ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.192 by root, Fri Feb 4 11:41:23 2005 UTC vs.
Revision 1.282 by root, Tue Jan 24 18:57:33 2006 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
43 * along with this program; if not, write to the Free Software 43 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 45 *----------------------------------------------------------------------*/
46 46
47/*{{{ includes: */ 47/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 48#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h"
50#include "rxvtperl.h"
50#include "version.h" 51#include "version.h"
51#include "command.h" 52#include "command.h"
52 53
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
53#ifdef KEYSYM_RESOURCE 59#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 60# include "keyboard.h"
55#endif 61#endif
56 62
57#include <cwchar>
58#include <csignal> 63#include <csignal>
59 64
60/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
61 66
62#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
63
64// exception thrown when the command parser runs out of input data
65class out_of_input { } out_of_input;
66 68
67#if ENABLE_FRILLS || ISO_14755 69#if ENABLE_FRILLS || ISO_14755
68 70
69#define ISO_14755_STARTED 0x80000000UL 71#define ISO_14755_STARTED 0x80000000UL
70#define ISO_14755_51 0x40000000UL // basic (section 5.1) 72#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
118 XK_Escape, 0x238b, 120 XK_Escape, 0x238b,
119 XK_Undo, 0x238c, 121 XK_Undo, 0x238c,
120 XK_Print, 0x2399, 122 XK_Print, 0x2399,
121 123
122 XK_space, 0x2423, 124 XK_space, 0x2423,
125
126#ifdef XK_KP_Begin
127 XK_KP_Prior, 0x21de,
128 XK_KP_Next, 0x21df,
129 XK_KP_Begin, 0x2320,
130 XK_KP_Insert, 0x2380,
131 XK_KP_Delete, 0x2326,
123 XK_KP_Space, 0x2422, 132 XK_KP_Space, 0x2422,
133#endif
124 0, 134 0,
125}; 135};
126 136
127void 137void
128rxvt_term::iso14755_54 (int x, int y) 138rxvt_term::iso14755_54 (int x, int y)
129{ 139{
130 x = Pixel2Col (x); 140 x = Pixel2Col (x);
131 y = Pixel2Row (y); 141 y = Pixel2Row (y);
132 142
133 if (x < 0 || x >= TermWin.ncol 143 if (!IN_RANGE_EXC (x, 0, ncol)
134 || y < 0 || y >= TermWin.nrow) 144 || !IN_RANGE_EXC (y, 0, nrow))
135 return; 145 return;
136 146
137 for (;;) 147 for (;;)
138 { 148 {
139 text_t t = screen.text[y + TermWin.saveLines - TermWin.view_start][x]; 149 const line_t &l = ROW(y + view_start);
150
151 text_t t = l.t[x];
140 152
141 if (t != NOCHAR || !x) 153 if (t != NOCHAR || !x)
142 { 154 {
143 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x], 155 iso14755_51 (l.t[x], l.r[x], x, y);
144 screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
145 iso14755buf = ISO_14755_54; 156 iso14755buf = ISO_14755_54;
146 break; 157 break;
147 } 158 }
148 159
149 x--; 160 x--;
150 } 161 }
151
152} 162}
153#endif
154 163
155#if ENABLE_OVERLAY
156void 164void
157rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 165rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
158{ 166{
159 rxvt_fontset *fs = FONTSET (r); 167 rxvt_fontset *fs = FONTSET (r);
160 rxvt_font *f = (*fs)[fs->find_font (ch)]; 168 rxvt_font *f = (*fs)[fs->find_font (ch)];
161 wchar_t *chr, *alloc, ch2; 169 wchar_t *chr, *alloc, ch2, *fname;
162 int len; 170 int len;
163 171
172 fname = rxvt_utf8towcs (f->name);
173
164#if ENABLE_COMBINING 174# if ENABLE_COMBINING
165 if (IS_COMPOSE (ch)) 175 if (IS_COMPOSE (ch))
166 { 176 {
167 len = rxvt_composite.expand (ch, 0); 177 len = rxvt_composite.expand (ch, 0);
168 alloc = chr = new wchar_t[len]; 178 alloc = chr = new wchar_t[len];
169 rxvt_composite.expand (ch, chr); 179 rxvt_composite.expand (ch, chr);
170 } 180 }
171 else 181 else
172#endif 182# endif
173 { 183 {
174 ch2 = ch; 184 ch2 = ch;
175 185
176 alloc = 0; 186 alloc = 0;
177 chr = &ch2; 187 chr = &ch2;
178 len = 1; 188 len = 1;
179 } 189 }
180 190
181 int width = strlen (f->name); 191 char attr[80]; // plenty
182 192
183 scr_overlay_new (0, -1, width < 8+5 ? 8+5 : width, len + 1); 193 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
194 (int)r,
195 fgcolor_of (r), bgcolor_of (r),
196 r & RS_Bold ? " bold" : "",
197 r & RS_Italic ? " italic" : "",
198 r & RS_Blink ? " blink" : "",
199 r & RS_RVid ? " rvid" : "",
200 r & RS_Uline ? " uline" : "",
201 r & RS_Careful ? " careful" : "");
202
203 int width = wcswidth (fname, wcslen (fname));
204
205 max_it (width, 8+5); // for char + hey
206 max_it (width, strlen (attr));
207
208 if (y >= 0)
209 {
210 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
211 x = 0;
212 }
213
214 scr_overlay_new (x, y, width, len + 2);
184 215
185 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 216 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
186 217
187 for (int y = 0; y < len; y++) 218 for (int y = 0; y < len; y++)
188 { 219 {
… …
191 ch = *chr++; 222 ch = *chr++;
192 223
193 sprintf (buf, "%8x", ch); 224 sprintf (buf, "%8x", ch);
194 scr_overlay_set (0, y, buf); 225 scr_overlay_set (0, y, buf);
195 scr_overlay_set (9, y, '='); 226 scr_overlay_set (9, y, '=');
196#if !UNICODE3 227# if !UNICODE3
197 if (ch >= 0x10000) 228 if (ch >= 0x10000)
198 ch = 0xfffd; 229 ch = 0xfffd;
199#endif 230# endif
200 scr_overlay_set (11, y, ch, r); 231 scr_overlay_set (11, y, ch, r);
201 scr_overlay_set (12, y, NOCHAR, r); 232 scr_overlay_set (12, y, NOCHAR, r);
202 } 233 }
203 234
235 scr_overlay_set (0, len , attr);
204 scr_overlay_set (0, len, f->name); 236 scr_overlay_set (0, len + 1, fname);
205 237
238 free (fname);
239
206#if ENABLE_COMBINING 240# if ENABLE_COMBINING
207 if (alloc) 241 if (alloc)
208 delete [] alloc; 242 delete [] alloc;
209#endif 243# endif
210} 244}
211#endif 245#endif
212 246
213void 247void
214rxvt_term::commit_iso14755 () 248rxvt_term::commit_iso14755 ()
… …
231 mb[0] = ch[0]; 265 mb[0] = ch[0];
232 len = 1; 266 len = 1;
233 } 267 }
234 268
235 if (len > 0) 269 if (len > 0)
236 tt_write ((unsigned char *)mb, len); 270 tt_write (mb, len);
237 else 271 else
238 scr_bell (); 272 scr_bell ();
239 } 273 }
240 274
241 iso14755buf = 0; 275 iso14755buf = 0;
… …
269 KeySym keysym; 303 KeySym keysym;
270#ifdef DEBUG_CMD 304#ifdef DEBUG_CMD
271 static int debug_key = 1; /* accessible by a debugger only */ 305 static int debug_key = 1; /* accessible by a debugger only */
272#endif 306#endif
273 int valid_keysym; 307 int valid_keysym;
274 unsigned char kbuf[KBUFSZ]; 308 char kbuf[KBUFSZ];
275 309
276 /* 310 /*
277 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 311 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
278 * escape sequence to toggle the Keypad. 312 * escape sequence to toggle the Keypad.
279 * 313 *
280 * Always permit `shift' to override the current setting 314 * Always permit `shift' to override the current setting
281 */ 315 */
282 shft = (ev.state & ShiftMask); 316 shft = ev.state & ShiftMask;
283 ctrl = (ev.state & ControlMask); 317 ctrl = ev.state & ControlMask;
284 meta = (ev.state & ModMetaMask); 318 meta = ev.state & ModMetaMask;
285 319
286 if (numlock_state || (ev.state & ModNumLockMask)) 320 if (numlock_state || (ev.state & ModNumLockMask))
287 { 321 {
288 numlock_state = (ev.state & ModNumLockMask); 322 numlock_state = (ev.state & ModNumLockMask);
289 PrivMode ((!numlock_state), PrivMode_aplKP); 323 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
297 Status status_return; 331 Status status_return;
298 332
299#if 0 333#if 0
300#ifdef X_HAVE_UTF8_STRING 334#ifdef X_HAVE_UTF8_STRING
301 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 335 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
302 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 336 len = Xutf8LookupString (Input_Context, &ev, kbuf,
303 KBUFSZ, &keysym, &status_return); 337 KBUFSZ, &keysym, &status_return);
304 else 338 else
305#endif 339#endif
306#endif 340#endif
307 { 341 {
… …
309 343
310 // the XOpenIM manpage lies about hardcoding the locale 344 // the XOpenIM manpage lies about hardcoding the locale
311 // at the point of XOpenIM, so temporarily switch locales 345 // at the point of XOpenIM, so temporarily switch locales
312 if (rs[Rs_imLocale]) 346 if (rs[Rs_imLocale])
313 SET_LOCALE (rs[Rs_imLocale]); 347 SET_LOCALE (rs[Rs_imLocale]);
348
314 // assume wchar_t == unicode or better 349 // assume wchar_t == unicode or better
315 len = XwcLookupString (Input_Context, &ev, wkbuf, 350 len = XwcLookupString (Input_Context, &ev, wkbuf,
316 KBUFSZ, &keysym, &status_return); 351 KBUFSZ, &keysym, &status_return);
352
317 if (rs[Rs_imLocale]) 353 if (rs[Rs_imLocale])
318 SET_LOCALE (locale); 354 SET_LOCALE (locale);
319 355
320 if (status_return == XLookupChars 356 if (status_return == XLookupChars
321 || status_return == XLookupBoth) 357 || status_return == XLookupBoth)
… …
342 || status_return == XLookupBoth; 378 || status_return == XLookupBoth;
343 } 379 }
344 else 380 else
345#endif 381#endif
346 { 382 {
347 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 383 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
348 valid_keysym = keysym != NoSymbol; 384 valid_keysym = keysym != NoSymbol;
349 } 385 }
350 386
351 if (valid_keysym) 387 if (valid_keysym)
352 { 388 {
353#ifdef KEYSYM_RESOURCE 389#ifdef KEYSYM_RESOURCE
354 if (keyboard->dispatch (this, keysym, ev.state)) 390 if (keyboard->dispatch (this, keysym, ev.state))
355 return; 391 return;
356#endif 392#endif
357 393
358 if (TermWin.saveLines) 394 if (saveLines)
359 { 395 {
360#ifdef UNSHIFTED_SCROLLKEYS 396#ifdef UNSHIFTED_SCROLLKEYS
361 if (!ctrl && !meta) 397 if (!ctrl && !meta)
362#else 398#else
363 if (IS_SCROLL_MOD) 399 if (IS_SCROLL_MOD)
364#endif 400#endif
365 { 401 {
366 int lnsppg; 402 int lnsppg;
367 403
368#ifdef PAGING_CONTEXT_LINES 404#ifdef PAGING_CONTEXT_LINES
369 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 405 lnsppg = nrow - PAGING_CONTEXT_LINES;
370#else 406#else
371 lnsppg = TermWin.nrow * 4 / 5; 407 lnsppg = nrow * 4 / 5;
372#endif 408#endif
373 if (keysym == XK_Prior) 409 if (keysym == XK_Prior)
374 { 410 {
375 scr_page (UP, lnsppg); 411 scr_page (UP, lnsppg);
376 return; 412 return;
… …
404 scr_move_to (0, 1); 440 scr_move_to (0, 1);
405 return; 441 return;
406 } 442 }
407 else if (keysym == XK_End) 443 else if (keysym == XK_End)
408 { 444 {
409 scr_move_to (1, 0); 445 scr_move_to (1, 1);
410 return; 446 return;
411 } 447 }
412 } 448 }
413#endif 449#endif
414 } 450 }
… …
425 { 461 {
426 switch (keysym) 462 switch (keysym)
427 { 463 {
428 /* normal XTerm key bindings */ 464 /* normal XTerm key bindings */
429 case XK_Insert: /* Shift+Insert = paste mouse selection */ 465 case XK_Insert: /* Shift+Insert = paste mouse selection */
430 selection_request (ev.time, 0, 0); 466 selection_request (ev.time);
431 return; 467 return;
432#if TODO 468#if TODO
433 /* rxvt extras */ 469 /* rxvt extras */
434 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 470 case XK_KP_Add: /* Shift+KP_Add = bigger font */
435 change_font (FONT_UP); 471 change_font (FONT_UP);
… …
513 else 549 else
514 strcpy (kbuf, key_backspace); 550 strcpy (kbuf, key_backspace);
515 break; 551 break;
516#endif 552#endif
517#ifndef NO_DELETE_KEY 553#ifndef NO_DELETE_KEY
554# ifdef XK_KP_Prior
555 case XK_KP_Delete:
556 /* allow shift to override */
557 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
558 {
559 strcpy (kbuf, "\033On");
560 break;
561 }
562 /* FALLTHROUGH */
563# endif
518 case XK_Delete: 564 case XK_Delete:
519 strcpy (kbuf, key_delete); 565 strcpy (kbuf, key_delete);
520 break; 566 break;
521#endif 567#endif
522 case XK_Tab: 568 case XK_Tab:
… …
625#ifdef XK_KP_Begin 671#ifdef XK_KP_Begin
626 case XK_KP_Begin: 672 case XK_KP_Begin:
627 strcpy (kbuf, "\033Ou"); 673 strcpy (kbuf, "\033Ou");
628 break; 674 break;
629 675
630 case XK_KP_Insert:
631 strcpy (kbuf, "\033Op");
632 break;
633
634 case XK_KP_Delete:
635 strcpy (kbuf, "\033On");
636 break;
637#endif 676#endif
638 case XK_KP_F1: /* "\033OP" */ 677 case XK_KP_F1: /* "\033OP" */
639 case XK_KP_F2: /* "\033OQ" */ 678 case XK_KP_F2: /* "\033OQ" */
640 case XK_KP_F3: /* "\033OR" */ 679 case XK_KP_F3: /* "\033OR" */
641 case XK_KP_F4: /* "\033OS" */ 680 case XK_KP_F4: /* "\033OS" */
… …
673 break; 712 break;
674 713
675 case XK_Find: 714 case XK_Find:
676 strcpy (kbuf, "\033[1~"); 715 strcpy (kbuf, "\033[1~");
677 break; 716 break;
717
718#ifdef XK_KP_End
719 case XK_KP_Insert:
720 /* allow shift to override */
721 if ((priv_modes & PrivMode_aplKP) ? !shft : shft)
722 {
723 strcpy (kbuf, "\033Op");
724 break;
725 }
726 /* FALLTHROUGH */
727#endif
678 case XK_Insert: 728 case XK_Insert:
679 strcpy (kbuf, "\033[2~"); 729 strcpy (kbuf, "\033[2~");
680 break; 730 break;
681#ifdef DXK_Remove /* support for DEC remove like key */ 731#ifdef DXK_Remove /* support for DEC remove like key */
682 case DXK_Remove: 732 case DXK_Remove:
… …
802 { 852 {
803#ifdef META8_OPTION 853#ifdef META8_OPTION
804 /* set 8-bit on */ 854 /* set 8-bit on */
805 if (meta && (meta_char == 0x80)) 855 if (meta && (meta_char == 0x80))
806 { 856 {
807 unsigned char *ch; 857 char *ch;
808 858
809 for (ch = kbuf; ch < kbuf + len; ch++) 859 for (ch = kbuf; ch < kbuf + len; ch++)
810 *ch |= 0x80; 860 *ch |= 0x80;
811 861
812 meta = 0; 862 meta = 0;
… …
814#endif 864#endif
815 /* nil */ ; 865 /* nil */ ;
816 } 866 }
817 } 867 }
818 868
869 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
870 return;
871
819 if (len <= 0) 872 if (len <= 0)
820 return; /* not mapped */ 873 return; /* not mapped */
821 874
822 if (options & Opt_scrollTtyKeypress) 875 if (OPTION (Opt_scrollTtyKeypress))
823 if (TermWin.view_start) 876 if (view_start)
824 { 877 {
825 TermWin.view_start = 0; 878 view_start = 0;
826 want_refresh = 1; 879 want_refresh = 1;
827 } 880 }
828 881
829 /* 882 /*
830 * these modifications only affect the static keybuffer 883 * these modifications only affect the static keybuffer
… …
845#ifdef META8_OPTION 898#ifdef META8_OPTION
846 && meta_char == C0_ESC 899 && meta_char == C0_ESC
847#endif 900#endif
848 ) 901 )
849 { 902 {
850 const unsigned char ch = C0_ESC; 903 const char ch = C0_ESC;
851 tt_write (&ch, 1); 904 tt_write (&ch, 1);
852 } 905 }
853 906
854#if defined(DEBUG_CMD) 907#if defined(DEBUG_CMD)
855 /* Display keyboard buffer contents */ 908 /* Display keyboard buffer contents */
… …
863#endif /* DEBUG_CMD */ 916#endif /* DEBUG_CMD */
864 tt_write (kbuf, (unsigned int)len); 917 tt_write (kbuf, (unsigned int)len);
865} 918}
866/*}}} */ 919/*}}} */
867 920
868#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 921#if defined (KEYSYM_RESOURCE)
869/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
870/* attempt to `write' count to the input buffer */
871unsigned int 922unsigned int
872rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 923rxvt_term::cmd_write (const char *str, unsigned int count)
873{ 924{
874 unsigned int n, s; 925 unsigned int n, s;
875 926
876 n = cmdbuf_ptr - cmdbuf_base; 927 n = cmdbuf_ptr - cmdbuf_base;
877 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 928 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
914 } 965 }
915#endif 966#endif
916 967
917 if (want_refresh) 968 if (want_refresh)
918 { 969 {
970 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
971 {
972 int row = view_start;
973 int end_row = row + nrow;
974
975 while (row > top_row && ROW (row - 1).is_longer ())
976 --row;
977
978 do
979 {
980 int start_row = row;
981 line_t *l;
982
983 do
984 {
985 l = &ROW (row++);
986
987 if (!(l->f & LINE_FILTERED))
988 {
989 // line not filtered, mark it as filtered
990 l->f |= LINE_FILTERED;
991 while (l->is_longer ())
992 {
993 l = &ROW (row++);
994 l->f |= LINE_FILTERED;
995 }
996
997 // and filter it
998 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
999
1000 break;
1001 }
1002 }
1003 while (l->is_longer () && row < end_row);
1004 }
1005 while (row < end_row);
1006 }
1007
919 scr_refresh (refresh_type); 1008 scr_refresh ();
920 scrollbar_show (1); 1009 scrollbar_show (1);
921#ifdef USE_XIM 1010#ifdef USE_XIM
922 IMSendSpot (); 1011 IMSendSpot ();
923#endif 1012#endif
924 } 1013 }
… …
927} 1016}
928 1017
929void 1018void
930rxvt_term::check_cb (check_watcher &w) 1019rxvt_term::check_cb (check_watcher &w)
931{ 1020{
932 SET_R (this); 1021 make_current ();
933 SET_LOCALE (locale);
934 1022
935 display->flush (); 1023 display->flush ();
936 1024
937 if (want_refresh && !flush_ev.active) 1025 if (want_refresh && !flush_ev.active)
938 flush_ev.start (NOW + 0.01); 1026 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
939} 1027}
940 1028
941void 1029void
942rxvt_term::flush_cb (time_watcher &w) 1030rxvt_term::flush_cb (time_watcher &w)
943{ 1031{
944 SET_R (this); 1032 make_current ();
945 SET_LOCALE (locale);
946 1033
947 refresh_limit = 1; 1034 refresh_limit = 1;
948 refresh_count = 0; 1035 refresh_count = 0;
949 flush (); 1036 flush ();
950} 1037}
… …
954rxvt_term::cursor_blink_cb (time_watcher &w) 1041rxvt_term::cursor_blink_cb (time_watcher &w)
955{ 1042{
956 hidden_cursor = !hidden_cursor; 1043 hidden_cursor = !hidden_cursor;
957 want_refresh = 1; 1044 want_refresh = 1;
958 1045
959 w.start (w.at + BLINK_INTERVAL); 1046 w.start (w.at + CURSOR_BLINK_INTERVAL);
960} 1047}
961#endif 1048#endif
962 1049
963#ifdef TEXT_BLINK 1050#ifdef TEXT_BLINK
964void 1051void
… …
978rxvt_term::cont_scroll_cb (time_watcher &w) 1065rxvt_term::cont_scroll_cb (time_watcher &w)
979{ 1066{
980 if ((scrollbar_isUp() || scrollbar_isDn()) && 1067 if ((scrollbar_isUp() || scrollbar_isDn()) &&
981 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1068 scr_page (scrollbar_isUp() ? UP : DN, 1))
982 { 1069 {
983 refresh_type |= SMOOTH_REFRESH;
984 want_refresh = 1; 1070 want_refresh = 1;
985 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
986 } 1072 }
987} 1073}
988#endif 1074#endif
… …
992rxvt_term::sel_scroll_cb (time_watcher &w) 1078rxvt_term::sel_scroll_cb (time_watcher &w)
993{ 1079{
994 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1080 if (scr_page (scroll_selection_dir, scroll_selection_lines))
995 { 1081 {
996 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1082 selection_extend (selection_save_x, selection_save_y, selection_save_state);
997 refresh_type |= SMOOTH_REFRESH;
998 want_refresh = 1; 1083 want_refresh = 1;
999 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1084 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1000 } 1085 }
1001} 1086}
1002#endif 1087#endif
… …
1007{ 1092{
1008 if (mouse_slip_wheel_speed == 0 1093 if (mouse_slip_wheel_speed == 0
1009 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1094 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1010 : scr_page (UP, mouse_slip_wheel_speed)) 1095 : scr_page (UP, mouse_slip_wheel_speed))
1011 { 1096 {
1012 if (TermWin.view_start == TermWin.nscrolled || 1097 if (view_start == top_row || view_start == 0)
1013 TermWin.view_start == 0)
1014 mouse_slip_wheel_speed = 0; 1098 mouse_slip_wheel_speed = 0;
1015 1099
1016 refresh_type |= SMOOTH_REFRESH;
1017 want_refresh = 1; 1100 want_refresh = 1;
1018 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1101 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1019 } 1102 }
1020} 1103}
1021#endif 1104#endif
1022 1105
1106#if HAVE_SCHED_YIELD
1107static struct event_handler
1108{
1109 check_watcher cw_yield;
1110
1111 void yield (check_watcher &w)
1112 {
1113 sched_yield ();
1114 w.stop ();
1115 }
1116
1117 event_handler ()
1118 : cw_yield (this, &event_handler::yield)
1119 {
1120 }
1121} event_handler;
1122#endif
1123
1023bool 1124bool
1024rxvt_term::pty_fill () 1125rxvt_term::pty_fill ()
1025{ 1126{
1026 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1127 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1027 1128
1028 if (CBUFSIZ == n) 1129 if (CBUFSIZ == n)
1029 { 1130 {
1030 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1131 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1031 n = 0; 1132 n = 0;
1032 } 1133 }
1033 1134
1034 memmove (cmdbuf_base, cmdbuf_ptr, n); 1135 memmove (cmdbuf_base, cmdbuf_ptr, n);
1035 cmdbuf_ptr = cmdbuf_base; 1136 cmdbuf_ptr = cmdbuf_base;
1036 cmdbuf_endp = cmdbuf_ptr + n; 1137 cmdbuf_endp = cmdbuf_ptr + n;
1037 1138
1038 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1139 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1039 1140
1040 if (n > 0) 1141 if (r > 0)
1041 { 1142 {
1042 cmdbuf_endp += n; 1143 cmdbuf_endp += r;
1043 return true; 1144 return true;
1044 } 1145 }
1045 else if (n < 0 && errno != EAGAIN) 1146 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1147 {
1148#if HAVE_SCHED_YIELD
1149 if (display->is_local)
1150 event_handler.cw_yield.start ();
1151#endif
1152 }
1153 else
1154 {
1155 pty_ev.stop ();
1156
1157 if (!OPTION (Opt_hold))
1046 destroy (); 1158 destroy ();
1159 }
1047 1160
1048 return false; 1161 return false;
1049} 1162}
1050 1163
1051void 1164void
1052rxvt_term::pty_cb (io_watcher &w, short revents) 1165rxvt_term::pty_cb (io_watcher &w, short revents)
1053{ 1166{
1054 SET_R (this); 1167 make_current ();
1055 SET_LOCALE (locale);
1056 1168
1057 if (revents & EVENT_READ) 1169 if (revents & EVENT_READ)
1058 // loop, but don't allow a single term to monopolize us 1170 // loop, but don't allow a single term to monopolize us
1059 while (pty_fill ()) 1171 while (pty_fill ())
1060 if (cmd_parse ()) 1172 if (cmd_parse ())
… …
1065} 1177}
1066 1178
1067void 1179void
1068rxvt_term::pointer_unblank () 1180rxvt_term::pointer_unblank ()
1069{ 1181{
1070 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1182 XDefineCursor (display->display, vt, TermWin_cursor);
1071 recolour_cursor (); 1183 recolour_cursor ();
1072 1184
1073#ifdef POINTER_BLANK 1185#ifdef POINTER_BLANK
1074 hidden_pointer = 0; 1186 hidden_pointer = 0;
1075 1187
1076 if (options & Opt_pointerBlank) 1188 if (OPTION (Opt_pointerBlank))
1077 pointer_ev.start (NOW + pointerBlankDelay); 1189 pointer_ev.start (NOW + pointerBlankDelay);
1078#endif 1190#endif
1079} 1191}
1080 1192
1081#ifdef POINTER_BLANK 1193#ifdef POINTER_BLANK
1082void 1194void
1083rxvt_term::pointer_blank () 1195rxvt_term::pointer_blank ()
1084{ 1196{
1085 if (! (options & Opt_pointerBlank)) 1197 if (!OPTION (Opt_pointerBlank))
1086 return; 1198 return;
1087 1199
1088 XDefineCursor (display->display, TermWin.vt, display->blank_cursor); 1200 XDefineCursor (display->display, vt, display->blank_cursor);
1089 XFlush (display->display); 1201 XFlush (display->display);
1090 1202
1091 hidden_pointer = 1; 1203 hidden_pointer = 1;
1092} 1204}
1093 1205
1094void 1206void
1095rxvt_term::pointer_cb (time_watcher &w) 1207rxvt_term::pointer_cb (time_watcher &w)
1096{ 1208{
1097 SET_R (this); 1209 make_current ();
1098 SET_LOCALE (locale);
1099 1210
1100 pointer_blank (); 1211 pointer_blank ();
1101} 1212}
1102#endif 1213#endif
1103 1214
… …
1182 1293
1183/*{{{ process an X event */ 1294/*{{{ process an X event */
1184void 1295void
1185rxvt_term::x_cb (XEvent &ev) 1296rxvt_term::x_cb (XEvent &ev)
1186{ 1297{
1298 make_current ();
1299
1187 dDisp; 1300 dDisp;
1188 1301
1189 SET_R (this); 1302 if (ev.xany.window == vt
1190 SET_LOCALE (locale); 1303 && SHOULD_INVOKE (HOOK_X_EVENT)
1304 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1305 return;
1191 1306
1192#if defined(CURSOR_BLINK) 1307 // for XQueryPointer
1193 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
1194 {
1195 if (hidden_cursor)
1196 {
1197 hidden_cursor = 0;
1198 want_refresh = 1;
1199 }
1200
1201 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1202 }
1203#endif
1204
1205#if defined(POINTER_BLANK)
1206 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1207 {
1208 if (ev.type == MotionNotify
1209 || ev.type == ButtonPress
1210 || ev.type == ButtonRelease)
1211 if (hidden_pointer)
1212 pointer_unblank ();
1213
1214 if (ev.type == KeyPress && hidden_pointer == 0)
1215 pointer_blank ();
1216 }
1217#endif
1218
1219 Window unused_root, unused_child; 1308 Window unused_root, unused_child;
1220 int unused_root_x, unused_root_y; 1309 int unused_root_x, unused_root_y;
1221 unsigned int unused_mask; 1310 unsigned int unused_mask;
1222 1311
1223 switch (ev.type) 1312 switch (ev.type)
… …
1230 1319
1231 break; 1320 break;
1232 1321
1233 case KeyRelease: 1322 case KeyRelease:
1234 { 1323 {
1235#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1324#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1236 KeySym ks; 1325 KeySym keysym;
1237 1326
1238 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1327 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1239#endif 1328#endif
1240 1329
1241#if ENABLE_FRILLS || ISO_14755 1330#if ENABLE_FRILLS || ISO_14755
1242 // ISO 14755 support 1331 // ISO 14755 support
1243 if (iso14755buf) 1332 if (iso14755buf)
… …
1248# endif 1337# endif
1249# if ISO_14755 1338# if ISO_14755
1250 // iso14755 part 5.2 handling: release time 1339 // iso14755 part 5.2 handling: release time
1251 // first: controls 1340 // first: controls
1252 if ((ev.xkey.state & ControlMask) 1341 if ((ev.xkey.state & ControlMask)
1253 && ((ks >= 0x40 && ks <= 0x5f) 1342 && ((keysym >= 0x40 && keysym <= 0x5f)
1254 || (ks >= 0x61 && ks <= 0x7f))) 1343 || (keysym >= 0x61 && keysym <= 0x7f)))
1255 { 1344 {
1256 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1345 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1257 commit_iso14755 (); 1346 commit_iso14755 ();
1258 return; // case-break; 1347 goto skip_switch;
1259 } 1348 }
1260 1349
1261 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1350 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1262 if (i[0] == ks) 1351 if (i[0] == keysym)
1263 { 1352 {
1264 iso14755buf = ISO_14755_51 | i[1]; 1353 iso14755buf = ISO_14755_51 | i[1];
1265 commit_iso14755 (); 1354 commit_iso14755 ();
1266 return; // case-break; 1355 goto skip_switch;
1267 } 1356 }
1268 1357
1269 scr_bell (); 1358 scr_bell ();
1270# endif 1359# endif
1271 iso14755buf = 0; 1360 iso14755buf = 0;
… …
1290 else 1379 else
1291 iso14755buf = 0; 1380 iso14755buf = 0;
1292 } 1381 }
1293#endif 1382#endif
1294 1383
1384 if (ev.xany.window == vt
1385 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1386 break;
1387
1295#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1388#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1296 if (!(ev.xkey.state & ControlMask)) 1389 if (!(ev.xkey.state & ControlMask))
1297 slip_wheel_ev.stop (); 1390 slip_wheel_ev.stop ();
1298 else if (ks == XK_Control_L || ks == XK_Control_R) 1391 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1299 mouse_slip_wheel_speed = 0; 1392 mouse_slip_wheel_speed = 0;
1300#endif 1393#endif
1301 break; 1394 break;
1302 } 1395 }
1303 1396
… …
1309 button_release (ev.xbutton); 1402 button_release (ev.xbutton);
1310 break; 1403 break;
1311 1404
1312 case ClientMessage: 1405 case ClientMessage:
1313 if (ev.xclient.format == 32 1406 if (ev.xclient.format == 32
1314 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1407 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1315 destroy ();
1316#ifdef OFFIX_DND
1317 /* OffiX Dnd (drag 'n' drop) protocol */
1318 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1319 && (ev.xclient.data.l[0] == DndFile
1320 || ev.xclient.data.l[0] == DndDir
1321 || ev.xclient.data.l[0] == DndLink))
1322 { 1408 {
1323 /* Get Dnd data */ 1409 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1324 Atom ActualType; 1410 {
1325 int ActualFormat; 1411 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1326 unsigned char *data; 1412 {
1327 unsigned long Size, RemainingBytes; 1413 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1328 1414 {
1329 XGetWindowProperty (disp, display->root, 1415 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1330 xa[XA_DNDSELECTION], 1416 destroy ();
1331 0L, 1000000L, 1417 }
1332 False, AnyPropertyType, 1418#if ENABLE_EWMH
1333 &ActualType, &ActualFormat, 1419 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1334 &Size, &RemainingBytes, 1420 XSendEvent (disp, ev.xclient.window = display->root,
1421 False, SubstructureRedirectMask | SubstructureNotifyMask,
1335 &data); 1422 &ev);
1336 set_string_property (XA_CUT_BUFFER0, data); 1423#endif
1337 XFree (data); 1424 }
1338 selection_paste (display->root, XA_CUT_BUFFER0, true); 1425 }
1339 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime); 1426#if ENABLE_XEMBED
1427 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1428 {
1429 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1430 focus_in ();
1431 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1432 focus_out ();
1433 }
1434#endif
1340 } 1435 }
1341#endif /* OFFIX_DND */
1342 break; 1436 break;
1343 1437
1344 case MappingNotify: 1438 case MappingNotify:
1345 XRefreshKeyboardMapping (&ev.xmapping); 1439 XRefreshKeyboardMapping (&ev.xmapping);
1346 break; 1440 break;
… …
1369 break; 1463 break;
1370 } 1464 }
1371 break; 1465 break;
1372 1466
1373 case FocusIn: 1467 case FocusIn:
1374 if (!TermWin.focus) 1468 focus_in ();
1469 break;
1470
1471 case FocusOut:
1472 focus_out ();
1473 break;
1474
1475 case ConfigureNotify:
1476 if (ev.xconfigure.window == parent[0])
1375 { 1477 {
1376 TermWin.focus = 1;
1377 want_refresh = 1;
1378#ifdef USE_XIM
1379 if (Input_Context != NULL)
1380 {
1381 IMSetStatusPosition ();
1382 XSetICFocus (Input_Context);
1383 }
1384#endif
1385#ifdef CURSOR_BLINK
1386 if (options & Opt_cursorBlink)
1387 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1388#endif
1389#ifdef OFF_FOCUS_FADING
1390 if (rs[Rs_fade])
1391 {
1392 pix_colors = pix_colors_focused;
1393 scr_recolour ();
1394 }
1395#endif
1396
1397 }
1398 break;
1399
1400 case FocusOut:
1401 if (TermWin.focus)
1402 {
1403 TermWin.focus = 0;
1404 want_refresh = 1;
1405
1406#if ENABLE_FRILLS || ISO_14755
1407 iso14755buf = 0;
1408#endif
1409#if ENABLE_OVERLAY
1410 scr_overlay_off ();
1411#endif
1412#ifdef USE_XIM
1413 if (Input_Context != NULL)
1414 XUnsetICFocus (Input_Context);
1415#endif
1416#ifdef CURSOR_BLINK
1417 if (options & Opt_cursorBlink)
1418 cursor_blink_ev.stop ();
1419 hidden_cursor = 0;
1420#endif
1421#ifdef OFF_FOCUS_FADING
1422 if (rs[Rs_fade])
1423 {
1424 pix_colors = pix_colors_unfocused;
1425 scr_recolour ();
1426 }
1427#endif
1428 }
1429 break;
1430
1431 case ConfigureNotify:
1432 if (ev.xconfigure.window == TermWin.parent[0])
1433 {
1434 int height, width;
1435
1436 do
1437 { /* Wrap lots of configures into one */
1438 width = ev.xconfigure.width;
1439 height = ev.xconfigure.height;
1440 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1441 }
1442 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)); 1478 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1479 ;
1443 1480
1444 if (szHint.width != width || szHint.height != height) 1481 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1445 { 1482 {
1446 seen_resize = 1; 1483 seen_resize = 1;
1447 resize_all_windows (width, height, 1); 1484 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1448 } 1485 }
1449 1486
1487 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1488
1450#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1489#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1451 if (options & Opt_transparent) 1490 if (OPTION (Opt_transparent))
1452 check_our_parents (); 1491 check_our_parents ();
1453#endif 1492#endif
1454 } 1493 }
1455 break; 1494 break;
1456 1495
1457 case PropertyNotify: 1496 case PropertyNotify:
1497 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1458 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1498 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1459 && ev.xproperty.state == PropertyNewValue) 1499 && ev.xproperty.state == PropertyNewValue)
1460 selection_property (ev.xproperty.window, ev.xproperty.atom); 1500 selection_property (ev.xproperty.window, ev.xproperty.atom);
1461 1501
1462 break; 1502 break;
1463 1503
1464 case SelectionClear: 1504 case SelectionClear:
1465 selection_clear (); 1505 selection_clear ();
… …
1472 1512
1473 case SelectionRequest: 1513 case SelectionRequest:
1474 selection_send (ev.xselectionrequest); 1514 selection_send (ev.xselectionrequest);
1475 break; 1515 break;
1476 1516
1517 case MapNotify:
1518 mapped = 1;
1519#ifdef TEXT_BLINK
1520 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1521#endif
1522 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1523 break;
1524
1477 case UnmapNotify: 1525 case UnmapNotify:
1478 TermWin.mapped = 0; 1526 mapped = 0;
1479#ifdef TEXT_BLINK 1527#ifdef TEXT_BLINK
1480 text_blink_ev.stop (); 1528 text_blink_ev.stop ();
1481#endif 1529#endif
1482 break; 1530 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1483
1484 case MapNotify:
1485 TermWin.mapped = 1;
1486#ifdef TEXT_BLINK
1487 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1488#endif
1489 break; 1531 break;
1490 1532
1491#ifdef TRANSPARENT 1533#ifdef TRANSPARENT
1492 case ReparentNotify: 1534 case ReparentNotify:
1493 rootwin_cb (ev); 1535 rootwin_cb (ev);
1494 break; 1536 break;
1495#endif /* TRANSPARENT */ 1537#endif /* TRANSPARENT */
1496 1538
1497 case GraphicsExpose: 1539 case GraphicsExpose:
1498 case Expose: 1540 case Expose:
1499 if (ev.xany.window == TermWin.vt) 1541 if (ev.xany.window == vt)
1500 { 1542 {
1501 do 1543 do
1502 scr_expose (ev.xexpose.x, ev.xexpose.y, 1544 scr_expose (ev.xexpose.x, ev.xexpose.y,
1503 ev.xexpose.width, ev.xexpose.height, False); 1545 ev.xexpose.width, ev.xexpose.height, False);
1504 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)); 1546 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1505 1547
1506 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1548 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1507 1549
1508 while (XCheckTypedWindowEvent (disp, TermWin.vt, ev.xany.type, &ev)) 1550 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1509 scr_expose (ev.xexpose.x, ev.xexpose.y, 1551 scr_expose (ev.xexpose.x, ev.xexpose.y,
1510 ev.xexpose.width, ev.xexpose.height, False); 1552 ev.xexpose.width, ev.xexpose.height, False);
1511 1553
1512 scr_refresh (refresh_type); 1554 want_refresh = 1;
1513 } 1555 }
1514 else 1556 else
1515 { 1557 {
1516 XEvent unused_event; 1558 XEvent unused_event;
1517 1559
… …
1523 if (isScrollbarWindow (ev.xany.window)) 1565 if (isScrollbarWindow (ev.xany.window))
1524 { 1566 {
1525 scrollBar.setIdle (); 1567 scrollBar.setIdle ();
1526 scrollbar_show (0); 1568 scrollbar_show (0);
1527 } 1569 }
1528#ifdef MENUBAR
1529 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1530 menubar_expose ();
1531#endif
1532 1570
1533#ifdef TRANSPARENT 1571#ifdef TRANSPARENT
1534 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1572 if (am_transparent && ev.xany.window == parent[0])
1535 XClearWindow (disp, ev.xany.window); 1573 XClearWindow (disp, ev.xany.window);
1536#endif 1574#endif
1537 } 1575 }
1538 break; 1576 break;
1539 1577
1540 case MotionNotify: 1578 case MotionNotify:
1541#ifdef POINTER_BLANK 1579#ifdef POINTER_BLANK
1542 if (hidden_pointer) 1580 if (hidden_pointer)
1543 pointer_unblank (); 1581 pointer_unblank ();
1544#endif 1582#endif
1545#if MENUBAR
1546 if (isMenuBarWindow (ev.xany.window))
1547 {
1548 menubar_control (ev.xbutton);
1549 break;
1550 }
1551#endif
1552 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1583 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1553 break; 1584 break;
1554 1585
1555 if (ev.xany.window == TermWin.vt) 1586 if (ev.xany.window == vt)
1556 { 1587 {
1588 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1589 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1590 ; // nop
1557 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1591 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1558 { 1592 {
1559 while (XCheckTypedWindowEvent (disp, TermWin.vt, MotionNotify, &ev)) 1593 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1560 ; 1594 ;
1561 1595
1562 XQueryPointer (disp, TermWin.vt, 1596 XQueryPointer (disp, vt,
1563 &unused_root, &unused_child, 1597 &unused_root, &unused_child,
1564 &unused_root_x, &unused_root_y, 1598 &unused_root_x, &unused_root_y,
1565 &ev.xbutton.x, &ev.xbutton.y, 1599 &ev.xbutton.x, &ev.xbutton.y,
1566 &ev.xbutton.state); 1600 &ev.xbutton.state);
1567#ifdef MOUSE_THRESHOLD 1601#ifdef MOUSE_THRESHOLD
… …
1579#endif 1613#endif
1580 selection_extend (ev.xbutton.x, ev.xbutton.y, 1614 selection_extend (ev.xbutton.x, ev.xbutton.y,
1581 ev.xbutton.state & Button3Mask ? 2 : 0); 1615 ev.xbutton.state & Button3Mask ? 2 : 0);
1582 1616
1583#ifdef SELECTION_SCROLLING 1617#ifdef SELECTION_SCROLLING
1584 if (ev.xbutton.y < TermWin.int_bwidth 1618 if (ev.xbutton.y < int_bwidth
1585 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1619 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1586 { 1620 {
1587 int dist; 1621 int dist;
1588 1622
1589 /* don't clobber the current delay if we are 1623 /* don't clobber the current delay if we are
1590 * already in the middle of scrolling. 1624 * already in the middle of scrolling.
… …
1598 selection_save_x = ev.xbutton.x; 1632 selection_save_x = ev.xbutton.x;
1599 selection_save_y = ev.xbutton.y; 1633 selection_save_y = ev.xbutton.y;
1600 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1634 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1601 1635
1602 /* calc number of lines to scroll */ 1636 /* calc number of lines to scroll */
1603 if (ev.xbutton.y < TermWin.int_bwidth) 1637 if (ev.xbutton.y < int_bwidth)
1604 { 1638 {
1605 scroll_selection_dir = UP; 1639 scroll_selection_dir = UP;
1606 dist = TermWin.int_bwidth - ev.xbutton.y; 1640 dist = int_bwidth - ev.xbutton.y;
1607 } 1641 }
1608 else 1642 else
1609 { 1643 {
1610 scroll_selection_dir = DN; 1644 scroll_selection_dir = DN;
1611 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1645 dist = ev.xbutton.y - (int_bwidth + height);
1612 } 1646 }
1613 1647
1614 scroll_selection_lines = Pixel2Height (dist) 1648 scroll_selection_lines = Pixel2Height (dist)
1615 / SELECTION_SCROLL_LINE_SPEEDUP 1649 / SELECTION_SCROLL_LINE_SPEEDUP
1616 + 1; 1650 + 1;
1617 MIN_IT (scroll_selection_lines, 1651 min_it (scroll_selection_lines,
1618 SELECTION_SCROLL_MAX_LINES); 1652 SELECTION_SCROLL_MAX_LINES);
1619 } 1653 }
1620 else 1654 else
1621 { 1655 {
1622 /* we are within the text window, so we 1656 /* we are within the text window, so we
… …
1642 &unused_root_x, &unused_root_y, 1676 &unused_root_x, &unused_root_y,
1643 &ev.xbutton.x, &ev.xbutton.y, 1677 &ev.xbutton.x, &ev.xbutton.y,
1644 &unused_mask); 1678 &unused_mask);
1645 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1679 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1646 scrollbar_size ()); 1680 scrollbar_size ());
1647 scr_refresh (refresh_type); 1681 want_refresh = 1;
1648 refresh_limit = 0; 1682 refresh_limit = 0;
1649 scrollbar_show (1); 1683 scrollbar_show (1);
1650 } 1684 }
1651 break; 1685 break;
1652 } 1686 }
1687
1688skip_switch: ;
1689
1690#if defined(CURSOR_BLINK)
1691 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1692 {
1693 if (hidden_cursor)
1694 {
1695 hidden_cursor = 0;
1696 want_refresh = 1;
1697 }
1698
1699 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1700 }
1701#endif
1702
1703#if defined(POINTER_BLANK)
1704 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1705 {
1706 if (ev.type == MotionNotify
1707 || ev.type == ButtonPress
1708 || ev.type == ButtonRelease)
1709 if (hidden_pointer)
1710 pointer_unblank ();
1711
1712 if (ev.type == KeyPress && hidden_pointer == 0)
1713 pointer_blank ();
1714 }
1715#endif
1716}
1717
1718void
1719rxvt_term::focus_in ()
1720{
1721 if (!focus)
1722 {
1723 focus = 1;
1724 want_refresh = 1;
1725
1726 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1727
1728#if USE_XIM
1729 if (Input_Context != NULL)
1730 {
1731 IMSetStatusPosition ();
1732 XSetICFocus (Input_Context);
1733 }
1734#endif
1735#if CURSOR_BLINK
1736 if (OPTION (Opt_cursorBlink))
1737 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1738#endif
1739#if OFF_FOCUS_FADING
1740 if (rs[Rs_fade])
1741 {
1742 pix_colors = pix_colors_focused;
1743 scr_recolour ();
1744 }
1745#endif
1746 }
1747}
1748
1749void
1750rxvt_term::focus_out ()
1751{
1752 if (focus)
1753 {
1754 focus = 0;
1755 want_refresh = 1;
1756
1757 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1758
1759#if ENABLE_FRILLS || ISO_14755
1760 if (iso14755buf)
1761 {
1762 iso14755buf = 0;
1763# if ENABLE_OVERLAY
1764 scr_overlay_off ();
1765# endif
1766 }
1767#endif
1768#if USE_XIM
1769 if (Input_Context != NULL)
1770 XUnsetICFocus (Input_Context);
1771#endif
1772#if CURSOR_BLINK
1773 if (OPTION (Opt_cursorBlink))
1774 cursor_blink_ev.stop ();
1775 hidden_cursor = 0;
1776#endif
1777#if OFF_FOCUS_FADING
1778 if (rs[Rs_fade])
1779 {
1780 pix_colors = pix_colors_unfocused;
1781 scr_recolour ();
1782 }
1783#endif
1784 }
1653} 1785}
1654 1786
1655#if TRANSPARENT 1787#if TRANSPARENT
1656void 1788void
1657rxvt_term::rootwin_cb (XEvent &ev) 1789rxvt_term::rootwin_cb (XEvent &ev)
1658{ 1790{
1659 SET_R (this); 1791 make_current ();
1660 SET_LOCALE (locale);
1661 1792
1662 switch (ev.type) 1793 switch (ev.type)
1663 { 1794 {
1664 case PropertyNotify: 1795 case PropertyNotify:
1665 /* 1796 /*
… …
1670 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1801 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1671 return; 1802 return;
1672 1803
1673 /* FALLTHROUGH */ 1804 /* FALLTHROUGH */
1674 case ReparentNotify: 1805 case ReparentNotify:
1675 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1806 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1676 want_refresh = want_full_refresh = 1; 1807 want_refresh = want_full_refresh = 1;
1677 break; 1808 break;
1678 } 1809 }
1679} 1810}
1680#endif 1811#endif
… …
1683rxvt_term::button_press (XButtonEvent &ev) 1814rxvt_term::button_press (XButtonEvent &ev)
1684{ 1815{
1685 int reportmode = 0, clickintime; 1816 int reportmode = 0, clickintime;
1686 1817
1687 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1818 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1819
1688 if (!bypass_keystate) 1820 if (!bypass_keystate)
1689 reportmode = !! (priv_modes & PrivMode_mouse_report); 1821 reportmode = !! (priv_modes & PrivMode_mouse_report);
1690 1822
1691 /* 1823 /*
1692 * VT window processing of button press 1824 * VT window processing of button press
1693 */ 1825 */
1694 if (ev.window == TermWin.vt) 1826 if (ev.window == vt)
1695 { 1827 {
1828 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1829 return;
1830
1696#if ISO_14755 1831#if ISO_14755
1697 // 5.4 1832 // 5.4
1698 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1833 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1699 { 1834 {
1700 iso14755_54 (ev.x, ev.y); 1835 iso14755_54 (ev.x, ev.y);
… …
1712#ifdef MOUSE_REPORT_DOUBLECLICK 1847#ifdef MOUSE_REPORT_DOUBLECLICK
1713 if (ev.button == MEvent.button && clickintime) 1848 if (ev.button == MEvent.button && clickintime)
1714 { 1849 {
1715 /* same button, within alloted time */ 1850 /* same button, within alloted time */
1716 MEvent.clicks++; 1851 MEvent.clicks++;
1852
1717 if (MEvent.clicks > 1) 1853 if (MEvent.clicks > 1)
1718 { 1854 {
1719 /* only report double clicks */ 1855 /* only report double clicks */
1720 MEvent.clicks = 2; 1856 MEvent.clicks = 2;
1721 mouse_report (ev); 1857 mouse_report (ev);
… …
1753#else 1889#else
1754 selection.rect = false; 1890 selection.rect = false;
1755#endif 1891#endif
1756 1892
1757 /* allow shift+left click to extend selection */ 1893 /* allow shift+left click to extend selection */
1758 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1894 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1759 { 1895 {
1760 if (MEvent.button == Button1 && clickintime) 1896 if (MEvent.button == Button1 && clickintime)
1761 selection_rotate (ev.x, ev.y); 1897 selection_rotate (ev.x, ev.y);
1762 else 1898 else
1763 selection_extend (ev.x, ev.y, 1); 1899 selection_extend (ev.x, ev.y, 1);
… …
1904 case Button3: 2040 case Button3:
1905 if (scrollBar.style != R_SB_XTERM) 2041 if (scrollBar.style != R_SB_XTERM)
1906 { 2042 {
1907 if (scrollbar_above_slider (ev.y)) 2043 if (scrollbar_above_slider (ev.y))
1908# ifdef RXVT_SCROLL_FULL 2044# ifdef RXVT_SCROLL_FULL
1909 scr_page (UP, TermWin.nrow - 1); 2045 scr_page (UP, nrow - 1);
1910# else 2046# else
1911 scr_page (UP, TermWin.nrow / 4); 2047 scr_page (UP, nrow / 4);
1912# endif 2048# endif
1913 else if (scrollbar_below_slider (ev.y)) 2049 else if (scrollbar_below_slider (ev.y))
1914# ifdef RXVT_SCROLL_FULL 2050# ifdef RXVT_SCROLL_FULL
1915 scr_page (DN, TermWin.nrow - 1); 2051 scr_page (DN, nrow - 1);
1916# else 2052# else
1917 scr_page (DN, TermWin.nrow / 4); 2053 scr_page (DN, nrow / 4);
1918# endif 2054# endif
1919 else 2055 else
1920 scrollBar.setMotion (); 2056 scrollBar.setMotion ();
1921 } 2057 }
1922 else 2058 else
1923 { 2059 {
1924 scr_page ((ev.button == Button1 ? DN : UP), 2060 scr_page ((ev.button == Button1 ? DN : UP),
1925 (TermWin.nrow 2061 (nrow
1926 * scrollbar_position (ev.y) 2062 * scrollbar_position (ev.y)
1927 / scrollbar_size ())); 2063 / scrollbar_size ()));
1928 } 2064 }
1929 2065
1930 break; 2066 break;
1931 } 2067 }
1932 } 2068 }
2069
1933 return; 2070 return;
1934 } 2071 }
1935#if MENUBAR
1936 /*
1937 * Menubar window processing of button press
1938 */
1939 if (isMenuBarWindow (ev.window))
1940 menubar_control (ev);
1941#endif
1942} 2072}
1943 2073
1944void 2074void
1945rxvt_term::button_release (XButtonEvent &ev) 2075rxvt_term::button_release (XButtonEvent &ev)
1946{ 2076{
… …
1952 2082
1953 if (scrollbar_isUpDn ()) 2083 if (scrollbar_isUpDn ())
1954 { 2084 {
1955 scrollBar.setIdle (); 2085 scrollBar.setIdle ();
1956 scrollbar_show (0); 2086 scrollbar_show (0);
1957#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1958 refresh_type &= ~SMOOTH_REFRESH;
1959#endif
1960 } 2087 }
1961 2088
1962#ifdef SELECTION_SCROLLING 2089#ifdef SELECTION_SCROLLING
1963 if (sel_scroll_ev.active) 2090 if (sel_scroll_ev.active)
1964 sel_scroll_ev.stop(); 2091 sel_scroll_ev.stop();
1965#endif 2092#endif
1966 2093
1967 if (ev.window == TermWin.vt) 2094 if (ev.window == vt)
1968 { 2095 {
2096 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2097 return;
2098
1969#if ISO_14755 2099#if ISO_14755
1970 // 5.4 2100 // 5.4
1971 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2101 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1972 return; 2102 return;
1973#endif 2103#endif
2104
1974 if (reportmode) 2105 if (reportmode)
1975 { 2106 {
1976 /* mouse report from vt window */ 2107 /* mouse report from vt window */
1977 /* don't report release of wheel "buttons" */ 2108 /* don't report release of wheel "buttons" */
1978 if (ev.button >= 4) 2109 if (ev.button >= 4)
… …
2008 { 2139 {
2009 case Button1: 2140 case Button1:
2010 case Button3: 2141 case Button3:
2011 selection_make (ev.time); 2142 selection_make (ev.time);
2012 break; 2143 break;
2144
2013 case Button2: 2145 case Button2:
2014 selection_request (ev.time, ev.x, ev.y); 2146 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2147 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2015 break; 2148 break;
2149
2016#ifdef MOUSE_WHEEL 2150#ifdef MOUSE_WHEEL
2017 case Button4: 2151 case Button4:
2018 case Button5: 2152 case Button5:
2019 { 2153 {
2020 int i; 2154 int i;
… …
2022 2156
2023 v = ev.button == Button4 ? UP : DN; 2157 v = ev.button == Button4 ? UP : DN;
2024 2158
2025 if (ev.state & ShiftMask) 2159 if (ev.state & ShiftMask)
2026 i = 1; 2160 i = 1;
2027 else if (options & Opt_mouseWheelScrollPage) 2161 else if (OPTION (Opt_mouseWheelScrollPage))
2028 i = TermWin.nrow - 1; 2162 i = nrow - 1;
2029 else 2163 else
2030 i = 5; 2164 i = 5;
2031 2165
2032# ifdef MOUSE_SLIP_WHEELING 2166# ifdef MOUSE_SLIP_WHEELING
2033 if (ev.state & ControlMask) 2167 if (ev.state & ControlMask)
2034 { 2168 {
2035 mouse_slip_wheel_speed += v ? -1 : 1; 2169 mouse_slip_wheel_speed += v ? -1 : 1;
2036 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2170 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2037 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2171 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2038 2172
2039 if (slip_wheel_ev.at < NOW) 2173 if (slip_wheel_ev.at < NOW)
2040 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2174 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2041 2175
2042 slip_wheel_ev.start (); 2176 slip_wheel_ev.start ();
2043 } 2177 }
2044 else 2178 else
2045 { 2179 {
2046# endif 2180# endif
2047# ifdef JUMP_MOUSE_WHEEL
2048 scr_page (v, i); 2181 scr_page (v, i);
2049 scr_refresh (SMOOTH_REFRESH);
2050 scrollbar_show (1); 2182 scrollbar_show (1);
2051# else
2052 while (i--)
2053 {
2054 scr_page (v, 1);
2055 scr_refresh (SMOOTH_REFRESH);
2056 scrollbar_show (1);
2057 }
2058# endif
2059# ifdef MOUSE_SLIP_WHEELING 2183# ifdef MOUSE_SLIP_WHEELING
2060 } 2184 }
2061#endif 2185# endif
2062 } 2186 }
2063 break; 2187 break;
2064#endif 2188#endif
2065 } 2189 }
2066 } 2190 }
2067#ifdef MENUBAR
2068 else if (isMenuBarWindow (ev.window))
2069 menubar_control (ev);
2070#endif
2071} 2191}
2072 2192
2073#ifdef TRANSPARENT 2193#ifdef TRANSPARENT
2074#if TINTING 2194#if TINTING
2075/* taken from aterm-0.4.2 */ 2195/* taken from aterm-0.4.2 */
… …
2318 XWindowAttributes wattr, wrootattr; 2438 XWindowAttributes wattr, wrootattr;
2319 dDisp; 2439 dDisp;
2320 2440
2321 pchanged = 0; 2441 pchanged = 0;
2322 2442
2323 if (!(options & Opt_transparent)) 2443 if (!OPTION (Opt_transparent))
2324 return pchanged; /* Don't try any more */ 2444 return pchanged; /* Don't try any more */
2325 2445
2326 XGetWindowAttributes (disp, display->root, &wrootattr); 2446 XGetWindowAttributes (disp, display->root, &wrootattr);
2327 rootdepth = wrootattr.depth; 2447 rootdepth = wrootattr.depth;
2328 2448
2329 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 2449 XGetWindowAttributes (disp, parent[0], &wattr);
2330 2450
2331 if (rootdepth != wattr.depth) 2451 if (rootdepth != wattr.depth)
2332 { 2452 {
2333 if (am_transparent) 2453 if (am_transparent)
2334 { 2454 {
2335 pchanged = 1; 2455 pchanged = 1;
2336 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2456 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2337 am_transparent = am_pixmap_trans = 0; 2457 am_transparent = am_pixmap_trans = 0;
2338 } 2458 }
2339 2459
2340 return pchanged; /* Don't try any more */ 2460 return pchanged; /* Don't try any more */
2341 } 2461 }
… …
2382 Window cr; 2502 Window cr;
2383 XImage *image; 2503 XImage *image;
2384 GC gc; 2504 GC gc;
2385 XGCValues gcvalue; 2505 XGCValues gcvalue;
2386 2506
2387 XTranslateCoordinates (disp, TermWin.parent[0], display->root, 2507 XTranslateCoordinates (disp, parent[0], display->root,
2388 0, 0, &sx, &sy, &cr); 2508 0, 0, &sx, &sy, &cr);
2389 nw = (unsigned int)szHint.width; 2509 nw = (unsigned int)szHint.width;
2390 nh = (unsigned int)szHint.height; 2510 nh = (unsigned int)szHint.height;
2391 nx = ny = 0; 2511 nx = ny = 0;
2392 2512
… …
2402 nh += sy; 2522 nh += sy;
2403 ny = -sy; 2523 ny = -sy;
2404 sy = 0; 2524 sy = 0;
2405 } 2525 }
2406 2526
2407 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2527 min_it (nw, (unsigned int) (wrootattr.width - sx));
2408 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2528 min_it (nh, (unsigned int) (wrootattr.height - sy));
2409 2529
2410 XSync (disp, False); 2530 XSync (disp, False);
2411 allowedxerror = -1; 2531 allowedxerror = -1;
2412 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2532 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2413 2533
… …
2418 if (image == NULL) 2538 if (image == NULL)
2419 { 2539 {
2420 if (am_transparent && am_pixmap_trans) 2540 if (am_transparent && am_pixmap_trans)
2421 { 2541 {
2422 pchanged = 1; 2542 pchanged = 1;
2423 if (TermWin.pixmap != None) 2543 if (pixmap != None)
2424 { 2544 {
2425 XFreePixmap (disp, TermWin.pixmap); 2545 XFreePixmap (disp, pixmap);
2426 TermWin.pixmap = None; 2546 pixmap = None;
2427 } 2547 }
2428 } 2548 }
2429 2549
2430 am_pixmap_trans = 0; 2550 am_pixmap_trans = 0;
2431 } 2551 }
2432 else 2552 else
2433 { 2553 {
2434 if (TermWin.pixmap != None) 2554 if (pixmap != None)
2435 XFreePixmap (disp, TermWin.pixmap); 2555 XFreePixmap (disp, pixmap);
2436 2556
2437#if TINTING 2557#if TINTING
2438 if (ISSET_PIXCOLOR (Color_tint)) 2558 if (ISSET_PIXCOLOR (Color_tint))
2439 { 2559 {
2440 unsigned short rm, gm, bm; 2560 unsigned short rm, gm, bm;
… …
2444 2564
2445 ShadeXImage (display, image, shade, rm, gm, bm); 2565 ShadeXImage (display, image, shade, rm, gm, bm);
2446 } 2566 }
2447#endif 2567#endif
2448 2568
2449 TermWin.pixmap = XCreatePixmap (disp, TermWin.vt, 2569 pixmap = XCreatePixmap (disp, vt,
2450 szHint.width, szHint.height, image->depth); 2570 szHint.width, szHint.height, image->depth);
2451 gc = XCreateGC (disp, TermWin.vt, 0UL, &gcvalue); 2571 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2452 XPutImage (disp, TermWin.pixmap, gc, image, 0, 0, 2572 XPutImage (disp, pixmap, gc, image, 0, 0,
2453 nx, ny, image->width, image->height); 2573 nx, ny, image->width, image->height);
2454 XFreeGC (disp, gc); 2574 XFreeGC (disp, gc);
2455 XDestroyImage (image); 2575 XDestroyImage (image);
2456 XSetWindowBackgroundPixmap (disp, TermWin.parent[0], TermWin.pixmap); 2576 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2457 XClearWindow (disp, TermWin.parent[0]); 2577 XClearWindow (disp, parent[0]);
2458 2578
2459 if (!am_transparent || !am_pixmap_trans) 2579 if (!am_transparent || !am_pixmap_trans)
2460 pchanged = 1; 2580 pchanged = 1;
2461 2581
2462 am_transparent = am_pixmap_trans = 1; 2582 am_transparent = am_pixmap_trans = 1;
2463 } 2583 }
2464 } 2584 }
2465 2585
2466 if (am_pixmap_trans) 2586 if (am_pixmap_trans)
2467 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2587 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2468 else 2588 else
2469 { 2589 {
2470 unsigned int n; 2590 unsigned int n;
2471 /* 2591 /*
2472 * InheritPixmap transparency 2592 * InheritPixmap transparency
2473 */ 2593 */
2474 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2594 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2475 { 2595 {
2476 oldp = TermWin.parent[i]; 2596 oldp = parent[i];
2477 XQueryTree (disp, TermWin.parent[i - 1], &root, 2597 XQueryTree (disp, parent[i - 1], &root,
2478 &TermWin.parent[i], &list, &n); 2598 &parent[i], &list, &n);
2479 XFree (list); 2599 XFree (list);
2480 2600
2481 if (TermWin.parent[i] == display->root) 2601 if (parent[i] == display->root)
2482 { 2602 {
2483 if (oldp != None) 2603 if (oldp != None)
2484 pchanged = 1; 2604 pchanged = 1;
2485 2605
2486 break; 2606 break;
2487 } 2607 }
2488 2608
2489 if (oldp != TermWin.parent[i]) 2609 if (oldp != parent[i])
2490 pchanged = 1; 2610 pchanged = 1;
2491 } 2611 }
2492 2612
2493 n = 0; 2613 n = 0;
2494 2614
2495 if (pchanged) 2615 if (pchanged)
2496 { 2616 {
2497 for (; n < (unsigned int)i; n++) 2617 for (; n < (unsigned int)i; n++)
2498 { 2618 {
2499 XGetWindowAttributes (disp, TermWin.parent[n], &wattr); 2619 XGetWindowAttributes (disp, parent[n], &wattr);
2500 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2620 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2501 { 2621 {
2502 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2622 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2503 break; 2623 break;
2504 } 2624 }
2505 } 2625 }
2506 } 2626 }
2507 2627
2508 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2628 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2509 { 2629 {
2510 XSetWindowBackground (disp, TermWin.parent[0], pix_colors_focused[Color_fg]); 2630 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2511 XSetWindowBackground (disp, TermWin.vt, pix_colors_focused[Color_bg]); 2631 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2512 am_transparent = 0; 2632 am_transparent = 0;
2513 /* XXX: also turn off Opt_transparent? */ 2633 /* XXX: also turn off Opt_transparent? */
2514 } 2634 }
2515 else 2635 else
2516 { 2636 {
2517#if WAIT_FOR_WM
2518 /* wait (an arbitrary period) for the WM to do its thing
2519 * needed for fvwm2.2.2 (and before?) */
2520 sleep (1);
2521#endif
2522 for (n = 0; n < (unsigned int)i; n++) 2637 for (n = 0; n < (unsigned int)i; n++)
2523 { 2638 {
2524 XSetWindowBackgroundPixmap (disp, TermWin.parent[n], ParentRelative); 2639 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2525 XClearWindow (disp, TermWin.parent[n]); 2640 XClearWindow (disp, parent[n]);
2526 } 2641 }
2527 2642
2528 XSetWindowBackgroundPixmap (disp, TermWin.vt, ParentRelative); 2643 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2529 am_transparent = 1; 2644 am_transparent = 1;
2530 } 2645 }
2531 2646
2532 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2647 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2533 TermWin.parent[i] = None; 2648 parent[i] = None;
2534 } 2649 }
2535 2650
2536 if (scrollBar.win) 2651 if (scrollBar.win)
2537 { 2652 {
2538 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2653 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
… …
2555 2670
2556bool 2671bool
2557rxvt_term::cmd_parse () 2672rxvt_term::cmd_parse ()
2558{ 2673{
2559 bool flag = false; 2674 bool flag = false;
2560 unicode_t ch = NOCHAR; 2675 wchar_t ch = NOCHAR;
2561 unsigned char *seq_begin; // remember start of esc-sequence here 2676 char *seq_begin; // remember start of esc-sequence here
2562 2677
2563 for (;;) 2678 for (;;)
2564 { 2679 {
2565 if (ch == NOCHAR) 2680 if (ch == NOCHAR)
2566 { 2681 {
2567 seq_begin = cmdbuf_ptr; 2682 seq_begin = cmdbuf_ptr;
2568 ch = next_char (); 2683 ch = next_char ();
2569 }
2570 2684
2571 if (ch == NOCHAR) // TODO: improve 2685 if (ch == NOCHAR)
2572 break; 2686 break;
2687 }
2573 2688
2574 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2689 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2575 { 2690 {
2576 if (!seen_input) 2691 if (!seen_input)
2577 { 2692 {
… …
2581 // some window managers resize the window early, and these programs 2696 // some window managers resize the window early, and these programs
2582 // then sometimes get the size wrong. 2697 // then sometimes get the size wrong.
2583 // unfortunately other programs are even more buggy and dislike 2698 // unfortunately other programs are even more buggy and dislike
2584 // being sent SIGWINCH, so only do it when we were in fact being 2699 // being sent SIGWINCH, so only do it when we were in fact being
2585 // resized. 2700 // resized.
2586 if (seen_resize) 2701 if (seen_resize && cmd_pid)
2587 kill (-cmd_pid, SIGWINCH); 2702 kill (-cmd_pid, SIGWINCH);
2588 } 2703 }
2589 2704
2590 /* Read a text string from the input buffer */ 2705 /* Read a text string from the input buffer */
2591 unicode_t buf[UBUFSIZ]; 2706 wchar_t buf[UBUFSIZ];
2592 bool refreshnow = false; 2707 bool refreshnow = false;
2593 int nlines = 0; 2708 int nlines = 0;
2594 unicode_t *str = buf; 2709 wchar_t *str = buf;
2710 wchar_t *eol = str + min (ncol, UBUFSIZ);
2595 2711
2596 for (;;) 2712 for (;;)
2597 { 2713 {
2598 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2714 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2599 break; 2715 break;
2600 2716
2601 *str++ = ch; 2717 *str++ = ch;
2602 2718
2603 if (ch == C0_LF) 2719 if (ch == C0_LF || str >= eol)
2604 { 2720 {
2721 if (ch == C0_LF)
2605 nlines++; 2722 nlines++;
2723
2606 refresh_count++; 2724 refresh_count++;
2607 2725
2608 if (!(options & Opt_jumpScroll) 2726 if (!OPTION (Opt_jumpScroll)
2609 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2727 || (refresh_count >= refresh_limit * (nrow - 1)))
2610 { 2728 {
2611 refreshnow = true; 2729 refreshnow = true;
2730 refresh_count = 0;
2612 ch = NOCHAR; 2731 ch = NOCHAR;
2613 break; 2732 break;
2614 } 2733 }
2615 2734
2616 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2735 // scr_add_lines only works for nlines <= nrow - 1.
2617 if (nlines >= TermWin.nrow - 1) 2736 if (nlines >= nrow - 1)
2618 { 2737 {
2738 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2739 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2619 scr_add_lines (buf, nlines, str - buf); 2740 scr_add_lines (buf, str - buf, nlines);
2741
2620 nlines = 0; 2742 nlines = 0;
2621 str = buf; 2743 str = buf;
2744 eol = str + min (ncol, UBUFSIZ);
2622 } 2745 }
2623 }
2624 2746
2625 if (str >= buf + UBUFSIZ) 2747 if (str >= eol)
2626 { 2748 {
2749 if (eol >= buf + UBUFSIZ)
2750 {
2627 ch = NOCHAR; 2751 ch = NOCHAR;
2628 break; 2752 break;
2753 }
2754 else
2755 eol = min (eol + ncol, buf + UBUFSIZ);
2756 }
2757
2629 } 2758 }
2630 2759
2631 seq_begin = cmdbuf_ptr; 2760 seq_begin = cmdbuf_ptr;
2632 ch = next_char (); 2761 ch = next_char ();
2633 } 2762 }
2634 2763
2764 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2765 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2635 scr_add_lines (buf, nlines, str - buf); 2766 scr_add_lines (buf, str - buf, nlines);
2636 2767
2637 /* 2768 /*
2638 * If there have been a lot of new lines, then update the screen 2769 * If there have been a lot of new lines, then update the screen
2639 * What the heck I'll cheat and only refresh less than every page-full. 2770 * What the heck I'll cheat and only refresh less than every page-full.
2640 * the number of pages between refreshes is refresh_limit, which 2771 * the number of pages between refreshes is refresh_limit, which
2641 * is incremented here because we must be doing flat-out scrolling. 2772 * is incremented here because we must be doing flat-out scrolling.
2642 */ 2773 */
2643 if (refreshnow) 2774 if (refreshnow)
2644 { 2775 {
2645 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2776 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2646 refresh_limit++; 2777 refresh_limit++;
2647 else 2778 else
2648 { 2779 {
2649 flag = true; 2780 flag = true;
2650 scr_refresh (refresh_type); 2781 scr_refresh ();
2782 want_refresh = 1;
2651 } 2783 }
2652 } 2784 }
2653 2785
2654 } 2786 }
2655 else 2787 else
… …
2670 } 2802 }
2671 2803
2672 return flag; 2804 return flag;
2673} 2805}
2674 2806
2675// read the next octet
2676unicode_t
2677rxvt_term::next_octet ()
2678{
2679 return cmdbuf_ptr < cmdbuf_endp
2680 ? *cmdbuf_ptr++
2681 : NOCHAR;
2682}
2683
2684// read the next character 2807// read the next character
2685unicode_t 2808wchar_t
2686rxvt_term::next_char () 2809rxvt_term::next_char () NOTHROW
2687{ 2810{
2688 while (cmdbuf_ptr < cmdbuf_endp) 2811 while (cmdbuf_ptr < cmdbuf_endp)
2689 { 2812 {
2690 // assume 7-bit to be ascii ALWAYS 2813 // assume 7-bit to be ascii ALWAYS
2691 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2814 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2692 return *cmdbuf_ptr++; 2815 return *cmdbuf_ptr++;
2693 2816
2694 wchar_t wc; 2817 wchar_t wc;
2695 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2818 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2696 2819
2697 if (len == (size_t)-2) 2820 if (len == (size_t)-2)
2698 { 2821 {
2699 // the mbstate stores incomplete sequences. didn't know this :/ 2822 // the mbstate stores incomplete sequences. didn't know this :/
2700 cmdbuf_ptr = cmdbuf_endp; 2823 cmdbuf_ptr = cmdbuf_endp;
2701 break; 2824 break;
2702 } 2825 }
2703 2826
2704 if (len == (size_t)-1) 2827 if (len == (size_t)-1)
2705 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2828 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2706 2829
2707 // assume wchar == unicode 2830 // assume wchar == unicode
2708 cmdbuf_ptr += len; 2831 cmdbuf_ptr += len;
2709 return wc & UNICODE_MASK; 2832 return wc & UNICODE_MASK;
2710 } 2833 }
2711 2834
2712 return NOCHAR; 2835 return NOCHAR;
2713} 2836}
2837
2838// read the next octet
2839uint32_t
2840rxvt_term::next_octet () NOTHROW
2841{
2842 return cmdbuf_ptr < cmdbuf_endp
2843 ? (unsigned char)*cmdbuf_ptr++
2844 : NOCHAR;
2845}
2846
2847static class out_of_input out_of_input;
2714 2848
2715/* rxvt_cmd_getc () - Return next input character */ 2849/* rxvt_cmd_getc () - Return next input character */
2716/* 2850/*
2717 * Return the next input character after first passing any keyboard input 2851 * Return the next input character after first passing any keyboard input
2718 * to the command. 2852 * to the command.
2719 */ 2853 */
2720unicode_t 2854wchar_t
2721rxvt_term::cmd_getc () 2855rxvt_term::cmd_getc () THROW ((class out_of_input))
2722{ 2856{
2723 unicode_t c = next_char (); 2857 wchar_t c = next_char ();
2724 2858
2725 if (c == NOCHAR) 2859 if (c == NOCHAR)
2726 throw out_of_input; 2860 throw out_of_input;
2727 2861
2728 return c; 2862 return c;
2729} 2863}
2730 2864
2731unicode_t 2865uint32_t
2732rxvt_term::cmd_get8 () 2866rxvt_term::cmd_get8 () THROW ((class out_of_input))
2733{ 2867{
2734 unicode_t c = next_octet (); 2868 uint32_t c = next_octet ();
2735 2869
2736 if (c == NOCHAR) 2870 if (c == NOCHAR)
2737 throw out_of_input; 2871 throw out_of_input;
2738 2872
2739 return c; 2873 return c;
… …
2839 case C0_ESC: 2973 case C0_ESC:
2840 process_escape_seq (); 2974 process_escape_seq ();
2841 break; 2975 break;
2842 case C0_ENQ: /* terminal Status */ 2976 case C0_ENQ: /* terminal Status */
2843 if (rs[Rs_answerbackstring]) 2977 if (rs[Rs_answerbackstring])
2844 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2978 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2845 (unsigned int)strlen (rs[Rs_answerbackstring]));
2846 else 2979 else
2847 tt_write ((unsigned char *)VT100_ANS, 2980 tt_write (VT100_ANS, strlen (VT100_ANS));
2848 (unsigned int)strlen (VT100_ANS));
2849 break; 2981 break;
2850 case C0_BEL: /* bell */ 2982 case C0_BEL: /* bell */
2851 scr_bell (); 2983 scr_bell ();
2852 break; 2984 break;
2853 case C0_BS: /* backspace */ 2985 case C0_BS: /* backspace */
… …
3008 break; 3140 break;
3009 3141
3010 /* 8.3.87: NEXT LINE */ 3142 /* 8.3.87: NEXT LINE */
3011 case C1_NEL: /* ESC E */ 3143 case C1_NEL: /* ESC E */
3012 { 3144 {
3013 unicode_t nlcr[] = { C0_LF, C0_CR }; 3145 wchar_t nlcr[] = { C0_LF, C0_CR };
3014 scr_add_lines (nlcr, 1, 2); 3146 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3015 } 3147 }
3016 break; 3148 break;
3017 3149
3018 /* kidnapped escape sequence: Should be 8.3.48 */ 3150 /* kidnapped escape sequence: Should be 8.3.48 */
3019 case C1_ESA: /* ESC G */ 3151 case C1_ESA: /* ESC G */
… …
3041 process_dcs_seq (); 3173 process_dcs_seq ();
3042 break; 3174 break;
3043 3175
3044 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3176 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3045 case C1_SCI: /* ESC Z */ 3177 case C1_SCI: /* ESC Z */
3046 tt_write ((const unsigned char *)ESCZ_ANSWER, 3178 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3047 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3048 break; /* steal obsolete ESC [ c */ 3179 break; /* steal obsolete ESC [ c */
3049 3180
3050 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3181 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3051 case C1_CSI: /* ESC [ */ 3182 case C1_CSI: /* ESC [ */
3052 process_csi_seq (); 3183 process_csi_seq ();
… …
3177 { 3308 {
3178 switch (priv) 3309 switch (priv)
3179 { 3310 {
3180 case '>': 3311 case '>':
3181 if (ch == CSI_DA) /* secondary device attributes */ 3312 if (ch == CSI_DA) /* secondary device attributes */
3182 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3313 {
3314 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3315 // 'U' for rxvt-unicode <= 7.2, and Mm85 (e.g. 7385 for 7.3) for later versions.
3316 //
3317 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3318 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3319 // that we do not support xterm mouse reporting (should be 95 when we do).
3320 //
3321 tt_printf ("\033[>%c%c85;94;0c", VERSION[0], VERSION[1]);
3322 }
3183 break; 3323 break;
3184 case '?': 3324 case '?':
3185 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3325 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3186 process_terminal_mode (ch, priv, nargs, arg); 3326 process_terminal_mode (ch, priv, nargs, arg);
3187 break; 3327 break;
… …
3292 3432
3293 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3433 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3294 arg[0] = -arg[0]; 3434 arg[0] = -arg[0];
3295 /* FALLTHROUGH */ 3435 /* FALLTHROUGH */
3296 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3436 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3297 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3437 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3298 break; 3438 break;
3299 3439
3300 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3440 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3301 tt_write ((const unsigned char *)VT100_ANS, 3441 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3302 (unsigned int) (sizeof (VT100_ANS) - 1));
3303 break; 3442 break;
3304 3443
3305 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3444 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3306 process_sgr_mode (nargs, arg); 3445 process_sgr_mode (nargs, arg);
3307 break; 3446 break;
… …
3314 break; 3453 break;
3315 case 6: /* CPR requested */ 3454 case 6: /* CPR requested */
3316 scr_report_position (); 3455 scr_report_position ();
3317 break; 3456 break;
3318 case 7: /* unofficial extension */ 3457 case 7: /* unofficial extension */
3319 if (options & Opt_insecure) 3458 if (OPTION (Opt_insecure))
3320 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3459 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3321 break; 3460 break;
3322 case 8: /* unofficial extension */ 3461 case 8: /* unofficial extension */
3323 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3462 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3324 break; 3463 break;
… …
3427 { 3566 {
3428 /* 3567 /*
3429 * commands 3568 * commands
3430 */ 3569 */
3431 case 1: /* deiconify window */ 3570 case 1: /* deiconify window */
3432 XMapWindow (disp, TermWin.parent[0]); 3571 XMapWindow (disp, parent[0]);
3433 break; 3572 break;
3434 case 2: /* iconify window */ 3573 case 2: /* iconify window */
3435 XIconifyWindow (disp, TermWin.parent[0], display->screen); 3574 XIconifyWindow (disp, parent[0], display->screen);
3436 break; 3575 break;
3437 case 3: /* set position (pixels) */ 3576 case 3: /* set position (pixels) */
3438 XMoveWindow (disp, TermWin.parent[0], args[1], args[2]); 3577 XMoveWindow (disp, parent[0], args[1], args[2]);
3439 break; 3578 break;
3440 case 4: /* set size (pixels) */ 3579 case 4: /* set size (pixels) */
3441 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3580 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3442 break; 3581 break;
3443 case 5: /* raise window */ 3582 case 5: /* raise window */
3444 XRaiseWindow (disp, TermWin.parent[0]); 3583 XRaiseWindow (disp, parent[0]);
3445 break; 3584 break;
3446 case 6: /* lower window */ 3585 case 6: /* lower window */
3447 XLowerWindow (disp, TermWin.parent[0]); 3586 XLowerWindow (disp, parent[0]);
3448 break; 3587 break;
3449 case 7: /* refresh window */ 3588 case 7: /* refresh window */
3450 scr_touch (true); 3589 scr_touch (true);
3451 break; 3590 break;
3452 case 8: /* set size (chars) */ 3591 case 8: /* set size (chars) */
3453 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3592 set_widthheight ((unsigned int) (args[2] * fwidth),
3454 (unsigned int) (args[1] * TermWin.fheight)); 3593 (unsigned int) (args[1] * fheight));
3455 break; 3594 break;
3456 3595
3457 //case 9: NYI, TODO, restore maximized window or maximize window 3596 //case 9: NYI, TODO, restore maximized window or maximize window
3458 default: 3597 default:
3459 if (args[0] >= 24) /* set height (chars) */ 3598 if (args[0] >= 24) /* set height (chars) */
3460 set_widthheight ((unsigned int)TermWin.width, 3599 set_widthheight ((unsigned int)width,
3461 (unsigned int) (args[1] * TermWin.fheight)); 3600 (unsigned int) (args[1] * fheight));
3462 break; 3601 break;
3463 3602
3464 3603
3465 /* 3604 /*
3466 * reports - some output format copied from XTerm 3605 * reports - some output format copied from XTerm
3467 */ 3606 */
3468 case 11: /* report window state */ 3607 case 11: /* report window state */
3469 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3608 XGetWindowAttributes (disp, parent[0], &wattr);
3470 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3609 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3471 break; 3610 break;
3472 case 13: /* report window position */ 3611 case 13: /* report window position */
3473 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3612 XGetWindowAttributes (disp, parent[0], &wattr);
3474 XTranslateCoordinates (disp, TermWin.parent[0], wattr.root, 3613 XTranslateCoordinates (disp, parent[0], wattr.root,
3475 -wattr.border_width, -wattr.border_width, 3614 -wattr.border_width, -wattr.border_width,
3476 &x, &y, &wdummy); 3615 &x, &y, &wdummy);
3477 tt_printf ("\033[3;%d;%dt", x, y); 3616 tt_printf ("\033[3;%d;%dt", x, y);
3478 break; 3617 break;
3479 case 14: /* report window size (pixels) */ 3618 case 14: /* report window size (pixels) */
3480 XGetWindowAttributes (disp, TermWin.parent[0], &wattr); 3619 XGetWindowAttributes (disp, parent[0], &wattr);
3481 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3620 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3482 break; 3621 break;
3483 case 18: /* report text area size (chars) */ 3622 case 18: /* report text area size (chars) */
3484 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3623 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3485 break; 3624 break;
3486 case 19: /* report window size (chars) */ 3625 case 19: /* report window size (chars) */
3487 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3626 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3488 break; 3627 break;
3489 case 20: /* report icon label */ 3628 case 20: /* report icon label */
3490 { 3629 {
3491 char *s; 3630 char *s;
3492 XGetIconName (disp, TermWin.parent[0], &s); 3631 XGetIconName (disp, parent[0], &s);
3493 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3632 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3494 XFree (s); 3633 XFree (s);
3495 } 3634 }
3496 break; 3635 break;
3497 case 21: /* report window title */ 3636 case 21: /* report window title */
3498 { 3637 {
3499 char *s; 3638 char *s;
3500 XFetchName (disp, TermWin.parent[0], &s); 3639 XFetchName (disp, parent[0], &s);
3501 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3640 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3502 XFree (s); 3641 XFree (s);
3503 } 3642 }
3504 break; 3643 break;
3505 } 3644 }
3506} 3645}
… …
3509/*----------------------------------------------------------------------*/ 3648/*----------------------------------------------------------------------*/
3510/* 3649/*
3511 * get input up until STRING TERMINATOR (or BEL) 3650 * get input up until STRING TERMINATOR (or BEL)
3512 * ends_how is terminator used. returned input must be free()'d 3651 * ends_how is terminator used. returned input must be free()'d
3513 */ 3652 */
3514unsigned char * 3653char *
3515rxvt_term::get_to_st (unicode_t &ends_how) 3654rxvt_term::get_to_st (unicode_t &ends_how)
3516{ 3655{
3517 unicode_t ch; 3656 unicode_t ch;
3518 bool seen_esc = false; 3657 bool seen_esc = false;
3519 unsigned int n = 0; 3658 unsigned int n = 0;
… …
3538 else if (ch < 0x20) 3677 else if (ch < 0x20)
3539 return NULL; /* other control character - exit */ 3678 return NULL; /* other control character - exit */
3540 3679
3541 seen_esc = false; 3680 seen_esc = false;
3542 3681
3543 if (n >= sizeof (string) - 1) 3682 if (n >= STRING_MAX - 1)
3544 // stop at some sane length 3683 // stop at some sane length
3545 return NULL; 3684 return NULL;
3546 3685
3547 if (ch == C0_SYN) 3686 if (ch == C0_SYN)
3548 string[n++] = cmd_get8 (); 3687 string[n++] = cmd_get8 ();
… …
3552 3691
3553 string[n++] = '\0'; 3692 string[n++] = '\0';
3554 3693
3555 ends_how = (ch == 0x5c ? C0_ESC : ch); 3694 ends_how = (ch == 0x5c ? C0_ESC : ch);
3556 3695
3557 return (unsigned char *)rxvt_wcstombs (string); 3696 return rxvt_wcstombs (string);
3558} 3697}
3559 3698
3560/*----------------------------------------------------------------------*/ 3699/*----------------------------------------------------------------------*/
3561/* 3700/*
3562 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3701 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3563 */ 3702 */
3564void 3703void
3565rxvt_term::process_dcs_seq () 3704rxvt_term::process_dcs_seq ()
3566{ 3705{
3567 unsigned char *s; 3706 char *s;
3568 unicode_t eh; 3707 unicode_t eh;
3569 3708
3570 /* 3709 /*
3571 * Not handled yet 3710 * Not handled yet
3572 */ 3711 */
… …
3591 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3730 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3592 arg = arg * 10 + (ch - '0'); 3731 arg = arg * 10 + (ch - '0');
3593 3732
3594 if (ch == ';') 3733 if (ch == ';')
3595 { 3734 {
3596 unsigned char *s = get_to_st (eh); 3735 char *s = get_to_st (eh);
3597 3736
3598 if (s) 3737 if (s)
3599 { 3738 {
3600 process_xterm_seq (arg, (char *)s, eh); 3739 process_xterm_seq (arg, s, eh);
3601 free (s); 3740 free (s);
3602 } 3741 }
3603 } 3742 }
3604} 3743}
3605 3744
3606void 3745void
3607rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3746rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3608{ 3747{
3609 if (str[0] == '?' && !str[1]) 3748 if (str[0] == '?' && !str[1])
3610 { 3749 {
3611 unsigned short r, g, b; 3750 unsigned short r, g, b;
3612 pix_colors_focused[color].get (display, r, g, b); 3751 pix_colors_focused[color].get (display, r, g, b);
… …
3616 set_window_color (color, str); 3755 set_window_color (color, str);
3617} 3756}
3618 3757
3619/* 3758/*
3620 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3759 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3621 * 0 = change iconName/title
3622 * 1 = change iconName
3623 * 2 = change title
3624 * 4 = change color
3625 * 10 = change fg color
3626 * 11 = change bg color
3627 * 12 = change text color
3628 * 13 = change mouse foreground color
3629 * 17 = change highlight character colour
3630 * 18 = change bold character color
3631 * 19 = change underlined character color
3632 * 46 = change logfile (not implemented)
3633 * 50 = change font
3634 *
3635 * rxvt extensions:
3636 * 20 = bg pixmap
3637 * 39 = change default fg color
3638 * 49 = change default bg color
3639 * 55 = dump scrollback buffer and all of screen
3640 * 701 = change locale
3641 * 702 = find font
3642 * 703 = menu
3643 */ 3760 */
3644void 3761void
3645rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3762rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3646{ 3763{
3647 int changed = 0;
3648 int color; 3764 int color;
3649 char *buf, *name; 3765 char *buf, *name;
3650 bool query = str[0] == '?' && !str[1]; 3766 bool query = str[0] == '?' && !str[1];
3651 int saveop = op; 3767 int saveop = op;
3652 dDisp; 3768 dDisp;
… …
3673 unsigned long bytes_after; 3789 unsigned long bytes_after;
3674 unsigned char *value = 0; 3790 unsigned char *value = 0;
3675 const char *str = ""; 3791 const char *str = "";
3676 3792
3677 if (prop 3793 if (prop
3678 && XGetWindowProperty (disp, TermWin.parent[0], 3794 && XGetWindowProperty (disp, parent[0],
3679 prop, 0, 1<<16, 0, AnyPropertyType, 3795 prop, 0, 1<<16, 0, AnyPropertyType,
3680 &actual_type, &actual_format, 3796 &actual_type, &actual_format,
3681 &nitems, &bytes_after, &value) == Success 3797 &nitems, &bytes_after, &value) == Success
3682 && actual_type != None 3798 && actual_type != None
3683 && actual_format == 8) 3799 && actual_format == 8)
… …
3695 { 3811 {
3696 *eq = 0; 3812 *eq = 0;
3697 set_utf8_property (display->atom (str), eq + 1); 3813 set_utf8_property (display->atom (str), eq + 1);
3698 } 3814 }
3699 else 3815 else
3700 XDeleteProperty (disp, TermWin.parent[0], 3816 XDeleteProperty (disp, parent[0],
3701 display->atom (str)); 3817 display->atom (str));
3702 } 3818 }
3703 break; 3819 break;
3704 3820
3705 case XTerm_Color: 3821 case XTerm_Color:
… …
3707 { 3823 {
3708 if ((name = strchr (buf, ';')) == NULL) 3824 if ((name = strchr (buf, ';')) == NULL)
3709 break; 3825 break;
3710 3826
3711 *name++ = '\0'; 3827 *name++ = '\0';
3712 color = atoi (buf); 3828 color = atoi (buf) + minCOLOR;
3713 3829
3714 if (color < 0 || color >= TOTAL_COLORS) 3830 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3715 break; 3831 break;
3716 3832
3717 if ((buf = strchr (name, ';')) != NULL) 3833 if ((buf = strchr (name, ';')) != NULL)
3718 *buf++ = '\0'; 3834 *buf++ = '\0';
3719 3835
3720 if (name[0] == '?' && !name[1]) 3836 if (name[0] == '?' && !name[1])
3721 { 3837 {
3722 unsigned short r, g, b; 3838 unsigned short r, g, b;
3723 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3839 pix_colors_focused[color].get (display, r, g, b);
3724 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3840 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3725 } 3841 }
3726 else 3842 else
3727 set_window_color (color + minCOLOR, name); 3843 set_window_color (color, name);
3728 } 3844 }
3729 break; 3845 break;
3730 case XTerm_Color00: 3846 case XTerm_Color00:
3731 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3847 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3732 break; 3848 break;
3733 case XTerm_Color01: 3849 case XTerm_Color01:
3734 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3850 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3735 break; 3851 break;
3736#ifndef NO_CURSORCOLOR 3852#ifndef NO_CURSORCOLOR
3737 case XTerm_Color_cursor: 3853 case XTerm_Color_cursor:
3738 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3854 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3739 break; 3855 break;
… …
3743 break; 3859 break;
3744 case XTerm_Color_pointer_bg: 3860 case XTerm_Color_pointer_bg:
3745 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3861 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3746 break; 3862 break;
3747#ifndef NO_BOLD_UNDERLINE_REVERSE 3863#ifndef NO_BOLD_UNDERLINE_REVERSE
3748 case XTerm_Color_BD:
3749 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3750 break;
3751 case XTerm_Color_IT:
3752 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3753 break;
3754 case XTerm_Color_UL:
3755 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3756 break;
3757 case XTerm_Color_RV: 3864 case XTerm_Color_RV:
3758 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3865 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3759 break; 3866 break;
3867 case Rxvt_Color_BD:
3868 case URxvt_Color_BD:
3869 process_color_seq (op, Color_BD, str, resp);
3870 break;
3871 case Rxvt_Color_UL:
3872 case URxvt_Color_UL:
3873 process_color_seq (op, Color_UL, str, resp);
3874 break;
3875 case URxvt_Color_IT:
3876 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3877 break;
3760#endif 3878#endif
3761#if TRANSPARENT && TINTING 3879#if TRANSPARENT && TINTING
3762 case XTerm_Color_tint: 3880 case URxvt_Color_tint:
3763 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3881 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3764 check_our_parents (); 3882 check_our_parents ();
3765 if (am_transparent) 3883 if (am_transparent)
3766 want_full_refresh = want_refresh = 1; 3884 want_full_refresh = want_refresh = 1;
3767 break; 3885 break;
3768#endif 3886#endif
3769 3887
3770 case XTerm_Pixmap: 3888 case Rxvt_Pixmap:
3889 {
3771 if (*str != ';') 3890 if (*str != ';')
3772 { 3891 {
3773#if XPM_BACKGROUND 3892#if XPM_BACKGROUND
3774 scale_pixmap (""); /* reset to default scaling */ 3893 scale_pixmap (""); /* reset to default scaling */
3775 set_bgPixmap (str); /* change pixmap */ 3894 set_bgPixmap (str); /* change pixmap */
3776#endif
3777 scr_touch (true); 3895 scr_touch (true);
3896#endif
3778 } 3897 }
3898
3899 int changed = 0;
3900
3779 while ((str = strchr (str, ';')) != NULL) 3901 while ((str = strchr (str, ';')) != NULL)
3780 { 3902 {
3781 str++; 3903 str++;
3782#if XPM_BACKGROUND 3904#if XPM_BACKGROUND
3783 changed += scale_pixmap (str); 3905 changed += scale_pixmap (str);
3784#endif 3906#endif
3785 } 3907 }
3786 3908
3787 if (changed) 3909 if (changed)
3788 { 3910 {
3789#ifdef XPM_BACKGROUND 3911#ifdef XPM_BACKGROUND
3790 resize_pixmap (); 3912 resize_pixmap ();
3791#endif
3792 scr_touch (true); 3913 scr_touch (true);
3914#endif
3793 } 3915 }
3916 }
3794 break; 3917 break;
3795 3918
3796 case XTerm_restoreFG: 3919 case Rxvt_restoreFG:
3797 set_window_color (Color_fg, str); 3920 set_window_color (Color_fg, str);
3798 break; 3921 break;
3799 case XTerm_restoreBG: 3922 case Rxvt_restoreBG:
3800 set_window_color (Color_bg, str); 3923 set_window_color (Color_bg, str);
3801 break; 3924 break;
3802 3925
3803 case XTerm_logfile: 3926 case XTerm_logfile:
3804 // TODO, when secure mode? 3927 // TODO, when secure mode?
3805 break; 3928 break;
3806 3929
3930#if 0
3931 case Rxvt_dumpscreen: /* no error notices */
3932 {
3933 int fd;
3934 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3935 {
3936 scr_dump (fd);
3937 close (fd);
3938 }
3939 }
3940 break;
3941#endif
3807 case XTerm_font: 3942 case XTerm_font:
3808 op = URxvt_font; 3943 op = URxvt_font;
3809 case URxvt_font: 3944 case URxvt_font:
3810#if ENABLE_STYLES 3945#if ENABLE_STYLES
3811 case URxvt_boldFont: 3946 case URxvt_boldFont:
3812 case URxvt_italicFont: 3947 case URxvt_italicFont:
3813 case URxvt_boldItalicFont: 3948 case URxvt_boldItalicFont:
3814#endif 3949#endif
3815 if (query) 3950 if (query)
3816 tt_printf ("\33]%d;%-.250s%c", saveop, 3951 tt_printf ("\33]%d;%-.250s%c", saveop,
3817 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3952 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3818 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3953 ? fontset[op - URxvt_font]->fontdesc : "",
3819 resp); 3954 resp);
3820 else 3955 else
3821 { 3956 {
3822 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3957 const char *&res = rs[Rs_font + (op - URxvt_font)];
3823 3958
… …
3826 set_fonts (); 3961 set_fonts ();
3827 } 3962 }
3828 break; 3963 break;
3829 3964
3830#if ENABLE_FRILLS 3965#if ENABLE_FRILLS
3831 case XTerm_locale: 3966 case URxvt_locale:
3832 if (query) 3967 if (query)
3833 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3968 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3834 else 3969 else
3835 { 3970 {
3836 set_locale (str); 3971 set_locale (str);
3837 pty.set_utf8_mode (enc_utf8); 3972 pty->set_utf8_mode (enc_utf8);
3838# ifdef USE_XIM
3839 im_cb (); 3973 init_xlocale ();
3840# endif
3841 } 3974 }
3842 break; 3975 break;
3843#endif
3844 3976
3845#ifdef MENUBAR 3977 case URxvt_view_up:
3846 case XTerm_Menu: 3978 case URxvt_view_down:
3847 if (options & Opt_insecure) 3979 {
3848 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3980 int lines = atoi (str);
3981
3982 if (lines)
3983 scr_page (op == URxvt_view_up ? UP : DN, lines);
3984 else
3985 scr_erase_savelines ();
3986 }
3987
3849 break; 3988 break;
3850#endif 3989#endif
3851#if 0 3990
3852 case XTerm_dumpscreen: /* no error notices */ 3991#if ENABLE_PERL
3853 { 3992 case URxvt_perl:
3854 int fd; 3993 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3855 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3994 ; // no responses yet
3856 {
3857 scr_dump (fd);
3858 close (fd);
3859 }
3860 }
3861 break; 3995 break;
3862#endif 3996#endif
3863 } 3997 }
3864} 3998}
3865/*----------------------------------------------------------------------*/ 3999/*----------------------------------------------------------------------*/
… …
3896 return state; 4030 return state;
3897} 4031}
3898 4032
3899/* we're not using priv _yet_ */ 4033/* we're not using priv _yet_ */
3900void 4034void
3901rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4035rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3902{ 4036{
3903 unsigned int i, j; 4037 unsigned int i, j;
3904 int state; 4038 int state;
3905 4039
3906 static const struct 4040 static const struct
… …
3917 { 5, PrivMode_rVideo }, 4051 { 5, PrivMode_rVideo },
3918 { 6, PrivMode_relOrigin }, 4052 { 6, PrivMode_relOrigin },
3919 { 7, PrivMode_Autowrap }, 4053 { 7, PrivMode_Autowrap },
3920 // 8, bi-directional support mode 4054 // 8, bi-directional support mode
3921 { 9, PrivMode_MouseX10 }, 4055 { 9, PrivMode_MouseX10 },
3922#ifdef menuBar_esc
3923 { menuBar_esc, PrivMode_menuBar },
3924#endif
3925 // 18, 19 printing-related 4056 // 18, 19 printing-related
3926 { 25, PrivMode_VisibleCursor }, 4057 { 25, PrivMode_VisibleCursor },
3927#ifdef scrollBar_esc 4058#ifdef scrollBar_esc
3928 { scrollBar_esc, PrivMode_scrollBar }, 4059 { scrollBar_esc, PrivMode_scrollBar },
3929#endif 4060#endif
… …
3974 } 4105 }
3975 4106
3976 /* extra handling for values with state unkept */ 4107 /* extra handling for values with state unkept */
3977 switch (arg[i]) 4108 switch (arg[i])
3978 { 4109 {
4110#if ENABLE_STYLES
4111 case 1021:
4112 set_option (Opt_intensityStyles, mode);
4113
4114 scr_touch (true);
4115 break;
4116#endif
3979 case 1048: /* alternative cursor save */ 4117 case 1048: /* alternative cursor save */
3980 case 1049: 4118 case 1049:
3981 if (options & Opt_secondaryScreen) 4119 if (OPTION (Opt_secondaryScreen))
3982 if (mode == 0) 4120 if (mode == 0)
3983 scr_cursor (RESTORE); 4121 scr_cursor (RESTORE);
3984 else if (mode == 1) 4122 else if (mode == 1)
3985 scr_cursor (SAVE); 4123 scr_cursor (SAVE);
3986 break; 4124 break;
… …
3998 */ 4136 */
3999 PrivMode (1, PrivMode_vt52); 4137 PrivMode (1, PrivMode_vt52);
4000 break; 4138 break;
4001 case 3: /* 80/132 */ 4139 case 3: /* 80/132 */
4002 if (priv_modes & PrivMode_132OK) 4140 if (priv_modes & PrivMode_132OK)
4003 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4141 set_widthheight (((state ? 132 : 80) * fwidth), height);
4004 break; 4142 break;
4005 case 4: /* smooth scrolling */ 4143 case 4: /* smooth scrolling */
4006 if (state)
4007 options &= ~Opt_jumpScroll;
4008 else
4009 options |= Opt_jumpScroll; 4144 set_option (Opt_jumpScroll, !state);
4010 break; 4145 break;
4011 case 5: /* reverse video */ 4146 case 5: /* reverse video */
4012 scr_rvideo_mode (state); 4147 scr_rvideo_mode (state);
4013 break; 4148 break;
4014 case 6: /* relative/absolute origins */ 4149 case 6: /* relative/absolute origins */
… …
4020 /* case 8: - auto repeat, can't do on a per window basis */ 4155 /* case 8: - auto repeat, can't do on a per window basis */
4021 case 9: /* X10 mouse reporting */ 4156 case 9: /* X10 mouse reporting */
4022 if (state) /* orthogonal */ 4157 if (state) /* orthogonal */
4023 priv_modes &= ~PrivMode_MouseX11; 4158 priv_modes &= ~PrivMode_MouseX11;
4024 break; 4159 break;
4025#ifdef menuBar_esc
4026 case menuBar_esc:
4027#ifdef MENUBAR
4028 map_menuBar (state);
4029#endif
4030 break;
4031#endif
4032#ifdef scrollBar_esc 4160#ifdef scrollBar_esc
4033 case scrollBar_esc: 4161 case scrollBar_esc:
4034 if (scrollbar_mapping (state)) 4162 if (scrollbar_mapping (state))
4035 { 4163 {
4036 resize_all_windows (0, 0, 0); 4164 resize_all_windows (0, 0, 0);
… …
4055#if 0 4183#if 0
4056 case 1001: 4184 case 1001:
4057 break; /* X11 mouse highlighting */ 4185 break; /* X11 mouse highlighting */
4058#endif 4186#endif
4059 case 1010: /* scroll to bottom on TTY output inhibit */ 4187 case 1010: /* scroll to bottom on TTY output inhibit */
4060 if (state)
4061 options &= ~Opt_scrollTtyOutput;
4062 else
4063 options |= Opt_scrollTtyOutput; 4188 set_option (Opt_scrollTtyOutput, !state);
4064 break; 4189 break;
4065 case 1011: /* scroll to bottom on key press */ 4190 case 1011: /* scroll to bottom on key press */
4066 if (state)
4067 options |= Opt_scrollTtyKeypress; 4191 set_option (Opt_scrollTtyKeypress, state);
4068 else
4069 options &= ~Opt_scrollTtyKeypress;
4070 break; 4192 break;
4071 case 1047: /* secondary screen w/ clearing last */ 4193 case 1047: /* secondary screen w/ clearing last */
4072 if (options & Opt_secondaryScreen) 4194 if (OPTION (Opt_secondaryScreen))
4073 if (current_screen != PRIMARY) 4195 if (current_screen != PRIMARY)
4074 scr_erase_screen (2); 4196 scr_erase_screen (2);
4075 scr_change_screen (state); 4197 scr_change_screen (state);
4076 break; 4198 break;
4077 case 1049: /* secondary screen w/ clearing first */ 4199 case 1049: /* secondary screen w/ clearing first */
4078 scr_change_screen (state); 4200 scr_change_screen (state);
4079 if (options & Opt_secondaryScreen) 4201 if (OPTION (Opt_secondaryScreen))
4080 if (current_screen != PRIMARY) 4202 if (current_screen != PRIMARY)
4081 scr_erase_screen (2); 4203 scr_erase_screen (2);
4082 break; 4204 break;
4083 default: 4205 default:
4084 break; 4206 break;
… …
4212 scr_color (Color_bg, Color_bg); 4334 scr_color (Color_bg, Color_bg);
4213 break; 4335 break;
4214 4336
4215 //case 50: // not variable spacing 4337 //case 50: // not variable spacing
4216 4338
4217#ifndef NO_BRIGHTCOLOR 4339#if ENABLE_FRILLS
4218 case 90: 4340 case 90:
4219 case 91: /* set bright fg color */ 4341 case 91: /* set bright fg color */
4220 case 92: 4342 case 92:
4221 case 93: 4343 case 93:
4222 case 94: 4344 case 94:
… …
4234 case 106: 4356 case 106:
4235 case 107: 4357 case 107:
4236 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4358 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4237 break; 4359 break;
4238#endif 4360#endif
4239
4240 } 4361 }
4241 } 4362 }
4242} 4363}
4243/*}}} */ 4364/*}}} */
4244 4365
… …
4268 */ 4389 */
4269void 4390void
4270rxvt_term::tt_printf (const char *fmt,...) 4391rxvt_term::tt_printf (const char *fmt,...)
4271{ 4392{
4272 va_list arg_ptr; 4393 va_list arg_ptr;
4273 unsigned char buf[256]; 4394 char buf[256];
4274 4395
4275 va_start (arg_ptr, fmt); 4396 va_start (arg_ptr, fmt);
4276 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4397 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4277 va_end (arg_ptr); 4398 va_end (arg_ptr);
4278 tt_write (buf, strlen (buf)); 4399 tt_write (buf, strlen (buf));
… …
4283 * or generated by us in response to a query ESC sequence. 4404 * or generated by us in response to a query ESC sequence.
4284 */ 4405 */
4285const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4406const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4286 4407
4287void 4408void
4288rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4409rxvt_term::tt_write (const char *data, unsigned int len)
4289{ 4410{
4411 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4412 return;
4413
4414 if (pty->pty < 0)
4415 return;
4416
4290 if (v_buflen == 0) 4417 if (v_buflen == 0)
4291 { 4418 {
4292 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4419 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4293 4420
4294 if ((unsigned int)written == len) 4421 if ((unsigned int)written == len)
4295 return; 4422 return;
4296 4423
4297 data += written; 4424 data += written;
4298 len -= written; 4425 len -= written;
4299 } 4426 }
4300 4427
4301 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4428 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4302 4429
4303 memcpy (v_buffer + v_buflen, data, len); 4430 memcpy (v_buffer + v_buflen, data, len);
4304 v_buflen += len; 4431 v_buflen += len;
4305 4432
4306 pty_ev.set (EVENT_READ | EVENT_WRITE); 4433 pty_ev.set (EVENT_READ | EVENT_WRITE);
4307} 4434}
4308 4435
4309void rxvt_term::pty_write () 4436void rxvt_term::pty_write ()
4310{ 4437{
4311 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4438 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4312 4439
4313 if (written > 0) 4440 if (written > 0)
4314 { 4441 {
4315 v_buflen -= written; 4442 v_buflen -= written;
4316 4443
… …
4325 } 4452 }
4326 4453
4327 memmove (v_buffer, v_buffer + written, v_buflen); 4454 memmove (v_buffer, v_buffer + written, v_buflen);
4328 } 4455 }
4329 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4456 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4330 // original code just ignores this... 4457 pty_ev.set (EVENT_READ);
4331 destroy ();
4332} 4458}
4333 4459
4334/*----------------------- end-of-file (C source) -----------------------*/ 4460/*----------------------- end-of-file (C source) -----------------------*/
4335 4461

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines