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

Diff Legend

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