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.177 by root, Mon Dec 13 07:18:52 2004 UTC vs.
Revision 1.276 by root, Fri Jan 20 11:02:46 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
53#include <wchar.h> 56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE
60# include "keyboard.h"
61#endif
62
54#include <signal.h> 63#include <csignal>
55 64
56/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
57 66
58#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
59
60// exception thrown when the command parser runs out of input data
61class out_of_input { } out_of_input;
62 68
63#if ENABLE_FRILLS || ISO_14755 69#if ENABLE_FRILLS || ISO_14755
64 70
65#define ISO_14755_STARTED 0x80000000UL 71#define ISO_14755_STARTED 0x80000000UL
66#define ISO_14755_51 0x40000000UL // basic (section 5.1) 72#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
114 XK_Escape, 0x238b, 120 XK_Escape, 0x238b,
115 XK_Undo, 0x238c, 121 XK_Undo, 0x238c,
116 XK_Print, 0x2399, 122 XK_Print, 0x2399,
117 123
118 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,
119 XK_KP_Space, 0x2422, 132 XK_KP_Space, 0x2422,
133#endif
120 0, 134 0,
121}; 135};
122 136
123void 137void
124rxvt_term::iso14755_54 (int x, int y) 138rxvt_term::iso14755_54 (int x, int y)
125{ 139{
126 x = Pixel2Col (x); 140 x = Pixel2Col (x);
127 y = Pixel2Row (y); 141 y = Pixel2Row (y);
128 142
129 if (x < 0 || x >= TermWin.ncol 143 if (!IN_RANGE_EXC (x, 0, ncol)
130 || y < 0 || y >= TermWin.nrow) 144 || !IN_RANGE_EXC (y, 0, nrow))
131 return; 145 return;
132 146
133 for (;;) 147 for (;;)
134 { 148 {
135 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];
136 152
137 if (t != NOCHAR || !x) 153 if (t != NOCHAR || !x)
138 { 154 {
139 iso14755_51 (screen.text[y + TermWin.saveLines - TermWin.view_start][x], 155 iso14755_51 (l.t[x], l.r[x], x, y);
140 screen.rend[y + TermWin.saveLines - TermWin.view_start][x]);
141 iso14755buf = ISO_14755_54; 156 iso14755buf = ISO_14755_54;
142 break; 157 break;
143 } 158 }
144 159
145 x--; 160 x--;
146 } 161 }
147
148} 162}
149#endif
150 163
151#if ENABLE_OVERLAY
152void 164void
153rxvt_term::iso14755_51 (unicode_t ch, rend_t r) 165rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
154{ 166{
155 rxvt_fontset *fs = FONTSET (r); 167 rxvt_fontset *fs = FONTSET (r);
156 rxvt_font *f = (*fs)[fs->find_font (ch)]; 168 rxvt_font *f = (*fs)[fs->find_font (ch)];
157 wchar_t *chr, *alloc, ch2; 169 wchar_t *chr, *alloc, ch2, *fname;
158 int len; 170 int len;
159 171
172 fname = rxvt_utf8towcs (f->name);
173
160#if ENABLE_COMBINING 174# if ENABLE_COMBINING
161 if (IS_COMPOSE (ch)) 175 if (IS_COMPOSE (ch))
162 { 176 {
163 len = rxvt_composite.expand (ch, 0); 177 len = rxvt_composite.expand (ch, 0);
164 alloc = chr = new wchar_t[len]; 178 alloc = chr = new wchar_t[len];
165 rxvt_composite.expand (ch, chr); 179 rxvt_composite.expand (ch, chr);
166 } 180 }
167 else 181 else
168#endif 182# endif
169 { 183 {
170 ch2 = ch; 184 ch2 = ch;
171 185
172 alloc = 0; 186 alloc = 0;
173 chr = &ch2; 187 chr = &ch2;
174 len = 1; 188 len = 1;
175 } 189 }
176 190
177 int width = strlen (f->name); 191 char attr[80]; // plenty
178 192
179 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);
180 215
181 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 216 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
182 217
183 for (int y = 0; y < len; y++) 218 for (int y = 0; y < len; y++)
184 { 219 {
… …
187 ch = *chr++; 222 ch = *chr++;
188 223
189 sprintf (buf, "%8x", ch); 224 sprintf (buf, "%8x", ch);
190 scr_overlay_set (0, y, buf); 225 scr_overlay_set (0, y, buf);
191 scr_overlay_set (9, y, '='); 226 scr_overlay_set (9, y, '=');
192#if !UNICODE3 227# if !UNICODE3
193 if (ch >= 0x10000) 228 if (ch >= 0x10000)
194 ch = 0xfffd; 229 ch = 0xfffd;
195#endif 230# endif
196 scr_overlay_set (11, y, ch, r); 231 scr_overlay_set (11, y, ch, r);
197 scr_overlay_set (12, y, NOCHAR, r); 232 scr_overlay_set (12, y, NOCHAR, r);
198 } 233 }
199 234
235 scr_overlay_set (0, len , attr);
200 scr_overlay_set (0, len, f->name); 236 scr_overlay_set (0, len + 1, fname);
201 237
238 free (fname);
239
202#if ENABLE_COMBINING 240# if ENABLE_COMBINING
203 if (alloc) 241 if (alloc)
204 delete [] alloc; 242 delete [] alloc;
205#endif 243# endif
206} 244}
207#endif 245#endif
208 246
209void 247void
210rxvt_term::commit_iso14755 () 248rxvt_term::commit_iso14755 ()
… …
227 mb[0] = ch[0]; 265 mb[0] = ch[0];
228 len = 1; 266 len = 1;
229 } 267 }
230 268
231 if (len > 0) 269 if (len > 0)
232 tt_write ((unsigned char *)mb, len); 270 tt_write (mb, len);
233 else 271 else
234 scr_bell (); 272 scr_bell ();
235 } 273 }
236 274
237 iso14755buf = 0; 275 iso14755buf = 0;
… …
265 KeySym keysym; 303 KeySym keysym;
266#ifdef DEBUG_CMD 304#ifdef DEBUG_CMD
267 static int debug_key = 1; /* accessible by a debugger only */ 305 static int debug_key = 1; /* accessible by a debugger only */
268#endif 306#endif
269 int valid_keysym; 307 int valid_keysym;
270 unsigned char kbuf[KBUFSZ]; 308 char kbuf[KBUFSZ];
271 309
272 /* 310 /*
273 * 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
274 * escape sequence to toggle the Keypad. 312 * escape sequence to toggle the Keypad.
275 * 313 *
276 * Always permit `shift' to override the current setting 314 * Always permit `shift' to override the current setting
277 */ 315 */
278 shft = (ev.state & ShiftMask); 316 shft = ev.state & ShiftMask;
279 ctrl = (ev.state & ControlMask); 317 ctrl = ev.state & ControlMask;
280 meta = (ev.state & ModMetaMask); 318 meta = ev.state & ModMetaMask;
281 319
282 if (numlock_state || (ev.state & ModNumLockMask)) 320 if (numlock_state || (ev.state & ModNumLockMask))
283 { 321 {
284 numlock_state = (ev.state & ModNumLockMask); 322 numlock_state = (ev.state & ModNumLockMask);
285 PrivMode ((!numlock_state), PrivMode_aplKP); 323 PrivMode ((!numlock_state), PrivMode_aplKP);
… …
293 Status status_return; 331 Status status_return;
294 332
295#if 0 333#if 0
296#ifdef X_HAVE_UTF8_STRING 334#ifdef X_HAVE_UTF8_STRING
297 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
298 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 336 len = Xutf8LookupString (Input_Context, &ev, kbuf,
299 KBUFSZ, &keysym, &status_return); 337 KBUFSZ, &keysym, &status_return);
300 else 338 else
301#endif 339#endif
302#endif 340#endif
303 { 341 {
… …
305 343
306 // the XOpenIM manpage lies about hardcoding the locale 344 // the XOpenIM manpage lies about hardcoding the locale
307 // at the point of XOpenIM, so temporarily switch locales 345 // at the point of XOpenIM, so temporarily switch locales
308 if (rs[Rs_imLocale]) 346 if (rs[Rs_imLocale])
309 SET_LOCALE (rs[Rs_imLocale]); 347 SET_LOCALE (rs[Rs_imLocale]);
348
310 // assume wchar_t == unicode or better 349 // assume wchar_t == unicode or better
311 len = XwcLookupString (Input_Context, &ev, wkbuf, 350 len = XwcLookupString (Input_Context, &ev, wkbuf,
312 KBUFSZ, &keysym, &status_return); 351 KBUFSZ, &keysym, &status_return);
352
313 if (rs[Rs_imLocale]) 353 if (rs[Rs_imLocale])
314 SET_LOCALE (locale); 354 SET_LOCALE (locale);
315 355
316 if (status_return == XLookupChars 356 if (status_return == XLookupChars
317 || status_return == XLookupBoth) 357 || status_return == XLookupBoth)
… …
338 || status_return == XLookupBoth; 378 || status_return == XLookupBoth;
339 } 379 }
340 else 380 else
341#endif 381#endif
342 { 382 {
343 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 383 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
344 valid_keysym = keysym != NoSymbol; 384 valid_keysym = keysym != NoSymbol;
345 } 385 }
346 386
347 if (valid_keysym) 387 if (valid_keysym)
348 { 388 {
389#ifdef KEYSYM_RESOURCE
390 if (keyboard->dispatch (this, keysym, ev.state))
391 return;
392#endif
393
349 if (TermWin.saveLines) 394 if (saveLines)
350 { 395 {
351#ifdef UNSHIFTED_SCROLLKEYS 396#ifdef UNSHIFTED_SCROLLKEYS
352 if (!ctrl && !meta) 397 if (!ctrl && !meta)
353#else 398#else
354 if (IS_SCROLL_MOD) 399 if (IS_SCROLL_MOD)
355#endif 400#endif
356 { 401 {
357 int lnsppg; 402 int lnsppg;
358 403
359#ifdef PAGING_CONTEXT_LINES 404#ifdef PAGING_CONTEXT_LINES
360 lnsppg = TermWin.nrow - PAGING_CONTEXT_LINES; 405 lnsppg = nrow - PAGING_CONTEXT_LINES;
361#else 406#else
362 lnsppg = TermWin.nrow * 4 / 5; 407 lnsppg = nrow * 4 / 5;
363#endif 408#endif
364 if (keysym == XK_Prior) 409 if (keysym == XK_Prior)
365 { 410 {
366 scr_page (UP, lnsppg); 411 scr_page (UP, lnsppg);
367 return; 412 return;
… …
395 scr_move_to (0, 1); 440 scr_move_to (0, 1);
396 return; 441 return;
397 } 442 }
398 else if (keysym == XK_End) 443 else if (keysym == XK_End)
399 { 444 {
400 scr_move_to (1, 0); 445 scr_move_to (1, 1);
401 return; 446 return;
402 } 447 }
403 } 448 }
404#endif 449#endif
405 } 450 }
… …
416 { 461 {
417 switch (keysym) 462 switch (keysym)
418 { 463 {
419 /* normal XTerm key bindings */ 464 /* normal XTerm key bindings */
420 case XK_Insert: /* Shift+Insert = paste mouse selection */ 465 case XK_Insert: /* Shift+Insert = paste mouse selection */
421 selection_request (ev.time, 0, 0); 466 selection_request (ev.time);
422 return; 467 return;
423#if TODO 468#if TODO
424 /* rxvt extras */ 469 /* rxvt extras */
425 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 470 case XK_KP_Add: /* Shift+KP_Add = bigger font */
426 change_font (FONT_UP); 471 change_font (FONT_UP);
… …
487 } 532 }
488#endif 533#endif
489 534
490 if (keysym >= 0xFF00 && keysym <= 0xFFFF) 535 if (keysym >= 0xFF00 && keysym <= 0xFFFF)
491 { 536 {
492#ifdef KEYSYM_RESOURCE
493 if (! (shft | ctrl) && Keysym_map[keysym & 0xFF] != NULL)
494 {
495 unsigned int l;
496 const unsigned char *kbuf0;
497
498 kbuf0 = (Keysym_map[keysym & 0xFF]);
499 l = (unsigned int)*kbuf0++;
500
501 /* escape prefix */
502 if (meta
503# ifdef META8_OPTION
504 && meta_char == C0_ESC
505# endif
506 )
507 {
508 const unsigned char ch = C0_ESC;
509 tt_write (&ch, 1);
510 }
511
512 tt_write (kbuf0, l);
513 return;
514 }
515 else
516#endif
517 { 537 {
518 newlen = 1; 538 newlen = 1;
519 switch (keysym) 539 switch (keysym)
520 { 540 {
521#ifndef NO_BACKSPACE_KEY 541#ifndef NO_BACKSPACE_KEY
… …
529 else 549 else
530 strcpy (kbuf, key_backspace); 550 strcpy (kbuf, key_backspace);
531 break; 551 break;
532#endif 552#endif
533#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
534 case XK_Delete: 564 case XK_Delete:
535 strcpy (kbuf, key_delete); 565 strcpy (kbuf, key_delete);
536 break; 566 break;
537#endif 567#endif
538 case XK_Tab: 568 case XK_Tab:
… …
641#ifdef XK_KP_Begin 671#ifdef XK_KP_Begin
642 case XK_KP_Begin: 672 case XK_KP_Begin:
643 strcpy (kbuf, "\033Ou"); 673 strcpy (kbuf, "\033Ou");
644 break; 674 break;
645 675
646 case XK_KP_Insert:
647 strcpy (kbuf, "\033Op");
648 break;
649
650 case XK_KP_Delete:
651 strcpy (kbuf, "\033On");
652 break;
653#endif 676#endif
654 case XK_KP_F1: /* "\033OP" */ 677 case XK_KP_F1: /* "\033OP" */
655 case XK_KP_F2: /* "\033OQ" */ 678 case XK_KP_F2: /* "\033OQ" */
656 case XK_KP_F3: /* "\033OR" */ 679 case XK_KP_F3: /* "\033OR" */
657 case XK_KP_F4: /* "\033OS" */ 680 case XK_KP_F4: /* "\033OS" */
… …
689 break; 712 break;
690 713
691 case XK_Find: 714 case XK_Find:
692 strcpy (kbuf, "\033[1~"); 715 strcpy (kbuf, "\033[1~");
693 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
694 case XK_Insert: 728 case XK_Insert:
695 strcpy (kbuf, "\033[2~"); 729 strcpy (kbuf, "\033[2~");
696 break; 730 break;
697#ifdef DXK_Remove /* support for DEC remove like key */ 731#ifdef DXK_Remove /* support for DEC remove like key */
698 case DXK_Remove: 732 case DXK_Remove:
… …
788#undef FKEY 822#undef FKEY
789 default: 823 default:
790 newlen = 0; 824 newlen = 0;
791 break; 825 break;
792 } 826 }
827
793 if (newlen) 828 if (newlen)
794 len = strlen (kbuf); 829 len = strlen (kbuf);
795 } 830 }
796 831
797 /* 832 /*
… …
806 else if (ctrl && keysym == XK_minus) 841 else if (ctrl && keysym == XK_minus)
807 { 842 {
808 len = 1; 843 len = 1;
809 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */ 844 kbuf[0] = '\037'; /* Ctrl-Minus generates ^_ (31) */
810 } 845 }
846 else if (keysym == XK_ISO_Left_Tab)
847 {
848 strcpy (kbuf, "\033[Z");
849 len = 3;
850 }
811 else 851 else
812 { 852 {
813#ifdef META8_OPTION 853#ifdef META8_OPTION
814 /* set 8-bit on */ 854 /* set 8-bit on */
815 if (meta && (meta_char == 0x80)) 855 if (meta && (meta_char == 0x80))
816 { 856 {
817 unsigned char *ch; 857 char *ch;
818 858
819 for (ch = kbuf; ch < kbuf + len; ch++) 859 for (ch = kbuf; ch < kbuf + len; ch++)
820 *ch |= 0x80; 860 *ch |= 0x80;
821 861
822 meta = 0; 862 meta = 0;
… …
824#endif 864#endif
825 /* nil */ ; 865 /* nil */ ;
826 } 866 }
827 } 867 }
828 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
829 if (len <= 0) 872 if (len <= 0)
830 return; /* not mapped */ 873 return; /* not mapped */
831 874
832 if (options & Opt_scrollTtyKeypress) 875 if (OPTION (Opt_scrollTtyKeypress))
833 if (TermWin.view_start) 876 if (view_start)
834 { 877 {
835 TermWin.view_start = 0; 878 view_start = 0;
836 want_refresh = 1; 879 want_refresh = 1;
837 } 880 }
838 881
839 /* 882 /*
840 * these modifications only affect the static keybuffer 883 * these modifications only affect the static keybuffer
… …
855#ifdef META8_OPTION 898#ifdef META8_OPTION
856 && meta_char == C0_ESC 899 && meta_char == C0_ESC
857#endif 900#endif
858 ) 901 )
859 { 902 {
860 const unsigned char ch = C0_ESC; 903 const char ch = C0_ESC;
861 tt_write (&ch, 1); 904 tt_write (&ch, 1);
862 } 905 }
863 906
864#if defined(DEBUG_CMD) 907#if defined(DEBUG_CMD)
865 /* Display keyboard buffer contents */ 908 /* Display keyboard buffer contents */
… …
873#endif /* DEBUG_CMD */ 916#endif /* DEBUG_CMD */
874 tt_write (kbuf, (unsigned int)len); 917 tt_write (kbuf, (unsigned int)len);
875} 918}
876/*}}} */ 919/*}}} */
877 920
878#if (MENUBAR_MAX) 921#if defined (KEYSYM_RESOURCE)
879/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
880/* attempt to `write' count to the input buffer */
881unsigned int 922unsigned int
882rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 923rxvt_term::cmd_write (const char *str, unsigned int count)
883{ 924{
884 unsigned int n, s; 925 unsigned int n, s;
885 926
886 n = cmdbuf_ptr - cmdbuf_base; 927 n = cmdbuf_ptr - cmdbuf_base;
887 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 928 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
906 947
907 cmd_parse (); 948 cmd_parse ();
908 949
909 return 0; 950 return 0;
910} 951}
911#endif /* MENUBAR_MAX */ 952#endif
912 953
913void 954void
914rxvt_term::flush () 955rxvt_term::flush ()
915{ 956{
916 flush_ev.stop (); 957 flush_ev.stop ();
… …
924 } 965 }
925#endif 966#endif
926 967
927 if (want_refresh) 968 if (want_refresh)
928 { 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
929 scr_refresh (refresh_type); 1008 scr_refresh ();
930 scrollbar_show (1); 1009 scrollbar_show (1);
931#ifdef USE_XIM 1010#ifdef USE_XIM
932 IMSendSpot (); 1011 IMSendSpot ();
933#endif 1012#endif
934 } 1013 }
… …
937} 1016}
938 1017
939void 1018void
940rxvt_term::check_cb (check_watcher &w) 1019rxvt_term::check_cb (check_watcher &w)
941{ 1020{
942 SET_R (this); 1021 make_current ();
943 SET_LOCALE (locale);
944 1022
945 display->flush (); 1023 display->flush ();
946 1024
947 if (want_refresh && !flush_ev.active) 1025 if (want_refresh && !flush_ev.active)
948 flush_ev.start (NOW + 0.01); 1026 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
949} 1027}
950 1028
951void 1029void
952rxvt_term::flush_cb (time_watcher &w) 1030rxvt_term::flush_cb (time_watcher &w)
953{ 1031{
954 SET_R (this); 1032 make_current ();
955 SET_LOCALE (locale);
956 1033
957 refresh_limit = 1; 1034 refresh_limit = 1;
958 refresh_count = 0; 1035 refresh_count = 0;
959 flush (); 1036 flush ();
960} 1037}
… …
964rxvt_term::cursor_blink_cb (time_watcher &w) 1041rxvt_term::cursor_blink_cb (time_watcher &w)
965{ 1042{
966 hidden_cursor = !hidden_cursor; 1043 hidden_cursor = !hidden_cursor;
967 want_refresh = 1; 1044 want_refresh = 1;
968 1045
969 w.start (w.at + BLINK_INTERVAL); 1046 w.start (w.at + CURSOR_BLINK_INTERVAL);
970} 1047}
971#endif 1048#endif
972 1049
973#ifdef TEXT_BLINK 1050#ifdef TEXT_BLINK
974void 1051void
… …
988rxvt_term::cont_scroll_cb (time_watcher &w) 1065rxvt_term::cont_scroll_cb (time_watcher &w)
989{ 1066{
990 if ((scrollbar_isUp() || scrollbar_isDn()) && 1067 if ((scrollbar_isUp() || scrollbar_isDn()) &&
991 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1068 scr_page (scrollbar_isUp() ? UP : DN, 1))
992 { 1069 {
993 refresh_type |= SMOOTH_REFRESH;
994 want_refresh = 1; 1070 want_refresh = 1;
995 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
996 } 1072 }
997} 1073}
998#endif 1074#endif
… …
1002rxvt_term::sel_scroll_cb (time_watcher &w) 1078rxvt_term::sel_scroll_cb (time_watcher &w)
1003{ 1079{
1004 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1080 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1005 { 1081 {
1006 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1082 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1007 refresh_type |= SMOOTH_REFRESH;
1008 want_refresh = 1; 1083 want_refresh = 1;
1009 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1084 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1010 } 1085 }
1011} 1086}
1012#endif 1087#endif
… …
1017{ 1092{
1018 if (mouse_slip_wheel_speed == 0 1093 if (mouse_slip_wheel_speed == 0
1019 || 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)
1020 : scr_page (UP, mouse_slip_wheel_speed)) 1095 : scr_page (UP, mouse_slip_wheel_speed))
1021 { 1096 {
1022 refresh_type |= SMOOTH_REFRESH; 1097 if (view_start == top_row || view_start == 0)
1098 mouse_slip_wheel_speed = 0;
1099
1023 want_refresh = 1; 1100 want_refresh = 1;
1024 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1101 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1025 } 1102 }
1026} 1103}
1027#endif 1104#endif
1028 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
1029bool 1124bool
1030rxvt_term::pty_fill () 1125rxvt_term::pty_fill ()
1031{ 1126{
1032 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1127 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1033 1128
1034 if (CBUFSIZ == n) 1129 if (CBUFSIZ == n)
1035 { 1130 {
1036 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");
1037 n = 0; 1132 n = 0;
1038 } 1133 }
1039 1134
1040 memmove (cmdbuf_base, cmdbuf_ptr, n); 1135 memmove (cmdbuf_base, cmdbuf_ptr, n);
1041 cmdbuf_ptr = cmdbuf_base; 1136 cmdbuf_ptr = cmdbuf_base;
1042 cmdbuf_endp = cmdbuf_ptr + n; 1137 cmdbuf_endp = cmdbuf_ptr + n;
1043 1138
1044 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1139 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1045 1140
1046 if (n > 0) 1141 if (r > 0)
1047 { 1142 {
1048 cmdbuf_endp += n; 1143 cmdbuf_endp += r;
1049 return true; 1144 return true;
1050 } 1145 }
1051 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))
1052 destroy (); 1158 destroy ();
1159 }
1053 1160
1054 return false; 1161 return false;
1055} 1162}
1056 1163
1057void 1164void
1058rxvt_term::pty_cb (io_watcher &w, short revents) 1165rxvt_term::pty_cb (io_watcher &w, short revents)
1059{ 1166{
1060 SET_R (this); 1167 make_current ();
1061 SET_LOCALE (locale);
1062 1168
1063 if (revents & EVENT_READ) 1169 if (revents & EVENT_READ)
1064 // loop, but don't allow a single term to monopolize us 1170 // loop, but don't allow a single term to monopolize us
1065 while (pty_fill ()) 1171 while (pty_fill ())
1066 if (cmd_parse ()) 1172 if (cmd_parse ())
… …
1071} 1177}
1072 1178
1073void 1179void
1074rxvt_term::pointer_unblank () 1180rxvt_term::pointer_unblank ()
1075{ 1181{
1076 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1182 XDefineCursor (display->display, vt, TermWin_cursor);
1077 recolour_cursor (); 1183 recolour_cursor ();
1078 1184
1079#ifdef POINTER_BLANK 1185#ifdef POINTER_BLANK
1080 hidden_pointer = 0; 1186 hidden_pointer = 0;
1081 1187
1082 if (options & Opt_pointerBlank) 1188 if (OPTION (Opt_pointerBlank))
1083 pointer_ev.start (NOW + pointerBlankDelay); 1189 pointer_ev.start (NOW + pointerBlankDelay);
1084#endif 1190#endif
1085} 1191}
1086 1192
1087#ifdef POINTER_BLANK 1193#ifdef POINTER_BLANK
1088void 1194void
1089rxvt_term::pointer_blank () 1195rxvt_term::pointer_blank ()
1090{ 1196{
1091 if (! (options & Opt_pointerBlank)) 1197 if (!OPTION (Opt_pointerBlank))
1092 return; 1198 return;
1093 1199
1094 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1200 XDefineCursor (display->display, vt, display->blank_cursor);
1095 XFlush (display->display); 1201 XFlush (display->display);
1096 1202
1097 hidden_pointer = 1; 1203 hidden_pointer = 1;
1098} 1204}
1099 1205
1100void 1206void
1101rxvt_term::pointer_cb (time_watcher &w) 1207rxvt_term::pointer_cb (time_watcher &w)
1102{ 1208{
1103 SET_R (this); 1209 make_current ();
1104 SET_LOCALE (locale);
1105 1210
1106 pointer_blank (); 1211 pointer_blank ();
1107} 1212}
1108#endif 1213#endif
1109 1214
… …
1188 1293
1189/*{{{ process an X event */ 1294/*{{{ process an X event */
1190void 1295void
1191rxvt_term::x_cb (XEvent &ev) 1296rxvt_term::x_cb (XEvent &ev)
1192{ 1297{
1193 SET_R (this); 1298 make_current ();
1194 SET_LOCALE (locale);
1195 1299
1196#if defined(CURSOR_BLINK) 1300 dDisp;
1197 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
1198 {
1199 if (hidden_cursor)
1200 {
1201 hidden_cursor = 0;
1202 want_refresh = 1;
1203 }
1204 1301
1205 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1302 if (ev.xany.window == vt
1206 } 1303 && SHOULD_INVOKE (HOOK_X_EVENT)
1207#endif 1304 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1305 return;
1208 1306
1209#if defined(POINTER_BLANK) 1307 // for XQueryPointer
1210 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1211 {
1212 if (ev.type == MotionNotify
1213 || ev.type == ButtonPress
1214 || ev.type == ButtonRelease)
1215 if (hidden_pointer)
1216 pointer_unblank ();
1217
1218 if (ev.type == KeyPress && hidden_pointer == 0)
1219 pointer_blank ();
1220 }
1221#endif
1222
1223 Window unused_root, unused_child; 1308 Window unused_root, unused_child;
1224 int unused_root_x, unused_root_y; 1309 int unused_root_x, unused_root_y;
1225 unsigned int unused_mask; 1310 unsigned int unused_mask;
1226 1311
1227 switch (ev.type) 1312 switch (ev.type)
… …
1234 1319
1235 break; 1320 break;
1236 1321
1237 case KeyRelease: 1322 case KeyRelease:
1238 { 1323 {
1239#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1324#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1240 KeySym ks; 1325 KeySym keysym;
1241 1326
1242 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 :/
1243#endif 1328#endif
1244 1329
1245#if ENABLE_FRILLS || ISO_14755 1330#if ENABLE_FRILLS || ISO_14755
1246 // ISO 14755 support 1331 // ISO 14755 support
1247 if (iso14755buf) 1332 if (iso14755buf)
… …
1252# endif 1337# endif
1253# if ISO_14755 1338# if ISO_14755
1254 // iso14755 part 5.2 handling: release time 1339 // iso14755 part 5.2 handling: release time
1255 // first: controls 1340 // first: controls
1256 if ((ev.xkey.state & ControlMask) 1341 if ((ev.xkey.state & ControlMask)
1257 && ((ks >= 0x40 && ks <= 0x5f) 1342 && ((keysym >= 0x40 && keysym <= 0x5f)
1258 || (ks >= 0x61 && ks <= 0x7f))) 1343 || (keysym >= 0x61 && keysym <= 0x7f)))
1259 { 1344 {
1260 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1345 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1261 commit_iso14755 (); 1346 commit_iso14755 ();
1262 return; // case-break; 1347 goto skip_switch;
1263 } 1348 }
1264 1349
1265 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1350 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1266 if (i[0] == ks) 1351 if (i[0] == keysym)
1267 { 1352 {
1268 iso14755buf = ISO_14755_51 | i[1]; 1353 iso14755buf = ISO_14755_51 | i[1];
1269 commit_iso14755 (); 1354 commit_iso14755 ();
1270 return; // case-break; 1355 goto skip_switch;
1271 } 1356 }
1272 1357
1273 scr_bell (); 1358 scr_bell ();
1274# endif 1359# endif
1275 iso14755buf = 0; 1360 iso14755buf = 0;
… …
1294 else 1379 else
1295 iso14755buf = 0; 1380 iso14755buf = 0;
1296 } 1381 }
1297#endif 1382#endif
1298 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
1299#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1388#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1300 if (!(ev.xkey.state & ControlMask)) 1389 if (!(ev.xkey.state & ControlMask))
1301 slip_wheel_ev.stop (); 1390 slip_wheel_ev.stop ();
1302 else if (ks == XK_Control_L || ks == XK_Control_R) 1391 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1303 mouse_slip_wheel_speed = 0; 1392 mouse_slip_wheel_speed = 0;
1304#endif 1393#endif
1305 break; 1394 break;
1306 } 1395 }
1307 1396
… …
1312 case ButtonRelease: 1401 case ButtonRelease:
1313 button_release (ev.xbutton); 1402 button_release (ev.xbutton);
1314 break; 1403 break;
1315 1404
1316 case ClientMessage: 1405 case ClientMessage:
1317 if (ev.xclient.format == 32 1406 if (ev.xclient.format == 32)
1318 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW])
1319 destroy ();
1320#ifdef OFFIX_DND
1321 /* OffiX Dnd (drag 'n' drop) protocol */
1322 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1323 && (ev.xclient.data.l[0] == DndFile
1324 || ev.xclient.data.l[0] == DndDir
1325 || ev.xclient.data.l[0] == DndLink))
1326 { 1407 {
1327 /* Get Dnd data */ 1408 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1328 Atom ActualType; 1409 {
1329 int ActualFormat; 1410 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1330 unsigned char *data; 1411 {
1331 unsigned long Size, RemainingBytes; 1412 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, ev, DT_END)))
1332 1413 destroy ();
1333 XGetWindowProperty (display->display, display->root, 1414 }
1334 xa[XA_DNDSELECTION], 1415#if ENABLE_EWMH
1335 0L, 1000000L, 1416 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1336 False, AnyPropertyType, 1417 XSendEvent (disp, ev.xclient.window = display->root,
1337 &ActualType, &ActualFormat, 1418 False, SubstructureRedirectMask | SubstructureNotifyMask,
1338 &Size, &RemainingBytes,
1339 &data); 1419 &ev);
1340 set_string_property (XA_CUT_BUFFER0, data); 1420#endif
1341 XFree (data); 1421 }
1342 selection_paste (display->root, XA_CUT_BUFFER0, true); 1422#if ENABLE_XEMBED
1343 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1423 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1424 {
1425 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1426 focus_in ();
1427 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1428 focus_out ();
1429 }
1430#endif
1344 } 1431 }
1345#endif /* OFFIX_DND */
1346 break; 1432 break;
1347 1433
1348 case MappingNotify: 1434 case MappingNotify:
1349 XRefreshKeyboardMapping (&ev.xmapping); 1435 XRefreshKeyboardMapping (&ev.xmapping);
1350 break; 1436 break;
… …
1373 break; 1459 break;
1374 } 1460 }
1375 break; 1461 break;
1376 1462
1377 case FocusIn: 1463 case FocusIn:
1378 if (!TermWin.focus) 1464 focus_in ();
1465 break;
1466
1467 case FocusOut:
1468 focus_out ();
1469 break;
1470
1471 case ConfigureNotify:
1472 if (ev.xconfigure.window == parent[0])
1379 { 1473 {
1380 TermWin.focus = 1;
1381 want_refresh = 1;
1382#ifdef USE_XIM
1383 if (Input_Context != NULL)
1384 {
1385 IMSetStatusPosition ();
1386 XSetICFocus (Input_Context);
1387 }
1388#endif
1389#ifdef CURSOR_BLINK
1390 if (options & Opt_cursorBlink)
1391 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1392#endif
1393#ifdef OFF_FOCUS_FADING
1394 if (rs[Rs_fade])
1395 {
1396 pix_colors = pix_colors_focused;
1397 scr_recolour ();
1398 }
1399#endif
1400
1401 }
1402 break;
1403
1404 case FocusOut:
1405 if (TermWin.focus)
1406 {
1407 TermWin.focus = 0;
1408 want_refresh = 1;
1409
1410#if ENABLE_FRILLS || ISO_14755
1411 iso14755buf = 0;
1412#endif
1413#if ENABLE_OVERLAY
1414 scr_overlay_off ();
1415#endif
1416#ifdef USE_XIM
1417 if (Input_Context != NULL)
1418 XUnsetICFocus (Input_Context);
1419#endif
1420#ifdef CURSOR_BLINK
1421 if (options & Opt_cursorBlink)
1422 cursor_blink_ev.stop ();
1423 hidden_cursor = 0;
1424#endif
1425#ifdef OFF_FOCUS_FADING
1426 if (rs[Rs_fade])
1427 {
1428 pix_colors = pix_colors_unfocused;
1429 scr_recolour ();
1430 }
1431#endif
1432 }
1433 break;
1434
1435 case ConfigureNotify:
1436 if (ev.xconfigure.window == TermWin.parent[0])
1437 {
1438 int height, width;
1439
1440 do
1441 { /* Wrap lots of configures into one */
1442 width = ev.xconfigure.width;
1443 height = ev.xconfigure.height;
1444 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1445 }
1446 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1474 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1475 ;
1447 1476
1448 if (szHint.width != width || szHint.height != height) 1477 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1449 { 1478 {
1450 seen_resize = 1; 1479 seen_resize = 1;
1451 resize_all_windows (width, height, 1); 1480 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1452 } 1481 }
1453 1482
1483 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1484
1454#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1485#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1455 if (options & Opt_transparent) 1486 if (OPTION (Opt_transparent))
1456 check_our_parents (); 1487 check_our_parents ();
1457#endif 1488#endif
1458 } 1489 }
1459 break; 1490 break;
1460 1491
… …
1476 1507
1477 case SelectionRequest: 1508 case SelectionRequest:
1478 selection_send (ev.xselectionrequest); 1509 selection_send (ev.xselectionrequest);
1479 break; 1510 break;
1480 1511
1512 case MapNotify:
1513 mapped = 1;
1514#ifdef TEXT_BLINK
1515 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1516#endif
1517 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1518 break;
1519
1481 case UnmapNotify: 1520 case UnmapNotify:
1482 TermWin.mapped = 0; 1521 mapped = 0;
1483#ifdef TEXT_BLINK 1522#ifdef TEXT_BLINK
1484 text_blink_ev.stop (); 1523 text_blink_ev.stop ();
1485#endif 1524#endif
1486 break; 1525 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1487
1488 case MapNotify:
1489 TermWin.mapped = 1;
1490#ifdef TEXT_BLINK
1491 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1492#endif
1493 break; 1526 break;
1494 1527
1495#ifdef TRANSPARENT 1528#ifdef TRANSPARENT
1496 case ReparentNotify: 1529 case ReparentNotify:
1497 rootwin_cb (ev); 1530 rootwin_cb (ev);
1498 break; 1531 break;
1499#endif /* TRANSPARENT */ 1532#endif /* TRANSPARENT */
1500 1533
1501 case GraphicsExpose: 1534 case GraphicsExpose:
1502 case Expose: 1535 case Expose:
1503 if (ev.xany.window == TermWin.vt) 1536 if (ev.xany.window == vt)
1504 { 1537 {
1505 do 1538 do
1506 scr_expose (ev.xexpose.x, ev.xexpose.y, 1539 scr_expose (ev.xexpose.x, ev.xexpose.y,
1507 ev.xexpose.width, ev.xexpose.height, False); 1540 ev.xexpose.width, ev.xexpose.height, False);
1508 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1541 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1509 1542
1510 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1543 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1511 1544
1512 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1545 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1513 scr_expose (ev.xexpose.x, ev.xexpose.y, 1546 scr_expose (ev.xexpose.x, ev.xexpose.y,
1514 ev.xexpose.width, ev.xexpose.height, False); 1547 ev.xexpose.width, ev.xexpose.height, False);
1515 1548
1516 scr_refresh (refresh_type); 1549 want_refresh = 1;
1517 } 1550 }
1518 else 1551 else
1519 { 1552 {
1520 XEvent unused_event; 1553 XEvent unused_event;
1521 1554
1522 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1555 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1523 ; 1556 ;
1524 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1557 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1525 ; 1558 ;
1526 1559
1527 if (isScrollbarWindow (ev.xany.window)) 1560 if (isScrollbarWindow (ev.xany.window))
1528 { 1561 {
1529 scrollBar.setIdle (); 1562 scrollBar.setIdle ();
1530 scrollbar_show (0); 1563 scrollbar_show (0);
1531 } 1564 }
1532#ifdef MENUBAR
1533 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1534 menubar_expose ();
1535#endif
1536 1565
1537#ifdef TRANSPARENT 1566#ifdef TRANSPARENT
1538 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1567 if (am_transparent && ev.xany.window == parent[0])
1539 XClearWindow (display->display, ev.xany.window); 1568 XClearWindow (disp, ev.xany.window);
1540#endif 1569#endif
1541 } 1570 }
1542 break; 1571 break;
1543 1572
1544 case MotionNotify: 1573 case MotionNotify:
1545#ifdef POINTER_BLANK 1574#ifdef POINTER_BLANK
1546 if (hidden_pointer) 1575 if (hidden_pointer)
1547 pointer_unblank (); 1576 pointer_unblank ();
1548#endif 1577#endif
1549#if MENUBAR
1550 if (isMenuBarWindow (ev.xany.window))
1551 {
1552 menubar_control (ev.xbutton);
1553 break;
1554 }
1555#endif
1556 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1578 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1557 break; 1579 break;
1558 1580
1559 if (ev.xany.window == TermWin.vt) 1581 if (ev.xany.window == vt)
1560 { 1582 {
1583 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1584 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1585 ; // nop
1561 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1586 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1562 { 1587 {
1563 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1588 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1564 ; 1589 ;
1565 1590
1566 XQueryPointer (display->display, TermWin.vt, 1591 XQueryPointer (disp, vt,
1567 &unused_root, &unused_child, 1592 &unused_root, &unused_child,
1568 &unused_root_x, &unused_root_y, 1593 &unused_root_x, &unused_root_y,
1569 &ev.xbutton.x, &ev.xbutton.y, 1594 &ev.xbutton.x, &ev.xbutton.y,
1570 &ev.xbutton.state); 1595 &ev.xbutton.state);
1571#ifdef MOUSE_THRESHOLD 1596#ifdef MOUSE_THRESHOLD
… …
1583#endif 1608#endif
1584 selection_extend (ev.xbutton.x, ev.xbutton.y, 1609 selection_extend (ev.xbutton.x, ev.xbutton.y,
1585 ev.xbutton.state & Button3Mask ? 2 : 0); 1610 ev.xbutton.state & Button3Mask ? 2 : 0);
1586 1611
1587#ifdef SELECTION_SCROLLING 1612#ifdef SELECTION_SCROLLING
1588 if (ev.xbutton.y < TermWin.int_bwidth 1613 if (ev.xbutton.y < int_bwidth
1589 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1614 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1590 { 1615 {
1591 int dist; 1616 int dist;
1592 1617
1593 /* don't clobber the current delay if we are 1618 /* don't clobber the current delay if we are
1594 * already in the middle of scrolling. 1619 * already in the middle of scrolling.
… …
1602 selection_save_x = ev.xbutton.x; 1627 selection_save_x = ev.xbutton.x;
1603 selection_save_y = ev.xbutton.y; 1628 selection_save_y = ev.xbutton.y;
1604 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1629 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1605 1630
1606 /* calc number of lines to scroll */ 1631 /* calc number of lines to scroll */
1607 if (ev.xbutton.y < TermWin.int_bwidth) 1632 if (ev.xbutton.y < int_bwidth)
1608 { 1633 {
1609 scroll_selection_dir = UP; 1634 scroll_selection_dir = UP;
1610 dist = TermWin.int_bwidth - ev.xbutton.y; 1635 dist = int_bwidth - ev.xbutton.y;
1611 } 1636 }
1612 else 1637 else
1613 { 1638 {
1614 scroll_selection_dir = DN; 1639 scroll_selection_dir = DN;
1615 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1640 dist = ev.xbutton.y - (int_bwidth + height);
1616 } 1641 }
1617 1642
1618 scroll_selection_lines = Pixel2Height (dist) 1643 scroll_selection_lines = Pixel2Height (dist)
1619 / SELECTION_SCROLL_LINE_SPEEDUP 1644 / SELECTION_SCROLL_LINE_SPEEDUP
1620 + 1; 1645 + 1;
1621 MIN_IT (scroll_selection_lines, 1646 min_it (scroll_selection_lines,
1622 SELECTION_SCROLL_MAX_LINES); 1647 SELECTION_SCROLL_MAX_LINES);
1623 } 1648 }
1624 else 1649 else
1625 { 1650 {
1626 /* we are within the text window, so we 1651 /* we are within the text window, so we
… …
1635#endif 1660#endif
1636 } 1661 }
1637 } 1662 }
1638 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1663 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1639 { 1664 {
1640 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1665 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1641 MotionNotify, &ev)) 1666 MotionNotify, &ev))
1642 ; 1667 ;
1643 1668
1644 XQueryPointer (display->display, scrollBar.win, 1669 XQueryPointer (disp, scrollBar.win,
1645 &unused_root, &unused_child, 1670 &unused_root, &unused_child,
1646 &unused_root_x, &unused_root_y, 1671 &unused_root_x, &unused_root_y,
1647 &ev.xbutton.x, &ev.xbutton.y, 1672 &ev.xbutton.x, &ev.xbutton.y,
1648 &unused_mask); 1673 &unused_mask);
1649 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1674 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1650 scrollbar_size ()); 1675 scrollbar_size ());
1651 scr_refresh (refresh_type); 1676 want_refresh = 1;
1652 refresh_limit = 0; 1677 refresh_limit = 0;
1653 scrollbar_show (1); 1678 scrollbar_show (1);
1654 } 1679 }
1655 break; 1680 break;
1656 } 1681 }
1682
1683skip_switch: ;
1684
1685#if defined(CURSOR_BLINK)
1686 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1687 {
1688 if (hidden_cursor)
1689 {
1690 hidden_cursor = 0;
1691 want_refresh = 1;
1692 }
1693
1694 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1695 }
1696#endif
1697
1698#if defined(POINTER_BLANK)
1699 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1700 {
1701 if (ev.type == MotionNotify
1702 || ev.type == ButtonPress
1703 || ev.type == ButtonRelease)
1704 if (hidden_pointer)
1705 pointer_unblank ();
1706
1707 if (ev.type == KeyPress && hidden_pointer == 0)
1708 pointer_blank ();
1709 }
1710#endif
1711}
1712
1713void
1714rxvt_term::focus_in ()
1715{
1716 if (!focus)
1717 {
1718 focus = 1;
1719 want_refresh = 1;
1720
1721 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1722
1723#if USE_XIM
1724 if (Input_Context != NULL)
1725 {
1726 IMSetStatusPosition ();
1727 XSetICFocus (Input_Context);
1728 }
1729#endif
1730#if CURSOR_BLINK
1731 if (OPTION (Opt_cursorBlink))
1732 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1733#endif
1734#if OFF_FOCUS_FADING
1735 if (rs[Rs_fade])
1736 {
1737 pix_colors = pix_colors_focused;
1738 scr_recolour ();
1739 }
1740#endif
1741 }
1742}
1743
1744void
1745rxvt_term::focus_out ()
1746{
1747 if (focus)
1748 {
1749 focus = 0;
1750 want_refresh = 1;
1751
1752 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1753
1754#if ENABLE_FRILLS || ISO_14755
1755 if (iso14755buf)
1756 {
1757 iso14755buf = 0;
1758# if ENABLE_OVERLAY
1759 scr_overlay_off ();
1760# endif
1761 }
1762#endif
1763#if USE_XIM
1764 if (Input_Context != NULL)
1765 XUnsetICFocus (Input_Context);
1766#endif
1767#if CURSOR_BLINK
1768 if (OPTION (Opt_cursorBlink))
1769 cursor_blink_ev.stop ();
1770 hidden_cursor = 0;
1771#endif
1772#if OFF_FOCUS_FADING
1773 if (rs[Rs_fade])
1774 {
1775 pix_colors = pix_colors_unfocused;
1776 scr_recolour ();
1777 }
1778#endif
1779 }
1657} 1780}
1658 1781
1659#if TRANSPARENT 1782#if TRANSPARENT
1660void 1783void
1661rxvt_term::rootwin_cb (XEvent &ev) 1784rxvt_term::rootwin_cb (XEvent &ev)
1662{ 1785{
1663 SET_R (this); 1786 make_current ();
1664 SET_LOCALE (locale);
1665 1787
1666 switch (ev.type) 1788 switch (ev.type)
1667 { 1789 {
1668 case PropertyNotify: 1790 case PropertyNotify:
1669 /* 1791 /*
1670 * if user used some Esetroot compatible prog to set the root bg, 1792 * if user used some Esetroot compatible prog to set the root bg,
1671 * use the property to determine the pixmap. We use it later on. 1793 * use the property to determine the pixmap. We use it later on.
1672 */ 1794 */
1673 if (xa[XA_XROOTPMAPID] == 0)
1674 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1675
1676 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1795 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1796 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1677 return; 1797 return;
1678 1798
1679 /* FALLTHROUGH */ 1799 /* FALLTHROUGH */
1680 case ReparentNotify: 1800 case ReparentNotify:
1681 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1801 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1682 want_refresh = want_full_refresh = 1; 1802 want_refresh = want_full_refresh = 1;
1683 break; 1803 break;
1684 } 1804 }
1685} 1805}
1686#endif 1806#endif
… …
1689rxvt_term::button_press (XButtonEvent &ev) 1809rxvt_term::button_press (XButtonEvent &ev)
1690{ 1810{
1691 int reportmode = 0, clickintime; 1811 int reportmode = 0, clickintime;
1692 1812
1693 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1813 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1814
1694 if (!bypass_keystate) 1815 if (!bypass_keystate)
1695 reportmode = !! (priv_modes & PrivMode_mouse_report); 1816 reportmode = !! (priv_modes & PrivMode_mouse_report);
1696 1817
1697 /* 1818 /*
1698 * VT window processing of button press 1819 * VT window processing of button press
1699 */ 1820 */
1700 if (ev.window == TermWin.vt) 1821 if (ev.window == vt)
1701 { 1822 {
1702#if ISO_14755 1823#if ISO_14755
1703 // 5.4 1824 // 5.4
1704 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1825 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1705 { 1826 {
… …
1718#ifdef MOUSE_REPORT_DOUBLECLICK 1839#ifdef MOUSE_REPORT_DOUBLECLICK
1719 if (ev.button == MEvent.button && clickintime) 1840 if (ev.button == MEvent.button && clickintime)
1720 { 1841 {
1721 /* same button, within alloted time */ 1842 /* same button, within alloted time */
1722 MEvent.clicks++; 1843 MEvent.clicks++;
1844
1723 if (MEvent.clicks > 1) 1845 if (MEvent.clicks > 1)
1724 { 1846 {
1725 /* only report double clicks */ 1847 /* only report double clicks */
1726 MEvent.clicks = 2; 1848 MEvent.clicks = 2;
1727 mouse_report (ev); 1849 mouse_report (ev);
… …
1747 else 1869 else
1748 { 1870 {
1749 if (ev.button != MEvent.button) 1871 if (ev.button != MEvent.button)
1750 MEvent.clicks = 0; 1872 MEvent.clicks = 0;
1751 1873
1874 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1752 switch (ev.button) 1875 switch (ev.button)
1753 { 1876 {
1754 case Button1: 1877 case Button1:
1755 /* allow meta + click to select rectangular areas */ 1878 /* allow meta + click to select rectangular areas */
1756 /* should be done in screen.C */ 1879 /* should be done in screen.C */
1757#if ENABLE_FRILLS 1880#if ENABLE_FRILLS
1758 selection.rect = !! (ev.state & ModMetaMask); 1881 selection.rect = !!(ev.state & ModMetaMask);
1759#else 1882#else
1760 selection.rect = false; 1883 selection.rect = false;
1761#endif 1884#endif
1762 1885
1763 /* allow shift+left click to extend selection */ 1886 /* allow shift+left click to extend selection */
1764 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1887 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1765 { 1888 {
1766 if (MEvent.button == Button1 && clickintime) 1889 if (MEvent.button == Button1 && clickintime)
1767 selection_rotate (ev.x, ev.y); 1890 selection_rotate (ev.x, ev.y);
1768 else 1891 else
1769 selection_extend (ev.x, ev.y, 1); 1892 selection_extend (ev.x, ev.y, 1);
1770 } 1893 }
1771 else 1894 else
1772 { 1895 {
1773 if (MEvent.button == Button1 && clickintime) 1896 if (MEvent.button == Button1 && clickintime)
1774 MEvent.clicks++; 1897 MEvent.clicks++;
1775 else 1898 else
1776 MEvent.clicks = 1; 1899 MEvent.clicks = 1;
1777 1900
1778 selection_click (MEvent.clicks, ev.x, ev.y); 1901 selection_click (MEvent.clicks, ev.x, ev.y);
1779 } 1902 }
1780 1903
1781 MEvent.button = Button1; 1904 MEvent.button = Button1;
1782 break; 1905 break;
1783 1906
1784 case Button3: 1907 case Button3:
1785 if (MEvent.button == Button3 && clickintime) 1908 if (MEvent.button == Button3 && clickintime)
1786 selection_rotate (ev.x, ev.y); 1909 selection_rotate (ev.x, ev.y);
1787 else 1910 else
1788 selection_extend (ev.x, ev.y, 1); 1911 selection_extend (ev.x, ev.y, 1);
1789 1912
1790 MEvent.button = Button3; 1913 MEvent.button = Button3;
1791 break; 1914 break;
1792 } 1915 }
1793 } 1916 }
1794 1917
1795 MEvent.time = ev.time; 1918 MEvent.time = ev.time;
1796 return; 1919 return;
1797 } 1920 }
1798 1921
… …
1910 case Button3: 2033 case Button3:
1911 if (scrollBar.style != R_SB_XTERM) 2034 if (scrollBar.style != R_SB_XTERM)
1912 { 2035 {
1913 if (scrollbar_above_slider (ev.y)) 2036 if (scrollbar_above_slider (ev.y))
1914# ifdef RXVT_SCROLL_FULL 2037# ifdef RXVT_SCROLL_FULL
1915 scr_page (UP, TermWin.nrow - 1); 2038 scr_page (UP, nrow - 1);
1916# else 2039# else
1917 scr_page (UP, TermWin.nrow / 4); 2040 scr_page (UP, nrow / 4);
1918# endif 2041# endif
1919 else if (scrollbar_below_slider (ev.y)) 2042 else if (scrollbar_below_slider (ev.y))
1920# ifdef RXVT_SCROLL_FULL 2043# ifdef RXVT_SCROLL_FULL
1921 scr_page (DN, TermWin.nrow - 1); 2044 scr_page (DN, nrow - 1);
1922# else 2045# else
1923 scr_page (DN, TermWin.nrow / 4); 2046 scr_page (DN, nrow / 4);
1924# endif 2047# endif
1925 else 2048 else
1926 scrollBar.setMotion (); 2049 scrollBar.setMotion ();
1927 } 2050 }
1928 else 2051 else
1929 { 2052 {
1930 scr_page ((ev.button == Button1 ? DN : UP), 2053 scr_page ((ev.button == Button1 ? DN : UP),
1931 (TermWin.nrow 2054 (nrow
1932 * scrollbar_position (ev.y) 2055 * scrollbar_position (ev.y)
1933 / scrollbar_size ())); 2056 / scrollbar_size ()));
1934 } 2057 }
1935 2058
1936 break; 2059 break;
1937 } 2060 }
1938 } 2061 }
2062
1939 return; 2063 return;
1940 } 2064 }
1941#if MENUBAR
1942 /*
1943 * Menubar window processing of button press
1944 */
1945 if (isMenuBarWindow (ev.window))
1946 menubar_control (ev);
1947#endif
1948} 2065}
1949 2066
1950void 2067void
1951rxvt_term::button_release (XButtonEvent &ev) 2068rxvt_term::button_release (XButtonEvent &ev)
1952{ 2069{
… …
1958 2075
1959 if (scrollbar_isUpDn ()) 2076 if (scrollbar_isUpDn ())
1960 { 2077 {
1961 scrollBar.setIdle (); 2078 scrollBar.setIdle ();
1962 scrollbar_show (0); 2079 scrollbar_show (0);
1963#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1964 refresh_type &= ~SMOOTH_REFRESH;
1965#endif
1966 } 2080 }
1967 2081
1968#ifdef SELECTION_SCROLLING 2082#ifdef SELECTION_SCROLLING
1969 if (sel_scroll_ev.active) 2083 if (sel_scroll_ev.active)
1970 sel_scroll_ev.stop(); 2084 sel_scroll_ev.stop();
1971#endif 2085#endif
1972 2086
1973 if (ev.window == TermWin.vt) 2087 if (ev.window == vt)
1974 { 2088 {
1975#if ISO_14755 2089#if ISO_14755
1976 // 5.4 2090 // 5.4
1977 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2091 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1978 return; 2092 return;
… …
2008 if (priv_modes & PrivMode_mouse_report 2122 if (priv_modes & PrivMode_mouse_report
2009 && bypass_keystate 2123 && bypass_keystate
2010 && ev.button == Button1 && MEvent.clicks <= 1) 2124 && ev.button == Button1 && MEvent.clicks <= 1)
2011 selection_extend (ev.x, ev.y, 0); 2125 selection_extend (ev.x, ev.y, 0);
2012 2126
2127 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2128 return;
2129
2013 switch (ev.button) 2130 switch (ev.button)
2014 { 2131 {
2015 case Button1: 2132 case Button1:
2016 case Button3: 2133 case Button3:
2017 selection_make (ev.time); 2134 selection_make (ev.time);
2018 break; 2135 break;
2136
2019 case Button2: 2137 case Button2:
2020 selection_request (ev.time, ev.x, ev.y); 2138 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2139 selection_request (ev.time, ev.state & ShiftMask ? Sel_Clipboard : Sel_Primary);
2021 break; 2140 break;
2141
2022#ifdef MOUSE_WHEEL 2142#ifdef MOUSE_WHEEL
2023 case Button4: 2143 case Button4:
2024 case Button5: 2144 case Button5:
2025 { 2145 {
2026 int i; 2146 int i;
… …
2028 2148
2029 v = ev.button == Button4 ? UP : DN; 2149 v = ev.button == Button4 ? UP : DN;
2030 2150
2031 if (ev.state & ShiftMask) 2151 if (ev.state & ShiftMask)
2032 i = 1; 2152 i = 1;
2033 else if (options & Opt_mouseWheelScrollPage) 2153 else if (OPTION (Opt_mouseWheelScrollPage))
2034 i = TermWin.nrow - 1; 2154 i = nrow - 1;
2035 else 2155 else
2036 i = 5; 2156 i = 5;
2037 2157
2038# ifdef MOUSE_SLIP_WHEELING 2158# ifdef MOUSE_SLIP_WHEELING
2039 if (ev.state & ControlMask) 2159 if (ev.state & ControlMask)
2040 { 2160 {
2041 mouse_slip_wheel_speed += v ? -1 : 1; 2161 mouse_slip_wheel_speed += v ? -1 : 1;
2042 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2162 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2043 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2163 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2044 2164
2045 if (slip_wheel_ev.at < NOW) 2165 if (slip_wheel_ev.at < NOW)
2046 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2166 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2047 2167
2048 slip_wheel_ev.start (); 2168 slip_wheel_ev.start ();
2049 } 2169 }
2050 else 2170 else
2051 { 2171 {
2052# endif 2172# endif
2053# ifdef JUMP_MOUSE_WHEEL
2054 scr_page (v, i); 2173 scr_page (v, i);
2055 scr_refresh (SMOOTH_REFRESH);
2056 scrollbar_show (1); 2174 scrollbar_show (1);
2057# else
2058 while (i--)
2059 {
2060 scr_page (v, 1);
2061 scr_refresh (SMOOTH_REFRESH);
2062 scrollbar_show (1);
2063 }
2064# endif
2065# ifdef MOUSE_SLIP_WHEELING 2175# ifdef MOUSE_SLIP_WHEELING
2066 } 2176 }
2067#endif 2177# endif
2068 } 2178 }
2069 break; 2179 break;
2070#endif 2180#endif
2071 } 2181 }
2072 } 2182 }
2073#ifdef MENUBAR
2074 else if (isMenuBarWindow (ev.window))
2075 menubar_control (ev);
2076#endif
2077} 2183}
2078 2184
2079#ifdef TRANSPARENT 2185#ifdef TRANSPARENT
2080#if TINTING 2186#if TINTING
2081/* taken from aterm-0.4.2 */ 2187/* taken from aterm-0.4.2 */
… …
2089 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2195 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2090 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2196 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2091 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2197 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2092 int i; 2198 int i;
2093 2199
2094 Visual* visual = display->visual; 2200 Visual *visual = display->visual;
2095 2201
2096 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2202 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2097 2203
2098 /* for convenience */ 2204 /* for convenience */
2099 mask_r = visual->red_mask; 2205 mask_r = visual->red_mask;
… …
2320 Atom atype; 2426 Atom atype;
2321 unsigned char *prop = NULL; 2427 unsigned char *prop = NULL;
2322 Window root, oldp, *list; 2428 Window root, oldp, *list;
2323 Pixmap rootpixmap = None; 2429 Pixmap rootpixmap = None;
2324 XWindowAttributes wattr, wrootattr; 2430 XWindowAttributes wattr, wrootattr;
2431 dDisp;
2325 2432
2326 pchanged = 0; 2433 pchanged = 0;
2327 2434
2328 if (!(options & Opt_transparent)) 2435 if (!OPTION (Opt_transparent))
2329 return pchanged; /* Don't try any more */ 2436 return pchanged; /* Don't try any more */
2330 2437
2331 XGetWindowAttributes (display->display, display->root, &wrootattr); 2438 XGetWindowAttributes (disp, display->root, &wrootattr);
2332 rootdepth = wrootattr.depth; 2439 rootdepth = wrootattr.depth;
2333 2440
2334 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2441 XGetWindowAttributes (disp, parent[0], &wattr);
2335 2442
2336 if (rootdepth != wattr.depth) 2443 if (rootdepth != wattr.depth)
2337 { 2444 {
2338 if (am_transparent) 2445 if (am_transparent)
2339 { 2446 {
2340 pchanged = 1; 2447 pchanged = 1;
2341 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2448 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2342 am_transparent = am_pixmap_trans = 0; 2449 am_transparent = am_pixmap_trans = 0;
2343 } 2450 }
2344 2451
2345 return pchanged; /* Don't try any more */ 2452 return pchanged; /* Don't try any more */
2346 } 2453 }
2347 2454
2348 /* Get all X ops out of the queue so that our information is up-to-date. */ 2455 /* Get all X ops out of the queue so that our information is up-to-date. */
2349 XSync (display->display, False); 2456 XSync (disp, False);
2350 2457
2351 /* 2458 /*
2352 * Make the frame window set by the window manager have 2459 * Make the frame window set by the window manager have
2353 * the root background. Some window managers put multiple nested frame 2460 * the root background. Some window managers put multiple nested frame
2354 * windows for each client, so we have to take care about that. 2461 * windows for each client, so we have to take care about that.
2355 */ 2462 */
2356 i = (xa[XA_XROOTPMAPID] 2463 i = (xa[XA_XROOTPMAP_ID]
2357 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2464 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2358 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2465 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2359 &nitems, &bytes_after, &prop) == Success); 2466 &nitems, &bytes_after, &prop) == Success);
2360 2467
2361 if (!i || prop == NULL) 2468 if (!i || prop == NULL)
2362 i = (xa[XA_XSETROOTID] 2469 i = (xa[XA_ESETROOT_PMAP_ID]
2363 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2470 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2364 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2471 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2365 &nitems, &bytes_after, &prop) == Success); 2472 &nitems, &bytes_after, &prop) == Success);
2366 2473
2367 if (!i || prop == NULL 2474 if (!i || prop == NULL
2368#if TINTING 2475#if TINTING
… …
2387 Window cr; 2494 Window cr;
2388 XImage *image; 2495 XImage *image;
2389 GC gc; 2496 GC gc;
2390 XGCValues gcvalue; 2497 XGCValues gcvalue;
2391 2498
2392 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2499 XTranslateCoordinates (disp, parent[0], display->root,
2393 0, 0, &sx, &sy, &cr); 2500 0, 0, &sx, &sy, &cr);
2394 nw = (unsigned int)szHint.width; 2501 nw = (unsigned int)szHint.width;
2395 nh = (unsigned int)szHint.height; 2502 nh = (unsigned int)szHint.height;
2396 nx = ny = 0; 2503 nx = ny = 0;
2397 2504
… …
2407 nh += sy; 2514 nh += sy;
2408 ny = -sy; 2515 ny = -sy;
2409 sy = 0; 2516 sy = 0;
2410 } 2517 }
2411 2518
2412 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2519 min_it (nw, (unsigned int) (wrootattr.width - sx));
2413 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2520 min_it (nh, (unsigned int) (wrootattr.height - sy));
2414 2521
2415 XSync (display->display, False); 2522 XSync (disp, False);
2416 allowedxerror = -1; 2523 allowedxerror = -1;
2417 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2524 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2418 2525
2419 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2526 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2420 /* XXX: may need a delay here? */ 2527 /* XXX: may need a delay here? */
2421 allowedxerror = 0; 2528 allowedxerror = 0;
2422 2529
2423 if (image == NULL) 2530 if (image == NULL)
2424 { 2531 {
2425 if (am_transparent && am_pixmap_trans) 2532 if (am_transparent && am_pixmap_trans)
2426 { 2533 {
2427 pchanged = 1; 2534 pchanged = 1;
2428 if (TermWin.pixmap != None) 2535 if (pixmap != None)
2429 { 2536 {
2430 XFreePixmap (display->display, TermWin.pixmap); 2537 XFreePixmap (disp, pixmap);
2431 TermWin.pixmap = None; 2538 pixmap = None;
2432 } 2539 }
2433 } 2540 }
2434 2541
2435 am_pixmap_trans = 0; 2542 am_pixmap_trans = 0;
2436 } 2543 }
2437 else 2544 else
2438 { 2545 {
2439 if (TermWin.pixmap != None) 2546 if (pixmap != None)
2440 XFreePixmap (display->display, TermWin.pixmap); 2547 XFreePixmap (disp, pixmap);
2441 2548
2442#if TINTING 2549#if TINTING
2443 if (ISSET_PIXCOLOR (Color_tint)) 2550 if (ISSET_PIXCOLOR (Color_tint))
2444 { 2551 {
2445 unsigned short rm, gm, bm; 2552 unsigned short rm, gm, bm;
… …
2449 2556
2450 ShadeXImage (display, image, shade, rm, gm, bm); 2557 ShadeXImage (display, image, shade, rm, gm, bm);
2451 } 2558 }
2452#endif 2559#endif
2453 2560
2454 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2561 pixmap = XCreatePixmap (disp, vt,
2455 szHint.width, szHint.height, image->depth); 2562 szHint.width, szHint.height, image->depth);
2456 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2563 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2457 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2564 XPutImage (disp, pixmap, gc, image, 0, 0,
2458 nx, ny, image->width, image->height); 2565 nx, ny, image->width, image->height);
2459 XFreeGC (display->display, gc); 2566 XFreeGC (disp, gc);
2460 XDestroyImage (image); 2567 XDestroyImage (image);
2461 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2568 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2462 XClearWindow (display->display, TermWin.parent[0]); 2569 XClearWindow (disp, parent[0]);
2463 2570
2464 if (!am_transparent || !am_pixmap_trans) 2571 if (!am_transparent || !am_pixmap_trans)
2465 pchanged = 1; 2572 pchanged = 1;
2466 2573
2467 am_transparent = am_pixmap_trans = 1; 2574 am_transparent = am_pixmap_trans = 1;
2468 } 2575 }
2469 } 2576 }
2470 2577
2471 if (am_pixmap_trans) 2578 if (am_pixmap_trans)
2472 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2579 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2473 else 2580 else
2474 { 2581 {
2475 unsigned int n; 2582 unsigned int n;
2476 /* 2583 /*
2477 * InheritPixmap transparency 2584 * InheritPixmap transparency
2478 */ 2585 */
2479 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2586 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2480 { 2587 {
2481 oldp = TermWin.parent[i]; 2588 oldp = parent[i];
2482 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2589 XQueryTree (disp, parent[i - 1], &root,
2483 &TermWin.parent[i], &list, &n); 2590 &parent[i], &list, &n);
2484 XFree (list); 2591 XFree (list);
2485 2592
2486 if (TermWin.parent[i] == display->root) 2593 if (parent[i] == display->root)
2487 { 2594 {
2488 if (oldp != None) 2595 if (oldp != None)
2489 pchanged = 1; 2596 pchanged = 1;
2490 2597
2491 break; 2598 break;
2492 } 2599 }
2493 2600
2494 if (oldp != TermWin.parent[i]) 2601 if (oldp != parent[i])
2495 pchanged = 1; 2602 pchanged = 1;
2496 } 2603 }
2497 2604
2498 n = 0; 2605 n = 0;
2499 2606
2500 if (pchanged) 2607 if (pchanged)
2501 { 2608 {
2502 for (; n < (unsigned int)i; n++) 2609 for (; n < (unsigned int)i; n++)
2503 { 2610 {
2504 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2611 XGetWindowAttributes (disp, parent[n], &wattr);
2505 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2612 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2506 { 2613 {
2507 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2614 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2508 break; 2615 break;
2509 } 2616 }
2510 } 2617 }
2511 } 2618 }
2512 2619
2513 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2620 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2514 { 2621 {
2515 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]); 2622 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2516 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2623 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2517 am_transparent = 0; 2624 am_transparent = 0;
2518 /* XXX: also turn off Opt_transparent? */ 2625 /* XXX: also turn off Opt_transparent? */
2519 } 2626 }
2520 else 2627 else
2521 { 2628 {
… …
2524 * needed for fvwm2.2.2 (and before?) */ 2631 * needed for fvwm2.2.2 (and before?) */
2525 sleep (1); 2632 sleep (1);
2526#endif 2633#endif
2527 for (n = 0; n < (unsigned int)i; n++) 2634 for (n = 0; n < (unsigned int)i; n++)
2528 { 2635 {
2529 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2636 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2530 XClearWindow (display->display, TermWin.parent[n]); 2637 XClearWindow (disp, parent[n]);
2531 } 2638 }
2532 2639
2533 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2640 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2534 am_transparent = 1; 2641 am_transparent = 1;
2535 } 2642 }
2536 2643
2537 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2644 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2538 TermWin.parent[i] = None; 2645 parent[i] = None;
2539 } 2646 }
2540 2647
2541 if (scrollBar.win) 2648 if (scrollBar.win)
2542 { 2649 {
2543 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2650 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2544 scrollBar.setIdle (); 2651 scrollBar.setIdle ();
2545 scrollbar_show (0); 2652 scrollbar_show (0);
2546 } 2653 }
2547 2654
2548 if (am_transparent) 2655 if (am_transparent)
… …
2560 2667
2561bool 2668bool
2562rxvt_term::cmd_parse () 2669rxvt_term::cmd_parse ()
2563{ 2670{
2564 bool flag = false; 2671 bool flag = false;
2565 unicode_t ch = NOCHAR; 2672 wchar_t ch = NOCHAR;
2566 unsigned char *seq_begin; // remember start of esc-sequence here 2673 char *seq_begin; // remember start of esc-sequence here
2567 2674
2568 for (;;) 2675 for (;;)
2569 { 2676 {
2570 if (ch == NOCHAR) 2677 if (ch == NOCHAR)
2571 { 2678 {
2572 seq_begin = cmdbuf_ptr; 2679 seq_begin = cmdbuf_ptr;
2573 ch = next_char (); 2680 ch = next_char ();
2574 }
2575 2681
2576 if (ch == NOCHAR) // TODO: improve 2682 if (ch == NOCHAR)
2577 break; 2683 break;
2684 }
2578 2685
2579 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2686 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2580 { 2687 {
2581 if (!seen_input) 2688 if (!seen_input)
2582 { 2689 {
… …
2586 // some window managers resize the window early, and these programs 2693 // some window managers resize the window early, and these programs
2587 // then sometimes get the size wrong. 2694 // then sometimes get the size wrong.
2588 // unfortunately other programs are even more buggy and dislike 2695 // unfortunately other programs are even more buggy and dislike
2589 // being sent SIGWINCH, so only do it when we were in fact being 2696 // being sent SIGWINCH, so only do it when we were in fact being
2590 // resized. 2697 // resized.
2591 if (seen_resize) 2698 if (seen_resize && cmd_pid)
2592 kill (-cmd_pid, SIGWINCH); 2699 kill (-cmd_pid, SIGWINCH);
2593 } 2700 }
2594 2701
2595 /* Read a text string from the input buffer */ 2702 /* Read a text string from the input buffer */
2596 unicode_t buf[UBUFSIZ]; 2703 wchar_t buf[UBUFSIZ];
2597 bool refreshnow = false; 2704 bool refreshnow = false;
2598 int nlines = 0; 2705 int nlines = 0;
2599 unicode_t *str = buf; 2706 wchar_t *str = buf;
2707 wchar_t *eol = str + min (ncol, UBUFSIZ);
2600 2708
2601 for (;;) 2709 for (;;)
2602 { 2710 {
2603 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2711 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2604 break; 2712 break;
2605 2713
2606 *str++ = ch; 2714 *str++ = ch;
2607 2715
2608 if (ch == C0_LF) 2716 if (ch == C0_LF || str >= eol)
2609 { 2717 {
2718 if (ch == C0_LF)
2610 nlines++; 2719 nlines++;
2720
2611 refresh_count++; 2721 refresh_count++;
2612 2722
2613 if (!(options & Opt_jumpScroll) 2723 if (!OPTION (Opt_jumpScroll)
2614 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2724 || (refresh_count >= refresh_limit * (nrow - 1)))
2615 { 2725 {
2616 refreshnow = true; 2726 refreshnow = true;
2727 refresh_count = 0;
2617 ch = NOCHAR; 2728 ch = NOCHAR;
2618 break; 2729 break;
2619 } 2730 }
2620 2731
2621 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2732 // scr_add_lines only works for nlines <= nrow - 1.
2622 if (nlines >= TermWin.nrow - 1) 2733 if (nlines >= nrow - 1)
2623 { 2734 {
2735 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2736 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2624 scr_add_lines (buf, nlines, str - buf); 2737 scr_add_lines (buf, str - buf, nlines);
2738
2625 nlines = 0; 2739 nlines = 0;
2626 str = buf; 2740 str = buf;
2741 eol = str + min (ncol, UBUFSIZ);
2627 } 2742 }
2628 }
2629 2743
2630 if (str >= buf + UBUFSIZ) 2744 if (str >= eol)
2631 { 2745 {
2746 if (eol >= buf + UBUFSIZ)
2747 {
2632 ch = NOCHAR; 2748 ch = NOCHAR;
2633 break; 2749 break;
2750 }
2751 else
2752 eol = min (eol + ncol, buf + UBUFSIZ);
2753 }
2754
2634 } 2755 }
2635 2756
2636 seq_begin = cmdbuf_ptr; 2757 seq_begin = cmdbuf_ptr;
2637 ch = next_char (); 2758 ch = next_char ();
2638 } 2759 }
2639 2760
2761 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2762 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2640 scr_add_lines (buf, nlines, str - buf); 2763 scr_add_lines (buf, str - buf, nlines);
2641 2764
2642 /* 2765 /*
2643 * If there have been a lot of new lines, then update the screen 2766 * If there have been a lot of new lines, then update the screen
2644 * What the heck I'll cheat and only refresh less than every page-full. 2767 * What the heck I'll cheat and only refresh less than every page-full.
2645 * the number of pages between refreshes is refresh_limit, which 2768 * the number of pages between refreshes is refresh_limit, which
2646 * is incremented here because we must be doing flat-out scrolling. 2769 * is incremented here because we must be doing flat-out scrolling.
2647 */ 2770 */
2648 if (refreshnow) 2771 if (refreshnow)
2649 { 2772 {
2650 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2773 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2651 refresh_limit++; 2774 refresh_limit++;
2652 else 2775 else
2653 { 2776 {
2654 flag = true; 2777 flag = true;
2655 scr_refresh (refresh_type); 2778 scr_refresh ();
2779 want_refresh = 1;
2656 } 2780 }
2657 } 2781 }
2658 2782
2659 } 2783 }
2660 else 2784 else
… …
2675 } 2799 }
2676 2800
2677 return flag; 2801 return flag;
2678} 2802}
2679 2803
2680// read the next octet
2681unicode_t
2682rxvt_term::next_octet ()
2683{
2684 return cmdbuf_ptr < cmdbuf_endp
2685 ? *cmdbuf_ptr++
2686 : NOCHAR;
2687}
2688
2689// read the next character 2804// read the next character
2690unicode_t 2805wchar_t
2691rxvt_term::next_char () 2806rxvt_term::next_char () NOTHROW
2692{ 2807{
2693 while (cmdbuf_ptr < cmdbuf_endp) 2808 while (cmdbuf_ptr < cmdbuf_endp)
2694 { 2809 {
2695 // assume 7-bit to be ascii ALWAYS 2810 // assume 7-bit to be ascii ALWAYS
2696 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2811 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2697 return *cmdbuf_ptr++; 2812 return *cmdbuf_ptr++;
2698 2813
2699 wchar_t wc; 2814 wchar_t wc;
2700 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2815 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2701 2816
2702 if (len == (size_t)-2) 2817 if (len == (size_t)-2)
2703 { 2818 {
2704 // the mbstate stores incomplete sequences. didn't know this :/ 2819 // the mbstate stores incomplete sequences. didn't know this :/
2705 cmdbuf_ptr = cmdbuf_endp; 2820 cmdbuf_ptr = cmdbuf_endp;
2706 break; 2821 break;
2707 } 2822 }
2708 2823
2709 if (len == (size_t)-1) 2824 if (len == (size_t)-1)
2710 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2825 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2711 2826
2712 // assume wchar == unicode 2827 // assume wchar == unicode
2713 cmdbuf_ptr += len; 2828 cmdbuf_ptr += len;
2714 return wc; 2829 return wc & UNICODE_MASK;
2715 } 2830 }
2716 2831
2717 return NOCHAR; 2832 return NOCHAR;
2718} 2833}
2834
2835// read the next octet
2836uint32_t
2837rxvt_term::next_octet () NOTHROW
2838{
2839 return cmdbuf_ptr < cmdbuf_endp
2840 ? (unsigned char)*cmdbuf_ptr++
2841 : NOCHAR;
2842}
2843
2844static class out_of_input out_of_input;
2719 2845
2720/* rxvt_cmd_getc () - Return next input character */ 2846/* rxvt_cmd_getc () - Return next input character */
2721/* 2847/*
2722 * Return the next input character after first passing any keyboard input 2848 * Return the next input character after first passing any keyboard input
2723 * to the command. 2849 * to the command.
2724 */ 2850 */
2725unicode_t 2851wchar_t
2726rxvt_term::cmd_getc () 2852rxvt_term::cmd_getc () THROW ((class out_of_input))
2727{ 2853{
2728 unicode_t c = next_char (); 2854 wchar_t c = next_char ();
2729 2855
2730 if (c == NOCHAR) 2856 if (c == NOCHAR)
2731 throw out_of_input; 2857 throw out_of_input;
2732 2858
2733 return c; 2859 return c;
2734} 2860}
2735 2861
2736unicode_t 2862uint32_t
2737rxvt_term::cmd_get8 () 2863rxvt_term::cmd_get8 () THROW ((class out_of_input))
2738{ 2864{
2739 unicode_t c = next_octet (); 2865 uint32_t c = next_octet ();
2740 2866
2741 if (c == NOCHAR) 2867 if (c == NOCHAR)
2742 throw out_of_input; 2868 throw out_of_input;
2743 2869
2744 return c; 2870 return c;
… …
2844 case C0_ESC: 2970 case C0_ESC:
2845 process_escape_seq (); 2971 process_escape_seq ();
2846 break; 2972 break;
2847 case C0_ENQ: /* terminal Status */ 2973 case C0_ENQ: /* terminal Status */
2848 if (rs[Rs_answerbackstring]) 2974 if (rs[Rs_answerbackstring])
2849 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2975 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2850 (unsigned int)strlen (rs[Rs_answerbackstring]));
2851 else 2976 else
2852 tt_write ((unsigned char *)VT100_ANS, 2977 tt_write (VT100_ANS, strlen (VT100_ANS));
2853 (unsigned int)strlen (VT100_ANS));
2854 break; 2978 break;
2855 case C0_BEL: /* bell */ 2979 case C0_BEL: /* bell */
2856 scr_bell (); 2980 scr_bell ();
2857 break; 2981 break;
2858 case C0_BS: /* backspace */ 2982 case C0_BS: /* backspace */
… …
3013 break; 3137 break;
3014 3138
3015 /* 8.3.87: NEXT LINE */ 3139 /* 8.3.87: NEXT LINE */
3016 case C1_NEL: /* ESC E */ 3140 case C1_NEL: /* ESC E */
3017 { 3141 {
3018 unicode_t nlcr[] = { C0_LF, C0_CR }; 3142 wchar_t nlcr[] = { C0_LF, C0_CR };
3019 scr_add_lines (nlcr, 1, 2); 3143 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3020 } 3144 }
3021 break; 3145 break;
3022 3146
3023 /* kidnapped escape sequence: Should be 8.3.48 */ 3147 /* kidnapped escape sequence: Should be 8.3.48 */
3024 case C1_ESA: /* ESC G */ 3148 case C1_ESA: /* ESC G */
… …
3046 process_dcs_seq (); 3170 process_dcs_seq ();
3047 break; 3171 break;
3048 3172
3049 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3173 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3050 case C1_SCI: /* ESC Z */ 3174 case C1_SCI: /* ESC Z */
3051 tt_write ((const unsigned char *)ESCZ_ANSWER, 3175 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3052 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3053 break; /* steal obsolete ESC [ c */ 3176 break; /* steal obsolete ESC [ c */
3054 3177
3055 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3178 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3056 case C1_CSI: /* ESC [ */ 3179 case C1_CSI: /* ESC [ */
3057 process_csi_seq (); 3180 process_csi_seq ();
… …
3182 { 3305 {
3183 switch (priv) 3306 switch (priv)
3184 { 3307 {
3185 case '>': 3308 case '>':
3186 if (ch == CSI_DA) /* secondary device attributes */ 3309 if (ch == CSI_DA) /* secondary device attributes */
3187 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3310 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3188 break; 3311 break;
3189 case '?': 3312 case '?':
3190 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3313 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3191 process_terminal_mode (ch, priv, nargs, arg); 3314 process_terminal_mode (ch, priv, nargs, arg);
3192 break; 3315 break;
… …
3297 3420
3298 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3421 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3299 arg[0] = -arg[0]; 3422 arg[0] = -arg[0];
3300 /* FALLTHROUGH */ 3423 /* FALLTHROUGH */
3301 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3424 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3302 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3425 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3303 break; 3426 break;
3304 3427
3305 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3428 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3306 tt_write ((const unsigned char *)VT100_ANS, 3429 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3307 (unsigned int) (sizeof (VT100_ANS) - 1));
3308 break; 3430 break;
3309 3431
3310 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3432 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3311 process_sgr_mode (nargs, arg); 3433 process_sgr_mode (nargs, arg);
3312 break; 3434 break;
… …
3319 break; 3441 break;
3320 case 6: /* CPR requested */ 3442 case 6: /* CPR requested */
3321 scr_report_position (); 3443 scr_report_position ();
3322 break; 3444 break;
3323 case 7: /* unofficial extension */ 3445 case 7: /* unofficial extension */
3324 if (options & Opt_insecure) 3446 if (OPTION (Opt_insecure))
3325 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3447 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3326 break; 3448 break;
3327 case 8: /* unofficial extension */ 3449 case 8: /* unofficial extension */
3328 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3450 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3329 break; 3451 break;
… …
3421rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3543rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3422{ 3544{
3423 int x, y; 3545 int x, y;
3424 XWindowAttributes wattr; 3546 XWindowAttributes wattr;
3425 Window wdummy; 3547 Window wdummy;
3548 dDisp;
3426 3549
3427 if (nargs == 0) 3550 if (nargs == 0)
3428 return; 3551 return;
3429 3552
3430 switch (args[0]) 3553 switch (args[0])
3431 { 3554 {
3432 /* 3555 /*
3433 * commands 3556 * commands
3434 */ 3557 */
3435 case 1: /* deiconify window */ 3558 case 1: /* deiconify window */
3436 XMapWindow (display->display, TermWin.parent[0]); 3559 XMapWindow (disp, parent[0]);
3437 break; 3560 break;
3438 case 2: /* iconify window */ 3561 case 2: /* iconify window */
3439 XIconifyWindow (display->display, TermWin.parent[0], 3562 XIconifyWindow (disp, parent[0], display->screen);
3440 DefaultScreen (display->display));
3441 break; 3563 break;
3442 case 3: /* set position (pixels) */ 3564 case 3: /* set position (pixels) */
3443 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3565 XMoveWindow (disp, parent[0], args[1], args[2]);
3444 break; 3566 break;
3445 case 4: /* set size (pixels) */ 3567 case 4: /* set size (pixels) */
3446 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3568 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3447 break; 3569 break;
3448 case 5: /* raise window */ 3570 case 5: /* raise window */
3449 XRaiseWindow (display->display, TermWin.parent[0]); 3571 XRaiseWindow (disp, parent[0]);
3450 break; 3572 break;
3451 case 6: /* lower window */ 3573 case 6: /* lower window */
3452 XLowerWindow (display->display, TermWin.parent[0]); 3574 XLowerWindow (disp, parent[0]);
3453 break; 3575 break;
3454 case 7: /* refresh window */ 3576 case 7: /* refresh window */
3455 scr_touch (true); 3577 scr_touch (true);
3456 break; 3578 break;
3457 case 8: /* set size (chars) */ 3579 case 8: /* set size (chars) */
3458 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3580 set_widthheight ((unsigned int) (args[2] * fwidth),
3459 (unsigned int) (args[1] * TermWin.fheight)); 3581 (unsigned int) (args[1] * fheight));
3460 break; 3582 break;
3461 3583
3462 //case 9: NYI, TODO, restore maximized window or maximize window 3584 //case 9: NYI, TODO, restore maximized window or maximize window
3463 default: 3585 default:
3464 if (args[0] >= 24) /* set height (chars) */ 3586 if (args[0] >= 24) /* set height (chars) */
3465 set_widthheight ((unsigned int)TermWin.width, 3587 set_widthheight ((unsigned int)width,
3466 (unsigned int) (args[1] * TermWin.fheight)); 3588 (unsigned int) (args[1] * fheight));
3467 break; 3589 break;
3468 3590
3469 3591
3470 /* 3592 /*
3471 * reports - some output format copied from XTerm 3593 * reports - some output format copied from XTerm
3472 */ 3594 */
3473 case 11: /* report window state */ 3595 case 11: /* report window state */
3474 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3596 XGetWindowAttributes (disp, parent[0], &wattr);
3475 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3597 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3476 break; 3598 break;
3477 case 13: /* report window position */ 3599 case 13: /* report window position */
3478 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3600 XGetWindowAttributes (disp, parent[0], &wattr);
3479 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3601 XTranslateCoordinates (disp, parent[0], wattr.root,
3480 -wattr.border_width, -wattr.border_width, 3602 -wattr.border_width, -wattr.border_width,
3481 &x, &y, &wdummy); 3603 &x, &y, &wdummy);
3482 tt_printf ("\033[3;%d;%dt", x, y); 3604 tt_printf ("\033[3;%d;%dt", x, y);
3483 break; 3605 break;
3484 case 14: /* report window size (pixels) */ 3606 case 14: /* report window size (pixels) */
3485 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3607 XGetWindowAttributes (disp, parent[0], &wattr);
3486 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3608 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3487 break; 3609 break;
3488 case 18: /* report text area size (chars) */ 3610 case 18: /* report text area size (chars) */
3489 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3611 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3490 break; 3612 break;
3491 case 19: /* report window size (chars) */ 3613 case 19: /* report window size (chars) */
3492 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3614 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3493 break; 3615 break;
3494 case 20: /* report icon label */ 3616 case 20: /* report icon label */
3495 { 3617 {
3496 char *s; 3618 char *s;
3497 XGetIconName (display->display, TermWin.parent[0], &s); 3619 XGetIconName (disp, parent[0], &s);
3498 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3620 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3499 XFree (s); 3621 XFree (s);
3500 } 3622 }
3501 break; 3623 break;
3502 case 21: /* report window title */ 3624 case 21: /* report window title */
3503 { 3625 {
3504 char *s; 3626 char *s;
3505 XFetchName (display->display, TermWin.parent[0], &s); 3627 XFetchName (disp, parent[0], &s);
3506 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3628 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3507 XFree (s); 3629 XFree (s);
3508 } 3630 }
3509 break; 3631 break;
3510 } 3632 }
3511} 3633}
… …
3514/*----------------------------------------------------------------------*/ 3636/*----------------------------------------------------------------------*/
3515/* 3637/*
3516 * get input up until STRING TERMINATOR (or BEL) 3638 * get input up until STRING TERMINATOR (or BEL)
3517 * ends_how is terminator used. returned input must be free()'d 3639 * ends_how is terminator used. returned input must be free()'d
3518 */ 3640 */
3519unsigned char * 3641char *
3520rxvt_term::get_to_st (unicode_t &ends_how) 3642rxvt_term::get_to_st (unicode_t &ends_how)
3521{ 3643{
3522 unicode_t ch; 3644 unicode_t ch;
3523 bool seen_esc = false; 3645 bool seen_esc = false;
3524 unsigned int n = 0; 3646 unsigned int n = 0;
… …
3543 else if (ch < 0x20) 3665 else if (ch < 0x20)
3544 return NULL; /* other control character - exit */ 3666 return NULL; /* other control character - exit */
3545 3667
3546 seen_esc = false; 3668 seen_esc = false;
3547 3669
3548 if (n >= sizeof (string) - 1) 3670 if (n >= STRING_MAX - 1)
3549 // stop at some sane length 3671 // stop at some sane length
3550 return NULL; 3672 return NULL;
3551 3673
3552 if (ch == C0_SYN) 3674 if (ch == C0_SYN)
3553 string[n++] = cmd_get8 (); 3675 string[n++] = cmd_get8 ();
… …
3557 3679
3558 string[n++] = '\0'; 3680 string[n++] = '\0';
3559 3681
3560 ends_how = (ch == 0x5c ? C0_ESC : ch); 3682 ends_how = (ch == 0x5c ? C0_ESC : ch);
3561 3683
3562 return (unsigned char *)rxvt_wcstombs (string); 3684 return rxvt_wcstombs (string);
3563} 3685}
3564 3686
3565/*----------------------------------------------------------------------*/ 3687/*----------------------------------------------------------------------*/
3566/* 3688/*
3567 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3689 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3568 */ 3690 */
3569void 3691void
3570rxvt_term::process_dcs_seq () 3692rxvt_term::process_dcs_seq ()
3571{ 3693{
3572 unsigned char *s; 3694 char *s;
3573 unicode_t eh; 3695 unicode_t eh;
3574 3696
3575 /* 3697 /*
3576 * Not handled yet 3698 * Not handled yet
3577 */ 3699 */
… …
3596 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3718 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3597 arg = arg * 10 + (ch - '0'); 3719 arg = arg * 10 + (ch - '0');
3598 3720
3599 if (ch == ';') 3721 if (ch == ';')
3600 { 3722 {
3601 unsigned char *s = get_to_st (eh); 3723 char *s = get_to_st (eh);
3602 3724
3603 if (s) 3725 if (s)
3604 { 3726 {
3605 process_xterm_seq (arg, (char *)s, eh); 3727 process_xterm_seq (arg, s, eh);
3606 free (s); 3728 free (s);
3607 } 3729 }
3608 } 3730 }
3609} 3731}
3610 3732
3611void 3733void
3612rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3734rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3613{ 3735{
3614 if (str[0] == '?' && !str[1]) 3736 if (str[0] == '?' && !str[1])
3615 { 3737 {
3616 unsigned short r, g, b; 3738 unsigned short r, g, b;
3617 pix_colors_focused[color].get (display, r, g, b); 3739 pix_colors_focused[color].get (display, r, g, b);
… …
3621 set_window_color (color, str); 3743 set_window_color (color, str);
3622} 3744}
3623 3745
3624/* 3746/*
3625 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3747 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3626 * 0 = change iconName/title
3627 * 1 = change iconName
3628 * 2 = change title
3629 * 4 = change color
3630 * 10 = change fg color
3631 * 11 = change bg color
3632 * 12 = change text color
3633 * 13 = change mouse foreground color
3634 * 17 = change highlight character colour
3635 * 18 = change bold character color
3636 * 19 = change underlined character color
3637 * 46 = change logfile (not implemented)
3638 * 50 = change font
3639 *
3640 * rxvt extensions:
3641 * 20 = bg pixmap
3642 * 39 = change default fg color
3643 * 49 = change default bg color
3644 * 55 = dump scrollback buffer and all of screen
3645 * 701 = change locale
3646 * 702 = find font
3647 * 703 = menu
3648 */ 3748 */
3649void 3749void
3650rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3750rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3651{ 3751{
3652 int changed = 0;
3653 int color; 3752 int color;
3654 char *buf, *name; 3753 char *buf, *name;
3655 bool query = str[0] == '?' && !str[1]; 3754 bool query = str[0] == '?' && !str[1];
3656 int saveop = op; 3755 int saveop = op;
3756 dDisp;
3657 3757
3658 assert (str != NULL); 3758 assert (str != NULL);
3659 switch (op) 3759 switch (op)
3660 { 3760 {
3661 case XTerm_name: 3761 case XTerm_name:
… …
3677 unsigned long bytes_after; 3777 unsigned long bytes_after;
3678 unsigned char *value = 0; 3778 unsigned char *value = 0;
3679 const char *str = ""; 3779 const char *str = "";
3680 3780
3681 if (prop 3781 if (prop
3682 && XGetWindowProperty (display->display, TermWin.parent[0], 3782 && XGetWindowProperty (disp, parent[0],
3683 prop, 0, 1<<16, 0, AnyPropertyType, 3783 prop, 0, 1<<16, 0, AnyPropertyType,
3684 &actual_type, &actual_format, 3784 &actual_type, &actual_format,
3685 &nitems, &bytes_after, &value) == Success 3785 &nitems, &bytes_after, &value) == Success
3686 && actual_type != None 3786 && actual_type != None
3687 && actual_format == 8) 3787 && actual_format == 8)
… …
3699 { 3799 {
3700 *eq = 0; 3800 *eq = 0;
3701 set_utf8_property (display->atom (str), eq + 1); 3801 set_utf8_property (display->atom (str), eq + 1);
3702 } 3802 }
3703 else 3803 else
3704 XDeleteProperty (display->display, TermWin.parent[0], 3804 XDeleteProperty (disp, parent[0],
3705 display->atom (str)); 3805 display->atom (str));
3706 } 3806 }
3707 break; 3807 break;
3708 3808
3709 case XTerm_Color: 3809 case XTerm_Color:
… …
3711 { 3811 {
3712 if ((name = strchr (buf, ';')) == NULL) 3812 if ((name = strchr (buf, ';')) == NULL)
3713 break; 3813 break;
3714 3814
3715 *name++ = '\0'; 3815 *name++ = '\0';
3716 color = atoi (buf); 3816 color = atoi (buf) + minCOLOR;
3717 3817
3718 if (color < 0 || color >= TOTAL_COLORS) 3818 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3719 break; 3819 break;
3720 3820
3721 if ((buf = strchr (name, ';')) != NULL) 3821 if ((buf = strchr (name, ';')) != NULL)
3722 *buf++ = '\0'; 3822 *buf++ = '\0';
3723 3823
3724 if (name[0] == '?' && !name[1]) 3824 if (name[0] == '?' && !name[1])
3725 { 3825 {
3726 unsigned short r, g, b; 3826 unsigned short r, g, b;
3727 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3827 pix_colors_focused[color].get (display, r, g, b);
3728 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3828 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3729 } 3829 }
3730 else 3830 else
3731 set_window_color (color + minCOLOR, name); 3831 set_window_color (color, name);
3732 } 3832 }
3733 break; 3833 break;
3734 case XTerm_Color00: 3834 case XTerm_Color00:
3735 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3835 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3736 break; 3836 break;
3737 case XTerm_Color01: 3837 case XTerm_Color01:
3738 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3838 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3739 break; 3839 break;
3740#ifndef NO_CURSORCOLOR 3840#ifndef NO_CURSORCOLOR
3741 case XTerm_Color_cursor: 3841 case XTerm_Color_cursor:
3742 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3842 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3743 break; 3843 break;
… …
3747 break; 3847 break;
3748 case XTerm_Color_pointer_bg: 3848 case XTerm_Color_pointer_bg:
3749 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3849 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3750 break; 3850 break;
3751#ifndef NO_BOLD_UNDERLINE_REVERSE 3851#ifndef NO_BOLD_UNDERLINE_REVERSE
3752 case XTerm_Color_BD:
3753 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3754 break;
3755 case XTerm_Color_IT:
3756 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3757 break;
3758 case XTerm_Color_UL:
3759 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3760 break;
3761 case XTerm_Color_RV: 3852 case XTerm_Color_RV:
3762 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3853 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3763 break; 3854 break;
3855 case Rxvt_Color_BD:
3856 case URxvt_Color_BD:
3857 process_color_seq (op, Color_BD, str, resp);
3858 break;
3859 case Rxvt_Color_UL:
3860 case URxvt_Color_UL:
3861 process_color_seq (op, Color_UL, str, resp);
3862 break;
3863 case URxvt_Color_IT:
3864 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3865 break;
3764#endif 3866#endif
3765#if TRANSPARENT && TINTING 3867#if TRANSPARENT && TINTING
3766 case XTerm_Color_tint: 3868 case URxvt_Color_tint:
3767 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3869 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3768 check_our_parents (); 3870 check_our_parents ();
3769 if (am_transparent) 3871 if (am_transparent)
3770 want_full_refresh = want_refresh = 1; 3872 want_full_refresh = want_refresh = 1;
3771 break; 3873 break;
3772#endif 3874#endif
3773 3875
3774 case XTerm_Pixmap: 3876 case Rxvt_Pixmap:
3877 {
3775 if (*str != ';') 3878 if (*str != ';')
3776 { 3879 {
3777#if XPM_BACKGROUND 3880#if XPM_BACKGROUND
3778 scale_pixmap (""); /* reset to default scaling */ 3881 scale_pixmap (""); /* reset to default scaling */
3779 set_bgPixmap (str); /* change pixmap */ 3882 set_bgPixmap (str); /* change pixmap */
3780#endif
3781 scr_touch (true); 3883 scr_touch (true);
3884#endif
3782 } 3885 }
3886
3887 int changed = 0;
3888
3783 while ((str = strchr (str, ';')) != NULL) 3889 while ((str = strchr (str, ';')) != NULL)
3784 { 3890 {
3785 str++; 3891 str++;
3786#if XPM_BACKGROUND 3892#if XPM_BACKGROUND
3787 changed += scale_pixmap (str); 3893 changed += scale_pixmap (str);
3788#endif 3894#endif
3789
3790 } 3895 }
3896
3791 if (changed) 3897 if (changed)
3792 { 3898 {
3793#ifdef XPM_BACKGROUND 3899#ifdef XPM_BACKGROUND
3794 resize_pixmap (); 3900 resize_pixmap ();
3795#endif
3796 scr_touch (true); 3901 scr_touch (true);
3902#endif
3797 } 3903 }
3904 }
3798 break; 3905 break;
3799 3906
3800 case XTerm_restoreFG: 3907 case Rxvt_restoreFG:
3801 set_window_color (Color_fg, str); 3908 set_window_color (Color_fg, str);
3802 break; 3909 break;
3803 case XTerm_restoreBG: 3910 case Rxvt_restoreBG:
3804 set_window_color (Color_bg, str); 3911 set_window_color (Color_bg, str);
3805 break; 3912 break;
3806 3913
3807 case XTerm_logfile: 3914 case XTerm_logfile:
3808 // TODO, when secure mode? 3915 // TODO, when secure mode?
3809 break; 3916 break;
3810 3917
3918#if 0
3919 case Rxvt_dumpscreen: /* no error notices */
3920 {
3921 int fd;
3922 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3923 {
3924 scr_dump (fd);
3925 close (fd);
3926 }
3927 }
3928 break;
3929#endif
3811 case XTerm_font: 3930 case XTerm_font:
3812 op = URxvt_font; 3931 op = URxvt_font;
3813 case URxvt_font: 3932 case URxvt_font:
3814#if ENABLE_STYLES 3933#if ENABLE_STYLES
3815 case URxvt_boldFont: 3934 case URxvt_boldFont:
3816 case URxvt_italicFont: 3935 case URxvt_italicFont:
3817 case URxvt_boldItalicFont: 3936 case URxvt_boldItalicFont:
3818#endif 3937#endif
3819 if (query) 3938 if (query)
3820 tt_printf ("\33]%d;%-.250s%c", saveop, 3939 tt_printf ("\33]%d;%-.250s%c", saveop,
3821 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3940 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3822 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3941 ? fontset[op - URxvt_font]->fontdesc : "",
3823 resp); 3942 resp);
3824 else 3943 else
3825 { 3944 {
3826 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3945 const char *&res = rs[Rs_font + (op - URxvt_font)];
3827 3946
… …
3830 set_fonts (); 3949 set_fonts ();
3831 } 3950 }
3832 break; 3951 break;
3833 3952
3834#if ENABLE_FRILLS 3953#if ENABLE_FRILLS
3835 case XTerm_locale: 3954 case URxvt_locale:
3836 if (query) 3955 if (query)
3837 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3956 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3838 else 3957 else
3839 { 3958 {
3840 set_locale (str); 3959 set_locale (str);
3841# ifdef USE_XIM 3960 pty->set_utf8_mode (enc_utf8);
3842 im_cb (); 3961 init_xlocale ();
3843# endif
3844 } 3962 }
3845 break; 3963 break;
3846#endif
3847 3964
3848#ifdef MENUBAR 3965 case URxvt_view_up:
3849 case XTerm_Menu: 3966 case URxvt_view_down:
3850 if (options & Opt_insecure) 3967 {
3851 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3968 int lines = atoi (str);
3969
3970 if (lines)
3971 scr_page (op == URxvt_view_up ? UP : DN, lines);
3972 else
3973 scr_erase_savelines ();
3974 }
3975
3852 break; 3976 break;
3853#endif 3977#endif
3854#if 0 3978
3855 case XTerm_dumpscreen: /* no error notices */ 3979#if ENABLE_PERL
3856 { 3980 case URxvt_perl:
3857 int fd; 3981 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3858 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3982 ; // no responses yet
3859 {
3860 scr_dump (fd);
3861 close (fd);
3862 }
3863 }
3864 break; 3983 break;
3865#endif 3984#endif
3866 } 3985 }
3867} 3986}
3868/*----------------------------------------------------------------------*/ 3987/*----------------------------------------------------------------------*/
… …
3899 return state; 4018 return state;
3900} 4019}
3901 4020
3902/* we're not using priv _yet_ */ 4021/* we're not using priv _yet_ */
3903void 4022void
3904rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4023rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3905{ 4024{
3906 unsigned int i, j; 4025 unsigned int i, j;
3907 int state; 4026 int state;
3908 4027
3909 static const struct 4028 static const struct
… …
3920 { 5, PrivMode_rVideo }, 4039 { 5, PrivMode_rVideo },
3921 { 6, PrivMode_relOrigin }, 4040 { 6, PrivMode_relOrigin },
3922 { 7, PrivMode_Autowrap }, 4041 { 7, PrivMode_Autowrap },
3923 // 8, bi-directional support mode 4042 // 8, bi-directional support mode
3924 { 9, PrivMode_MouseX10 }, 4043 { 9, PrivMode_MouseX10 },
3925#ifdef menuBar_esc
3926 { menuBar_esc, PrivMode_menuBar },
3927#endif
3928 // 18, 19 printing-related 4044 // 18, 19 printing-related
3929 { 25, PrivMode_VisibleCursor }, 4045 { 25, PrivMode_VisibleCursor },
3930#ifdef scrollBar_esc 4046#ifdef scrollBar_esc
3931 { scrollBar_esc, PrivMode_scrollBar }, 4047 { scrollBar_esc, PrivMode_scrollBar },
3932#endif 4048#endif
… …
3977 } 4093 }
3978 4094
3979 /* extra handling for values with state unkept */ 4095 /* extra handling for values with state unkept */
3980 switch (arg[i]) 4096 switch (arg[i])
3981 { 4097 {
4098#if ENABLE_STYLES
4099 case 1021:
4100 set_option (Opt_intensityStyles, mode);
4101
4102 scr_touch (true);
4103 break;
4104#endif
3982 case 1048: /* alternative cursor save */ 4105 case 1048: /* alternative cursor save */
3983 case 1049: 4106 case 1049:
3984 if (options & Opt_secondaryScreen) 4107 if (OPTION (Opt_secondaryScreen))
3985 if (mode == 0) 4108 if (mode == 0)
3986 scr_cursor (RESTORE); 4109 scr_cursor (RESTORE);
3987 else if (mode == 1) 4110 else if (mode == 1)
3988 scr_cursor (SAVE); 4111 scr_cursor (SAVE);
3989 break; 4112 break;
… …
4001 */ 4124 */
4002 PrivMode (1, PrivMode_vt52); 4125 PrivMode (1, PrivMode_vt52);
4003 break; 4126 break;
4004 case 3: /* 80/132 */ 4127 case 3: /* 80/132 */
4005 if (priv_modes & PrivMode_132OK) 4128 if (priv_modes & PrivMode_132OK)
4006 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4129 set_widthheight (((state ? 132 : 80) * fwidth), height);
4007 break; 4130 break;
4008 case 4: /* smooth scrolling */ 4131 case 4: /* smooth scrolling */
4009 if (state)
4010 options &= ~Opt_jumpScroll;
4011 else
4012 options |= Opt_jumpScroll; 4132 set_option (Opt_jumpScroll, !state);
4013 break; 4133 break;
4014 case 5: /* reverse video */ 4134 case 5: /* reverse video */
4015 scr_rvideo_mode (state); 4135 scr_rvideo_mode (state);
4016 break; 4136 break;
4017 case 6: /* relative/absolute origins */ 4137 case 6: /* relative/absolute origins */
… …
4023 /* case 8: - auto repeat, can't do on a per window basis */ 4143 /* case 8: - auto repeat, can't do on a per window basis */
4024 case 9: /* X10 mouse reporting */ 4144 case 9: /* X10 mouse reporting */
4025 if (state) /* orthogonal */ 4145 if (state) /* orthogonal */
4026 priv_modes &= ~PrivMode_MouseX11; 4146 priv_modes &= ~PrivMode_MouseX11;
4027 break; 4147 break;
4028#ifdef menuBar_esc
4029 case menuBar_esc:
4030#ifdef MENUBAR
4031 map_menuBar (state);
4032#endif
4033 break;
4034#endif
4035#ifdef scrollBar_esc 4148#ifdef scrollBar_esc
4036 case scrollBar_esc: 4149 case scrollBar_esc:
4037 if (scrollbar_mapping (state)) 4150 if (scrollbar_mapping (state))
4038 { 4151 {
4039 resize_all_windows (0, 0, 0); 4152 resize_all_windows (0, 0, 0);
… …
4058#if 0 4171#if 0
4059 case 1001: 4172 case 1001:
4060 break; /* X11 mouse highlighting */ 4173 break; /* X11 mouse highlighting */
4061#endif 4174#endif
4062 case 1010: /* scroll to bottom on TTY output inhibit */ 4175 case 1010: /* scroll to bottom on TTY output inhibit */
4063 if (state)
4064 options &= ~Opt_scrollTtyOutput;
4065 else
4066 options |= Opt_scrollTtyOutput; 4176 set_option (Opt_scrollTtyOutput, !state);
4067 break; 4177 break;
4068 case 1011: /* scroll to bottom on key press */ 4178 case 1011: /* scroll to bottom on key press */
4069 if (state)
4070 options |= Opt_scrollTtyKeypress; 4179 set_option (Opt_scrollTtyKeypress, state);
4071 else
4072 options &= ~Opt_scrollTtyKeypress;
4073 break; 4180 break;
4074 case 1047: /* secondary screen w/ clearing last */ 4181 case 1047: /* secondary screen w/ clearing last */
4075 if (options & Opt_secondaryScreen) 4182 if (OPTION (Opt_secondaryScreen))
4076 if (current_screen != PRIMARY) 4183 if (current_screen != PRIMARY)
4077 scr_erase_screen (2); 4184 scr_erase_screen (2);
4078 scr_change_screen (state); 4185 scr_change_screen (state);
4079 break; 4186 break;
4080 case 1049: /* secondary screen w/ clearing first */ 4187 case 1049: /* secondary screen w/ clearing first */
4081 scr_change_screen (state); 4188 scr_change_screen (state);
4082 if (options & Opt_secondaryScreen) 4189 if (OPTION (Opt_secondaryScreen))
4083 if (current_screen != PRIMARY) 4190 if (current_screen != PRIMARY)
4084 scr_erase_screen (2); 4191 scr_erase_screen (2);
4085 break; 4192 break;
4086 default: 4193 default:
4087 break; 4194 break;
… …
4215 scr_color (Color_bg, Color_bg); 4322 scr_color (Color_bg, Color_bg);
4216 break; 4323 break;
4217 4324
4218 //case 50: // not variable spacing 4325 //case 50: // not variable spacing
4219 4326
4220#ifndef NO_BRIGHTCOLOR 4327#if ENABLE_FRILLS
4221 case 90: 4328 case 90:
4222 case 91: /* set bright fg color */ 4329 case 91: /* set bright fg color */
4223 case 92: 4330 case 92:
4224 case 93: 4331 case 93:
4225 case 94: 4332 case 94:
… …
4237 case 106: 4344 case 106:
4238 case 107: 4345 case 107:
4239 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4346 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4240 break; 4347 break;
4241#endif 4348#endif
4242
4243 } 4349 }
4244 } 4350 }
4245} 4351}
4246/*}}} */ 4352/*}}} */
4247 4353
… …
4271 */ 4377 */
4272void 4378void
4273rxvt_term::tt_printf (const char *fmt,...) 4379rxvt_term::tt_printf (const char *fmt,...)
4274{ 4380{
4275 va_list arg_ptr; 4381 va_list arg_ptr;
4276 unsigned char buf[256]; 4382 char buf[256];
4277 4383
4278 va_start (arg_ptr, fmt); 4384 va_start (arg_ptr, fmt);
4279 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4385 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4280 va_end (arg_ptr); 4386 va_end (arg_ptr);
4281 tt_write (buf, strlen (buf)); 4387 tt_write (buf, strlen (buf));
… …
4286 * or generated by us in response to a query ESC sequence. 4392 * or generated by us in response to a query ESC sequence.
4287 */ 4393 */
4288const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4394const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4289 4395
4290void 4396void
4291rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4397rxvt_term::tt_write (const char *data, unsigned int len)
4292{ 4398{
4399 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4400 return;
4401
4402 if (pty->pty < 0)
4403 return;
4404
4293 if (v_buflen == 0) 4405 if (v_buflen == 0)
4294 { 4406 {
4295 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4407 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4296 4408
4297 if ((unsigned int)written == len) 4409 if ((unsigned int)written == len)
4298 return; 4410 return;
4299 4411
4300 data += written; 4412 data += written;
4301 len -= written; 4413 len -= written;
4302 } 4414 }
4303 4415
4304 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4416 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4305 4417
4306 memcpy (v_buffer + v_buflen, data, len); 4418 memcpy (v_buffer + v_buflen, data, len);
4307 v_buflen += len; 4419 v_buflen += len;
4308 4420
4309 pty_ev.set (EVENT_READ | EVENT_WRITE); 4421 pty_ev.set (EVENT_READ | EVENT_WRITE);
4310} 4422}
4311 4423
4312void rxvt_term::pty_write () 4424void rxvt_term::pty_write ()
4313{ 4425{
4314 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4426 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4315 4427
4316 if (written > 0) 4428 if (written > 0)
4317 { 4429 {
4318 v_buflen -= written; 4430 v_buflen -= written;
4319 4431
… …
4328 } 4440 }
4329 4441
4330 memmove (v_buffer, v_buffer + written, v_buflen); 4442 memmove (v_buffer, v_buffer + written, v_buflen);
4331 } 4443 }
4332 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4444 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4333 // original code just ignores this... 4445 pty_ev.set (EVENT_READ);
4334 destroy ();
4335} 4446}
4336 4447
4337/*----------------------- end-of-file (C source) -----------------------*/ 4448/*----------------------- end-of-file (C source) -----------------------*/
4338 4449

Diff Legend

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