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.445 by sf-exg, Fri Apr 2 13:52:30 2010 UTC vs.
Revision 1.539 by sf-exg, Tue Apr 16 08:44:45 2013 UTC

… …
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com> 10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com>
11 * - vt100 printing 11 * - vt100 printing
12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu> 12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu>
13 * - X11 mouse report mode and support for 13 * - X11 mouse report mode and support for
14 * DEC "private mode" save/restore functions. 14 * DEC "private mode" save/restore functions.
… …
20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es> 20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es>
21 * - modification and cleanups for Solaris 2.x 21 * - modification and cleanups for Solaris 2.x
22 * and Linux 1.2.x 22 * and Linux 1.2.x
23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
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-2007 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2011 Marc Lehmann <schmorp@schmorp.de>
31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it> 31 * Copyright (c) 2007 Emanuele Giaquinta <e.giaquinta@glauco.it>
32 * 32 *
33 * This program is free software; you can redistribute it and/or modify 33 * This program is free software; you can redistribute it and/or modify
34 * it under the terms of the GNU General Public License as published by 34 * it under the terms of the GNU General Public License as published by
35 * the Free Software Foundation; either version 2 of the License, or 35 * the Free Software Foundation; either version 2 of the License, or
… …
54 54
55#ifdef KEYSYM_RESOURCE 55#ifdef KEYSYM_RESOURCE
56# include "keyboard.h" 56# include "keyboard.h"
57#endif 57#endif
58 58
59#include <csignal> 59#include <signal.h>
60 60
61#if LINUX_YIELD_HACK 61#if LINUX_YIELD_HACK
62# include <ctime> 62# include <time.h>
63#endif 63#endif
64 64
65/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
66 66
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
… …
131 XK_KP_Space, 0x2422, 131 XK_KP_Space, 0x2422,
132#endif 132#endif
133 0, 133 0,
134}; 134};
135 135
136void 136void ecb_cold
137rxvt_term::iso14755_54 (int x, int y) 137rxvt_term::iso14755_54 (int x, int y)
138{ 138{
139 x = Pixel2Col (x); 139 x = Pixel2Col (x);
140 y = Pixel2Row (y); 140 y = Pixel2Row (y);
141 141
… …
149 149
150 text_t t = l.t[x]; 150 text_t t = l.t[x];
151 151
152 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
153 { 153 {
154 iso14755_51 (l.t[x], l.r[x], x, y); 154 iso14755_51 (l.t[x], l.r[x], x, y, view_start);
155 iso14755buf = ISO_14755_54; 155 iso14755buf = ISO_14755_54;
156 break; 156 break;
157 } 157 }
158 158
159 x--; 159 x--;
160 } 160 }
161} 161}
162 162
163void 163void ecb_cold
164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 164rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y, int y2)
165{ 165{
166 rxvt_fontset *fs = FONTSET (r); 166 rxvt_fontset *fs = FONTSET (r);
167 wchar_t *chr, *alloc, ch2, **fname; 167 wchar_t *chr, *alloc, ch2, **fname;
168 int len; 168 int len;
169 169
… …
181 181
182 alloc = 0; 182 alloc = 0;
183 chr = &ch2; 183 chr = &ch2;
184 len = 1; 184 len = 1;
185 } 185 }
186
187 char rowcol[40];
188 snprintf (rowcol, sizeof rowcol, "col %d row %d @%d", x, y, y2);
186 189
187 char attr[80]; // plenty 190 char attr[80]; // plenty
188 191
189 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s", 192 sprintf (attr, "%08x = fg %d bg %d%s%s%s%s%s%s",
190 (int)r, 193 (int)r,
… …
203 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])]; 206 rxvt_font *f = (*fs)[fs->find_font_idx (chr[i])];
204 fname[i] = rxvt_utf8towcs (f->name); 207 fname[i] = rxvt_utf8towcs (f->name);
205 max_it (width, wcswidth (fname[i], wcslen (fname[i]))); 208 max_it (width, wcswidth (fname[i], wcslen (fname[i])));
206 } 209 }
207 210
208 max_it (width, 8+5); // for char + hex
209 max_it (width, strlen (attr)); 211 max_it (width, strlen (attr));
210 212
211 if (y >= 0) 213 if (y >= 0)
212 { 214 {
213 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1; 215 y = (y >= nrow - len - 4 && x < width + 2) ? 0 : -1;
214 x = 0; 216 x = 0;
215 } 217 }
216 218
217 scr_overlay_new (x, y, width, len * 2 + 1); 219 scr_overlay_new (x, y, width, len * 2 + 2);
220
221 scr_overlay_set (0, 0, rowcol);
218 222
219 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r)); 223 r = SET_STYLE (OVERLAY_RSTYLE, GET_STYLE (r));
220 224
221 for (int y = 0; y < len; y++) 225 for (int y = 0; y < len; y++)
222 { 226 {
223 char buf[9]; 227 char buf[9];
224 228
225 ch = *chr++; 229 ch = *chr++;
226 230
227 sprintf (buf, "%8x", ch); 231 sprintf (buf, "%8x", ch);
228 scr_overlay_set (0, y, buf); 232 scr_overlay_set (0, y + 1, buf);
229 scr_overlay_set (9, y, '='); 233 scr_overlay_set (9, y + 1, '=');
230# if !UNICODE_3 234# if !UNICODE_3
231 if (ch >= 0x10000) 235 if (ch >= 0x10000)
232 ch = 0xfffd; 236 ch = 0xfffd;
233# endif 237# endif
234 scr_overlay_set (11, y, ch, r); 238 scr_overlay_set (11, y + 1, ch, r);
235 239
236 if (WCWIDTH (ch) >= 2) 240 if (WCWIDTH (ch) >= 2)
237 scr_overlay_set (12, y, NOCHAR, r); 241 scr_overlay_set (12, y + 1, NOCHAR, r);
238 } 242 }
239 243
240// { 244// {
241// char buf[4+4+3+1]; 245// char buf[4+4+3+1];
242// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y); 246// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
243// scr_overlay_set (0, 0, buf); 247// scr_overlay_set (0, 0, buf);
244// } 248// }
245 scr_overlay_set (0, len , attr); 249 scr_overlay_set (0, len + 1, attr);
246 for (int i = 0; i < len; i++) 250 for (int i = 0; i < len; i++)
247 { 251 {
248 scr_overlay_set (0, len + 1 + i, fname[i]); 252 scr_overlay_set (0, len + 2 + i, fname[i]);
249 free (fname[i]); 253 free (fname[i]);
250 } 254 }
251 255
252# if ENABLE_COMBINING 256# if ENABLE_COMBINING
253 if (alloc) 257 if (alloc)
254 delete [] alloc; 258 delete [] alloc;
255# endif 259# endif
256} 260}
257#endif 261#endif
258 262
259void 263void ecb_cold
260rxvt_term::commit_iso14755 () 264rxvt_term::commit_iso14755 ()
261{ 265{
262 wchar_t ch[2];
263
264 ch[0] = iso14755buf & ISO_14755_MASK; 266 wchar_t ch = iso14755buf & ISO_14755_MASK;
265 ch[1] = 0;
266 267
267 if (iso14755buf & ISO_14755_51) 268 if (iso14755buf & ISO_14755_51)
268 { 269 {
269 char mb[16]; 270 char mb[MB_LEN_MAX];
270 int len; 271 int len;
271 272
272 // allow verbatim 0-bytes and control-bytes to be entered 273 // allow verbatim 0-bytes and control-bytes to be entered
273 if (ch[0] >= 0x20) 274 if (ch >= 0x20)
274 len = wcstombs (mb, ch, 16); 275 len = wctomb (mb, ch);
275 else 276 else
276 { 277 {
277 mb[0] = ch[0]; 278 mb[0] = ch;
278 len = 1; 279 len = 1;
279 } 280 }
280 281
281 if (len > 0) 282 if (len > 0)
282 tt_write (mb, len); 283 tt_write (mb, len);
… …
285 } 286 }
286 287
287 iso14755buf = 0; 288 iso14755buf = 0;
288} 289}
289 290
290static int 291static int ecb_cold
291hex_keyval (XKeyEvent &ev) 292hex_keyval (XKeyEvent &ev)
292{ 293{
293 // check whether this event corresponds to a hex digit 294 // check whether this event corresponds to a hex digit
294 // if the modifiers had not been pressed. 295 // if the modifiers had not been pressed.
295 for (int index = 0; index < 8; index++) 296 for (int index = 0; index < 8; index++)
… …
304 305
305 return -1; 306 return -1;
306} 307}
307#endif 308#endif
308 309
309static inline KeySym 310static inline KeySym ecb_cold
310translate_keypad (KeySym keysym, bool kp) 311translate_keypad (KeySym keysym, bool kp)
311{ 312{
312#ifdef XK_KP_Home 313#ifdef XK_KP_Home
313 static const KeySym keypadtrans[] = { 314 static const KeySym keypadtrans[] = {
314 XK_KP_7, // XK_KP_Home 315 XK_KP_7, // XK_KP_Home
… …
340# endif 341# endif
341#endif 342#endif
342 return keysym; 343 return keysym;
343} 344}
344 345
345static inline int 346static inline int ecb_cold
346map_function_key (KeySym keysym) 347map_function_key (KeySym keysym)
347{ 348{
348 int param = 0; 349 int param = 0;
349 350
350 if (IN_RANGE_INC (keysym, XK_F1, XK_F35)) 351 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
… …
399 break; 400 break;
400 } 401 }
401 return param; 402 return param;
402} 403}
403 404
404void 405void ecb_cold
405rxvt_term::key_press (XKeyEvent &ev) 406rxvt_term::key_press (XKeyEvent &ev)
406{ 407{
407 int ctrl, meta, shft, len; 408 int ctrl, meta, shft, len;
408 KeySym keysym; 409 KeySym keysym;
409 int valid_keysym; 410 int valid_keysym;
… …
424 ctrl = ev.state & ControlMask; 425 ctrl = ev.state & ControlMask;
425 meta = ev.state & ModMetaMask; 426 meta = ev.state & ModMetaMask;
426 427
427 kbuf[0] = 0; 428 kbuf[0] = 0;
428 429
429#ifdef USE_XIM 430#if USE_XIM
430 if (Input_Context) 431 if (Input_Context)
431 { 432 {
432 Status status_return; 433 Status status_return;
433 434
434#if 0 435#if 0
… …
509#endif 510#endif
510 max_it (lnsppg, 1); 511 max_it (lnsppg, 1);
511 512
512 if (keysym == XK_Prior) 513 if (keysym == XK_Prior)
513 { 514 {
514 scr_page (UP, lnsppg); 515 scr_page (lnsppg);
515 return; 516 return;
516 } 517 }
517 else if (keysym == XK_Next) 518 else if (keysym == XK_Next)
518 { 519 {
519 scr_page (DN, lnsppg); 520 scr_page (-lnsppg);
520 return; 521 return;
521 } 522 }
522 } 523 }
523#ifdef SCROLL_ON_UPDOWN_KEYS 524#ifdef SCROLL_ON_UPDOWN_KEYS
524 if (IS_SCROLL_MOD) 525 if (IS_SCROLL_MOD)
525 { 526 {
526 if (keysym == XK_Up) 527 if (keysym == XK_Up)
527 { 528 {
528 scr_page (UP, 1); 529 scr_page (1);
529 return; 530 return;
530 } 531 }
531 else if (keysym == XK_Down) 532 else if (keysym == XK_Down)
532 { 533 {
533 scr_page (DN, 1); 534 scr_page (-1);
534 return; 535 return;
535 } 536 }
536 } 537 }
537#endif 538#endif
538#ifdef SCROLL_ON_HOMEEND_KEYS 539#ifdef SCROLL_ON_HOMEEND_KEYS
539 if (IS_SCROLL_MOD) 540 if (IS_SCROLL_MOD)
540 { 541 {
541 if (keysym == XK_Home) 542 if (keysym == XK_Home)
542 { 543 {
543 scr_move_to (0, 1); 544 scr_changeview (top_row);
544 return; 545 return;
545 } 546 }
546 else if (keysym == XK_End) 547 else if (keysym == XK_End)
547 { 548 {
548 scr_move_to (1, 1); 549 scr_changeview (0);
549 return; 550 return;
550 } 551 }
551 } 552 }
552#endif 553#endif
553 } 554 }
… …
569 selection_request (ev.time); 570 selection_request (ev.time);
570 return; 571 return;
571#if TODO 572#if TODO
572 /* rxvt extras */ 573 /* rxvt extras */
573 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 574 case XK_KP_Add: /* Shift+KP_Add = bigger font */
574 change_font (FONT_UP);
575 return; 575 return;
576 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 576 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
577 change_font (FONT_DN);
578 return; 577 return;
579#endif 578#endif
580 } 579 }
581 } 580 }
582 } 581 }
… …
649 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft; 648 bool kp = priv_modes & PrivMode_aplKP ? !shft : shft;
650 unsigned int newlen = 1; 649 unsigned int newlen = 1;
651 650
652 if (ev.state & ModNumLockMask) 651 if (ev.state & ModNumLockMask)
653 kp = false; 652 kp = false;
653
654 switch (translate_keypad (keysym, kp)) 654 keysym = translate_keypad (keysym, kp);
655
656 switch (keysym)
655 { 657 {
656#ifndef NO_BACKSPACE_KEY 658#ifndef NO_BACKSPACE_KEY
657 case XK_BackSpace: 659 case XK_BackSpace:
658 if (priv_modes & PrivMode_HaveBackSpace) 660 if (priv_modes & PrivMode_HaveBackSpace)
659 { 661 {
… …
778 } 780 }
779 781
780 if (newlen) 782 if (newlen)
781 len = strlen (kbuf); 783 len = strlen (kbuf);
782 784
785 if (len > 0)
786 {
783 /* 787 /*
788 * pass Shift/Control indicators for function keys ending with `~'
789 *
790 * eg,
791 * Prior = "ESC[5~"
792 * Shift+Prior = "ESC[5$"
793 * Ctrl+Prior = "ESC[5^"
794 * Ctrl+Shift+Prior = "ESC[5@"
795 */
796 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
797 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
798
799 /*
784 * Pass meta for all function keys, if 'meta' option set 800 * Pass meta for all function keys, if 'meta' option set
785 */ 801 */
786#ifdef META8_OPTION 802#ifdef META8_OPTION
787 if (meta && (meta_char == 0x80) && len > 0) 803 if (meta && (meta_char == 0x80))
788 kbuf[len - 1] |= 0x80; 804 kbuf[len - 1] |= 0x80;
789#endif 805#endif
806 }
790 807
791 } 808 }
792 else if (ctrl && keysym == XK_minus) 809 else if (ctrl && keysym == XK_minus)
793 { 810 {
794 len = 1; 811 len = 1;
… …
828 { 845 {
829 view_start = 0; 846 view_start = 0;
830 want_refresh = 1; 847 want_refresh = 1;
831 } 848 }
832 849
833 /*
834 * these modifications only affect the static keybuffer
835 * pass Shift/Control indicators for function keys ending with `~'
836 *
837 * eg,
838 * Prior = "ESC[5~"
839 * Shift+Prior = "ESC[5$"
840 * Ctrl+Prior = "ESC[5^"
841 * Ctrl+Shift+Prior = "ESC[5@"
842 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
843 */
844 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
845 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
846
847 /* escape prefix */ 850 /* escape prefix */
848 if (meta 851 if (meta
849#ifdef META8_OPTION 852#ifdef META8_OPTION
850 && meta_char == C0_ESC 853 && meta_char == C0_ESC
851#endif 854#endif
… …
856 } 859 }
857 860
858 tt_write (kbuf, (unsigned int)len); 861 tt_write (kbuf, (unsigned int)len);
859} 862}
860 863
861void 864void ecb_cold
862rxvt_term::key_release (XKeyEvent &ev) 865rxvt_term::key_release (XKeyEvent &ev)
863{ 866{
864#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 867#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
865 KeySym keysym; 868 KeySym keysym;
866 869
… …
886 commit_iso14755 (); 889 commit_iso14755 ();
887 890
888 return; 891 return;
889 } 892 }
890 893
891 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 894 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
892 if (i[0] == keysym) 895 if (i[0] == keysym)
893 { 896 {
894 iso14755buf = ISO_14755_51 | i[1]; 897 iso14755buf = ISO_14755_51 | i[1];
895 commit_iso14755 (); 898 commit_iso14755 ();
896 899
… …
933 else if (keysym == XK_Control_L || keysym == XK_Control_R) 936 else if (keysym == XK_Control_L || keysym == XK_Control_R)
934 mouse_slip_wheel_speed = 0; 937 mouse_slip_wheel_speed = 0;
935#endif 938#endif
936} 939}
937 940
938#if defined (KEYSYM_RESOURCE)
939unsigned int
940rxvt_term::cmd_write (const char *str, unsigned int count)
941{
942 unsigned int n, s;
943
944 n = cmdbuf_ptr - cmdbuf_base;
945 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
946
947 if (n > 0 && s < count)
948 {
949 memmove (cmdbuf_base, cmdbuf_ptr,
950 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
951 cmdbuf_ptr = cmdbuf_base;
952 cmdbuf_endp -= n;
953 s += n;
954 }
955
956 if (count > s)
957 {
958 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
959 count = s;
960 }
961
962 for (; count--;)
963 *cmdbuf_endp++ = *str++;
964
965 cmd_parse ();
966
967 return 0;
968}
969#endif
970
971void 941void
972rxvt_term::flush () 942rxvt_term::flush ()
973{ 943{
974 flush_ev.stop (); 944 flush_ev.stop ();
975 945
976#ifdef HAVE_BG_PIXMAP 946#ifdef HAVE_IMG
977 if (bgPixmap.check_clearChanged ()) 947 if (bg_flags & BG_NEEDS_REFRESH)
978 { 948 {
979// scr_clear (true); This needs to be researched further! 949 bg_flags &= ~BG_NEEDS_REFRESH;
980 scr_touch (false); 950 scr_touch (false);
981 } 951 }
982#endif 952#endif
983 953
984 if (want_refresh) 954 if (want_refresh)
… …
1021 while (row < end_row); 991 while (row < end_row);
1022 } 992 }
1023 993
1024 scr_refresh (); 994 scr_refresh ();
1025 scrollBar.show (1); 995 scrollBar.show (1);
1026#ifdef USE_XIM 996#if USE_XIM
1027 IMSendSpot (); 997 im_send_spot ();
1028#endif 998#endif
1029 } 999 }
1030 1000
1031 display->flush (); 1001 display->flush ();
1032} 1002}
… …
1050 flush (); 1020 flush ();
1051} 1021}
1052 1022
1053#ifdef CURSOR_BLINK 1023#ifdef CURSOR_BLINK
1054void 1024void
1025rxvt_term::cursor_blink_reset ()
1026{
1027 if (hidden_cursor)
1028 {
1029 hidden_cursor = 0;
1030 want_refresh = 1;
1031 }
1032
1033 if (option (Opt_cursorBlink))
1034 cursor_blink_ev.again ();
1035 else
1036 cursor_blink_ev.stop ();
1037}
1038
1039void
1055rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1040rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1056{ 1041{
1057 hidden_cursor = !hidden_cursor; 1042 hidden_cursor = !hidden_cursor;
1058 want_refresh = 1; 1043 want_refresh = 1;
1059 refresh_check (); 1044 refresh_check ();
… …
1077 1062
1078#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1063#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1079void 1064void
1080rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1065rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1081{ 1066{
1082 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1067 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1083 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1068 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1084 { 1069 {
1085 want_refresh = 1; 1070 want_refresh = 1;
1086 refresh_check (); 1071 refresh_check ();
1087 } 1072 }
1088 else 1073 else
… …
1107 1092
1108#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1093#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1109void 1094void
1110rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1095rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1111{ 1096{
1112 if (scr_changeview (view_start - mouse_slip_wheel_speed)) 1097 if (scr_page (mouse_slip_wheel_speed))
1113 { 1098 {
1114 want_refresh = 1; 1099 want_refresh = 1;
1115 refresh_check (); 1100 refresh_check ();
1116 } 1101 }
1117 1102
… …
1149 { 1134 {
1150 } 1135 }
1151} event_handler; 1136} event_handler;
1152#endif 1137#endif
1153 1138
1139/* make sure all the cmd data is at beginning of cmdbuf */
1140void
1141rxvt_term::cmdbuf_reify ()
1142{
1143 if (cmdbuf_ptr == cmdbuf_base)
1144 return;
1145
1146 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1147
1148 memmove (cmdbuf_base, cmdbuf_ptr, used);
1149 cmdbuf_ptr = cmdbuf_base;
1150 cmdbuf_endp = cmdbuf_ptr + used;
1151
1152}
1153
1154#if defined (KEYSYM_RESOURCE)
1155void
1156rxvt_term::cmdbuf_append (const char *str, size_t count)
1157{
1158 cmdbuf_reify ();
1159
1160 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1161
1162 if (count > avail)
1163 return;
1164
1165 memcpy (cmdbuf_endp, str, count);
1166 cmdbuf_endp += count;
1167
1168 cmd_parse ();
1169}
1170#endif
1171
1154bool 1172bool
1155rxvt_term::pty_fill () 1173rxvt_term::pty_fill ()
1156{ 1174{
1157 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1175 cmdbuf_reify ();
1158 1176
1159 if (CBUFSIZ == n) 1177 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1160 { 1178
1161 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1179 if (!avail)
1162 n = 0;
1163 } 1180 {
1164 1181 // normally this indicates a "too long" command sequence - just drop the data we have
1165 memmove (cmdbuf_base, cmdbuf_ptr, n);
1166 cmdbuf_ptr = cmdbuf_base; 1182 cmdbuf_ptr = cmdbuf_base;
1167 cmdbuf_endp = cmdbuf_ptr + n; 1183 cmdbuf_endp = cmdbuf_ptr;
1184 avail = CBUFSIZ;
1185 }
1168 1186
1169 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1187 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1170 1188
1171 if (r > 0) 1189 if (r > 0)
1172 { 1190 {
1173 cmdbuf_endp += r; 1191 cmdbuf_endp += r;
1174 return true; 1192 return true;
… …
1205 pty_write (); 1223 pty_write ();
1206 1224
1207 refresh_check (); 1225 refresh_check ();
1208} 1226}
1209 1227
1210void 1228void ecb_cold
1211rxvt_term::pointer_unblank () 1229rxvt_term::pointer_unblank ()
1212{ 1230{
1213 XDefineCursor (dpy, vt, TermWin_cursor); 1231 XDefineCursor (dpy, vt, TermWin_cursor);
1214 recolour_cursor (); 1232 recolour_cursor ();
1215 1233
… …
1220 pointer_ev.start (pointerBlankDelay); 1238 pointer_ev.start (pointerBlankDelay);
1221#endif 1239#endif
1222} 1240}
1223 1241
1224#ifdef POINTER_BLANK 1242#ifdef POINTER_BLANK
1225void 1243void ecb_cold
1226rxvt_term::pointer_blank () 1244rxvt_term::pointer_blank ()
1227{ 1245{
1228 if (!option (Opt_pointerBlank)) 1246 if (!option (Opt_pointerBlank))
1229 return; 1247 return;
1230 1248
… …
1232 XFlush (dpy); 1250 XFlush (dpy);
1233 1251
1234 hidden_pointer = 1; 1252 hidden_pointer = 1;
1235} 1253}
1236 1254
1237void 1255void ecb_cold
1238rxvt_term::pointer_cb (ev::timer &w, int revents) 1256rxvt_term::pointer_cb (ev::timer &w, int revents)
1239{ 1257{
1240 make_current (); 1258 make_current ();
1241 1259
1242 pointer_blank (); 1260 pointer_blank ();
… …
1248{ 1266{
1249 int button_number, key_state = 0; 1267 int button_number, key_state = 0;
1250 int x, y; 1268 int x, y;
1251 int code = 32; 1269 int code = 32;
1252 1270
1253 x = Pixel2Col (ev.x); 1271 x = Pixel2Col (ev.x) + 1;
1254 y = Pixel2Row (ev.y); 1272 y = Pixel2Row (ev.y) + 1;
1273
1255 if (ev.type == MotionNotify) 1274 if (ev.type == MotionNotify)
1256 { 1275 {
1257 if (x == mouse_row && y == mouse_col) 1276 if (x == mouse_row && y == mouse_col)
1258 return; 1277 return;
1278
1259 mouse_row = x; 1279 mouse_row = x;
1260 mouse_col = y; 1280 mouse_col = y;
1261 code += 32; 1281 code += 32;
1262 } 1282 }
1263 1283
… …
1266 else 1286 else
1267 { 1287 {
1268 button_number = MEvent.button - Button1; 1288 button_number = MEvent.button - Button1;
1269 /* add 0x3D for wheel events, like xterm does */ 1289 /* add 0x3D for wheel events, like xterm does */
1270 if (button_number >= 3) 1290 if (button_number >= 3)
1271 button_number += (64 - 3); 1291 button_number += 64 - 3;
1272 } 1292 }
1273 1293
1274 if (priv_modes & PrivMode_MouseX10) 1294 if (priv_modes & PrivMode_MouseX10)
1275 { 1295 {
1276 /* 1296 /*
… …
1308 fputc ('A', stderr); 1328 fputc ('A', stderr);
1309 if (key_state & 32) 1329 if (key_state & 32)
1310 fputc ('2', stderr); 1330 fputc ('2', stderr);
1311 fprintf (stderr, "]: <%d>, %d/%d\n", 1331 fprintf (stderr, "]: <%d>, %d/%d\n",
1312 button_number, 1332 button_number,
1313 x + 1, 1333 x,
1314 y + 1); 1334 y);
1315#endif 1335#endif
1316 1336
1337#if ENABLE_FRILLS
1338 if (priv_modes & PrivMode_ExtMouseRight)
1339 tt_printf ("\033[%d;%d;%dM",
1340 code + button_number + key_state,
1341 x,
1342 y);
1343 else if (priv_modes & PrivMode_ExtModeMouse)
1344 tt_printf ("\033[M%c%lc%lc",
1345 code + button_number + key_state,
1346 wint_t (32 + x),
1347 wint_t (32 + y));
1348 else
1349#endif
1317 tt_printf ("\033[M%c%c%c", 1350 tt_printf ("\033[M%c%c%c",
1318 (code + button_number + key_state), 1351 code + button_number + key_state,
1319 (32 + x + 1), 1352 32 + x,
1320 (32 + y + 1)); 1353 32 + y);
1321} 1354}
1322 1355
1323/*{{{ process an X event */ 1356/*{{{ process an X event */
1324void 1357void ecb_hot
1325rxvt_term::x_cb (XEvent &ev) 1358rxvt_term::x_cb (XEvent &ev)
1326{ 1359{
1327 make_current (); 1360 make_current ();
1328 1361
1329 dLocal (Display *, dpy); 1362 dLocal (Display *, dpy);
… …
1427 && ev.xfocus.mode != NotifyGrab) 1460 && ev.xfocus.mode != NotifyGrab)
1428 focus_out (); 1461 focus_out ();
1429 break; 1462 break;
1430 1463
1431 case ConfigureNotify: 1464 case ConfigureNotify:
1432 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1433 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1434 szHint.width, szHint.height);*/
1435 if (ev.xconfigure.window == parent[0]) 1465 if (ev.xconfigure.window == parent)
1436 { 1466 {
1437 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1467 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1438 ; 1468 ;
1469
1470 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1471
1472 bool moved = false;
1473#ifdef HAVE_BG_PIXMAP
1474 if (bg_window_position_sensitive ())
1475 {
1476 want_position_change = true;
1477 if (bg_img == 0)
1478 moved = true;
1479 }
1480#endif
1481
1482 if (want_position_change)
1483 {
1484 int x, y;
1485
1486 if (ev.xconfigure.send_event)
1487 {
1488 x = ev.xconfigure.x;
1489 y = ev.xconfigure.y;
1490 }
1491 else
1492 get_window_origin (x, y);
1493
1494 if (x != parent_x || y != parent_y)
1495 {
1496 parent_x = x;
1497 parent_y = y;
1498 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1499 moved = true;
1500 }
1501 }
1439 1502
1440 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1503 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1441 { 1504 {
1442 seen_resize = 1; 1505 seen_resize = 1;
1443 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1506 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1444 } 1507 }
1445 else 1508 else
1446 { 1509 {
1447#ifdef HAVE_BG_PIXMAP 1510#ifdef HAVE_BG_PIXMAP
1448 if (bgPixmap.window_position_sensitive ())
1449 {
1450 if (mapped) 1511 if (moved)
1451 update_background (); 1512 update_background ();
1452 else
1453 bgPixmap.invalidate ();
1454 }
1455#endif 1513#endif
1456 } 1514 }
1457 1515
1458 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1516 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1459 } 1517 }
1460 break; 1518 break;
1461 1519
1462 case PropertyNotify: 1520 case PropertyNotify:
1463 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1521 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1464 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1465 && ev.xproperty.state == PropertyNewValue)
1466 selection_property (ev.xproperty.window, ev.xproperty.atom);
1467
1468 break; 1522 break;
1469 1523
1470 case SelectionClear: 1524 case SelectionClear:
1471 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]); 1525 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1472 break; 1526 break;
1473 1527
1474 case SelectionNotify:
1475 if (selection_wait == Sel_normal)
1476 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1477 break;
1478
1479 case SelectionRequest: 1528 case SelectionRequest:
1480 selection_send (ev.xselectionrequest); 1529 selection_send (ev.xselectionrequest);
1481 break; 1530 break;
1482 1531
1483 case MapNotify: 1532 case MapNotify:
1484#ifdef HAVE_BG_PIXMAP 1533#ifdef HAVE_BG_PIXMAP
1485 /* This is needed spcifically to fix the case of no window manager or a 1534 // This is needed at startup for the case of no window manager
1486 * non-reparenting window manager. In those cases we never get first 1535 // or a non-reparenting window manager and also because we
1487 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1536 // defer bg image updates if the window is not mapped. The
1488 * care of multiplicity of ConfigureNotify events arriwing while WM does 1537 // short delay is to optimize for multiple ConfigureNotify
1489 * reparenting. 1538 // events at startup when the window manager reparents the
1490 * We should not render background immidiately, as there could be several 1539 // window, so as to perform the computation after we have
1491 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1540 // received all of them.
1492 * by scheduling background redraw as soon as we can, but giving a short 1541 if (bg_img == 0)
1493 * bit of time for ConfigureNotifies to arrive.
1494 * We should render background PRIOR to drawing any text, but AFTER all
1495 * of ConfigureNotifys for the best results.
1496 */
1497 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1498 update_background_ev.start (0.025); 1542 update_background_ev.start (0.025);
1499#endif 1543#endif
1500 mapped = 1; 1544 mapped = 1;
1501#ifdef TEXT_BLINK 1545#ifdef TEXT_BLINK
1502 text_blink_ev.start (); 1546 text_blink_ev.start ();
… …
1517 if (ev.xany.window == vt) 1561 if (ev.xany.window == vt)
1518 { 1562 {
1519 do 1563 do
1520 { 1564 {
1521 scr_expose (ev.xexpose.x, ev.xexpose.y, 1565 scr_expose (ev.xexpose.x, ev.xexpose.y,
1522 ev.xexpose.width, ev.xexpose.height, False); 1566 ev.xexpose.width, ev.xexpose.height, false);
1523 } 1567 }
1524 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1568 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1525 1569
1526 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1570 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1527 1571
1528 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1572 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1529 { 1573 {
1530 scr_expose (ev.xexpose.x, ev.xexpose.y, 1574 scr_expose (ev.xexpose.x, ev.xexpose.y,
1531 ev.xexpose.width, ev.xexpose.height, False); 1575 ev.xexpose.width, ev.xexpose.height, false);
1532 } 1576 }
1533 1577
1534 want_refresh = 1; 1578 want_refresh = 1;
1535 } 1579 }
1536 else 1580 else
… …
1542 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1586 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1543 ; 1587 ;
1544 1588
1545 if (scrollBar.state && ev.xany.window == scrollBar.win) 1589 if (scrollBar.state && ev.xany.window == scrollBar.win)
1546 { 1590 {
1547 scrollBar.state = STATE_IDLE; 1591 scrollBar.state = SB_STATE_IDLE;
1548 scrollBar.show (0); 1592 scrollBar.show (0);
1549 } 1593 }
1550 } 1594 }
1551 break; 1595 break;
1552 1596
… …
1618 dist = int_bwidth - ev.xbutton.y; 1662 dist = int_bwidth - ev.xbutton.y;
1619 } 1663 }
1620 else 1664 else
1621 { 1665 {
1622 scroll_selection_dir = DN; 1666 scroll_selection_dir = DN;
1623 dist = ev.xbutton.y - (int_bwidth + height); 1667 dist = ev.xbutton.y - (int_bwidth + vt_height);
1624 } 1668 }
1625 1669
1626 scroll_selection_lines = Pixel2Height (dist) 1670 scroll_selection_lines = Pixel2Height (dist)
1627 / SELECTION_SCROLL_LINE_SPEEDUP 1671 / SELECTION_SCROLL_LINE_SPEEDUP
1628 + 1; 1672 + 1;
… …
1640#ifdef MOUSE_THRESHOLD 1684#ifdef MOUSE_THRESHOLD
1641 } 1685 }
1642#endif 1686#endif
1643 } 1687 }
1644 } 1688 }
1645 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1689 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1646 { 1690 {
1647 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1691 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1648 MotionNotify, &ev)) 1692 MotionNotify, &ev))
1649 ; 1693 ;
1650 1694
1651 XQueryPointer (dpy, scrollBar.win, 1695 XQueryPointer (dpy, scrollBar.win,
1652 &unused_root, &unused_child, 1696 &unused_root, &unused_child,
1653 &unused_root_x, &unused_root_y, 1697 &unused_root_x, &unused_root_y,
1654 &ev.xbutton.x, &ev.xbutton.y, 1698 &ev.xbutton.x, &ev.xbutton.y,
1655 &unused_mask); 1699 &unused_mask);
1656 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1700 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1657 scrollBar.size ()); 1701 scrollBar.size ());
1658 want_refresh = 1; 1702 want_refresh = 1;
1659 scrollBar.show (1); 1703 scrollBar.show (1);
1660 } 1704 }
1661 break; 1705 break;
1662 } 1706 }
1663 1707
1664#if defined(CURSOR_BLINK) 1708#if defined(CURSOR_BLINK)
1665 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1709 if (ev.type == KeyPress)
1666 {
1667 if (hidden_cursor)
1668 {
1669 hidden_cursor = 0;
1670 want_refresh = 1;
1671 }
1672
1673 cursor_blink_ev.again (); 1710 cursor_blink_reset ();
1674 }
1675#endif 1711#endif
1676 1712
1677#if defined(POINTER_BLANK) 1713#if defined(POINTER_BLANK)
1678 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1714 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1679 { 1715 {
… …
1690 1726
1691 refresh_check (); 1727 refresh_check ();
1692} 1728}
1693 1729
1694#if ENABLE_FRILLS 1730#if ENABLE_FRILLS
1695void 1731void ecb_cold
1696rxvt_term::set_urgency (bool enable) 1732rxvt_term::set_urgency (bool enable)
1697{ 1733{
1698 if (enable == urgency_hint) 1734 if (enable == urgency_hint)
1699 return; 1735 return;
1700 1736
1701 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1737 if (XWMHints *h = XGetWMHints (dpy, parent))
1702 { 1738 {
1703 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1739 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1704 XSetWMHints (dpy, parent[0], h); 1740 XSetWMHints (dpy, parent, h);
1705 urgency_hint = enable; 1741 urgency_hint = enable;
1742 XFree (h);
1706 } 1743 }
1707} 1744}
1708#endif 1745#endif
1709 1746
1710void 1747void ecb_cold
1711rxvt_term::focus_in () 1748rxvt_term::focus_in ()
1712{ 1749{
1713 if (!focus) 1750 if (!focus)
1714 { 1751 {
1715 focus = 1; 1752 focus = 1;
1716 want_refresh = 1; 1753 want_refresh = 1;
1717 1754
1718#if USE_XIM 1755#if USE_XIM
1719 if (Input_Context != NULL) 1756 if (Input_Context != NULL)
1720 { 1757 {
1721 IMSetPosition (); 1758 im_set_position ();
1722 XSetICFocus (Input_Context); 1759 XSetICFocus (Input_Context);
1723 } 1760 }
1724#endif 1761#endif
1725#if CURSOR_BLINK 1762#if CURSOR_BLINK
1726 if (option (Opt_cursorBlink)) 1763 if (option (Opt_cursorBlink))
… …
1740 1777
1741 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1778 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1742 } 1779 }
1743} 1780}
1744 1781
1745void 1782void ecb_cold
1746rxvt_term::focus_out () 1783rxvt_term::focus_out ()
1747{ 1784{
1748 if (focus) 1785 if (focus)
1749 { 1786 {
1750 focus = 0; 1787 focus = 0;
… …
1783 1820
1784 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1821 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1785 } 1822 }
1786} 1823}
1787 1824
1788void 1825void ecb_cold
1789rxvt_term::update_fade_color (unsigned int idx) 1826rxvt_term::update_fade_color (unsigned int idx)
1790{ 1827{
1791#if OFF_FOCUS_FADING 1828#if OFF_FOCUS_FADING
1792 if (rs[Rs_fade]) 1829 if (rs[Rs_fade])
1793 { 1830 {
… …
1796 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1833 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1797 } 1834 }
1798#endif 1835#endif
1799} 1836}
1800 1837
1801#if ENABLE_TRANSPARENCY || ENABLE_PERL 1838#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1802void 1839void ecb_hot
1803rxvt_term::rootwin_cb (XEvent &ev) 1840rxvt_term::rootwin_cb (XEvent &ev)
1804{ 1841{
1805 make_current (); 1842 make_current ();
1806 1843
1807 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1844 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1808 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1845 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1809 return; 1846 return;
1810 1847
1811# if ENABLE_TRANSPARENCY
1812 switch (ev.type) 1848 switch (ev.type)
1813 { 1849 {
1814 case PropertyNotify: 1850 case PropertyNotify:
1815 /* 1851 /*
1816 * if user used some Esetroot compatible prog to set the root bg, 1852 * if user used some Esetroot compatible prog to set the root bg,
1817 * use the property to determine the pixmap. We use it later on. 1853 * use the property to determine the pixmap. We use it later on.
1818 */ 1854 */
1819 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1855 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1820 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1856 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1821 { 1857 {
1822 bgPixmap.set_root_pixmap (); 1858#if BG_IMAGE_FROM_ROOT
1859 if (option (Opt_transparent))
1860 {
1861 rxvt_img::new_from_root (this)->replace (root_img);
1823 update_background (); 1862 update_background ();
1863 }
1864#endif
1865 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1824 } 1866 }
1825 1867
1826 break; 1868 break;
1827 } 1869 }
1828# endif
1829 1870
1830 refresh_check (); 1871 refresh_check ();
1831} 1872}
1832#endif 1873#endif
1833 1874
… …
1866 /* save the xbutton state (for ButtonRelease) */ 1907 /* save the xbutton state (for ButtonRelease) */
1867 MEvent.state = ev.state; 1908 MEvent.state = ev.state;
1868#ifdef MOUSE_REPORT_DOUBLECLICK 1909#ifdef MOUSE_REPORT_DOUBLECLICK
1869 if (ev.button == MEvent.button && clickintime) 1910 if (ev.button == MEvent.button && clickintime)
1870 { 1911 {
1871 /* same button, within alloted time */ 1912 /* same button, within allowed time */
1872 MEvent.clicks++; 1913 MEvent.clicks++;
1873 1914
1874 if (MEvent.clicks > 1) 1915 if (MEvent.clicks > 1)
1875 { 1916 {
1876 /* only report double clicks */ 1917 /* only report double clicks */
… …
1957 if (scrollBar.upButton (ev.y)) 1998 if (scrollBar.upButton (ev.y))
1958 direction = UP; /* up */ 1999 direction = UP; /* up */
1959 else if (scrollBar.dnButton (ev.y)) 2000 else if (scrollBar.dnButton (ev.y))
1960 direction = DN; /* down */ 2001 direction = DN; /* down */
1961 2002
1962 scrollBar.state = STATE_IDLE; 2003 scrollBar.state = SB_STATE_IDLE;
1963 /* 2004 /*
1964 * Rxvt-style scrollbar: 2005 * Rxvt-style scrollbar:
1965 * move up if mouse is above slider 2006 * move up if mouse is above slider
1966 * move dn if mouse is below slider 2007 * move dn if mouse is below slider
1967 * 2008 *
… …
2006 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2047 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2007#endif 2048#endif
2008 if (scr_page (direction, 1)) 2049 if (scr_page (direction, 1))
2009 { 2050 {
2010 if (direction == UP) 2051 if (direction == UP)
2011 scrollBar.state = STATE_UP; 2052 scrollBar.state = SB_STATE_UP;
2012 else 2053 else
2013 scrollBar.state = STATE_DOWN; 2054 scrollBar.state = SB_STATE_DOWN;
2014 } 2055 }
2015 } 2056 }
2016 else 2057 else
2017 switch (ev.button) 2058 switch (ev.button)
2018 { 2059 {
2019 case Button2: 2060 case Button2:
2020 switch (scrollBar.align) 2061 switch (scrollBar.align)
2021 { 2062 {
2022 case R_SB_ALIGN_TOP: 2063 case SB_ALIGN_TOP:
2023 csrO = 0; 2064 csrO = 0;
2024 break; 2065 break;
2025 case R_SB_ALIGN_CENTRE: 2066 case SB_ALIGN_CENTRE:
2026 csrO = (scrollBar.bot - scrollBar.top) / 2; 2067 csrO = (scrollBar.bot - scrollBar.top) / 2;
2027 break; 2068 break;
2028 case R_SB_ALIGN_BOTTOM: 2069 case SB_ALIGN_BOTTOM:
2029 csrO = scrollBar.bot - scrollBar.top; 2070 csrO = scrollBar.bot - scrollBar.top;
2030 break; 2071 break;
2031 } 2072 }
2032 2073
2033 if (scrollBar.style == R_SB_XTERM 2074 if (scrollBar.style == SB_STYLE_XTERM
2034 || scrollbar_above_slider (ev.y) 2075 || scrollBar.above_slider (ev.y)
2035 || scrollbar_below_slider (ev.y)) 2076 || scrollBar.below_slider (ev.y))
2036 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2077 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2037 2078
2038 scrollBar.state = STATE_MOTION; 2079 scrollBar.state = SB_STATE_MOTION;
2039 break; 2080 break;
2040 2081
2041 case Button1: 2082 case Button1:
2042 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2083 if (scrollBar.align == SB_ALIGN_CENTRE)
2043 csrO = ev.y - scrollBar.top; 2084 csrO = ev.y - scrollBar.top;
2044 /* FALLTHROUGH */ 2085 /* FALLTHROUGH */
2045 2086
2046 case Button3: 2087 case Button3:
2047 if (scrollBar.style != R_SB_XTERM) 2088 if (scrollBar.style != SB_STYLE_XTERM)
2048 { 2089 {
2049 if (scrollbar_above_slider (ev.y)) 2090 if (scrollBar.above_slider (ev.y))
2050# ifdef RXVT_SCROLL_FULL 2091# ifdef RXVT_SCROLL_FULL
2051 scr_page (UP, nrow - 1); 2092 scr_page (UP, nrow - 1);
2052# else 2093# else
2053 scr_page (UP, nrow / 4); 2094 scr_page (UP, nrow / 4);
2054# endif 2095# endif
2055 else if (scrollbar_below_slider (ev.y)) 2096 else if (scrollBar.below_slider (ev.y))
2056# ifdef RXVT_SCROLL_FULL 2097# ifdef RXVT_SCROLL_FULL
2057 scr_page (DN, nrow - 1); 2098 scr_page (DN, nrow - 1);
2058# else 2099# else
2059 scr_page (DN, nrow / 4); 2100 scr_page (DN, nrow / 4);
2060# endif 2101# endif
2061 else 2102 else
2062 scrollBar.state = STATE_MOTION; 2103 scrollBar.state = SB_STATE_MOTION;
2063 } 2104 }
2064 else 2105 else
2065 { 2106 {
2066 scr_page ((ev.button == Button1 ? DN : UP), 2107 scr_page ((ev.button == Button1 ? DN : UP),
2067 (nrow 2108 (nrow
2068 * scrollbar_position (ev.y) 2109 * scrollBar.position (ev.y)
2069 / scrollBar.size ())); 2110 / scrollBar.size ()));
2070 } 2111 }
2071 2112
2072 break; 2113 break;
2073 } 2114 }
… …
2084 2125
2085 csrO = 0; /* reset csr Offset */ 2126 csrO = 0; /* reset csr Offset */
2086 if (!bypass_keystate) 2127 if (!bypass_keystate)
2087 reportmode = !! (priv_modes & PrivMode_mouse_report); 2128 reportmode = !! (priv_modes & PrivMode_mouse_report);
2088 2129
2089 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2130 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2090 { 2131 {
2091 scrollBar.state = STATE_IDLE; 2132 scrollBar.state = SB_STATE_IDLE;
2092 scrollBar.show (0); 2133 scrollBar.show (0);
2093 } 2134 }
2094 2135
2095#ifdef SELECTION_SCROLLING 2136#ifdef SELECTION_SCROLLING
2096 sel_scroll_ev.stop(); 2137 sel_scroll_ev.stop();
… …
2146 case Button3: 2187 case Button3:
2147 selection_make (ev.time); 2188 selection_make (ev.time);
2148 break; 2189 break;
2149 2190
2150 case Button2: 2191 case Button2:
2151 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2192 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2152 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2193 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2153 break; 2194 break;
2154 2195
2155#ifdef MOUSE_WHEEL 2196#ifdef MOUSE_WHEEL
2156 case Button4: 2197 case Button4:
2157 case Button5: 2198 case Button5:
2158 { 2199 {
2159 int i; 2200 int lines;
2160 page_dirn v; 2201 page_dirn dirn;
2161 2202
2162 v = ev.button == Button4 ? UP : DN; 2203 dirn = ev.button == Button4 ? UP : DN;
2163 2204
2164 if (ev.state & ShiftMask) 2205 if (ev.state & ShiftMask)
2165 i = 1; 2206 lines = 1;
2166 else if (option (Opt_mouseWheelScrollPage)) 2207 else if (option (Opt_mouseWheelScrollPage))
2167 i = nrow - 1; 2208 lines = nrow - 1;
2168 else 2209 else
2169 i = 5; 2210 lines = 5;
2170 2211
2171# ifdef MOUSE_SLIP_WHEELING 2212# ifdef MOUSE_SLIP_WHEELING
2172 if (ev.state & ControlMask) 2213 if (ev.state & ControlMask)
2173 { 2214 {
2174 mouse_slip_wheel_speed += v ? -1 : 1; 2215 mouse_slip_wheel_speed += dirn;
2175 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2216 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2176 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2177 2217
2178 if (!slip_wheel_ev.is_active ()) 2218 if (!slip_wheel_ev.is_active ())
2179 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2219 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2180 } 2220 }
2181 else 2221 else
2182# endif 2222# endif
2183 { 2223 {
2184 scr_page (v, i); 2224 scr_page (dirn, lines);
2185 scrollBar.show (1); 2225 scrollBar.show (1);
2186 } 2226 }
2187 } 2227 }
2188 break; 2228 break;
2189#endif 2229#endif
… …
2191 } 2231 }
2192} 2232}
2193 2233
2194/*}}} */ 2234/*}}} */
2195 2235
2196void 2236void ecb_hot
2197rxvt_term::cmd_parse () 2237rxvt_term::cmd_parse ()
2198{ 2238{
2199 wchar_t ch = NOCHAR; 2239 wchar_t ch = NOCHAR;
2200 char *seq_begin; // remember start of esc-sequence here 2240 char *seq_begin; // remember start of esc-sequence here
2201 2241
2202 for (;;) 2242 for (;;)
2203 { 2243 {
2204 if (expect_false (ch == NOCHAR)) 2244 if (ecb_unlikely (ch == NOCHAR))
2205 { 2245 {
2206 seq_begin = cmdbuf_ptr; 2246 seq_begin = cmdbuf_ptr;
2207 ch = next_char (); 2247 ch = next_char ();
2208 2248
2209 if (ch == NOCHAR) 2249 if (ch == NOCHAR)
2210 break; 2250 break;
2211 } 2251 }
2212 2252
2213 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)) 2253 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2214 { 2254 {
2215 if (expect_false (!seen_input)) 2255 if (ecb_unlikely (!seen_input))
2216 { 2256 {
2217 seen_input = 1; 2257 seen_input = 1;
2218 // many badly-written programs (e.g. jed) contain a race condition: 2258 // many badly-written programs (e.g. jed) contain a race condition:
2219 // they first read the screensize and then install a SIGWINCH handler. 2259 // they first read the screensize and then install a SIGWINCH handler.
2220 // some window managers resize the window early, and these programs 2260 // some window managers resize the window early, and these programs
… …
2233 wchar_t *str = buf; 2273 wchar_t *str = buf;
2234 wchar_t *eol = str + min (ncol, UBUFSIZ); 2274 wchar_t *eol = str + min (ncol, UBUFSIZ);
2235 2275
2236 for (;;) 2276 for (;;)
2237 { 2277 {
2238 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))) 2278 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2239 break; 2279 break;
2240 2280
2241 *str++ = ch; 2281 *str++ = ch;
2242 2282
2243 if (expect_false (ch == C0_LF || str >= eol)) 2283 if (ecb_unlikely (ch == C0_LF || str >= eol))
2244 { 2284 {
2245 if (ch == C0_LF) 2285 if (ch == C0_LF)
2246 nlines++; 2286 nlines++;
2247 2287
2248 refresh_count++; 2288 refresh_count++;
… …
2320 } 2360 }
2321 } 2361 }
2322} 2362}
2323 2363
2324// read the next character 2364// read the next character
2325wchar_t 2365wchar_t ecb_hot
2326rxvt_term::next_char () NOTHROW 2366rxvt_term::next_char () NOTHROW
2327{ 2367{
2328 while (cmdbuf_ptr < cmdbuf_endp) 2368 while (cmdbuf_ptr < cmdbuf_endp)
2329 { 2369 {
2330 // assume 7-bit to be ascii ALWAYS 2370 // assume 7-bit to be ascii ALWAYS
2331 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2371 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2332 return *cmdbuf_ptr++; 2372 return *cmdbuf_ptr++;
2333 2373
2334 wchar_t wc; 2374 wchar_t wc;
2335 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2375 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2336 2376
… …
2342 } 2382 }
2343 2383
2344 if (len == (size_t)-1) 2384 if (len == (size_t)-1)
2345 { 2385 {
2346 mbstate.reset (); // reset now undefined conversion state 2386 mbstate.reset (); // reset now undefined conversion state
2387 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2388 // in which case we "erroneously" return the next byte which might be valid.
2347 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2389 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2348 } 2390 }
2349 2391
2350 // assume wchar == unicode 2392 // assume wchar == unicode
2351 cmdbuf_ptr += len; 2393 cmdbuf_ptr += len;
… …
2354 2396
2355 return NOCHAR; 2397 return NOCHAR;
2356} 2398}
2357 2399
2358// read the next octet 2400// read the next octet
2359uint32_t 2401uint32_t ecb_hot
2360rxvt_term::next_octet () NOTHROW 2402rxvt_term::next_octet () NOTHROW
2361{ 2403{
2362 return cmdbuf_ptr < cmdbuf_endp 2404 return cmdbuf_ptr < cmdbuf_endp
2363 ? (unsigned char)*cmdbuf_ptr++ 2405 ? (unsigned char)*cmdbuf_ptr++
2364 : NOCHAR; 2406 : NOCHAR;
2365} 2407}
2366 2408
2367static class out_of_input out_of_input; 2409static class out_of_input out_of_input;
2368 2410
2369/* rxvt_cmd_getc () - Return next input character */ 2411wchar_t ecb_hot
2370/*
2371 * Return the next input character after first passing any keyboard input
2372 * to the command.
2373 */
2374wchar_t
2375rxvt_term::cmd_getc () THROW ((class out_of_input)) 2412rxvt_term::cmd_getc () THROW ((class out_of_input))
2376{ 2413{
2377 wchar_t c = next_char (); 2414 wchar_t c = next_char ();
2378 2415
2379 if (c == NOCHAR) 2416 if (c == NOCHAR)
2380 throw out_of_input; 2417 throw out_of_input;
2381 2418
2382 return c; 2419 return c;
2383} 2420}
2384 2421
2385uint32_t 2422uint32_t ecb_hot
2386rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2423rxvt_term::cmd_get8 () THROW ((class out_of_input))
2387{ 2424{
2388 uint32_t c = next_octet (); 2425 uint32_t c = next_octet ();
2389 2426
2390 if (c == NOCHAR) 2427 if (c == NOCHAR)
… …
2394} 2431}
2395 2432
2396/*{{{ print pipe */ 2433/*{{{ print pipe */
2397/*----------------------------------------------------------------------*/ 2434/*----------------------------------------------------------------------*/
2398#ifdef PRINTPIPE 2435#ifdef PRINTPIPE
2399FILE * 2436FILE * ecb_cold
2400rxvt_term::popen_printer () 2437rxvt_term::popen_printer ()
2401{ 2438{
2402 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w"); 2439 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2403 2440
2404 if (stream == NULL) 2441 if (stream == NULL)
2405 rxvt_warn ("can't open printer pipe, not printing.\n"); 2442 rxvt_warn ("can't open printer pipe, not printing.\n");
2406 2443
2407 return stream; 2444 return stream;
2408} 2445}
2409 2446
2410int 2447int ecb_cold
2411rxvt_term::pclose_printer (FILE *stream) 2448rxvt_term::pclose_printer (FILE *stream)
2412{ 2449{
2413 fflush (stream); 2450 fflush (stream);
2414 return pclose (stream); 2451 return pclose (stream);
2415} 2452}
2416 2453
2417/* 2454/*
2418 * simulate attached vt100 printer 2455 * simulate attached vt100 printer
2419 */ 2456 */
2420void 2457void ecb_cold
2421rxvt_term::process_print_pipe () 2458rxvt_term::process_print_pipe ()
2422{ 2459{
2423 FILE *fd = popen_printer (); 2460 FILE *fd = popen_printer ();
2424 2461
2425 if (!fd) 2462 if (!fd)
… …
2471 pclose_printer (fd); 2508 pclose_printer (fd);
2472} 2509}
2473#endif /* PRINTPIPE */ 2510#endif /* PRINTPIPE */
2474/*}}} */ 2511/*}}} */
2475 2512
2476/* *INDENT-OFF* */
2477enum { 2513enum {
2478 C1_40 = 0x40, 2514 C1_40 = 0x40,
2479 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2515 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2480 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2516 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2481 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2517 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2482 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2518 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2483}; 2519};
2484/* *INDENT-ON* */
2485 2520
2486/*{{{ process non-printing single characters */ 2521/*{{{ process non-printing single characters */
2487void 2522void ecb_hot
2488rxvt_term::process_nonprinting (unicode_t ch) 2523rxvt_term::process_nonprinting (unicode_t ch)
2489{ 2524{
2490 switch (ch) 2525 switch (ch)
2491 { 2526 {
2492 case C0_ESC: 2527 case C0_ESC:
… …
2538} 2573}
2539/*}}} */ 2574/*}}} */
2540 2575
2541 2576
2542/*{{{ process VT52 escape sequences */ 2577/*{{{ process VT52 escape sequences */
2543void 2578void ecb_cold
2544rxvt_term::process_escape_vt52 (unicode_t ch) 2579rxvt_term::process_escape_vt52 (unicode_t ch)
2545{ 2580{
2546 int row, col; 2581 int row, col;
2547 2582
2548 switch (ch) 2583 switch (ch)
… …
2582 break; 2617 break;
2583 case 'Z': /* identify the terminal type */ 2618 case 'Z': /* identify the terminal type */
2584 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2619 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2585 break; 2620 break;
2586 case '<': /* turn off VT52 mode */ 2621 case '<': /* turn off VT52 mode */
2587 set_privmode (PrivMode_vt52, 0); 2622 priv_modes &= ~PrivMode_vt52;
2588 break; 2623 break;
2589 case 'F': /* use special graphics character set */ 2624 case 'F': /* use special graphics character set */
2590 case 'G': /* use regular character set */ 2625 case 'G': /* use regular character set */
2591 /* unimplemented */ 2626 /* unimplemented */
2592 break; 2627 break;
… …
2598} 2633}
2599/*}}} */ 2634/*}}} */
2600 2635
2601 2636
2602/*{{{ process escape sequences */ 2637/*{{{ process escape sequences */
2603void 2638void ecb_hot
2604rxvt_term::process_escape_seq () 2639rxvt_term::process_escape_seq ()
2605{ 2640{
2606 unicode_t ch = cmd_getc (); 2641 unicode_t ch = cmd_getc ();
2607 2642
2608 if (priv_modes & PrivMode_vt52) 2643 if (priv_modes & PrivMode_vt52)
… …
2611 return; 2646 return;
2612 } 2647 }
2613 2648
2614 switch (ch) 2649 switch (ch)
2615 { 2650 {
2616 /* case 1: do_tek_mode (); break; */
2617 case '#': 2651 case '#':
2618 if (cmd_getc () == '8') 2652 if (cmd_getc () == '8')
2619 scr_E (); 2653 scr_E ();
2620 break; 2654 break;
2621 case '(': 2655 case '(':
… …
2644#if !ENABLE_MINIMAL 2678#if !ENABLE_MINIMAL
2645 case '9': 2679 case '9':
2646 scr_forwardindex (); 2680 scr_forwardindex ();
2647 break; 2681 break;
2648#endif 2682#endif
2683 // DECPAM/DECPNM
2649 case '=': 2684 case '=':
2685 priv_modes |= PrivMode_aplKP;
2686 break;
2650 case '>': 2687 case '>':
2651 set_privmode (PrivMode_aplKP, ch == '='); 2688 priv_modes &= ~PrivMode_aplKP;
2652 break; 2689 break;
2653 2690
2654 case C1_40: 2691 case C1_40:
2655 cmd_getc (); 2692 cmd_getc ();
2656 break; 2693 break;
… …
2660 2697
2661 /* 8.3.87: NEXT LINE */ 2698 /* 8.3.87: NEXT LINE */
2662 case C1_NEL: /* ESC E */ 2699 case C1_NEL: /* ESC E */
2663 { 2700 {
2664 wchar_t nlcr[] = { C0_LF, C0_CR }; 2701 wchar_t nlcr[] = { C0_LF, C0_CR };
2665 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2702 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2666 } 2703 }
2667 break; 2704 break;
2668 2705
2669 /* kidnapped escape sequence: Should be 8.3.48 */ 2706 /* kidnapped escape sequence: Should be 8.3.48 */
2670 case C1_ESA: /* ESC G */ 2707 case C1_ESA: /* ESC G */
2671 process_graphics (); 2708 // used by original rxvt for rob nations own graphics mode
2709 if (cmd_getc () == 'Q')
2710 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2672 break; 2711 break;
2673 2712
2674 /* 8.3.63: CHARACTER TABULATION SET */ 2713 /* 8.3.63: CHARACTER TABULATION SET */
2675 case C1_HTS: /* ESC H */ 2714 case C1_HTS: /* ESC H */
2676 scr_set_tab (1); 2715 scr_set_tab (1);
… …
2680 case C1_RI: /* ESC M */ 2719 case C1_RI: /* ESC M */
2681 scr_index (DN); 2720 scr_index (DN);
2682 break; 2721 break;
2683 2722
2684 /* 8.3.142: SINGLE-SHIFT TWO */ 2723 /* 8.3.142: SINGLE-SHIFT TWO */
2685 /*case C1_SS2: scr_single_shift (2); break; */ 2724 /* case C1_SS2: break; */
2686 2725
2687 /* 8.3.143: SINGLE-SHIFT THREE */ 2726 /* 8.3.143: SINGLE-SHIFT THREE */
2688 /*case C1_SS3: scr_single_shift (3); break; */ 2727 /* case C1_SS3: break; */
2689 2728
2690 /* 8.3.27: DEVICE CONTROL STRING */ 2729 /* 8.3.27: DEVICE CONTROL STRING */
2691 case C1_DCS: /* ESC P */ 2730 case C1_DCS: /* ESC P */
2692 process_dcs_seq (); 2731 process_dcs_seq ();
2693 break; 2732 break;
… …
2726 } 2765 }
2727} 2766}
2728/*}}} */ 2767/*}}} */
2729 2768
2730/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2769/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2731/* *INDENT-OFF* */
2732enum { 2770enum {
2733 CSI_ICH = 0x40, 2771 CSI_ICH = 0x40,
2734 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2772 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2735 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2773 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2736 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2774 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2739 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2777 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2740 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2778 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2741 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2779 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2742}; 2780};
2743 2781
2744#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2782#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2745 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2783 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2746 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2784 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2747#define get_byte_array_bit(array, bit) \ 2785#define get_byte_array_bit(array, bit) \
2748 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2786 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2749 2787
2750const unsigned char csi_defaults[] = 2788static const unsigned char csi_defaults[] =
2751 { 2789 {
2752 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2790 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2753 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2791 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2754 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2792 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2755 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2793 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2756 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2794 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2757 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2795 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2758 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2796 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2759 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2797 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2760 }; 2798 };
2761/* *INDENT-ON* */
2762 2799
2763void 2800void ecb_hot
2764rxvt_term::process_csi_seq () 2801rxvt_term::process_csi_seq ()
2765{ 2802{
2766 unicode_t ch, priv, i; 2803 unicode_t ch, priv, prev_ch, i;
2767 unsigned int nargs, p; 2804 unsigned int nargs, p;
2768 int n, ndef; 2805 int n, ndef;
2769 int arg[ESC_ARGS] = { }; 2806 int arg[ESC_ARGS] = { };
2770 2807
2771 nargs = 0; 2808 nargs = 0;
… …
2777 /* '<' '=' '>' '?' '!' */ 2814 /* '<' '=' '>' '?' '!' */
2778 priv = ch; 2815 priv = ch;
2779 ch = cmd_getc (); 2816 ch = cmd_getc ();
2780 } 2817 }
2781 2818
2819 prev_ch = 0;
2782 /* read any numerical arguments */ 2820 /* read any numerical arguments */
2783 for (n = -1; ch < CSI_ICH; ) 2821 for (n = -1; ch < CSI_ICH; )
2784 { 2822 {
2785 if (isdigit (ch)) 2823 if (isdigit (ch))
2786 { 2824 {
… …
2796 n = -1; 2834 n = -1;
2797 } 2835 }
2798 else if (IS_CONTROL (ch)) 2836 else if (IS_CONTROL (ch))
2799 process_nonprinting (ch); 2837 process_nonprinting (ch);
2800 2838
2839 prev_ch = ch;
2801 ch = cmd_getc (); 2840 ch = cmd_getc ();
2802 } 2841 }
2803 2842
2804 if (ch > CSI_7F) 2843 if (ch > CSI_7F)
2805 return; 2844 return;
… …
2844 { 2883 {
2845 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2884 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2846 scr_soft_reset (); 2885 scr_soft_reset ();
2847 2886
2848 static const int pm_h[] = { 7, 25 }; 2887 static const int pm_h[] = { 7, 25 };
2849 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 }; 2888 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2850 2889
2851 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h); 2890 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2852 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l); 2891 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2853 } 2892 }
2854 break; 2893 break;
2855 } 2894 }
2856 2895
2857 return; 2896 return;
… …
2875 } 2914 }
2876 break; 2915 break;
2877#endif 2916#endif
2878 2917
2879 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2918 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2880 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2919 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2881 arg[0] = -arg[0]; 2920 arg[0] = -arg[0];
2882 /* FALLTHROUGH */ 2921 /* FALLTHROUGH */
2883 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2922 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2884 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2923 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2885 scr_gotorc (arg[0], 0, RELATIVE); 2924 scr_gotorc (arg[0], 0, RELATIVE);
2886 break; 2925 break;
2887 2926
2888 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2927 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2889 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2928 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3039 scr_insert_mode (1); 3078 scr_insert_mode (1);
3040 else if (arg[0] == 20) 3079 else if (arg[0] == 20)
3041 priv_modes |= PrivMode_LFNL; 3080 priv_modes |= PrivMode_LFNL;
3042 break; 3081 break;
3043 3082
3083 case CSI_71: // DESCUSR: set cursor style
3084 if (prev_ch == ' ')
3085 set_cursor_style (arg[0]);
3086 break;
3087
3044 /* 3088 /*
3045 * PRIVATE USE beyond this point. All CSI_7? sequences here 3089 * PRIVATE USE beyond this point. All CSI_7? sequences here
3046 */ 3090 */
3047 case CSI_72: /* DECSTBM: set top and bottom margins */ 3091 case CSI_72: /* DECSTBM: set top and bottom margins */
3048 if (nargs == 1) 3092 if (nargs == 1)
… …
3076 } 3120 }
3077} 3121}
3078/*}}} */ 3122/*}}} */
3079 3123
3080#if !ENABLE_MINIMAL 3124#if !ENABLE_MINIMAL
3081/* ARGSUSED */
3082void 3125void
3083rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3126rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3084{ 3127{
3085 int x, y; 3128 int x, y;
3086 XWindowAttributes wattr; 3129 XWindowAttributes wattr;
… …
3095 { 3138 {
3096 /* 3139 /*
3097 * commands 3140 * commands
3098 */ 3141 */
3099 case 1: /* deiconify window */ 3142 case 1: /* deiconify window */
3100 XMapWindow (dpy, parent[0]); 3143 XMapWindow (dpy, parent);
3101 break; 3144 break;
3102 case 2: /* iconify window */ 3145 case 2: /* iconify window */
3103 XIconifyWindow (dpy, parent[0], display->screen); 3146 XIconifyWindow (dpy, parent, display->screen);
3104 break; 3147 break;
3105 case 3: /* set position (pixels) */ 3148 case 3: /* set position (pixels) */
3106 XMoveWindow (dpy, parent[0], args[1], args[2]); 3149 XMoveWindow (dpy, parent, args[1], args[2]);
3107 break; 3150 break;
3108 case 4: /* set size (pixels) */ 3151 case 4: /* set size (pixels) */
3109 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3152 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3110 break; 3153 break;
3111 case 5: /* raise window */ 3154 case 5: /* raise window */
3112 XRaiseWindow (dpy, parent[0]); 3155 XRaiseWindow (dpy, parent);
3113 break; 3156 break;
3114 case 6: /* lower window */ 3157 case 6: /* lower window */
3115 XLowerWindow (dpy, parent[0]); 3158 XLowerWindow (dpy, parent);
3116 break; 3159 break;
3117 case 7: /* refresh window */ 3160 case 7: /* refresh window */
3118 scr_touch (true); 3161 scr_touch (true);
3119 break; 3162 break;
3120 case 8: /* set size (chars) */ 3163 case 8: /* set size (chars) */
… …
3123 break; 3166 break;
3124 3167
3125 //case 9: NYI, TODO, restore maximized window or maximize window 3168 //case 9: NYI, TODO, restore maximized window or maximize window
3126 default: 3169 default:
3127 if (args[0] >= 24) /* set height (chars) */ 3170 if (args[0] >= 24) /* set height (chars) */
3128 set_widthheight ((unsigned int)width, 3171 set_widthheight ((unsigned int)vt_width,
3129 (unsigned int) (args[1] * fheight)); 3172 (unsigned int) (args[1] * fheight));
3130 break; 3173 break;
3131 3174
3132 /* 3175 /*
3133 * reports - some output format copied from XTerm 3176 * reports - some output format copied from XTerm
3134 */ 3177 */
3135 case 11: /* report window state */ 3178 case 11: /* report window state */
3136 XGetWindowAttributes (dpy, parent[0], &wattr); 3179 XGetWindowAttributes (dpy, parent, &wattr);
3137 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3180 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3138 break; 3181 break;
3139 case 13: /* report window position */ 3182 case 13: /* report window position */
3140 XGetWindowAttributes (dpy, parent[0], &wattr); 3183 XGetWindowAttributes (dpy, parent, &wattr);
3141 XTranslateCoordinates (dpy, parent[0], wattr.root, 3184 XTranslateCoordinates (dpy, parent, wattr.root,
3142 -wattr.border_width, -wattr.border_width, 3185 -wattr.border_width, -wattr.border_width,
3143 &x, &y, &wdummy); 3186 &x, &y, &wdummy);
3144 tt_printf ("\033[3;%d;%dt", x, y); 3187 tt_printf ("\033[3;%d;%dt", x, y);
3145 break; 3188 break;
3146 case 14: /* report window size (pixels) */ 3189 case 14: /* report window size (pixels) */
3147 XGetWindowAttributes (dpy, parent[0], &wattr); 3190 XGetWindowAttributes (dpy, parent, &wattr);
3148 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3191 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3149 break; 3192 break;
3150 case 18: /* report text area size (chars) */ 3193 case 18: /* report text area size (chars) */
3151 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3194 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3152 break; 3195 break;
… …
3154 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3197 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3155 break; 3198 break;
3156 case 20: /* report icon label */ 3199 case 20: /* report icon label */
3157 { 3200 {
3158 char *s; 3201 char *s;
3159 XGetIconName (dpy, parent[0], &s); 3202 XGetIconName (dpy, parent, &s);
3160 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3203 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3161 XFree (s); 3204 XFree (s);
3162 } 3205 }
3163 break; 3206 break;
3164 case 21: /* report window title */ 3207 case 21: /* report window title */
3165 { 3208 {
3166 char *s; 3209 char *s;
3167 XFetchName (dpy, parent[0], &s); 3210 XFetchName (dpy, parent, &s);
3168 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3211 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3169 XFree (s); 3212 XFree (s);
3170 } 3213 }
3171 break; 3214 break;
3172 } 3215 }
… …
3228 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3271 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3229 */ 3272 */
3230void 3273void
3231rxvt_term::process_dcs_seq () 3274rxvt_term::process_dcs_seq ()
3232{ 3275{
3233 char *s;
3234 unicode_t eh;
3235
3236 /* 3276 /*
3237 * Not handled yet 3277 * Not handled yet
3238 */ 3278 */
3279
3280 unicode_t eh;
3239 s = get_to_st (eh); 3281 char *s = get_to_st (eh);
3240 if (s) 3282 if (s)
3241 free (s); 3283 free (s);
3242 3284
3243 return; 3285 return;
3244} 3286}
… …
3248 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)' 3290 * process OPERATING SYSTEM COMMAND sequence `ESC ] Ps ; Pt (ST|BEL)'
3249 */ 3291 */
3250void 3292void
3251rxvt_term::process_osc_seq () 3293rxvt_term::process_osc_seq ()
3252{ 3294{
3253 unicode_t ch, eh;
3254 int arg; 3295 int arg;
3255 3296
3256 ch = cmd_getc (); 3297 unicode_t ch = cmd_getc ();
3257 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3298 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3258 arg = arg * 10 + (ch - '0'); 3299 arg = arg * 10 + (ch - '0');
3259 3300
3260 if (ch == ';') 3301 if (ch == ';')
3261 { 3302 {
3303 unicode_t eh;
3262 char *s = get_to_st (eh); 3304 char *s = get_to_st (eh);
3263 3305
3264 if (s) 3306 if (s)
3265 { 3307 {
3266 process_xterm_seq (arg, s, eh); 3308 process_xterm_seq (arg, s, eh);
… …
3327 unsigned long bytes_after; 3369 unsigned long bytes_after;
3328 unsigned char *value = 0; 3370 unsigned char *value = 0;
3329 const char *str = ""; 3371 const char *str = "";
3330 3372
3331 if (prop 3373 if (prop
3332 && XGetWindowProperty (dpy, parent[0], 3374 && XGetWindowProperty (dpy, parent,
3333 prop, 0, 1<<16, 0, AnyPropertyType, 3375 prop, 0, 1<<16, 0, AnyPropertyType,
3334 &actual_type, &actual_format, 3376 &actual_type, &actual_format,
3335 &nitems, &bytes_after, &value) == Success 3377 &nitems, &bytes_after, &value) == Success
3336 && actual_type != None 3378 && actual_type != None
3337 && actual_format == 8) 3379 && actual_format == 8)
… …
3349 { 3391 {
3350 *eq = 0; 3392 *eq = 0;
3351 set_utf8_property (display->atom (str), eq + 1); 3393 set_utf8_property (display->atom (str), eq + 1);
3352 } 3394 }
3353 else 3395 else
3354 XDeleteProperty (dpy, parent[0], 3396 XDeleteProperty (dpy, parent,
3355 display->atom (str)); 3397 display->atom (str));
3356 } 3398 }
3357 break; 3399 break;
3358 3400
3359 case XTerm_Color: 3401 case XTerm_Color:
… …
3391 process_color_seq (op, Color_pointer_fg, str, resp); 3433 process_color_seq (op, Color_pointer_fg, str, resp);
3392 break; 3434 break;
3393 case XTerm_Color_pointer_bg: 3435 case XTerm_Color_pointer_bg:
3394 process_color_seq (op, Color_pointer_bg, str, resp); 3436 process_color_seq (op, Color_pointer_bg, str, resp);
3395 break; 3437 break;
3438#ifdef OPTION_HC
3439 case XTerm_Color_HC:
3440 process_color_seq (op, Color_HC, str, resp);
3441 break;
3442 case XTerm_Color_HTC:
3443 process_color_seq (op, Color_HTC, str, resp);
3444 break;
3445#endif
3396#ifndef NO_BOLD_UNDERLINE_REVERSE 3446#ifndef NO_BOLD_UNDERLINE_REVERSE
3397 case XTerm_Color_RV:
3398 process_color_seq (op, Color_RV, str, resp);
3399 break;
3400 case Rxvt_Color_BD:
3401 case URxvt_Color_BD: 3447 case URxvt_Color_BD:
3402 process_color_seq (op, Color_BD, str, resp); 3448 process_color_seq (op, Color_BD, str, resp);
3403 break; 3449 break;
3404 case Rxvt_Color_UL:
3405 case URxvt_Color_UL: 3450 case URxvt_Color_UL:
3406 process_color_seq (op, Color_UL, str, resp); 3451 process_color_seq (op, Color_UL, str, resp);
3407 break; 3452 break;
3408 case URxvt_Color_IT: 3453 case URxvt_Color_IT:
3409 process_color_seq (op, Color_IT, str, resp); 3454 process_color_seq (op, Color_IT, str, resp);
3410 break; 3455 break;
3411#endif 3456#endif
3412 case URxvt_Color_border: 3457 case URxvt_Color_border:
3413 process_color_seq (op, Color_border, str, resp); 3458 process_color_seq (op, Color_border, str, resp);
3414 break; 3459 break;
3415#if ENABLE_TRANSPARENCY 3460
3461#if BG_IMAGE_FROM_ROOT
3416 case URxvt_Color_tint: 3462 case URxvt_Color_tint:
3417 process_color_seq (op, Color_tint, str, resp); 3463 process_color_seq (op, Color_tint, str, resp);
3418 { 3464 {
3419 bool changed = false; 3465 bool changed = false;
3420 3466
3421 if (ISSET_PIXCOLOR (Color_tint)) 3467 if (ISSET_PIXCOLOR (Color_tint))
3422 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3468 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3423 else
3424 changed = bgPixmap.unset_tint ();
3425 3469
3426 if (changed) 3470 if (changed)
3427 update_background (); 3471 update_background ();
3428 } 3472 }
3429 3473
… …
3433#if BG_IMAGE_FROM_FILE 3477#if BG_IMAGE_FROM_FILE
3434 case Rxvt_Pixmap: 3478 case Rxvt_Pixmap:
3435 if (!strcmp (str, "?")) 3479 if (!strcmp (str, "?"))
3436 { 3480 {
3437 char str[256]; 3481 char str[256];
3482 int h_scale = fimage.h_scale;
3483 int v_scale = fimage.v_scale;
3484 int h_align = fimage.h_align;
3485 int v_align = fimage.v_align;
3438 3486
3439 sprintf (str, "[%dx%d+%d+%d]", 3487 sprintf (str, "[%dx%d+%d+%d]",
3440 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3488 h_scale, v_scale,
3441 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3489 h_align, v_align);
3442 process_xterm_seq (XTerm_title, str, CHAR_ST); 3490 process_xterm_seq (XTerm_title, str, CHAR_ST);
3443 } 3491 }
3444 else 3492 else
3445 { 3493 {
3446 int changed = 0; 3494 bool changed = false;
3447 3495
3448 if (*str != ';') 3496 if (*str != ';')
3449 { 3497 {
3450 /* reset to default scaling :*/ 3498 try
3451 bgPixmap.unset_geometry (); 3499 {
3452 if (bgPixmap.set_file (str)) /* change pixmap */ 3500 fimage.set_file_geometry (this, str);
3453 changed++; 3501 changed = true;
3454 str = strchr (str, ';'); 3502 }
3455 if (str == NULL) 3503 catch (const class rxvt_failure_exception &e)
3456 bgPixmap.set_defaultGeometry (); 3504 {
3505 }
3457 } 3506 }
3458 3507 else
3459 while (str)
3460 { 3508 {
3461 str++; 3509 str++;
3462 if (bgPixmap.set_geometry (str)) 3510 if (fimage.set_geometry (str, true))
3463 changed++; 3511 changed = true;
3464 str = strchr (str, ';');
3465 } 3512 }
3466 3513
3467 if (changed) 3514 if (changed)
3515 {
3516 if (bg_window_position_sensitive ())
3517 {
3518 int x, y;
3519 get_window_origin (x, y);
3520 parent_x = x;
3521 parent_y = y;
3522 }
3468 update_background (); 3523 update_background ();
3524 }
3469 } 3525 }
3470 break; 3526 break;
3471#endif 3527#endif
3472 3528
3473 case XTerm_logfile: 3529 case XTerm_logfile:
… …
3560 * 's' = save 3616 * 's' = save
3561 * 'r' = restore 3617 * 'r' = restore
3562 * 't' = toggle 3618 * 't' = toggle
3563 * so no need for fancy checking 3619 * so no need for fancy checking
3564 */ 3620 */
3565int 3621int ecb_cold
3566rxvt_term::privcases (int mode, unsigned long bit) 3622rxvt_term::privcases (int mode, unsigned long bit)
3567{ 3623{
3568 int state; 3624 int state;
3569 3625
3570 if (mode == 's') 3626 if (mode == 's')
3571 { 3627 {
3572 SavedModes |= (priv_modes & bit); 3628 if (priv_modes & bit)
3629 SavedModes |= bit;
3630 else
3631 SavedModes &= ~bit;
3573 return -1; 3632 return -1;
3574 } 3633 }
3575 else 3634 else
3576 { 3635 {
3577 if (mode == 'r') 3636 if (mode == 'r')
3578 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3637 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3579 else 3638 else
3580 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3639 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3581 set_privmode (bit, state); 3640
3641 if (state)
3642 priv_modes |= bit;
3643 else
3644 priv_modes &= ~bit;
3582 } 3645 }
3583 3646
3584 return state; 3647 return state;
3585} 3648}
3586 3649
3587/* we're not using priv _yet_ */ 3650/* we're not using priv _yet_ */
3588void 3651void
3589rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3652rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3590{ 3653{
3591 unsigned int i, j; 3654 unsigned int i, j;
3592 int state; 3655 int state;
3593 3656
3594 static const struct 3657 static const struct
3595 { 3658 {
3596 const int argval; 3659 const int argval;
3597 const unsigned long bit; 3660 const unsigned long bit;
3598 } argtopriv[] = { 3661 } argtopriv[] = {
3599 { 1, PrivMode_aplCUR }, // DECCKM 3662 { 1, PrivMode_aplCUR }, // DECCKM
3600 { 2, PrivMode_vt52 }, 3663 { 2, PrivMode_vt52 }, // DECANM
3601 { 3, PrivMode_132 }, // DECCOLM 3664 { 3, PrivMode_132 }, // DECCOLM
3602 { 4, PrivMode_smoothScroll }, // DECSCLM 3665 { 4, PrivMode_smoothScroll }, // DECSCLM
3603 { 5, PrivMode_rVideo }, // DECSCNM 3666 { 5, PrivMode_rVideo }, // DECSCNM
3604 { 6, PrivMode_relOrigin }, // DECOM 3667 { 6, PrivMode_relOrigin }, // DECOM
3605 { 7, PrivMode_Autowrap }, // DECAWM 3668 { 7, PrivMode_Autowrap }, // DECAWM
3606 // 8, auto-repeat keys // DECARM 3669 // 8, auto-repeat keys // DECARM
3607 { 9, PrivMode_MouseX10 }, 3670 { 9, PrivMode_MouseX10 },
3608 // 18 end FF to printer after print screen 3671 // 18 end FF to printer after print screen
3609 // 19 Print screen prints full screen/scorll region 3672 // 19 Print screen prints full screen/scroll region
3610 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3673 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3611#ifdef scrollBar_esc 3674#ifdef scrollBar_esc
3612 { scrollBar_esc, PrivMode_scrollBar }, 3675 { scrollBar_esc, PrivMode_scrollBar },
3613#endif 3676#endif
3614 { 35, PrivMode_ShiftKeys }, // rxvt extension 3677 { 35, PrivMode_ShiftKeys }, // rxvt extension
3615 // 38, tektronix mode // DECTEK 3678 // 38, tektronix mode // DECTEK
3616 { 40, PrivMode_132OK }, 3679 { 40, PrivMode_132OK },
3617 // 41 xterm more fixes NYI 3680 // 41 xterm more fixes NYI
3618 // 45 margin bell NYI 3681 // 45 margin bell NYI
3619 // 46 start logging 3682 // 46 start logging
3620 { 47, PrivMode_Screen }, 3683 { 47, PrivMode_Screen },
3621 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3684 { 66, PrivMode_aplKP }, // DECNKM
3622#ifndef NO_BACKSPACE_KEY 3685#ifndef NO_BACKSPACE_KEY
3623 { 67, PrivMode_BackSpace }, // DECBKM 3686 { 67, PrivMode_BackSpace }, // DECBKM
3624#endif 3687#endif
3625 { 1000, PrivMode_MouseX11 }, 3688 { 1000, PrivMode_MouseX11 },
3626 { 1002, PrivMode_MouseBtnEvent }, 3689 { 1002, PrivMode_MouseBtnEvent },
3627 { 1003, PrivMode_MouseAnyEvent }, 3690 { 1003, PrivMode_MouseAnyEvent },
3691#if ENABLE_FRILLS
3692 { 1005, PrivMode_ExtModeMouse },
3693#endif
3628 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3694 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3629 { 1011, PrivMode_Keypress }, // rxvt extension 3695 { 1011, PrivMode_Keypress }, // rxvt extension
3696#if ENABLE_FRILLS
3697 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3698#endif
3630 // 1035 enable modifiers for alt, numlock NYI 3699 // 1035 enable modifiers for alt, numlock NYI
3631 // 1036 send ESC for meta keys NYI 3700 // 1036 send ESC for meta keys NYI
3632 // 1037 send DEL for keypad delete NYI 3701 // 1037 send DEL for keypad delete NYI
3633 { 1047, PrivMode_Screen }, 3702 { 1047, PrivMode_Screen },
3634 // 1048 save and restore cursor 3703 // 1048 save and restore cursor, implemented in code
3635 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3704 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3636 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3705 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3637 { 2004, PrivMode_BracketPaste }, 3706 { 2004, PrivMode_BracketPaste },
3638 }; 3707 };
3639 3708
… …
3649 for (i = 0; i < nargs; i++) 3718 for (i = 0; i < nargs; i++)
3650 { 3719 {
3651 state = -1; 3720 state = -1;
3652 3721
3653 /* basic handling */ 3722 /* basic handling */
3654 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3723 for (j = 0; j < ecb_array_length (argtopriv); j++)
3655 if (argtopriv[j].argval == arg[i]) 3724 if (argtopriv[j].argval == arg[i])
3656 { 3725 {
3657 state = privcases (mode, argtopriv[j].bit); 3726 state = privcases (mode, argtopriv[j].bit);
3658 break; 3727 break;
3659 } 3728 }
… …
3685 case 2: /* VT52 mode */ 3754 case 2: /* VT52 mode */
3686 /* oddball mode. should be set regardless of set/reset 3755 /* oddball mode. should be set regardless of set/reset
3687 * parameter. Return from VT52 mode with an ESC < from 3756 * parameter. Return from VT52 mode with an ESC < from
3688 * within VT52 mode 3757 * within VT52 mode
3689 */ 3758 */
3690 set_privmode (PrivMode_vt52, 1); 3759 priv_modes |= PrivMode_vt52;
3691 break; 3760 break;
3692 case 3: /* 80/132 */ 3761 case 3: /* 80/132 */
3693 if (priv_modes & PrivMode_132OK) 3762 if (priv_modes & PrivMode_132OK)
3694 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight); 3763 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3695 break; 3764 break;
… …
3710 if (state) /* orthogonal */ 3779 if (state) /* orthogonal */
3711 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3780 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3712 break; 3781 break;
3713#ifdef scrollBar_esc 3782#ifdef scrollBar_esc
3714 case scrollBar_esc: 3783 case scrollBar_esc:
3715 if (scrollBar.map (state)) 3784 scrollBar.map (state);
3716 {
3717 resize_all_windows (0, 0, 0); 3785 resize_all_windows (0, 0, 0);
3718 scr_touch (true); 3786 scr_touch (true);
3719 }
3720 break; 3787 break;
3721#endif 3788#endif
3722 case 25: /* visible/invisible cursor */ 3789 case 25: /* visible/invisible cursor */
3723 scr_cursor_visible (state); 3790 scr_cursor_visible (state);
3724 break; 3791 break;
… …
3737 case 1003: 3804 case 1003:
3738 if (state) 3805 if (state)
3739 { 3806 {
3740 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3807 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3741 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3808 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3809 mouse_row = mouse_col = 0;
3742 vt_emask_mouse = PointerMotionMask; 3810 vt_emask_mouse = PointerMotionMask;
3743 } 3811 }
3744 else 3812 else
3745 vt_emask_mouse = NoEventMask; 3813 vt_emask_mouse = NoEventMask;
3746 3814
… …
3778 } 3846 }
3779} 3847}
3780/*}}} */ 3848/*}}} */
3781 3849
3782/*{{{ process sgr sequences */ 3850/*{{{ process sgr sequences */
3783void 3851void ecb_hot
3784rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3852rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3785{ 3853{
3786 unsigned int i; 3854 unsigned int i;
3787 short rendset; 3855 short rendset;
3788 int rendstyle; 3856 int rendstyle;
… …
3929 break; 3997 break;
3930#endif 3998#endif
3931 } 3999 }
3932 } 4000 }
3933} 4001}
3934/*}}} */
3935 4002
3936/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3937void 4003void
3938rxvt_term::process_graphics () 4004rxvt_term::set_cursor_style (int style)
3939{ 4005{
3940 unicode_t ch, cmd = cmd_getc (); 4006 if (!IN_RANGE_INC (style, 0, 4))
3941
3942 if (cmd == 'Q')
3943 {
3944 /* query graphics */
3945 tt_printf ("\033G0\012"); /* no graphics */
3946 return; 4007 return;
3947 } 4008
3948 /* swallow other graphics sequences until terminating ':' */ 4009 set_option (Opt_cursorUnderline, style >= 3);
3949 do 4010
3950 ch = cmd_getc (); 4011#ifdef CURSOR_BLINK
3951 while (ch != ':'); 4012 set_option (Opt_cursorBlink, !style || (style & 1));
4013 cursor_blink_reset ();
4014#endif
4015
4016 want_refresh = 1;
3952} 4017}
3953/*}}} */ 4018/*}}} */
3954 4019
3955/* ------------------------------------------------------------------------- */ 4020/* ------------------------------------------------------------------------- */
3956 4021
… …
3972 4037
3973/* ---------------------------------------------------------------------- */ 4038/* ---------------------------------------------------------------------- */
3974/* Write data to the pty as typed by the user, pasted with the mouse, 4039/* Write data to the pty as typed by the user, pasted with the mouse,
3975 * or generated by us in response to a query ESC sequence. 4040 * or generated by us in response to a query ESC sequence.
3976 */ 4041 */
3977const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4042static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3978 4043
3979void 4044void
3980rxvt_term::tt_write (const char *data, unsigned int len) 4045rxvt_term::tt_write (const char *data, unsigned int len)
3981{ 4046{
3982 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4047 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3987 4052
3988 if (v_buflen == 0) 4053 if (v_buflen == 0)
3989 { 4054 {
3990 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4055 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3991 4056
4057 max_it (written, 0);
4058
3992 if ((unsigned int)written == len) 4059 if (written == len)
3993 return; 4060 return;
3994 4061
3995 data += written; 4062 data += written;
3996 len -= written; 4063 len -= written;
3997 } 4064 }
3998 4065
3999 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4066 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4000 4067
4001 memcpy (v_buffer + v_buflen, data, len); 4068 memcpy (v_buffer + v_buflen, data, len);
4002 v_buflen += len; 4069 v_buflen += len;
4003 4070
4004 pty_ev.set (ev::READ | ev::WRITE); 4071 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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