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

Diff Legend

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