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.178 by root, Wed Dec 15 00:53:23 2004 UTC vs.
Revision 1.279 by root, Sat Jan 21 14:25:05 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
… …
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]) 1407 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
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 { 1408 {
1327 /* Get Dnd data */ 1409 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1328 Atom ActualType; 1410 {
1329 int ActualFormat; 1411 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1330 unsigned char *data; 1412 {
1331 unsigned long Size, RemainingBytes; 1413 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1332 1414 {
1333 XGetWindowProperty (display->display, display->root, 1415 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1334 xa[XA_DNDSELECTION], 1416 destroy ();
1335 0L, 1000000L, 1417 }
1336 False, AnyPropertyType, 1418#if ENABLE_EWMH
1337 &ActualType, &ActualFormat, 1419 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1338 &Size, &RemainingBytes, 1420 XSendEvent (disp, ev.xclient.window = display->root,
1421 False, SubstructureRedirectMask | SubstructureNotifyMask,
1339 &data); 1422 &ev);
1340 set_string_property (XA_CUT_BUFFER0, data); 1423#endif
1341 XFree (data); 1424 }
1342 selection_paste (display->root, XA_CUT_BUFFER0, true); 1425 }
1343 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1426#if ENABLE_XEMBED
1427 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1428 {
1429 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1430 focus_in ();
1431 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1432 focus_out ();
1433 }
1434#endif
1344 } 1435 }
1345#endif /* OFFIX_DND */
1346 break; 1436 break;
1347 1437
1348 case MappingNotify: 1438 case MappingNotify:
1349 XRefreshKeyboardMapping (&ev.xmapping); 1439 XRefreshKeyboardMapping (&ev.xmapping);
1350 break; 1440 break;
… …
1373 break; 1463 break;
1374 } 1464 }
1375 break; 1465 break;
1376 1466
1377 case FocusIn: 1467 case FocusIn:
1378 if (!TermWin.focus) 1468 focus_in ();
1469 break;
1470
1471 case FocusOut:
1472 focus_out ();
1473 break;
1474
1475 case ConfigureNotify:
1476 if (ev.xconfigure.window == parent[0])
1379 { 1477 {
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)); 1478 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1479 ;
1447 1480
1448 if (szHint.width != width || szHint.height != height) 1481 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1449 { 1482 {
1450 seen_resize = 1; 1483 seen_resize = 1;
1451 resize_all_windows (width, height, 1); 1484 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1452 } 1485 }
1453 1486
1487 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1488
1454#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1489#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1455 if (options & Opt_transparent) 1490 if (OPTION (Opt_transparent))
1456 check_our_parents (); 1491 check_our_parents ();
1457#endif 1492#endif
1458 } 1493 }
1459 break; 1494 break;
1460 1495
1461 case PropertyNotify: 1496 case PropertyNotify:
1497 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1462 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1498 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1463 && ev.xproperty.state == PropertyNewValue) 1499 && ev.xproperty.state == PropertyNewValue)
1464 selection_property (ev.xproperty.window, ev.xproperty.atom); 1500 selection_property (ev.xproperty.window, ev.xproperty.atom);
1465 1501
1466 break; 1502 break;
1467 1503
1468 case SelectionClear: 1504 case SelectionClear:
1469 selection_clear (); 1505 selection_clear ();
… …
1476 1512
1477 case SelectionRequest: 1513 case SelectionRequest:
1478 selection_send (ev.xselectionrequest); 1514 selection_send (ev.xselectionrequest);
1479 break; 1515 break;
1480 1516
1517 case MapNotify:
1518 mapped = 1;
1519#ifdef TEXT_BLINK
1520 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1521#endif
1522 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1523 break;
1524
1481 case UnmapNotify: 1525 case UnmapNotify:
1482 TermWin.mapped = 0; 1526 mapped = 0;
1483#ifdef TEXT_BLINK 1527#ifdef TEXT_BLINK
1484 text_blink_ev.stop (); 1528 text_blink_ev.stop ();
1485#endif 1529#endif
1486 break; 1530 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; 1531 break;
1494 1532
1495#ifdef TRANSPARENT 1533#ifdef TRANSPARENT
1496 case ReparentNotify: 1534 case ReparentNotify:
1497 rootwin_cb (ev); 1535 rootwin_cb (ev);
1498 break; 1536 break;
1499#endif /* TRANSPARENT */ 1537#endif /* TRANSPARENT */
1500 1538
1501 case GraphicsExpose: 1539 case GraphicsExpose:
1502 case Expose: 1540 case Expose:
1503 if (ev.xany.window == TermWin.vt) 1541 if (ev.xany.window == vt)
1504 { 1542 {
1505 do 1543 do
1506 scr_expose (ev.xexpose.x, ev.xexpose.y, 1544 scr_expose (ev.xexpose.x, ev.xexpose.y,
1507 ev.xexpose.width, ev.xexpose.height, False); 1545 ev.xexpose.width, ev.xexpose.height, False);
1508 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1546 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1509 1547
1510 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1548 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1511 1549
1512 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1550 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1513 scr_expose (ev.xexpose.x, ev.xexpose.y, 1551 scr_expose (ev.xexpose.x, ev.xexpose.y,
1514 ev.xexpose.width, ev.xexpose.height, False); 1552 ev.xexpose.width, ev.xexpose.height, False);
1515 1553
1516 scr_refresh (refresh_type); 1554 want_refresh = 1;
1517 } 1555 }
1518 else 1556 else
1519 { 1557 {
1520 XEvent unused_event; 1558 XEvent unused_event;
1521 1559
1522 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1560 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1523 ; 1561 ;
1524 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1562 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1525 ; 1563 ;
1526 1564
1527 if (isScrollbarWindow (ev.xany.window)) 1565 if (isScrollbarWindow (ev.xany.window))
1528 { 1566 {
1529 scrollBar.setIdle (); 1567 scrollBar.setIdle ();
1530 scrollbar_show (0); 1568 scrollbar_show (0);
1531 } 1569 }
1532#ifdef MENUBAR
1533 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1534 menubar_expose ();
1535#endif
1536 1570
1537#ifdef TRANSPARENT 1571#ifdef TRANSPARENT
1538 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1572 if (am_transparent && ev.xany.window == parent[0])
1539 XClearWindow (display->display, ev.xany.window); 1573 XClearWindow (disp, ev.xany.window);
1540#endif 1574#endif
1541 } 1575 }
1542 break; 1576 break;
1543 1577
1544 case MotionNotify: 1578 case MotionNotify:
1545#ifdef POINTER_BLANK 1579#ifdef POINTER_BLANK
1546 if (hidden_pointer) 1580 if (hidden_pointer)
1547 pointer_unblank (); 1581 pointer_unblank ();
1548#endif 1582#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) 1583 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1557 break; 1584 break;
1558 1585
1559 if (ev.xany.window == TermWin.vt) 1586 if (ev.xany.window == vt)
1560 { 1587 {
1588 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1589 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1590 ; // nop
1561 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1591 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1562 { 1592 {
1563 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1593 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1564 ; 1594 ;
1565 1595
1566 XQueryPointer (display->display, TermWin.vt, 1596 XQueryPointer (disp, vt,
1567 &unused_root, &unused_child, 1597 &unused_root, &unused_child,
1568 &unused_root_x, &unused_root_y, 1598 &unused_root_x, &unused_root_y,
1569 &ev.xbutton.x, &ev.xbutton.y, 1599 &ev.xbutton.x, &ev.xbutton.y,
1570 &ev.xbutton.state); 1600 &ev.xbutton.state);
1571#ifdef MOUSE_THRESHOLD 1601#ifdef MOUSE_THRESHOLD
… …
1583#endif 1613#endif
1584 selection_extend (ev.xbutton.x, ev.xbutton.y, 1614 selection_extend (ev.xbutton.x, ev.xbutton.y,
1585 ev.xbutton.state & Button3Mask ? 2 : 0); 1615 ev.xbutton.state & Button3Mask ? 2 : 0);
1586 1616
1587#ifdef SELECTION_SCROLLING 1617#ifdef SELECTION_SCROLLING
1588 if (ev.xbutton.y < TermWin.int_bwidth 1618 if (ev.xbutton.y < int_bwidth
1589 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1619 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1590 { 1620 {
1591 int dist; 1621 int dist;
1592 1622
1593 /* don't clobber the current delay if we are 1623 /* don't clobber the current delay if we are
1594 * already in the middle of scrolling. 1624 * already in the middle of scrolling.
… …
1602 selection_save_x = ev.xbutton.x; 1632 selection_save_x = ev.xbutton.x;
1603 selection_save_y = ev.xbutton.y; 1633 selection_save_y = ev.xbutton.y;
1604 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1634 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1605 1635
1606 /* calc number of lines to scroll */ 1636 /* calc number of lines to scroll */
1607 if (ev.xbutton.y < TermWin.int_bwidth) 1637 if (ev.xbutton.y < int_bwidth)
1608 { 1638 {
1609 scroll_selection_dir = UP; 1639 scroll_selection_dir = UP;
1610 dist = TermWin.int_bwidth - ev.xbutton.y; 1640 dist = int_bwidth - ev.xbutton.y;
1611 } 1641 }
1612 else 1642 else
1613 { 1643 {
1614 scroll_selection_dir = DN; 1644 scroll_selection_dir = DN;
1615 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1645 dist = ev.xbutton.y - (int_bwidth + height);
1616 } 1646 }
1617 1647
1618 scroll_selection_lines = Pixel2Height (dist) 1648 scroll_selection_lines = Pixel2Height (dist)
1619 / SELECTION_SCROLL_LINE_SPEEDUP 1649 / SELECTION_SCROLL_LINE_SPEEDUP
1620 + 1; 1650 + 1;
1621 MIN_IT (scroll_selection_lines, 1651 min_it (scroll_selection_lines,
1622 SELECTION_SCROLL_MAX_LINES); 1652 SELECTION_SCROLL_MAX_LINES);
1623 } 1653 }
1624 else 1654 else
1625 { 1655 {
1626 /* we are within the text window, so we 1656 /* we are within the text window, so we
… …
1635#endif 1665#endif
1636 } 1666 }
1637 } 1667 }
1638 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1668 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1639 { 1669 {
1640 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1670 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1641 MotionNotify, &ev)) 1671 MotionNotify, &ev))
1642 ; 1672 ;
1643 1673
1644 XQueryPointer (display->display, scrollBar.win, 1674 XQueryPointer (disp, scrollBar.win,
1645 &unused_root, &unused_child, 1675 &unused_root, &unused_child,
1646 &unused_root_x, &unused_root_y, 1676 &unused_root_x, &unused_root_y,
1647 &ev.xbutton.x, &ev.xbutton.y, 1677 &ev.xbutton.x, &ev.xbutton.y,
1648 &unused_mask); 1678 &unused_mask);
1649 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1679 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1650 scrollbar_size ()); 1680 scrollbar_size ());
1651 scr_refresh (refresh_type); 1681 want_refresh = 1;
1652 refresh_limit = 0; 1682 refresh_limit = 0;
1653 scrollbar_show (1); 1683 scrollbar_show (1);
1654 } 1684 }
1655 break; 1685 break;
1656 } 1686 }
1687
1688skip_switch: ;
1689
1690#if defined(CURSOR_BLINK)
1691 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1692 {
1693 if (hidden_cursor)
1694 {
1695 hidden_cursor = 0;
1696 want_refresh = 1;
1697 }
1698
1699 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1700 }
1701#endif
1702
1703#if defined(POINTER_BLANK)
1704 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1705 {
1706 if (ev.type == MotionNotify
1707 || ev.type == ButtonPress
1708 || ev.type == ButtonRelease)
1709 if (hidden_pointer)
1710 pointer_unblank ();
1711
1712 if (ev.type == KeyPress && hidden_pointer == 0)
1713 pointer_blank ();
1714 }
1715#endif
1716}
1717
1718void
1719rxvt_term::focus_in ()
1720{
1721 if (!focus)
1722 {
1723 focus = 1;
1724 want_refresh = 1;
1725
1726 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1727
1728#if USE_XIM
1729 if (Input_Context != NULL)
1730 {
1731 IMSetStatusPosition ();
1732 XSetICFocus (Input_Context);
1733 }
1734#endif
1735#if CURSOR_BLINK
1736 if (OPTION (Opt_cursorBlink))
1737 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1738#endif
1739#if OFF_FOCUS_FADING
1740 if (rs[Rs_fade])
1741 {
1742 pix_colors = pix_colors_focused;
1743 scr_recolour ();
1744 }
1745#endif
1746 }
1747}
1748
1749void
1750rxvt_term::focus_out ()
1751{
1752 if (focus)
1753 {
1754 focus = 0;
1755 want_refresh = 1;
1756
1757 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1758
1759#if ENABLE_FRILLS || ISO_14755
1760 if (iso14755buf)
1761 {
1762 iso14755buf = 0;
1763# if ENABLE_OVERLAY
1764 scr_overlay_off ();
1765# endif
1766 }
1767#endif
1768#if USE_XIM
1769 if (Input_Context != NULL)
1770 XUnsetICFocus (Input_Context);
1771#endif
1772#if CURSOR_BLINK
1773 if (OPTION (Opt_cursorBlink))
1774 cursor_blink_ev.stop ();
1775 hidden_cursor = 0;
1776#endif
1777#if OFF_FOCUS_FADING
1778 if (rs[Rs_fade])
1779 {
1780 pix_colors = pix_colors_unfocused;
1781 scr_recolour ();
1782 }
1783#endif
1784 }
1657} 1785}
1658 1786
1659#if TRANSPARENT 1787#if TRANSPARENT
1660void 1788void
1661rxvt_term::rootwin_cb (XEvent &ev) 1789rxvt_term::rootwin_cb (XEvent &ev)
1662{ 1790{
1663 SET_R (this); 1791 make_current ();
1664 SET_LOCALE (locale);
1665 1792
1666 switch (ev.type) 1793 switch (ev.type)
1667 { 1794 {
1668 case PropertyNotify: 1795 case PropertyNotify:
1669 /* 1796 /*
1670 * if user used some Esetroot compatible prog to set the root bg, 1797 * 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. 1798 * use the property to determine the pixmap. We use it later on.
1672 */ 1799 */
1673 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1800 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1674 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1801 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1675 return; 1802 return;
1676 1803
1677 /* FALLTHROUGH */ 1804 /* FALLTHROUGH */
1678 case ReparentNotify: 1805 case ReparentNotify:
1679 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1806 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1680 want_refresh = want_full_refresh = 1; 1807 want_refresh = want_full_refresh = 1;
1681 break; 1808 break;
1682 } 1809 }
1683} 1810}
1684#endif 1811#endif
… …
1687rxvt_term::button_press (XButtonEvent &ev) 1814rxvt_term::button_press (XButtonEvent &ev)
1688{ 1815{
1689 int reportmode = 0, clickintime; 1816 int reportmode = 0, clickintime;
1690 1817
1691 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1818 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1819
1692 if (!bypass_keystate) 1820 if (!bypass_keystate)
1693 reportmode = !! (priv_modes & PrivMode_mouse_report); 1821 reportmode = !! (priv_modes & PrivMode_mouse_report);
1694 1822
1695 /* 1823 /*
1696 * VT window processing of button press 1824 * VT window processing of button press
1697 */ 1825 */
1698 if (ev.window == TermWin.vt) 1826 if (ev.window == vt)
1699 { 1827 {
1700#if ISO_14755 1828#if ISO_14755
1701 // 5.4 1829 // 5.4
1702 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1830 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1703 { 1831 {
… …
1716#ifdef MOUSE_REPORT_DOUBLECLICK 1844#ifdef MOUSE_REPORT_DOUBLECLICK
1717 if (ev.button == MEvent.button && clickintime) 1845 if (ev.button == MEvent.button && clickintime)
1718 { 1846 {
1719 /* same button, within alloted time */ 1847 /* same button, within alloted time */
1720 MEvent.clicks++; 1848 MEvent.clicks++;
1849
1721 if (MEvent.clicks > 1) 1850 if (MEvent.clicks > 1)
1722 { 1851 {
1723 /* only report double clicks */ 1852 /* only report double clicks */
1724 MEvent.clicks = 2; 1853 MEvent.clicks = 2;
1725 mouse_report (ev); 1854 mouse_report (ev);
… …
1745 else 1874 else
1746 { 1875 {
1747 if (ev.button != MEvent.button) 1876 if (ev.button != MEvent.button)
1748 MEvent.clicks = 0; 1877 MEvent.clicks = 0;
1749 1878
1879 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1750 switch (ev.button) 1880 switch (ev.button)
1751 { 1881 {
1752 case Button1: 1882 case Button1:
1753 /* allow meta + click to select rectangular areas */ 1883 /* allow meta + click to select rectangular areas */
1754 /* should be done in screen.C */ 1884 /* should be done in screen.C */
1755#if ENABLE_FRILLS 1885#if ENABLE_FRILLS
1756 selection.rect = !! (ev.state & ModMetaMask); 1886 selection.rect = !!(ev.state & ModMetaMask);
1757#else 1887#else
1758 selection.rect = false; 1888 selection.rect = false;
1759#endif 1889#endif
1760 1890
1761 /* allow shift+left click to extend selection */ 1891 /* allow shift+left click to extend selection */
1762 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1892 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1763 { 1893 {
1764 if (MEvent.button == Button1 && clickintime) 1894 if (MEvent.button == Button1 && clickintime)
1765 selection_rotate (ev.x, ev.y); 1895 selection_rotate (ev.x, ev.y);
1766 else 1896 else
1767 selection_extend (ev.x, ev.y, 1); 1897 selection_extend (ev.x, ev.y, 1);
1768 } 1898 }
1769 else 1899 else
1770 { 1900 {
1771 if (MEvent.button == Button1 && clickintime) 1901 if (MEvent.button == Button1 && clickintime)
1772 MEvent.clicks++; 1902 MEvent.clicks++;
1773 else 1903 else
1774 MEvent.clicks = 1; 1904 MEvent.clicks = 1;
1775 1905
1776 selection_click (MEvent.clicks, ev.x, ev.y); 1906 selection_click (MEvent.clicks, ev.x, ev.y);
1777 } 1907 }
1778 1908
1779 MEvent.button = Button1; 1909 MEvent.button = Button1;
1780 break; 1910 break;
1781 1911
1782 case Button3: 1912 case Button3:
1783 if (MEvent.button == Button3 && clickintime) 1913 if (MEvent.button == Button3 && clickintime)
1784 selection_rotate (ev.x, ev.y); 1914 selection_rotate (ev.x, ev.y);
1785 else 1915 else
1786 selection_extend (ev.x, ev.y, 1); 1916 selection_extend (ev.x, ev.y, 1);
1787 1917
1788 MEvent.button = Button3; 1918 MEvent.button = Button3;
1789 break; 1919 break;
1790 } 1920 }
1791 } 1921 }
1792 1922
1793 MEvent.time = ev.time; 1923 MEvent.time = ev.time;
1794 return; 1924 return;
1795 } 1925 }
1796 1926
… …
1908 case Button3: 2038 case Button3:
1909 if (scrollBar.style != R_SB_XTERM) 2039 if (scrollBar.style != R_SB_XTERM)
1910 { 2040 {
1911 if (scrollbar_above_slider (ev.y)) 2041 if (scrollbar_above_slider (ev.y))
1912# ifdef RXVT_SCROLL_FULL 2042# ifdef RXVT_SCROLL_FULL
1913 scr_page (UP, TermWin.nrow - 1); 2043 scr_page (UP, nrow - 1);
1914# else 2044# else
1915 scr_page (UP, TermWin.nrow / 4); 2045 scr_page (UP, nrow / 4);
1916# endif 2046# endif
1917 else if (scrollbar_below_slider (ev.y)) 2047 else if (scrollbar_below_slider (ev.y))
1918# ifdef RXVT_SCROLL_FULL 2048# ifdef RXVT_SCROLL_FULL
1919 scr_page (DN, TermWin.nrow - 1); 2049 scr_page (DN, nrow - 1);
1920# else 2050# else
1921 scr_page (DN, TermWin.nrow / 4); 2051 scr_page (DN, nrow / 4);
1922# endif 2052# endif
1923 else 2053 else
1924 scrollBar.setMotion (); 2054 scrollBar.setMotion ();
1925 } 2055 }
1926 else 2056 else
1927 { 2057 {
1928 scr_page ((ev.button == Button1 ? DN : UP), 2058 scr_page ((ev.button == Button1 ? DN : UP),
1929 (TermWin.nrow 2059 (nrow
1930 * scrollbar_position (ev.y) 2060 * scrollbar_position (ev.y)
1931 / scrollbar_size ())); 2061 / scrollbar_size ()));
1932 } 2062 }
1933 2063
1934 break; 2064 break;
1935 } 2065 }
1936 } 2066 }
2067
1937 return; 2068 return;
1938 } 2069 }
1939#if MENUBAR
1940 /*
1941 * Menubar window processing of button press
1942 */
1943 if (isMenuBarWindow (ev.window))
1944 menubar_control (ev);
1945#endif
1946} 2070}
1947 2071
1948void 2072void
1949rxvt_term::button_release (XButtonEvent &ev) 2073rxvt_term::button_release (XButtonEvent &ev)
1950{ 2074{
… …
1956 2080
1957 if (scrollbar_isUpDn ()) 2081 if (scrollbar_isUpDn ())
1958 { 2082 {
1959 scrollBar.setIdle (); 2083 scrollBar.setIdle ();
1960 scrollbar_show (0); 2084 scrollbar_show (0);
1961#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1962 refresh_type &= ~SMOOTH_REFRESH;
1963#endif
1964 } 2085 }
1965 2086
1966#ifdef SELECTION_SCROLLING 2087#ifdef SELECTION_SCROLLING
1967 if (sel_scroll_ev.active) 2088 if (sel_scroll_ev.active)
1968 sel_scroll_ev.stop(); 2089 sel_scroll_ev.stop();
1969#endif 2090#endif
1970 2091
1971 if (ev.window == TermWin.vt) 2092 if (ev.window == vt)
1972 { 2093 {
1973#if ISO_14755 2094#if ISO_14755
1974 // 5.4 2095 // 5.4
1975 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2096 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1976 return; 2097 return;
… …
2006 if (priv_modes & PrivMode_mouse_report 2127 if (priv_modes & PrivMode_mouse_report
2007 && bypass_keystate 2128 && bypass_keystate
2008 && ev.button == Button1 && MEvent.clicks <= 1) 2129 && ev.button == Button1 && MEvent.clicks <= 1)
2009 selection_extend (ev.x, ev.y, 0); 2130 selection_extend (ev.x, ev.y, 0);
2010 2131
2132 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2133 return;
2134
2011 switch (ev.button) 2135 switch (ev.button)
2012 { 2136 {
2013 case Button1: 2137 case Button1:
2014 case Button3: 2138 case Button3:
2015 selection_make (ev.time); 2139 selection_make (ev.time);
2016 break; 2140 break;
2141
2017 case Button2: 2142 case Button2:
2018 selection_request (ev.time, ev.x, ev.y); 2143 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2144 selection_request (ev.time, ev.state & ShiftMask ? Sel_Clipboard : Sel_Primary);
2019 break; 2145 break;
2146
2020#ifdef MOUSE_WHEEL 2147#ifdef MOUSE_WHEEL
2021 case Button4: 2148 case Button4:
2022 case Button5: 2149 case Button5:
2023 { 2150 {
2024 int i; 2151 int i;
… …
2026 2153
2027 v = ev.button == Button4 ? UP : DN; 2154 v = ev.button == Button4 ? UP : DN;
2028 2155
2029 if (ev.state & ShiftMask) 2156 if (ev.state & ShiftMask)
2030 i = 1; 2157 i = 1;
2031 else if (options & Opt_mouseWheelScrollPage) 2158 else if (OPTION (Opt_mouseWheelScrollPage))
2032 i = TermWin.nrow - 1; 2159 i = nrow - 1;
2033 else 2160 else
2034 i = 5; 2161 i = 5;
2035 2162
2036# ifdef MOUSE_SLIP_WHEELING 2163# ifdef MOUSE_SLIP_WHEELING
2037 if (ev.state & ControlMask) 2164 if (ev.state & ControlMask)
2038 { 2165 {
2039 mouse_slip_wheel_speed += v ? -1 : 1; 2166 mouse_slip_wheel_speed += v ? -1 : 1;
2040 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2167 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2041 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2168 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2042 2169
2043 if (slip_wheel_ev.at < NOW) 2170 if (slip_wheel_ev.at < NOW)
2044 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2171 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2045 2172
2046 slip_wheel_ev.start (); 2173 slip_wheel_ev.start ();
2047 } 2174 }
2048 else 2175 else
2049 { 2176 {
2050# endif 2177# endif
2051# ifdef JUMP_MOUSE_WHEEL
2052 scr_page (v, i); 2178 scr_page (v, i);
2053 scr_refresh (SMOOTH_REFRESH);
2054 scrollbar_show (1); 2179 scrollbar_show (1);
2055# else
2056 while (i--)
2057 {
2058 scr_page (v, 1);
2059 scr_refresh (SMOOTH_REFRESH);
2060 scrollbar_show (1);
2061 }
2062# endif
2063# ifdef MOUSE_SLIP_WHEELING 2180# ifdef MOUSE_SLIP_WHEELING
2064 } 2181 }
2065#endif 2182# endif
2066 } 2183 }
2067 break; 2184 break;
2068#endif 2185#endif
2069 } 2186 }
2070 } 2187 }
2071#ifdef MENUBAR
2072 else if (isMenuBarWindow (ev.window))
2073 menubar_control (ev);
2074#endif
2075} 2188}
2076 2189
2077#ifdef TRANSPARENT 2190#ifdef TRANSPARENT
2078#if TINTING 2191#if TINTING
2079/* taken from aterm-0.4.2 */ 2192/* taken from aterm-0.4.2 */
… …
2087 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2200 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2088 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2201 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2089 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2202 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2090 int i; 2203 int i;
2091 2204
2092 Visual* visual = display->visual; 2205 Visual *visual = display->visual;
2093 2206
2094 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2207 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2095 2208
2096 /* for convenience */ 2209 /* for convenience */
2097 mask_r = visual->red_mask; 2210 mask_r = visual->red_mask;
… …
2318 Atom atype; 2431 Atom atype;
2319 unsigned char *prop = NULL; 2432 unsigned char *prop = NULL;
2320 Window root, oldp, *list; 2433 Window root, oldp, *list;
2321 Pixmap rootpixmap = None; 2434 Pixmap rootpixmap = None;
2322 XWindowAttributes wattr, wrootattr; 2435 XWindowAttributes wattr, wrootattr;
2436 dDisp;
2323 2437
2324 pchanged = 0; 2438 pchanged = 0;
2325 2439
2326 if (!(options & Opt_transparent)) 2440 if (!OPTION (Opt_transparent))
2327 return pchanged; /* Don't try any more */ 2441 return pchanged; /* Don't try any more */
2328 2442
2329 XGetWindowAttributes (display->display, display->root, &wrootattr); 2443 XGetWindowAttributes (disp, display->root, &wrootattr);
2330 rootdepth = wrootattr.depth; 2444 rootdepth = wrootattr.depth;
2331 2445
2332 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2446 XGetWindowAttributes (disp, parent[0], &wattr);
2333 2447
2334 if (rootdepth != wattr.depth) 2448 if (rootdepth != wattr.depth)
2335 { 2449 {
2336 if (am_transparent) 2450 if (am_transparent)
2337 { 2451 {
2338 pchanged = 1; 2452 pchanged = 1;
2339 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2453 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2340 am_transparent = am_pixmap_trans = 0; 2454 am_transparent = am_pixmap_trans = 0;
2341 } 2455 }
2342 2456
2343 return pchanged; /* Don't try any more */ 2457 return pchanged; /* Don't try any more */
2344 } 2458 }
2345 2459
2346 /* Get all X ops out of the queue so that our information is up-to-date. */ 2460 /* Get all X ops out of the queue so that our information is up-to-date. */
2347 XSync (display->display, False); 2461 XSync (disp, False);
2348 2462
2349 /* 2463 /*
2350 * Make the frame window set by the window manager have 2464 * Make the frame window set by the window manager have
2351 * the root background. Some window managers put multiple nested frame 2465 * the root background. Some window managers put multiple nested frame
2352 * windows for each client, so we have to take care about that. 2466 * windows for each client, so we have to take care about that.
2353 */ 2467 */
2354 i = (xa[XA_XROOTPMAP_ID] 2468 i = (xa[XA_XROOTPMAP_ID]
2355 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAP_ID], 2469 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2356 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2470 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2357 &nitems, &bytes_after, &prop) == Success); 2471 &nitems, &bytes_after, &prop) == Success);
2358 2472
2359 if (!i || prop == NULL) 2473 if (!i || prop == NULL)
2360 i = (xa[XA_ESETROOT_PMAP_ID] 2474 i = (xa[XA_ESETROOT_PMAP_ID]
2361 && XGetWindowProperty (display->display, display->root, xa[XA_ESETROOT_PMAP_ID], 2475 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2362 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2476 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2363 &nitems, &bytes_after, &prop) == Success); 2477 &nitems, &bytes_after, &prop) == Success);
2364 2478
2365 if (!i || prop == NULL 2479 if (!i || prop == NULL
2366#if TINTING 2480#if TINTING
… …
2385 Window cr; 2499 Window cr;
2386 XImage *image; 2500 XImage *image;
2387 GC gc; 2501 GC gc;
2388 XGCValues gcvalue; 2502 XGCValues gcvalue;
2389 2503
2390 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2504 XTranslateCoordinates (disp, parent[0], display->root,
2391 0, 0, &sx, &sy, &cr); 2505 0, 0, &sx, &sy, &cr);
2392 nw = (unsigned int)szHint.width; 2506 nw = (unsigned int)szHint.width;
2393 nh = (unsigned int)szHint.height; 2507 nh = (unsigned int)szHint.height;
2394 nx = ny = 0; 2508 nx = ny = 0;
2395 2509
… …
2405 nh += sy; 2519 nh += sy;
2406 ny = -sy; 2520 ny = -sy;
2407 sy = 0; 2521 sy = 0;
2408 } 2522 }
2409 2523
2410 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2524 min_it (nw, (unsigned int) (wrootattr.width - sx));
2411 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2525 min_it (nh, (unsigned int) (wrootattr.height - sy));
2412 2526
2413 XSync (display->display, False); 2527 XSync (disp, False);
2414 allowedxerror = -1; 2528 allowedxerror = -1;
2415 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2529 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2416 2530
2417 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2531 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2418 /* XXX: may need a delay here? */ 2532 /* XXX: may need a delay here? */
2419 allowedxerror = 0; 2533 allowedxerror = 0;
2420 2534
2421 if (image == NULL) 2535 if (image == NULL)
2422 { 2536 {
2423 if (am_transparent && am_pixmap_trans) 2537 if (am_transparent && am_pixmap_trans)
2424 { 2538 {
2425 pchanged = 1; 2539 pchanged = 1;
2426 if (TermWin.pixmap != None) 2540 if (pixmap != None)
2427 { 2541 {
2428 XFreePixmap (display->display, TermWin.pixmap); 2542 XFreePixmap (disp, pixmap);
2429 TermWin.pixmap = None; 2543 pixmap = None;
2430 } 2544 }
2431 } 2545 }
2432 2546
2433 am_pixmap_trans = 0; 2547 am_pixmap_trans = 0;
2434 } 2548 }
2435 else 2549 else
2436 { 2550 {
2437 if (TermWin.pixmap != None) 2551 if (pixmap != None)
2438 XFreePixmap (display->display, TermWin.pixmap); 2552 XFreePixmap (disp, pixmap);
2439 2553
2440#if TINTING 2554#if TINTING
2441 if (ISSET_PIXCOLOR (Color_tint)) 2555 if (ISSET_PIXCOLOR (Color_tint))
2442 { 2556 {
2443 unsigned short rm, gm, bm; 2557 unsigned short rm, gm, bm;
… …
2447 2561
2448 ShadeXImage (display, image, shade, rm, gm, bm); 2562 ShadeXImage (display, image, shade, rm, gm, bm);
2449 } 2563 }
2450#endif 2564#endif
2451 2565
2452 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2566 pixmap = XCreatePixmap (disp, vt,
2453 szHint.width, szHint.height, image->depth); 2567 szHint.width, szHint.height, image->depth);
2454 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2568 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2455 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2569 XPutImage (disp, pixmap, gc, image, 0, 0,
2456 nx, ny, image->width, image->height); 2570 nx, ny, image->width, image->height);
2457 XFreeGC (display->display, gc); 2571 XFreeGC (disp, gc);
2458 XDestroyImage (image); 2572 XDestroyImage (image);
2459 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2573 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2460 XClearWindow (display->display, TermWin.parent[0]); 2574 XClearWindow (disp, parent[0]);
2461 2575
2462 if (!am_transparent || !am_pixmap_trans) 2576 if (!am_transparent || !am_pixmap_trans)
2463 pchanged = 1; 2577 pchanged = 1;
2464 2578
2465 am_transparent = am_pixmap_trans = 1; 2579 am_transparent = am_pixmap_trans = 1;
2466 } 2580 }
2467 } 2581 }
2468 2582
2469 if (am_pixmap_trans) 2583 if (am_pixmap_trans)
2470 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2584 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2471 else 2585 else
2472 { 2586 {
2473 unsigned int n; 2587 unsigned int n;
2474 /* 2588 /*
2475 * InheritPixmap transparency 2589 * InheritPixmap transparency
2476 */ 2590 */
2477 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2591 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2478 { 2592 {
2479 oldp = TermWin.parent[i]; 2593 oldp = parent[i];
2480 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2594 XQueryTree (disp, parent[i - 1], &root,
2481 &TermWin.parent[i], &list, &n); 2595 &parent[i], &list, &n);
2482 XFree (list); 2596 XFree (list);
2483 2597
2484 if (TermWin.parent[i] == display->root) 2598 if (parent[i] == display->root)
2485 { 2599 {
2486 if (oldp != None) 2600 if (oldp != None)
2487 pchanged = 1; 2601 pchanged = 1;
2488 2602
2489 break; 2603 break;
2490 } 2604 }
2491 2605
2492 if (oldp != TermWin.parent[i]) 2606 if (oldp != parent[i])
2493 pchanged = 1; 2607 pchanged = 1;
2494 } 2608 }
2495 2609
2496 n = 0; 2610 n = 0;
2497 2611
2498 if (pchanged) 2612 if (pchanged)
2499 { 2613 {
2500 for (; n < (unsigned int)i; n++) 2614 for (; n < (unsigned int)i; n++)
2501 { 2615 {
2502 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2616 XGetWindowAttributes (disp, parent[n], &wattr);
2503 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2617 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2504 { 2618 {
2505 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2619 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2506 break; 2620 break;
2507 } 2621 }
2508 } 2622 }
2509 } 2623 }
2510 2624
2511 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2625 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2512 { 2626 {
2513 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]); 2627 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2514 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2628 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2515 am_transparent = 0; 2629 am_transparent = 0;
2516 /* XXX: also turn off Opt_transparent? */ 2630 /* XXX: also turn off Opt_transparent? */
2517 } 2631 }
2518 else 2632 else
2519 { 2633 {
2520#if WAIT_FOR_WM
2521 /* wait (an arbitrary period) for the WM to do its thing
2522 * needed for fvwm2.2.2 (and before?) */
2523 sleep (1);
2524#endif
2525 for (n = 0; n < (unsigned int)i; n++) 2634 for (n = 0; n < (unsigned int)i; n++)
2526 { 2635 {
2527 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2636 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2528 XClearWindow (display->display, TermWin.parent[n]); 2637 XClearWindow (disp, parent[n]);
2529 } 2638 }
2530 2639
2531 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2640 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2532 am_transparent = 1; 2641 am_transparent = 1;
2533 } 2642 }
2534 2643
2535 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2644 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2536 TermWin.parent[i] = None; 2645 parent[i] = None;
2537 } 2646 }
2538 2647
2539 if (scrollBar.win) 2648 if (scrollBar.win)
2540 { 2649 {
2541 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2650 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2542 scrollBar.setIdle (); 2651 scrollBar.setIdle ();
2543 scrollbar_show (0); 2652 scrollbar_show (0);
2544 } 2653 }
2545 2654
2546 if (am_transparent) 2655 if (am_transparent)
… …
2558 2667
2559bool 2668bool
2560rxvt_term::cmd_parse () 2669rxvt_term::cmd_parse ()
2561{ 2670{
2562 bool flag = false; 2671 bool flag = false;
2563 unicode_t ch = NOCHAR; 2672 wchar_t ch = NOCHAR;
2564 unsigned char *seq_begin; // remember start of esc-sequence here 2673 char *seq_begin; // remember start of esc-sequence here
2565 2674
2566 for (;;) 2675 for (;;)
2567 { 2676 {
2568 if (ch == NOCHAR) 2677 if (ch == NOCHAR)
2569 { 2678 {
2570 seq_begin = cmdbuf_ptr; 2679 seq_begin = cmdbuf_ptr;
2571 ch = next_char (); 2680 ch = next_char ();
2572 }
2573 2681
2574 if (ch == NOCHAR) // TODO: improve 2682 if (ch == NOCHAR)
2575 break; 2683 break;
2684 }
2576 2685
2577 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)
2578 { 2687 {
2579 if (!seen_input) 2688 if (!seen_input)
2580 { 2689 {
… …
2584 // some window managers resize the window early, and these programs 2693 // some window managers resize the window early, and these programs
2585 // then sometimes get the size wrong. 2694 // then sometimes get the size wrong.
2586 // unfortunately other programs are even more buggy and dislike 2695 // unfortunately other programs are even more buggy and dislike
2587 // 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
2588 // resized. 2697 // resized.
2589 if (seen_resize) 2698 if (seen_resize && cmd_pid)
2590 kill (-cmd_pid, SIGWINCH); 2699 kill (-cmd_pid, SIGWINCH);
2591 } 2700 }
2592 2701
2593 /* Read a text string from the input buffer */ 2702 /* Read a text string from the input buffer */
2594 unicode_t buf[UBUFSIZ]; 2703 wchar_t buf[UBUFSIZ];
2595 bool refreshnow = false; 2704 bool refreshnow = false;
2596 int nlines = 0; 2705 int nlines = 0;
2597 unicode_t *str = buf; 2706 wchar_t *str = buf;
2707 wchar_t *eol = str + min (ncol, UBUFSIZ);
2598 2708
2599 for (;;) 2709 for (;;)
2600 { 2710 {
2601 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))
2602 break; 2712 break;
2603 2713
2604 *str++ = ch; 2714 *str++ = ch;
2605 2715
2606 if (ch == C0_LF) 2716 if (ch == C0_LF || str >= eol)
2607 { 2717 {
2718 if (ch == C0_LF)
2608 nlines++; 2719 nlines++;
2720
2609 refresh_count++; 2721 refresh_count++;
2610 2722
2611 if (!(options & Opt_jumpScroll) 2723 if (!OPTION (Opt_jumpScroll)
2612 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2724 || (refresh_count >= refresh_limit * (nrow - 1)))
2613 { 2725 {
2614 refreshnow = true; 2726 refreshnow = true;
2727 refresh_count = 0;
2615 ch = NOCHAR; 2728 ch = NOCHAR;
2616 break; 2729 break;
2617 } 2730 }
2618 2731
2619 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2732 // scr_add_lines only works for nlines <= nrow - 1.
2620 if (nlines >= TermWin.nrow - 1) 2733 if (nlines >= nrow - 1)
2621 { 2734 {
2735 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2736 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2622 scr_add_lines (buf, nlines, str - buf); 2737 scr_add_lines (buf, str - buf, nlines);
2738
2623 nlines = 0; 2739 nlines = 0;
2624 str = buf; 2740 str = buf;
2741 eol = str + min (ncol, UBUFSIZ);
2625 } 2742 }
2626 }
2627 2743
2628 if (str >= buf + UBUFSIZ) 2744 if (str >= eol)
2629 { 2745 {
2746 if (eol >= buf + UBUFSIZ)
2747 {
2630 ch = NOCHAR; 2748 ch = NOCHAR;
2631 break; 2749 break;
2750 }
2751 else
2752 eol = min (eol + ncol, buf + UBUFSIZ);
2753 }
2754
2632 } 2755 }
2633 2756
2634 seq_begin = cmdbuf_ptr; 2757 seq_begin = cmdbuf_ptr;
2635 ch = next_char (); 2758 ch = next_char ();
2636 } 2759 }
2637 2760
2761 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2762 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2638 scr_add_lines (buf, nlines, str - buf); 2763 scr_add_lines (buf, str - buf, nlines);
2639 2764
2640 /* 2765 /*
2641 * 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
2642 * 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.
2643 * the number of pages between refreshes is refresh_limit, which 2768 * the number of pages between refreshes is refresh_limit, which
2644 * is incremented here because we must be doing flat-out scrolling. 2769 * is incremented here because we must be doing flat-out scrolling.
2645 */ 2770 */
2646 if (refreshnow) 2771 if (refreshnow)
2647 { 2772 {
2648 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2773 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2649 refresh_limit++; 2774 refresh_limit++;
2650 else 2775 else
2651 { 2776 {
2652 flag = true; 2777 flag = true;
2653 scr_refresh (refresh_type); 2778 scr_refresh ();
2779 want_refresh = 1;
2654 } 2780 }
2655 } 2781 }
2656 2782
2657 } 2783 }
2658 else 2784 else
… …
2673 } 2799 }
2674 2800
2675 return flag; 2801 return flag;
2676} 2802}
2677 2803
2678// read the next octet
2679unicode_t
2680rxvt_term::next_octet ()
2681{
2682 return cmdbuf_ptr < cmdbuf_endp
2683 ? *cmdbuf_ptr++
2684 : NOCHAR;
2685}
2686
2687// read the next character 2804// read the next character
2688unicode_t 2805wchar_t
2689rxvt_term::next_char () 2806rxvt_term::next_char () NOTHROW
2690{ 2807{
2691 while (cmdbuf_ptr < cmdbuf_endp) 2808 while (cmdbuf_ptr < cmdbuf_endp)
2692 { 2809 {
2693 // assume 7-bit to be ascii ALWAYS 2810 // assume 7-bit to be ascii ALWAYS
2694 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2811 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2695 return *cmdbuf_ptr++; 2812 return *cmdbuf_ptr++;
2696 2813
2697 wchar_t wc; 2814 wchar_t wc;
2698 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);
2699 2816
2700 if (len == (size_t)-2) 2817 if (len == (size_t)-2)
2701 { 2818 {
2702 // the mbstate stores incomplete sequences. didn't know this :/ 2819 // the mbstate stores incomplete sequences. didn't know this :/
2703 cmdbuf_ptr = cmdbuf_endp; 2820 cmdbuf_ptr = cmdbuf_endp;
2704 break; 2821 break;
2705 } 2822 }
2706 2823
2707 if (len == (size_t)-1) 2824 if (len == (size_t)-1)
2708 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
2709 2826
2710 // assume wchar == unicode 2827 // assume wchar == unicode
2711 cmdbuf_ptr += len; 2828 cmdbuf_ptr += len;
2712 return wc; 2829 return wc & UNICODE_MASK;
2713 } 2830 }
2714 2831
2715 return NOCHAR; 2832 return NOCHAR;
2716} 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;
2717 2845
2718/* rxvt_cmd_getc () - Return next input character */ 2846/* rxvt_cmd_getc () - Return next input character */
2719/* 2847/*
2720 * Return the next input character after first passing any keyboard input 2848 * Return the next input character after first passing any keyboard input
2721 * to the command. 2849 * to the command.
2722 */ 2850 */
2723unicode_t 2851wchar_t
2724rxvt_term::cmd_getc () 2852rxvt_term::cmd_getc () THROW ((class out_of_input))
2725{ 2853{
2726 unicode_t c = next_char (); 2854 wchar_t c = next_char ();
2727 2855
2728 if (c == NOCHAR) 2856 if (c == NOCHAR)
2729 throw out_of_input; 2857 throw out_of_input;
2730 2858
2731 return c; 2859 return c;
2732} 2860}
2733 2861
2734unicode_t 2862uint32_t
2735rxvt_term::cmd_get8 () 2863rxvt_term::cmd_get8 () THROW ((class out_of_input))
2736{ 2864{
2737 unicode_t c = next_octet (); 2865 uint32_t c = next_octet ();
2738 2866
2739 if (c == NOCHAR) 2867 if (c == NOCHAR)
2740 throw out_of_input; 2868 throw out_of_input;
2741 2869
2742 return c; 2870 return c;
… …
2842 case C0_ESC: 2970 case C0_ESC:
2843 process_escape_seq (); 2971 process_escape_seq ();
2844 break; 2972 break;
2845 case C0_ENQ: /* terminal Status */ 2973 case C0_ENQ: /* terminal Status */
2846 if (rs[Rs_answerbackstring]) 2974 if (rs[Rs_answerbackstring])
2847 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2975 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2848 (unsigned int)strlen (rs[Rs_answerbackstring]));
2849 else 2976 else
2850 tt_write ((unsigned char *)VT100_ANS, 2977 tt_write (VT100_ANS, strlen (VT100_ANS));
2851 (unsigned int)strlen (VT100_ANS));
2852 break; 2978 break;
2853 case C0_BEL: /* bell */ 2979 case C0_BEL: /* bell */
2854 scr_bell (); 2980 scr_bell ();
2855 break; 2981 break;
2856 case C0_BS: /* backspace */ 2982 case C0_BS: /* backspace */
… …
3011 break; 3137 break;
3012 3138
3013 /* 8.3.87: NEXT LINE */ 3139 /* 8.3.87: NEXT LINE */
3014 case C1_NEL: /* ESC E */ 3140 case C1_NEL: /* ESC E */
3015 { 3141 {
3016 unicode_t nlcr[] = { C0_LF, C0_CR }; 3142 wchar_t nlcr[] = { C0_LF, C0_CR };
3017 scr_add_lines (nlcr, 1, 2); 3143 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3018 } 3144 }
3019 break; 3145 break;
3020 3146
3021 /* kidnapped escape sequence: Should be 8.3.48 */ 3147 /* kidnapped escape sequence: Should be 8.3.48 */
3022 case C1_ESA: /* ESC G */ 3148 case C1_ESA: /* ESC G */
… …
3044 process_dcs_seq (); 3170 process_dcs_seq ();
3045 break; 3171 break;
3046 3172
3047 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3173 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3048 case C1_SCI: /* ESC Z */ 3174 case C1_SCI: /* ESC Z */
3049 tt_write ((const unsigned char *)ESCZ_ANSWER, 3175 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3050 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3051 break; /* steal obsolete ESC [ c */ 3176 break; /* steal obsolete ESC [ c */
3052 3177
3053 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3178 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3054 case C1_CSI: /* ESC [ */ 3179 case C1_CSI: /* ESC [ */
3055 process_csi_seq (); 3180 process_csi_seq ();
… …
3180 { 3305 {
3181 switch (priv) 3306 switch (priv)
3182 { 3307 {
3183 case '>': 3308 case '>':
3184 if (ch == CSI_DA) /* secondary device attributes */ 3309 if (ch == CSI_DA) /* secondary device attributes */
3185 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3310 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3186 break; 3311 break;
3187 case '?': 3312 case '?':
3188 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3313 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3189 process_terminal_mode (ch, priv, nargs, arg); 3314 process_terminal_mode (ch, priv, nargs, arg);
3190 break; 3315 break;
… …
3295 3420
3296 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3421 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3297 arg[0] = -arg[0]; 3422 arg[0] = -arg[0];
3298 /* FALLTHROUGH */ 3423 /* FALLTHROUGH */
3299 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3424 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3300 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3425 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3301 break; 3426 break;
3302 3427
3303 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3428 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3304 tt_write ((const unsigned char *)VT100_ANS, 3429 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3305 (unsigned int) (sizeof (VT100_ANS) - 1));
3306 break; 3430 break;
3307 3431
3308 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3432 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3309 process_sgr_mode (nargs, arg); 3433 process_sgr_mode (nargs, arg);
3310 break; 3434 break;
… …
3317 break; 3441 break;
3318 case 6: /* CPR requested */ 3442 case 6: /* CPR requested */
3319 scr_report_position (); 3443 scr_report_position ();
3320 break; 3444 break;
3321 case 7: /* unofficial extension */ 3445 case 7: /* unofficial extension */
3322 if (options & Opt_insecure) 3446 if (OPTION (Opt_insecure))
3323 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3447 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3324 break; 3448 break;
3325 case 8: /* unofficial extension */ 3449 case 8: /* unofficial extension */
3326 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3450 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3327 break; 3451 break;
… …
3419rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3543rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3420{ 3544{
3421 int x, y; 3545 int x, y;
3422 XWindowAttributes wattr; 3546 XWindowAttributes wattr;
3423 Window wdummy; 3547 Window wdummy;
3548 dDisp;
3424 3549
3425 if (nargs == 0) 3550 if (nargs == 0)
3426 return; 3551 return;
3427 3552
3428 switch (args[0]) 3553 switch (args[0])
3429 { 3554 {
3430 /* 3555 /*
3431 * commands 3556 * commands
3432 */ 3557 */
3433 case 1: /* deiconify window */ 3558 case 1: /* deiconify window */
3434 XMapWindow (display->display, TermWin.parent[0]); 3559 XMapWindow (disp, parent[0]);
3435 break; 3560 break;
3436 case 2: /* iconify window */ 3561 case 2: /* iconify window */
3437 XIconifyWindow (display->display, TermWin.parent[0], 3562 XIconifyWindow (disp, parent[0], display->screen);
3438 DefaultScreen (display->display));
3439 break; 3563 break;
3440 case 3: /* set position (pixels) */ 3564 case 3: /* set position (pixels) */
3441 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3565 XMoveWindow (disp, parent[0], args[1], args[2]);
3442 break; 3566 break;
3443 case 4: /* set size (pixels) */ 3567 case 4: /* set size (pixels) */
3444 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3568 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3445 break; 3569 break;
3446 case 5: /* raise window */ 3570 case 5: /* raise window */
3447 XRaiseWindow (display->display, TermWin.parent[0]); 3571 XRaiseWindow (disp, parent[0]);
3448 break; 3572 break;
3449 case 6: /* lower window */ 3573 case 6: /* lower window */
3450 XLowerWindow (display->display, TermWin.parent[0]); 3574 XLowerWindow (disp, parent[0]);
3451 break; 3575 break;
3452 case 7: /* refresh window */ 3576 case 7: /* refresh window */
3453 scr_touch (true); 3577 scr_touch (true);
3454 break; 3578 break;
3455 case 8: /* set size (chars) */ 3579 case 8: /* set size (chars) */
3456 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3580 set_widthheight ((unsigned int) (args[2] * fwidth),
3457 (unsigned int) (args[1] * TermWin.fheight)); 3581 (unsigned int) (args[1] * fheight));
3458 break; 3582 break;
3459 3583
3460 //case 9: NYI, TODO, restore maximized window or maximize window 3584 //case 9: NYI, TODO, restore maximized window or maximize window
3461 default: 3585 default:
3462 if (args[0] >= 24) /* set height (chars) */ 3586 if (args[0] >= 24) /* set height (chars) */
3463 set_widthheight ((unsigned int)TermWin.width, 3587 set_widthheight ((unsigned int)width,
3464 (unsigned int) (args[1] * TermWin.fheight)); 3588 (unsigned int) (args[1] * fheight));
3465 break; 3589 break;
3466 3590
3467 3591
3468 /* 3592 /*
3469 * reports - some output format copied from XTerm 3593 * reports - some output format copied from XTerm
3470 */ 3594 */
3471 case 11: /* report window state */ 3595 case 11: /* report window state */
3472 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3596 XGetWindowAttributes (disp, parent[0], &wattr);
3473 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3597 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3474 break; 3598 break;
3475 case 13: /* report window position */ 3599 case 13: /* report window position */
3476 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3600 XGetWindowAttributes (disp, parent[0], &wattr);
3477 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3601 XTranslateCoordinates (disp, parent[0], wattr.root,
3478 -wattr.border_width, -wattr.border_width, 3602 -wattr.border_width, -wattr.border_width,
3479 &x, &y, &wdummy); 3603 &x, &y, &wdummy);
3480 tt_printf ("\033[3;%d;%dt", x, y); 3604 tt_printf ("\033[3;%d;%dt", x, y);
3481 break; 3605 break;
3482 case 14: /* report window size (pixels) */ 3606 case 14: /* report window size (pixels) */
3483 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3607 XGetWindowAttributes (disp, parent[0], &wattr);
3484 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3608 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3485 break; 3609 break;
3486 case 18: /* report text area size (chars) */ 3610 case 18: /* report text area size (chars) */
3487 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3611 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3488 break; 3612 break;
3489 case 19: /* report window size (chars) */ 3613 case 19: /* report window size (chars) */
3490 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3614 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3491 break; 3615 break;
3492 case 20: /* report icon label */ 3616 case 20: /* report icon label */
3493 { 3617 {
3494 char *s; 3618 char *s;
3495 XGetIconName (display->display, TermWin.parent[0], &s); 3619 XGetIconName (disp, parent[0], &s);
3496 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 */
3497 XFree (s); 3621 XFree (s);
3498 } 3622 }
3499 break; 3623 break;
3500 case 21: /* report window title */ 3624 case 21: /* report window title */
3501 { 3625 {
3502 char *s; 3626 char *s;
3503 XFetchName (display->display, TermWin.parent[0], &s); 3627 XFetchName (disp, parent[0], &s);
3504 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 */
3505 XFree (s); 3629 XFree (s);
3506 } 3630 }
3507 break; 3631 break;
3508 } 3632 }
3509} 3633}
… …
3512/*----------------------------------------------------------------------*/ 3636/*----------------------------------------------------------------------*/
3513/* 3637/*
3514 * get input up until STRING TERMINATOR (or BEL) 3638 * get input up until STRING TERMINATOR (or BEL)
3515 * ends_how is terminator used. returned input must be free()'d 3639 * ends_how is terminator used. returned input must be free()'d
3516 */ 3640 */
3517unsigned char * 3641char *
3518rxvt_term::get_to_st (unicode_t &ends_how) 3642rxvt_term::get_to_st (unicode_t &ends_how)
3519{ 3643{
3520 unicode_t ch; 3644 unicode_t ch;
3521 bool seen_esc = false; 3645 bool seen_esc = false;
3522 unsigned int n = 0; 3646 unsigned int n = 0;
… …
3541 else if (ch < 0x20) 3665 else if (ch < 0x20)
3542 return NULL; /* other control character - exit */ 3666 return NULL; /* other control character - exit */
3543 3667
3544 seen_esc = false; 3668 seen_esc = false;
3545 3669
3546 if (n >= sizeof (string) - 1) 3670 if (n >= STRING_MAX - 1)
3547 // stop at some sane length 3671 // stop at some sane length
3548 return NULL; 3672 return NULL;
3549 3673
3550 if (ch == C0_SYN) 3674 if (ch == C0_SYN)
3551 string[n++] = cmd_get8 (); 3675 string[n++] = cmd_get8 ();
… …
3555 3679
3556 string[n++] = '\0'; 3680 string[n++] = '\0';
3557 3681
3558 ends_how = (ch == 0x5c ? C0_ESC : ch); 3682 ends_how = (ch == 0x5c ? C0_ESC : ch);
3559 3683
3560 return (unsigned char *)rxvt_wcstombs (string); 3684 return rxvt_wcstombs (string);
3561} 3685}
3562 3686
3563/*----------------------------------------------------------------------*/ 3687/*----------------------------------------------------------------------*/
3564/* 3688/*
3565 * 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)'
3566 */ 3690 */
3567void 3691void
3568rxvt_term::process_dcs_seq () 3692rxvt_term::process_dcs_seq ()
3569{ 3693{
3570 unsigned char *s; 3694 char *s;
3571 unicode_t eh; 3695 unicode_t eh;
3572 3696
3573 /* 3697 /*
3574 * Not handled yet 3698 * Not handled yet
3575 */ 3699 */
… …
3594 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3718 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3595 arg = arg * 10 + (ch - '0'); 3719 arg = arg * 10 + (ch - '0');
3596 3720
3597 if (ch == ';') 3721 if (ch == ';')
3598 { 3722 {
3599 unsigned char *s = get_to_st (eh); 3723 char *s = get_to_st (eh);
3600 3724
3601 if (s) 3725 if (s)
3602 { 3726 {
3603 process_xterm_seq (arg, (char *)s, eh); 3727 process_xterm_seq (arg, s, eh);
3604 free (s); 3728 free (s);
3605 } 3729 }
3606 } 3730 }
3607} 3731}
3608 3732
3609void 3733void
3610rxvt_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)
3611{ 3735{
3612 if (str[0] == '?' && !str[1]) 3736 if (str[0] == '?' && !str[1])
3613 { 3737 {
3614 unsigned short r, g, b; 3738 unsigned short r, g, b;
3615 pix_colors_focused[color].get (display, r, g, b); 3739 pix_colors_focused[color].get (display, r, g, b);
… …
3619 set_window_color (color, str); 3743 set_window_color (color, str);
3620} 3744}
3621 3745
3622/* 3746/*
3623 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3747 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3624 * 0 = change iconName/title
3625 * 1 = change iconName
3626 * 2 = change title
3627 * 4 = change color
3628 * 10 = change fg color
3629 * 11 = change bg color
3630 * 12 = change text color
3631 * 13 = change mouse foreground color
3632 * 17 = change highlight character colour
3633 * 18 = change bold character color
3634 * 19 = change underlined character color
3635 * 46 = change logfile (not implemented)
3636 * 50 = change font
3637 *
3638 * rxvt extensions:
3639 * 20 = bg pixmap
3640 * 39 = change default fg color
3641 * 49 = change default bg color
3642 * 55 = dump scrollback buffer and all of screen
3643 * 701 = change locale
3644 * 702 = find font
3645 * 703 = menu
3646 */ 3748 */
3647void 3749void
3648rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3750rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3649{ 3751{
3650 int changed = 0;
3651 int color; 3752 int color;
3652 char *buf, *name; 3753 char *buf, *name;
3653 bool query = str[0] == '?' && !str[1]; 3754 bool query = str[0] == '?' && !str[1];
3654 int saveop = op; 3755 int saveop = op;
3756 dDisp;
3655 3757
3656 assert (str != NULL); 3758 assert (str != NULL);
3657 switch (op) 3759 switch (op)
3658 { 3760 {
3659 case XTerm_name: 3761 case XTerm_name:
… …
3675 unsigned long bytes_after; 3777 unsigned long bytes_after;
3676 unsigned char *value = 0; 3778 unsigned char *value = 0;
3677 const char *str = ""; 3779 const char *str = "";
3678 3780
3679 if (prop 3781 if (prop
3680 && XGetWindowProperty (display->display, TermWin.parent[0], 3782 && XGetWindowProperty (disp, parent[0],
3681 prop, 0, 1<<16, 0, AnyPropertyType, 3783 prop, 0, 1<<16, 0, AnyPropertyType,
3682 &actual_type, &actual_format, 3784 &actual_type, &actual_format,
3683 &nitems, &bytes_after, &value) == Success 3785 &nitems, &bytes_after, &value) == Success
3684 && actual_type != None 3786 && actual_type != None
3685 && actual_format == 8) 3787 && actual_format == 8)
… …
3697 { 3799 {
3698 *eq = 0; 3800 *eq = 0;
3699 set_utf8_property (display->atom (str), eq + 1); 3801 set_utf8_property (display->atom (str), eq + 1);
3700 } 3802 }
3701 else 3803 else
3702 XDeleteProperty (display->display, TermWin.parent[0], 3804 XDeleteProperty (disp, parent[0],
3703 display->atom (str)); 3805 display->atom (str));
3704 } 3806 }
3705 break; 3807 break;
3706 3808
3707 case XTerm_Color: 3809 case XTerm_Color:
… …
3709 { 3811 {
3710 if ((name = strchr (buf, ';')) == NULL) 3812 if ((name = strchr (buf, ';')) == NULL)
3711 break; 3813 break;
3712 3814
3713 *name++ = '\0'; 3815 *name++ = '\0';
3714 color = atoi (buf); 3816 color = atoi (buf) + minCOLOR;
3715 3817
3716 if (color < 0 || color >= TOTAL_COLORS) 3818 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3717 break; 3819 break;
3718 3820
3719 if ((buf = strchr (name, ';')) != NULL) 3821 if ((buf = strchr (name, ';')) != NULL)
3720 *buf++ = '\0'; 3822 *buf++ = '\0';
3721 3823
3722 if (name[0] == '?' && !name[1]) 3824 if (name[0] == '?' && !name[1])
3723 { 3825 {
3724 unsigned short r, g, b; 3826 unsigned short r, g, b;
3725 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3827 pix_colors_focused[color].get (display, r, g, b);
3726 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);
3727 } 3829 }
3728 else 3830 else
3729 set_window_color (color + minCOLOR, name); 3831 set_window_color (color, name);
3730 } 3832 }
3731 break; 3833 break;
3732 case XTerm_Color00: 3834 case XTerm_Color00:
3733 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3835 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3734 break; 3836 break;
3735 case XTerm_Color01: 3837 case XTerm_Color01:
3736 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3838 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3737 break; 3839 break;
3738#ifndef NO_CURSORCOLOR 3840#ifndef NO_CURSORCOLOR
3739 case XTerm_Color_cursor: 3841 case XTerm_Color_cursor:
3740 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3842 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3741 break; 3843 break;
… …
3745 break; 3847 break;
3746 case XTerm_Color_pointer_bg: 3848 case XTerm_Color_pointer_bg:
3747 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);
3748 break; 3850 break;
3749#ifndef NO_BOLD_UNDERLINE_REVERSE 3851#ifndef NO_BOLD_UNDERLINE_REVERSE
3750 case XTerm_Color_BD:
3751 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3752 break;
3753 case XTerm_Color_IT:
3754 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3755 break;
3756 case XTerm_Color_UL:
3757 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3758 break;
3759 case XTerm_Color_RV: 3852 case XTerm_Color_RV:
3760 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3853 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3761 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;
3762#endif 3866#endif
3763#if TRANSPARENT && TINTING 3867#if TRANSPARENT && TINTING
3764 case XTerm_Color_tint: 3868 case URxvt_Color_tint:
3765 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3869 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3766 check_our_parents (); 3870 check_our_parents ();
3767 if (am_transparent) 3871 if (am_transparent)
3768 want_full_refresh = want_refresh = 1; 3872 want_full_refresh = want_refresh = 1;
3769 break; 3873 break;
3770#endif 3874#endif
3771 3875
3772 case XTerm_Pixmap: 3876 case Rxvt_Pixmap:
3877 {
3773 if (*str != ';') 3878 if (*str != ';')
3774 { 3879 {
3775#if XPM_BACKGROUND 3880#if XPM_BACKGROUND
3776 scale_pixmap (""); /* reset to default scaling */ 3881 scale_pixmap (""); /* reset to default scaling */
3777 set_bgPixmap (str); /* change pixmap */ 3882 set_bgPixmap (str); /* change pixmap */
3778#endif
3779 scr_touch (true); 3883 scr_touch (true);
3884#endif
3780 } 3885 }
3886
3887 int changed = 0;
3888
3781 while ((str = strchr (str, ';')) != NULL) 3889 while ((str = strchr (str, ';')) != NULL)
3782 { 3890 {
3783 str++; 3891 str++;
3784#if XPM_BACKGROUND 3892#if XPM_BACKGROUND
3785 changed += scale_pixmap (str); 3893 changed += scale_pixmap (str);
3786#endif 3894#endif
3787
3788 } 3895 }
3896
3789 if (changed) 3897 if (changed)
3790 { 3898 {
3791#ifdef XPM_BACKGROUND 3899#ifdef XPM_BACKGROUND
3792 resize_pixmap (); 3900 resize_pixmap ();
3793#endif
3794 scr_touch (true); 3901 scr_touch (true);
3902#endif
3795 } 3903 }
3904 }
3796 break; 3905 break;
3797 3906
3798 case XTerm_restoreFG: 3907 case Rxvt_restoreFG:
3799 set_window_color (Color_fg, str); 3908 set_window_color (Color_fg, str);
3800 break; 3909 break;
3801 case XTerm_restoreBG: 3910 case Rxvt_restoreBG:
3802 set_window_color (Color_bg, str); 3911 set_window_color (Color_bg, str);
3803 break; 3912 break;
3804 3913
3805 case XTerm_logfile: 3914 case XTerm_logfile:
3806 // TODO, when secure mode? 3915 // TODO, when secure mode?
3807 break; 3916 break;
3808 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
3809 case XTerm_font: 3930 case XTerm_font:
3810 op = URxvt_font; 3931 op = URxvt_font;
3811 case URxvt_font: 3932 case URxvt_font:
3812#if ENABLE_STYLES 3933#if ENABLE_STYLES
3813 case URxvt_boldFont: 3934 case URxvt_boldFont:
3814 case URxvt_italicFont: 3935 case URxvt_italicFont:
3815 case URxvt_boldItalicFont: 3936 case URxvt_boldItalicFont:
3816#endif 3937#endif
3817 if (query) 3938 if (query)
3818 tt_printf ("\33]%d;%-.250s%c", saveop, 3939 tt_printf ("\33]%d;%-.250s%c", saveop,
3819 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3940 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3820 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3941 ? fontset[op - URxvt_font]->fontdesc : "",
3821 resp); 3942 resp);
3822 else 3943 else
3823 { 3944 {
3824 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3945 const char *&res = rs[Rs_font + (op - URxvt_font)];
3825 3946
… …
3828 set_fonts (); 3949 set_fonts ();
3829 } 3950 }
3830 break; 3951 break;
3831 3952
3832#if ENABLE_FRILLS 3953#if ENABLE_FRILLS
3833 case XTerm_locale: 3954 case URxvt_locale:
3834 if (query) 3955 if (query)
3835 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);
3836 else 3957 else
3837 { 3958 {
3838 set_locale (str); 3959 set_locale (str);
3839# ifdef USE_XIM 3960 pty->set_utf8_mode (enc_utf8);
3840 im_cb (); 3961 init_xlocale ();
3841# endif
3842 } 3962 }
3843 break; 3963 break;
3844#endif
3845 3964
3846#ifdef MENUBAR 3965 case URxvt_view_up:
3847 case XTerm_Menu: 3966 case URxvt_view_down:
3848 if (options & Opt_insecure) 3967 {
3849 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
3850 break; 3976 break;
3851#endif 3977#endif
3852#if 0 3978
3853 case XTerm_dumpscreen: /* no error notices */ 3979#if ENABLE_PERL
3854 { 3980 case URxvt_perl:
3855 int fd; 3981 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3856 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3982 ; // no responses yet
3857 {
3858 scr_dump (fd);
3859 close (fd);
3860 }
3861 }
3862 break; 3983 break;
3863#endif 3984#endif
3864 } 3985 }
3865} 3986}
3866/*----------------------------------------------------------------------*/ 3987/*----------------------------------------------------------------------*/
… …
3897 return state; 4018 return state;
3898} 4019}
3899 4020
3900/* we're not using priv _yet_ */ 4021/* we're not using priv _yet_ */
3901void 4022void
3902rxvt_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)
3903{ 4024{
3904 unsigned int i, j; 4025 unsigned int i, j;
3905 int state; 4026 int state;
3906 4027
3907 static const struct 4028 static const struct
… …
3918 { 5, PrivMode_rVideo }, 4039 { 5, PrivMode_rVideo },
3919 { 6, PrivMode_relOrigin }, 4040 { 6, PrivMode_relOrigin },
3920 { 7, PrivMode_Autowrap }, 4041 { 7, PrivMode_Autowrap },
3921 // 8, bi-directional support mode 4042 // 8, bi-directional support mode
3922 { 9, PrivMode_MouseX10 }, 4043 { 9, PrivMode_MouseX10 },
3923#ifdef menuBar_esc
3924 { menuBar_esc, PrivMode_menuBar },
3925#endif
3926 // 18, 19 printing-related 4044 // 18, 19 printing-related
3927 { 25, PrivMode_VisibleCursor }, 4045 { 25, PrivMode_VisibleCursor },
3928#ifdef scrollBar_esc 4046#ifdef scrollBar_esc
3929 { scrollBar_esc, PrivMode_scrollBar }, 4047 { scrollBar_esc, PrivMode_scrollBar },
3930#endif 4048#endif
… …
3975 } 4093 }
3976 4094
3977 /* extra handling for values with state unkept */ 4095 /* extra handling for values with state unkept */
3978 switch (arg[i]) 4096 switch (arg[i])
3979 { 4097 {
4098#if ENABLE_STYLES
4099 case 1021:
4100 set_option (Opt_intensityStyles, mode);
4101
4102 scr_touch (true);
4103 break;
4104#endif
3980 case 1048: /* alternative cursor save */ 4105 case 1048: /* alternative cursor save */
3981 case 1049: 4106 case 1049:
3982 if (options & Opt_secondaryScreen) 4107 if (OPTION (Opt_secondaryScreen))
3983 if (mode == 0) 4108 if (mode == 0)
3984 scr_cursor (RESTORE); 4109 scr_cursor (RESTORE);
3985 else if (mode == 1) 4110 else if (mode == 1)
3986 scr_cursor (SAVE); 4111 scr_cursor (SAVE);
3987 break; 4112 break;
… …
3999 */ 4124 */
4000 PrivMode (1, PrivMode_vt52); 4125 PrivMode (1, PrivMode_vt52);
4001 break; 4126 break;
4002 case 3: /* 80/132 */ 4127 case 3: /* 80/132 */
4003 if (priv_modes & PrivMode_132OK) 4128 if (priv_modes & PrivMode_132OK)
4004 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4129 set_widthheight (((state ? 132 : 80) * fwidth), height);
4005 break; 4130 break;
4006 case 4: /* smooth scrolling */ 4131 case 4: /* smooth scrolling */
4007 if (state)
4008 options &= ~Opt_jumpScroll;
4009 else
4010 options |= Opt_jumpScroll; 4132 set_option (Opt_jumpScroll, !state);
4011 break; 4133 break;
4012 case 5: /* reverse video */ 4134 case 5: /* reverse video */
4013 scr_rvideo_mode (state); 4135 scr_rvideo_mode (state);
4014 break; 4136 break;
4015 case 6: /* relative/absolute origins */ 4137 case 6: /* relative/absolute origins */
… …
4021 /* 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 */
4022 case 9: /* X10 mouse reporting */ 4144 case 9: /* X10 mouse reporting */
4023 if (state) /* orthogonal */ 4145 if (state) /* orthogonal */
4024 priv_modes &= ~PrivMode_MouseX11; 4146 priv_modes &= ~PrivMode_MouseX11;
4025 break; 4147 break;
4026#ifdef menuBar_esc
4027 case menuBar_esc:
4028#ifdef MENUBAR
4029 map_menuBar (state);
4030#endif
4031 break;
4032#endif
4033#ifdef scrollBar_esc 4148#ifdef scrollBar_esc
4034 case scrollBar_esc: 4149 case scrollBar_esc:
4035 if (scrollbar_mapping (state)) 4150 if (scrollbar_mapping (state))
4036 { 4151 {
4037 resize_all_windows (0, 0, 0); 4152 resize_all_windows (0, 0, 0);
… …
4056#if 0 4171#if 0
4057 case 1001: 4172 case 1001:
4058 break; /* X11 mouse highlighting */ 4173 break; /* X11 mouse highlighting */
4059#endif 4174#endif
4060 case 1010: /* scroll to bottom on TTY output inhibit */ 4175 case 1010: /* scroll to bottom on TTY output inhibit */
4061 if (state)
4062 options &= ~Opt_scrollTtyOutput;
4063 else
4064 options |= Opt_scrollTtyOutput; 4176 set_option (Opt_scrollTtyOutput, !state);
4065 break; 4177 break;
4066 case 1011: /* scroll to bottom on key press */ 4178 case 1011: /* scroll to bottom on key press */
4067 if (state)
4068 options |= Opt_scrollTtyKeypress; 4179 set_option (Opt_scrollTtyKeypress, state);
4069 else
4070 options &= ~Opt_scrollTtyKeypress;
4071 break; 4180 break;
4072 case 1047: /* secondary screen w/ clearing last */ 4181 case 1047: /* secondary screen w/ clearing last */
4073 if (options & Opt_secondaryScreen) 4182 if (OPTION (Opt_secondaryScreen))
4074 if (current_screen != PRIMARY) 4183 if (current_screen != PRIMARY)
4075 scr_erase_screen (2); 4184 scr_erase_screen (2);
4076 scr_change_screen (state); 4185 scr_change_screen (state);
4077 break; 4186 break;
4078 case 1049: /* secondary screen w/ clearing first */ 4187 case 1049: /* secondary screen w/ clearing first */
4079 scr_change_screen (state); 4188 scr_change_screen (state);
4080 if (options & Opt_secondaryScreen) 4189 if (OPTION (Opt_secondaryScreen))
4081 if (current_screen != PRIMARY) 4190 if (current_screen != PRIMARY)
4082 scr_erase_screen (2); 4191 scr_erase_screen (2);
4083 break; 4192 break;
4084 default: 4193 default:
4085 break; 4194 break;
… …
4213 scr_color (Color_bg, Color_bg); 4322 scr_color (Color_bg, Color_bg);
4214 break; 4323 break;
4215 4324
4216 //case 50: // not variable spacing 4325 //case 50: // not variable spacing
4217 4326
4218#ifndef NO_BRIGHTCOLOR 4327#if ENABLE_FRILLS
4219 case 90: 4328 case 90:
4220 case 91: /* set bright fg color */ 4329 case 91: /* set bright fg color */
4221 case 92: 4330 case 92:
4222 case 93: 4331 case 93:
4223 case 94: 4332 case 94:
… …
4235 case 106: 4344 case 106:
4236 case 107: 4345 case 107:
4237 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4346 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4238 break; 4347 break;
4239#endif 4348#endif
4240
4241 } 4349 }
4242 } 4350 }
4243} 4351}
4244/*}}} */ 4352/*}}} */
4245 4353
… …
4269 */ 4377 */
4270void 4378void
4271rxvt_term::tt_printf (const char *fmt,...) 4379rxvt_term::tt_printf (const char *fmt,...)
4272{ 4380{
4273 va_list arg_ptr; 4381 va_list arg_ptr;
4274 unsigned char buf[256]; 4382 char buf[256];
4275 4383
4276 va_start (arg_ptr, fmt); 4384 va_start (arg_ptr, fmt);
4277 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4385 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4278 va_end (arg_ptr); 4386 va_end (arg_ptr);
4279 tt_write (buf, strlen (buf)); 4387 tt_write (buf, strlen (buf));
… …
4284 * or generated by us in response to a query ESC sequence. 4392 * or generated by us in response to a query ESC sequence.
4285 */ 4393 */
4286const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4394const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4287 4395
4288void 4396void
4289rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4397rxvt_term::tt_write (const char *data, unsigned int len)
4290{ 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
4291 if (v_buflen == 0) 4405 if (v_buflen == 0)
4292 { 4406 {
4293 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));
4294 4408
4295 if ((unsigned int)written == len) 4409 if ((unsigned int)written == len)
4296 return; 4410 return;
4297 4411
4298 data += written; 4412 data += written;
4299 len -= written; 4413 len -= written;
4300 } 4414 }
4301 4415
4302 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4416 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4303 4417
4304 memcpy (v_buffer + v_buflen, data, len); 4418 memcpy (v_buffer + v_buflen, data, len);
4305 v_buflen += len; 4419 v_buflen += len;
4306 4420
4307 pty_ev.set (EVENT_READ | EVENT_WRITE); 4421 pty_ev.set (EVENT_READ | EVENT_WRITE);
4308} 4422}
4309 4423
4310void rxvt_term::pty_write () 4424void rxvt_term::pty_write ()
4311{ 4425{
4312 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));
4313 4427
4314 if (written > 0) 4428 if (written > 0)
4315 { 4429 {
4316 v_buflen -= written; 4430 v_buflen -= written;
4317 4431
… …
4326 } 4440 }
4327 4441
4328 memmove (v_buffer, v_buffer + written, v_buflen); 4442 memmove (v_buffer, v_buffer + written, v_buflen);
4329 } 4443 }
4330 else if (written != -1 || (errno != EAGAIN && errno != EINTR)) 4444 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4331 // original code just ignores this... 4445 pty_ev.set (EVENT_READ);
4332 destroy ();
4333} 4446}
4334 4447
4335/*----------------------- end-of-file (C source) -----------------------*/ 4448/*----------------------- end-of-file (C source) -----------------------*/
4336 4449

Diff Legend

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