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.454 by sf-exg, Sat Aug 21 16:07:15 2010 UTC vs.
Revision 1.544 by sf-exg, Sat Apr 26 14:55:58 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-2014 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 405static inline wchar_t *
406rxvt_wcsdup (const wchar_t *str, int len)
407{
408 wchar_t *r = (wchar_t *)rxvt_malloc ((len + 1) * sizeof (wchar_t));
409 memcpy (r, str, len * sizeof (wchar_t));
410 r[len] = 0;
411 return r;
412}
413
414void ecb_cold
405rxvt_term::key_press (XKeyEvent &ev) 415rxvt_term::key_press (XKeyEvent &ev)
406{ 416{
407 int ctrl, meta, shft, len; 417 int ctrl, meta, shft, len;
408 KeySym keysym; 418 KeySym keysym;
409 int valid_keysym; 419 int valid_keysym;
410 char kbuf[KBUFSZ]; 420 char rkbuf[KBUFSZ];
421 char *kbuf = rkbuf + 1;
411 422
412#if ISO_14755 423#if ISO_14755
413 if (iso14755buf & ISO_14755_52) 424 if (iso14755buf & ISO_14755_52)
414 return; 425 return;
415#endif 426#endif
… …
424 ctrl = ev.state & ControlMask; 435 ctrl = ev.state & ControlMask;
425 meta = ev.state & ModMetaMask; 436 meta = ev.state & ModMetaMask;
426 437
427 kbuf[0] = 0; 438 kbuf[0] = 0;
428 439
429#ifdef USE_XIM 440#if USE_XIM
430 if (Input_Context) 441 if (Input_Context)
431 { 442 {
432 Status status_return; 443 Status status_return;
433 444
434#if 0 445#if 0
… …
509#endif 520#endif
510 max_it (lnsppg, 1); 521 max_it (lnsppg, 1);
511 522
512 if (keysym == XK_Prior) 523 if (keysym == XK_Prior)
513 { 524 {
514 scr_page (UP, lnsppg); 525 scr_page (lnsppg);
515 return; 526 return;
516 } 527 }
517 else if (keysym == XK_Next) 528 else if (keysym == XK_Next)
518 { 529 {
519 scr_page (DN, lnsppg); 530 scr_page (-lnsppg);
520 return; 531 return;
521 } 532 }
522 } 533 }
523#ifdef SCROLL_ON_UPDOWN_KEYS 534#ifdef SCROLL_ON_UPDOWN_KEYS
524 if (IS_SCROLL_MOD) 535 if (IS_SCROLL_MOD)
525 { 536 {
526 if (keysym == XK_Up) 537 if (keysym == XK_Up)
527 { 538 {
528 scr_page (UP, 1); 539 scr_page (1);
529 return; 540 return;
530 } 541 }
531 else if (keysym == XK_Down) 542 else if (keysym == XK_Down)
532 { 543 {
533 scr_page (DN, 1); 544 scr_page (-1);
534 return; 545 return;
535 } 546 }
536 } 547 }
537#endif 548#endif
538#ifdef SCROLL_ON_HOMEEND_KEYS 549#ifdef SCROLL_ON_HOMEEND_KEYS
539 if (IS_SCROLL_MOD) 550 if (IS_SCROLL_MOD)
540 { 551 {
541 if (keysym == XK_Home) 552 if (keysym == XK_Home)
542 { 553 {
543 scr_move_to (0, 1); 554 scr_changeview (top_row);
544 return; 555 return;
545 } 556 }
546 else if (keysym == XK_End) 557 else if (keysym == XK_End)
547 { 558 {
548 scr_move_to (1, 1); 559 scr_changeview (0);
549 return; 560 return;
550 } 561 }
551 } 562 }
552#endif 563#endif
553 } 564 }
… …
569 selection_request (ev.time); 580 selection_request (ev.time);
570 return; 581 return;
571#if TODO 582#if TODO
572 /* rxvt extras */ 583 /* rxvt extras */
573 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 584 case XK_KP_Add: /* Shift+KP_Add = bigger font */
574 change_font (FONT_UP);
575 return; 585 return;
576 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 586 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
577 change_font (FONT_DN);
578 return; 587 return;
579#endif 588#endif
580 } 589 }
581 } 590 }
591 }
592
593 if (ctrl && meta && (keysym == XK_c || keysym == XK_v))
594 {
595 if (keysym == XK_v)
596 selection_request (ev.time, Sel_Clipboard);
597 else if (selection.len > 0)
598 {
599 free (selection.clip_text);
600 selection.clip_text = rxvt_wcsdup (selection.text, selection.len);
601 selection.clip_len = selection.len;
602 selection_grab (CurrentTime, true);
603 }
604
605 return;
582 } 606 }
583 607
584#if ENABLE_FRILLS || ISO_14755 608#if ENABLE_FRILLS || ISO_14755
585 // ISO 14755 support 609 // ISO 14755 support
586 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51)) 610 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
… …
771 795
772 default: 796 default:
773 { 797 {
774 int param = map_function_key (keysym); 798 int param = map_function_key (keysym);
775 if (param > 0) 799 if (param > 0)
776 {
777 int n = sprintf (kbuf,"\033[%d~", param); 800 sprintf (kbuf,"\033[%d~", param);
778 /*
779 * pass Shift/Control indicators for function keys ending with `~'
780 *
781 * eg,
782 * Prior = "ESC[5~"
783 * Shift+Prior = "ESC[5$"
784 * Ctrl+Prior = "ESC[5^"
785 * Ctrl+Shift+Prior = "ESC[5@"
786 */
787 kbuf[n-1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
788 }
789 else 801 else
790 newlen = 0; 802 newlen = 0;
791 } 803 }
792 break; 804 break;
793 } 805 }
794 806
795 if (newlen) 807 if (newlen)
796 len = strlen (kbuf); 808 len = strlen (kbuf);
797 809
810 if (len > 0)
811 {
798 /* 812 /*
813 * pass Shift/Control indicators for function keys ending with `~'
814 *
815 * eg,
816 * Prior = "ESC[5~"
817 * Shift+Prior = "ESC[5$"
818 * Ctrl+Prior = "ESC[5^"
819 * Ctrl+Shift+Prior = "ESC[5@"
820 */
821 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
822 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
823
824 /*
799 * Pass meta for all function keys, if 'meta' option set 825 * Pass meta for all function keys, if 'meta' option set
800 */ 826 */
801#ifdef META8_OPTION 827#ifdef META8_OPTION
802 if (meta && (meta_char == 0x80) && len > 0) 828 if (meta && (meta_char == 0x80))
803 kbuf[len - 1] |= 0x80; 829 kbuf[len - 1] |= 0x80;
804#endif 830#endif
831 }
805 832
806 } 833 }
807 else if (ctrl && keysym == XK_minus) 834 else if (ctrl && keysym == XK_minus)
808 { 835 {
809 len = 1; 836 len = 1;
… …
828 meta = 0; 855 meta = 0;
829 } 856 }
830#endif 857#endif
831 /* nil */ ; 858 /* nil */ ;
832 } 859 }
860 }
861
862 /* escape prefix */
863 if (len && meta
864#ifdef META8_OPTION
865 && meta_char == C0_ESC
866#endif
867 )
868 {
869 *--kbuf = C0_ESC;
870 len++;
833 } 871 }
834 872
835 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END))) 873 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
836 return; 874 return;
837 875
… …
843 { 881 {
844 view_start = 0; 882 view_start = 0;
845 want_refresh = 1; 883 want_refresh = 1;
846 } 884 }
847 885
848 /*
849 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
850 */
851
852 /* escape prefix */
853 if (meta
854#ifdef META8_OPTION
855 && meta_char == C0_ESC
856#endif
857 )
858 {
859 const char ch = C0_ESC;
860 tt_write (&ch, 1);
861 }
862
863 tt_write (kbuf, (unsigned int)len); 886 tt_write (kbuf, (unsigned int)len);
864} 887}
865 888
866void 889void ecb_cold
867rxvt_term::key_release (XKeyEvent &ev) 890rxvt_term::key_release (XKeyEvent &ev)
868{ 891{
869#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 892#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
870 KeySym keysym; 893 KeySym keysym;
871 894
… …
891 commit_iso14755 (); 914 commit_iso14755 ();
892 915
893 return; 916 return;
894 } 917 }
895 918
896 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 919 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
897 if (i[0] == keysym) 920 if (i[0] == keysym)
898 { 921 {
899 iso14755buf = ISO_14755_51 | i[1]; 922 iso14755buf = ISO_14755_51 | i[1];
900 commit_iso14755 (); 923 commit_iso14755 ();
901 924
… …
938 else if (keysym == XK_Control_L || keysym == XK_Control_R) 961 else if (keysym == XK_Control_L || keysym == XK_Control_R)
939 mouse_slip_wheel_speed = 0; 962 mouse_slip_wheel_speed = 0;
940#endif 963#endif
941} 964}
942 965
943#if defined (KEYSYM_RESOURCE)
944unsigned int
945rxvt_term::cmd_write (const char *str, unsigned int count)
946{
947 unsigned int n, s;
948
949 n = cmdbuf_ptr - cmdbuf_base;
950 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
951
952 if (n > 0 && s < count)
953 {
954 memmove (cmdbuf_base, cmdbuf_ptr,
955 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
956 cmdbuf_ptr = cmdbuf_base;
957 cmdbuf_endp -= n;
958 s += n;
959 }
960
961 if (count > s)
962 {
963 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
964 count = s;
965 }
966
967 for (; count--;)
968 *cmdbuf_endp++ = *str++;
969
970 cmd_parse ();
971
972 return 0;
973}
974#endif
975
976void 966void
977rxvt_term::flush () 967rxvt_term::flush ()
978{ 968{
979 flush_ev.stop (); 969 flush_ev.stop ();
980 970
981#ifdef HAVE_BG_PIXMAP 971#ifdef HAVE_IMG
982 if (bgPixmap.check_clearChanged ()) 972 if (bg_flags & BG_NEEDS_REFRESH)
983 { 973 {
984// scr_clear (true); This needs to be researched further! 974 bg_flags &= ~BG_NEEDS_REFRESH;
985 scr_touch (false); 975 scr_touch (false);
986 } 976 }
987#endif 977#endif
988 978
989 if (want_refresh) 979 if (want_refresh)
… …
1026 while (row < end_row); 1016 while (row < end_row);
1027 } 1017 }
1028 1018
1029 scr_refresh (); 1019 scr_refresh ();
1030 scrollBar.show (1); 1020 scrollBar.show (1);
1031#ifdef USE_XIM 1021#if USE_XIM
1032 IMSendSpot (); 1022 im_send_spot ();
1033#endif 1023#endif
1034 } 1024 }
1035 1025
1036 display->flush (); 1026 display->flush ();
1037} 1027}
… …
1055 flush (); 1045 flush ();
1056} 1046}
1057 1047
1058#ifdef CURSOR_BLINK 1048#ifdef CURSOR_BLINK
1059void 1049void
1050rxvt_term::cursor_blink_reset ()
1051{
1052 if (hidden_cursor)
1053 {
1054 hidden_cursor = 0;
1055 want_refresh = 1;
1056 }
1057
1058 if (option (Opt_cursorBlink))
1059 cursor_blink_ev.again ();
1060 else
1061 cursor_blink_ev.stop ();
1062}
1063
1064void
1060rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1065rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1061{ 1066{
1062 hidden_cursor = !hidden_cursor; 1067 hidden_cursor = !hidden_cursor;
1063 want_refresh = 1; 1068 want_refresh = 1;
1064 refresh_check (); 1069 refresh_check ();
… …
1082 1087
1083#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1088#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1084void 1089void
1085rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1090rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1086{ 1091{
1087 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1092 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1088 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1093 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1089 { 1094 {
1090 want_refresh = 1; 1095 want_refresh = 1;
1091 refresh_check (); 1096 refresh_check ();
1092 } 1097 }
1093 else 1098 else
… …
1097 1102
1098#ifdef SELECTION_SCROLLING 1103#ifdef SELECTION_SCROLLING
1099void 1104void
1100rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1105rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1101{ 1106{
1102 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1107 if (scr_page (scroll_selection_lines))
1103 { 1108 {
1104 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1109 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1105 want_refresh = 1; 1110 want_refresh = 1;
1106 refresh_check (); 1111 refresh_check ();
1107 } 1112 }
… …
1112 1117
1113#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1118#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1114void 1119void
1115rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1120rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1116{ 1121{
1117 if (scr_changeview (view_start - mouse_slip_wheel_speed)) 1122 if (scr_page (mouse_slip_wheel_speed))
1118 { 1123 {
1119 want_refresh = 1; 1124 want_refresh = 1;
1120 refresh_check (); 1125 refresh_check ();
1121 } 1126 }
1122 1127
… …
1154 { 1159 {
1155 } 1160 }
1156} event_handler; 1161} event_handler;
1157#endif 1162#endif
1158 1163
1164/* make sure all the cmd data is at beginning of cmdbuf */
1165void
1166rxvt_term::cmdbuf_reify ()
1167{
1168 if (cmdbuf_ptr == cmdbuf_base)
1169 return;
1170
1171 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1172
1173 memmove (cmdbuf_base, cmdbuf_ptr, used);
1174 cmdbuf_ptr = cmdbuf_base;
1175 cmdbuf_endp = cmdbuf_ptr + used;
1176
1177}
1178
1179#if defined (KEYSYM_RESOURCE)
1180void
1181rxvt_term::cmdbuf_append (const char *str, size_t count)
1182{
1183 cmdbuf_reify ();
1184
1185 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1186
1187 if (count > avail)
1188 return;
1189
1190 memcpy (cmdbuf_endp, str, count);
1191 cmdbuf_endp += count;
1192
1193 cmd_parse ();
1194}
1195#endif
1196
1159bool 1197bool
1160rxvt_term::pty_fill () 1198rxvt_term::pty_fill ()
1161{ 1199{
1162 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1200 cmdbuf_reify ();
1163 1201
1164 if (CBUFSIZ == n) 1202 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1165 { 1203
1166 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1204 if (!avail)
1167 n = 0;
1168 } 1205 {
1169 1206 // normally this indicates a "too long" command sequence - just drop the data we have
1170 memmove (cmdbuf_base, cmdbuf_ptr, n);
1171 cmdbuf_ptr = cmdbuf_base; 1207 cmdbuf_ptr = cmdbuf_base;
1172 cmdbuf_endp = cmdbuf_ptr + n; 1208 cmdbuf_endp = cmdbuf_ptr;
1209 avail = CBUFSIZ;
1210 }
1173 1211
1174 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1212 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1175 1213
1176 if (r > 0) 1214 if (r > 0)
1177 { 1215 {
1178 cmdbuf_endp += r; 1216 cmdbuf_endp += r;
1179 return true; 1217 return true;
… …
1210 pty_write (); 1248 pty_write ();
1211 1249
1212 refresh_check (); 1250 refresh_check ();
1213} 1251}
1214 1252
1215void 1253void ecb_cold
1216rxvt_term::pointer_unblank () 1254rxvt_term::pointer_unblank ()
1217{ 1255{
1218 XDefineCursor (dpy, vt, TermWin_cursor); 1256 XDefineCursor (dpy, vt, TermWin_cursor);
1219 recolour_cursor (); 1257 recolour_cursor ();
1220 1258
… …
1225 pointer_ev.start (pointerBlankDelay); 1263 pointer_ev.start (pointerBlankDelay);
1226#endif 1264#endif
1227} 1265}
1228 1266
1229#ifdef POINTER_BLANK 1267#ifdef POINTER_BLANK
1230void 1268void ecb_cold
1231rxvt_term::pointer_blank () 1269rxvt_term::pointer_blank ()
1232{ 1270{
1233 if (!option (Opt_pointerBlank)) 1271 if (!option (Opt_pointerBlank))
1234 return; 1272 return;
1235 1273
… …
1237 XFlush (dpy); 1275 XFlush (dpy);
1238 1276
1239 hidden_pointer = 1; 1277 hidden_pointer = 1;
1240} 1278}
1241 1279
1242void 1280void ecb_cold
1243rxvt_term::pointer_cb (ev::timer &w, int revents) 1281rxvt_term::pointer_cb (ev::timer &w, int revents)
1244{ 1282{
1245 make_current (); 1283 make_current ();
1246 1284
1247 pointer_blank (); 1285 pointer_blank ();
… …
1253{ 1291{
1254 int button_number, key_state = 0; 1292 int button_number, key_state = 0;
1255 int x, y; 1293 int x, y;
1256 int code = 32; 1294 int code = 32;
1257 1295
1258 x = Pixel2Col (ev.x); 1296 x = Pixel2Col (ev.x) + 1;
1259 y = Pixel2Row (ev.y); 1297 y = Pixel2Row (ev.y) + 1;
1298
1260 if (ev.type == MotionNotify) 1299 if (ev.type == MotionNotify)
1261 { 1300 {
1262 if (x == mouse_row && y == mouse_col) 1301 if (x == mouse_row && y == mouse_col)
1263 return; 1302 return;
1303
1264 mouse_row = x; 1304 mouse_row = x;
1265 mouse_col = y; 1305 mouse_col = y;
1266 code += 32; 1306 code += 32;
1267 } 1307 }
1268 1308
… …
1271 else 1311 else
1272 { 1312 {
1273 button_number = MEvent.button - Button1; 1313 button_number = MEvent.button - Button1;
1274 /* add 0x3D for wheel events, like xterm does */ 1314 /* add 0x3D for wheel events, like xterm does */
1275 if (button_number >= 3) 1315 if (button_number >= 3)
1276 button_number += (64 - 3); 1316 button_number += 64 - 3;
1277 } 1317 }
1278 1318
1279 if (priv_modes & PrivMode_MouseX10) 1319 if (priv_modes & PrivMode_MouseX10)
1280 { 1320 {
1281 /* 1321 /*
… …
1313 fputc ('A', stderr); 1353 fputc ('A', stderr);
1314 if (key_state & 32) 1354 if (key_state & 32)
1315 fputc ('2', stderr); 1355 fputc ('2', stderr);
1316 fprintf (stderr, "]: <%d>, %d/%d\n", 1356 fprintf (stderr, "]: <%d>, %d/%d\n",
1317 button_number, 1357 button_number,
1318 x + 1, 1358 x,
1319 y + 1); 1359 y);
1320#endif 1360#endif
1321 1361
1362#if ENABLE_FRILLS
1363 if (priv_modes & PrivMode_ExtMouseRight)
1364 tt_printf ("\033[%d;%d;%dM",
1365 code + button_number + key_state,
1366 x,
1367 y);
1368 else if (priv_modes & PrivMode_ExtModeMouse)
1369 tt_printf ("\033[M%c%lc%lc",
1370 code + button_number + key_state,
1371 wint_t (32 + x),
1372 wint_t (32 + y));
1373 else
1374#endif
1322 tt_printf ("\033[M%c%c%c", 1375 tt_printf ("\033[M%c%c%c",
1323 (code + button_number + key_state), 1376 code + button_number + key_state,
1324 (32 + x + 1), 1377 32 + x,
1325 (32 + y + 1)); 1378 32 + y);
1326} 1379}
1327 1380
1328/*{{{ process an X event */ 1381/*{{{ process an X event */
1329void 1382void ecb_hot
1330rxvt_term::x_cb (XEvent &ev) 1383rxvt_term::x_cb (XEvent &ev)
1331{ 1384{
1332 make_current (); 1385 make_current ();
1333 1386
1334 dLocal (Display *, dpy); 1387 dLocal (Display *, dpy);
… …
1432 && ev.xfocus.mode != NotifyGrab) 1485 && ev.xfocus.mode != NotifyGrab)
1433 focus_out (); 1486 focus_out ();
1434 break; 1487 break;
1435 1488
1436 case ConfigureNotify: 1489 case ConfigureNotify:
1437 /*fprintf (stderr, "ConfigureNotify for %X, parent is %X, geom is %dx%d%+d%+d, old geom was %dx%d\n",
1438 ev.xconfigure.window, parent[0], ev.xconfigure.width, ev.xconfigure.height, ev.xconfigure.x, ev.xconfigure.y,
1439 szHint.width, szHint.height);*/
1440 if (ev.xconfigure.window == parent[0]) 1490 if (ev.xconfigure.window == parent)
1441 { 1491 {
1442 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1492 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1443 ; 1493 ;
1494
1495 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1496
1497 bool moved = false;
1498#ifdef HAVE_BG_PIXMAP
1499 if (bg_window_position_sensitive ())
1500 {
1501 want_position_change = true;
1502 if (bg_img == 0)
1503 moved = true;
1504 }
1505#endif
1506
1507 if (want_position_change)
1508 {
1509 int x, y;
1510
1511 if (ev.xconfigure.send_event)
1512 {
1513 x = ev.xconfigure.x;
1514 y = ev.xconfigure.y;
1515 }
1516 else
1517 get_window_origin (x, y);
1518
1519 if (x != parent_x || y != parent_y)
1520 {
1521 parent_x = x;
1522 parent_y = y;
1523 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1524 moved = true;
1525 }
1526 }
1444 1527
1445 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1528 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1446 { 1529 {
1447 seen_resize = 1; 1530 seen_resize = 1;
1448 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1531 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1449 } 1532 }
1450 else 1533 else
1451 { 1534 {
1452#ifdef HAVE_BG_PIXMAP 1535#ifdef HAVE_BG_PIXMAP
1453 if (bgPixmap.window_position_sensitive ())
1454 {
1455 if (mapped) 1536 if (moved)
1456 update_background (); 1537 update_background ();
1457 else
1458 bgPixmap.invalidate ();
1459 }
1460#endif 1538#endif
1461 } 1539 }
1462 1540
1463 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1541 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1464 } 1542 }
1465 break; 1543 break;
1466 1544
1467 case PropertyNotify: 1545 case PropertyNotify:
1468 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1546 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1469 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1470 && ev.xproperty.state == PropertyNewValue)
1471 selection_property (ev.xproperty.window, ev.xproperty.atom);
1472
1473 break; 1547 break;
1474 1548
1475 case SelectionClear: 1549 case SelectionClear:
1476 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]); 1550 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1477 break; 1551 break;
1478 1552
1479 case SelectionNotify:
1480 if (selection_wait == Sel_normal)
1481 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1482 break;
1483
1484 case SelectionRequest: 1553 case SelectionRequest:
1485 selection_send (ev.xselectionrequest); 1554 selection_send (ev.xselectionrequest);
1486 break; 1555 break;
1487 1556
1488 case MapNotify: 1557 case MapNotify:
1489#ifdef HAVE_BG_PIXMAP 1558#ifdef HAVE_BG_PIXMAP
1490 /* This is needed specifically to fix the case of no window manager or a 1559 // This is needed at startup for the case of no window manager
1491 * non-reparenting window manager. In those cases we never get first 1560 // or a non-reparenting window manager and also because we
1492 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1561 // defer bg image updates if the window is not mapped. The
1493 * care of multiplicity of ConfigureNotify events arriving while WM does 1562 // short delay is to optimize for multiple ConfigureNotify
1494 * reparenting. 1563 // events at startup when the window manager reparents the
1495 * We should not render background immediately, as there could be several 1564 // window, so as to perform the computation after we have
1496 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1565 // received all of them.
1497 * by scheduling background redraw as soon as we can, but giving a short 1566 if (bg_img == 0)
1498 * bit of time for ConfigureNotifies to arrive.
1499 * We should render background PRIOR to drawing any text, but AFTER all
1500 * of ConfigureNotifys for the best results.
1501 */
1502 if (bgPixmap.flags & bgPixmap_t::isInvalid)
1503 update_background_ev.start (0.025); 1567 update_background_ev.start (0.025);
1504#endif 1568#endif
1505 mapped = 1; 1569 mapped = 1;
1506#ifdef TEXT_BLINK 1570#ifdef TEXT_BLINK
1507 text_blink_ev.start (); 1571 text_blink_ev.start ();
… …
1522 if (ev.xany.window == vt) 1586 if (ev.xany.window == vt)
1523 { 1587 {
1524 do 1588 do
1525 { 1589 {
1526 scr_expose (ev.xexpose.x, ev.xexpose.y, 1590 scr_expose (ev.xexpose.x, ev.xexpose.y,
1527 ev.xexpose.width, ev.xexpose.height, False); 1591 ev.xexpose.width, ev.xexpose.height, false);
1528 } 1592 }
1529 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1593 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1530 1594
1531 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1595 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1532 1596
1533 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1597 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1534 { 1598 {
1535 scr_expose (ev.xexpose.x, ev.xexpose.y, 1599 scr_expose (ev.xexpose.x, ev.xexpose.y,
1536 ev.xexpose.width, ev.xexpose.height, False); 1600 ev.xexpose.width, ev.xexpose.height, false);
1537 } 1601 }
1538 1602
1539 want_refresh = 1; 1603 want_refresh = 1;
1540 } 1604 }
1541 else 1605 else
… …
1547 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1611 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1548 ; 1612 ;
1549 1613
1550 if (scrollBar.state && ev.xany.window == scrollBar.win) 1614 if (scrollBar.state && ev.xany.window == scrollBar.win)
1551 { 1615 {
1552 scrollBar.state = STATE_IDLE; 1616 scrollBar.state = SB_STATE_IDLE;
1553 scrollBar.show (0); 1617 scrollBar.show (0);
1554 } 1618 }
1555 } 1619 }
1556 break; 1620 break;
1557 1621
… …
1599 1663
1600#ifdef SELECTION_SCROLLING 1664#ifdef SELECTION_SCROLLING
1601 if (ev.xbutton.y < int_bwidth 1665 if (ev.xbutton.y < int_bwidth
1602 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1666 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1603 { 1667 {
1668 page_dirn scroll_selection_dir;
1604 int dist; 1669 int dist;
1605 1670
1606 /* don't clobber the current delay if we are 1671 /* don't clobber the current delay if we are
1607 * already in the middle of scrolling. 1672 * already in the middle of scrolling.
1608 */ 1673 */
… …
1623 dist = int_bwidth - ev.xbutton.y; 1688 dist = int_bwidth - ev.xbutton.y;
1624 } 1689 }
1625 else 1690 else
1626 { 1691 {
1627 scroll_selection_dir = DN; 1692 scroll_selection_dir = DN;
1628 dist = ev.xbutton.y - (int_bwidth + height); 1693 dist = ev.xbutton.y - (int_bwidth + vt_height);
1629 } 1694 }
1630 1695
1631 scroll_selection_lines = Pixel2Height (dist) 1696 scroll_selection_lines = Pixel2Height (dist)
1632 / SELECTION_SCROLL_LINE_SPEEDUP 1697 / SELECTION_SCROLL_LINE_SPEEDUP
1633 + 1; 1698 + 1;
1634 min_it (scroll_selection_lines, 1699 min_it (scroll_selection_lines,
1635 SELECTION_SCROLL_MAX_LINES); 1700 SELECTION_SCROLL_MAX_LINES);
1701 scroll_selection_lines *= scroll_selection_dir;
1636 } 1702 }
1637 else 1703 else
1638 { 1704 {
1639 /* we are within the text window, so we 1705 /* we are within the text window, so we
1640 * shouldn't be scrolling 1706 * shouldn't be scrolling
… …
1645#ifdef MOUSE_THRESHOLD 1711#ifdef MOUSE_THRESHOLD
1646 } 1712 }
1647#endif 1713#endif
1648 } 1714 }
1649 } 1715 }
1650 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1716 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1651 { 1717 {
1652 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1718 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1653 MotionNotify, &ev)) 1719 MotionNotify, &ev))
1654 ; 1720 ;
1655 1721
1656 XQueryPointer (dpy, scrollBar.win, 1722 XQueryPointer (dpy, scrollBar.win,
1657 &unused_root, &unused_child, 1723 &unused_root, &unused_child,
1658 &unused_root_x, &unused_root_y, 1724 &unused_root_x, &unused_root_y,
1659 &ev.xbutton.x, &ev.xbutton.y, 1725 &ev.xbutton.x, &ev.xbutton.y,
1660 &unused_mask); 1726 &unused_mask);
1661 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1727 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1662 scrollBar.size ()); 1728 scrollBar.size ());
1663 want_refresh = 1; 1729 want_refresh = 1;
1664 scrollBar.show (1); 1730 scrollBar.show (1);
1665 } 1731 }
1666 break; 1732 break;
1667 } 1733 }
1668 1734
1669#if defined(CURSOR_BLINK) 1735#if defined(CURSOR_BLINK)
1670 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1736 if (ev.type == KeyPress)
1671 {
1672 if (hidden_cursor)
1673 {
1674 hidden_cursor = 0;
1675 want_refresh = 1;
1676 }
1677
1678 cursor_blink_ev.again (); 1737 cursor_blink_reset ();
1679 }
1680#endif 1738#endif
1681 1739
1682#if defined(POINTER_BLANK) 1740#if defined(POINTER_BLANK)
1683 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1741 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1684 { 1742 {
… …
1695 1753
1696 refresh_check (); 1754 refresh_check ();
1697} 1755}
1698 1756
1699#if ENABLE_FRILLS 1757#if ENABLE_FRILLS
1700void 1758void ecb_cold
1701rxvt_term::set_urgency (bool enable) 1759rxvt_term::set_urgency (bool enable)
1702{ 1760{
1703 if (enable == urgency_hint) 1761 if (enable == urgency_hint)
1704 return; 1762 return;
1705 1763
1706 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1764 if (XWMHints *h = XGetWMHints (dpy, parent))
1707 { 1765 {
1708 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1766 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1709 XSetWMHints (dpy, parent[0], h); 1767 XSetWMHints (dpy, parent, h);
1710 urgency_hint = enable; 1768 urgency_hint = enable;
1769 XFree (h);
1711 } 1770 }
1712} 1771}
1713#endif 1772#endif
1714 1773
1715void 1774void ecb_cold
1716rxvt_term::focus_in () 1775rxvt_term::focus_in ()
1717{ 1776{
1718 if (!focus) 1777 if (!focus)
1719 { 1778 {
1720 focus = 1; 1779 focus = 1;
1721 want_refresh = 1; 1780 want_refresh = 1;
1722 1781
1723#if USE_XIM 1782#if USE_XIM
1724 if (Input_Context != NULL) 1783 if (Input_Context != NULL)
1725 { 1784 {
1726 IMSetPosition (); 1785 im_set_position ();
1727 XSetICFocus (Input_Context); 1786 XSetICFocus (Input_Context);
1728 } 1787 }
1729#endif 1788#endif
1730#if CURSOR_BLINK 1789#if CURSOR_BLINK
1731 if (option (Opt_cursorBlink)) 1790 if (option (Opt_cursorBlink))
… …
1745 1804
1746 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1805 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1747 } 1806 }
1748} 1807}
1749 1808
1750void 1809void ecb_cold
1751rxvt_term::focus_out () 1810rxvt_term::focus_out ()
1752{ 1811{
1753 if (focus) 1812 if (focus)
1754 { 1813 {
1755 focus = 0; 1814 focus = 0;
… …
1788 1847
1789 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1848 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1790 } 1849 }
1791} 1850}
1792 1851
1793void 1852void ecb_cold
1794rxvt_term::update_fade_color (unsigned int idx) 1853rxvt_term::update_fade_color (unsigned int idx)
1795{ 1854{
1796#if OFF_FOCUS_FADING 1855#if OFF_FOCUS_FADING
1797 if (rs[Rs_fade]) 1856 if (rs[Rs_fade])
1798 { 1857 {
… …
1801 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1860 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1802 } 1861 }
1803#endif 1862#endif
1804} 1863}
1805 1864
1806#if ENABLE_TRANSPARENCY || ENABLE_PERL 1865#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1807void 1866void ecb_hot
1808rxvt_term::rootwin_cb (XEvent &ev) 1867rxvt_term::rootwin_cb (XEvent &ev)
1809{ 1868{
1810 make_current (); 1869 make_current ();
1811 1870
1812 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1871 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1813 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1872 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1814 return; 1873 return;
1815 1874
1816# if ENABLE_TRANSPARENCY
1817 switch (ev.type) 1875 switch (ev.type)
1818 { 1876 {
1819 case PropertyNotify: 1877 case PropertyNotify:
1820 /* 1878 /*
1821 * if user used some Esetroot compatible prog to set the root bg, 1879 * if user used some Esetroot compatible prog to set the root bg,
1822 * use the property to determine the pixmap. We use it later on. 1880 * use the property to determine the pixmap. We use it later on.
1823 */ 1881 */
1824 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1882 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1825 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1883 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1826 { 1884 {
1827 bgPixmap.set_root_pixmap (); 1885#if BG_IMAGE_FROM_ROOT
1886 if (option (Opt_transparent))
1887 {
1888 rxvt_img::new_from_root (this)->replace (root_img);
1828 update_background (); 1889 update_background ();
1890 }
1891#endif
1892 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1829 } 1893 }
1830 1894
1831 break; 1895 break;
1832 } 1896 }
1833# endif
1834 1897
1835 refresh_check (); 1898 refresh_check ();
1836} 1899}
1837#endif 1900#endif
1838 1901
… …
1962 if (scrollBar.upButton (ev.y)) 2025 if (scrollBar.upButton (ev.y))
1963 direction = UP; /* up */ 2026 direction = UP; /* up */
1964 else if (scrollBar.dnButton (ev.y)) 2027 else if (scrollBar.dnButton (ev.y))
1965 direction = DN; /* down */ 2028 direction = DN; /* down */
1966 2029
1967 scrollBar.state = STATE_IDLE; 2030 scrollBar.state = SB_STATE_IDLE;
1968 /* 2031 /*
1969 * Rxvt-style scrollbar: 2032 * Rxvt-style scrollbar:
1970 * move up if mouse is above slider 2033 * move up if mouse is above slider
1971 * move dn if mouse is below slider 2034 * move dn if mouse is below slider
1972 * 2035 *
… …
2011 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2074 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2012#endif 2075#endif
2013 if (scr_page (direction, 1)) 2076 if (scr_page (direction, 1))
2014 { 2077 {
2015 if (direction == UP) 2078 if (direction == UP)
2016 scrollBar.state = STATE_UP; 2079 scrollBar.state = SB_STATE_UP;
2017 else 2080 else
2018 scrollBar.state = STATE_DOWN; 2081 scrollBar.state = SB_STATE_DOWN;
2019 } 2082 }
2020 } 2083 }
2021 else 2084 else
2022 switch (ev.button) 2085 switch (ev.button)
2023 { 2086 {
2024 case Button2: 2087 case Button2:
2025 switch (scrollBar.align) 2088 switch (scrollBar.align)
2026 { 2089 {
2027 case R_SB_ALIGN_TOP: 2090 case SB_ALIGN_TOP:
2028 csrO = 0; 2091 csrO = 0;
2029 break; 2092 break;
2030 case R_SB_ALIGN_CENTRE: 2093 case SB_ALIGN_CENTRE:
2031 csrO = (scrollBar.bot - scrollBar.top) / 2; 2094 csrO = (scrollBar.bot - scrollBar.top) / 2;
2032 break; 2095 break;
2033 case R_SB_ALIGN_BOTTOM: 2096 case SB_ALIGN_BOTTOM:
2034 csrO = scrollBar.bot - scrollBar.top; 2097 csrO = scrollBar.bot - scrollBar.top;
2035 break; 2098 break;
2036 } 2099 }
2037 2100
2038 if (scrollBar.style == R_SB_XTERM 2101 if (scrollBar.style == SB_STYLE_XTERM
2039 || scrollbar_above_slider (ev.y) 2102 || scrollBar.above_slider (ev.y)
2040 || scrollbar_below_slider (ev.y)) 2103 || scrollBar.below_slider (ev.y))
2041 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2104 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2042 2105
2043 scrollBar.state = STATE_MOTION; 2106 scrollBar.state = SB_STATE_MOTION;
2044 break; 2107 break;
2045 2108
2046 case Button1: 2109 case Button1:
2047 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2110 if (scrollBar.align == SB_ALIGN_CENTRE)
2048 csrO = ev.y - scrollBar.top; 2111 csrO = ev.y - scrollBar.top;
2049 /* FALLTHROUGH */ 2112 /* FALLTHROUGH */
2050 2113
2051 case Button3: 2114 case Button3:
2052 if (scrollBar.style != R_SB_XTERM) 2115 if (scrollBar.style != SB_STYLE_XTERM)
2053 { 2116 {
2054 if (scrollbar_above_slider (ev.y)) 2117 if (scrollBar.above_slider (ev.y))
2055# ifdef RXVT_SCROLL_FULL 2118# ifdef RXVT_SCROLL_FULL
2056 scr_page (UP, nrow - 1); 2119 scr_page (UP, nrow - 1);
2057# else 2120# else
2058 scr_page (UP, nrow / 4); 2121 scr_page (UP, nrow / 4);
2059# endif 2122# endif
2060 else if (scrollbar_below_slider (ev.y)) 2123 else if (scrollBar.below_slider (ev.y))
2061# ifdef RXVT_SCROLL_FULL 2124# ifdef RXVT_SCROLL_FULL
2062 scr_page (DN, nrow - 1); 2125 scr_page (DN, nrow - 1);
2063# else 2126# else
2064 scr_page (DN, nrow / 4); 2127 scr_page (DN, nrow / 4);
2065# endif 2128# endif
2066 else 2129 else
2067 scrollBar.state = STATE_MOTION; 2130 scrollBar.state = SB_STATE_MOTION;
2068 } 2131 }
2069 else 2132 else
2070 { 2133 {
2071 scr_page ((ev.button == Button1 ? DN : UP), 2134 scr_page ((ev.button == Button1 ? DN : UP),
2072 (nrow 2135 (nrow
2073 * scrollbar_position (ev.y) 2136 * scrollBar.position (ev.y)
2074 / scrollBar.size ())); 2137 / scrollBar.size ()));
2075 } 2138 }
2076 2139
2077 break; 2140 break;
2078 } 2141 }
… …
2089 2152
2090 csrO = 0; /* reset csr Offset */ 2153 csrO = 0; /* reset csr Offset */
2091 if (!bypass_keystate) 2154 if (!bypass_keystate)
2092 reportmode = !! (priv_modes & PrivMode_mouse_report); 2155 reportmode = !! (priv_modes & PrivMode_mouse_report);
2093 2156
2094 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2157 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2095 { 2158 {
2096 scrollBar.state = STATE_IDLE; 2159 scrollBar.state = SB_STATE_IDLE;
2097 scrollBar.show (0); 2160 scrollBar.show (0);
2098 } 2161 }
2099 2162
2100#ifdef SELECTION_SCROLLING 2163#ifdef SELECTION_SCROLLING
2101 sel_scroll_ev.stop(); 2164 sel_scroll_ev.stop();
… …
2151 case Button3: 2214 case Button3:
2152 selection_make (ev.time); 2215 selection_make (ev.time);
2153 break; 2216 break;
2154 2217
2155 case Button2: 2218 case Button2:
2156 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2219 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2157 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2220 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2158 break; 2221 break;
2159 2222
2160#ifdef MOUSE_WHEEL 2223#ifdef MOUSE_WHEEL
2161 case Button4: 2224 case Button4:
2162 case Button5: 2225 case Button5:
2163 { 2226 {
2164 int i; 2227 int lines;
2165 page_dirn v; 2228 page_dirn dirn;
2166 2229
2167 v = ev.button == Button4 ? UP : DN; 2230 dirn = ev.button == Button4 ? UP : DN;
2168 2231
2169 if (ev.state & ShiftMask) 2232 if (ev.state & ShiftMask)
2170 i = 1; 2233 lines = 1;
2171 else if (option (Opt_mouseWheelScrollPage)) 2234 else if (option (Opt_mouseWheelScrollPage))
2172 i = nrow - 1; 2235 lines = nrow - 1;
2173 else 2236 else
2174 i = 5; 2237 lines = 5;
2175 2238
2176# ifdef MOUSE_SLIP_WHEELING 2239# ifdef MOUSE_SLIP_WHEELING
2177 if (ev.state & ControlMask) 2240 if (ev.state & ControlMask)
2178 { 2241 {
2179 mouse_slip_wheel_speed += v ? -1 : 1; 2242 mouse_slip_wheel_speed += dirn;
2180 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2243 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2181 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2182 2244
2183 if (!slip_wheel_ev.is_active ()) 2245 if (!slip_wheel_ev.is_active ())
2184 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2246 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2185 } 2247 }
2186 else 2248 else
2187# endif 2249# endif
2188 { 2250 {
2189 scr_page (v, i); 2251 scr_page (dirn, lines);
2190 scrollBar.show (1); 2252 scrollBar.show (1);
2191 } 2253 }
2192 } 2254 }
2193 break; 2255 break;
2194#endif 2256#endif
… …
2196 } 2258 }
2197} 2259}
2198 2260
2199/*}}} */ 2261/*}}} */
2200 2262
2201void 2263void ecb_hot
2202rxvt_term::cmd_parse () 2264rxvt_term::cmd_parse ()
2203{ 2265{
2204 wchar_t ch = NOCHAR; 2266 wchar_t ch = NOCHAR;
2205 char *seq_begin; // remember start of esc-sequence here 2267 char *seq_begin; // remember start of esc-sequence here
2206 2268
2207 for (;;) 2269 for (;;)
2208 { 2270 {
2209 if (expect_false (ch == NOCHAR)) 2271 if (ecb_unlikely (ch == NOCHAR))
2210 { 2272 {
2211 seq_begin = cmdbuf_ptr; 2273 seq_begin = cmdbuf_ptr;
2212 ch = next_char (); 2274 ch = next_char ();
2213 2275
2214 if (ch == NOCHAR) 2276 if (ch == NOCHAR)
2215 break; 2277 break;
2216 } 2278 }
2217 2279
2218 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)) 2280 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2219 { 2281 {
2220 if (expect_false (!seen_input)) 2282 if (ecb_unlikely (!seen_input))
2221 { 2283 {
2222 seen_input = 1; 2284 seen_input = 1;
2223 // many badly-written programs (e.g. jed) contain a race condition: 2285 // many badly-written programs (e.g. jed) contain a race condition:
2224 // they first read the screensize and then install a SIGWINCH handler. 2286 // they first read the screensize and then install a SIGWINCH handler.
2225 // some window managers resize the window early, and these programs 2287 // some window managers resize the window early, and these programs
… …
2238 wchar_t *str = buf; 2300 wchar_t *str = buf;
2239 wchar_t *eol = str + min (ncol, UBUFSIZ); 2301 wchar_t *eol = str + min (ncol, UBUFSIZ);
2240 2302
2241 for (;;) 2303 for (;;)
2242 { 2304 {
2243 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))) 2305 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2244 break; 2306 break;
2245 2307
2246 *str++ = ch; 2308 *str++ = ch;
2247 2309
2248 if (expect_false (ch == C0_LF || str >= eol)) 2310 if (ecb_unlikely (ch == C0_LF || str >= eol))
2249 { 2311 {
2250 if (ch == C0_LF) 2312 if (ch == C0_LF)
2251 nlines++; 2313 nlines++;
2252 2314
2253 refresh_count++; 2315 refresh_count++;
… …
2325 } 2387 }
2326 } 2388 }
2327} 2389}
2328 2390
2329// read the next character 2391// read the next character
2330wchar_t 2392wchar_t ecb_hot
2331rxvt_term::next_char () NOTHROW 2393rxvt_term::next_char () NOTHROW
2332{ 2394{
2333 while (cmdbuf_ptr < cmdbuf_endp) 2395 while (cmdbuf_ptr < cmdbuf_endp)
2334 { 2396 {
2335 // assume 7-bit to be ascii ALWAYS 2397 // assume 7-bit to be ascii ALWAYS
2336 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2398 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2337 return *cmdbuf_ptr++; 2399 return *cmdbuf_ptr++;
2338 2400
2339 wchar_t wc; 2401 wchar_t wc;
2340 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2402 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2341 2403
… …
2347 } 2409 }
2348 2410
2349 if (len == (size_t)-1) 2411 if (len == (size_t)-1)
2350 { 2412 {
2351 mbstate.reset (); // reset now undefined conversion state 2413 mbstate.reset (); // reset now undefined conversion state
2414 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2415 // in which case we "erroneously" return the next byte which might be valid.
2352 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2416 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2353 } 2417 }
2354 2418
2355 // assume wchar == unicode 2419 // assume wchar == unicode
2356 cmdbuf_ptr += len; 2420 cmdbuf_ptr += len;
… …
2359 2423
2360 return NOCHAR; 2424 return NOCHAR;
2361} 2425}
2362 2426
2363// read the next octet 2427// read the next octet
2364uint32_t 2428uint32_t ecb_hot
2365rxvt_term::next_octet () NOTHROW 2429rxvt_term::next_octet () NOTHROW
2366{ 2430{
2367 return cmdbuf_ptr < cmdbuf_endp 2431 return cmdbuf_ptr < cmdbuf_endp
2368 ? (unsigned char)*cmdbuf_ptr++ 2432 ? (unsigned char)*cmdbuf_ptr++
2369 : NOCHAR; 2433 : NOCHAR;
2370} 2434}
2371 2435
2372static class out_of_input out_of_input; 2436static class out_of_input out_of_input;
2373 2437
2374/* rxvt_cmd_getc () - Return next input character */ 2438wchar_t ecb_hot
2375/*
2376 * Return the next input character after first passing any keyboard input
2377 * to the command.
2378 */
2379wchar_t
2380rxvt_term::cmd_getc () THROW ((class out_of_input)) 2439rxvt_term::cmd_getc () THROW ((class out_of_input))
2381{ 2440{
2382 wchar_t c = next_char (); 2441 wchar_t c = next_char ();
2383 2442
2384 if (c == NOCHAR) 2443 if (c == NOCHAR)
2385 throw out_of_input; 2444 throw out_of_input;
2386 2445
2387 return c; 2446 return c;
2388} 2447}
2389 2448
2390uint32_t 2449uint32_t ecb_hot
2391rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2450rxvt_term::cmd_get8 () THROW ((class out_of_input))
2392{ 2451{
2393 uint32_t c = next_octet (); 2452 uint32_t c = next_octet ();
2394 2453
2395 if (c == NOCHAR) 2454 if (c == NOCHAR)
… …
2399} 2458}
2400 2459
2401/*{{{ print pipe */ 2460/*{{{ print pipe */
2402/*----------------------------------------------------------------------*/ 2461/*----------------------------------------------------------------------*/
2403#ifdef PRINTPIPE 2462#ifdef PRINTPIPE
2404FILE * 2463FILE * ecb_cold
2405rxvt_term::popen_printer () 2464rxvt_term::popen_printer ()
2406{ 2465{
2407 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w"); 2466 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2408 2467
2409 if (stream == NULL) 2468 if (stream == NULL)
2410 rxvt_warn ("can't open printer pipe, not printing.\n"); 2469 rxvt_warn ("can't open printer pipe, not printing.\n");
2411 2470
2412 return stream; 2471 return stream;
2413} 2472}
2414 2473
2415int 2474int ecb_cold
2416rxvt_term::pclose_printer (FILE *stream) 2475rxvt_term::pclose_printer (FILE *stream)
2417{ 2476{
2418 fflush (stream); 2477 fflush (stream);
2419 return pclose (stream); 2478 return pclose (stream);
2420} 2479}
2421 2480
2422/* 2481/*
2423 * simulate attached vt100 printer 2482 * simulate attached vt100 printer
2424 */ 2483 */
2425void 2484void ecb_cold
2426rxvt_term::process_print_pipe () 2485rxvt_term::process_print_pipe ()
2427{ 2486{
2428 FILE *fd = popen_printer (); 2487 FILE *fd = popen_printer ();
2429 2488
2430 if (!fd) 2489 if (!fd)
… …
2476 pclose_printer (fd); 2535 pclose_printer (fd);
2477} 2536}
2478#endif /* PRINTPIPE */ 2537#endif /* PRINTPIPE */
2479/*}}} */ 2538/*}}} */
2480 2539
2481/* *INDENT-OFF* */
2482enum { 2540enum {
2483 C1_40 = 0x40, 2541 C1_40 = 0x40,
2484 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2542 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2485 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2543 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2486 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2544 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2487 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2545 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2488}; 2546};
2489/* *INDENT-ON* */
2490 2547
2491/*{{{ process non-printing single characters */ 2548/*{{{ process non-printing single characters */
2492void 2549void ecb_hot
2493rxvt_term::process_nonprinting (unicode_t ch) 2550rxvt_term::process_nonprinting (unicode_t ch)
2494{ 2551{
2495 switch (ch) 2552 switch (ch)
2496 { 2553 {
2497 case C0_ESC: 2554 case C0_ESC:
… …
2543} 2600}
2544/*}}} */ 2601/*}}} */
2545 2602
2546 2603
2547/*{{{ process VT52 escape sequences */ 2604/*{{{ process VT52 escape sequences */
2548void 2605void ecb_cold
2549rxvt_term::process_escape_vt52 (unicode_t ch) 2606rxvt_term::process_escape_vt52 (unicode_t ch)
2550{ 2607{
2551 int row, col; 2608 int row, col;
2552 2609
2553 switch (ch) 2610 switch (ch)
… …
2587 break; 2644 break;
2588 case 'Z': /* identify the terminal type */ 2645 case 'Z': /* identify the terminal type */
2589 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2646 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2590 break; 2647 break;
2591 case '<': /* turn off VT52 mode */ 2648 case '<': /* turn off VT52 mode */
2592 set_privmode (PrivMode_vt52, 0); 2649 priv_modes &= ~PrivMode_vt52;
2593 break; 2650 break;
2594 case 'F': /* use special graphics character set */ 2651 case 'F': /* use special graphics character set */
2595 case 'G': /* use regular character set */ 2652 case 'G': /* use regular character set */
2596 /* unimplemented */ 2653 /* unimplemented */
2597 break; 2654 break;
… …
2603} 2660}
2604/*}}} */ 2661/*}}} */
2605 2662
2606 2663
2607/*{{{ process escape sequences */ 2664/*{{{ process escape sequences */
2608void 2665void ecb_hot
2609rxvt_term::process_escape_seq () 2666rxvt_term::process_escape_seq ()
2610{ 2667{
2611 unicode_t ch = cmd_getc (); 2668 unicode_t ch = cmd_getc ();
2612 2669
2613 if (priv_modes & PrivMode_vt52) 2670 if (priv_modes & PrivMode_vt52)
… …
2616 return; 2673 return;
2617 } 2674 }
2618 2675
2619 switch (ch) 2676 switch (ch)
2620 { 2677 {
2621 /* case 1: do_tek_mode (); break; */
2622 case '#': 2678 case '#':
2623 if (cmd_getc () == '8') 2679 if (cmd_getc () == '8')
2624 scr_E (); 2680 scr_E ();
2625 break; 2681 break;
2626 case '(': 2682 case '(':
… …
2649#if !ENABLE_MINIMAL 2705#if !ENABLE_MINIMAL
2650 case '9': 2706 case '9':
2651 scr_forwardindex (); 2707 scr_forwardindex ();
2652 break; 2708 break;
2653#endif 2709#endif
2710 // DECPAM/DECPNM
2654 case '=': 2711 case '=':
2712 priv_modes |= PrivMode_aplKP;
2713 break;
2655 case '>': 2714 case '>':
2656 set_privmode (PrivMode_aplKP, ch == '='); 2715 priv_modes &= ~PrivMode_aplKP;
2657 break; 2716 break;
2658 2717
2659 case C1_40: 2718 case C1_40:
2660 cmd_getc (); 2719 cmd_getc ();
2661 break; 2720 break;
… …
2665 2724
2666 /* 8.3.87: NEXT LINE */ 2725 /* 8.3.87: NEXT LINE */
2667 case C1_NEL: /* ESC E */ 2726 case C1_NEL: /* ESC E */
2668 { 2727 {
2669 wchar_t nlcr[] = { C0_LF, C0_CR }; 2728 wchar_t nlcr[] = { C0_LF, C0_CR };
2670 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2729 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2671 } 2730 }
2672 break; 2731 break;
2673 2732
2674 /* kidnapped escape sequence: Should be 8.3.48 */ 2733 /* kidnapped escape sequence: Should be 8.3.48 */
2675 case C1_ESA: /* ESC G */ 2734 case C1_ESA: /* ESC G */
2676 process_graphics (); 2735 // used by original rxvt for rob nations own graphics mode
2736 if (cmd_getc () == 'Q')
2737 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2677 break; 2738 break;
2678 2739
2679 /* 8.3.63: CHARACTER TABULATION SET */ 2740 /* 8.3.63: CHARACTER TABULATION SET */
2680 case C1_HTS: /* ESC H */ 2741 case C1_HTS: /* ESC H */
2681 scr_set_tab (1); 2742 scr_set_tab (1);
… …
2685 case C1_RI: /* ESC M */ 2746 case C1_RI: /* ESC M */
2686 scr_index (DN); 2747 scr_index (DN);
2687 break; 2748 break;
2688 2749
2689 /* 8.3.142: SINGLE-SHIFT TWO */ 2750 /* 8.3.142: SINGLE-SHIFT TWO */
2690 /*case C1_SS2: scr_single_shift (2); break; */ 2751 /* case C1_SS2: break; */
2691 2752
2692 /* 8.3.143: SINGLE-SHIFT THREE */ 2753 /* 8.3.143: SINGLE-SHIFT THREE */
2693 /*case C1_SS3: scr_single_shift (3); break; */ 2754 /* case C1_SS3: break; */
2694 2755
2695 /* 8.3.27: DEVICE CONTROL STRING */ 2756 /* 8.3.27: DEVICE CONTROL STRING */
2696 case C1_DCS: /* ESC P */ 2757 case C1_DCS: /* ESC P */
2697 process_dcs_seq (); 2758 process_dcs_seq ();
2698 break; 2759 break;
… …
2731 } 2792 }
2732} 2793}
2733/*}}} */ 2794/*}}} */
2734 2795
2735/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2796/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2736/* *INDENT-OFF* */
2737enum { 2797enum {
2738 CSI_ICH = 0x40, 2798 CSI_ICH = 0x40,
2739 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2799 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2740 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2800 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2741 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2801 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2744 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2804 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2745 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2805 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2746 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2806 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2747}; 2807};
2748 2808
2749#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2809#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2750 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2810 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2751 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2811 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2752#define get_byte_array_bit(array, bit) \ 2812#define get_byte_array_bit(array, bit) \
2753 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2813 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2754 2814
2755const unsigned char csi_defaults[] = 2815static const unsigned char csi_defaults[] =
2756 { 2816 {
2757 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2817 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2758 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2818 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2759 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2819 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2760 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2820 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2761 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2821 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2762 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2822 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2763 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2823 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2764 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2824 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2765 }; 2825 };
2766/* *INDENT-ON* */
2767 2826
2768void 2827void ecb_hot
2769rxvt_term::process_csi_seq () 2828rxvt_term::process_csi_seq ()
2770{ 2829{
2771 unicode_t ch, priv, i; 2830 unicode_t ch, priv, prev_ch, i;
2772 unsigned int nargs, p; 2831 unsigned int nargs, p;
2773 int n, ndef; 2832 int n, ndef;
2774 int arg[ESC_ARGS] = { }; 2833 int arg[ESC_ARGS] = { };
2775 2834
2776 nargs = 0; 2835 nargs = 0;
… …
2782 /* '<' '=' '>' '?' '!' */ 2841 /* '<' '=' '>' '?' '!' */
2783 priv = ch; 2842 priv = ch;
2784 ch = cmd_getc (); 2843 ch = cmd_getc ();
2785 } 2844 }
2786 2845
2846 prev_ch = 0;
2787 /* read any numerical arguments */ 2847 /* read any numerical arguments */
2788 for (n = -1; ch < CSI_ICH; ) 2848 for (n = -1; ch < CSI_ICH; )
2789 { 2849 {
2790 if (isdigit (ch)) 2850 if (isdigit (ch))
2791 { 2851 {
… …
2801 n = -1; 2861 n = -1;
2802 } 2862 }
2803 else if (IS_CONTROL (ch)) 2863 else if (IS_CONTROL (ch))
2804 process_nonprinting (ch); 2864 process_nonprinting (ch);
2805 2865
2866 prev_ch = ch;
2806 ch = cmd_getc (); 2867 ch = cmd_getc ();
2807 } 2868 }
2808 2869
2809 if (ch > CSI_7F) 2870 if (ch > CSI_7F)
2810 return; 2871 return;
… …
2849 { 2910 {
2850 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2911 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2851 scr_soft_reset (); 2912 scr_soft_reset ();
2852 2913
2853 static const int pm_h[] = { 7, 25 }; 2914 static const int pm_h[] = { 7, 25 };
2854 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 }; 2915 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2855 2916
2856 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h); 2917 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2857 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l); 2918 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2858 } 2919 }
2859 break; 2920 break;
2860 } 2921 }
2861 2922
2862 return; 2923 return;
… …
2880 } 2941 }
2881 break; 2942 break;
2882#endif 2943#endif
2883 2944
2884 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2945 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2885 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2946 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2886 arg[0] = -arg[0]; 2947 arg[0] = -arg[0];
2887 /* FALLTHROUGH */ 2948 /* FALLTHROUGH */
2888 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2949 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2889 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2950 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2890 scr_gotorc (arg[0], 0, RELATIVE); 2951 scr_gotorc (arg[0], 0, RELATIVE);
2891 break; 2952 break;
2892 2953
2893 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2954 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2894 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2955 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3044 scr_insert_mode (1); 3105 scr_insert_mode (1);
3045 else if (arg[0] == 20) 3106 else if (arg[0] == 20)
3046 priv_modes |= PrivMode_LFNL; 3107 priv_modes |= PrivMode_LFNL;
3047 break; 3108 break;
3048 3109
3110 case CSI_71: // DESCUSR: set cursor style
3111 if (prev_ch == ' ')
3112 set_cursor_style (arg[0]);
3113 break;
3114
3049 /* 3115 /*
3050 * PRIVATE USE beyond this point. All CSI_7? sequences here 3116 * PRIVATE USE beyond this point. All CSI_7? sequences here
3051 */ 3117 */
3052 case CSI_72: /* DECSTBM: set top and bottom margins */ 3118 case CSI_72: /* DECSTBM: set top and bottom margins */
3053 if (nargs == 1) 3119 if (nargs == 1)
… …
3081 } 3147 }
3082} 3148}
3083/*}}} */ 3149/*}}} */
3084 3150
3085#if !ENABLE_MINIMAL 3151#if !ENABLE_MINIMAL
3086/* ARGSUSED */
3087void 3152void
3088rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3153rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3089{ 3154{
3090 int x, y; 3155 int x, y;
3091 XWindowAttributes wattr; 3156 XWindowAttributes wattr;
… …
3100 { 3165 {
3101 /* 3166 /*
3102 * commands 3167 * commands
3103 */ 3168 */
3104 case 1: /* deiconify window */ 3169 case 1: /* deiconify window */
3105 XMapWindow (dpy, parent[0]); 3170 XMapWindow (dpy, parent);
3106 break; 3171 break;
3107 case 2: /* iconify window */ 3172 case 2: /* iconify window */
3108 XIconifyWindow (dpy, parent[0], display->screen); 3173 XIconifyWindow (dpy, parent, display->screen);
3109 break; 3174 break;
3110 case 3: /* set position (pixels) */ 3175 case 3: /* set position (pixels) */
3111 XMoveWindow (dpy, parent[0], args[1], args[2]); 3176 XMoveWindow (dpy, parent, args[1], args[2]);
3112 break; 3177 break;
3113 case 4: /* set size (pixels) */ 3178 case 4: /* set size (pixels) */
3114 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3179 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3115 break; 3180 break;
3116 case 5: /* raise window */ 3181 case 5: /* raise window */
3117 XRaiseWindow (dpy, parent[0]); 3182 XRaiseWindow (dpy, parent);
3118 break; 3183 break;
3119 case 6: /* lower window */ 3184 case 6: /* lower window */
3120 XLowerWindow (dpy, parent[0]); 3185 XLowerWindow (dpy, parent);
3121 break; 3186 break;
3122 case 7: /* refresh window */ 3187 case 7: /* refresh window */
3123 scr_touch (true); 3188 scr_touch (true);
3124 break; 3189 break;
3125 case 8: /* set size (chars) */ 3190 case 8: /* set size (chars) */
… …
3128 break; 3193 break;
3129 3194
3130 //case 9: NYI, TODO, restore maximized window or maximize window 3195 //case 9: NYI, TODO, restore maximized window or maximize window
3131 default: 3196 default:
3132 if (args[0] >= 24) /* set height (chars) */ 3197 if (args[0] >= 24) /* set height (chars) */
3133 set_widthheight ((unsigned int)width, 3198 set_widthheight ((unsigned int)vt_width,
3134 (unsigned int) (args[1] * fheight)); 3199 (unsigned int) (args[1] * fheight));
3135 break; 3200 break;
3136 3201
3137 /* 3202 /*
3138 * reports - some output format copied from XTerm 3203 * reports - some output format copied from XTerm
3139 */ 3204 */
3140 case 11: /* report window state */ 3205 case 11: /* report window state */
3141 XGetWindowAttributes (dpy, parent[0], &wattr); 3206 XGetWindowAttributes (dpy, parent, &wattr);
3142 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3207 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3143 break; 3208 break;
3144 case 13: /* report window position */ 3209 case 13: /* report window position */
3145 XGetWindowAttributes (dpy, parent[0], &wattr); 3210 XGetWindowAttributes (dpy, parent, &wattr);
3146 XTranslateCoordinates (dpy, parent[0], wattr.root, 3211 XTranslateCoordinates (dpy, parent, wattr.root,
3147 -wattr.border_width, -wattr.border_width, 3212 -wattr.border_width, -wattr.border_width,
3148 &x, &y, &wdummy); 3213 &x, &y, &wdummy);
3149 tt_printf ("\033[3;%d;%dt", x, y); 3214 tt_printf ("\033[3;%d;%dt", x, y);
3150 break; 3215 break;
3151 case 14: /* report window size (pixels) */ 3216 case 14: /* report window size (pixels) */
3152 XGetWindowAttributes (dpy, parent[0], &wattr); 3217 XGetWindowAttributes (dpy, parent, &wattr);
3153 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3218 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3154 break; 3219 break;
3155 case 18: /* report text area size (chars) */ 3220 case 18: /* report text area size (chars) */
3156 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3221 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3157 break; 3222 break;
… …
3159 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3224 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3160 break; 3225 break;
3161 case 20: /* report icon label */ 3226 case 20: /* report icon label */
3162 { 3227 {
3163 char *s; 3228 char *s;
3164 XGetIconName (dpy, parent[0], &s); 3229 XGetIconName (dpy, parent, &s);
3165 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3230 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3166 XFree (s); 3231 XFree (s);
3167 } 3232 }
3168 break; 3233 break;
3169 case 21: /* report window title */ 3234 case 21: /* report window title */
3170 { 3235 {
3171 char *s; 3236 char *s;
3172 XFetchName (dpy, parent[0], &s); 3237 XFetchName (dpy, parent, &s);
3173 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3238 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3174 XFree (s); 3239 XFree (s);
3175 } 3240 }
3176 break; 3241 break;
3177 } 3242 }
… …
3187rxvt_term::get_to_st (unicode_t &ends_how) 3252rxvt_term::get_to_st (unicode_t &ends_how)
3188{ 3253{
3189 unicode_t ch; 3254 unicode_t ch;
3190 bool seen_esc = false; 3255 bool seen_esc = false;
3191 unsigned int n = 0; 3256 unsigned int n = 0;
3192 wchar_t string[STRING_MAX]; 3257 wchar_t string[CBUFSIZ];
3193 3258
3194 while ((ch = cmd_getc ()) != NOCHAR) 3259 while ((ch = cmd_getc ()) != NOCHAR)
3195 { 3260 {
3196 if (seen_esc) 3261 if (seen_esc)
3197 { 3262 {
… …
3212 else if (ch < 0x20) 3277 else if (ch < 0x20)
3213 return NULL; /* other control character - exit */ 3278 return NULL; /* other control character - exit */
3214 3279
3215 seen_esc = false; 3280 seen_esc = false;
3216 3281
3217 if (n >= STRING_MAX - 1) 3282 if (n >= sizeof (string) - 1)
3218 // stop at some sane length 3283 // stop at some sane length
3219 return NULL; 3284 return NULL;
3220 3285
3221 string[n++] = ch; 3286 string[n++] = ch;
3222 } 3287 }
… …
3331 unsigned long bytes_after; 3396 unsigned long bytes_after;
3332 unsigned char *value = 0; 3397 unsigned char *value = 0;
3333 const char *str = ""; 3398 const char *str = "";
3334 3399
3335 if (prop 3400 if (prop
3336 && XGetWindowProperty (dpy, parent[0], 3401 && XGetWindowProperty (dpy, parent,
3337 prop, 0, 1<<16, 0, AnyPropertyType, 3402 prop, 0, 1<<16, 0, AnyPropertyType,
3338 &actual_type, &actual_format, 3403 &actual_type, &actual_format,
3339 &nitems, &bytes_after, &value) == Success 3404 &nitems, &bytes_after, &value) == Success
3340 && actual_type != None 3405 && actual_type != None
3341 && actual_format == 8) 3406 && actual_format == 8)
3342 str = (const char *)(value); 3407 str = (const char *)(value);
3343 3408
3344 tt_printf ("\033]%d;%s%c", op, str, resp); 3409 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3345 3410
3346 XFree (value); 3411 XFree (value);
3347 } 3412 }
3348 else 3413 else
3349 { 3414 {
… …
3353 { 3418 {
3354 *eq = 0; 3419 *eq = 0;
3355 set_utf8_property (display->atom (str), eq + 1); 3420 set_utf8_property (display->atom (str), eq + 1);
3356 } 3421 }
3357 else 3422 else
3358 XDeleteProperty (dpy, parent[0], 3423 XDeleteProperty (dpy, parent,
3359 display->atom (str)); 3424 display->atom (str));
3360 } 3425 }
3361 break; 3426 break;
3362 3427
3363 case XTerm_Color: 3428 case XTerm_Color:
… …
3417 break; 3482 break;
3418#endif 3483#endif
3419 case URxvt_Color_border: 3484 case URxvt_Color_border:
3420 process_color_seq (op, Color_border, str, resp); 3485 process_color_seq (op, Color_border, str, resp);
3421 break; 3486 break;
3422#if ENABLE_TRANSPARENCY 3487
3488#if BG_IMAGE_FROM_ROOT
3423 case URxvt_Color_tint: 3489 case URxvt_Color_tint:
3424 process_color_seq (op, Color_tint, str, resp); 3490 process_color_seq (op, Color_tint, str, resp);
3425 { 3491 {
3426 bool changed = false; 3492 bool changed = false;
3427 3493
3428 if (ISSET_PIXCOLOR (Color_tint)) 3494 if (ISSET_PIXCOLOR (Color_tint))
3429 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3495 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3430 else
3431 changed = bgPixmap.unset_tint ();
3432 3496
3433 if (changed) 3497 if (changed)
3434 update_background (); 3498 update_background ();
3435 } 3499 }
3436 3500
… …
3440#if BG_IMAGE_FROM_FILE 3504#if BG_IMAGE_FROM_FILE
3441 case Rxvt_Pixmap: 3505 case Rxvt_Pixmap:
3442 if (!strcmp (str, "?")) 3506 if (!strcmp (str, "?"))
3443 { 3507 {
3444 char str[256]; 3508 char str[256];
3509 int h_scale = fimage.h_scale;
3510 int v_scale = fimage.v_scale;
3511 int h_align = fimage.h_align;
3512 int v_align = fimage.v_align;
3445 3513
3446 sprintf (str, "[%dx%d+%d+%d]", 3514 sprintf (str, "[%dx%d+%d+%d]",
3447 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3515 h_scale, v_scale,
3448 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3516 h_align, v_align);
3449 process_xterm_seq (XTerm_title, str, CHAR_ST); 3517 process_xterm_seq (XTerm_title, str, CHAR_ST);
3450 } 3518 }
3451 else 3519 else
3452 { 3520 {
3453 int changed = 0; 3521 bool changed = false;
3454 3522
3455 if (*str != ';') 3523 if (*str != ';')
3456 { 3524 {
3457 /* reset to default scaling :*/ 3525 try
3458 bgPixmap.unset_geometry (); 3526 {
3459 if (bgPixmap.set_file (str)) /* change pixmap */ 3527 fimage.set_file_geometry (this, str);
3460 changed++; 3528 changed = true;
3461 str = strchr (str, ';'); 3529 }
3462 if (str == NULL) 3530 catch (const class rxvt_failure_exception &e)
3463 bgPixmap.set_defaultGeometry (); 3531 {
3532 }
3464 } 3533 }
3465 3534 else
3466 while (str)
3467 { 3535 {
3468 str++; 3536 str++;
3469 if (bgPixmap.set_geometry (str)) 3537 if (fimage.set_geometry (str, true))
3470 changed++; 3538 changed = true;
3471 str = strchr (str, ';');
3472 } 3539 }
3473 3540
3474 if (changed) 3541 if (changed)
3542 {
3543 if (bg_window_position_sensitive ())
3544 {
3545 int x, y;
3546 get_window_origin (x, y);
3547 parent_x = x;
3548 parent_y = y;
3549 }
3475 update_background (); 3550 update_background ();
3551 }
3476 } 3552 }
3477 break; 3553 break;
3478#endif 3554#endif
3479 3555
3480 case XTerm_logfile: 3556 case XTerm_logfile:
… …
3567 * 's' = save 3643 * 's' = save
3568 * 'r' = restore 3644 * 'r' = restore
3569 * 't' = toggle 3645 * 't' = toggle
3570 * so no need for fancy checking 3646 * so no need for fancy checking
3571 */ 3647 */
3572int 3648int ecb_cold
3573rxvt_term::privcases (int mode, unsigned long bit) 3649rxvt_term::privcases (int mode, unsigned long bit)
3574{ 3650{
3575 int state; 3651 int state;
3576 3652
3577 if (mode == 's') 3653 if (mode == 's')
3578 { 3654 {
3579 SavedModes |= (priv_modes & bit); 3655 if (priv_modes & bit)
3656 SavedModes |= bit;
3657 else
3658 SavedModes &= ~bit;
3580 return -1; 3659 return -1;
3581 } 3660 }
3582 else 3661 else
3583 { 3662 {
3584 if (mode == 'r') 3663 if (mode == 'r')
3585 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3664 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3586 else 3665 else
3587 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3666 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3588 3667
3589 set_privmode (bit, state); 3668 if (state)
3669 priv_modes |= bit;
3670 else
3671 priv_modes &= ~bit;
3590 } 3672 }
3591 3673
3592 return state; 3674 return state;
3593} 3675}
3594 3676
3595/* we're not using priv _yet_ */ 3677/* we're not using priv _yet_ */
3596void 3678void
3597rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3679rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3598{ 3680{
3599 unsigned int i, j; 3681 unsigned int i, j;
3600 int state; 3682 int state;
3601 3683
3602 static const struct 3684 static const struct
3603 { 3685 {
3604 const int argval; 3686 const int argval;
3605 const unsigned long bit; 3687 const unsigned long bit;
3606 } argtopriv[] = { 3688 } argtopriv[] = {
3607 { 1, PrivMode_aplCUR }, // DECCKM 3689 { 1, PrivMode_aplCUR }, // DECCKM
3608 { 2, PrivMode_vt52 }, 3690 { 2, PrivMode_vt52 }, // DECANM
3609 { 3, PrivMode_132 }, // DECCOLM 3691 { 3, PrivMode_132 }, // DECCOLM
3610 { 4, PrivMode_smoothScroll }, // DECSCLM 3692 { 4, PrivMode_smoothScroll }, // DECSCLM
3611 { 5, PrivMode_rVideo }, // DECSCNM 3693 { 5, PrivMode_rVideo }, // DECSCNM
3612 { 6, PrivMode_relOrigin }, // DECOM 3694 { 6, PrivMode_relOrigin }, // DECOM
3613 { 7, PrivMode_Autowrap }, // DECAWM 3695 { 7, PrivMode_Autowrap }, // DECAWM
3614 // 8, auto-repeat keys // DECARM 3696 // 8, auto-repeat keys // DECARM
3615 { 9, PrivMode_MouseX10 }, 3697 { 9, PrivMode_MouseX10 },
3616 // 18 end FF to printer after print screen 3698 // 18 end FF to printer after print screen
3617 // 19 Print screen prints full screen/scroll region 3699 // 19 Print screen prints full screen/scroll region
3618 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3700 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3619#ifdef scrollBar_esc 3701#ifdef scrollBar_esc
3620 { scrollBar_esc, PrivMode_scrollBar }, 3702 { scrollBar_esc, PrivMode_scrollBar },
3621#endif 3703#endif
3622 { 35, PrivMode_ShiftKeys }, // rxvt extension 3704 { 35, PrivMode_ShiftKeys }, // rxvt extension
3623 // 38, tektronix mode // DECTEK 3705 // 38, tektronix mode // DECTEK
3624 { 40, PrivMode_132OK }, 3706 { 40, PrivMode_132OK },
3625 // 41 xterm more fixes NYI 3707 // 41 xterm more fixes NYI
3626 // 45 margin bell NYI 3708 // 45 margin bell NYI
3627 // 46 start logging 3709 // 46 start logging
3628 { 47, PrivMode_Screen }, 3710 { 47, PrivMode_Screen },
3629 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3711 { 66, PrivMode_aplKP }, // DECNKM
3630#ifndef NO_BACKSPACE_KEY 3712#ifndef NO_BACKSPACE_KEY
3631 { 67, PrivMode_BackSpace }, // DECBKM 3713 { 67, PrivMode_BackSpace }, // DECBKM
3632#endif 3714#endif
3633 { 1000, PrivMode_MouseX11 }, 3715 { 1000, PrivMode_MouseX11 },
3634 { 1002, PrivMode_MouseBtnEvent }, 3716 { 1002, PrivMode_MouseBtnEvent },
3635 { 1003, PrivMode_MouseAnyEvent }, 3717 { 1003, PrivMode_MouseAnyEvent },
3718#if ENABLE_FRILLS
3719 { 1005, PrivMode_ExtModeMouse },
3720#endif
3636 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3721 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3637 { 1011, PrivMode_Keypress }, // rxvt extension 3722 { 1011, PrivMode_Keypress }, // rxvt extension
3723#if ENABLE_FRILLS
3724 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3725#endif
3638 // 1035 enable modifiers for alt, numlock NYI 3726 // 1035 enable modifiers for alt, numlock NYI
3639 // 1036 send ESC for meta keys NYI 3727 // 1036 send ESC for meta keys NYI
3640 // 1037 send DEL for keypad delete NYI 3728 // 1037 send DEL for keypad delete NYI
3641 { 1047, PrivMode_Screen }, 3729 { 1047, PrivMode_Screen },
3642 // 1048 save and restore cursor 3730 // 1048 save and restore cursor, implemented in code
3643 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3731 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3644 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3732 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3645 { 2004, PrivMode_BracketPaste }, 3733 { 2004, PrivMode_BracketPaste },
3646 }; 3734 };
3647 3735
… …
3657 for (i = 0; i < nargs; i++) 3745 for (i = 0; i < nargs; i++)
3658 { 3746 {
3659 state = -1; 3747 state = -1;
3660 3748
3661 /* basic handling */ 3749 /* basic handling */
3662 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3750 for (j = 0; j < ecb_array_length (argtopriv); j++)
3663 if (argtopriv[j].argval == arg[i]) 3751 if (argtopriv[j].argval == arg[i])
3664 { 3752 {
3665 state = privcases (mode, argtopriv[j].bit); 3753 state = privcases (mode, argtopriv[j].bit);
3666 break; 3754 break;
3667 } 3755 }
… …
3693 case 2: /* VT52 mode */ 3781 case 2: /* VT52 mode */
3694 /* oddball mode. should be set regardless of set/reset 3782 /* oddball mode. should be set regardless of set/reset
3695 * parameter. Return from VT52 mode with an ESC < from 3783 * parameter. Return from VT52 mode with an ESC < from
3696 * within VT52 mode 3784 * within VT52 mode
3697 */ 3785 */
3698 set_privmode (PrivMode_vt52, 1); 3786 priv_modes |= PrivMode_vt52;
3699 break; 3787 break;
3700 case 3: /* 80/132 */ 3788 case 3: /* 80/132 */
3701 if (priv_modes & PrivMode_132OK) 3789 if (priv_modes & PrivMode_132OK)
3702 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight); 3790 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3703 break; 3791 break;
… …
3718 if (state) /* orthogonal */ 3806 if (state) /* orthogonal */
3719 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3807 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3720 break; 3808 break;
3721#ifdef scrollBar_esc 3809#ifdef scrollBar_esc
3722 case scrollBar_esc: 3810 case scrollBar_esc:
3723 if (scrollBar.map (state)) 3811 scrollBar.map (state);
3724 {
3725 resize_all_windows (0, 0, 0); 3812 resize_all_windows (0, 0, 0);
3726 scr_touch (true); 3813 scr_touch (true);
3727 }
3728 break; 3814 break;
3729#endif 3815#endif
3730 case 25: /* visible/invisible cursor */ 3816 case 25: /* visible/invisible cursor */
3731 scr_cursor_visible (state); 3817 scr_cursor_visible (state);
3732 break; 3818 break;
… …
3745 case 1003: 3831 case 1003:
3746 if (state) 3832 if (state)
3747 { 3833 {
3748 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3834 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3749 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3835 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3836 mouse_row = mouse_col = 0;
3750 vt_emask_mouse = PointerMotionMask; 3837 vt_emask_mouse = PointerMotionMask;
3751 } 3838 }
3752 else 3839 else
3753 vt_emask_mouse = NoEventMask; 3840 vt_emask_mouse = NoEventMask;
3754 3841
… …
3786 } 3873 }
3787} 3874}
3788/*}}} */ 3875/*}}} */
3789 3876
3790/*{{{ process sgr sequences */ 3877/*{{{ process sgr sequences */
3791void 3878void ecb_hot
3792rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3879rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3793{ 3880{
3794 unsigned int i; 3881 unsigned int i;
3795 short rendset; 3882 short rendset;
3796 int rendstyle; 3883 int rendstyle;
… …
3937 break; 4024 break;
3938#endif 4025#endif
3939 } 4026 }
3940 } 4027 }
3941} 4028}
3942/*}}} */
3943 4029
3944/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3945void 4030void
3946rxvt_term::process_graphics () 4031rxvt_term::set_cursor_style (int style)
3947{ 4032{
3948 unicode_t ch, cmd = cmd_getc (); 4033 if (!IN_RANGE_INC (style, 0, 4))
3949
3950 if (cmd == 'Q')
3951 {
3952 /* query graphics */
3953 tt_printf ("\033G0\012"); /* no graphics */
3954 return; 4034 return;
3955 } 4035
3956 /* swallow other graphics sequences until terminating ':' */ 4036 set_option (Opt_cursorUnderline, style >= 3);
3957 do 4037
3958 ch = cmd_getc (); 4038#ifdef CURSOR_BLINK
3959 while (ch != ':'); 4039 set_option (Opt_cursorBlink, !style || (style & 1));
4040 cursor_blink_reset ();
4041#endif
4042
4043 want_refresh = 1;
3960} 4044}
3961/*}}} */ 4045/*}}} */
3962 4046
3963/* ------------------------------------------------------------------------- */ 4047/* ------------------------------------------------------------------------- */
3964 4048
… …
3980 4064
3981/* ---------------------------------------------------------------------- */ 4065/* ---------------------------------------------------------------------- */
3982/* Write data to the pty as typed by the user, pasted with the mouse, 4066/* Write data to the pty as typed by the user, pasted with the mouse,
3983 * or generated by us in response to a query ESC sequence. 4067 * or generated by us in response to a query ESC sequence.
3984 */ 4068 */
3985const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4069static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
3986 4070
3987void 4071void
3988rxvt_term::tt_write (const char *data, unsigned int len) 4072rxvt_term::tt_write (const char *data, unsigned int len)
3989{ 4073{
3990 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4074 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
3995 4079
3996 if (v_buflen == 0) 4080 if (v_buflen == 0)
3997 { 4081 {
3998 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4082 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
3999 4083
4084 max_it (written, 0);
4085
4000 if ((unsigned int)written == len) 4086 if (written == len)
4001 return; 4087 return;
4002 4088
4003 data += written; 4089 data += written;
4004 len -= written; 4090 len -= written;
4005 } 4091 }
4006 4092
4007 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4093 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4008 4094
4009 memcpy (v_buffer + v_buflen, data, len); 4095 memcpy (v_buffer + v_buflen, data, len);
4010 v_buflen += len; 4096 v_buflen += len;
4011 4097
4012 pty_ev.set (ev::READ | ev::WRITE); 4098 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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