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.459 by sf-exg, Thu Nov 18 17:28:31 2010 UTC vs.
Revision 1.541 by root, Thu Feb 20 18:59:13 2014 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 }
… …
781 } 780 }
782 781
783 if (newlen) 782 if (newlen)
784 len = strlen (kbuf); 783 len = strlen (kbuf);
785 784
785 if (len > 0)
786 {
786 /* 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 /*
787 * Pass meta for all function keys, if 'meta' option set 800 * Pass meta for all function keys, if 'meta' option set
788 */ 801 */
789#ifdef META8_OPTION 802#ifdef META8_OPTION
790 if (meta && (meta_char == 0x80) && len > 0) 803 if (meta && (meta_char == 0x80))
791 kbuf[len - 1] |= 0x80; 804 kbuf[len - 1] |= 0x80;
792#endif 805#endif
806 }
793 807
794 } 808 }
795 else if (ctrl && keysym == XK_minus) 809 else if (ctrl && keysym == XK_minus)
796 { 810 {
797 len = 1; 811 len = 1;
… …
831 { 845 {
832 view_start = 0; 846 view_start = 0;
833 want_refresh = 1; 847 want_refresh = 1;
834 } 848 }
835 849
836 /*
837 * these modifications only affect the static keybuffer
838 * pass Shift/Control indicators for function keys ending with `~'
839 *
840 * eg,
841 * Prior = "ESC[5~"
842 * Shift+Prior = "ESC[5$"
843 * Ctrl+Prior = "ESC[5^"
844 * Ctrl+Shift+Prior = "ESC[5@"
845 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
846 */
847 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
848 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
849
850 /* escape prefix */ 850 /* escape prefix */
851 if (meta 851 if (meta
852#ifdef META8_OPTION 852#ifdef META8_OPTION
853 && meta_char == C0_ESC 853 && meta_char == C0_ESC
854#endif 854#endif
… …
859 } 859 }
860 860
861 tt_write (kbuf, (unsigned int)len); 861 tt_write (kbuf, (unsigned int)len);
862} 862}
863 863
864void 864void ecb_cold
865rxvt_term::key_release (XKeyEvent &ev) 865rxvt_term::key_release (XKeyEvent &ev)
866{ 866{
867#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 867#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
868 KeySym keysym; 868 KeySym keysym;
869 869
… …
889 commit_iso14755 (); 889 commit_iso14755 ();
890 890
891 return; 891 return;
892 } 892 }
893 893
894 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 894 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
895 if (i[0] == keysym) 895 if (i[0] == keysym)
896 { 896 {
897 iso14755buf = ISO_14755_51 | i[1]; 897 iso14755buf = ISO_14755_51 | i[1];
898 commit_iso14755 (); 898 commit_iso14755 ();
899 899
… …
936 else if (keysym == XK_Control_L || keysym == XK_Control_R) 936 else if (keysym == XK_Control_L || keysym == XK_Control_R)
937 mouse_slip_wheel_speed = 0; 937 mouse_slip_wheel_speed = 0;
938#endif 938#endif
939} 939}
940 940
941#if defined (KEYSYM_RESOURCE)
942unsigned int
943rxvt_term::cmd_write (const char *str, unsigned int count)
944{
945 unsigned int n, s;
946
947 n = cmdbuf_ptr - cmdbuf_base;
948 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
949
950 if (n > 0 && s < count)
951 {
952 memmove (cmdbuf_base, cmdbuf_ptr,
953 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
954 cmdbuf_ptr = cmdbuf_base;
955 cmdbuf_endp -= n;
956 s += n;
957 }
958
959 if (count > s)
960 {
961 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
962 count = s;
963 }
964
965 for (; count--;)
966 *cmdbuf_endp++ = *str++;
967
968 cmd_parse ();
969
970 return 0;
971}
972#endif
973
974void 941void
975rxvt_term::flush () 942rxvt_term::flush ()
976{ 943{
977 flush_ev.stop (); 944 flush_ev.stop ();
978 945
979#ifdef HAVE_BG_PIXMAP 946#ifdef HAVE_IMG
980 if (bgPixmap.flags & bgPixmap_t::hasChanged) 947 if (bg_flags & BG_NEEDS_REFRESH)
981 { 948 {
982 bgPixmap.flags &= ~bgPixmap_t::hasChanged; 949 bg_flags &= ~BG_NEEDS_REFRESH;
983// scr_clear (true); This needs to be researched further!
984 scr_touch (false); 950 scr_touch (false);
985 } 951 }
986#endif 952#endif
987 953
988 if (want_refresh) 954 if (want_refresh)
… …
1025 while (row < end_row); 991 while (row < end_row);
1026 } 992 }
1027 993
1028 scr_refresh (); 994 scr_refresh ();
1029 scrollBar.show (1); 995 scrollBar.show (1);
1030#ifdef USE_XIM 996#if USE_XIM
1031 IMSendSpot (); 997 im_send_spot ();
1032#endif 998#endif
1033 } 999 }
1034 1000
1035 display->flush (); 1001 display->flush ();
1036} 1002}
… …
1054 flush (); 1020 flush ();
1055} 1021}
1056 1022
1057#ifdef CURSOR_BLINK 1023#ifdef CURSOR_BLINK
1058void 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
1059rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1040rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1060{ 1041{
1061 hidden_cursor = !hidden_cursor; 1042 hidden_cursor = !hidden_cursor;
1062 want_refresh = 1; 1043 want_refresh = 1;
1063 refresh_check (); 1044 refresh_check ();
… …
1081 1062
1082#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1063#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1083void 1064void
1084rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1065rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1085{ 1066{
1086 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1067 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1087 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1068 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1088 { 1069 {
1089 want_refresh = 1; 1070 want_refresh = 1;
1090 refresh_check (); 1071 refresh_check ();
1091 } 1072 }
1092 else 1073 else
… …
1096 1077
1097#ifdef SELECTION_SCROLLING 1078#ifdef SELECTION_SCROLLING
1098void 1079void
1099rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1080rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1100{ 1081{
1101 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1082 if (scr_page (scroll_selection_lines))
1102 { 1083 {
1103 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1084 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1104 want_refresh = 1; 1085 want_refresh = 1;
1105 refresh_check (); 1086 refresh_check ();
1106 } 1087 }
… …
1111 1092
1112#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1093#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1113void 1094void
1114rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1095rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1115{ 1096{
1116 if (scr_changeview (view_start - mouse_slip_wheel_speed)) 1097 if (scr_page (mouse_slip_wheel_speed))
1117 { 1098 {
1118 want_refresh = 1; 1099 want_refresh = 1;
1119 refresh_check (); 1100 refresh_check ();
1120 } 1101 }
1121 1102
… …
1153 { 1134 {
1154 } 1135 }
1155} event_handler; 1136} event_handler;
1156#endif 1137#endif
1157 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
1158bool 1172bool
1159rxvt_term::pty_fill () 1173rxvt_term::pty_fill ()
1160{ 1174{
1161 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1175 cmdbuf_reify ();
1162 1176
1163 if (CBUFSIZ == n) 1177 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1164 { 1178
1165 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1179 if (!avail)
1166 n = 0;
1167 } 1180 {
1168 1181 // normally this indicates a "too long" command sequence - just drop the data we have
1169 memmove (cmdbuf_base, cmdbuf_ptr, n);
1170 cmdbuf_ptr = cmdbuf_base; 1182 cmdbuf_ptr = cmdbuf_base;
1171 cmdbuf_endp = cmdbuf_ptr + n; 1183 cmdbuf_endp = cmdbuf_ptr;
1184 avail = CBUFSIZ;
1185 }
1172 1186
1173 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1187 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1174 1188
1175 if (r > 0) 1189 if (r > 0)
1176 { 1190 {
1177 cmdbuf_endp += r; 1191 cmdbuf_endp += r;
1178 return true; 1192 return true;
… …
1209 pty_write (); 1223 pty_write ();
1210 1224
1211 refresh_check (); 1225 refresh_check ();
1212} 1226}
1213 1227
1214void 1228void ecb_cold
1215rxvt_term::pointer_unblank () 1229rxvt_term::pointer_unblank ()
1216{ 1230{
1217 XDefineCursor (dpy, vt, TermWin_cursor); 1231 XDefineCursor (dpy, vt, TermWin_cursor);
1218 recolour_cursor (); 1232 recolour_cursor ();
1219 1233
… …
1224 pointer_ev.start (pointerBlankDelay); 1238 pointer_ev.start (pointerBlankDelay);
1225#endif 1239#endif
1226} 1240}
1227 1241
1228#ifdef POINTER_BLANK 1242#ifdef POINTER_BLANK
1229void 1243void ecb_cold
1230rxvt_term::pointer_blank () 1244rxvt_term::pointer_blank ()
1231{ 1245{
1232 if (!option (Opt_pointerBlank)) 1246 if (!option (Opt_pointerBlank))
1233 return; 1247 return;
1234 1248
… …
1236 XFlush (dpy); 1250 XFlush (dpy);
1237 1251
1238 hidden_pointer = 1; 1252 hidden_pointer = 1;
1239} 1253}
1240 1254
1241void 1255void ecb_cold
1242rxvt_term::pointer_cb (ev::timer &w, int revents) 1256rxvt_term::pointer_cb (ev::timer &w, int revents)
1243{ 1257{
1244 make_current (); 1258 make_current ();
1245 1259
1246 pointer_blank (); 1260 pointer_blank ();
… …
1252{ 1266{
1253 int button_number, key_state = 0; 1267 int button_number, key_state = 0;
1254 int x, y; 1268 int x, y;
1255 int code = 32; 1269 int code = 32;
1256 1270
1257 x = Pixel2Col (ev.x); 1271 x = Pixel2Col (ev.x) + 1;
1258 y = Pixel2Row (ev.y); 1272 y = Pixel2Row (ev.y) + 1;
1273
1259 if (ev.type == MotionNotify) 1274 if (ev.type == MotionNotify)
1260 { 1275 {
1261 if (x == mouse_row && y == mouse_col) 1276 if (x == mouse_row && y == mouse_col)
1262 return; 1277 return;
1278
1263 mouse_row = x; 1279 mouse_row = x;
1264 mouse_col = y; 1280 mouse_col = y;
1265 code += 32; 1281 code += 32;
1266 } 1282 }
1267 1283
… …
1270 else 1286 else
1271 { 1287 {
1272 button_number = MEvent.button - Button1; 1288 button_number = MEvent.button - Button1;
1273 /* add 0x3D for wheel events, like xterm does */ 1289 /* add 0x3D for wheel events, like xterm does */
1274 if (button_number >= 3) 1290 if (button_number >= 3)
1275 button_number += (64 - 3); 1291 button_number += 64 - 3;
1276 } 1292 }
1277 1293
1278 if (priv_modes & PrivMode_MouseX10) 1294 if (priv_modes & PrivMode_MouseX10)
1279 { 1295 {
1280 /* 1296 /*
… …
1312 fputc ('A', stderr); 1328 fputc ('A', stderr);
1313 if (key_state & 32) 1329 if (key_state & 32)
1314 fputc ('2', stderr); 1330 fputc ('2', stderr);
1315 fprintf (stderr, "]: <%d>, %d/%d\n", 1331 fprintf (stderr, "]: <%d>, %d/%d\n",
1316 button_number, 1332 button_number,
1317 x + 1, 1333 x,
1318 y + 1); 1334 y);
1319#endif 1335#endif
1320 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
1321 tt_printf ("\033[M%c%c%c", 1350 tt_printf ("\033[M%c%c%c",
1322 (code + button_number + key_state), 1351 code + button_number + key_state,
1323 (32 + x + 1), 1352 32 + x,
1324 (32 + y + 1)); 1353 32 + y);
1325} 1354}
1326 1355
1327/*{{{ process an X event */ 1356/*{{{ process an X event */
1328void 1357void ecb_hot
1329rxvt_term::x_cb (XEvent &ev) 1358rxvt_term::x_cb (XEvent &ev)
1330{ 1359{
1331 make_current (); 1360 make_current ();
1332 1361
1333 dLocal (Display *, dpy); 1362 dLocal (Display *, dpy);
… …
1431 && ev.xfocus.mode != NotifyGrab) 1460 && ev.xfocus.mode != NotifyGrab)
1432 focus_out (); 1461 focus_out ();
1433 break; 1462 break;
1434 1463
1435 case ConfigureNotify: 1464 case ConfigureNotify:
1436 if (ev.xconfigure.window == parent[0]) 1465 if (ev.xconfigure.window == parent)
1437 { 1466 {
1438 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1467 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1439 ; 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 }
1440 1502
1441 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1503 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1442 { 1504 {
1443 seen_resize = 1; 1505 seen_resize = 1;
1444 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1506 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1445 } 1507 }
1446 else 1508 else
1447 { 1509 {
1448#ifdef HAVE_BG_PIXMAP 1510#ifdef HAVE_BG_PIXMAP
1449 if (bgPixmap.window_position_sensitive ())
1450 {
1451 if (mapped) 1511 if (moved)
1452 update_background (); 1512 update_background ();
1453 else
1454 bgPixmap.invalidate ();
1455 }
1456#endif 1513#endif
1457 } 1514 }
1458 1515
1459 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1516 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1460 } 1517 }
1461 break; 1518 break;
1462 1519
1463 case PropertyNotify: 1520 case PropertyNotify:
1464 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1521 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1465 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1466 && ev.xproperty.state == PropertyNewValue)
1467 selection_property (ev.xproperty.window, ev.xproperty.atom);
1468
1469 break; 1522 break;
1470 1523
1471 case SelectionClear: 1524 case SelectionClear:
1472 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]); 1525 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1473 break; 1526 break;
1474 1527
1475 case SelectionNotify:
1476 if (selection_wait == Sel_normal)
1477 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1478 break;
1479
1480 case SelectionRequest: 1528 case SelectionRequest:
1481 selection_send (ev.xselectionrequest); 1529 selection_send (ev.xselectionrequest);
1482 break; 1530 break;
1483 1531
1484 case MapNotify: 1532 case MapNotify:
1485#ifdef HAVE_BG_PIXMAP 1533#ifdef HAVE_BG_PIXMAP
1486 /* This is needed specifically to fix the case of no window manager or a 1534 // This is needed at startup for the case of no window manager
1487 * non-reparenting window manager. In those cases we never get first 1535 // or a non-reparenting window manager and also because we
1488 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1536 // defer bg image updates if the window is not mapped. The
1489 * care of multiplicity of ConfigureNotify events arriving while WM does 1537 // short delay is to optimize for multiple ConfigureNotify
1490 * reparenting. 1538 // events at startup when the window manager reparents the
1491 * We should not render background immediately, as there could be several 1539 // window, so as to perform the computation after we have
1492 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1540 // received all of them.
1493 * by scheduling background redraw as soon as we can, but giving a short 1541 if (bg_img == 0)
1494 * bit of time for ConfigureNotifies to arrive.
1495 * We should render background PRIOR to drawing any text, but AFTER all
1496 * of ConfigureNotifys for the best results.
1497 */
1498 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1499 update_background_ev.start (0.025); 1542 update_background_ev.start (0.025);
1500#endif 1543#endif
1501 mapped = 1; 1544 mapped = 1;
1502#ifdef TEXT_BLINK 1545#ifdef TEXT_BLINK
1503 text_blink_ev.start (); 1546 text_blink_ev.start ();
… …
1518 if (ev.xany.window == vt) 1561 if (ev.xany.window == vt)
1519 { 1562 {
1520 do 1563 do
1521 { 1564 {
1522 scr_expose (ev.xexpose.x, ev.xexpose.y, 1565 scr_expose (ev.xexpose.x, ev.xexpose.y,
1523 ev.xexpose.width, ev.xexpose.height, False); 1566 ev.xexpose.width, ev.xexpose.height, false);
1524 } 1567 }
1525 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1568 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1526 1569
1527 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1570 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1528 1571
1529 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1572 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1530 { 1573 {
1531 scr_expose (ev.xexpose.x, ev.xexpose.y, 1574 scr_expose (ev.xexpose.x, ev.xexpose.y,
1532 ev.xexpose.width, ev.xexpose.height, False); 1575 ev.xexpose.width, ev.xexpose.height, false);
1533 } 1576 }
1534 1577
1535 want_refresh = 1; 1578 want_refresh = 1;
1536 } 1579 }
1537 else 1580 else
… …
1543 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1586 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1544 ; 1587 ;
1545 1588
1546 if (scrollBar.state && ev.xany.window == scrollBar.win) 1589 if (scrollBar.state && ev.xany.window == scrollBar.win)
1547 { 1590 {
1548 scrollBar.state = STATE_IDLE; 1591 scrollBar.state = SB_STATE_IDLE;
1549 scrollBar.show (0); 1592 scrollBar.show (0);
1550 } 1593 }
1551 } 1594 }
1552 break; 1595 break;
1553 1596
… …
1595 1638
1596#ifdef SELECTION_SCROLLING 1639#ifdef SELECTION_SCROLLING
1597 if (ev.xbutton.y < int_bwidth 1640 if (ev.xbutton.y < int_bwidth
1598 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1641 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1599 { 1642 {
1643 page_dirn scroll_selection_dir;
1600 int dist; 1644 int dist;
1601 1645
1602 /* don't clobber the current delay if we are 1646 /* don't clobber the current delay if we are
1603 * already in the middle of scrolling. 1647 * already in the middle of scrolling.
1604 */ 1648 */
… …
1619 dist = int_bwidth - ev.xbutton.y; 1663 dist = int_bwidth - ev.xbutton.y;
1620 } 1664 }
1621 else 1665 else
1622 { 1666 {
1623 scroll_selection_dir = DN; 1667 scroll_selection_dir = DN;
1624 dist = ev.xbutton.y - (int_bwidth + height); 1668 dist = ev.xbutton.y - (int_bwidth + vt_height);
1625 } 1669 }
1626 1670
1627 scroll_selection_lines = Pixel2Height (dist) 1671 scroll_selection_lines = Pixel2Height (dist)
1628 / SELECTION_SCROLL_LINE_SPEEDUP 1672 / SELECTION_SCROLL_LINE_SPEEDUP
1629 + 1; 1673 + 1;
1630 min_it (scroll_selection_lines, 1674 min_it (scroll_selection_lines,
1631 SELECTION_SCROLL_MAX_LINES); 1675 SELECTION_SCROLL_MAX_LINES);
1676 scroll_selection_lines *= scroll_selection_dir;
1632 } 1677 }
1633 else 1678 else
1634 { 1679 {
1635 /* we are within the text window, so we 1680 /* we are within the text window, so we
1636 * shouldn't be scrolling 1681 * shouldn't be scrolling
… …
1641#ifdef MOUSE_THRESHOLD 1686#ifdef MOUSE_THRESHOLD
1642 } 1687 }
1643#endif 1688#endif
1644 } 1689 }
1645 } 1690 }
1646 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1691 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1647 { 1692 {
1648 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1693 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1649 MotionNotify, &ev)) 1694 MotionNotify, &ev))
1650 ; 1695 ;
1651 1696
1652 XQueryPointer (dpy, scrollBar.win, 1697 XQueryPointer (dpy, scrollBar.win,
1653 &unused_root, &unused_child, 1698 &unused_root, &unused_child,
1654 &unused_root_x, &unused_root_y, 1699 &unused_root_x, &unused_root_y,
1655 &ev.xbutton.x, &ev.xbutton.y, 1700 &ev.xbutton.x, &ev.xbutton.y,
1656 &unused_mask); 1701 &unused_mask);
1657 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1702 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1658 scrollBar.size ()); 1703 scrollBar.size ());
1659 want_refresh = 1; 1704 want_refresh = 1;
1660 scrollBar.show (1); 1705 scrollBar.show (1);
1661 } 1706 }
1662 break; 1707 break;
1663 } 1708 }
1664 1709
1665#if defined(CURSOR_BLINK) 1710#if defined(CURSOR_BLINK)
1666 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1711 if (ev.type == KeyPress)
1667 {
1668 if (hidden_cursor)
1669 {
1670 hidden_cursor = 0;
1671 want_refresh = 1;
1672 }
1673
1674 cursor_blink_ev.again (); 1712 cursor_blink_reset ();
1675 }
1676#endif 1713#endif
1677 1714
1678#if defined(POINTER_BLANK) 1715#if defined(POINTER_BLANK)
1679 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1716 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1680 { 1717 {
… …
1691 1728
1692 refresh_check (); 1729 refresh_check ();
1693} 1730}
1694 1731
1695#if ENABLE_FRILLS 1732#if ENABLE_FRILLS
1696void 1733void ecb_cold
1697rxvt_term::set_urgency (bool enable) 1734rxvt_term::set_urgency (bool enable)
1698{ 1735{
1699 if (enable == urgency_hint) 1736 if (enable == urgency_hint)
1700 return; 1737 return;
1701 1738
1702 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1739 if (XWMHints *h = XGetWMHints (dpy, parent))
1703 { 1740 {
1704 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1741 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1705 XSetWMHints (dpy, parent[0], h); 1742 XSetWMHints (dpy, parent, h);
1706 urgency_hint = enable; 1743 urgency_hint = enable;
1744 XFree (h);
1707 } 1745 }
1708} 1746}
1709#endif 1747#endif
1710 1748
1711void 1749void ecb_cold
1712rxvt_term::focus_in () 1750rxvt_term::focus_in ()
1713{ 1751{
1714 if (!focus) 1752 if (!focus)
1715 { 1753 {
1716 focus = 1; 1754 focus = 1;
1717 want_refresh = 1; 1755 want_refresh = 1;
1718 1756
1719#if USE_XIM 1757#if USE_XIM
1720 if (Input_Context != NULL) 1758 if (Input_Context != NULL)
1721 { 1759 {
1722 IMSetPosition (); 1760 im_set_position ();
1723 XSetICFocus (Input_Context); 1761 XSetICFocus (Input_Context);
1724 } 1762 }
1725#endif 1763#endif
1726#if CURSOR_BLINK 1764#if CURSOR_BLINK
1727 if (option (Opt_cursorBlink)) 1765 if (option (Opt_cursorBlink))
… …
1741 1779
1742 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1780 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1743 } 1781 }
1744} 1782}
1745 1783
1746void 1784void ecb_cold
1747rxvt_term::focus_out () 1785rxvt_term::focus_out ()
1748{ 1786{
1749 if (focus) 1787 if (focus)
1750 { 1788 {
1751 focus = 0; 1789 focus = 0;
… …
1784 1822
1785 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1823 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1786 } 1824 }
1787} 1825}
1788 1826
1789void 1827void ecb_cold
1790rxvt_term::update_fade_color (unsigned int idx) 1828rxvt_term::update_fade_color (unsigned int idx)
1791{ 1829{
1792#if OFF_FOCUS_FADING 1830#if OFF_FOCUS_FADING
1793 if (rs[Rs_fade]) 1831 if (rs[Rs_fade])
1794 { 1832 {
… …
1797 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1835 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1798 } 1836 }
1799#endif 1837#endif
1800} 1838}
1801 1839
1802#if ENABLE_TRANSPARENCY || ENABLE_PERL 1840#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1803void 1841void ecb_hot
1804rxvt_term::rootwin_cb (XEvent &ev) 1842rxvt_term::rootwin_cb (XEvent &ev)
1805{ 1843{
1806 make_current (); 1844 make_current ();
1807 1845
1808 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1846 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1809 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1847 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1810 return; 1848 return;
1811 1849
1812# if ENABLE_TRANSPARENCY
1813 switch (ev.type) 1850 switch (ev.type)
1814 { 1851 {
1815 case PropertyNotify: 1852 case PropertyNotify:
1816 /* 1853 /*
1817 * if user used some Esetroot compatible prog to set the root bg, 1854 * if user used some Esetroot compatible prog to set the root bg,
1818 * use the property to determine the pixmap. We use it later on. 1855 * use the property to determine the pixmap. We use it later on.
1819 */ 1856 */
1820 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1857 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1821 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1858 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1822 { 1859 {
1823 bgPixmap.set_root_pixmap (); 1860#if BG_IMAGE_FROM_ROOT
1861 if (option (Opt_transparent))
1862 {
1863 rxvt_img::new_from_root (this)->replace (root_img);
1824 update_background (); 1864 update_background ();
1865 }
1866#endif
1867 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1825 } 1868 }
1826 1869
1827 break; 1870 break;
1828 } 1871 }
1829# endif
1830 1872
1831 refresh_check (); 1873 refresh_check ();
1832} 1874}
1833#endif 1875#endif
1834 1876
… …
1958 if (scrollBar.upButton (ev.y)) 2000 if (scrollBar.upButton (ev.y))
1959 direction = UP; /* up */ 2001 direction = UP; /* up */
1960 else if (scrollBar.dnButton (ev.y)) 2002 else if (scrollBar.dnButton (ev.y))
1961 direction = DN; /* down */ 2003 direction = DN; /* down */
1962 2004
1963 scrollBar.state = STATE_IDLE; 2005 scrollBar.state = SB_STATE_IDLE;
1964 /* 2006 /*
1965 * Rxvt-style scrollbar: 2007 * Rxvt-style scrollbar:
1966 * move up if mouse is above slider 2008 * move up if mouse is above slider
1967 * move dn if mouse is below slider 2009 * move dn if mouse is below slider
1968 * 2010 *
… …
2007 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2049 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2008#endif 2050#endif
2009 if (scr_page (direction, 1)) 2051 if (scr_page (direction, 1))
2010 { 2052 {
2011 if (direction == UP) 2053 if (direction == UP)
2012 scrollBar.state = STATE_UP; 2054 scrollBar.state = SB_STATE_UP;
2013 else 2055 else
2014 scrollBar.state = STATE_DOWN; 2056 scrollBar.state = SB_STATE_DOWN;
2015 } 2057 }
2016 } 2058 }
2017 else 2059 else
2018 switch (ev.button) 2060 switch (ev.button)
2019 { 2061 {
2020 case Button2: 2062 case Button2:
2021 switch (scrollBar.align) 2063 switch (scrollBar.align)
2022 { 2064 {
2023 case R_SB_ALIGN_TOP: 2065 case SB_ALIGN_TOP:
2024 csrO = 0; 2066 csrO = 0;
2025 break; 2067 break;
2026 case R_SB_ALIGN_CENTRE: 2068 case SB_ALIGN_CENTRE:
2027 csrO = (scrollBar.bot - scrollBar.top) / 2; 2069 csrO = (scrollBar.bot - scrollBar.top) / 2;
2028 break; 2070 break;
2029 case R_SB_ALIGN_BOTTOM: 2071 case SB_ALIGN_BOTTOM:
2030 csrO = scrollBar.bot - scrollBar.top; 2072 csrO = scrollBar.bot - scrollBar.top;
2031 break; 2073 break;
2032 } 2074 }
2033 2075
2034 if (scrollBar.style == R_SB_XTERM 2076 if (scrollBar.style == SB_STYLE_XTERM
2035 || scrollbar_above_slider (ev.y) 2077 || scrollBar.above_slider (ev.y)
2036 || scrollbar_below_slider (ev.y)) 2078 || scrollBar.below_slider (ev.y))
2037 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2079 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2038 2080
2039 scrollBar.state = STATE_MOTION; 2081 scrollBar.state = SB_STATE_MOTION;
2040 break; 2082 break;
2041 2083
2042 case Button1: 2084 case Button1:
2043 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2085 if (scrollBar.align == SB_ALIGN_CENTRE)
2044 csrO = ev.y - scrollBar.top; 2086 csrO = ev.y - scrollBar.top;
2045 /* FALLTHROUGH */ 2087 /* FALLTHROUGH */
2046 2088
2047 case Button3: 2089 case Button3:
2048 if (scrollBar.style != R_SB_XTERM) 2090 if (scrollBar.style != SB_STYLE_XTERM)
2049 { 2091 {
2050 if (scrollbar_above_slider (ev.y)) 2092 if (scrollBar.above_slider (ev.y))
2051# ifdef RXVT_SCROLL_FULL 2093# ifdef RXVT_SCROLL_FULL
2052 scr_page (UP, nrow - 1); 2094 scr_page (UP, nrow - 1);
2053# else 2095# else
2054 scr_page (UP, nrow / 4); 2096 scr_page (UP, nrow / 4);
2055# endif 2097# endif
2056 else if (scrollbar_below_slider (ev.y)) 2098 else if (scrollBar.below_slider (ev.y))
2057# ifdef RXVT_SCROLL_FULL 2099# ifdef RXVT_SCROLL_FULL
2058 scr_page (DN, nrow - 1); 2100 scr_page (DN, nrow - 1);
2059# else 2101# else
2060 scr_page (DN, nrow / 4); 2102 scr_page (DN, nrow / 4);
2061# endif 2103# endif
2062 else 2104 else
2063 scrollBar.state = STATE_MOTION; 2105 scrollBar.state = SB_STATE_MOTION;
2064 } 2106 }
2065 else 2107 else
2066 { 2108 {
2067 scr_page ((ev.button == Button1 ? DN : UP), 2109 scr_page ((ev.button == Button1 ? DN : UP),
2068 (nrow 2110 (nrow
2069 * scrollbar_position (ev.y) 2111 * scrollBar.position (ev.y)
2070 / scrollBar.size ())); 2112 / scrollBar.size ()));
2071 } 2113 }
2072 2114
2073 break; 2115 break;
2074 } 2116 }
… …
2085 2127
2086 csrO = 0; /* reset csr Offset */ 2128 csrO = 0; /* reset csr Offset */
2087 if (!bypass_keystate) 2129 if (!bypass_keystate)
2088 reportmode = !! (priv_modes & PrivMode_mouse_report); 2130 reportmode = !! (priv_modes & PrivMode_mouse_report);
2089 2131
2090 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2132 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2091 { 2133 {
2092 scrollBar.state = STATE_IDLE; 2134 scrollBar.state = SB_STATE_IDLE;
2093 scrollBar.show (0); 2135 scrollBar.show (0);
2094 } 2136 }
2095 2137
2096#ifdef SELECTION_SCROLLING 2138#ifdef SELECTION_SCROLLING
2097 sel_scroll_ev.stop(); 2139 sel_scroll_ev.stop();
… …
2147 case Button3: 2189 case Button3:
2148 selection_make (ev.time); 2190 selection_make (ev.time);
2149 break; 2191 break;
2150 2192
2151 case Button2: 2193 case Button2:
2152 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2194 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2153 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2195 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2154 break; 2196 break;
2155 2197
2156#ifdef MOUSE_WHEEL 2198#ifdef MOUSE_WHEEL
2157 case Button4: 2199 case Button4:
2158 case Button5: 2200 case Button5:
2159 { 2201 {
2160 int i; 2202 int lines;
2161 page_dirn v; 2203 page_dirn dirn;
2162 2204
2163 v = ev.button == Button4 ? UP : DN; 2205 dirn = ev.button == Button4 ? UP : DN;
2164 2206
2165 if (ev.state & ShiftMask) 2207 if (ev.state & ShiftMask)
2166 i = 1; 2208 lines = 1;
2167 else if (option (Opt_mouseWheelScrollPage)) 2209 else if (option (Opt_mouseWheelScrollPage))
2168 i = nrow - 1; 2210 lines = nrow - 1;
2169 else 2211 else
2170 i = 5; 2212 lines = 5;
2171 2213
2172# ifdef MOUSE_SLIP_WHEELING 2214# ifdef MOUSE_SLIP_WHEELING
2173 if (ev.state & ControlMask) 2215 if (ev.state & ControlMask)
2174 { 2216 {
2175 mouse_slip_wheel_speed += v ? -1 : 1; 2217 mouse_slip_wheel_speed += dirn;
2176 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2218 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2177 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2178 2219
2179 if (!slip_wheel_ev.is_active ()) 2220 if (!slip_wheel_ev.is_active ())
2180 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2221 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2181 } 2222 }
2182 else 2223 else
2183# endif 2224# endif
2184 { 2225 {
2185 scr_page (v, i); 2226 scr_page (dirn, lines);
2186 scrollBar.show (1); 2227 scrollBar.show (1);
2187 } 2228 }
2188 } 2229 }
2189 break; 2230 break;
2190#endif 2231#endif
… …
2192 } 2233 }
2193} 2234}
2194 2235
2195/*}}} */ 2236/*}}} */
2196 2237
2197void 2238void ecb_hot
2198rxvt_term::cmd_parse () 2239rxvt_term::cmd_parse ()
2199{ 2240{
2200 wchar_t ch = NOCHAR; 2241 wchar_t ch = NOCHAR;
2201 char *seq_begin; // remember start of esc-sequence here 2242 char *seq_begin; // remember start of esc-sequence here
2202 2243
2203 for (;;) 2244 for (;;)
2204 { 2245 {
2205 if (expect_false (ch == NOCHAR)) 2246 if (ecb_unlikely (ch == NOCHAR))
2206 { 2247 {
2207 seq_begin = cmdbuf_ptr; 2248 seq_begin = cmdbuf_ptr;
2208 ch = next_char (); 2249 ch = next_char ();
2209 2250
2210 if (ch == NOCHAR) 2251 if (ch == NOCHAR)
2211 break; 2252 break;
2212 } 2253 }
2213 2254
2214 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)) 2255 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2215 { 2256 {
2216 if (expect_false (!seen_input)) 2257 if (ecb_unlikely (!seen_input))
2217 { 2258 {
2218 seen_input = 1; 2259 seen_input = 1;
2219 // many badly-written programs (e.g. jed) contain a race condition: 2260 // many badly-written programs (e.g. jed) contain a race condition:
2220 // they first read the screensize and then install a SIGWINCH handler. 2261 // they first read the screensize and then install a SIGWINCH handler.
2221 // some window managers resize the window early, and these programs 2262 // some window managers resize the window early, and these programs
… …
2234 wchar_t *str = buf; 2275 wchar_t *str = buf;
2235 wchar_t *eol = str + min (ncol, UBUFSIZ); 2276 wchar_t *eol = str + min (ncol, UBUFSIZ);
2236 2277
2237 for (;;) 2278 for (;;)
2238 { 2279 {
2239 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))) 2280 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2240 break; 2281 break;
2241 2282
2242 *str++ = ch; 2283 *str++ = ch;
2243 2284
2244 if (expect_false (ch == C0_LF || str >= eol)) 2285 if (ecb_unlikely (ch == C0_LF || str >= eol))
2245 { 2286 {
2246 if (ch == C0_LF) 2287 if (ch == C0_LF)
2247 nlines++; 2288 nlines++;
2248 2289
2249 refresh_count++; 2290 refresh_count++;
… …
2321 } 2362 }
2322 } 2363 }
2323} 2364}
2324 2365
2325// read the next character 2366// read the next character
2326wchar_t 2367wchar_t ecb_hot
2327rxvt_term::next_char () NOTHROW 2368rxvt_term::next_char () NOTHROW
2328{ 2369{
2329 while (cmdbuf_ptr < cmdbuf_endp) 2370 while (cmdbuf_ptr < cmdbuf_endp)
2330 { 2371 {
2331 // assume 7-bit to be ascii ALWAYS 2372 // assume 7-bit to be ascii ALWAYS
2332 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2373 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2333 return *cmdbuf_ptr++; 2374 return *cmdbuf_ptr++;
2334 2375
2335 wchar_t wc; 2376 wchar_t wc;
2336 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2377 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2337 2378
… …
2343 } 2384 }
2344 2385
2345 if (len == (size_t)-1) 2386 if (len == (size_t)-1)
2346 { 2387 {
2347 mbstate.reset (); // reset now undefined conversion state 2388 mbstate.reset (); // reset now undefined conversion state
2389 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2390 // in which case we "erroneously" return the next byte which might be valid.
2348 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2391 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2349 } 2392 }
2350 2393
2351 // assume wchar == unicode 2394 // assume wchar == unicode
2352 cmdbuf_ptr += len; 2395 cmdbuf_ptr += len;
… …
2355 2398
2356 return NOCHAR; 2399 return NOCHAR;
2357} 2400}
2358 2401
2359// read the next octet 2402// read the next octet
2360uint32_t 2403uint32_t ecb_hot
2361rxvt_term::next_octet () NOTHROW 2404rxvt_term::next_octet () NOTHROW
2362{ 2405{
2363 return cmdbuf_ptr < cmdbuf_endp 2406 return cmdbuf_ptr < cmdbuf_endp
2364 ? (unsigned char)*cmdbuf_ptr++ 2407 ? (unsigned char)*cmdbuf_ptr++
2365 : NOCHAR; 2408 : NOCHAR;
2366} 2409}
2367 2410
2368static class out_of_input out_of_input; 2411static class out_of_input out_of_input;
2369 2412
2370/* rxvt_cmd_getc () - Return next input character */ 2413wchar_t ecb_hot
2371/*
2372 * Return the next input character after first passing any keyboard input
2373 * to the command.
2374 */
2375wchar_t
2376rxvt_term::cmd_getc () THROW ((class out_of_input)) 2414rxvt_term::cmd_getc () THROW ((class out_of_input))
2377{ 2415{
2378 wchar_t c = next_char (); 2416 wchar_t c = next_char ();
2379 2417
2380 if (c == NOCHAR) 2418 if (c == NOCHAR)
2381 throw out_of_input; 2419 throw out_of_input;
2382 2420
2383 return c; 2421 return c;
2384} 2422}
2385 2423
2386uint32_t 2424uint32_t ecb_hot
2387rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2425rxvt_term::cmd_get8 () THROW ((class out_of_input))
2388{ 2426{
2389 uint32_t c = next_octet (); 2427 uint32_t c = next_octet ();
2390 2428
2391 if (c == NOCHAR) 2429 if (c == NOCHAR)
… …
2395} 2433}
2396 2434
2397/*{{{ print pipe */ 2435/*{{{ print pipe */
2398/*----------------------------------------------------------------------*/ 2436/*----------------------------------------------------------------------*/
2399#ifdef PRINTPIPE 2437#ifdef PRINTPIPE
2400FILE * 2438FILE * ecb_cold
2401rxvt_term::popen_printer () 2439rxvt_term::popen_printer ()
2402{ 2440{
2403 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w"); 2441 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2404 2442
2405 if (stream == NULL) 2443 if (stream == NULL)
2406 rxvt_warn ("can't open printer pipe, not printing.\n"); 2444 rxvt_warn ("can't open printer pipe, not printing.\n");
2407 2445
2408 return stream; 2446 return stream;
2409} 2447}
2410 2448
2411int 2449int ecb_cold
2412rxvt_term::pclose_printer (FILE *stream) 2450rxvt_term::pclose_printer (FILE *stream)
2413{ 2451{
2414 fflush (stream); 2452 fflush (stream);
2415 return pclose (stream); 2453 return pclose (stream);
2416} 2454}
2417 2455
2418/* 2456/*
2419 * simulate attached vt100 printer 2457 * simulate attached vt100 printer
2420 */ 2458 */
2421void 2459void ecb_cold
2422rxvt_term::process_print_pipe () 2460rxvt_term::process_print_pipe ()
2423{ 2461{
2424 FILE *fd = popen_printer (); 2462 FILE *fd = popen_printer ();
2425 2463
2426 if (!fd) 2464 if (!fd)
… …
2472 pclose_printer (fd); 2510 pclose_printer (fd);
2473} 2511}
2474#endif /* PRINTPIPE */ 2512#endif /* PRINTPIPE */
2475/*}}} */ 2513/*}}} */
2476 2514
2477/* *INDENT-OFF* */
2478enum { 2515enum {
2479 C1_40 = 0x40, 2516 C1_40 = 0x40,
2480 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2517 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2481 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2518 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2482 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2519 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2483 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2520 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2484}; 2521};
2485/* *INDENT-ON* */
2486 2522
2487/*{{{ process non-printing single characters */ 2523/*{{{ process non-printing single characters */
2488void 2524void ecb_hot
2489rxvt_term::process_nonprinting (unicode_t ch) 2525rxvt_term::process_nonprinting (unicode_t ch)
2490{ 2526{
2491 switch (ch) 2527 switch (ch)
2492 { 2528 {
2493 case C0_ESC: 2529 case C0_ESC:
… …
2539} 2575}
2540/*}}} */ 2576/*}}} */
2541 2577
2542 2578
2543/*{{{ process VT52 escape sequences */ 2579/*{{{ process VT52 escape sequences */
2544void 2580void ecb_cold
2545rxvt_term::process_escape_vt52 (unicode_t ch) 2581rxvt_term::process_escape_vt52 (unicode_t ch)
2546{ 2582{
2547 int row, col; 2583 int row, col;
2548 2584
2549 switch (ch) 2585 switch (ch)
… …
2583 break; 2619 break;
2584 case 'Z': /* identify the terminal type */ 2620 case 'Z': /* identify the terminal type */
2585 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2621 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2586 break; 2622 break;
2587 case '<': /* turn off VT52 mode */ 2623 case '<': /* turn off VT52 mode */
2588 set_privmode (PrivMode_vt52, 0); 2624 priv_modes &= ~PrivMode_vt52;
2589 break; 2625 break;
2590 case 'F': /* use special graphics character set */ 2626 case 'F': /* use special graphics character set */
2591 case 'G': /* use regular character set */ 2627 case 'G': /* use regular character set */
2592 /* unimplemented */ 2628 /* unimplemented */
2593 break; 2629 break;
… …
2599} 2635}
2600/*}}} */ 2636/*}}} */
2601 2637
2602 2638
2603/*{{{ process escape sequences */ 2639/*{{{ process escape sequences */
2604void 2640void ecb_hot
2605rxvt_term::process_escape_seq () 2641rxvt_term::process_escape_seq ()
2606{ 2642{
2607 unicode_t ch = cmd_getc (); 2643 unicode_t ch = cmd_getc ();
2608 2644
2609 if (priv_modes & PrivMode_vt52) 2645 if (priv_modes & PrivMode_vt52)
… …
2612 return; 2648 return;
2613 } 2649 }
2614 2650
2615 switch (ch) 2651 switch (ch)
2616 { 2652 {
2617 /* case 1: do_tek_mode (); break; */
2618 case '#': 2653 case '#':
2619 if (cmd_getc () == '8') 2654 if (cmd_getc () == '8')
2620 scr_E (); 2655 scr_E ();
2621 break; 2656 break;
2622 case '(': 2657 case '(':
… …
2645#if !ENABLE_MINIMAL 2680#if !ENABLE_MINIMAL
2646 case '9': 2681 case '9':
2647 scr_forwardindex (); 2682 scr_forwardindex ();
2648 break; 2683 break;
2649#endif 2684#endif
2685 // DECPAM/DECPNM
2650 case '=': 2686 case '=':
2687 priv_modes |= PrivMode_aplKP;
2688 break;
2651 case '>': 2689 case '>':
2652 set_privmode (PrivMode_aplKP, ch == '='); 2690 priv_modes &= ~PrivMode_aplKP;
2653 break; 2691 break;
2654 2692
2655 case C1_40: 2693 case C1_40:
2656 cmd_getc (); 2694 cmd_getc ();
2657 break; 2695 break;
… …
2661 2699
2662 /* 8.3.87: NEXT LINE */ 2700 /* 8.3.87: NEXT LINE */
2663 case C1_NEL: /* ESC E */ 2701 case C1_NEL: /* ESC E */
2664 { 2702 {
2665 wchar_t nlcr[] = { C0_LF, C0_CR }; 2703 wchar_t nlcr[] = { C0_LF, C0_CR };
2666 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2704 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2667 } 2705 }
2668 break; 2706 break;
2669 2707
2670 /* kidnapped escape sequence: Should be 8.3.48 */ 2708 /* kidnapped escape sequence: Should be 8.3.48 */
2671 case C1_ESA: /* ESC G */ 2709 case C1_ESA: /* ESC G */
2672 process_graphics (); 2710 // used by original rxvt for rob nations own graphics mode
2711 if (cmd_getc () == 'Q')
2712 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2673 break; 2713 break;
2674 2714
2675 /* 8.3.63: CHARACTER TABULATION SET */ 2715 /* 8.3.63: CHARACTER TABULATION SET */
2676 case C1_HTS: /* ESC H */ 2716 case C1_HTS: /* ESC H */
2677 scr_set_tab (1); 2717 scr_set_tab (1);
… …
2681 case C1_RI: /* ESC M */ 2721 case C1_RI: /* ESC M */
2682 scr_index (DN); 2722 scr_index (DN);
2683 break; 2723 break;
2684 2724
2685 /* 8.3.142: SINGLE-SHIFT TWO */ 2725 /* 8.3.142: SINGLE-SHIFT TWO */
2686 /*case C1_SS2: scr_single_shift (2); break; */ 2726 /* case C1_SS2: break; */
2687 2727
2688 /* 8.3.143: SINGLE-SHIFT THREE */ 2728 /* 8.3.143: SINGLE-SHIFT THREE */
2689 /*case C1_SS3: scr_single_shift (3); break; */ 2729 /* case C1_SS3: break; */
2690 2730
2691 /* 8.3.27: DEVICE CONTROL STRING */ 2731 /* 8.3.27: DEVICE CONTROL STRING */
2692 case C1_DCS: /* ESC P */ 2732 case C1_DCS: /* ESC P */
2693 process_dcs_seq (); 2733 process_dcs_seq ();
2694 break; 2734 break;
… …
2727 } 2767 }
2728} 2768}
2729/*}}} */ 2769/*}}} */
2730 2770
2731/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2771/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2732/* *INDENT-OFF* */
2733enum { 2772enum {
2734 CSI_ICH = 0x40, 2773 CSI_ICH = 0x40,
2735 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2774 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2736 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2775 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2737 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2776 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2740 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2779 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2741 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2780 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2742 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2781 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2743}; 2782};
2744 2783
2745#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2784#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2746 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2785 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2747 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2786 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2748#define get_byte_array_bit(array, bit) \ 2787#define get_byte_array_bit(array, bit) \
2749 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2788 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2750 2789
2751const unsigned char csi_defaults[] = 2790static const unsigned char csi_defaults[] =
2752 { 2791 {
2753 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2792 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2754 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2793 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2755 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2794 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2756 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2795 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2757 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2796 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2758 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2797 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2759 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2798 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2760 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2799 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2761 }; 2800 };
2762/* *INDENT-ON* */
2763 2801
2764void 2802void ecb_hot
2765rxvt_term::process_csi_seq () 2803rxvt_term::process_csi_seq ()
2766{ 2804{
2767 unicode_t ch, priv, i; 2805 unicode_t ch, priv, prev_ch, i;
2768 unsigned int nargs, p; 2806 unsigned int nargs, p;
2769 int n, ndef; 2807 int n, ndef;
2770 int arg[ESC_ARGS] = { }; 2808 int arg[ESC_ARGS] = { };
2771 2809
2772 nargs = 0; 2810 nargs = 0;
… …
2778 /* '<' '=' '>' '?' '!' */ 2816 /* '<' '=' '>' '?' '!' */
2779 priv = ch; 2817 priv = ch;
2780 ch = cmd_getc (); 2818 ch = cmd_getc ();
2781 } 2819 }
2782 2820
2821 prev_ch = 0;
2783 /* read any numerical arguments */ 2822 /* read any numerical arguments */
2784 for (n = -1; ch < CSI_ICH; ) 2823 for (n = -1; ch < CSI_ICH; )
2785 { 2824 {
2786 if (isdigit (ch)) 2825 if (isdigit (ch))
2787 { 2826 {
… …
2797 n = -1; 2836 n = -1;
2798 } 2837 }
2799 else if (IS_CONTROL (ch)) 2838 else if (IS_CONTROL (ch))
2800 process_nonprinting (ch); 2839 process_nonprinting (ch);
2801 2840
2841 prev_ch = ch;
2802 ch = cmd_getc (); 2842 ch = cmd_getc ();
2803 } 2843 }
2804 2844
2805 if (ch > CSI_7F) 2845 if (ch > CSI_7F)
2806 return; 2846 return;
… …
2845 { 2885 {
2846 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2886 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2847 scr_soft_reset (); 2887 scr_soft_reset ();
2848 2888
2849 static const int pm_h[] = { 7, 25 }; 2889 static const int pm_h[] = { 7, 25 };
2850 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 }; 2890 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2851 2891
2852 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h); 2892 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2853 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l); 2893 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2854 } 2894 }
2855 break; 2895 break;
2856 } 2896 }
2857 2897
2858 return; 2898 return;
… …
2876 } 2916 }
2877 break; 2917 break;
2878#endif 2918#endif
2879 2919
2880 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2920 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2881 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2921 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2882 arg[0] = -arg[0]; 2922 arg[0] = -arg[0];
2883 /* FALLTHROUGH */ 2923 /* FALLTHROUGH */
2884 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2924 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2885 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2925 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2886 scr_gotorc (arg[0], 0, RELATIVE); 2926 scr_gotorc (arg[0], 0, RELATIVE);
2887 break; 2927 break;
2888 2928
2889 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2929 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2890 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2930 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3040 scr_insert_mode (1); 3080 scr_insert_mode (1);
3041 else if (arg[0] == 20) 3081 else if (arg[0] == 20)
3042 priv_modes |= PrivMode_LFNL; 3082 priv_modes |= PrivMode_LFNL;
3043 break; 3083 break;
3044 3084
3085 case CSI_71: // DESCUSR: set cursor style
3086 if (prev_ch == ' ')
3087 set_cursor_style (arg[0]);
3088 break;
3089
3045 /* 3090 /*
3046 * PRIVATE USE beyond this point. All CSI_7? sequences here 3091 * PRIVATE USE beyond this point. All CSI_7? sequences here
3047 */ 3092 */
3048 case CSI_72: /* DECSTBM: set top and bottom margins */ 3093 case CSI_72: /* DECSTBM: set top and bottom margins */
3049 if (nargs == 1) 3094 if (nargs == 1)
… …
3077 } 3122 }
3078} 3123}
3079/*}}} */ 3124/*}}} */
3080 3125
3081#if !ENABLE_MINIMAL 3126#if !ENABLE_MINIMAL
3082/* ARGSUSED */
3083void 3127void
3084rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3128rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3085{ 3129{
3086 int x, y; 3130 int x, y;
3087 XWindowAttributes wattr; 3131 XWindowAttributes wattr;
… …
3096 { 3140 {
3097 /* 3141 /*
3098 * commands 3142 * commands
3099 */ 3143 */
3100 case 1: /* deiconify window */ 3144 case 1: /* deiconify window */
3101 XMapWindow (dpy, parent[0]); 3145 XMapWindow (dpy, parent);
3102 break; 3146 break;
3103 case 2: /* iconify window */ 3147 case 2: /* iconify window */
3104 XIconifyWindow (dpy, parent[0], display->screen); 3148 XIconifyWindow (dpy, parent, display->screen);
3105 break; 3149 break;
3106 case 3: /* set position (pixels) */ 3150 case 3: /* set position (pixels) */
3107 XMoveWindow (dpy, parent[0], args[1], args[2]); 3151 XMoveWindow (dpy, parent, args[1], args[2]);
3108 break; 3152 break;
3109 case 4: /* set size (pixels) */ 3153 case 4: /* set size (pixels) */
3110 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3154 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3111 break; 3155 break;
3112 case 5: /* raise window */ 3156 case 5: /* raise window */
3113 XRaiseWindow (dpy, parent[0]); 3157 XRaiseWindow (dpy, parent);
3114 break; 3158 break;
3115 case 6: /* lower window */ 3159 case 6: /* lower window */
3116 XLowerWindow (dpy, parent[0]); 3160 XLowerWindow (dpy, parent);
3117 break; 3161 break;
3118 case 7: /* refresh window */ 3162 case 7: /* refresh window */
3119 scr_touch (true); 3163 scr_touch (true);
3120 break; 3164 break;
3121 case 8: /* set size (chars) */ 3165 case 8: /* set size (chars) */
… …
3124 break; 3168 break;
3125 3169
3126 //case 9: NYI, TODO, restore maximized window or maximize window 3170 //case 9: NYI, TODO, restore maximized window or maximize window
3127 default: 3171 default:
3128 if (args[0] >= 24) /* set height (chars) */ 3172 if (args[0] >= 24) /* set height (chars) */
3129 set_widthheight ((unsigned int)width, 3173 set_widthheight ((unsigned int)vt_width,
3130 (unsigned int) (args[1] * fheight)); 3174 (unsigned int) (args[1] * fheight));
3131 break; 3175 break;
3132 3176
3133 /* 3177 /*
3134 * reports - some output format copied from XTerm 3178 * reports - some output format copied from XTerm
3135 */ 3179 */
3136 case 11: /* report window state */ 3180 case 11: /* report window state */
3137 XGetWindowAttributes (dpy, parent[0], &wattr); 3181 XGetWindowAttributes (dpy, parent, &wattr);
3138 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3182 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3139 break; 3183 break;
3140 case 13: /* report window position */ 3184 case 13: /* report window position */
3141 XGetWindowAttributes (dpy, parent[0], &wattr); 3185 XGetWindowAttributes (dpy, parent, &wattr);
3142 XTranslateCoordinates (dpy, parent[0], wattr.root, 3186 XTranslateCoordinates (dpy, parent, wattr.root,
3143 -wattr.border_width, -wattr.border_width, 3187 -wattr.border_width, -wattr.border_width,
3144 &x, &y, &wdummy); 3188 &x, &y, &wdummy);
3145 tt_printf ("\033[3;%d;%dt", x, y); 3189 tt_printf ("\033[3;%d;%dt", x, y);
3146 break; 3190 break;
3147 case 14: /* report window size (pixels) */ 3191 case 14: /* report window size (pixels) */
3148 XGetWindowAttributes (dpy, parent[0], &wattr); 3192 XGetWindowAttributes (dpy, parent, &wattr);
3149 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3193 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3150 break; 3194 break;
3151 case 18: /* report text area size (chars) */ 3195 case 18: /* report text area size (chars) */
3152 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3196 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3153 break; 3197 break;
… …
3155 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3199 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3156 break; 3200 break;
3157 case 20: /* report icon label */ 3201 case 20: /* report icon label */
3158 { 3202 {
3159 char *s; 3203 char *s;
3160 XGetIconName (dpy, parent[0], &s); 3204 XGetIconName (dpy, parent, &s);
3161 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3205 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3162 XFree (s); 3206 XFree (s);
3163 } 3207 }
3164 break; 3208 break;
3165 case 21: /* report window title */ 3209 case 21: /* report window title */
3166 { 3210 {
3167 char *s; 3211 char *s;
3168 XFetchName (dpy, parent[0], &s); 3212 XFetchName (dpy, parent, &s);
3169 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3213 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3170 XFree (s); 3214 XFree (s);
3171 } 3215 }
3172 break; 3216 break;
3173 } 3217 }
… …
3183rxvt_term::get_to_st (unicode_t &ends_how) 3227rxvt_term::get_to_st (unicode_t &ends_how)
3184{ 3228{
3185 unicode_t ch; 3229 unicode_t ch;
3186 bool seen_esc = false; 3230 bool seen_esc = false;
3187 unsigned int n = 0; 3231 unsigned int n = 0;
3188 wchar_t string[STRING_MAX]; 3232 wchar_t string[CBUFSIZ];
3189 3233
3190 while ((ch = cmd_getc ()) != NOCHAR) 3234 while ((ch = cmd_getc ()) != NOCHAR)
3191 { 3235 {
3192 if (seen_esc) 3236 if (seen_esc)
3193 { 3237 {
… …
3208 else if (ch < 0x20) 3252 else if (ch < 0x20)
3209 return NULL; /* other control character - exit */ 3253 return NULL; /* other control character - exit */
3210 3254
3211 seen_esc = false; 3255 seen_esc = false;
3212 3256
3213 if (n >= STRING_MAX - 1) 3257 if (n >= sizeof (string) - 1)
3214 // stop at some sane length 3258 // stop at some sane length
3215 return NULL; 3259 return NULL;
3216 3260
3217 string[n++] = ch; 3261 string[n++] = ch;
3218 } 3262 }
… …
3327 unsigned long bytes_after; 3371 unsigned long bytes_after;
3328 unsigned char *value = 0; 3372 unsigned char *value = 0;
3329 const char *str = ""; 3373 const char *str = "";
3330 3374
3331 if (prop 3375 if (prop
3332 && XGetWindowProperty (dpy, parent[0], 3376 && XGetWindowProperty (dpy, parent,
3333 prop, 0, 1<<16, 0, AnyPropertyType, 3377 prop, 0, 1<<16, 0, AnyPropertyType,
3334 &actual_type, &actual_format, 3378 &actual_type, &actual_format,
3335 &nitems, &bytes_after, &value) == Success 3379 &nitems, &bytes_after, &value) == Success
3336 && actual_type != None 3380 && actual_type != None
3337 && actual_format == 8) 3381 && actual_format == 8)
… …
3349 { 3393 {
3350 *eq = 0; 3394 *eq = 0;
3351 set_utf8_property (display->atom (str), eq + 1); 3395 set_utf8_property (display->atom (str), eq + 1);
3352 } 3396 }
3353 else 3397 else
3354 XDeleteProperty (dpy, parent[0], 3398 XDeleteProperty (dpy, parent,
3355 display->atom (str)); 3399 display->atom (str));
3356 } 3400 }
3357 break; 3401 break;
3358 3402
3359 case XTerm_Color: 3403 case XTerm_Color:
… …
3413 break; 3457 break;
3414#endif 3458#endif
3415 case URxvt_Color_border: 3459 case URxvt_Color_border:
3416 process_color_seq (op, Color_border, str, resp); 3460 process_color_seq (op, Color_border, str, resp);
3417 break; 3461 break;
3418#if ENABLE_TRANSPARENCY 3462
3463#if BG_IMAGE_FROM_ROOT
3419 case URxvt_Color_tint: 3464 case URxvt_Color_tint:
3420 process_color_seq (op, Color_tint, str, resp); 3465 process_color_seq (op, Color_tint, str, resp);
3421 { 3466 {
3422 bool changed = false; 3467 bool changed = false;
3423 3468
3424 if (ISSET_PIXCOLOR (Color_tint)) 3469 if (ISSET_PIXCOLOR (Color_tint))
3425 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3470 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3426 else
3427 changed = bgPixmap.unset_tint ();
3428 3471
3429 if (changed) 3472 if (changed)
3430 update_background (); 3473 update_background ();
3431 } 3474 }
3432 3475
… …
3436#if BG_IMAGE_FROM_FILE 3479#if BG_IMAGE_FROM_FILE
3437 case Rxvt_Pixmap: 3480 case Rxvt_Pixmap:
3438 if (!strcmp (str, "?")) 3481 if (!strcmp (str, "?"))
3439 { 3482 {
3440 char str[256]; 3483 char str[256];
3484 int h_scale = fimage.h_scale;
3485 int v_scale = fimage.v_scale;
3486 int h_align = fimage.h_align;
3487 int v_align = fimage.v_align;
3441 3488
3442 sprintf (str, "[%dx%d+%d+%d]", 3489 sprintf (str, "[%dx%d+%d+%d]",
3443 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3490 h_scale, v_scale,
3444 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3491 h_align, v_align);
3445 process_xterm_seq (XTerm_title, str, CHAR_ST); 3492 process_xterm_seq (XTerm_title, str, CHAR_ST);
3446 } 3493 }
3447 else 3494 else
3448 { 3495 {
3449 int changed = 0; 3496 bool changed = false;
3450 3497
3451 if (*str != ';') 3498 if (*str != ';')
3452 { 3499 {
3453 if (bgPixmap.set_file (str)) /* change pixmap */ 3500 try
3454 { 3501 {
3502 fimage.set_file_geometry (this, str);
3455 changed++; 3503 changed = true;
3456 str = strchr (str, ';');
3457 if (str == NULL)
3458 bgPixmap.set_defaultGeometry ();
3459 else 3504 }
3460 bgPixmap.set_geometry (str+1); 3505 catch (const class rxvt_failure_exception &e)
3506 {
3461 } 3507 }
3462 } 3508 }
3463 else 3509 else
3464 { 3510 {
3465 str++; 3511 str++;
3466 if (bgPixmap.set_geometry (str, true)) 3512 if (fimage.set_geometry (str, true))
3467 changed++; 3513 changed = true;
3468 } 3514 }
3469 3515
3470 if (changed) 3516 if (changed)
3517 {
3518 if (bg_window_position_sensitive ())
3519 {
3520 int x, y;
3521 get_window_origin (x, y);
3522 parent_x = x;
3523 parent_y = y;
3524 }
3471 update_background (); 3525 update_background ();
3526 }
3472 } 3527 }
3473 break; 3528 break;
3474#endif 3529#endif
3475 3530
3476 case XTerm_logfile: 3531 case XTerm_logfile:
… …
3563 * 's' = save 3618 * 's' = save
3564 * 'r' = restore 3619 * 'r' = restore
3565 * 't' = toggle 3620 * 't' = toggle
3566 * so no need for fancy checking 3621 * so no need for fancy checking
3567 */ 3622 */
3568int 3623int ecb_cold
3569rxvt_term::privcases (int mode, unsigned long bit) 3624rxvt_term::privcases (int mode, unsigned long bit)
3570{ 3625{
3571 int state; 3626 int state;
3572 3627
3573 if (mode == 's') 3628 if (mode == 's')
3574 { 3629 {
3575 SavedModes |= (priv_modes & bit); 3630 if (priv_modes & bit)
3631 SavedModes |= bit;
3632 else
3633 SavedModes &= ~bit;
3576 return -1; 3634 return -1;
3577 } 3635 }
3578 else 3636 else
3579 { 3637 {
3580 if (mode == 'r') 3638 if (mode == 'r')
3581 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3639 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3582 else 3640 else
3583 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3641 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3584 3642
3585 set_privmode (bit, state); 3643 if (state)
3644 priv_modes |= bit;
3645 else
3646 priv_modes &= ~bit;
3586 } 3647 }
3587 3648
3588 return state; 3649 return state;
3589} 3650}
3590 3651
3591/* we're not using priv _yet_ */ 3652/* we're not using priv _yet_ */
3592void 3653void
3593rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3654rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3594{ 3655{
3595 unsigned int i, j; 3656 unsigned int i, j;
3596 int state; 3657 int state;
3597 3658
3598 static const struct 3659 static const struct
3599 { 3660 {
3600 const int argval; 3661 const int argval;
3601 const unsigned long bit; 3662 const unsigned long bit;
3602 } argtopriv[] = { 3663 } argtopriv[] = {
3603 { 1, PrivMode_aplCUR }, // DECCKM 3664 { 1, PrivMode_aplCUR }, // DECCKM
3604 { 2, PrivMode_vt52 }, 3665 { 2, PrivMode_vt52 }, // DECANM
3605 { 3, PrivMode_132 }, // DECCOLM 3666 { 3, PrivMode_132 }, // DECCOLM
3606 { 4, PrivMode_smoothScroll }, // DECSCLM 3667 { 4, PrivMode_smoothScroll }, // DECSCLM
3607 { 5, PrivMode_rVideo }, // DECSCNM 3668 { 5, PrivMode_rVideo }, // DECSCNM
3608 { 6, PrivMode_relOrigin }, // DECOM 3669 { 6, PrivMode_relOrigin }, // DECOM
3609 { 7, PrivMode_Autowrap }, // DECAWM 3670 { 7, PrivMode_Autowrap }, // DECAWM
3610 // 8, auto-repeat keys // DECARM 3671 // 8, auto-repeat keys // DECARM
3611 { 9, PrivMode_MouseX10 }, 3672 { 9, PrivMode_MouseX10 },
3612 // 18 end FF to printer after print screen 3673 // 18 end FF to printer after print screen
3613 // 19 Print screen prints full screen/scroll region 3674 // 19 Print screen prints full screen/scroll region
3614 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3675 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3615#ifdef scrollBar_esc 3676#ifdef scrollBar_esc
3616 { scrollBar_esc, PrivMode_scrollBar }, 3677 { scrollBar_esc, PrivMode_scrollBar },
3617#endif 3678#endif
3618 { 35, PrivMode_ShiftKeys }, // rxvt extension 3679 { 35, PrivMode_ShiftKeys }, // rxvt extension
3619 // 38, tektronix mode // DECTEK 3680 // 38, tektronix mode // DECTEK
3620 { 40, PrivMode_132OK }, 3681 { 40, PrivMode_132OK },
3621 // 41 xterm more fixes NYI 3682 // 41 xterm more fixes NYI
3622 // 45 margin bell NYI 3683 // 45 margin bell NYI
3623 // 46 start logging 3684 // 46 start logging
3624 { 47, PrivMode_Screen }, 3685 { 47, PrivMode_Screen },
3625 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3686 { 66, PrivMode_aplKP }, // DECNKM
3626#ifndef NO_BACKSPACE_KEY 3687#ifndef NO_BACKSPACE_KEY
3627 { 67, PrivMode_BackSpace }, // DECBKM 3688 { 67, PrivMode_BackSpace }, // DECBKM
3628#endif 3689#endif
3629 { 1000, PrivMode_MouseX11 }, 3690 { 1000, PrivMode_MouseX11 },
3630 { 1002, PrivMode_MouseBtnEvent }, 3691 { 1002, PrivMode_MouseBtnEvent },
3631 { 1003, PrivMode_MouseAnyEvent }, 3692 { 1003, PrivMode_MouseAnyEvent },
3693#if ENABLE_FRILLS
3694 { 1005, PrivMode_ExtModeMouse },
3695#endif
3632 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3696 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3633 { 1011, PrivMode_Keypress }, // rxvt extension 3697 { 1011, PrivMode_Keypress }, // rxvt extension
3698#if ENABLE_FRILLS
3699 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3700#endif
3634 // 1035 enable modifiers for alt, numlock NYI 3701 // 1035 enable modifiers for alt, numlock NYI
3635 // 1036 send ESC for meta keys NYI 3702 // 1036 send ESC for meta keys NYI
3636 // 1037 send DEL for keypad delete NYI 3703 // 1037 send DEL for keypad delete NYI
3637 { 1047, PrivMode_Screen }, 3704 { 1047, PrivMode_Screen },
3638 // 1048 save and restore cursor 3705 // 1048 save and restore cursor, implemented in code
3639 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3706 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3640 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3707 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3641 { 2004, PrivMode_BracketPaste }, 3708 { 2004, PrivMode_BracketPaste },
3642 }; 3709 };
3643 3710
… …
3653 for (i = 0; i < nargs; i++) 3720 for (i = 0; i < nargs; i++)
3654 { 3721 {
3655 state = -1; 3722 state = -1;
3656 3723
3657 /* basic handling */ 3724 /* basic handling */
3658 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3725 for (j = 0; j < ecb_array_length (argtopriv); j++)
3659 if (argtopriv[j].argval == arg[i]) 3726 if (argtopriv[j].argval == arg[i])
3660 { 3727 {
3661 state = privcases (mode, argtopriv[j].bit); 3728 state = privcases (mode, argtopriv[j].bit);
3662 break; 3729 break;
3663 } 3730 }
… …
3689 case 2: /* VT52 mode */ 3756 case 2: /* VT52 mode */
3690 /* oddball mode. should be set regardless of set/reset 3757 /* oddball mode. should be set regardless of set/reset
3691 * parameter. Return from VT52 mode with an ESC < from 3758 * parameter. Return from VT52 mode with an ESC < from
3692 * within VT52 mode 3759 * within VT52 mode
3693 */ 3760 */
3694 set_privmode (PrivMode_vt52, 1); 3761 priv_modes |= PrivMode_vt52;
3695 break; 3762 break;
3696 case 3: /* 80/132 */ 3763 case 3: /* 80/132 */
3697 if (priv_modes & PrivMode_132OK) 3764 if (priv_modes & PrivMode_132OK)
3698 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight); 3765 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3699 break; 3766 break;
… …
3714 if (state) /* orthogonal */ 3781 if (state) /* orthogonal */
3715 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3782 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3716 break; 3783 break;
3717#ifdef scrollBar_esc 3784#ifdef scrollBar_esc
3718 case scrollBar_esc: 3785 case scrollBar_esc:
3719 if (scrollBar.map (state)) 3786 scrollBar.map (state);
3720 {
3721 resize_all_windows (0, 0, 0); 3787 resize_all_windows (0, 0, 0);
3722 scr_touch (true); 3788 scr_touch (true);
3723 }
3724 break; 3789 break;
3725#endif 3790#endif
3726 case 25: /* visible/invisible cursor */ 3791 case 25: /* visible/invisible cursor */
3727 scr_cursor_visible (state); 3792 scr_cursor_visible (state);
3728 break; 3793 break;
… …
3741 case 1003: 3806 case 1003:
3742 if (state) 3807 if (state)
3743 { 3808 {
3744 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3809 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3745 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3810 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3811 mouse_row = mouse_col = 0;
3746 vt_emask_mouse = PointerMotionMask; 3812 vt_emask_mouse = PointerMotionMask;
3747 } 3813 }
3748 else 3814 else
3749 vt_emask_mouse = NoEventMask; 3815 vt_emask_mouse = NoEventMask;
3750 3816
… …
3782 } 3848 }
3783} 3849}
3784/*}}} */ 3850/*}}} */
3785 3851
3786/*{{{ process sgr sequences */ 3852/*{{{ process sgr sequences */
3787void 3853void ecb_hot
3788rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3854rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3789{ 3855{
3790 unsigned int i; 3856 unsigned int i;
3791 short rendset; 3857 short rendset;
3792 int rendstyle; 3858 int rendstyle;
… …
3933 break; 3999 break;
3934#endif 4000#endif
3935 } 4001 }
3936 } 4002 }
3937} 4003}
3938/*}}} */
3939 4004
3940/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3941void 4005void
3942rxvt_term::process_graphics () 4006rxvt_term::set_cursor_style (int style)
3943{ 4007{
3944 unicode_t ch, cmd = cmd_getc (); 4008 if (!IN_RANGE_INC (style, 0, 4))
3945
3946 if (cmd == 'Q')
3947 {
3948 /* query graphics */
3949 tt_printf ("\033G0\012"); /* no graphics */
3950 return; 4009 return;
3951 } 4010
3952 /* swallow other graphics sequences until terminating ':' */ 4011 set_option (Opt_cursorUnderline, style >= 3);
3953 do 4012
3954 ch = cmd_getc (); 4013#ifdef CURSOR_BLINK
3955 while (ch != ':'); 4014 set_option (Opt_cursorBlink, !style || (style & 1));
4015 cursor_blink_reset ();
4016#endif
4017
4018 want_refresh = 1;
3956} 4019}
3957/*}}} */ 4020/*}}} */
3958 4021
3959/* ------------------------------------------------------------------------- */ 4022/* ------------------------------------------------------------------------- */
3960 4023
… …
3976 4039
3977/* ---------------------------------------------------------------------- */ 4040/* ---------------------------------------------------------------------- */
3978/* Write data to the pty as typed by the user, pasted with the mouse, 4041/* Write data to the pty as typed by the user, pasted with the mouse,
3979 * or generated by us in response to a query ESC sequence. 4042 * or generated by us in response to a query ESC sequence.
3980 */ 4043 */
3981const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4044static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3982 4045
3983void 4046void
3984rxvt_term::tt_write (const char *data, unsigned int len) 4047rxvt_term::tt_write (const char *data, unsigned int len)
3985{ 4048{
3986 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4049 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3991 4054
3992 if (v_buflen == 0) 4055 if (v_buflen == 0)
3993 { 4056 {
3994 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4057 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3995 4058
4059 max_it (written, 0);
4060
3996 if ((unsigned int)written == len) 4061 if (written == len)
3997 return; 4062 return;
3998 4063
3999 data += written; 4064 data += written;
4000 len -= written; 4065 len -= written;
4001 } 4066 }
4002 4067
4003 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4068 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4004 4069
4005 memcpy (v_buffer + v_buflen, data, len); 4070 memcpy (v_buffer + v_buflen, data, len);
4006 v_buflen += len; 4071 v_buflen += len;
4007 4072
4008 pty_ev.set (ev::READ | ev::WRITE); 4073 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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