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.175 by root, Sat Dec 11 17:18:29 2004 UTC vs.
Revision 1.274 by root, Fri Jan 20 10:27:08 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, Sel_Primary);
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_WRITE)
1064 tt_write (0, 0);
1065 else if (revents & EVENT_READ) 1169 if (revents & EVENT_READ)
1066 // loop, but don't allow a single term to monopolize us 1170 // loop, but don't allow a single term to monopolize us
1067 while (pty_fill ()) 1171 while (pty_fill ())
1068 if (cmd_parse ()) 1172 if (cmd_parse ())
1069 break; 1173 break;
1174
1175 if (revents & EVENT_WRITE)
1176 pty_write ();
1070} 1177}
1071 1178
1072void 1179void
1073rxvt_term::pointer_unblank () 1180rxvt_term::pointer_unblank ()
1074{ 1181{
1075 XDefineCursor (display->display, TermWin.vt, TermWin_cursor); 1182 XDefineCursor (display->display, vt, TermWin_cursor);
1076 recolour_cursor (); 1183 recolour_cursor ();
1077 1184
1078#ifdef POINTER_BLANK 1185#ifdef POINTER_BLANK
1079 hidden_pointer = 0; 1186 hidden_pointer = 0;
1080 1187
1081 if (options & Opt_pointerBlank) 1188 if (OPTION (Opt_pointerBlank))
1082 pointer_ev.start (NOW + pointerBlankDelay); 1189 pointer_ev.start (NOW + pointerBlankDelay);
1083#endif 1190#endif
1084} 1191}
1085 1192
1086#ifdef POINTER_BLANK 1193#ifdef POINTER_BLANK
1087void 1194void
1088rxvt_term::pointer_blank () 1195rxvt_term::pointer_blank ()
1089{ 1196{
1090 if (! (options & Opt_pointerBlank)) 1197 if (!OPTION (Opt_pointerBlank))
1091 return; 1198 return;
1092 1199
1093 XDefineCursor (display->display, TermWin.vt, blank_cursor); 1200 XDefineCursor (display->display, vt, display->blank_cursor);
1094 XFlush (display->display); 1201 XFlush (display->display);
1095 1202
1096 hidden_pointer = 1; 1203 hidden_pointer = 1;
1097} 1204}
1098 1205
1099void 1206void
1100rxvt_term::pointer_cb (time_watcher &w) 1207rxvt_term::pointer_cb (time_watcher &w)
1101{ 1208{
1102 SET_R (this); 1209 make_current ();
1103 SET_LOCALE (locale);
1104 1210
1105 pointer_blank (); 1211 pointer_blank ();
1106} 1212}
1107#endif 1213#endif
1108 1214
… …
1187 1293
1188/*{{{ process an X event */ 1294/*{{{ process an X event */
1189void 1295void
1190rxvt_term::x_cb (XEvent &ev) 1296rxvt_term::x_cb (XEvent &ev)
1191{ 1297{
1192 SET_R (this); 1298 make_current ();
1193 SET_LOCALE (locale);
1194 1299
1195#if defined(CURSOR_BLINK) 1300 dDisp;
1196 if ((options & Opt_cursorBlink) && ev.type == KeyPress)
1197 {
1198 if (hidden_cursor)
1199 {
1200 hidden_cursor = 0;
1201 want_refresh = 1;
1202 }
1203 1301
1204 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1302 if (ev.xany.window == vt
1205 } 1303 && SHOULD_INVOKE (HOOK_X_EVENT)
1206#endif 1304 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1305 return;
1207 1306
1208#if defined(POINTER_BLANK) 1307 // for XQueryPointer
1209 if ((options & Opt_pointerBlank) && pointerBlankDelay > 0)
1210 {
1211 if (ev.type == MotionNotify
1212 || ev.type == ButtonPress
1213 || ev.type == ButtonRelease)
1214 if (hidden_pointer)
1215 pointer_unblank ();
1216
1217 if (ev.type == KeyPress && hidden_pointer == 0)
1218 pointer_blank ();
1219 }
1220#endif
1221
1222 Window unused_root, unused_child; 1308 Window unused_root, unused_child;
1223 int unused_root_x, unused_root_y; 1309 int unused_root_x, unused_root_y;
1224 unsigned int unused_mask; 1310 unsigned int unused_mask;
1225 1311
1226 switch (ev.type) 1312 switch (ev.type)
… …
1233 1319
1234 break; 1320 break;
1235 1321
1236 case KeyRelease: 1322 case KeyRelease:
1237 { 1323 {
1238#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1324#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1239 KeySym ks; 1325 KeySym keysym;
1240 1326
1241 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 :/
1242#endif 1328#endif
1243 1329
1244#if ENABLE_FRILLS || ISO_14755 1330#if ENABLE_FRILLS || ISO_14755
1245 // ISO 14755 support 1331 // ISO 14755 support
1246 if (iso14755buf) 1332 if (iso14755buf)
… …
1251# endif 1337# endif
1252# if ISO_14755 1338# if ISO_14755
1253 // iso14755 part 5.2 handling: release time 1339 // iso14755 part 5.2 handling: release time
1254 // first: controls 1340 // first: controls
1255 if ((ev.xkey.state & ControlMask) 1341 if ((ev.xkey.state & ControlMask)
1256 && ((ks >= 0x40 && ks <= 0x5f) 1342 && ((keysym >= 0x40 && keysym <= 0x5f)
1257 || (ks >= 0x61 && ks <= 0x7f))) 1343 || (keysym >= 0x61 && keysym <= 0x7f)))
1258 { 1344 {
1259 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1345 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1260 commit_iso14755 (); 1346 commit_iso14755 ();
1261 return; // case-break; 1347 goto skip_switch;
1262 } 1348 }
1263 1349
1264 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1350 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1265 if (i[0] == ks) 1351 if (i[0] == keysym)
1266 { 1352 {
1267 iso14755buf = ISO_14755_51 | i[1]; 1353 iso14755buf = ISO_14755_51 | i[1];
1268 commit_iso14755 (); 1354 commit_iso14755 ();
1269 return; // case-break; 1355 goto skip_switch;
1270 } 1356 }
1271 1357
1272 scr_bell (); 1358 scr_bell ();
1273# endif 1359# endif
1274 iso14755buf = 0; 1360 iso14755buf = 0;
… …
1293 else 1379 else
1294 iso14755buf = 0; 1380 iso14755buf = 0;
1295 } 1381 }
1296#endif 1382#endif
1297 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
1298#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1388#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1299 if (!(ev.xkey.state & ControlMask)) 1389 if (!(ev.xkey.state & ControlMask))
1300 slip_wheel_ev.stop (); 1390 slip_wheel_ev.stop ();
1301 else if (ks == XK_Control_L || ks == XK_Control_R) 1391 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1302 mouse_slip_wheel_speed = 0; 1392 mouse_slip_wheel_speed = 0;
1303#endif 1393#endif
1304 break; 1394 break;
1305 } 1395 }
1306 1396
… …
1312 button_release (ev.xbutton); 1402 button_release (ev.xbutton);
1313 break; 1403 break;
1314 1404
1315 case ClientMessage: 1405 case ClientMessage:
1316 if (ev.xclient.format == 32 1406 if (ev.xclient.format == 32
1407 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1408 {
1317 && (Atom)ev.xclient.data.l[0] == xa[XA_WMDELETEWINDOW]) 1409 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1318 destroy (); 1410 destroy ();
1411#if ENABLE_EWMH
1412 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1413 XSendEvent (disp, ev.xclient.window = display->root,
1414 False, SubstructureRedirectMask | SubstructureNotifyMask,
1415 &ev);
1416#endif
1417 }
1418#if ENABLE_XEMBED
1419 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1420 {
1421 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1422 focus_in ();
1423 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1424 focus_out ();
1425 }
1426#endif
1319#ifdef OFFIX_DND 1427#ifdef OFFIX_DND
1320 /* OffiX Dnd (drag 'n' drop) protocol */ 1428 /* OffiX Dnd (drag 'n' drop) protocol */
1321 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL] 1429 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1322 && (ev.xclient.data.l[0] == DndFile 1430 && (ev.xclient.data.l[0] == DndFile
1323 || ev.xclient.data.l[0] == DndDir 1431 || ev.xclient.data.l[0] == DndDir
1324 || ev.xclient.data.l[0] == DndLink)) 1432 || ev.xclient.data.l[0] == DndLink))
1325 { 1433 {
1326 /* Get Dnd data */ 1434 /* Get Dnd data */
1327 Atom ActualType; 1435 Atom ActualType;
1328 int ActualFormat; 1436 int ActualFormat;
1329 unsigned char *data; 1437 unsigned char *data;
1330 unsigned long Size, RemainingBytes; 1438 unsigned long Size, RemainingBytes;
1331 1439
1332 XGetWindowProperty (display->display, display->root, 1440 XGetWindowProperty (disp, display->root,
1333 xa[XA_DNDSELECTION], 1441 xa[XA_DNDSELECTION],
1334 0L, 1000000L, 1442 0L, 1000000L,
1335 False, AnyPropertyType, 1443 False, AnyPropertyType,
1336 &ActualType, &ActualFormat, 1444 &ActualType, &ActualFormat,
1337 &Size, &RemainingBytes, 1445 &Size, &RemainingBytes,
1338 &data); 1446 &data);
1339 set_string_property (XA_CUT_BUFFER0, data); 1447 set_string_property (XA_CUT_BUFFER0, data);
1340 XFree (data); 1448 XFree (data);
1341 selection_paste (display->root, XA_CUT_BUFFER0, True); 1449 selection_paste (display->root, XA_CUT_BUFFER0, true);
1342 XSetInputFocus (display->display, display->root, RevertToNone, CurrentTime); 1450 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1343 } 1451 }
1344#endif /* OFFIX_DND */ 1452#endif /* OFFIX_DND */
1345 break; 1453 break;
1346 1454
1347 case MappingNotify: 1455 case MappingNotify:
… …
1372 break; 1480 break;
1373 } 1481 }
1374 break; 1482 break;
1375 1483
1376 case FocusIn: 1484 case FocusIn:
1377 if (!TermWin.focus) 1485 focus_in ();
1486 break;
1487
1488 case FocusOut:
1489 focus_out ();
1490 break;
1491
1492 case ConfigureNotify:
1493 if (ev.xconfigure.window == parent[0])
1378 { 1494 {
1379 TermWin.focus = 1;
1380 want_refresh = 1;
1381#ifdef USE_XIM
1382 if (Input_Context != NULL)
1383 {
1384 IMSetStatusPosition ();
1385 XSetICFocus (Input_Context);
1386 }
1387#endif
1388#ifdef CURSOR_BLINK
1389 if (options & Opt_cursorBlink)
1390 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1391#endif
1392#ifdef OFF_FOCUS_FADING
1393 if (rs[Rs_fade])
1394 {
1395 pix_colors = pix_colors_focused;
1396 scr_recolour ();
1397 }
1398#endif
1399
1400 }
1401 break;
1402
1403 case FocusOut:
1404 if (TermWin.focus)
1405 {
1406 TermWin.focus = 0;
1407 want_refresh = 1;
1408
1409#if ENABLE_FRILLS || ISO_14755
1410 iso14755buf = 0;
1411#endif
1412#if ENABLE_OVERLAY
1413 scr_overlay_off ();
1414#endif
1415#ifdef USE_XIM
1416 if (Input_Context != NULL)
1417 XUnsetICFocus (Input_Context);
1418#endif
1419#ifdef CURSOR_BLINK
1420 if (options & Opt_cursorBlink)
1421 cursor_blink_ev.stop ();
1422 hidden_cursor = 0;
1423#endif
1424#ifdef OFF_FOCUS_FADING
1425 if (rs[Rs_fade])
1426 {
1427 pix_colors = pix_colors_unfocused;
1428 scr_recolour ();
1429 }
1430#endif
1431 }
1432 break;
1433
1434 case ConfigureNotify:
1435 if (ev.xconfigure.window == TermWin.parent[0])
1436 {
1437 int height, width;
1438
1439 do
1440 { /* Wrap lots of configures into one */
1441 width = ev.xconfigure.width;
1442 height = ev.xconfigure.height;
1443 D_SIZE ((stderr, "Size: ConfigureNotify: %4d x %4d", width, height));
1444 }
1445 while (XCheckTypedWindowEvent (display->display, ev.xconfigure.window, ConfigureNotify, &ev)); 1495 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev))
1496 ;
1446 1497
1447 if (szHint.width != width || szHint.height != height) 1498 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1448 { 1499 {
1449 seen_resize = 1; 1500 seen_resize = 1;
1450 resize_all_windows (width, height, 1); 1501 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1451 } 1502 }
1452 1503
1504 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1505
1453#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1506#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1454 if (options & Opt_transparent) 1507 if (OPTION (Opt_transparent))
1455 check_our_parents (); 1508 check_our_parents ();
1456#endif 1509#endif
1457 } 1510 }
1458 break; 1511 break;
1459 1512
… …
1468 selection_clear (); 1521 selection_clear ();
1469 break; 1522 break;
1470 1523
1471 case SelectionNotify: 1524 case SelectionNotify:
1472 if (selection_wait == Sel_normal) 1525 if (selection_wait == Sel_normal)
1473 selection_paste (ev.xselection.requestor, 1526 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1474 ev.xselection.property, True);
1475 break; 1527 break;
1476 1528
1477 case SelectionRequest: 1529 case SelectionRequest:
1478 selection_send (ev.xselectionrequest); 1530 selection_send (ev.xselectionrequest);
1479 break; 1531 break;
1480 1532
1533 case MapNotify:
1534 mapped = 1;
1535#ifdef TEXT_BLINK
1536 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1537#endif
1538 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1539 break;
1540
1481 case UnmapNotify: 1541 case UnmapNotify:
1482 TermWin.mapped = 0; 1542 mapped = 0;
1483#ifdef TEXT_BLINK 1543#ifdef TEXT_BLINK
1484 text_blink_ev.stop (); 1544 text_blink_ev.stop ();
1485#endif 1545#endif
1486 break; 1546 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; 1547 break;
1494 1548
1495#ifdef TRANSPARENT 1549#ifdef TRANSPARENT
1496 case ReparentNotify: 1550 case ReparentNotify:
1497 rootwin_cb (ev); 1551 rootwin_cb (ev);
1498 break; 1552 break;
1499#endif /* TRANSPARENT */ 1553#endif /* TRANSPARENT */
1500 1554
1501 case GraphicsExpose: 1555 case GraphicsExpose:
1502 case Expose: 1556 case Expose:
1503 if (ev.xany.window == TermWin.vt) 1557 if (ev.xany.window == vt)
1504 { 1558 {
1505 do 1559 do
1506 scr_expose (ev.xexpose.x, ev.xexpose.y, 1560 scr_expose (ev.xexpose.x, ev.xexpose.y,
1507 ev.xexpose.width, ev.xexpose.height, False); 1561 ev.xexpose.width, ev.xexpose.height, False);
1508 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)); 1562 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev));
1509 1563
1510 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1564 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1511 1565
1512 while (XCheckTypedWindowEvent (display->display, TermWin.vt, ev.xany.type, &ev)) 1566 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1513 scr_expose (ev.xexpose.x, ev.xexpose.y, 1567 scr_expose (ev.xexpose.x, ev.xexpose.y,
1514 ev.xexpose.width, ev.xexpose.height, False); 1568 ev.xexpose.width, ev.xexpose.height, False);
1515 1569
1516 scr_refresh (refresh_type); 1570 want_refresh = 1;
1517 } 1571 }
1518 else 1572 else
1519 { 1573 {
1520 XEvent unused_event; 1574 XEvent unused_event;
1521 1575
1522 while (XCheckTypedWindowEvent (display->display, ev.xany.window, Expose, &unused_event)) 1576 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event))
1523 ; 1577 ;
1524 while (XCheckTypedWindowEvent (display->display, ev.xany.window, GraphicsExpose, &unused_event)) 1578 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event))
1525 ; 1579 ;
1526 1580
1527 if (isScrollbarWindow (ev.xany.window)) 1581 if (isScrollbarWindow (ev.xany.window))
1528 { 1582 {
1529 scrollBar.setIdle (); 1583 scrollBar.setIdle ();
1530 scrollbar_show (0); 1584 scrollbar_show (0);
1531 } 1585 }
1532#ifdef MENUBAR
1533 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1534 menubar_expose ();
1535#endif
1536 1586
1537#ifdef TRANSPARENT 1587#ifdef TRANSPARENT
1538 if (am_transparent && ev.xany.window == TermWin.parent[0]) 1588 if (am_transparent && ev.xany.window == parent[0])
1539 XClearWindow (display->display, ev.xany.window); 1589 XClearWindow (disp, ev.xany.window);
1540#endif 1590#endif
1541 } 1591 }
1542 break; 1592 break;
1543 1593
1544 case MotionNotify: 1594 case MotionNotify:
1545#ifdef POINTER_BLANK 1595#ifdef POINTER_BLANK
1546 if (hidden_pointer) 1596 if (hidden_pointer)
1547 pointer_unblank (); 1597 pointer_unblank ();
1548#endif 1598#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) 1599 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1557 break; 1600 break;
1558 1601
1559 if (ev.xany.window == TermWin.vt) 1602 if (ev.xany.window == vt)
1560 { 1603 {
1604 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1605 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1606 ; // nop
1561 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1607 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1562 { 1608 {
1563 while (XCheckTypedWindowEvent (display->display, TermWin.vt, MotionNotify, &ev)) 1609 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1564 ; 1610 ;
1565 1611
1566 XQueryPointer (display->display, TermWin.vt, 1612 XQueryPointer (disp, vt,
1567 &unused_root, &unused_child, 1613 &unused_root, &unused_child,
1568 &unused_root_x, &unused_root_y, 1614 &unused_root_x, &unused_root_y,
1569 &ev.xbutton.x, &ev.xbutton.y, 1615 &ev.xbutton.x, &ev.xbutton.y,
1570 &ev.xbutton.state); 1616 &ev.xbutton.state);
1571#ifdef MOUSE_THRESHOLD 1617#ifdef MOUSE_THRESHOLD
… …
1583#endif 1629#endif
1584 selection_extend (ev.xbutton.x, ev.xbutton.y, 1630 selection_extend (ev.xbutton.x, ev.xbutton.y,
1585 ev.xbutton.state & Button3Mask ? 2 : 0); 1631 ev.xbutton.state & Button3Mask ? 2 : 0);
1586 1632
1587#ifdef SELECTION_SCROLLING 1633#ifdef SELECTION_SCROLLING
1588 if (ev.xbutton.y < TermWin.int_bwidth 1634 if (ev.xbutton.y < int_bwidth
1589 || Pixel2Row (ev.xbutton.y) > (TermWin.nrow-1)) 1635 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1590 { 1636 {
1591 int dist; 1637 int dist;
1592 1638
1593 /* don't clobber the current delay if we are 1639 /* don't clobber the current delay if we are
1594 * already in the middle of scrolling. 1640 * already in the middle of scrolling.
… …
1602 selection_save_x = ev.xbutton.x; 1648 selection_save_x = ev.xbutton.x;
1603 selection_save_y = ev.xbutton.y; 1649 selection_save_y = ev.xbutton.y;
1604 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0; 1650 selection_save_state = (ev.xbutton.state & Button3Mask) ? 2 : 0;
1605 1651
1606 /* calc number of lines to scroll */ 1652 /* calc number of lines to scroll */
1607 if (ev.xbutton.y < TermWin.int_bwidth) 1653 if (ev.xbutton.y < int_bwidth)
1608 { 1654 {
1609 scroll_selection_dir = UP; 1655 scroll_selection_dir = UP;
1610 dist = TermWin.int_bwidth - ev.xbutton.y; 1656 dist = int_bwidth - ev.xbutton.y;
1611 } 1657 }
1612 else 1658 else
1613 { 1659 {
1614 scroll_selection_dir = DN; 1660 scroll_selection_dir = DN;
1615 dist = ev.xbutton.y - (TermWin.int_bwidth + TermWin.height); 1661 dist = ev.xbutton.y - (int_bwidth + height);
1616 } 1662 }
1617 1663
1618 scroll_selection_lines = Pixel2Height (dist) 1664 scroll_selection_lines = Pixel2Height (dist)
1619 / SELECTION_SCROLL_LINE_SPEEDUP 1665 / SELECTION_SCROLL_LINE_SPEEDUP
1620 + 1; 1666 + 1;
1621 MIN_IT (scroll_selection_lines, 1667 min_it (scroll_selection_lines,
1622 SELECTION_SCROLL_MAX_LINES); 1668 SELECTION_SCROLL_MAX_LINES);
1623 } 1669 }
1624 else 1670 else
1625 { 1671 {
1626 /* we are within the text window, so we 1672 /* we are within the text window, so we
… …
1635#endif 1681#endif
1636 } 1682 }
1637 } 1683 }
1638 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1684 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1639 { 1685 {
1640 while (XCheckTypedWindowEvent (display->display, scrollBar.win, 1686 while (XCheckTypedWindowEvent (disp, scrollBar.win,
1641 MotionNotify, &ev)) 1687 MotionNotify, &ev))
1642 ; 1688 ;
1643 1689
1644 XQueryPointer (display->display, scrollBar.win, 1690 XQueryPointer (disp, scrollBar.win,
1645 &unused_root, &unused_child, 1691 &unused_root, &unused_child,
1646 &unused_root_x, &unused_root_y, 1692 &unused_root_x, &unused_root_y,
1647 &ev.xbutton.x, &ev.xbutton.y, 1693 &ev.xbutton.x, &ev.xbutton.y,
1648 &unused_mask); 1694 &unused_mask);
1649 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1695 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1650 scrollbar_size ()); 1696 scrollbar_size ());
1651 scr_refresh (refresh_type); 1697 want_refresh = 1;
1652 refresh_limit = 0; 1698 refresh_limit = 0;
1653 scrollbar_show (1); 1699 scrollbar_show (1);
1654 } 1700 }
1655 break; 1701 break;
1656 } 1702 }
1703
1704skip_switch: ;
1705
1706#if defined(CURSOR_BLINK)
1707 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1708 {
1709 if (hidden_cursor)
1710 {
1711 hidden_cursor = 0;
1712 want_refresh = 1;
1713 }
1714
1715 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1716 }
1717#endif
1718
1719#if defined(POINTER_BLANK)
1720 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1721 {
1722 if (ev.type == MotionNotify
1723 || ev.type == ButtonPress
1724 || ev.type == ButtonRelease)
1725 if (hidden_pointer)
1726 pointer_unblank ();
1727
1728 if (ev.type == KeyPress && hidden_pointer == 0)
1729 pointer_blank ();
1730 }
1731#endif
1732}
1733
1734void
1735rxvt_term::focus_in ()
1736{
1737 if (!focus)
1738 {
1739 focus = 1;
1740 want_refresh = 1;
1741
1742 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1743
1744#if USE_XIM
1745 if (Input_Context != NULL)
1746 {
1747 IMSetStatusPosition ();
1748 XSetICFocus (Input_Context);
1749 }
1750#endif
1751#if CURSOR_BLINK
1752 if (OPTION (Opt_cursorBlink))
1753 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1754#endif
1755#if OFF_FOCUS_FADING
1756 if (rs[Rs_fade])
1757 {
1758 pix_colors = pix_colors_focused;
1759 scr_recolour ();
1760 }
1761#endif
1762 }
1763}
1764
1765void
1766rxvt_term::focus_out ()
1767{
1768 if (focus)
1769 {
1770 focus = 0;
1771 want_refresh = 1;
1772
1773 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1774
1775#if ENABLE_FRILLS || ISO_14755
1776 if (iso14755buf)
1777 {
1778 iso14755buf = 0;
1779# if ENABLE_OVERLAY
1780 scr_overlay_off ();
1781# endif
1782 }
1783#endif
1784#if USE_XIM
1785 if (Input_Context != NULL)
1786 XUnsetICFocus (Input_Context);
1787#endif
1788#if CURSOR_BLINK
1789 if (OPTION (Opt_cursorBlink))
1790 cursor_blink_ev.stop ();
1791 hidden_cursor = 0;
1792#endif
1793#if OFF_FOCUS_FADING
1794 if (rs[Rs_fade])
1795 {
1796 pix_colors = pix_colors_unfocused;
1797 scr_recolour ();
1798 }
1799#endif
1800 }
1657} 1801}
1658 1802
1659#if TRANSPARENT 1803#if TRANSPARENT
1660void 1804void
1661rxvt_term::rootwin_cb (XEvent &ev) 1805rxvt_term::rootwin_cb (XEvent &ev)
1662{ 1806{
1663 SET_R (this); 1807 make_current ();
1664 SET_LOCALE (locale);
1665 1808
1666 switch (ev.type) 1809 switch (ev.type)
1667 { 1810 {
1668 case PropertyNotify: 1811 case PropertyNotify:
1669 /* 1812 /*
1670 * if user used some Esetroot compatible prog to set the root bg, 1813 * 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. 1814 * use the property to determine the pixmap. We use it later on.
1672 */ 1815 */
1673 if (xa[XA_XROOTPMAPID] == 0)
1674 xa[XA_XROOTPMAPID] = XInternAtom (display->display, "_XROOTPMAP_ID", False);
1675
1676 if (ev.xproperty.atom != xa[XA_XROOTPMAPID]) 1816 if (ev.xproperty.atom != xa[XA_XROOTPMAP_ID]
1817 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1677 return; 1818 return;
1678 1819
1679 /* FALLTHROUGH */ 1820 /* FALLTHROUGH */
1680 case ReparentNotify: 1821 case ReparentNotify:
1681 if ((options & Opt_transparent) && check_our_parents () && am_transparent) 1822 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1682 want_refresh = want_full_refresh = 1; 1823 want_refresh = want_full_refresh = 1;
1683 break; 1824 break;
1684 } 1825 }
1685} 1826}
1686#endif 1827#endif
… …
1689rxvt_term::button_press (XButtonEvent &ev) 1830rxvt_term::button_press (XButtonEvent &ev)
1690{ 1831{
1691 int reportmode = 0, clickintime; 1832 int reportmode = 0, clickintime;
1692 1833
1693 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1834 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1835
1694 if (!bypass_keystate) 1836 if (!bypass_keystate)
1695 reportmode = !! (priv_modes & PrivMode_mouse_report); 1837 reportmode = !! (priv_modes & PrivMode_mouse_report);
1696 1838
1697 /* 1839 /*
1698 * VT window processing of button press 1840 * VT window processing of button press
1699 */ 1841 */
1700 if (ev.window == TermWin.vt) 1842 if (ev.window == vt)
1701 { 1843 {
1702#if ISO_14755 1844#if ISO_14755
1703 // 5.4 1845 // 5.4
1704 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1846 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1705 { 1847 {
… …
1718#ifdef MOUSE_REPORT_DOUBLECLICK 1860#ifdef MOUSE_REPORT_DOUBLECLICK
1719 if (ev.button == MEvent.button && clickintime) 1861 if (ev.button == MEvent.button && clickintime)
1720 { 1862 {
1721 /* same button, within alloted time */ 1863 /* same button, within alloted time */
1722 MEvent.clicks++; 1864 MEvent.clicks++;
1865
1723 if (MEvent.clicks > 1) 1866 if (MEvent.clicks > 1)
1724 { 1867 {
1725 /* only report double clicks */ 1868 /* only report double clicks */
1726 MEvent.clicks = 2; 1869 MEvent.clicks = 2;
1727 mouse_report (ev); 1870 mouse_report (ev);
… …
1747 else 1890 else
1748 { 1891 {
1749 if (ev.button != MEvent.button) 1892 if (ev.button != MEvent.button)
1750 MEvent.clicks = 0; 1893 MEvent.clicks = 0;
1751 1894
1895 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1752 switch (ev.button) 1896 switch (ev.button)
1753 { 1897 {
1754 case Button1: 1898 case Button1:
1755 /* allow meta + click to select rectangular areas */ 1899 /* allow meta + click to select rectangular areas */
1756 /* should be done in screen.C */ 1900 /* should be done in screen.C */
1757#if ENABLE_FRILLS 1901#if ENABLE_FRILLS
1758 selection.rect = !! (ev.state & ModMetaMask); 1902 selection.rect = !!(ev.state & ModMetaMask);
1759#else 1903#else
1760 selection.rect = false; 1904 selection.rect = false;
1761#endif 1905#endif
1762 1906
1763 /* allow shift+left click to extend selection */ 1907 /* allow shift+left click to extend selection */
1764 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1908 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1765 { 1909 {
1766 if (MEvent.button == Button1 && clickintime) 1910 if (MEvent.button == Button1 && clickintime)
1767 selection_rotate (ev.x, ev.y); 1911 selection_rotate (ev.x, ev.y);
1768 else 1912 else
1769 selection_extend (ev.x, ev.y, 1); 1913 selection_extend (ev.x, ev.y, 1);
1770 } 1914 }
1771 else 1915 else
1772 { 1916 {
1773 if (MEvent.button == Button1 && clickintime) 1917 if (MEvent.button == Button1 && clickintime)
1774 MEvent.clicks++; 1918 MEvent.clicks++;
1775 else 1919 else
1776 MEvent.clicks = 1; 1920 MEvent.clicks = 1;
1777 1921
1778 selection_click (MEvent.clicks, ev.x, ev.y); 1922 selection_click (MEvent.clicks, ev.x, ev.y);
1779 } 1923 }
1780 1924
1781 MEvent.button = Button1; 1925 MEvent.button = Button1;
1782 break; 1926 break;
1783 1927
1784 case Button3: 1928 case Button3:
1785 if (MEvent.button == Button3 && clickintime) 1929 if (MEvent.button == Button3 && clickintime)
1786 selection_rotate (ev.x, ev.y); 1930 selection_rotate (ev.x, ev.y);
1787 else 1931 else
1788 selection_extend (ev.x, ev.y, 1); 1932 selection_extend (ev.x, ev.y, 1);
1789 1933
1790 MEvent.button = Button3; 1934 MEvent.button = Button3;
1791 break; 1935 break;
1792 } 1936 }
1793 } 1937 }
1794 1938
1795 MEvent.time = ev.time; 1939 MEvent.time = ev.time;
1796 return; 1940 return;
1797 } 1941 }
1798 1942
… …
1910 case Button3: 2054 case Button3:
1911 if (scrollBar.style != R_SB_XTERM) 2055 if (scrollBar.style != R_SB_XTERM)
1912 { 2056 {
1913 if (scrollbar_above_slider (ev.y)) 2057 if (scrollbar_above_slider (ev.y))
1914# ifdef RXVT_SCROLL_FULL 2058# ifdef RXVT_SCROLL_FULL
1915 scr_page (UP, TermWin.nrow - 1); 2059 scr_page (UP, nrow - 1);
1916# else 2060# else
1917 scr_page (UP, TermWin.nrow / 4); 2061 scr_page (UP, nrow / 4);
1918# endif 2062# endif
1919 else if (scrollbar_below_slider (ev.y)) 2063 else if (scrollbar_below_slider (ev.y))
1920# ifdef RXVT_SCROLL_FULL 2064# ifdef RXVT_SCROLL_FULL
1921 scr_page (DN, TermWin.nrow - 1); 2065 scr_page (DN, nrow - 1);
1922# else 2066# else
1923 scr_page (DN, TermWin.nrow / 4); 2067 scr_page (DN, nrow / 4);
1924# endif 2068# endif
1925 else 2069 else
1926 scrollBar.setMotion (); 2070 scrollBar.setMotion ();
1927 } 2071 }
1928 else 2072 else
1929 { 2073 {
1930 scr_page ((ev.button == Button1 ? DN : UP), 2074 scr_page ((ev.button == Button1 ? DN : UP),
1931 (TermWin.nrow 2075 (nrow
1932 * scrollbar_position (ev.y) 2076 * scrollbar_position (ev.y)
1933 / scrollbar_size ())); 2077 / scrollbar_size ()));
1934 } 2078 }
1935 2079
1936 break; 2080 break;
1937 } 2081 }
1938 } 2082 }
2083
1939 return; 2084 return;
1940 } 2085 }
1941#if MENUBAR
1942 /*
1943 * Menubar window processing of button press
1944 */
1945 if (isMenuBarWindow (ev.window))
1946 menubar_control (ev);
1947#endif
1948} 2086}
1949 2087
1950void 2088void
1951rxvt_term::button_release (XButtonEvent &ev) 2089rxvt_term::button_release (XButtonEvent &ev)
1952{ 2090{
… …
1958 2096
1959 if (scrollbar_isUpDn ()) 2097 if (scrollbar_isUpDn ())
1960 { 2098 {
1961 scrollBar.setIdle (); 2099 scrollBar.setIdle ();
1962 scrollbar_show (0); 2100 scrollbar_show (0);
1963#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1964 refresh_type &= ~SMOOTH_REFRESH;
1965#endif
1966 } 2101 }
1967 2102
1968#ifdef SELECTION_SCROLLING 2103#ifdef SELECTION_SCROLLING
1969 if (sel_scroll_ev.active) 2104 if (sel_scroll_ev.active)
1970 sel_scroll_ev.stop(); 2105 sel_scroll_ev.stop();
1971#endif 2106#endif
1972 2107
1973 if (ev.window == TermWin.vt) 2108 if (ev.window == vt)
1974 { 2109 {
1975#if ISO_14755 2110#if ISO_14755
1976 // 5.4 2111 // 5.4
1977 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2112 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1978 return; 2113 return;
… …
2008 if (priv_modes & PrivMode_mouse_report 2143 if (priv_modes & PrivMode_mouse_report
2009 && bypass_keystate 2144 && bypass_keystate
2010 && ev.button == Button1 && MEvent.clicks <= 1) 2145 && ev.button == Button1 && MEvent.clicks <= 1)
2011 selection_extend (ev.x, ev.y, 0); 2146 selection_extend (ev.x, ev.y, 0);
2012 2147
2148 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2149 return;
2150
2013 switch (ev.button) 2151 switch (ev.button)
2014 { 2152 {
2015 case Button1: 2153 case Button1:
2016 case Button3: 2154 case Button3:
2017 selection_make (ev.time); 2155 selection_make (ev.time);
2018 break; 2156 break;
2157
2019 case Button2: 2158 case Button2:
2020 selection_request (ev.time, ev.x, ev.y); 2159 if (IN_RANGE_EXC (ev.x, 0, width)
2160 && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2161 {
2162 if (ev.state & ShiftMask)
2163 selection_request (ev.time, Sel_Clipboard);
2164 else
2165 selection_request (ev.time, Sel_Primary);
2166 }
2021 break; 2167 break;
2168
2022#ifdef MOUSE_WHEEL 2169#ifdef MOUSE_WHEEL
2023 case Button4: 2170 case Button4:
2024 case Button5: 2171 case Button5:
2025 { 2172 {
2026 int i; 2173 int i;
… …
2028 2175
2029 v = ev.button == Button4 ? UP : DN; 2176 v = ev.button == Button4 ? UP : DN;
2030 2177
2031 if (ev.state & ShiftMask) 2178 if (ev.state & ShiftMask)
2032 i = 1; 2179 i = 1;
2033 else if (options & Opt_mouseWheelScrollPage) 2180 else if (OPTION (Opt_mouseWheelScrollPage))
2034 i = TermWin.nrow - 1; 2181 i = nrow - 1;
2035 else 2182 else
2036 i = 5; 2183 i = 5;
2037 2184
2038# ifdef MOUSE_SLIP_WHEELING 2185# ifdef MOUSE_SLIP_WHEELING
2039 if (ev.state & ControlMask) 2186 if (ev.state & ControlMask)
2040 { 2187 {
2041 mouse_slip_wheel_speed += v ? -1 : 1; 2188 mouse_slip_wheel_speed += v ? -1 : 1;
2042 if (mouse_slip_wheel_speed < -TermWin.nrow) mouse_slip_wheel_speed = -TermWin.nrow; 2189 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2043 if (mouse_slip_wheel_speed > +TermWin.nrow) mouse_slip_wheel_speed = +TermWin.nrow; 2190 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2044 2191
2045 if (slip_wheel_ev.at < NOW) 2192 if (slip_wheel_ev.at < NOW)
2046 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY; 2193 slip_wheel_ev.at = NOW + SCROLLBAR_CONTINUOUS_DELAY;
2047 2194
2048 slip_wheel_ev.start (); 2195 slip_wheel_ev.start ();
2049 } 2196 }
2050 else 2197 else
2051 { 2198 {
2052# endif 2199# endif
2053# ifdef JUMP_MOUSE_WHEEL
2054 scr_page (v, i); 2200 scr_page (v, i);
2055 scr_refresh (SMOOTH_REFRESH);
2056 scrollbar_show (1); 2201 scrollbar_show (1);
2057# else
2058 while (i--)
2059 {
2060 scr_page (v, 1);
2061 scr_refresh (SMOOTH_REFRESH);
2062 scrollbar_show (1);
2063 }
2064# endif
2065# ifdef MOUSE_SLIP_WHEELING 2202# ifdef MOUSE_SLIP_WHEELING
2066 } 2203 }
2067#endif 2204# endif
2068 } 2205 }
2069 break; 2206 break;
2070#endif 2207#endif
2071 } 2208 }
2072 } 2209 }
2073#ifdef MENUBAR
2074 else if (isMenuBarWindow (ev.window))
2075 menubar_control (ev);
2076#endif
2077} 2210}
2078 2211
2079#ifdef TRANSPARENT 2212#ifdef TRANSPARENT
2080#if TINTING 2213#if TINTING
2081/* taken from aterm-0.4.2 */ 2214/* taken from aterm-0.4.2 */
… …
2089 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2222 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2090 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2223 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2091 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2224 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2092 int i; 2225 int i;
2093 2226
2094 Visual* visual = display->visual; 2227 Visual *visual = display->visual;
2095 2228
2096 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2229 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2097 2230
2098 /* for convenience */ 2231 /* for convenience */
2099 mask_r = visual->red_mask; 2232 mask_r = visual->red_mask;
… …
2320 Atom atype; 2453 Atom atype;
2321 unsigned char *prop = NULL; 2454 unsigned char *prop = NULL;
2322 Window root, oldp, *list; 2455 Window root, oldp, *list;
2323 Pixmap rootpixmap = None; 2456 Pixmap rootpixmap = None;
2324 XWindowAttributes wattr, wrootattr; 2457 XWindowAttributes wattr, wrootattr;
2458 dDisp;
2325 2459
2326 pchanged = 0; 2460 pchanged = 0;
2327 2461
2328 if (!(options & Opt_transparent)) 2462 if (!OPTION (Opt_transparent))
2329 return pchanged; /* Don't try any more */ 2463 return pchanged; /* Don't try any more */
2330 2464
2331 XGetWindowAttributes (display->display, display->root, &wrootattr); 2465 XGetWindowAttributes (disp, display->root, &wrootattr);
2332 rootdepth = wrootattr.depth; 2466 rootdepth = wrootattr.depth;
2333 2467
2334 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 2468 XGetWindowAttributes (disp, parent[0], &wattr);
2335 2469
2336 if (rootdepth != wattr.depth) 2470 if (rootdepth != wattr.depth)
2337 { 2471 {
2338 if (am_transparent) 2472 if (am_transparent)
2339 { 2473 {
2340 pchanged = 1; 2474 pchanged = 1;
2341 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2475 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2342 am_transparent = am_pixmap_trans = 0; 2476 am_transparent = am_pixmap_trans = 0;
2343 } 2477 }
2344 2478
2345 return pchanged; /* Don't try any more */ 2479 return pchanged; /* Don't try any more */
2346 } 2480 }
2347 2481
2348 /* Get all X ops out of the queue so that our information is up-to-date. */ 2482 /* Get all X ops out of the queue so that our information is up-to-date. */
2349 XSync (display->display, False); 2483 XSync (disp, False);
2350 2484
2351 /* 2485 /*
2352 * Make the frame window set by the window manager have 2486 * Make the frame window set by the window manager have
2353 * the root background. Some window managers put multiple nested frame 2487 * the root background. Some window managers put multiple nested frame
2354 * windows for each client, so we have to take care about that. 2488 * windows for each client, so we have to take care about that.
2355 */ 2489 */
2356 i = (xa[XA_XROOTPMAPID] 2490 i = (xa[XA_XROOTPMAP_ID]
2357 && XGetWindowProperty (display->display, display->root, xa[XA_XROOTPMAPID], 2491 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID],
2358 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2492 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2359 &nitems, &bytes_after, &prop) == Success); 2493 &nitems, &bytes_after, &prop) == Success);
2360 2494
2361 if (!i || prop == NULL) 2495 if (!i || prop == NULL)
2362 i = (xa[XA_XSETROOTID] 2496 i = (xa[XA_ESETROOT_PMAP_ID]
2363 && XGetWindowProperty (display->display, display->root, xa[XA_XSETROOTID], 2497 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID],
2364 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2498 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2365 &nitems, &bytes_after, &prop) == Success); 2499 &nitems, &bytes_after, &prop) == Success);
2366 2500
2367 if (!i || prop == NULL 2501 if (!i || prop == NULL
2368#if TINTING 2502#if TINTING
… …
2387 Window cr; 2521 Window cr;
2388 XImage *image; 2522 XImage *image;
2389 GC gc; 2523 GC gc;
2390 XGCValues gcvalue; 2524 XGCValues gcvalue;
2391 2525
2392 XTranslateCoordinates (display->display, TermWin.parent[0], display->root, 2526 XTranslateCoordinates (disp, parent[0], display->root,
2393 0, 0, &sx, &sy, &cr); 2527 0, 0, &sx, &sy, &cr);
2394 nw = (unsigned int)szHint.width; 2528 nw = (unsigned int)szHint.width;
2395 nh = (unsigned int)szHint.height; 2529 nh = (unsigned int)szHint.height;
2396 nx = ny = 0; 2530 nx = ny = 0;
2397 2531
… …
2407 nh += sy; 2541 nh += sy;
2408 ny = -sy; 2542 ny = -sy;
2409 sy = 0; 2543 sy = 0;
2410 } 2544 }
2411 2545
2412 MIN_IT (nw, (unsigned int) (wrootattr.width - sx)); 2546 min_it (nw, (unsigned int) (wrootattr.width - sx));
2413 MIN_IT (nh, (unsigned int) (wrootattr.height - sy)); 2547 min_it (nh, (unsigned int) (wrootattr.height - sy));
2414 2548
2415 XSync (display->display, False); 2549 XSync (disp, False);
2416 allowedxerror = -1; 2550 allowedxerror = -1;
2417 image = XGetImage (display->display, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2551 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2418 2552
2419 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2553 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2420 /* XXX: may need a delay here? */ 2554 /* XXX: may need a delay here? */
2421 allowedxerror = 0; 2555 allowedxerror = 0;
2422 2556
2423 if (image == NULL) 2557 if (image == NULL)
2424 { 2558 {
2425 if (am_transparent && am_pixmap_trans) 2559 if (am_transparent && am_pixmap_trans)
2426 { 2560 {
2427 pchanged = 1; 2561 pchanged = 1;
2428 if (TermWin.pixmap != None) 2562 if (pixmap != None)
2429 { 2563 {
2430 XFreePixmap (display->display, TermWin.pixmap); 2564 XFreePixmap (disp, pixmap);
2431 TermWin.pixmap = None; 2565 pixmap = None;
2432 } 2566 }
2433 } 2567 }
2434 2568
2435 am_pixmap_trans = 0; 2569 am_pixmap_trans = 0;
2436 } 2570 }
2437 else 2571 else
2438 { 2572 {
2439 if (TermWin.pixmap != None) 2573 if (pixmap != None)
2440 XFreePixmap (display->display, TermWin.pixmap); 2574 XFreePixmap (disp, pixmap);
2441 2575
2442#if TINTING 2576#if TINTING
2443 if (ISSET_PIXCOLOR (Color_tint)) 2577 if (ISSET_PIXCOLOR (Color_tint))
2444 { 2578 {
2445 unsigned short rm, gm, bm; 2579 unsigned short rm, gm, bm;
… …
2449 2583
2450 ShadeXImage (display, image, shade, rm, gm, bm); 2584 ShadeXImage (display, image, shade, rm, gm, bm);
2451 } 2585 }
2452#endif 2586#endif
2453 2587
2454 TermWin.pixmap = XCreatePixmap (display->display, TermWin.vt, 2588 pixmap = XCreatePixmap (disp, vt,
2455 szHint.width, szHint.height, image->depth); 2589 szHint.width, szHint.height, image->depth);
2456 gc = XCreateGC (display->display, TermWin.vt, 0UL, &gcvalue); 2590 gc = XCreateGC (disp, vt, 0UL, &gcvalue);
2457 XPutImage (display->display, TermWin.pixmap, gc, image, 0, 0, 2591 XPutImage (disp, pixmap, gc, image, 0, 0,
2458 nx, ny, image->width, image->height); 2592 nx, ny, image->width, image->height);
2459 XFreeGC (display->display, gc); 2593 XFreeGC (disp, gc);
2460 XDestroyImage (image); 2594 XDestroyImage (image);
2461 XSetWindowBackgroundPixmap (display->display, TermWin.parent[0], TermWin.pixmap); 2595 XSetWindowBackgroundPixmap (disp, parent[0], pixmap);
2462 XClearWindow (display->display, TermWin.parent[0]); 2596 XClearWindow (disp, parent[0]);
2463 2597
2464 if (!am_transparent || !am_pixmap_trans) 2598 if (!am_transparent || !am_pixmap_trans)
2465 pchanged = 1; 2599 pchanged = 1;
2466 2600
2467 am_transparent = am_pixmap_trans = 1; 2601 am_transparent = am_pixmap_trans = 1;
2468 } 2602 }
2469 } 2603 }
2470 2604
2471 if (am_pixmap_trans) 2605 if (am_pixmap_trans)
2472 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2606 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2473 else 2607 else
2474 { 2608 {
2475 unsigned int n; 2609 unsigned int n;
2476 /* 2610 /*
2477 * InheritPixmap transparency 2611 * InheritPixmap transparency
2478 */ 2612 */
2479 for (i = 1; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2613 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2480 { 2614 {
2481 oldp = TermWin.parent[i]; 2615 oldp = parent[i];
2482 XQueryTree (display->display, TermWin.parent[i - 1], &root, 2616 XQueryTree (disp, parent[i - 1], &root,
2483 &TermWin.parent[i], &list, &n); 2617 &parent[i], &list, &n);
2484 XFree (list); 2618 XFree (list);
2485 2619
2486 if (TermWin.parent[i] == display->root) 2620 if (parent[i] == display->root)
2487 { 2621 {
2488 if (oldp != None) 2622 if (oldp != None)
2489 pchanged = 1; 2623 pchanged = 1;
2490 2624
2491 break; 2625 break;
2492 } 2626 }
2493 2627
2494 if (oldp != TermWin.parent[i]) 2628 if (oldp != parent[i])
2495 pchanged = 1; 2629 pchanged = 1;
2496 } 2630 }
2497 2631
2498 n = 0; 2632 n = 0;
2499 2633
2500 if (pchanged) 2634 if (pchanged)
2501 { 2635 {
2502 for (; n < (unsigned int)i; n++) 2636 for (; n < (unsigned int)i; n++)
2503 { 2637 {
2504 XGetWindowAttributes (display->display, TermWin.parent[n], &wattr); 2638 XGetWindowAttributes (disp, parent[n], &wattr);
2505 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2639 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2506 { 2640 {
2507 n = (int) (sizeof (TermWin.parent) / sizeof (Window)) + 1; 2641 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2508 break; 2642 break;
2509 } 2643 }
2510 } 2644 }
2511 } 2645 }
2512 2646
2513 if (n > (int) (sizeof (TermWin.parent) / sizeof (TermWin.parent[0]))) 2647 if (n > (int) (sizeof (parent) / sizeof (parent[0])))
2514 { 2648 {
2515 XSetWindowBackground (display->display, TermWin.parent[0], pix_colors_focused[Color_fg]); 2649 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]);
2516 XSetWindowBackground (display->display, TermWin.vt, pix_colors_focused[Color_bg]); 2650 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]);
2517 am_transparent = 0; 2651 am_transparent = 0;
2518 /* XXX: also turn off Opt_transparent? */ 2652 /* XXX: also turn off Opt_transparent? */
2519 } 2653 }
2520 else 2654 else
2521 { 2655 {
… …
2524 * needed for fvwm2.2.2 (and before?) */ 2658 * needed for fvwm2.2.2 (and before?) */
2525 sleep (1); 2659 sleep (1);
2526#endif 2660#endif
2527 for (n = 0; n < (unsigned int)i; n++) 2661 for (n = 0; n < (unsigned int)i; n++)
2528 { 2662 {
2529 XSetWindowBackgroundPixmap (display->display, TermWin.parent[n], ParentRelative); 2663 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative);
2530 XClearWindow (display->display, TermWin.parent[n]); 2664 XClearWindow (disp, parent[n]);
2531 } 2665 }
2532 2666
2533 XSetWindowBackgroundPixmap (display->display, TermWin.vt, ParentRelative); 2667 XSetWindowBackgroundPixmap (disp, vt, ParentRelative);
2534 am_transparent = 1; 2668 am_transparent = 1;
2535 } 2669 }
2536 2670
2537 for (; i < (int) (sizeof (TermWin.parent) / sizeof (Window)); i++) 2671 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2538 TermWin.parent[i] = None; 2672 parent[i] = None;
2539 } 2673 }
2540 2674
2541 if (scrollBar.win) 2675 if (scrollBar.win)
2542 { 2676 {
2543 XSetWindowBackgroundPixmap (display->display, scrollBar.win, ParentRelative); 2677 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative);
2544 scrollBar.setIdle (); 2678 scrollBar.setIdle ();
2545 scrollbar_show (0); 2679 scrollbar_show (0);
2546 } 2680 }
2547 2681
2548 if (am_transparent) 2682 if (am_transparent)
… …
2560 2694
2561bool 2695bool
2562rxvt_term::cmd_parse () 2696rxvt_term::cmd_parse ()
2563{ 2697{
2564 bool flag = false; 2698 bool flag = false;
2565 unicode_t ch = NOCHAR; 2699 wchar_t ch = NOCHAR;
2566 unsigned char *seq_begin; // remember start of esc-sequence here 2700 char *seq_begin; // remember start of esc-sequence here
2567 2701
2568 for (;;) 2702 for (;;)
2569 { 2703 {
2570 if (ch == NOCHAR) 2704 if (ch == NOCHAR)
2571 { 2705 {
2572 seq_begin = cmdbuf_ptr; 2706 seq_begin = cmdbuf_ptr;
2573 ch = next_char (); 2707 ch = next_char ();
2574 }
2575 2708
2576 if (ch == NOCHAR) // TODO: improve 2709 if (ch == NOCHAR)
2577 break; 2710 break;
2711 }
2578 2712
2579 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2713 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2580 { 2714 {
2581 if (!seen_input) 2715 if (!seen_input)
2582 { 2716 {
… …
2586 // some window managers resize the window early, and these programs 2720 // some window managers resize the window early, and these programs
2587 // then sometimes get the size wrong. 2721 // then sometimes get the size wrong.
2588 // unfortunately other programs are even more buggy and dislike 2722 // unfortunately other programs are even more buggy and dislike
2589 // being sent SIGWINCH, so only do it when we were in fact being 2723 // being sent SIGWINCH, so only do it when we were in fact being
2590 // resized. 2724 // resized.
2591 if (seen_resize) 2725 if (seen_resize && cmd_pid)
2592 kill (-cmd_pid, SIGWINCH); 2726 kill (-cmd_pid, SIGWINCH);
2593 } 2727 }
2594 2728
2595 /* Read a text string from the input buffer */ 2729 /* Read a text string from the input buffer */
2596 unicode_t buf[UBUFSIZ]; 2730 wchar_t buf[UBUFSIZ];
2597 bool refreshnow = false; 2731 bool refreshnow = false;
2598 int nlines = 0; 2732 int nlines = 0;
2599 unicode_t *str = buf; 2733 wchar_t *str = buf;
2734 wchar_t *eol = str + min (ncol, UBUFSIZ);
2600 2735
2601 for (;;) 2736 for (;;)
2602 { 2737 {
2603 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2738 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2604 break; 2739 break;
2605 2740
2606 *str++ = ch; 2741 *str++ = ch;
2607 2742
2608 if (ch == C0_LF) 2743 if (ch == C0_LF || str >= eol)
2609 { 2744 {
2745 if (ch == C0_LF)
2610 nlines++; 2746 nlines++;
2747
2611 refresh_count++; 2748 refresh_count++;
2612 2749
2613 if (!(options & Opt_jumpScroll) 2750 if (!OPTION (Opt_jumpScroll)
2614 || (refresh_count >= refresh_limit * (TermWin.nrow - 1))) 2751 || (refresh_count >= refresh_limit * (nrow - 1)))
2615 { 2752 {
2616 refreshnow = true; 2753 refreshnow = true;
2754 refresh_count = 0;
2617 ch = NOCHAR; 2755 ch = NOCHAR;
2618 break; 2756 break;
2619 } 2757 }
2620 2758
2621 // scr_add_lines only works for nlines <= TermWin.nrow - 1. 2759 // scr_add_lines only works for nlines <= nrow - 1.
2622 if (nlines >= TermWin.nrow - 1) 2760 if (nlines >= nrow - 1)
2623 { 2761 {
2762 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2763 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2624 scr_add_lines (buf, nlines, str - buf); 2764 scr_add_lines (buf, str - buf, nlines);
2765
2625 nlines = 0; 2766 nlines = 0;
2626 str = buf; 2767 str = buf;
2768 eol = str + min (ncol, UBUFSIZ);
2627 } 2769 }
2628 }
2629 2770
2630 if (str >= buf + UBUFSIZ) 2771 if (str >= eol)
2631 { 2772 {
2773 if (eol >= buf + UBUFSIZ)
2774 {
2632 ch = NOCHAR; 2775 ch = NOCHAR;
2633 break; 2776 break;
2777 }
2778 else
2779 eol = min (eol + ncol, buf + UBUFSIZ);
2780 }
2781
2634 } 2782 }
2635 2783
2636 seq_begin = cmdbuf_ptr; 2784 seq_begin = cmdbuf_ptr;
2637 ch = next_char (); 2785 ch = next_char ();
2638 } 2786 }
2639 2787
2788 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2789 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2640 scr_add_lines (buf, nlines, str - buf); 2790 scr_add_lines (buf, str - buf, nlines);
2641 2791
2642 /* 2792 /*
2643 * If there have been a lot of new lines, then update the screen 2793 * If there have been a lot of new lines, then update the screen
2644 * What the heck I'll cheat and only refresh less than every page-full. 2794 * What the heck I'll cheat and only refresh less than every page-full.
2645 * the number of pages between refreshes is refresh_limit, which 2795 * the number of pages between refreshes is refresh_limit, which
2646 * is incremented here because we must be doing flat-out scrolling. 2796 * is incremented here because we must be doing flat-out scrolling.
2647 */ 2797 */
2648 if (refreshnow) 2798 if (refreshnow)
2649 { 2799 {
2650 if ((options & Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2800 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2651 refresh_limit++; 2801 refresh_limit++;
2652 else 2802 else
2653 { 2803 {
2654 flag = true; 2804 flag = true;
2655 scr_refresh (refresh_type); 2805 scr_refresh ();
2806 want_refresh = 1;
2656 } 2807 }
2657 } 2808 }
2658 2809
2659 } 2810 }
2660 else 2811 else
… …
2675 } 2826 }
2676 2827
2677 return flag; 2828 return flag;
2678} 2829}
2679 2830
2680// read the next octet
2681unicode_t
2682rxvt_term::next_octet ()
2683{
2684 return cmdbuf_ptr < cmdbuf_endp
2685 ? *cmdbuf_ptr++
2686 : NOCHAR;
2687}
2688
2689// read the next character 2831// read the next character
2690unicode_t 2832wchar_t
2691rxvt_term::next_char () 2833rxvt_term::next_char () NOTHROW
2692{ 2834{
2693 while (cmdbuf_ptr < cmdbuf_endp) 2835 while (cmdbuf_ptr < cmdbuf_endp)
2694 { 2836 {
2695 // assume 7-bit to be ascii ALWAYS 2837 // assume 7-bit to be ascii ALWAYS
2696 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2838 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2697 return *cmdbuf_ptr++; 2839 return *cmdbuf_ptr++;
2698 2840
2699 wchar_t wc; 2841 wchar_t wc;
2700 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2842 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2701 2843
2702 if (len == (size_t)-2) 2844 if (len == (size_t)-2)
2703 { 2845 {
2704 // the mbstate stores incomplete sequences. didn't know this :/ 2846 // the mbstate stores incomplete sequences. didn't know this :/
2705 cmdbuf_ptr = cmdbuf_endp; 2847 cmdbuf_ptr = cmdbuf_endp;
2706 break; 2848 break;
2707 } 2849 }
2708 2850
2709 if (len == (size_t)-1) 2851 if (len == (size_t)-1)
2710 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2852 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2711 2853
2712 // assume wchar == unicode 2854 // assume wchar == unicode
2713 cmdbuf_ptr += len; 2855 cmdbuf_ptr += len;
2714 return wc; 2856 return wc & UNICODE_MASK;
2715 } 2857 }
2716 2858
2717 return NOCHAR; 2859 return NOCHAR;
2718} 2860}
2861
2862// read the next octet
2863uint32_t
2864rxvt_term::next_octet () NOTHROW
2865{
2866 return cmdbuf_ptr < cmdbuf_endp
2867 ? (unsigned char)*cmdbuf_ptr++
2868 : NOCHAR;
2869}
2870
2871static class out_of_input out_of_input;
2719 2872
2720/* rxvt_cmd_getc () - Return next input character */ 2873/* rxvt_cmd_getc () - Return next input character */
2721/* 2874/*
2722 * Return the next input character after first passing any keyboard input 2875 * Return the next input character after first passing any keyboard input
2723 * to the command. 2876 * to the command.
2724 */ 2877 */
2725unicode_t 2878wchar_t
2726rxvt_term::cmd_getc () 2879rxvt_term::cmd_getc () THROW ((class out_of_input))
2727{ 2880{
2728 unicode_t c = next_char (); 2881 wchar_t c = next_char ();
2729 2882
2730 if (c == NOCHAR) 2883 if (c == NOCHAR)
2731 throw out_of_input; 2884 throw out_of_input;
2732 2885
2733 return c; 2886 return c;
2734} 2887}
2735 2888
2736unicode_t 2889uint32_t
2737rxvt_term::cmd_get8 () 2890rxvt_term::cmd_get8 () THROW ((class out_of_input))
2738{ 2891{
2739 unicode_t c = next_octet (); 2892 uint32_t c = next_octet ();
2740 2893
2741 if (c == NOCHAR) 2894 if (c == NOCHAR)
2742 throw out_of_input; 2895 throw out_of_input;
2743 2896
2744 return c; 2897 return c;
… …
2844 case C0_ESC: 2997 case C0_ESC:
2845 process_escape_seq (); 2998 process_escape_seq ();
2846 break; 2999 break;
2847 case C0_ENQ: /* terminal Status */ 3000 case C0_ENQ: /* terminal Status */
2848 if (rs[Rs_answerbackstring]) 3001 if (rs[Rs_answerbackstring])
2849 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3002 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2850 (unsigned int)strlen (rs[Rs_answerbackstring]));
2851 else 3003 else
2852 tt_write ((unsigned char *)VT100_ANS, 3004 tt_write (VT100_ANS, strlen (VT100_ANS));
2853 (unsigned int)strlen (VT100_ANS));
2854 break; 3005 break;
2855 case C0_BEL: /* bell */ 3006 case C0_BEL: /* bell */
2856 scr_bell (); 3007 scr_bell ();
2857 break; 3008 break;
2858 case C0_BS: /* backspace */ 3009 case C0_BS: /* backspace */
… …
3013 break; 3164 break;
3014 3165
3015 /* 8.3.87: NEXT LINE */ 3166 /* 8.3.87: NEXT LINE */
3016 case C1_NEL: /* ESC E */ 3167 case C1_NEL: /* ESC E */
3017 { 3168 {
3018 unicode_t nlcr[] = { C0_LF, C0_CR }; 3169 wchar_t nlcr[] = { C0_LF, C0_CR };
3019 scr_add_lines (nlcr, 1, 2); 3170 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3020 } 3171 }
3021 break; 3172 break;
3022 3173
3023 /* kidnapped escape sequence: Should be 8.3.48 */ 3174 /* kidnapped escape sequence: Should be 8.3.48 */
3024 case C1_ESA: /* ESC G */ 3175 case C1_ESA: /* ESC G */
… …
3046 process_dcs_seq (); 3197 process_dcs_seq ();
3047 break; 3198 break;
3048 3199
3049 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3200 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3050 case C1_SCI: /* ESC Z */ 3201 case C1_SCI: /* ESC Z */
3051 tt_write ((const unsigned char *)ESCZ_ANSWER, 3202 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3052 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3053 break; /* steal obsolete ESC [ c */ 3203 break; /* steal obsolete ESC [ c */
3054 3204
3055 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3205 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3056 case C1_CSI: /* ESC [ */ 3206 case C1_CSI: /* ESC [ */
3057 process_csi_seq (); 3207 process_csi_seq ();
… …
3182 { 3332 {
3183 switch (priv) 3333 switch (priv)
3184 { 3334 {
3185 case '>': 3335 case '>':
3186 if (ch == CSI_DA) /* secondary device attributes */ 3336 if (ch == CSI_DA) /* secondary device attributes */
3187 tt_printf ("\033[>%d;%-.8s;0c", 'R', VSTRING); 3337 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]);
3188 break; 3338 break;
3189 case '?': 3339 case '?':
3190 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3340 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3191 process_terminal_mode (ch, priv, nargs, arg); 3341 process_terminal_mode (ch, priv, nargs, arg);
3192 break; 3342 break;
… …
3297 3447
3298 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */ 3448 case CSI_SD: /* 8.3.114: (1) SCROLL DOWN */
3299 arg[0] = -arg[0]; 3449 arg[0] = -arg[0];
3300 /* FALLTHROUGH */ 3450 /* FALLTHROUGH */
3301 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3451 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3302 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0], 0); 3452 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3303 break; 3453 break;
3304 3454
3305 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3455 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3306 tt_write ((const unsigned char *)VT100_ANS, 3456 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3307 (unsigned int) (sizeof (VT100_ANS) - 1));
3308 break; 3457 break;
3309 3458
3310 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3459 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3311 process_sgr_mode (nargs, arg); 3460 process_sgr_mode (nargs, arg);
3312 break; 3461 break;
… …
3319 break; 3468 break;
3320 case 6: /* CPR requested */ 3469 case 6: /* CPR requested */
3321 scr_report_position (); 3470 scr_report_position ();
3322 break; 3471 break;
3323 case 7: /* unofficial extension */ 3472 case 7: /* unofficial extension */
3324 if (options & Opt_insecure) 3473 if (OPTION (Opt_insecure))
3325 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3474 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3326 break; 3475 break;
3327 case 8: /* unofficial extension */ 3476 case 8: /* unofficial extension */
3328 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3477 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3329 break; 3478 break;
… …
3421rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3570rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3422{ 3571{
3423 int x, y; 3572 int x, y;
3424 XWindowAttributes wattr; 3573 XWindowAttributes wattr;
3425 Window wdummy; 3574 Window wdummy;
3575 dDisp;
3426 3576
3427 if (nargs == 0) 3577 if (nargs == 0)
3428 return; 3578 return;
3429 3579
3430 switch (args[0]) 3580 switch (args[0])
3431 { 3581 {
3432 /* 3582 /*
3433 * commands 3583 * commands
3434 */ 3584 */
3435 case 1: /* deiconify window */ 3585 case 1: /* deiconify window */
3436 XMapWindow (display->display, TermWin.parent[0]); 3586 XMapWindow (disp, parent[0]);
3437 break; 3587 break;
3438 case 2: /* iconify window */ 3588 case 2: /* iconify window */
3439 XIconifyWindow (display->display, TermWin.parent[0], 3589 XIconifyWindow (disp, parent[0], display->screen);
3440 DefaultScreen (display->display));
3441 break; 3590 break;
3442 case 3: /* set position (pixels) */ 3591 case 3: /* set position (pixels) */
3443 XMoveWindow (display->display, TermWin.parent[0], args[1], args[2]); 3592 XMoveWindow (disp, parent[0], args[1], args[2]);
3444 break; 3593 break;
3445 case 4: /* set size (pixels) */ 3594 case 4: /* set size (pixels) */
3446 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3595 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3447 break; 3596 break;
3448 case 5: /* raise window */ 3597 case 5: /* raise window */
3449 XRaiseWindow (display->display, TermWin.parent[0]); 3598 XRaiseWindow (disp, parent[0]);
3450 break; 3599 break;
3451 case 6: /* lower window */ 3600 case 6: /* lower window */
3452 XLowerWindow (display->display, TermWin.parent[0]); 3601 XLowerWindow (disp, parent[0]);
3453 break; 3602 break;
3454 case 7: /* refresh window */ 3603 case 7: /* refresh window */
3455 scr_touch (true); 3604 scr_touch (true);
3456 break; 3605 break;
3457 case 8: /* set size (chars) */ 3606 case 8: /* set size (chars) */
3458 set_widthheight ((unsigned int) (args[2] * TermWin.fwidth), 3607 set_widthheight ((unsigned int) (args[2] * fwidth),
3459 (unsigned int) (args[1] * TermWin.fheight)); 3608 (unsigned int) (args[1] * fheight));
3460 break; 3609 break;
3461 3610
3462 //case 9: NYI, TODO, restore maximized window or maximize window 3611 //case 9: NYI, TODO, restore maximized window or maximize window
3463 default: 3612 default:
3464 if (args[0] >= 24) /* set height (chars) */ 3613 if (args[0] >= 24) /* set height (chars) */
3465 set_widthheight ((unsigned int)TermWin.width, 3614 set_widthheight ((unsigned int)width,
3466 (unsigned int) (args[1] * TermWin.fheight)); 3615 (unsigned int) (args[1] * fheight));
3467 break; 3616 break;
3468 3617
3469 3618
3470 /* 3619 /*
3471 * reports - some output format copied from XTerm 3620 * reports - some output format copied from XTerm
3472 */ 3621 */
3473 case 11: /* report window state */ 3622 case 11: /* report window state */
3474 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3623 XGetWindowAttributes (disp, parent[0], &wattr);
3475 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3624 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3476 break; 3625 break;
3477 case 13: /* report window position */ 3626 case 13: /* report window position */
3478 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3627 XGetWindowAttributes (disp, parent[0], &wattr);
3479 XTranslateCoordinates (display->display, TermWin.parent[0], wattr.root, 3628 XTranslateCoordinates (disp, parent[0], wattr.root,
3480 -wattr.border_width, -wattr.border_width, 3629 -wattr.border_width, -wattr.border_width,
3481 &x, &y, &wdummy); 3630 &x, &y, &wdummy);
3482 tt_printf ("\033[3;%d;%dt", x, y); 3631 tt_printf ("\033[3;%d;%dt", x, y);
3483 break; 3632 break;
3484 case 14: /* report window size (pixels) */ 3633 case 14: /* report window size (pixels) */
3485 XGetWindowAttributes (display->display, TermWin.parent[0], &wattr); 3634 XGetWindowAttributes (disp, parent[0], &wattr);
3486 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3635 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3487 break; 3636 break;
3488 case 18: /* report text area size (chars) */ 3637 case 18: /* report text area size (chars) */
3489 tt_printf ("\033[8;%d;%dt", TermWin.nrow, TermWin.ncol); 3638 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3490 break; 3639 break;
3491 case 19: /* report window size (chars) */ 3640 case 19: /* report window size (chars) */
3492 tt_printf ("\033[9;%d;%dt", TermWin.nrow, TermWin.ncol); 3641 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3493 break; 3642 break;
3494 case 20: /* report icon label */ 3643 case 20: /* report icon label */
3495 { 3644 {
3496 char *s; 3645 char *s;
3497 XGetIconName (display->display, TermWin.parent[0], &s); 3646 XGetIconName (disp, parent[0], &s);
3498 tt_printf ("\033]L%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3647 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3499 XFree (s); 3648 XFree (s);
3500 } 3649 }
3501 break; 3650 break;
3502 case 21: /* report window title */ 3651 case 21: /* report window title */
3503 { 3652 {
3504 char *s; 3653 char *s;
3505 XFetchName (display->display, TermWin.parent[0], &s); 3654 XFetchName (disp, parent[0], &s);
3506 tt_printf ("\033]l%-.250s\234", (options & Opt_insecure) && s ? s : ""); /* 8bit ST */ 3655 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3507 XFree (s); 3656 XFree (s);
3508 } 3657 }
3509 break; 3658 break;
3510 } 3659 }
3511} 3660}
… …
3514/*----------------------------------------------------------------------*/ 3663/*----------------------------------------------------------------------*/
3515/* 3664/*
3516 * get input up until STRING TERMINATOR (or BEL) 3665 * get input up until STRING TERMINATOR (or BEL)
3517 * ends_how is terminator used. returned input must be free()'d 3666 * ends_how is terminator used. returned input must be free()'d
3518 */ 3667 */
3519unsigned char * 3668char *
3520rxvt_term::get_to_st (unicode_t &ends_how) 3669rxvt_term::get_to_st (unicode_t &ends_how)
3521{ 3670{
3522 unicode_t ch; 3671 unicode_t ch;
3523 bool seen_esc = false; 3672 bool seen_esc = false;
3524 unsigned int n = 0; 3673 unsigned int n = 0;
… …
3543 else if (ch < 0x20) 3692 else if (ch < 0x20)
3544 return NULL; /* other control character - exit */ 3693 return NULL; /* other control character - exit */
3545 3694
3546 seen_esc = false; 3695 seen_esc = false;
3547 3696
3548 if (n >= sizeof (string) - 1) 3697 if (n >= STRING_MAX - 1)
3549 // stop at some sane length 3698 // stop at some sane length
3550 return NULL; 3699 return NULL;
3551 3700
3552 if (ch == C0_SYN) 3701 if (ch == C0_SYN)
3553 string[n++] = cmd_get8 (); 3702 string[n++] = cmd_get8 ();
… …
3557 3706
3558 string[n++] = '\0'; 3707 string[n++] = '\0';
3559 3708
3560 ends_how = (ch == 0x5c ? C0_ESC : ch); 3709 ends_how = (ch == 0x5c ? C0_ESC : ch);
3561 3710
3562 return (unsigned char *)rxvt_wcstombs (string); 3711 return rxvt_wcstombs (string);
3563} 3712}
3564 3713
3565/*----------------------------------------------------------------------*/ 3714/*----------------------------------------------------------------------*/
3566/* 3715/*
3567 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3716 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3568 */ 3717 */
3569void 3718void
3570rxvt_term::process_dcs_seq () 3719rxvt_term::process_dcs_seq ()
3571{ 3720{
3572 unsigned char *s; 3721 char *s;
3573 unicode_t eh; 3722 unicode_t eh;
3574 3723
3575 /* 3724 /*
3576 * Not handled yet 3725 * Not handled yet
3577 */ 3726 */
… …
3596 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3745 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3597 arg = arg * 10 + (ch - '0'); 3746 arg = arg * 10 + (ch - '0');
3598 3747
3599 if (ch == ';') 3748 if (ch == ';')
3600 { 3749 {
3601 unsigned char *s = get_to_st (eh); 3750 char *s = get_to_st (eh);
3602 3751
3603 if (s) 3752 if (s)
3604 { 3753 {
3605 process_xterm_seq (arg, (char *)s, eh); 3754 process_xterm_seq (arg, s, eh);
3606 free (s); 3755 free (s);
3607 } 3756 }
3608 } 3757 }
3609} 3758}
3610 3759
3611void 3760void
3612rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3761rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3613{ 3762{
3614 if (str[0] == '?' && !str[1]) 3763 if (str[0] == '?' && !str[1])
3615 { 3764 {
3616 unsigned short r, g, b; 3765 unsigned short r, g, b;
3617 pix_colors_focused[color].get (display, r, g, b); 3766 pix_colors_focused[color].get (display, r, g, b);
… …
3621 set_window_color (color, str); 3770 set_window_color (color, str);
3622} 3771}
3623 3772
3624/* 3773/*
3625 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3774 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3626 * 0 = change iconName/title
3627 * 1 = change iconName
3628 * 2 = change title
3629 * 4 = change color
3630 * 10 = change fg color
3631 * 11 = change bg color
3632 * 12 = change text color
3633 * 13 = change mouse foreground color
3634 * 17 = change highlight character colour
3635 * 18 = change bold character color
3636 * 19 = change underlined character color
3637 * 46 = change logfile (not implemented)
3638 * 50 = change font
3639 *
3640 * rxvt extensions:
3641 * 20 = bg pixmap
3642 * 39 = change default fg color
3643 * 49 = change default bg color
3644 * 55 = dump scrollback buffer and all of screen
3645 * 701 = change locale
3646 * 702 = find font
3647 * 703 = menu
3648 */ 3775 */
3649void 3776void
3650rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3777rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3651{ 3778{
3652 int changed = 0;
3653 int color; 3779 int color;
3654 char *buf, *name; 3780 char *buf, *name;
3655 bool query = str[0] == '?' && !str[1]; 3781 bool query = str[0] == '?' && !str[1];
3656 int saveop = op; 3782 int saveop = op;
3783 dDisp;
3657 3784
3658 assert (str != NULL); 3785 assert (str != NULL);
3659 switch (op) 3786 switch (op)
3660 { 3787 {
3661 case XTerm_name: 3788 case XTerm_name:
… …
3677 unsigned long bytes_after; 3804 unsigned long bytes_after;
3678 unsigned char *value = 0; 3805 unsigned char *value = 0;
3679 const char *str = ""; 3806 const char *str = "";
3680 3807
3681 if (prop 3808 if (prop
3682 && XGetWindowProperty (display->display, TermWin.parent[0], 3809 && XGetWindowProperty (disp, parent[0],
3683 prop, 0, 1<<16, 0, AnyPropertyType, 3810 prop, 0, 1<<16, 0, AnyPropertyType,
3684 &actual_type, &actual_format, 3811 &actual_type, &actual_format,
3685 &nitems, &bytes_after, &value) == Success 3812 &nitems, &bytes_after, &value) == Success
3686 && actual_type != None 3813 && actual_type != None
3687 && actual_format == 8) 3814 && actual_format == 8)
… …
3699 { 3826 {
3700 *eq = 0; 3827 *eq = 0;
3701 set_utf8_property (display->atom (str), eq + 1); 3828 set_utf8_property (display->atom (str), eq + 1);
3702 } 3829 }
3703 else 3830 else
3704 XDeleteProperty (display->display, TermWin.parent[0], 3831 XDeleteProperty (disp, parent[0],
3705 display->atom (str)); 3832 display->atom (str));
3706 } 3833 }
3707 break; 3834 break;
3708 3835
3709 case XTerm_Color: 3836 case XTerm_Color:
… …
3711 { 3838 {
3712 if ((name = strchr (buf, ';')) == NULL) 3839 if ((name = strchr (buf, ';')) == NULL)
3713 break; 3840 break;
3714 3841
3715 *name++ = '\0'; 3842 *name++ = '\0';
3716 color = atoi (buf); 3843 color = atoi (buf) + minCOLOR;
3717 3844
3718 if (color < 0 || color >= TOTAL_COLORS) 3845 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3719 break; 3846 break;
3720 3847
3721 if ((buf = strchr (name, ';')) != NULL) 3848 if ((buf = strchr (name, ';')) != NULL)
3722 *buf++ = '\0'; 3849 *buf++ = '\0';
3723 3850
3724 if (name[0] == '?' && !name[1]) 3851 if (name[0] == '?' && !name[1])
3725 { 3852 {
3726 unsigned short r, g, b; 3853 unsigned short r, g, b;
3727 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3854 pix_colors_focused[color].get (display, r, g, b);
3728 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3855 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3729 } 3856 }
3730 else 3857 else
3731 set_window_color (color + minCOLOR, name); 3858 set_window_color (color, name);
3732 } 3859 }
3733 break; 3860 break;
3734 case XTerm_Color00: 3861 case XTerm_Color00:
3735 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3862 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3736 break; 3863 break;
3737 case XTerm_Color01: 3864 case XTerm_Color01:
3738 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3865 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3739 break; 3866 break;
3740#ifndef NO_CURSORCOLOR 3867#ifndef NO_CURSORCOLOR
3741 case XTerm_Color_cursor: 3868 case XTerm_Color_cursor:
3742 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3869 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3743 break; 3870 break;
… …
3747 break; 3874 break;
3748 case XTerm_Color_pointer_bg: 3875 case XTerm_Color_pointer_bg:
3749 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3876 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3750 break; 3877 break;
3751#ifndef NO_BOLD_UNDERLINE_REVERSE 3878#ifndef NO_BOLD_UNDERLINE_REVERSE
3752 case XTerm_Color_BD:
3753 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3754 break;
3755 case XTerm_Color_IT:
3756 process_color_seq (XTerm_Color_IT, Color_IT, str, resp);
3757 break;
3758 case XTerm_Color_UL:
3759 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3760 break;
3761 case XTerm_Color_RV: 3879 case XTerm_Color_RV:
3762 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3880 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3763 break; 3881 break;
3882 case Rxvt_Color_BD:
3883 case URxvt_Color_BD:
3884 process_color_seq (op, Color_BD, str, resp);
3885 break;
3886 case Rxvt_Color_UL:
3887 case URxvt_Color_UL:
3888 process_color_seq (op, Color_UL, str, resp);
3889 break;
3890 case URxvt_Color_IT:
3891 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3892 break;
3764#endif 3893#endif
3765#if TRANSPARENT && TINTING 3894#if TRANSPARENT && TINTING
3766 case XTerm_Color_tint: 3895 case URxvt_Color_tint:
3767 process_color_seq (XTerm_Color_tint, Color_tint, str, resp); 3896 process_color_seq (URxvt_Color_tint, Color_tint, str, resp);
3768 check_our_parents (); 3897 check_our_parents ();
3769 if (am_transparent) 3898 if (am_transparent)
3770 want_full_refresh = want_refresh = 1; 3899 want_full_refresh = want_refresh = 1;
3771 break; 3900 break;
3772#endif 3901#endif
3773 3902
3774 case XTerm_Pixmap: 3903 case Rxvt_Pixmap:
3904 {
3775 if (*str != ';') 3905 if (*str != ';')
3776 { 3906 {
3777#if XPM_BACKGROUND 3907#if XPM_BACKGROUND
3778 scale_pixmap (""); /* reset to default scaling */ 3908 scale_pixmap (""); /* reset to default scaling */
3779 set_bgPixmap (str); /* change pixmap */ 3909 set_bgPixmap (str); /* change pixmap */
3780#endif
3781 scr_touch (true); 3910 scr_touch (true);
3911#endif
3782 } 3912 }
3913
3914 int changed = 0;
3915
3783 while ((str = strchr (str, ';')) != NULL) 3916 while ((str = strchr (str, ';')) != NULL)
3784 { 3917 {
3785 str++; 3918 str++;
3786#if XPM_BACKGROUND 3919#if XPM_BACKGROUND
3787 changed += scale_pixmap (str); 3920 changed += scale_pixmap (str);
3788#endif 3921#endif
3789
3790 } 3922 }
3923
3791 if (changed) 3924 if (changed)
3792 { 3925 {
3793#ifdef XPM_BACKGROUND 3926#ifdef XPM_BACKGROUND
3794 resize_pixmap (); 3927 resize_pixmap ();
3795#endif
3796 scr_touch (true); 3928 scr_touch (true);
3929#endif
3797 } 3930 }
3931 }
3798 break; 3932 break;
3799 3933
3800 case XTerm_restoreFG: 3934 case Rxvt_restoreFG:
3801 set_window_color (Color_fg, str); 3935 set_window_color (Color_fg, str);
3802 break; 3936 break;
3803 case XTerm_restoreBG: 3937 case Rxvt_restoreBG:
3804 set_window_color (Color_bg, str); 3938 set_window_color (Color_bg, str);
3805 break; 3939 break;
3806 3940
3807 case XTerm_logfile: 3941 case XTerm_logfile:
3808 // TODO, when secure mode? 3942 // TODO, when secure mode?
3809 break; 3943 break;
3810 3944
3945#if 0
3946 case Rxvt_dumpscreen: /* no error notices */
3947 {
3948 int fd;
3949 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3950 {
3951 scr_dump (fd);
3952 close (fd);
3953 }
3954 }
3955 break;
3956#endif
3811 case XTerm_font: 3957 case XTerm_font:
3812 op = URxvt_font; 3958 op = URxvt_font;
3813 case URxvt_font: 3959 case URxvt_font:
3814#if ENABLE_STYLES 3960#if ENABLE_STYLES
3815 case URxvt_boldFont: 3961 case URxvt_boldFont:
3816 case URxvt_italicFont: 3962 case URxvt_italicFont:
3817 case URxvt_boldItalicFont: 3963 case URxvt_boldItalicFont:
3818#endif 3964#endif
3819 if (query) 3965 if (query)
3820 tt_printf ("\33]%d;%-.250s%c", saveop, 3966 tt_printf ("\33]%d;%-.250s%c", saveop,
3821 (options & Opt_insecure) && TermWin.fontset[op - URxvt_font]->fontdesc 3967 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3822 ? TermWin.fontset[op - URxvt_font]->fontdesc : "", 3968 ? fontset[op - URxvt_font]->fontdesc : "",
3823 resp); 3969 resp);
3824 else 3970 else
3825 { 3971 {
3826 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3972 const char *&res = rs[Rs_font + (op - URxvt_font)];
3827 3973
… …
3830 set_fonts (); 3976 set_fonts ();
3831 } 3977 }
3832 break; 3978 break;
3833 3979
3834#if ENABLE_FRILLS 3980#if ENABLE_FRILLS
3835 case XTerm_locale: 3981 case URxvt_locale:
3836 if (query) 3982 if (query)
3837 tt_printf ("\33]%d;%-.250s%c", XTerm_locale, (options & Opt_insecure) ? locale : "", resp); 3983 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3838 else 3984 else
3839 { 3985 {
3840 set_locale (str); 3986 set_locale (str);
3841# ifdef USE_XIM 3987 pty->set_utf8_mode (enc_utf8);
3842 im_cb (); 3988 init_xlocale ();
3843# endif
3844 } 3989 }
3845 break; 3990 break;
3846#endif
3847 3991
3848#ifdef MENUBAR 3992 case URxvt_view_up:
3849 case XTerm_Menu: 3993 case URxvt_view_down:
3850 if (options & Opt_insecure) 3994 {
3851 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3995 int lines = atoi (str);
3996
3997 if (lines)
3998 scr_page (op == URxvt_view_up ? UP : DN, lines);
3999 else
4000 scr_erase_savelines ();
4001 }
4002
3852 break; 4003 break;
3853#endif 4004#endif
3854#if 0 4005
3855 case XTerm_dumpscreen: /* no error notices */ 4006#if ENABLE_PERL
3856 { 4007 case URxvt_perl:
3857 int fd; 4008 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3858 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 4009 ; // no responses yet
3859 {
3860 scr_dump (fd);
3861 close (fd);
3862 }
3863 }
3864 break; 4010 break;
3865#endif 4011#endif
3866 } 4012 }
3867} 4013}
3868/*----------------------------------------------------------------------*/ 4014/*----------------------------------------------------------------------*/
… …
3899 return state; 4045 return state;
3900} 4046}
3901 4047
3902/* we're not using priv _yet_ */ 4048/* we're not using priv _yet_ */
3903void 4049void
3904rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4050rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3905{ 4051{
3906 unsigned int i, j; 4052 unsigned int i, j;
3907 int state; 4053 int state;
3908 4054
3909 static const struct 4055 static const struct
… …
3920 { 5, PrivMode_rVideo }, 4066 { 5, PrivMode_rVideo },
3921 { 6, PrivMode_relOrigin }, 4067 { 6, PrivMode_relOrigin },
3922 { 7, PrivMode_Autowrap }, 4068 { 7, PrivMode_Autowrap },
3923 // 8, bi-directional support mode 4069 // 8, bi-directional support mode
3924 { 9, PrivMode_MouseX10 }, 4070 { 9, PrivMode_MouseX10 },
3925#ifdef menuBar_esc
3926 { menuBar_esc, PrivMode_menuBar },
3927#endif
3928 // 18, 19 printing-related 4071 // 18, 19 printing-related
3929 { 25, PrivMode_VisibleCursor }, 4072 { 25, PrivMode_VisibleCursor },
3930#ifdef scrollBar_esc 4073#ifdef scrollBar_esc
3931 { scrollBar_esc, PrivMode_scrollBar }, 4074 { scrollBar_esc, PrivMode_scrollBar },
3932#endif 4075#endif
… …
3977 } 4120 }
3978 4121
3979 /* extra handling for values with state unkept */ 4122 /* extra handling for values with state unkept */
3980 switch (arg[i]) 4123 switch (arg[i])
3981 { 4124 {
4125#if ENABLE_STYLES
4126 case 1021:
4127 set_option (Opt_intensityStyles, mode);
4128
4129 scr_touch (true);
4130 break;
4131#endif
3982 case 1048: /* alternative cursor save */ 4132 case 1048: /* alternative cursor save */
3983 case 1049: 4133 case 1049:
3984 if (options & Opt_secondaryScreen) 4134 if (OPTION (Opt_secondaryScreen))
3985 if (mode == 0) 4135 if (mode == 0)
3986 scr_cursor (RESTORE); 4136 scr_cursor (RESTORE);
3987 else if (mode == 1) 4137 else if (mode == 1)
3988 scr_cursor (SAVE); 4138 scr_cursor (SAVE);
3989 break; 4139 break;
… …
4001 */ 4151 */
4002 PrivMode (1, PrivMode_vt52); 4152 PrivMode (1, PrivMode_vt52);
4003 break; 4153 break;
4004 case 3: /* 80/132 */ 4154 case 3: /* 80/132 */
4005 if (priv_modes & PrivMode_132OK) 4155 if (priv_modes & PrivMode_132OK)
4006 set_widthheight (((state ? 132 : 80) * TermWin.fwidth), TermWin.height); 4156 set_widthheight (((state ? 132 : 80) * fwidth), height);
4007 break; 4157 break;
4008 case 4: /* smooth scrolling */ 4158 case 4: /* smooth scrolling */
4009 if (state)
4010 options &= ~Opt_jumpScroll;
4011 else
4012 options |= Opt_jumpScroll; 4159 set_option (Opt_jumpScroll, !state);
4013 break; 4160 break;
4014 case 5: /* reverse video */ 4161 case 5: /* reverse video */
4015 scr_rvideo_mode (state); 4162 scr_rvideo_mode (state);
4016 break; 4163 break;
4017 case 6: /* relative/absolute origins */ 4164 case 6: /* relative/absolute origins */
… …
4023 /* case 8: - auto repeat, can't do on a per window basis */ 4170 /* case 8: - auto repeat, can't do on a per window basis */
4024 case 9: /* X10 mouse reporting */ 4171 case 9: /* X10 mouse reporting */
4025 if (state) /* orthogonal */ 4172 if (state) /* orthogonal */
4026 priv_modes &= ~PrivMode_MouseX11; 4173 priv_modes &= ~PrivMode_MouseX11;
4027 break; 4174 break;
4028#ifdef menuBar_esc
4029 case menuBar_esc:
4030#ifdef MENUBAR
4031 map_menuBar (state);
4032#endif
4033 break;
4034#endif
4035#ifdef scrollBar_esc 4175#ifdef scrollBar_esc
4036 case scrollBar_esc: 4176 case scrollBar_esc:
4037 if (scrollbar_mapping (state)) 4177 if (scrollbar_mapping (state))
4038 { 4178 {
4039 resize_all_windows (0, 0, 0); 4179 resize_all_windows (0, 0, 0);
… …
4058#if 0 4198#if 0
4059 case 1001: 4199 case 1001:
4060 break; /* X11 mouse highlighting */ 4200 break; /* X11 mouse highlighting */
4061#endif 4201#endif
4062 case 1010: /* scroll to bottom on TTY output inhibit */ 4202 case 1010: /* scroll to bottom on TTY output inhibit */
4063 if (state)
4064 options &= ~Opt_scrollTtyOutput;
4065 else
4066 options |= Opt_scrollTtyOutput; 4203 set_option (Opt_scrollTtyOutput, !state);
4067 break; 4204 break;
4068 case 1011: /* scroll to bottom on key press */ 4205 case 1011: /* scroll to bottom on key press */
4069 if (state)
4070 options |= Opt_scrollTtyKeypress; 4206 set_option (Opt_scrollTtyKeypress, state);
4071 else
4072 options &= ~Opt_scrollTtyKeypress;
4073 break; 4207 break;
4074 case 1047: /* secondary screen w/ clearing last */ 4208 case 1047: /* secondary screen w/ clearing last */
4075 if (options & Opt_secondaryScreen) 4209 if (OPTION (Opt_secondaryScreen))
4076 if (current_screen != PRIMARY) 4210 if (current_screen != PRIMARY)
4077 scr_erase_screen (2); 4211 scr_erase_screen (2);
4078 scr_change_screen (state); 4212 scr_change_screen (state);
4079 break; 4213 break;
4080 case 1049: /* secondary screen w/ clearing first */ 4214 case 1049: /* secondary screen w/ clearing first */
4081 scr_change_screen (state); 4215 scr_change_screen (state);
4082 if (options & Opt_secondaryScreen) 4216 if (OPTION (Opt_secondaryScreen))
4083 if (current_screen != PRIMARY) 4217 if (current_screen != PRIMARY)
4084 scr_erase_screen (2); 4218 scr_erase_screen (2);
4085 break; 4219 break;
4086 default: 4220 default:
4087 break; 4221 break;
… …
4215 scr_color (Color_bg, Color_bg); 4349 scr_color (Color_bg, Color_bg);
4216 break; 4350 break;
4217 4351
4218 //case 50: // not variable spacing 4352 //case 50: // not variable spacing
4219 4353
4220#ifndef NO_BRIGHTCOLOR 4354#if ENABLE_FRILLS
4221 case 90: 4355 case 90:
4222 case 91: /* set bright fg color */ 4356 case 91: /* set bright fg color */
4223 case 92: 4357 case 92:
4224 case 93: 4358 case 93:
4225 case 94: 4359 case 94:
… …
4237 case 106: 4371 case 106:
4238 case 107: 4372 case 107:
4239 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4373 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4240 break; 4374 break;
4241#endif 4375#endif
4242
4243 } 4376 }
4244 } 4377 }
4245} 4378}
4246/*}}} */ 4379/*}}} */
4247 4380
… …
4271 */ 4404 */
4272void 4405void
4273rxvt_term::tt_printf (const char *fmt,...) 4406rxvt_term::tt_printf (const char *fmt,...)
4274{ 4407{
4275 va_list arg_ptr; 4408 va_list arg_ptr;
4276 unsigned char buf[256]; 4409 char buf[256];
4277 4410
4278 va_start (arg_ptr, fmt); 4411 va_start (arg_ptr, fmt);
4279 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4412 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4280 va_end (arg_ptr); 4413 va_end (arg_ptr);
4281 tt_write (buf, strlen (buf)); 4414 tt_write (buf, strlen (buf));
… …
4283 4416
4284/* ---------------------------------------------------------------------- */ 4417/* ---------------------------------------------------------------------- */
4285/* Write data to the pty as typed by the user, pasted with the mouse, 4418/* Write data to the pty as typed by the user, pasted with the mouse,
4286 * or generated by us in response to a query ESC sequence. 4419 * or generated by us in response to a query ESC sequence.
4287 */ 4420 */
4421const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4422
4288void 4423void
4289rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4424rxvt_term::tt_write (const char *data, unsigned int len)
4290{ 4425{
4291 const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4426 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4427 return;
4292 4428
4293 if (len) 4429 if (pty->pty < 0)
4430 return;
4431
4432 if (v_buflen == 0)
4433 {
4434 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4435
4436 if ((unsigned int)written == len)
4437 return;
4438
4439 data += written;
4440 len -= written;
4294 { 4441 }
4442
4443 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4444
4445 memcpy (v_buffer + v_buflen, data, len);
4446 v_buflen += len;
4447
4448 pty_ev.set (EVENT_READ | EVENT_WRITE);
4449}
4450
4451void rxvt_term::pty_write ()
4452{
4453 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4454
4455 if (written > 0)
4456 {
4457 v_buflen -= written;
4458
4295 if (v_buflen == 0) 4459 if (v_buflen == 0)
4296 { 4460 {
4297 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4298
4299 if ((unsigned int)written == len)
4300 return;
4301
4302 data += written;
4303 len -= written;
4304 }
4305
4306
4307 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len);
4308
4309 memcpy (v_buffer + v_buflen, data, len);
4310 v_buflen += len;
4311 }
4312
4313 for (;;)
4314 {
4315 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4316
4317 if (written > 0)
4318 {
4319 v_buflen -= written;
4320
4321 if (v_buflen == 0)
4322 {
4323 free (v_buffer); 4461 free (v_buffer);
4324 v_buffer = 0; 4462 v_buffer = 0;
4325 v_buflen = 0; 4463 v_buflen = 0;
4326 4464
4327 pty_ev.set (EVENT_READ); 4465 pty_ev.set (EVENT_READ);
4328 return;
4329 }
4330
4331 memmove (v_buffer, v_buffer + written, v_buflen);
4332 }
4333 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4334 // original code just ignores this...
4335 destroy ();
4336 else
4337 {
4338 pty_ev.set (EVENT_READ | EVENT_WRITE);
4339 return; 4466 return;
4340 } 4467 }
4468
4469 memmove (v_buffer, v_buffer + written, v_buflen);
4341 } 4470 }
4471 else if (written != -1 || (errno != EAGAIN && errno != EINTR))
4472 pty_ev.set (EVENT_READ);
4342} 4473}
4343 4474
4344/*----------------------- end-of-file (C source) -----------------------*/ 4475/*----------------------- end-of-file (C source) -----------------------*/
4345 4476

Diff Legend

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