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.483 by sf-exg, Tue Apr 26 16:19:45 2011 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-2011 Marc Lehmann <schmorp@schmorp.de> 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))
… …
781 } 805 }
782 806
783 if (newlen) 807 if (newlen)
784 len = strlen (kbuf); 808 len = strlen (kbuf);
785 809
810 if (len > 0)
811 {
786 /* 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 /*
787 * Pass meta for all function keys, if 'meta' option set 825 * Pass meta for all function keys, if 'meta' option set
788 */ 826 */
789#ifdef META8_OPTION 827#ifdef META8_OPTION
790 if (meta && (meta_char == 0x80) && len > 0) 828 if (meta && (meta_char == 0x80))
791 kbuf[len - 1] |= 0x80; 829 kbuf[len - 1] |= 0x80;
792#endif 830#endif
831 }
793 832
794 } 833 }
795 else if (ctrl && keysym == XK_minus) 834 else if (ctrl && keysym == XK_minus)
796 { 835 {
797 len = 1; 836 len = 1;
… …
816 meta = 0; 855 meta = 0;
817 } 856 }
818#endif 857#endif
819 /* nil */ ; 858 /* nil */ ;
820 } 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++;
821 } 871 }
822 872
823 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)))
824 return; 874 return;
825 875
… …
831 { 881 {
832 view_start = 0; 882 view_start = 0;
833 want_refresh = 1; 883 want_refresh = 1;
834 } 884 }
835 885
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 */
851 if (meta
852#ifdef META8_OPTION
853 && meta_char == C0_ESC
854#endif
855 )
856 {
857 const char ch = C0_ESC;
858 tt_write (&ch, 1);
859 }
860
861 tt_write (kbuf, (unsigned int)len); 886 tt_write (kbuf, (unsigned int)len);
862} 887}
863 888
864void 889void ecb_cold
865rxvt_term::key_release (XKeyEvent &ev) 890rxvt_term::key_release (XKeyEvent &ev)
866{ 891{
867#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 892#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
868 KeySym keysym; 893 KeySym keysym;
869 894
… …
941void 966void
942rxvt_term::flush () 967rxvt_term::flush ()
943{ 968{
944 flush_ev.stop (); 969 flush_ev.stop ();
945 970
946#ifdef HAVE_BG_PIXMAP 971#ifdef HAVE_IMG
947 if (bg_flags & BG_NEEDS_REFRESH) 972 if (bg_flags & BG_NEEDS_REFRESH)
948 { 973 {
949 bg_flags &= ~BG_NEEDS_REFRESH; 974 bg_flags &= ~BG_NEEDS_REFRESH;
950 scr_touch (false); 975 scr_touch (false);
951 } 976 }
… …
991 while (row < end_row); 1016 while (row < end_row);
992 } 1017 }
993 1018
994 scr_refresh (); 1019 scr_refresh ();
995 scrollBar.show (1); 1020 scrollBar.show (1);
996#ifdef USE_XIM 1021#if USE_XIM
997 IMSendSpot (); 1022 im_send_spot ();
998#endif 1023#endif
999 } 1024 }
1000 1025
1001 display->flush (); 1026 display->flush ();
1002} 1027}
… …
1020 flush (); 1045 flush ();
1021} 1046}
1022 1047
1023#ifdef CURSOR_BLINK 1048#ifdef CURSOR_BLINK
1024void 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
1025rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1065rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1026{ 1066{
1027 hidden_cursor = !hidden_cursor; 1067 hidden_cursor = !hidden_cursor;
1028 want_refresh = 1; 1068 want_refresh = 1;
1029 refresh_check (); 1069 refresh_check ();
… …
1047 1087
1048#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1088#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1049void 1089void
1050rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1090rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1051{ 1091{
1052 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1092 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1053 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1093 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1054 { 1094 {
1055 want_refresh = 1; 1095 want_refresh = 1;
1056 refresh_check (); 1096 refresh_check ();
1057 } 1097 }
1058 else 1098 else
… …
1062 1102
1063#ifdef SELECTION_SCROLLING 1103#ifdef SELECTION_SCROLLING
1064void 1104void
1065rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1105rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1066{ 1106{
1067 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1107 if (scr_page (scroll_selection_lines))
1068 { 1108 {
1069 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1109 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1070 want_refresh = 1; 1110 want_refresh = 1;
1071 refresh_check (); 1111 refresh_check ();
1072 } 1112 }
… …
1077 1117
1078#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1118#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1079void 1119void
1080rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1120rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1081{ 1121{
1082 if (scr_changeview (view_start - mouse_slip_wheel_speed)) 1122 if (scr_page (mouse_slip_wheel_speed))
1083 { 1123 {
1084 want_refresh = 1; 1124 want_refresh = 1;
1085 refresh_check (); 1125 refresh_check ();
1086 } 1126 }
1087 1127
… …
1208 pty_write (); 1248 pty_write ();
1209 1249
1210 refresh_check (); 1250 refresh_check ();
1211} 1251}
1212 1252
1213void 1253void ecb_cold
1214rxvt_term::pointer_unblank () 1254rxvt_term::pointer_unblank ()
1215{ 1255{
1216 XDefineCursor (dpy, vt, TermWin_cursor); 1256 XDefineCursor (dpy, vt, TermWin_cursor);
1217 recolour_cursor (); 1257 recolour_cursor ();
1218 1258
… …
1223 pointer_ev.start (pointerBlankDelay); 1263 pointer_ev.start (pointerBlankDelay);
1224#endif 1264#endif
1225} 1265}
1226 1266
1227#ifdef POINTER_BLANK 1267#ifdef POINTER_BLANK
1228void 1268void ecb_cold
1229rxvt_term::pointer_blank () 1269rxvt_term::pointer_blank ()
1230{ 1270{
1231 if (!option (Opt_pointerBlank)) 1271 if (!option (Opt_pointerBlank))
1232 return; 1272 return;
1233 1273
… …
1235 XFlush (dpy); 1275 XFlush (dpy);
1236 1276
1237 hidden_pointer = 1; 1277 hidden_pointer = 1;
1238} 1278}
1239 1279
1240void 1280void ecb_cold
1241rxvt_term::pointer_cb (ev::timer &w, int revents) 1281rxvt_term::pointer_cb (ev::timer &w, int revents)
1242{ 1282{
1243 make_current (); 1283 make_current ();
1244 1284
1245 pointer_blank (); 1285 pointer_blank ();
… …
1337 32 + x, 1377 32 + x,
1338 32 + y); 1378 32 + y);
1339} 1379}
1340 1380
1341/*{{{ process an X event */ 1381/*{{{ process an X event */
1342void 1382void ecb_hot
1343rxvt_term::x_cb (XEvent &ev) 1383rxvt_term::x_cb (XEvent &ev)
1344{ 1384{
1345 make_current (); 1385 make_current ();
1346 1386
1347 dLocal (Display *, dpy); 1387 dLocal (Display *, dpy);
… …
1450 if (ev.xconfigure.window == parent) 1490 if (ev.xconfigure.window == parent)
1451 { 1491 {
1452 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1492 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1453 ; 1493 ;
1454 1494
1495 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1496
1497 bool moved = false;
1455#ifdef HAVE_BG_PIXMAP 1498#ifdef HAVE_BG_PIXMAP
1456 bool moved = false;
1457 if (bg_window_position_sensitive ()) 1499 if (bg_window_position_sensitive ())
1458 { 1500 {
1501 want_position_change = true;
1502 if (bg_img == 0)
1503 moved = true;
1504 }
1505#endif
1506
1507 if (want_position_change)
1508 {
1459 int x, y; 1509 int x, y;
1510
1460 if (ev.xconfigure.send_event) 1511 if (ev.xconfigure.send_event)
1461 { 1512 {
1462 x = ev.xconfigure.x; 1513 x = ev.xconfigure.x;
1463 y = ev.xconfigure.y; 1514 y = ev.xconfigure.y;
1464 } 1515 }
1465 else 1516 else
1466 get_window_origin (x, y); 1517 get_window_origin (x, y);
1467 1518
1468 if (bg_set_position (x, y) 1519 if (x != parent_x || y != parent_y)
1469 || !(bg_flags & BG_IS_VALID)) 1520 {
1521 parent_x = x;
1522 parent_y = y;
1523 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1470 moved = true; 1524 moved = true;
1525 }
1471 } 1526 }
1472#endif
1473 1527
1474 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1528 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1475 { 1529 {
1476 seen_resize = 1; 1530 seen_resize = 1;
1477 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1531 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1478 } 1532 }
1479 else 1533 else
1480 { 1534 {
1481#ifdef HAVE_BG_PIXMAP 1535#ifdef HAVE_BG_PIXMAP
1482 if (moved) 1536 if (moved)
1483 {
1484 if (mapped)
1485 update_background (); 1537 update_background ();
1486 else
1487 bg_invalidate ();
1488 }
1489#endif 1538#endif
1490 } 1539 }
1491 1540
1492 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1541 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1493 } 1542 }
… …
1505 selection_send (ev.xselectionrequest); 1554 selection_send (ev.xselectionrequest);
1506 break; 1555 break;
1507 1556
1508 case MapNotify: 1557 case MapNotify:
1509#ifdef HAVE_BG_PIXMAP 1558#ifdef HAVE_BG_PIXMAP
1510 /* 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
1511 * non-reparenting window manager. In those cases we never get first 1560 // or a non-reparenting window manager and also because we
1512 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1561 // defer bg image updates if the window is not mapped. The
1513 * care of multiplicity of ConfigureNotify events arriving while WM does 1562 // short delay is to optimize for multiple ConfigureNotify
1514 * reparenting. 1563 // events at startup when the window manager reparents the
1515 * We should not render background immediately, as there could be several 1564 // window, so as to perform the computation after we have
1516 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1565 // received all of them.
1517 * by scheduling background redraw as soon as we can, but giving a short 1566 if (bg_img == 0)
1518 * bit of time for ConfigureNotifies to arrive.
1519 * We should render background PRIOR to drawing any text, but AFTER all
1520 * of ConfigureNotifys for the best results.
1521 */
1522 if (!(bg_flags & BG_IS_VALID))
1523 update_background_ev.start (0.025); 1567 update_background_ev.start (0.025);
1524#endif 1568#endif
1525 mapped = 1; 1569 mapped = 1;
1526#ifdef TEXT_BLINK 1570#ifdef TEXT_BLINK
1527 text_blink_ev.start (); 1571 text_blink_ev.start ();
… …
1567 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1611 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1568 ; 1612 ;
1569 1613
1570 if (scrollBar.state && ev.xany.window == scrollBar.win) 1614 if (scrollBar.state && ev.xany.window == scrollBar.win)
1571 { 1615 {
1572 scrollBar.state = STATE_IDLE; 1616 scrollBar.state = SB_STATE_IDLE;
1573 scrollBar.show (0); 1617 scrollBar.show (0);
1574 } 1618 }
1575 } 1619 }
1576 break; 1620 break;
1577 1621
… …
1619 1663
1620#ifdef SELECTION_SCROLLING 1664#ifdef SELECTION_SCROLLING
1621 if (ev.xbutton.y < int_bwidth 1665 if (ev.xbutton.y < int_bwidth
1622 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1666 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1623 { 1667 {
1668 page_dirn scroll_selection_dir;
1624 int dist; 1669 int dist;
1625 1670
1626 /* don't clobber the current delay if we are 1671 /* don't clobber the current delay if we are
1627 * already in the middle of scrolling. 1672 * already in the middle of scrolling.
1628 */ 1673 */
… …
1643 dist = int_bwidth - ev.xbutton.y; 1688 dist = int_bwidth - ev.xbutton.y;
1644 } 1689 }
1645 else 1690 else
1646 { 1691 {
1647 scroll_selection_dir = DN; 1692 scroll_selection_dir = DN;
1648 dist = ev.xbutton.y - (int_bwidth + height); 1693 dist = ev.xbutton.y - (int_bwidth + vt_height);
1649 } 1694 }
1650 1695
1651 scroll_selection_lines = Pixel2Height (dist) 1696 scroll_selection_lines = Pixel2Height (dist)
1652 / SELECTION_SCROLL_LINE_SPEEDUP 1697 / SELECTION_SCROLL_LINE_SPEEDUP
1653 + 1; 1698 + 1;
1654 min_it (scroll_selection_lines, 1699 min_it (scroll_selection_lines,
1655 SELECTION_SCROLL_MAX_LINES); 1700 SELECTION_SCROLL_MAX_LINES);
1701 scroll_selection_lines *= scroll_selection_dir;
1656 } 1702 }
1657 else 1703 else
1658 { 1704 {
1659 /* we are within the text window, so we 1705 /* we are within the text window, so we
1660 * shouldn't be scrolling 1706 * shouldn't be scrolling
… …
1665#ifdef MOUSE_THRESHOLD 1711#ifdef MOUSE_THRESHOLD
1666 } 1712 }
1667#endif 1713#endif
1668 } 1714 }
1669 } 1715 }
1670 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1716 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1671 { 1717 {
1672 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1718 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1673 MotionNotify, &ev)) 1719 MotionNotify, &ev))
1674 ; 1720 ;
1675 1721
1676 XQueryPointer (dpy, scrollBar.win, 1722 XQueryPointer (dpy, scrollBar.win,
1677 &unused_root, &unused_child, 1723 &unused_root, &unused_child,
1678 &unused_root_x, &unused_root_y, 1724 &unused_root_x, &unused_root_y,
1679 &ev.xbutton.x, &ev.xbutton.y, 1725 &ev.xbutton.x, &ev.xbutton.y,
1680 &unused_mask); 1726 &unused_mask);
1681 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1727 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1682 scrollBar.size ()); 1728 scrollBar.size ());
1683 want_refresh = 1; 1729 want_refresh = 1;
1684 scrollBar.show (1); 1730 scrollBar.show (1);
1685 } 1731 }
1686 break; 1732 break;
1687 } 1733 }
1688 1734
1689#if defined(CURSOR_BLINK) 1735#if defined(CURSOR_BLINK)
1690 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1736 if (ev.type == KeyPress)
1691 {
1692 if (hidden_cursor)
1693 {
1694 hidden_cursor = 0;
1695 want_refresh = 1;
1696 }
1697
1698 cursor_blink_ev.again (); 1737 cursor_blink_reset ();
1699 }
1700#endif 1738#endif
1701 1739
1702#if defined(POINTER_BLANK) 1740#if defined(POINTER_BLANK)
1703 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1741 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1704 { 1742 {
… …
1715 1753
1716 refresh_check (); 1754 refresh_check ();
1717} 1755}
1718 1756
1719#if ENABLE_FRILLS 1757#if ENABLE_FRILLS
1720void 1758void ecb_cold
1721rxvt_term::set_urgency (bool enable) 1759rxvt_term::set_urgency (bool enable)
1722{ 1760{
1723 if (enable == urgency_hint) 1761 if (enable == urgency_hint)
1724 return; 1762 return;
1725 1763
1726 if (XWMHints *h = XGetWMHints (dpy, parent)) 1764 if (XWMHints *h = XGetWMHints (dpy, parent))
1727 { 1765 {
1728 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1766 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1729 XSetWMHints (dpy, parent, h); 1767 XSetWMHints (dpy, parent, h);
1730 urgency_hint = enable; 1768 urgency_hint = enable;
1769 XFree (h);
1731 } 1770 }
1732} 1771}
1733#endif 1772#endif
1734 1773
1735void 1774void ecb_cold
1736rxvt_term::focus_in () 1775rxvt_term::focus_in ()
1737{ 1776{
1738 if (!focus) 1777 if (!focus)
1739 { 1778 {
1740 focus = 1; 1779 focus = 1;
1741 want_refresh = 1; 1780 want_refresh = 1;
1742 1781
1743#if USE_XIM 1782#if USE_XIM
1744 if (Input_Context != NULL) 1783 if (Input_Context != NULL)
1745 { 1784 {
1746 IMSetPosition (); 1785 im_set_position ();
1747 XSetICFocus (Input_Context); 1786 XSetICFocus (Input_Context);
1748 } 1787 }
1749#endif 1788#endif
1750#if CURSOR_BLINK 1789#if CURSOR_BLINK
1751 if (option (Opt_cursorBlink)) 1790 if (option (Opt_cursorBlink))
… …
1765 1804
1766 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1805 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1767 } 1806 }
1768} 1807}
1769 1808
1770void 1809void ecb_cold
1771rxvt_term::focus_out () 1810rxvt_term::focus_out ()
1772{ 1811{
1773 if (focus) 1812 if (focus)
1774 { 1813 {
1775 focus = 0; 1814 focus = 0;
… …
1808 1847
1809 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1848 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1810 } 1849 }
1811} 1850}
1812 1851
1813void 1852void ecb_cold
1814rxvt_term::update_fade_color (unsigned int idx) 1853rxvt_term::update_fade_color (unsigned int idx)
1815{ 1854{
1816#if OFF_FOCUS_FADING 1855#if OFF_FOCUS_FADING
1817 if (rs[Rs_fade]) 1856 if (rs[Rs_fade])
1818 { 1857 {
… …
1821 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);
1822 } 1861 }
1823#endif 1862#endif
1824} 1863}
1825 1864
1826#if ENABLE_TRANSPARENCY || ENABLE_PERL 1865#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1827void 1866void ecb_hot
1828rxvt_term::rootwin_cb (XEvent &ev) 1867rxvt_term::rootwin_cb (XEvent &ev)
1829{ 1868{
1830 make_current (); 1869 make_current ();
1831 1870
1832 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1871 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1833 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1872 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1834 return; 1873 return;
1835 1874
1836# if ENABLE_TRANSPARENCY
1837 switch (ev.type) 1875 switch (ev.type)
1838 { 1876 {
1839 case PropertyNotify: 1877 case PropertyNotify:
1840 /* 1878 /*
1841 * 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,
1842 * 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.
1843 */ 1881 */
1844 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1882 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1845 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1883 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1846 { 1884 {
1847 bg_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);
1848 update_background (); 1889 update_background ();
1890 }
1891#endif
1892 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1849 } 1893 }
1850 1894
1851 break; 1895 break;
1852 } 1896 }
1853# endif
1854 1897
1855 refresh_check (); 1898 refresh_check ();
1856} 1899}
1857#endif 1900#endif
1858 1901
… …
1982 if (scrollBar.upButton (ev.y)) 2025 if (scrollBar.upButton (ev.y))
1983 direction = UP; /* up */ 2026 direction = UP; /* up */
1984 else if (scrollBar.dnButton (ev.y)) 2027 else if (scrollBar.dnButton (ev.y))
1985 direction = DN; /* down */ 2028 direction = DN; /* down */
1986 2029
1987 scrollBar.state = STATE_IDLE; 2030 scrollBar.state = SB_STATE_IDLE;
1988 /* 2031 /*
1989 * Rxvt-style scrollbar: 2032 * Rxvt-style scrollbar:
1990 * move up if mouse is above slider 2033 * move up if mouse is above slider
1991 * move dn if mouse is below slider 2034 * move dn if mouse is below slider
1992 * 2035 *
… …
2031 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2074 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2032#endif 2075#endif
2033 if (scr_page (direction, 1)) 2076 if (scr_page (direction, 1))
2034 { 2077 {
2035 if (direction == UP) 2078 if (direction == UP)
2036 scrollBar.state = STATE_UP; 2079 scrollBar.state = SB_STATE_UP;
2037 else 2080 else
2038 scrollBar.state = STATE_DOWN; 2081 scrollBar.state = SB_STATE_DOWN;
2039 } 2082 }
2040 } 2083 }
2041 else 2084 else
2042 switch (ev.button) 2085 switch (ev.button)
2043 { 2086 {
2044 case Button2: 2087 case Button2:
2045 switch (scrollBar.align) 2088 switch (scrollBar.align)
2046 { 2089 {
2047 case R_SB_ALIGN_TOP: 2090 case SB_ALIGN_TOP:
2048 csrO = 0; 2091 csrO = 0;
2049 break; 2092 break;
2050 case R_SB_ALIGN_CENTRE: 2093 case SB_ALIGN_CENTRE:
2051 csrO = (scrollBar.bot - scrollBar.top) / 2; 2094 csrO = (scrollBar.bot - scrollBar.top) / 2;
2052 break; 2095 break;
2053 case R_SB_ALIGN_BOTTOM: 2096 case SB_ALIGN_BOTTOM:
2054 csrO = scrollBar.bot - scrollBar.top; 2097 csrO = scrollBar.bot - scrollBar.top;
2055 break; 2098 break;
2056 } 2099 }
2057 2100
2058 if (scrollBar.style == R_SB_XTERM 2101 if (scrollBar.style == SB_STYLE_XTERM
2059 || scrollbar_above_slider (ev.y) 2102 || scrollBar.above_slider (ev.y)
2060 || scrollbar_below_slider (ev.y)) 2103 || scrollBar.below_slider (ev.y))
2061 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2104 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2062 2105
2063 scrollBar.state = STATE_MOTION; 2106 scrollBar.state = SB_STATE_MOTION;
2064 break; 2107 break;
2065 2108
2066 case Button1: 2109 case Button1:
2067 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2110 if (scrollBar.align == SB_ALIGN_CENTRE)
2068 csrO = ev.y - scrollBar.top; 2111 csrO = ev.y - scrollBar.top;
2069 /* FALLTHROUGH */ 2112 /* FALLTHROUGH */
2070 2113
2071 case Button3: 2114 case Button3:
2072 if (scrollBar.style != R_SB_XTERM) 2115 if (scrollBar.style != SB_STYLE_XTERM)
2073 { 2116 {
2074 if (scrollbar_above_slider (ev.y)) 2117 if (scrollBar.above_slider (ev.y))
2075# ifdef RXVT_SCROLL_FULL 2118# ifdef RXVT_SCROLL_FULL
2076 scr_page (UP, nrow - 1); 2119 scr_page (UP, nrow - 1);
2077# else 2120# else
2078 scr_page (UP, nrow / 4); 2121 scr_page (UP, nrow / 4);
2079# endif 2122# endif
2080 else if (scrollbar_below_slider (ev.y)) 2123 else if (scrollBar.below_slider (ev.y))
2081# ifdef RXVT_SCROLL_FULL 2124# ifdef RXVT_SCROLL_FULL
2082 scr_page (DN, nrow - 1); 2125 scr_page (DN, nrow - 1);
2083# else 2126# else
2084 scr_page (DN, nrow / 4); 2127 scr_page (DN, nrow / 4);
2085# endif 2128# endif
2086 else 2129 else
2087 scrollBar.state = STATE_MOTION; 2130 scrollBar.state = SB_STATE_MOTION;
2088 } 2131 }
2089 else 2132 else
2090 { 2133 {
2091 scr_page ((ev.button == Button1 ? DN : UP), 2134 scr_page ((ev.button == Button1 ? DN : UP),
2092 (nrow 2135 (nrow
2093 * scrollbar_position (ev.y) 2136 * scrollBar.position (ev.y)
2094 / scrollBar.size ())); 2137 / scrollBar.size ()));
2095 } 2138 }
2096 2139
2097 break; 2140 break;
2098 } 2141 }
… …
2109 2152
2110 csrO = 0; /* reset csr Offset */ 2153 csrO = 0; /* reset csr Offset */
2111 if (!bypass_keystate) 2154 if (!bypass_keystate)
2112 reportmode = !! (priv_modes & PrivMode_mouse_report); 2155 reportmode = !! (priv_modes & PrivMode_mouse_report);
2113 2156
2114 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2157 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2115 { 2158 {
2116 scrollBar.state = STATE_IDLE; 2159 scrollBar.state = SB_STATE_IDLE;
2117 scrollBar.show (0); 2160 scrollBar.show (0);
2118 } 2161 }
2119 2162
2120#ifdef SELECTION_SCROLLING 2163#ifdef SELECTION_SCROLLING
2121 sel_scroll_ev.stop(); 2164 sel_scroll_ev.stop();
… …
2171 case Button3: 2214 case Button3:
2172 selection_make (ev.time); 2215 selection_make (ev.time);
2173 break; 2216 break;
2174 2217
2175 case Button2: 2218 case Button2:
2176 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?
2177 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2220 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2178 break; 2221 break;
2179 2222
2180#ifdef MOUSE_WHEEL 2223#ifdef MOUSE_WHEEL
2181 case Button4: 2224 case Button4:
2182 case Button5: 2225 case Button5:
2183 { 2226 {
2184 int i; 2227 int lines;
2185 page_dirn v; 2228 page_dirn dirn;
2186 2229
2187 v = ev.button == Button4 ? UP : DN; 2230 dirn = ev.button == Button4 ? UP : DN;
2188 2231
2189 if (ev.state & ShiftMask) 2232 if (ev.state & ShiftMask)
2190 i = 1; 2233 lines = 1;
2191 else if (option (Opt_mouseWheelScrollPage)) 2234 else if (option (Opt_mouseWheelScrollPage))
2192 i = nrow - 1; 2235 lines = nrow - 1;
2193 else 2236 else
2194 i = 5; 2237 lines = 5;
2195 2238
2196# ifdef MOUSE_SLIP_WHEELING 2239# ifdef MOUSE_SLIP_WHEELING
2197 if (ev.state & ControlMask) 2240 if (ev.state & ControlMask)
2198 { 2241 {
2199 mouse_slip_wheel_speed += v ? -1 : 1; 2242 mouse_slip_wheel_speed += dirn;
2200 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2243 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2201 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2202 2244
2203 if (!slip_wheel_ev.is_active ()) 2245 if (!slip_wheel_ev.is_active ())
2204 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2246 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2205 } 2247 }
2206 else 2248 else
2207# endif 2249# endif
2208 { 2250 {
2209 scr_page (v, i); 2251 scr_page (dirn, lines);
2210 scrollBar.show (1); 2252 scrollBar.show (1);
2211 } 2253 }
2212 } 2254 }
2213 break; 2255 break;
2214#endif 2256#endif
… …
2216 } 2258 }
2217} 2259}
2218 2260
2219/*}}} */ 2261/*}}} */
2220 2262
2221void 2263void ecb_hot
2222rxvt_term::cmd_parse () 2264rxvt_term::cmd_parse ()
2223{ 2265{
2224 wchar_t ch = NOCHAR; 2266 wchar_t ch = NOCHAR;
2225 char *seq_begin; // remember start of esc-sequence here 2267 char *seq_begin; // remember start of esc-sequence here
2226 2268
2227 for (;;) 2269 for (;;)
2228 { 2270 {
2229 if (expect_false (ch == NOCHAR)) 2271 if (ecb_unlikely (ch == NOCHAR))
2230 { 2272 {
2231 seq_begin = cmdbuf_ptr; 2273 seq_begin = cmdbuf_ptr;
2232 ch = next_char (); 2274 ch = next_char ();
2233 2275
2234 if (ch == NOCHAR) 2276 if (ch == NOCHAR)
2235 break; 2277 break;
2236 } 2278 }
2237 2279
2238 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))
2239 { 2281 {
2240 if (expect_false (!seen_input)) 2282 if (ecb_unlikely (!seen_input))
2241 { 2283 {
2242 seen_input = 1; 2284 seen_input = 1;
2243 // many badly-written programs (e.g. jed) contain a race condition: 2285 // many badly-written programs (e.g. jed) contain a race condition:
2244 // they first read the screensize and then install a SIGWINCH handler. 2286 // they first read the screensize and then install a SIGWINCH handler.
2245 // some window managers resize the window early, and these programs 2287 // some window managers resize the window early, and these programs
… …
2258 wchar_t *str = buf; 2300 wchar_t *str = buf;
2259 wchar_t *eol = str + min (ncol, UBUFSIZ); 2301 wchar_t *eol = str + min (ncol, UBUFSIZ);
2260 2302
2261 for (;;) 2303 for (;;)
2262 { 2304 {
2263 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)))
2264 break; 2306 break;
2265 2307
2266 *str++ = ch; 2308 *str++ = ch;
2267 2309
2268 if (expect_false (ch == C0_LF || str >= eol)) 2310 if (ecb_unlikely (ch == C0_LF || str >= eol))
2269 { 2311 {
2270 if (ch == C0_LF) 2312 if (ch == C0_LF)
2271 nlines++; 2313 nlines++;
2272 2314
2273 refresh_count++; 2315 refresh_count++;
… …
2345 } 2387 }
2346 } 2388 }
2347} 2389}
2348 2390
2349// read the next character 2391// read the next character
2350wchar_t 2392wchar_t ecb_hot
2351rxvt_term::next_char () NOTHROW 2393rxvt_term::next_char () NOTHROW
2352{ 2394{
2353 while (cmdbuf_ptr < cmdbuf_endp) 2395 while (cmdbuf_ptr < cmdbuf_endp)
2354 { 2396 {
2355 // assume 7-bit to be ascii ALWAYS 2397 // assume 7-bit to be ascii ALWAYS
2356 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2398 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2357 return *cmdbuf_ptr++; 2399 return *cmdbuf_ptr++;
2358 2400
2359 wchar_t wc; 2401 wchar_t wc;
2360 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);
2361 2403
… …
2367 } 2409 }
2368 2410
2369 if (len == (size_t)-1) 2411 if (len == (size_t)-1)
2370 { 2412 {
2371 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.
2372 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
2373 } 2417 }
2374 2418
2375 // assume wchar == unicode 2419 // assume wchar == unicode
2376 cmdbuf_ptr += len; 2420 cmdbuf_ptr += len;
… …
2379 2423
2380 return NOCHAR; 2424 return NOCHAR;
2381} 2425}
2382 2426
2383// read the next octet 2427// read the next octet
2384uint32_t 2428uint32_t ecb_hot
2385rxvt_term::next_octet () NOTHROW 2429rxvt_term::next_octet () NOTHROW
2386{ 2430{
2387 return cmdbuf_ptr < cmdbuf_endp 2431 return cmdbuf_ptr < cmdbuf_endp
2388 ? (unsigned char)*cmdbuf_ptr++ 2432 ? (unsigned char)*cmdbuf_ptr++
2389 : NOCHAR; 2433 : NOCHAR;
2390} 2434}
2391 2435
2392static class out_of_input out_of_input; 2436static class out_of_input out_of_input;
2393 2437
2394wchar_t 2438wchar_t ecb_hot
2395rxvt_term::cmd_getc () THROW ((class out_of_input)) 2439rxvt_term::cmd_getc () THROW ((class out_of_input))
2396{ 2440{
2397 wchar_t c = next_char (); 2441 wchar_t c = next_char ();
2398 2442
2399 if (c == NOCHAR) 2443 if (c == NOCHAR)
2400 throw out_of_input; 2444 throw out_of_input;
2401 2445
2402 return c; 2446 return c;
2403} 2447}
2404 2448
2405uint32_t 2449uint32_t ecb_hot
2406rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2450rxvt_term::cmd_get8 () THROW ((class out_of_input))
2407{ 2451{
2408 uint32_t c = next_octet (); 2452 uint32_t c = next_octet ();
2409 2453
2410 if (c == NOCHAR) 2454 if (c == NOCHAR)
… …
2414} 2458}
2415 2459
2416/*{{{ print pipe */ 2460/*{{{ print pipe */
2417/*----------------------------------------------------------------------*/ 2461/*----------------------------------------------------------------------*/
2418#ifdef PRINTPIPE 2462#ifdef PRINTPIPE
2419FILE * 2463FILE * ecb_cold
2420rxvt_term::popen_printer () 2464rxvt_term::popen_printer ()
2421{ 2465{
2422 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");
2423 2467
2424 if (stream == NULL) 2468 if (stream == NULL)
2425 rxvt_warn ("can't open printer pipe, not printing.\n"); 2469 rxvt_warn ("can't open printer pipe, not printing.\n");
2426 2470
2427 return stream; 2471 return stream;
2428} 2472}
2429 2473
2430int 2474int ecb_cold
2431rxvt_term::pclose_printer (FILE *stream) 2475rxvt_term::pclose_printer (FILE *stream)
2432{ 2476{
2433 fflush (stream); 2477 fflush (stream);
2434 return pclose (stream); 2478 return pclose (stream);
2435} 2479}
2436 2480
2437/* 2481/*
2438 * simulate attached vt100 printer 2482 * simulate attached vt100 printer
2439 */ 2483 */
2440void 2484void ecb_cold
2441rxvt_term::process_print_pipe () 2485rxvt_term::process_print_pipe ()
2442{ 2486{
2443 FILE *fd = popen_printer (); 2487 FILE *fd = popen_printer ();
2444 2488
2445 if (!fd) 2489 if (!fd)
… …
2491 pclose_printer (fd); 2535 pclose_printer (fd);
2492} 2536}
2493#endif /* PRINTPIPE */ 2537#endif /* PRINTPIPE */
2494/*}}} */ 2538/*}}} */
2495 2539
2496/* *INDENT-OFF* */
2497enum { 2540enum {
2498 C1_40 = 0x40, 2541 C1_40 = 0x40,
2499 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,
2500 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,
2501 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,
2502 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,
2503}; 2546};
2504/* *INDENT-ON* */
2505 2547
2506/*{{{ process non-printing single characters */ 2548/*{{{ process non-printing single characters */
2507void 2549void ecb_hot
2508rxvt_term::process_nonprinting (unicode_t ch) 2550rxvt_term::process_nonprinting (unicode_t ch)
2509{ 2551{
2510 switch (ch) 2552 switch (ch)
2511 { 2553 {
2512 case C0_ESC: 2554 case C0_ESC:
… …
2558} 2600}
2559/*}}} */ 2601/*}}} */
2560 2602
2561 2603
2562/*{{{ process VT52 escape sequences */ 2604/*{{{ process VT52 escape sequences */
2563void 2605void ecb_cold
2564rxvt_term::process_escape_vt52 (unicode_t ch) 2606rxvt_term::process_escape_vt52 (unicode_t ch)
2565{ 2607{
2566 int row, col; 2608 int row, col;
2567 2609
2568 switch (ch) 2610 switch (ch)
… …
2602 break; 2644 break;
2603 case 'Z': /* identify the terminal type */ 2645 case 'Z': /* identify the terminal type */
2604 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2646 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2605 break; 2647 break;
2606 case '<': /* turn off VT52 mode */ 2648 case '<': /* turn off VT52 mode */
2607 set_privmode (PrivMode_vt52, 0); 2649 priv_modes &= ~PrivMode_vt52;
2608 break; 2650 break;
2609 case 'F': /* use special graphics character set */ 2651 case 'F': /* use special graphics character set */
2610 case 'G': /* use regular character set */ 2652 case 'G': /* use regular character set */
2611 /* unimplemented */ 2653 /* unimplemented */
2612 break; 2654 break;
… …
2618} 2660}
2619/*}}} */ 2661/*}}} */
2620 2662
2621 2663
2622/*{{{ process escape sequences */ 2664/*{{{ process escape sequences */
2623void 2665void ecb_hot
2624rxvt_term::process_escape_seq () 2666rxvt_term::process_escape_seq ()
2625{ 2667{
2626 unicode_t ch = cmd_getc (); 2668 unicode_t ch = cmd_getc ();
2627 2669
2628 if (priv_modes & PrivMode_vt52) 2670 if (priv_modes & PrivMode_vt52)
… …
2631 return; 2673 return;
2632 } 2674 }
2633 2675
2634 switch (ch) 2676 switch (ch)
2635 { 2677 {
2636 /* case 1: do_tek_mode (); break; */
2637 case '#': 2678 case '#':
2638 if (cmd_getc () == '8') 2679 if (cmd_getc () == '8')
2639 scr_E (); 2680 scr_E ();
2640 break; 2681 break;
2641 case '(': 2682 case '(':
… …
2664#if !ENABLE_MINIMAL 2705#if !ENABLE_MINIMAL
2665 case '9': 2706 case '9':
2666 scr_forwardindex (); 2707 scr_forwardindex ();
2667 break; 2708 break;
2668#endif 2709#endif
2710 // DECPAM/DECPNM
2669 case '=': 2711 case '=':
2712 priv_modes |= PrivMode_aplKP;
2713 break;
2670 case '>': 2714 case '>':
2671 set_privmode (PrivMode_aplKP, ch == '='); 2715 priv_modes &= ~PrivMode_aplKP;
2672 break; 2716 break;
2673 2717
2674 case C1_40: 2718 case C1_40:
2675 cmd_getc (); 2719 cmd_getc ();
2676 break; 2720 break;
… …
2680 2724
2681 /* 8.3.87: NEXT LINE */ 2725 /* 8.3.87: NEXT LINE */
2682 case C1_NEL: /* ESC E */ 2726 case C1_NEL: /* ESC E */
2683 { 2727 {
2684 wchar_t nlcr[] = { C0_LF, C0_CR }; 2728 wchar_t nlcr[] = { C0_LF, C0_CR };
2685 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1); 2729 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2686 } 2730 }
2687 break; 2731 break;
2688 2732
2689 /* kidnapped escape sequence: Should be 8.3.48 */ 2733 /* kidnapped escape sequence: Should be 8.3.48 */
2690 case C1_ESA: /* ESC G */ 2734 case C1_ESA: /* ESC G */
… …
2702 case C1_RI: /* ESC M */ 2746 case C1_RI: /* ESC M */
2703 scr_index (DN); 2747 scr_index (DN);
2704 break; 2748 break;
2705 2749
2706 /* 8.3.142: SINGLE-SHIFT TWO */ 2750 /* 8.3.142: SINGLE-SHIFT TWO */
2707 /*case C1_SS2: scr_single_shift (2); break; */ 2751 /* case C1_SS2: break; */
2708 2752
2709 /* 8.3.143: SINGLE-SHIFT THREE */ 2753 /* 8.3.143: SINGLE-SHIFT THREE */
2710 /*case C1_SS3: scr_single_shift (3); break; */ 2754 /* case C1_SS3: break; */
2711 2755
2712 /* 8.3.27: DEVICE CONTROL STRING */ 2756 /* 8.3.27: DEVICE CONTROL STRING */
2713 case C1_DCS: /* ESC P */ 2757 case C1_DCS: /* ESC P */
2714 process_dcs_seq (); 2758 process_dcs_seq ();
2715 break; 2759 break;
… …
2748 } 2792 }
2749} 2793}
2750/*}}} */ 2794/*}}} */
2751 2795
2752/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2796/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2753/* *INDENT-OFF* */
2754enum { 2797enum {
2755 CSI_ICH = 0x40, 2798 CSI_ICH = 0x40,
2756 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,
2757 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 ,
2758 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,
… …
2778 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, */
2779 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, */
2780 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, */
2781 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, {, |, }, ~, */
2782 }; 2825 };
2783/* *INDENT-ON* */
2784 2826
2785void 2827void ecb_hot
2786rxvt_term::process_csi_seq () 2828rxvt_term::process_csi_seq ()
2787{ 2829{
2788 unicode_t ch, priv, i; 2830 unicode_t ch, priv, prev_ch, i;
2789 unsigned int nargs, p; 2831 unsigned int nargs, p;
2790 int n, ndef; 2832 int n, ndef;
2791 int arg[ESC_ARGS] = { }; 2833 int arg[ESC_ARGS] = { };
2792 2834
2793 nargs = 0; 2835 nargs = 0;
… …
2799 /* '<' '=' '>' '?' '!' */ 2841 /* '<' '=' '>' '?' '!' */
2800 priv = ch; 2842 priv = ch;
2801 ch = cmd_getc (); 2843 ch = cmd_getc ();
2802 } 2844 }
2803 2845
2846 prev_ch = 0;
2804 /* read any numerical arguments */ 2847 /* read any numerical arguments */
2805 for (n = -1; ch < CSI_ICH; ) 2848 for (n = -1; ch < CSI_ICH; )
2806 { 2849 {
2807 if (isdigit (ch)) 2850 if (isdigit (ch))
2808 { 2851 {
… …
2818 n = -1; 2861 n = -1;
2819 } 2862 }
2820 else if (IS_CONTROL (ch)) 2863 else if (IS_CONTROL (ch))
2821 process_nonprinting (ch); 2864 process_nonprinting (ch);
2822 2865
2866 prev_ch = ch;
2823 ch = cmd_getc (); 2867 ch = cmd_getc ();
2824 } 2868 }
2825 2869
2826 if (ch > CSI_7F) 2870 if (ch > CSI_7F)
2827 return; 2871 return;
… …
2868 scr_soft_reset (); 2912 scr_soft_reset ();
2869 2913
2870 static const int pm_h[] = { 7, 25 }; 2914 static const int pm_h[] = { 7, 25 };
2871 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 }; 2915 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2872 2916
2873 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h); 2917 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2874 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l); 2918 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2875 } 2919 }
2876 break; 2920 break;
2877 } 2921 }
2878 2922
2879 return; 2923 return;
… …
2897 } 2941 }
2898 break; 2942 break;
2899#endif 2943#endif
2900 2944
2901 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2945 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2902 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2946 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2903 arg[0] = -arg[0]; 2947 arg[0] = -arg[0];
2904 /* FALLTHROUGH */ 2948 /* FALLTHROUGH */
2905 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2949 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2906 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2950 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2907 scr_gotorc (arg[0], 0, RELATIVE); 2951 scr_gotorc (arg[0], 0, RELATIVE);
2908 break; 2952 break;
2909 2953
2910 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2954 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2911 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2955 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3061 scr_insert_mode (1); 3105 scr_insert_mode (1);
3062 else if (arg[0] == 20) 3106 else if (arg[0] == 20)
3063 priv_modes |= PrivMode_LFNL; 3107 priv_modes |= PrivMode_LFNL;
3064 break; 3108 break;
3065 3109
3110 case CSI_71: // DESCUSR: set cursor style
3111 if (prev_ch == ' ')
3112 set_cursor_style (arg[0]);
3113 break;
3114
3066 /* 3115 /*
3067 * PRIVATE USE beyond this point. All CSI_7? sequences here 3116 * PRIVATE USE beyond this point. All CSI_7? sequences here
3068 */ 3117 */
3069 case CSI_72: /* DECSTBM: set top and bottom margins */ 3118 case CSI_72: /* DECSTBM: set top and bottom margins */
3070 if (nargs == 1) 3119 if (nargs == 1)
… …
3098 } 3147 }
3099} 3148}
3100/*}}} */ 3149/*}}} */
3101 3150
3102#if !ENABLE_MINIMAL 3151#if !ENABLE_MINIMAL
3103/* ARGSUSED */
3104void 3152void
3105rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3153rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3106{ 3154{
3107 int x, y; 3155 int x, y;
3108 XWindowAttributes wattr; 3156 XWindowAttributes wattr;
… …
3145 break; 3193 break;
3146 3194
3147 //case 9: NYI, TODO, restore maximized window or maximize window 3195 //case 9: NYI, TODO, restore maximized window or maximize window
3148 default: 3196 default:
3149 if (args[0] >= 24) /* set height (chars) */ 3197 if (args[0] >= 24) /* set height (chars) */
3150 set_widthheight ((unsigned int)width, 3198 set_widthheight ((unsigned int)vt_width,
3151 (unsigned int) (args[1] * fheight)); 3199 (unsigned int) (args[1] * fheight));
3152 break; 3200 break;
3153 3201
3154 /* 3202 /*
3155 * reports - some output format copied from XTerm 3203 * reports - some output format copied from XTerm
… …
3204rxvt_term::get_to_st (unicode_t &ends_how) 3252rxvt_term::get_to_st (unicode_t &ends_how)
3205{ 3253{
3206 unicode_t ch; 3254 unicode_t ch;
3207 bool seen_esc = false; 3255 bool seen_esc = false;
3208 unsigned int n = 0; 3256 unsigned int n = 0;
3209 wchar_t string[STRING_MAX]; 3257 wchar_t string[CBUFSIZ];
3210 3258
3211 while ((ch = cmd_getc ()) != NOCHAR) 3259 while ((ch = cmd_getc ()) != NOCHAR)
3212 { 3260 {
3213 if (seen_esc) 3261 if (seen_esc)
3214 { 3262 {
… …
3229 else if (ch < 0x20) 3277 else if (ch < 0x20)
3230 return NULL; /* other control character - exit */ 3278 return NULL; /* other control character - exit */
3231 3279
3232 seen_esc = false; 3280 seen_esc = false;
3233 3281
3234 if (n >= STRING_MAX - 1) 3282 if (n >= sizeof (string) - 1)
3235 // stop at some sane length 3283 // stop at some sane length
3236 return NULL; 3284 return NULL;
3237 3285
3238 string[n++] = ch; 3286 string[n++] = ch;
3239 } 3287 }
… …
3356 &nitems, &bytes_after, &value) == Success 3404 &nitems, &bytes_after, &value) == Success
3357 && actual_type != None 3405 && actual_type != None
3358 && actual_format == 8) 3406 && actual_format == 8)
3359 str = (const char *)(value); 3407 str = (const char *)(value);
3360 3408
3361 tt_printf ("\033]%d;%s%c", op, str, resp); 3409 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3362 3410
3363 XFree (value); 3411 XFree (value);
3364 } 3412 }
3365 else 3413 else
3366 { 3414 {
… …
3434 break; 3482 break;
3435#endif 3483#endif
3436 case URxvt_Color_border: 3484 case URxvt_Color_border:
3437 process_color_seq (op, Color_border, str, resp); 3485 process_color_seq (op, Color_border, str, resp);
3438 break; 3486 break;
3439#if ENABLE_TRANSPARENCY 3487
3488#if BG_IMAGE_FROM_ROOT
3440 case URxvt_Color_tint: 3489 case URxvt_Color_tint:
3441 process_color_seq (op, Color_tint, str, resp); 3490 process_color_seq (op, Color_tint, str, resp);
3442 { 3491 {
3443 bool changed = false; 3492 bool changed = false;
3444 3493
3445 if (ISSET_PIXCOLOR (Color_tint)) 3494 if (ISSET_PIXCOLOR (Color_tint))
3446 changed = bg_set_tint (pix_colors_focused [Color_tint]); 3495 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3447 3496
3448 if (changed) 3497 if (changed)
3449 update_background (); 3498 update_background ();
3450 } 3499 }
3451 3500
… …
3455#if BG_IMAGE_FROM_FILE 3504#if BG_IMAGE_FROM_FILE
3456 case Rxvt_Pixmap: 3505 case Rxvt_Pixmap:
3457 if (!strcmp (str, "?")) 3506 if (!strcmp (str, "?"))
3458 { 3507 {
3459 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;
3460 3513
3461 sprintf (str, "[%dx%d+%d+%d]", 3514 sprintf (str, "[%dx%d+%d+%d]",
3462 min (h_scale, 32767), min (v_scale, 32767), 3515 h_scale, v_scale,
3463 min (h_align, 32767), min (v_align, 32767)); 3516 h_align, v_align);
3464 process_xterm_seq (XTerm_title, str, CHAR_ST); 3517 process_xterm_seq (XTerm_title, str, CHAR_ST);
3465 } 3518 }
3466 else 3519 else
3467 { 3520 {
3468 int changed = 0; 3521 bool changed = false;
3469 3522
3470 if (*str != ';') 3523 if (*str != ';')
3471 { 3524 {
3472 if (bg_set_file (str)) /* change pixmap */ 3525 try
3473 { 3526 {
3527 fimage.set_file_geometry (this, str);
3474 changed++; 3528 changed = true;
3475 str = strchr (str, ';');
3476 if (str == NULL)
3477 bg_set_default_geometry ();
3478 else 3529 }
3479 bg_set_geometry (str+1); 3530 catch (const class rxvt_failure_exception &e)
3531 {
3480 } 3532 }
3481 } 3533 }
3482 else 3534 else
3483 { 3535 {
3484 str++; 3536 str++;
3485 if (bg_set_geometry (str, true)) 3537 if (fimage.set_geometry (str, true))
3486 changed++; 3538 changed = true;
3487 } 3539 }
3488 3540
3489 if (changed) 3541 if (changed)
3490 { 3542 {
3491 if (bg_window_position_sensitive ()) 3543 if (bg_window_position_sensitive ())
3492 { 3544 {
3493 int x, y; 3545 int x, y;
3494 get_window_origin (x, y); 3546 get_window_origin (x, y);
3495 bg_set_position (x, y); 3547 parent_x = x;
3548 parent_y = y;
3496 } 3549 }
3497 update_background (); 3550 update_background ();
3498 } 3551 }
3499 } 3552 }
3500 break; 3553 break;
… …
3590 * 's' = save 3643 * 's' = save
3591 * 'r' = restore 3644 * 'r' = restore
3592 * 't' = toggle 3645 * 't' = toggle
3593 * so no need for fancy checking 3646 * so no need for fancy checking
3594 */ 3647 */
3595int 3648int ecb_cold
3596rxvt_term::privcases (int mode, unsigned long bit) 3649rxvt_term::privcases (int mode, unsigned long bit)
3597{ 3650{
3598 int state; 3651 int state;
3599 3652
3600 if (mode == 's') 3653 if (mode == 's')
3601 { 3654 {
3602 SavedModes |= (priv_modes & bit); 3655 if (priv_modes & bit)
3656 SavedModes |= bit;
3657 else
3658 SavedModes &= ~bit;
3603 return -1; 3659 return -1;
3604 } 3660 }
3605 else 3661 else
3606 { 3662 {
3607 if (mode == 'r') 3663 if (mode == 'r')
3608 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3664 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3609 else 3665 else
3610 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3666 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3611 3667
3612 set_privmode (bit, state); 3668 if (state)
3669 priv_modes |= bit;
3670 else
3671 priv_modes &= ~bit;
3613 } 3672 }
3614 3673
3615 return state; 3674 return state;
3616} 3675}
3617 3676
3618/* we're not using priv _yet_ */ 3677/* we're not using priv _yet_ */
3619void 3678void
3620rxvt_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)
3621{ 3680{
3622 unsigned int i, j; 3681 unsigned int i, j;
3623 int state; 3682 int state;
3624 3683
3625 static const struct 3684 static const struct
3626 { 3685 {
3627 const int argval; 3686 const int argval;
3628 const unsigned long bit; 3687 const unsigned long bit;
3629 } argtopriv[] = { 3688 } argtopriv[] = {
3630 { 1, PrivMode_aplCUR }, // DECCKM 3689 { 1, PrivMode_aplCUR }, // DECCKM
3631 { 2, PrivMode_vt52 }, 3690 { 2, PrivMode_vt52 }, // DECANM
3632 { 3, PrivMode_132 }, // DECCOLM 3691 { 3, PrivMode_132 }, // DECCOLM
3633 { 4, PrivMode_smoothScroll }, // DECSCLM 3692 { 4, PrivMode_smoothScroll }, // DECSCLM
3634 { 5, PrivMode_rVideo }, // DECSCNM 3693 { 5, PrivMode_rVideo }, // DECSCNM
3635 { 6, PrivMode_relOrigin }, // DECOM 3694 { 6, PrivMode_relOrigin }, // DECOM
3636 { 7, PrivMode_Autowrap }, // DECAWM 3695 { 7, PrivMode_Autowrap }, // DECAWM
3637 // 8, auto-repeat keys // DECARM 3696 // 8, auto-repeat keys // DECARM
3638 { 9, PrivMode_MouseX10 }, 3697 { 9, PrivMode_MouseX10 },
3639 // 18 end FF to printer after print screen 3698 // 18 end FF to printer after print screen
3640 // 19 Print screen prints full screen/scroll region 3699 // 19 Print screen prints full screen/scroll region
3641 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3700 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3642#ifdef scrollBar_esc 3701#ifdef scrollBar_esc
3643 { scrollBar_esc, PrivMode_scrollBar }, 3702 { scrollBar_esc, PrivMode_scrollBar },
3644#endif 3703#endif
3645 { 35, PrivMode_ShiftKeys }, // rxvt extension 3704 { 35, PrivMode_ShiftKeys }, // rxvt extension
3646 // 38, tektronix mode // DECTEK 3705 // 38, tektronix mode // DECTEK
3647 { 40, PrivMode_132OK }, 3706 { 40, PrivMode_132OK },
3648 // 41 xterm more fixes NYI 3707 // 41 xterm more fixes NYI
3649 // 45 margin bell NYI 3708 // 45 margin bell NYI
3650 // 46 start logging 3709 // 46 start logging
3651 { 47, PrivMode_Screen }, 3710 { 47, PrivMode_Screen },
3652 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3711 { 66, PrivMode_aplKP }, // DECNKM
3653#ifndef NO_BACKSPACE_KEY 3712#ifndef NO_BACKSPACE_KEY
3654 { 67, PrivMode_BackSpace }, // DECBKM 3713 { 67, PrivMode_BackSpace }, // DECBKM
3655#endif 3714#endif
3656 { 1000, PrivMode_MouseX11 }, 3715 { 1000, PrivMode_MouseX11 },
3657 { 1002, PrivMode_MouseBtnEvent }, 3716 { 1002, PrivMode_MouseBtnEvent },
… …
3686 for (i = 0; i < nargs; i++) 3745 for (i = 0; i < nargs; i++)
3687 { 3746 {
3688 state = -1; 3747 state = -1;
3689 3748
3690 /* basic handling */ 3749 /* basic handling */
3691 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++) 3750 for (j = 0; j < ecb_array_length (argtopriv); j++)
3692 if (argtopriv[j].argval == arg[i]) 3751 if (argtopriv[j].argval == arg[i])
3693 { 3752 {
3694 state = privcases (mode, argtopriv[j].bit); 3753 state = privcases (mode, argtopriv[j].bit);
3695 break; 3754 break;
3696 } 3755 }
… …
3722 case 2: /* VT52 mode */ 3781 case 2: /* VT52 mode */
3723 /* oddball mode. should be set regardless of set/reset 3782 /* oddball mode. should be set regardless of set/reset
3724 * parameter. Return from VT52 mode with an ESC < from 3783 * parameter. Return from VT52 mode with an ESC < from
3725 * within VT52 mode 3784 * within VT52 mode
3726 */ 3785 */
3727 set_privmode (PrivMode_vt52, 1); 3786 priv_modes |= PrivMode_vt52;
3728 break; 3787 break;
3729 case 3: /* 80/132 */ 3788 case 3: /* 80/132 */
3730 if (priv_modes & PrivMode_132OK) 3789 if (priv_modes & PrivMode_132OK)
3731 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight); 3790 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3732 break; 3791 break;
… …
3747 if (state) /* orthogonal */ 3806 if (state) /* orthogonal */
3748 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3807 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3749 break; 3808 break;
3750#ifdef scrollBar_esc 3809#ifdef scrollBar_esc
3751 case scrollBar_esc: 3810 case scrollBar_esc:
3752 if (scrollBar.map (state)) 3811 scrollBar.map (state);
3753 {
3754 resize_all_windows (0, 0, 0); 3812 resize_all_windows (0, 0, 0);
3755 scr_touch (true); 3813 scr_touch (true);
3756 }
3757 break; 3814 break;
3758#endif 3815#endif
3759 case 25: /* visible/invisible cursor */ 3816 case 25: /* visible/invisible cursor */
3760 scr_cursor_visible (state); 3817 scr_cursor_visible (state);
3761 break; 3818 break;
… …
3816 } 3873 }
3817} 3874}
3818/*}}} */ 3875/*}}} */
3819 3876
3820/*{{{ process sgr sequences */ 3877/*{{{ process sgr sequences */
3821void 3878void ecb_hot
3822rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3879rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3823{ 3880{
3824 unsigned int i; 3881 unsigned int i;
3825 short rendset; 3882 short rendset;
3826 int rendstyle; 3883 int rendstyle;
… …
3967 break; 4024 break;
3968#endif 4025#endif
3969 } 4026 }
3970 } 4027 }
3971} 4028}
4029
4030void
4031rxvt_term::set_cursor_style (int style)
4032{
4033 if (!IN_RANGE_INC (style, 0, 4))
4034 return;
4035
4036 set_option (Opt_cursorUnderline, style >= 3);
4037
4038#ifdef CURSOR_BLINK
4039 set_option (Opt_cursorBlink, !style || (style & 1));
4040 cursor_blink_reset ();
4041#endif
4042
4043 want_refresh = 1;
4044}
3972/*}}} */ 4045/*}}} */
3973 4046
3974/* ------------------------------------------------------------------------- */ 4047/* ------------------------------------------------------------------------- */
3975 4048
3976/* 4049/*

Diff Legend

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