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.482 by sf-exg, Thu Apr 7 12:19:40 2011 UTC vs.
Revision 1.542 by root, Thu Apr 24 22:32:59 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 405void ecb_cold
405rxvt_term::key_press (XKeyEvent &ev) 406rxvt_term::key_press (XKeyEvent &ev)
406{ 407{
407 int ctrl, meta, shft, len; 408 int ctrl, meta, shft, len;
408 KeySym keysym; 409 KeySym keysym;
409 int valid_keysym; 410 int valid_keysym;
424 ctrl = ev.state & ControlMask; 425 ctrl = ev.state & ControlMask;
425 meta = ev.state & ModMetaMask; 426 meta = ev.state & ModMetaMask;
426 427
427 kbuf[0] = 0; 428 kbuf[0] = 0;
428 429
429#ifdef USE_XIM 430#if USE_XIM
430 if (Input_Context) 431 if (Input_Context)
431 { 432 {
432 Status status_return; 433 Status status_return;
433 434
434#if 0 435#if 0
509#endif 510#endif
510 max_it (lnsppg, 1); 511 max_it (lnsppg, 1);
511 512
512 if (keysym == XK_Prior) 513 if (keysym == XK_Prior)
513 { 514 {
514 scr_page (UP, lnsppg); 515 scr_page (lnsppg);
515 return; 516 return;
516 } 517 }
517 else if (keysym == XK_Next) 518 else if (keysym == XK_Next)
518 { 519 {
519 scr_page (DN, lnsppg); 520 scr_page (-lnsppg);
520 return; 521 return;
521 } 522 }
522 } 523 }
523#ifdef SCROLL_ON_UPDOWN_KEYS 524#ifdef SCROLL_ON_UPDOWN_KEYS
524 if (IS_SCROLL_MOD) 525 if (IS_SCROLL_MOD)
525 { 526 {
526 if (keysym == XK_Up) 527 if (keysym == XK_Up)
527 { 528 {
528 scr_page (UP, 1); 529 scr_page (1);
529 return; 530 return;
530 } 531 }
531 else if (keysym == XK_Down) 532 else if (keysym == XK_Down)
532 { 533 {
533 scr_page (DN, 1); 534 scr_page (-1);
534 return; 535 return;
535 } 536 }
536 } 537 }
537#endif 538#endif
538#ifdef SCROLL_ON_HOMEEND_KEYS 539#ifdef SCROLL_ON_HOMEEND_KEYS
539 if (IS_SCROLL_MOD) 540 if (IS_SCROLL_MOD)
540 { 541 {
541 if (keysym == XK_Home) 542 if (keysym == XK_Home)
542 { 543 {
543 scr_move_to (0, 1); 544 scr_changeview (top_row);
544 return; 545 return;
545 } 546 }
546 else if (keysym == XK_End) 547 else if (keysym == XK_End)
547 { 548 {
548 scr_move_to (1, 1); 549 scr_changeview (0);
549 return; 550 return;
550 } 551 }
551 } 552 }
552#endif 553#endif
553 } 554 }
569 selection_request (ev.time); 570 selection_request (ev.time);
570 return; 571 return;
571#if TODO 572#if TODO
572 /* rxvt extras */ 573 /* rxvt extras */
573 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 574 case XK_KP_Add: /* Shift+KP_Add = bigger font */
574 change_font (FONT_UP);
575 return; 575 return;
576 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 576 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
577 change_font (FONT_DN);
578 return; 577 return;
579#endif 578#endif
580 } 579 }
581 } 580 }
582 } 581 }
781 } 780 }
782 781
783 if (newlen) 782 if (newlen)
784 len = strlen (kbuf); 783 len = strlen (kbuf);
785 784
785 if (len > 0)
786 {
786 /* 787 /*
788 * pass Shift/Control indicators for function keys ending with `~'
789 *
790 * eg,
791 * Prior = "ESC[5~"
792 * Shift+Prior = "ESC[5$"
793 * Ctrl+Prior = "ESC[5^"
794 * Ctrl+Shift+Prior = "ESC[5@"
795 */
796 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
797 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
798
799 /*
787 * Pass meta for all function keys, if 'meta' option set 800 * Pass meta for all function keys, if 'meta' option set
788 */ 801 */
789#ifdef META8_OPTION 802#ifdef META8_OPTION
790 if (meta && (meta_char == 0x80) && len > 0) 803 if (meta && (meta_char == 0x80))
791 kbuf[len - 1] |= 0x80; 804 kbuf[len - 1] |= 0x80;
792#endif 805#endif
806 }
793 807
794 } 808 }
795 else if (ctrl && keysym == XK_minus) 809 else if (ctrl && keysym == XK_minus)
796 { 810 {
797 len = 1; 811 len = 1;
831 { 845 {
832 view_start = 0; 846 view_start = 0;
833 want_refresh = 1; 847 want_refresh = 1;
834 } 848 }
835 849
836 /*
837 * these modifications only affect the static keybuffer
838 * pass Shift/Control indicators for function keys ending with `~'
839 *
840 * eg,
841 * Prior = "ESC[5~"
842 * Shift+Prior = "ESC[5$"
843 * Ctrl+Prior = "ESC[5^"
844 * Ctrl+Shift+Prior = "ESC[5@"
845 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
846 */
847 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
848 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
849
850 /* escape prefix */ 850 /* escape prefix */
851 if (meta 851 if (meta
852#ifdef META8_OPTION 852#ifdef META8_OPTION
853 && meta_char == C0_ESC 853 && meta_char == C0_ESC
854#endif 854#endif
859 } 859 }
860 860
861 tt_write (kbuf, (unsigned int)len); 861 tt_write (kbuf, (unsigned int)len);
862} 862}
863 863
864void 864void ecb_cold
865rxvt_term::key_release (XKeyEvent &ev) 865rxvt_term::key_release (XKeyEvent &ev)
866{ 866{
867#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 867#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
868 KeySym keysym; 868 KeySym keysym;
869 869
941void 941void
942rxvt_term::flush () 942rxvt_term::flush ()
943{ 943{
944 flush_ev.stop (); 944 flush_ev.stop ();
945 945
946#ifdef HAVE_BG_PIXMAP 946#ifdef HAVE_IMG
947 if (bg_flags & BG_NEEDS_REFRESH) 947 if (bg_flags & BG_NEEDS_REFRESH)
948 { 948 {
949 bg_flags &= ~BG_NEEDS_REFRESH; 949 bg_flags &= ~BG_NEEDS_REFRESH;
950 scr_touch (false); 950 scr_touch (false);
951 } 951 }
991 while (row < end_row); 991 while (row < end_row);
992 } 992 }
993 993
994 scr_refresh (); 994 scr_refresh ();
995 scrollBar.show (1); 995 scrollBar.show (1);
996#ifdef USE_XIM 996#if USE_XIM
997 IMSendSpot (); 997 im_send_spot ();
998#endif 998#endif
999 } 999 }
1000 1000
1001 display->flush (); 1001 display->flush ();
1002} 1002}
1020 flush (); 1020 flush ();
1021} 1021}
1022 1022
1023#ifdef CURSOR_BLINK 1023#ifdef CURSOR_BLINK
1024void 1024void
1025rxvt_term::cursor_blink_reset ()
1026{
1027 if (hidden_cursor)
1028 {
1029 hidden_cursor = 0;
1030 want_refresh = 1;
1031 }
1032
1033 if (option (Opt_cursorBlink))
1034 cursor_blink_ev.again ();
1035 else
1036 cursor_blink_ev.stop ();
1037}
1038
1039void
1025rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1040rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1026{ 1041{
1027 hidden_cursor = !hidden_cursor; 1042 hidden_cursor = !hidden_cursor;
1028 want_refresh = 1; 1043 want_refresh = 1;
1029 refresh_check (); 1044 refresh_check ();
1047 1062
1048#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1063#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1049void 1064void
1050rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1065rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1051{ 1066{
1052 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1067 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1053 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1068 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1054 { 1069 {
1055 want_refresh = 1; 1070 want_refresh = 1;
1056 refresh_check (); 1071 refresh_check ();
1057 } 1072 }
1058 else 1073 else
1062 1077
1063#ifdef SELECTION_SCROLLING 1078#ifdef SELECTION_SCROLLING
1064void 1079void
1065rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1080rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1066{ 1081{
1067 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1082 if (scr_page (scroll_selection_lines))
1068 { 1083 {
1069 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1084 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1070 want_refresh = 1; 1085 want_refresh = 1;
1071 refresh_check (); 1086 refresh_check ();
1072 } 1087 }
1077 1092
1078#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1093#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1079void 1094void
1080rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1095rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1081{ 1096{
1082 if (scr_changeview (view_start - mouse_slip_wheel_speed)) 1097 if (scr_page (mouse_slip_wheel_speed))
1083 { 1098 {
1084 want_refresh = 1; 1099 want_refresh = 1;
1085 refresh_check (); 1100 refresh_check ();
1086 } 1101 }
1087 1102
1208 pty_write (); 1223 pty_write ();
1209 1224
1210 refresh_check (); 1225 refresh_check ();
1211} 1226}
1212 1227
1213void 1228void ecb_cold
1214rxvt_term::pointer_unblank () 1229rxvt_term::pointer_unblank ()
1215{ 1230{
1216 XDefineCursor (dpy, vt, TermWin_cursor); 1231 XDefineCursor (dpy, vt, TermWin_cursor);
1217 recolour_cursor (); 1232 recolour_cursor ();
1218 1233
1223 pointer_ev.start (pointerBlankDelay); 1238 pointer_ev.start (pointerBlankDelay);
1224#endif 1239#endif
1225} 1240}
1226 1241
1227#ifdef POINTER_BLANK 1242#ifdef POINTER_BLANK
1228void 1243void ecb_cold
1229rxvt_term::pointer_blank () 1244rxvt_term::pointer_blank ()
1230{ 1245{
1231 if (!option (Opt_pointerBlank)) 1246 if (!option (Opt_pointerBlank))
1232 return; 1247 return;
1233 1248
1235 XFlush (dpy); 1250 XFlush (dpy);
1236 1251
1237 hidden_pointer = 1; 1252 hidden_pointer = 1;
1238} 1253}
1239 1254
1240void 1255void ecb_cold
1241rxvt_term::pointer_cb (ev::timer &w, int revents) 1256rxvt_term::pointer_cb (ev::timer &w, int revents)
1242{ 1257{
1243 make_current (); 1258 make_current ();
1244 1259
1245 pointer_blank (); 1260 pointer_blank ();
1337 32 + x, 1352 32 + x,
1338 32 + y); 1353 32 + y);
1339} 1354}
1340 1355
1341/*{{{ process an X event */ 1356/*{{{ process an X event */
1342void 1357void ecb_hot
1343rxvt_term::x_cb (XEvent &ev) 1358rxvt_term::x_cb (XEvent &ev)
1344{ 1359{
1345 make_current (); 1360 make_current ();
1346 1361
1347 dLocal (Display *, dpy); 1362 dLocal (Display *, dpy);
1450 if (ev.xconfigure.window == parent) 1465 if (ev.xconfigure.window == parent)
1451 { 1466 {
1452 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1467 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1453 ; 1468 ;
1454 1469
1470 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1471
1472 bool moved = false;
1455#ifdef HAVE_BG_PIXMAP 1473#ifdef HAVE_BG_PIXMAP
1456 bool moved = false;
1457 if (bg_window_position_sensitive ()) 1474 if (bg_window_position_sensitive ())
1458 { 1475 {
1476 want_position_change = true;
1477 if (bg_img == 0)
1478 moved = true;
1479 }
1480#endif
1481
1482 if (want_position_change)
1483 {
1459 int x, y; 1484 int x, y;
1485
1460 if (ev.xconfigure.send_event) 1486 if (ev.xconfigure.send_event)
1461 { 1487 {
1462 x = ev.xconfigure.x; 1488 x = ev.xconfigure.x;
1463 y = ev.xconfigure.y; 1489 y = ev.xconfigure.y;
1464 } 1490 }
1465 else 1491 else
1466 get_window_origin (x, y); 1492 get_window_origin (x, y);
1467 1493
1468 if (bg_set_position (x, y) 1494 if (x != parent_x || y != parent_y)
1469 || !(bg_flags & BG_IS_VALID)) 1495 {
1496 parent_x = x;
1497 parent_y = y;
1498 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1470 moved = true; 1499 moved = true;
1500 }
1471 } 1501 }
1472#endif
1473 1502
1474 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1503 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1475 { 1504 {
1476 seen_resize = 1; 1505 seen_resize = 1;
1477 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1506 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1478 } 1507 }
1479 else 1508 else
1480 { 1509 {
1481#ifdef HAVE_BG_PIXMAP 1510#ifdef HAVE_BG_PIXMAP
1482 if (moved) 1511 if (moved)
1483 {
1484 if (mapped)
1485 update_background (); 1512 update_background ();
1486 else
1487 bg_invalidate ();
1488 }
1489#endif 1513#endif
1490 } 1514 }
1491 1515
1492 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1516 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1493 } 1517 }
1505 selection_send (ev.xselectionrequest); 1529 selection_send (ev.xselectionrequest);
1506 break; 1530 break;
1507 1531
1508 case MapNotify: 1532 case MapNotify:
1509#ifdef HAVE_BG_PIXMAP 1533#ifdef HAVE_BG_PIXMAP
1510 /* This is needed specifically to fix the case of no window manager or a 1534 // This is needed at startup for the case of no window manager
1511 * non-reparenting window manager. In those cases we never get first 1535 // or a non-reparenting window manager and also because we
1512 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1536 // defer bg image updates if the window is not mapped. The
1513 * care of multiplicity of ConfigureNotify events arriving while WM does 1537 // short delay is to optimize for multiple ConfigureNotify
1514 * reparenting. 1538 // events at startup when the window manager reparents the
1515 * We should not render background immediately, as there could be several 1539 // 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 1540 // received all of them.
1517 * by scheduling background redraw as soon as we can, but giving a short 1541 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); 1542 update_background_ev.start (0.025);
1524#endif 1543#endif
1525 mapped = 1; 1544 mapped = 1;
1526#ifdef TEXT_BLINK 1545#ifdef TEXT_BLINK
1527 text_blink_ev.start (); 1546 text_blink_ev.start ();
1567 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1586 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1568 ; 1587 ;
1569 1588
1570 if (scrollBar.state && ev.xany.window == scrollBar.win) 1589 if (scrollBar.state && ev.xany.window == scrollBar.win)
1571 { 1590 {
1572 scrollBar.state = STATE_IDLE; 1591 scrollBar.state = SB_STATE_IDLE;
1573 scrollBar.show (0); 1592 scrollBar.show (0);
1574 } 1593 }
1575 } 1594 }
1576 break; 1595 break;
1577 1596
1619 1638
1620#ifdef SELECTION_SCROLLING 1639#ifdef SELECTION_SCROLLING
1621 if (ev.xbutton.y < int_bwidth 1640 if (ev.xbutton.y < int_bwidth
1622 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1641 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1623 { 1642 {
1643 page_dirn scroll_selection_dir;
1624 int dist; 1644 int dist;
1625 1645
1626 /* don't clobber the current delay if we are 1646 /* don't clobber the current delay if we are
1627 * already in the middle of scrolling. 1647 * already in the middle of scrolling.
1628 */ 1648 */
1643 dist = int_bwidth - ev.xbutton.y; 1663 dist = int_bwidth - ev.xbutton.y;
1644 } 1664 }
1645 else 1665 else
1646 { 1666 {
1647 scroll_selection_dir = DN; 1667 scroll_selection_dir = DN;
1648 dist = ev.xbutton.y - (int_bwidth + height); 1668 dist = ev.xbutton.y - (int_bwidth + vt_height);
1649 } 1669 }
1650 1670
1651 scroll_selection_lines = Pixel2Height (dist) 1671 scroll_selection_lines = Pixel2Height (dist)
1652 / SELECTION_SCROLL_LINE_SPEEDUP 1672 / SELECTION_SCROLL_LINE_SPEEDUP
1653 + 1; 1673 + 1;
1654 min_it (scroll_selection_lines, 1674 min_it (scroll_selection_lines,
1655 SELECTION_SCROLL_MAX_LINES); 1675 SELECTION_SCROLL_MAX_LINES);
1676 scroll_selection_lines *= scroll_selection_dir;
1656 } 1677 }
1657 else 1678 else
1658 { 1679 {
1659 /* we are within the text window, so we 1680 /* we are within the text window, so we
1660 * shouldn't be scrolling 1681 * shouldn't be scrolling
1665#ifdef MOUSE_THRESHOLD 1686#ifdef MOUSE_THRESHOLD
1666 } 1687 }
1667#endif 1688#endif
1668 } 1689 }
1669 } 1690 }
1670 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1691 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1671 { 1692 {
1672 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1693 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1673 MotionNotify, &ev)) 1694 MotionNotify, &ev))
1674 ; 1695 ;
1675 1696
1676 XQueryPointer (dpy, scrollBar.win, 1697 XQueryPointer (dpy, scrollBar.win,
1677 &unused_root, &unused_child, 1698 &unused_root, &unused_child,
1678 &unused_root_x, &unused_root_y, 1699 &unused_root_x, &unused_root_y,
1679 &ev.xbutton.x, &ev.xbutton.y, 1700 &ev.xbutton.x, &ev.xbutton.y,
1680 &unused_mask); 1701 &unused_mask);
1681 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1702 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1682 scrollBar.size ()); 1703 scrollBar.size ());
1683 want_refresh = 1; 1704 want_refresh = 1;
1684 scrollBar.show (1); 1705 scrollBar.show (1);
1685 } 1706 }
1686 break; 1707 break;
1687 } 1708 }
1688 1709
1689#if defined(CURSOR_BLINK) 1710#if defined(CURSOR_BLINK)
1690 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1711 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 (); 1712 cursor_blink_reset ();
1699 }
1700#endif 1713#endif
1701 1714
1702#if defined(POINTER_BLANK) 1715#if defined(POINTER_BLANK)
1703 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1716 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1704 { 1717 {
1715 1728
1716 refresh_check (); 1729 refresh_check ();
1717} 1730}
1718 1731
1719#if ENABLE_FRILLS 1732#if ENABLE_FRILLS
1720void 1733void ecb_cold
1721rxvt_term::set_urgency (bool enable) 1734rxvt_term::set_urgency (bool enable)
1722{ 1735{
1723 if (enable == urgency_hint) 1736 if (enable == urgency_hint)
1724 return; 1737 return;
1725 1738
1726 if (XWMHints *h = XGetWMHints (dpy, parent)) 1739 if (XWMHints *h = XGetWMHints (dpy, parent))
1727 { 1740 {
1728 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1741 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1729 XSetWMHints (dpy, parent, h); 1742 XSetWMHints (dpy, parent, h);
1730 urgency_hint = enable; 1743 urgency_hint = enable;
1744 XFree (h);
1731 } 1745 }
1732} 1746}
1733#endif 1747#endif
1734 1748
1735void 1749void ecb_cold
1736rxvt_term::focus_in () 1750rxvt_term::focus_in ()
1737{ 1751{
1738 if (!focus) 1752 if (!focus)
1739 { 1753 {
1740 focus = 1; 1754 focus = 1;
1741 want_refresh = 1; 1755 want_refresh = 1;
1742 1756
1743#if USE_XIM 1757#if USE_XIM
1744 if (Input_Context != NULL) 1758 if (Input_Context != NULL)
1745 { 1759 {
1746 IMSetPosition (); 1760 im_set_position ();
1747 XSetICFocus (Input_Context); 1761 XSetICFocus (Input_Context);
1748 } 1762 }
1749#endif 1763#endif
1750#if CURSOR_BLINK 1764#if CURSOR_BLINK
1751 if (option (Opt_cursorBlink)) 1765 if (option (Opt_cursorBlink))
1765 1779
1766 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1780 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1767 } 1781 }
1768} 1782}
1769 1783
1770void 1784void ecb_cold
1771rxvt_term::focus_out () 1785rxvt_term::focus_out ()
1772{ 1786{
1773 if (focus) 1787 if (focus)
1774 { 1788 {
1775 focus = 0; 1789 focus = 0;
1808 1822
1809 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1823 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1810 } 1824 }
1811} 1825}
1812 1826
1813void 1827void ecb_cold
1814rxvt_term::update_fade_color (unsigned int idx) 1828rxvt_term::update_fade_color (unsigned int idx)
1815{ 1829{
1816#if OFF_FOCUS_FADING 1830#if OFF_FOCUS_FADING
1817 if (rs[Rs_fade]) 1831 if (rs[Rs_fade])
1818 { 1832 {
1821 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1835 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1822 } 1836 }
1823#endif 1837#endif
1824} 1838}
1825 1839
1826#if ENABLE_TRANSPARENCY || ENABLE_PERL 1840#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1827void 1841void ecb_hot
1828rxvt_term::rootwin_cb (XEvent &ev) 1842rxvt_term::rootwin_cb (XEvent &ev)
1829{ 1843{
1830 make_current (); 1844 make_current ();
1831 1845
1832 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1846 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1833 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1847 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1834 return; 1848 return;
1835 1849
1836# if ENABLE_TRANSPARENCY
1837 switch (ev.type) 1850 switch (ev.type)
1838 { 1851 {
1839 case PropertyNotify: 1852 case PropertyNotify:
1840 /* 1853 /*
1841 * if user used some Esetroot compatible prog to set the root bg, 1854 * if user used some Esetroot compatible prog to set the root bg,
1842 * use the property to determine the pixmap. We use it later on. 1855 * use the property to determine the pixmap. We use it later on.
1843 */ 1856 */
1844 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1857 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1845 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1858 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1846 { 1859 {
1847 bg_set_root_pixmap (); 1860#if BG_IMAGE_FROM_ROOT
1861 if (option (Opt_transparent))
1862 {
1863 rxvt_img::new_from_root (this)->replace (root_img);
1848 update_background (); 1864 update_background ();
1865 }
1866#endif
1867 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1849 } 1868 }
1850 1869
1851 break; 1870 break;
1852 } 1871 }
1853# endif
1854 1872
1855 refresh_check (); 1873 refresh_check ();
1856} 1874}
1857#endif 1875#endif
1858 1876
1982 if (scrollBar.upButton (ev.y)) 2000 if (scrollBar.upButton (ev.y))
1983 direction = UP; /* up */ 2001 direction = UP; /* up */
1984 else if (scrollBar.dnButton (ev.y)) 2002 else if (scrollBar.dnButton (ev.y))
1985 direction = DN; /* down */ 2003 direction = DN; /* down */
1986 2004
1987 scrollBar.state = STATE_IDLE; 2005 scrollBar.state = SB_STATE_IDLE;
1988 /* 2006 /*
1989 * Rxvt-style scrollbar: 2007 * Rxvt-style scrollbar:
1990 * move up if mouse is above slider 2008 * move up if mouse is above slider
1991 * move dn if mouse is below slider 2009 * move dn if mouse is below slider
1992 * 2010 *
2031 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2049 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2032#endif 2050#endif
2033 if (scr_page (direction, 1)) 2051 if (scr_page (direction, 1))
2034 { 2052 {
2035 if (direction == UP) 2053 if (direction == UP)
2036 scrollBar.state = STATE_UP; 2054 scrollBar.state = SB_STATE_UP;
2037 else 2055 else
2038 scrollBar.state = STATE_DOWN; 2056 scrollBar.state = SB_STATE_DOWN;
2039 } 2057 }
2040 } 2058 }
2041 else 2059 else
2042 switch (ev.button) 2060 switch (ev.button)
2043 { 2061 {
2044 case Button2: 2062 case Button2:
2045 switch (scrollBar.align) 2063 switch (scrollBar.align)
2046 { 2064 {
2047 case R_SB_ALIGN_TOP: 2065 case SB_ALIGN_TOP:
2048 csrO = 0; 2066 csrO = 0;
2049 break; 2067 break;
2050 case R_SB_ALIGN_CENTRE: 2068 case SB_ALIGN_CENTRE:
2051 csrO = (scrollBar.bot - scrollBar.top) / 2; 2069 csrO = (scrollBar.bot - scrollBar.top) / 2;
2052 break; 2070 break;
2053 case R_SB_ALIGN_BOTTOM: 2071 case SB_ALIGN_BOTTOM:
2054 csrO = scrollBar.bot - scrollBar.top; 2072 csrO = scrollBar.bot - scrollBar.top;
2055 break; 2073 break;
2056 } 2074 }
2057 2075
2058 if (scrollBar.style == R_SB_XTERM 2076 if (scrollBar.style == SB_STYLE_XTERM
2059 || scrollbar_above_slider (ev.y) 2077 || scrollBar.above_slider (ev.y)
2060 || scrollbar_below_slider (ev.y)) 2078 || scrollBar.below_slider (ev.y))
2061 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2079 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2062 2080
2063 scrollBar.state = STATE_MOTION; 2081 scrollBar.state = SB_STATE_MOTION;
2064 break; 2082 break;
2065 2083
2066 case Button1: 2084 case Button1:
2067 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2085 if (scrollBar.align == SB_ALIGN_CENTRE)
2068 csrO = ev.y - scrollBar.top; 2086 csrO = ev.y - scrollBar.top;
2069 /* FALLTHROUGH */ 2087 /* FALLTHROUGH */
2070 2088
2071 case Button3: 2089 case Button3:
2072 if (scrollBar.style != R_SB_XTERM) 2090 if (scrollBar.style != SB_STYLE_XTERM)
2073 { 2091 {
2074 if (scrollbar_above_slider (ev.y)) 2092 if (scrollBar.above_slider (ev.y))
2075# ifdef RXVT_SCROLL_FULL 2093# ifdef RXVT_SCROLL_FULL
2076 scr_page (UP, nrow - 1); 2094 scr_page (UP, nrow - 1);
2077# else 2095# else
2078 scr_page (UP, nrow / 4); 2096 scr_page (UP, nrow / 4);
2079# endif 2097# endif
2080 else if (scrollbar_below_slider (ev.y)) 2098 else if (scrollBar.below_slider (ev.y))
2081# ifdef RXVT_SCROLL_FULL 2099# ifdef RXVT_SCROLL_FULL
2082 scr_page (DN, nrow - 1); 2100 scr_page (DN, nrow - 1);
2083# else 2101# else
2084 scr_page (DN, nrow / 4); 2102 scr_page (DN, nrow / 4);
2085# endif 2103# endif
2086 else 2104 else
2087 scrollBar.state = STATE_MOTION; 2105 scrollBar.state = SB_STATE_MOTION;
2088 } 2106 }
2089 else 2107 else
2090 { 2108 {
2091 scr_page ((ev.button == Button1 ? DN : UP), 2109 scr_page ((ev.button == Button1 ? DN : UP),
2092 (nrow 2110 (nrow
2093 * scrollbar_position (ev.y) 2111 * scrollBar.position (ev.y)
2094 / scrollBar.size ())); 2112 / scrollBar.size ()));
2095 } 2113 }
2096 2114
2097 break; 2115 break;
2098 } 2116 }
2109 2127
2110 csrO = 0; /* reset csr Offset */ 2128 csrO = 0; /* reset csr Offset */
2111 if (!bypass_keystate) 2129 if (!bypass_keystate)
2112 reportmode = !! (priv_modes & PrivMode_mouse_report); 2130 reportmode = !! (priv_modes & PrivMode_mouse_report);
2113 2131
2114 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2132 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2115 { 2133 {
2116 scrollBar.state = STATE_IDLE; 2134 scrollBar.state = SB_STATE_IDLE;
2117 scrollBar.show (0); 2135 scrollBar.show (0);
2118 } 2136 }
2119 2137
2120#ifdef SELECTION_SCROLLING 2138#ifdef SELECTION_SCROLLING
2121 sel_scroll_ev.stop(); 2139 sel_scroll_ev.stop();
2171 case Button3: 2189 case Button3:
2172 selection_make (ev.time); 2190 selection_make (ev.time);
2173 break; 2191 break;
2174 2192
2175 case Button2: 2193 case Button2:
2176 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2194 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2177 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2195 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2178 break; 2196 break;
2179 2197
2180#ifdef MOUSE_WHEEL 2198#ifdef MOUSE_WHEEL
2181 case Button4: 2199 case Button4:
2182 case Button5: 2200 case Button5:
2183 { 2201 {
2184 int i; 2202 int lines;
2185 page_dirn v; 2203 page_dirn dirn;
2186 2204
2187 v = ev.button == Button4 ? UP : DN; 2205 dirn = ev.button == Button4 ? UP : DN;
2188 2206
2189 if (ev.state & ShiftMask) 2207 if (ev.state & ShiftMask)
2190 i = 1; 2208 lines = 1;
2191 else if (option (Opt_mouseWheelScrollPage)) 2209 else if (option (Opt_mouseWheelScrollPage))
2192 i = nrow - 1; 2210 lines = nrow - 1;
2193 else 2211 else
2194 i = 5; 2212 lines = 5;
2195 2213
2196# ifdef MOUSE_SLIP_WHEELING 2214# ifdef MOUSE_SLIP_WHEELING
2197 if (ev.state & ControlMask) 2215 if (ev.state & ControlMask)
2198 { 2216 {
2199 mouse_slip_wheel_speed += v ? -1 : 1; 2217 mouse_slip_wheel_speed += dirn;
2200 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2218 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2201 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2202 2219
2203 if (!slip_wheel_ev.is_active ()) 2220 if (!slip_wheel_ev.is_active ())
2204 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2221 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2205 } 2222 }
2206 else 2223 else
2207# endif 2224# endif
2208 { 2225 {
2209 scr_page (v, i); 2226 scr_page (dirn, lines);
2210 scrollBar.show (1); 2227 scrollBar.show (1);
2211 } 2228 }
2212 } 2229 }
2213 break; 2230 break;
2214#endif 2231#endif
2216 } 2233 }
2217} 2234}
2218 2235
2219/*}}} */ 2236/*}}} */
2220 2237
2221void 2238void ecb_hot
2222rxvt_term::cmd_parse () 2239rxvt_term::cmd_parse ()
2223{ 2240{
2224 wchar_t ch = NOCHAR; 2241 wchar_t ch = NOCHAR;
2225 char *seq_begin; // remember start of esc-sequence here 2242 char *seq_begin; // remember start of esc-sequence here
2226 2243
2227 for (;;) 2244 for (;;)
2228 { 2245 {
2229 if (expect_false (ch == NOCHAR)) 2246 if (ecb_unlikely (ch == NOCHAR))
2230 { 2247 {
2231 seq_begin = cmdbuf_ptr; 2248 seq_begin = cmdbuf_ptr;
2232 ch = next_char (); 2249 ch = next_char ();
2233 2250
2234 if (ch == NOCHAR) 2251 if (ch == NOCHAR)
2235 break; 2252 break;
2236 } 2253 }
2237 2254
2238 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)) 2255 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2239 { 2256 {
2240 if (expect_false (!seen_input)) 2257 if (ecb_unlikely (!seen_input))
2241 { 2258 {
2242 seen_input = 1; 2259 seen_input = 1;
2243 // many badly-written programs (e.g. jed) contain a race condition: 2260 // many badly-written programs (e.g. jed) contain a race condition:
2244 // they first read the screensize and then install a SIGWINCH handler. 2261 // they first read the screensize and then install a SIGWINCH handler.
2245 // some window managers resize the window early, and these programs 2262 // some window managers resize the window early, and these programs
2258 wchar_t *str = buf; 2275 wchar_t *str = buf;
2259 wchar_t *eol = str + min (ncol, UBUFSIZ); 2276 wchar_t *eol = str + min (ncol, UBUFSIZ);
2260 2277
2261 for (;;) 2278 for (;;)
2262 { 2279 {
2263 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))) 2280 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2264 break; 2281 break;
2265 2282
2266 *str++ = ch; 2283 *str++ = ch;
2267 2284
2268 if (expect_false (ch == C0_LF || str >= eol)) 2285 if (ecb_unlikely (ch == C0_LF || str >= eol))
2269 { 2286 {
2270 if (ch == C0_LF) 2287 if (ch == C0_LF)
2271 nlines++; 2288 nlines++;
2272 2289
2273 refresh_count++; 2290 refresh_count++;
2345 } 2362 }
2346 } 2363 }
2347} 2364}
2348 2365
2349// read the next character 2366// read the next character
2350wchar_t 2367wchar_t ecb_hot
2351rxvt_term::next_char () NOTHROW 2368rxvt_term::next_char () NOTHROW
2352{ 2369{
2353 while (cmdbuf_ptr < cmdbuf_endp) 2370 while (cmdbuf_ptr < cmdbuf_endp)
2354 { 2371 {
2355 // assume 7-bit to be ascii ALWAYS 2372 // assume 7-bit to be ascii ALWAYS
2356 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2373 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2357 return *cmdbuf_ptr++; 2374 return *cmdbuf_ptr++;
2358 2375
2359 wchar_t wc; 2376 wchar_t wc;
2360 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2377 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2361 2378
2367 } 2384 }
2368 2385
2369 if (len == (size_t)-1) 2386 if (len == (size_t)-1)
2370 { 2387 {
2371 mbstate.reset (); // reset now undefined conversion state 2388 mbstate.reset (); // reset now undefined conversion state
2389 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2390 // in which case we "erroneously" return the next byte which might be valid.
2372 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2391 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2373 } 2392 }
2374 2393
2375 // assume wchar == unicode 2394 // assume wchar == unicode
2376 cmdbuf_ptr += len; 2395 cmdbuf_ptr += len;
2379 2398
2380 return NOCHAR; 2399 return NOCHAR;
2381} 2400}
2382 2401
2383// read the next octet 2402// read the next octet
2384uint32_t 2403uint32_t ecb_hot
2385rxvt_term::next_octet () NOTHROW 2404rxvt_term::next_octet () NOTHROW
2386{ 2405{
2387 return cmdbuf_ptr < cmdbuf_endp 2406 return cmdbuf_ptr < cmdbuf_endp
2388 ? (unsigned char)*cmdbuf_ptr++ 2407 ? (unsigned char)*cmdbuf_ptr++
2389 : NOCHAR; 2408 : NOCHAR;
2390} 2409}
2391 2410
2392static class out_of_input out_of_input; 2411static class out_of_input out_of_input;
2393 2412
2394/* rxvt_cmd_getc () - Return next input character */ 2413wchar_t ecb_hot
2395/*
2396 * Return the next input character after first passing any keyboard input
2397 * to the command.
2398 */
2399wchar_t
2400rxvt_term::cmd_getc () THROW ((class out_of_input)) 2414rxvt_term::cmd_getc () THROW ((class out_of_input))
2401{ 2415{
2402 wchar_t c = next_char (); 2416 wchar_t c = next_char ();
2403 2417
2404 if (c == NOCHAR) 2418 if (c == NOCHAR)
2405 throw out_of_input; 2419 throw out_of_input;
2406 2420
2407 return c; 2421 return c;
2408} 2422}
2409 2423
2410uint32_t 2424uint32_t ecb_hot
2411rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2425rxvt_term::cmd_get8 () THROW ((class out_of_input))
2412{ 2426{
2413 uint32_t c = next_octet (); 2427 uint32_t c = next_octet ();
2414 2428
2415 if (c == NOCHAR) 2429 if (c == NOCHAR)
2419} 2433}
2420 2434
2421/*{{{ print pipe */ 2435/*{{{ print pipe */
2422/*----------------------------------------------------------------------*/ 2436/*----------------------------------------------------------------------*/
2423#ifdef PRINTPIPE 2437#ifdef PRINTPIPE
2424FILE * 2438FILE * ecb_cold
2425rxvt_term::popen_printer () 2439rxvt_term::popen_printer ()
2426{ 2440{
2427 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w"); 2441 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2428 2442
2429 if (stream == NULL) 2443 if (stream == NULL)
2430 rxvt_warn ("can't open printer pipe, not printing.\n"); 2444 rxvt_warn ("can't open printer pipe, not printing.\n");
2431 2445
2432 return stream; 2446 return stream;
2433} 2447}
2434 2448
2435int 2449int ecb_cold
2436rxvt_term::pclose_printer (FILE *stream) 2450rxvt_term::pclose_printer (FILE *stream)
2437{ 2451{
2438 fflush (stream); 2452 fflush (stream);
2439 return pclose (stream); 2453 return pclose (stream);
2440} 2454}
2441 2455
2442/* 2456/*
2443 * simulate attached vt100 printer 2457 * simulate attached vt100 printer
2444 */ 2458 */
2445void 2459void ecb_cold
2446rxvt_term::process_print_pipe () 2460rxvt_term::process_print_pipe ()
2447{ 2461{
2448 FILE *fd = popen_printer (); 2462 FILE *fd = popen_printer ();
2449 2463
2450 if (!fd) 2464 if (!fd)
2496 pclose_printer (fd); 2510 pclose_printer (fd);
2497} 2511}
2498#endif /* PRINTPIPE */ 2512#endif /* PRINTPIPE */
2499/*}}} */ 2513/*}}} */
2500 2514
2501/* *INDENT-OFF* */
2502enum { 2515enum {
2503 C1_40 = 0x40, 2516 C1_40 = 0x40,
2504 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2517 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2505 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2518 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2506 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2519 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2507 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2520 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2508}; 2521};
2509/* *INDENT-ON* */
2510 2522
2511/*{{{ process non-printing single characters */ 2523/*{{{ process non-printing single characters */
2512void 2524void ecb_hot
2513rxvt_term::process_nonprinting (unicode_t ch) 2525rxvt_term::process_nonprinting (unicode_t ch)
2514{ 2526{
2515 switch (ch) 2527 switch (ch)
2516 { 2528 {
2517 case C0_ESC: 2529 case C0_ESC:
2563} 2575}
2564/*}}} */ 2576/*}}} */
2565 2577
2566 2578
2567/*{{{ process VT52 escape sequences */ 2579/*{{{ process VT52 escape sequences */
2568void 2580void ecb_cold
2569rxvt_term::process_escape_vt52 (unicode_t ch) 2581rxvt_term::process_escape_vt52 (unicode_t ch)
2570{ 2582{
2571 int row, col; 2583 int row, col;
2572 2584
2573 switch (ch) 2585 switch (ch)
2607 break; 2619 break;
2608 case 'Z': /* identify the terminal type */ 2620 case 'Z': /* identify the terminal type */
2609 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2621 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2610 break; 2622 break;
2611 case '<': /* turn off VT52 mode */ 2623 case '<': /* turn off VT52 mode */
2612 set_privmode (PrivMode_vt52, 0); 2624 priv_modes &= ~PrivMode_vt52;
2613 break; 2625 break;
2614 case 'F': /* use special graphics character set */ 2626 case 'F': /* use special graphics character set */
2615 case 'G': /* use regular character set */ 2627 case 'G': /* use regular character set */
2616 /* unimplemented */ 2628 /* unimplemented */
2617 break; 2629 break;
2623} 2635}
2624/*}}} */ 2636/*}}} */
2625 2637
2626 2638
2627/*{{{ process escape sequences */ 2639/*{{{ process escape sequences */
2628void 2640void ecb_hot
2629rxvt_term::process_escape_seq () 2641rxvt_term::process_escape_seq ()
2630{ 2642{
2631 unicode_t ch = cmd_getc (); 2643 unicode_t ch = cmd_getc ();
2632 2644
2633 if (priv_modes & PrivMode_vt52) 2645 if (priv_modes & PrivMode_vt52)
2636 return; 2648 return;
2637 } 2649 }
2638 2650
2639 switch (ch) 2651 switch (ch)
2640 { 2652 {
2641 /* case 1: do_tek_mode (); break; */
2642 case '#': 2653 case '#':
2643 if (cmd_getc () == '8') 2654 if (cmd_getc () == '8')
2644 scr_E (); 2655 scr_E ();
2645 break; 2656 break;
2646 case '(': 2657 case '(':
2669#if !ENABLE_MINIMAL 2680#if !ENABLE_MINIMAL
2670 case '9': 2681 case '9':
2671 scr_forwardindex (); 2682 scr_forwardindex ();
2672 break; 2683 break;
2673#endif 2684#endif
2685 // DECPAM/DECPNM
2674 case '=': 2686 case '=':
2687 priv_modes |= PrivMode_aplKP;
2688 break;
2675 case '>': 2689 case '>':
2676 set_privmode (PrivMode_aplKP, ch == '='); 2690 priv_modes &= ~PrivMode_aplKP;
2677 break; 2691 break;
2678 2692
2679 case C1_40: 2693 case C1_40:
2680 cmd_getc (); 2694 cmd_getc ();
2681 break; 2695 break;
2685 2699
2686 /* 8.3.87: NEXT LINE */ 2700 /* 8.3.87: NEXT LINE */
2687 case C1_NEL: /* ESC E */ 2701 case C1_NEL: /* ESC E */
2688 { 2702 {
2689 wchar_t nlcr[] = { C0_LF, C0_CR }; 2703 wchar_t nlcr[] = { C0_LF, C0_CR };
2690 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1); 2704 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2691 } 2705 }
2692 break; 2706 break;
2693 2707
2694 /* kidnapped escape sequence: Should be 8.3.48 */ 2708 /* kidnapped escape sequence: Should be 8.3.48 */
2695 case C1_ESA: /* ESC G */ 2709 case C1_ESA: /* ESC G */
2707 case C1_RI: /* ESC M */ 2721 case C1_RI: /* ESC M */
2708 scr_index (DN); 2722 scr_index (DN);
2709 break; 2723 break;
2710 2724
2711 /* 8.3.142: SINGLE-SHIFT TWO */ 2725 /* 8.3.142: SINGLE-SHIFT TWO */
2712 /*case C1_SS2: scr_single_shift (2); break; */ 2726 /* case C1_SS2: break; */
2713 2727
2714 /* 8.3.143: SINGLE-SHIFT THREE */ 2728 /* 8.3.143: SINGLE-SHIFT THREE */
2715 /*case C1_SS3: scr_single_shift (3); break; */ 2729 /* case C1_SS3: break; */
2716 2730
2717 /* 8.3.27: DEVICE CONTROL STRING */ 2731 /* 8.3.27: DEVICE CONTROL STRING */
2718 case C1_DCS: /* ESC P */ 2732 case C1_DCS: /* ESC P */
2719 process_dcs_seq (); 2733 process_dcs_seq ();
2720 break; 2734 break;
2753 } 2767 }
2754} 2768}
2755/*}}} */ 2769/*}}} */
2756 2770
2757/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2771/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2758/* *INDENT-OFF* */
2759enum { 2772enum {
2760 CSI_ICH = 0x40, 2773 CSI_ICH = 0x40,
2761 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2774 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2762 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2775 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2763 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2776 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
2783 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2796 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2784 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2797 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2785 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2798 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2786 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2799 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2787 }; 2800 };
2788/* *INDENT-ON* */
2789 2801
2790void 2802void ecb_hot
2791rxvt_term::process_csi_seq () 2803rxvt_term::process_csi_seq ()
2792{ 2804{
2793 unicode_t ch, priv, i; 2805 unicode_t ch, priv, prev_ch, i;
2794 unsigned int nargs, p; 2806 unsigned int nargs, p;
2795 int n, ndef; 2807 int n, ndef;
2796 int arg[ESC_ARGS] = { }; 2808 int arg[ESC_ARGS] = { };
2797 2809
2798 nargs = 0; 2810 nargs = 0;
2804 /* '<' '=' '>' '?' '!' */ 2816 /* '<' '=' '>' '?' '!' */
2805 priv = ch; 2817 priv = ch;
2806 ch = cmd_getc (); 2818 ch = cmd_getc ();
2807 } 2819 }
2808 2820
2821 prev_ch = 0;
2809 /* read any numerical arguments */ 2822 /* read any numerical arguments */
2810 for (n = -1; ch < CSI_ICH; ) 2823 for (n = -1; ch < CSI_ICH; )
2811 { 2824 {
2812 if (isdigit (ch)) 2825 if (isdigit (ch))
2813 { 2826 {
2823 n = -1; 2836 n = -1;
2824 } 2837 }
2825 else if (IS_CONTROL (ch)) 2838 else if (IS_CONTROL (ch))
2826 process_nonprinting (ch); 2839 process_nonprinting (ch);
2827 2840
2841 prev_ch = ch;
2828 ch = cmd_getc (); 2842 ch = cmd_getc ();
2829 } 2843 }
2830 2844
2831 if (ch > CSI_7F) 2845 if (ch > CSI_7F)
2832 return; 2846 return;
2873 scr_soft_reset (); 2887 scr_soft_reset ();
2874 2888
2875 static const int pm_h[] = { 7, 25 }; 2889 static const int pm_h[] = { 7, 25 };
2876 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 }; 2890 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2877 2891
2878 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h); 2892 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2879 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l); 2893 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2880 } 2894 }
2881 break; 2895 break;
2882 } 2896 }
2883 2897
2884 return; 2898 return;
2902 } 2916 }
2903 break; 2917 break;
2904#endif 2918#endif
2905 2919
2906 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2920 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2907 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2921 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2908 arg[0] = -arg[0]; 2922 arg[0] = -arg[0];
2909 /* FALLTHROUGH */ 2923 /* FALLTHROUGH */
2910 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2924 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2911 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2925 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2912 scr_gotorc (arg[0], 0, RELATIVE); 2926 scr_gotorc (arg[0], 0, RELATIVE);
2913 break; 2927 break;
2914 2928
2915 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2929 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2916 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2930 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
3066 scr_insert_mode (1); 3080 scr_insert_mode (1);
3067 else if (arg[0] == 20) 3081 else if (arg[0] == 20)
3068 priv_modes |= PrivMode_LFNL; 3082 priv_modes |= PrivMode_LFNL;
3069 break; 3083 break;
3070 3084
3085 case CSI_71: // DESCUSR: set cursor style
3086 if (prev_ch == ' ')
3087 set_cursor_style (arg[0]);
3088 break;
3089
3071 /* 3090 /*
3072 * PRIVATE USE beyond this point. All CSI_7? sequences here 3091 * PRIVATE USE beyond this point. All CSI_7? sequences here
3073 */ 3092 */
3074 case CSI_72: /* DECSTBM: set top and bottom margins */ 3093 case CSI_72: /* DECSTBM: set top and bottom margins */
3075 if (nargs == 1) 3094 if (nargs == 1)
3103 } 3122 }
3104} 3123}
3105/*}}} */ 3124/*}}} */
3106 3125
3107#if !ENABLE_MINIMAL 3126#if !ENABLE_MINIMAL
3108/* ARGSUSED */
3109void 3127void
3110rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3128rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3111{ 3129{
3112 int x, y; 3130 int x, y;
3113 XWindowAttributes wattr; 3131 XWindowAttributes wattr;
3150 break; 3168 break;
3151 3169
3152 //case 9: NYI, TODO, restore maximized window or maximize window 3170 //case 9: NYI, TODO, restore maximized window or maximize window
3153 default: 3171 default:
3154 if (args[0] >= 24) /* set height (chars) */ 3172 if (args[0] >= 24) /* set height (chars) */
3155 set_widthheight ((unsigned int)width, 3173 set_widthheight ((unsigned int)vt_width,
3156 (unsigned int) (args[1] * fheight)); 3174 (unsigned int) (args[1] * fheight));
3157 break; 3175 break;
3158 3176
3159 /* 3177 /*
3160 * reports - some output format copied from XTerm 3178 * reports - some output format copied from XTerm
3209rxvt_term::get_to_st (unicode_t &ends_how) 3227rxvt_term::get_to_st (unicode_t &ends_how)
3210{ 3228{
3211 unicode_t ch; 3229 unicode_t ch;
3212 bool seen_esc = false; 3230 bool seen_esc = false;
3213 unsigned int n = 0; 3231 unsigned int n = 0;
3214 wchar_t string[STRING_MAX]; 3232 wchar_t string[CBUFSIZ];
3215 3233
3216 while ((ch = cmd_getc ()) != NOCHAR) 3234 while ((ch = cmd_getc ()) != NOCHAR)
3217 { 3235 {
3218 if (seen_esc) 3236 if (seen_esc)
3219 { 3237 {
3234 else if (ch < 0x20) 3252 else if (ch < 0x20)
3235 return NULL; /* other control character - exit */ 3253 return NULL; /* other control character - exit */
3236 3254
3237 seen_esc = false; 3255 seen_esc = false;
3238 3256
3239 if (n >= STRING_MAX - 1) 3257 if (n >= sizeof (string) - 1)
3240 // stop at some sane length 3258 // stop at some sane length
3241 return NULL; 3259 return NULL;
3242 3260
3243 string[n++] = ch; 3261 string[n++] = ch;
3244 } 3262 }
3361 &nitems, &bytes_after, &value) == Success 3379 &nitems, &bytes_after, &value) == Success
3362 && actual_type != None 3380 && actual_type != None
3363 && actual_format == 8) 3381 && actual_format == 8)
3364 str = (const char *)(value); 3382 str = (const char *)(value);
3365 3383
3366 tt_printf ("\033]%d;%s%c", op, str, resp); 3384 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3367 3385
3368 XFree (value); 3386 XFree (value);
3369 } 3387 }
3370 else 3388 else
3371 { 3389 {
3439 break; 3457 break;
3440#endif 3458#endif
3441 case URxvt_Color_border: 3459 case URxvt_Color_border:
3442 process_color_seq (op, Color_border, str, resp); 3460 process_color_seq (op, Color_border, str, resp);
3443 break; 3461 break;
3444#if ENABLE_TRANSPARENCY 3462
3463#if BG_IMAGE_FROM_ROOT
3445 case URxvt_Color_tint: 3464 case URxvt_Color_tint:
3446 process_color_seq (op, Color_tint, str, resp); 3465 process_color_seq (op, Color_tint, str, resp);
3447 { 3466 {
3448 bool changed = false; 3467 bool changed = false;
3449 3468
3450 if (ISSET_PIXCOLOR (Color_tint)) 3469 if (ISSET_PIXCOLOR (Color_tint))
3451 changed = bg_set_tint (pix_colors_focused [Color_tint]); 3470 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3452 3471
3453 if (changed) 3472 if (changed)
3454 update_background (); 3473 update_background ();
3455 } 3474 }
3456 3475
3460#if BG_IMAGE_FROM_FILE 3479#if BG_IMAGE_FROM_FILE
3461 case Rxvt_Pixmap: 3480 case Rxvt_Pixmap:
3462 if (!strcmp (str, "?")) 3481 if (!strcmp (str, "?"))
3463 { 3482 {
3464 char str[256]; 3483 char str[256];
3484 int h_scale = fimage.h_scale;
3485 int v_scale = fimage.v_scale;
3486 int h_align = fimage.h_align;
3487 int v_align = fimage.v_align;
3465 3488
3466 sprintf (str, "[%dx%d+%d+%d]", 3489 sprintf (str, "[%dx%d+%d+%d]",
3467 min (h_scale, 32767), min (v_scale, 32767), 3490 h_scale, v_scale,
3468 min (h_align, 32767), min (v_align, 32767)); 3491 h_align, v_align);
3469 process_xterm_seq (XTerm_title, str, CHAR_ST); 3492 process_xterm_seq (XTerm_title, str, CHAR_ST);
3470 } 3493 }
3471 else 3494 else
3472 { 3495 {
3473 int changed = 0; 3496 bool changed = false;
3474 3497
3475 if (*str != ';') 3498 if (*str != ';')
3476 { 3499 {
3477 if (bg_set_file (str)) /* change pixmap */ 3500 try
3478 { 3501 {
3502 fimage.set_file_geometry (this, str);
3479 changed++; 3503 changed = true;
3480 str = strchr (str, ';');
3481 if (str == NULL)
3482 bg_set_default_geometry ();
3483 else 3504 }
3484 bg_set_geometry (str+1); 3505 catch (const class rxvt_failure_exception &e)
3506 {
3485 } 3507 }
3486 } 3508 }
3487 else 3509 else
3488 { 3510 {
3489 str++; 3511 str++;
3490 if (bg_set_geometry (str, true)) 3512 if (fimage.set_geometry (str, true))
3491 changed++; 3513 changed = true;
3492 } 3514 }
3493 3515
3494 if (changed) 3516 if (changed)
3495 { 3517 {
3496 if (bg_window_position_sensitive ()) 3518 if (bg_window_position_sensitive ())
3497 { 3519 {
3498 int x, y; 3520 int x, y;
3499 get_window_origin (x, y); 3521 get_window_origin (x, y);
3500 bg_set_position (x, y); 3522 parent_x = x;
3523 parent_y = y;
3501 } 3524 }
3502 update_background (); 3525 update_background ();
3503 } 3526 }
3504 } 3527 }
3505 break; 3528 break;
3595 * 's' = save 3618 * 's' = save
3596 * 'r' = restore 3619 * 'r' = restore
3597 * 't' = toggle 3620 * 't' = toggle
3598 * so no need for fancy checking 3621 * so no need for fancy checking
3599 */ 3622 */
3600int 3623int ecb_cold
3601rxvt_term::privcases (int mode, unsigned long bit) 3624rxvt_term::privcases (int mode, unsigned long bit)
3602{ 3625{
3603 int state; 3626 int state;
3604 3627
3605 if (mode == 's') 3628 if (mode == 's')
3606 { 3629 {
3607 SavedModes |= (priv_modes & bit); 3630 if (priv_modes & bit)
3631 SavedModes |= bit;
3632 else
3633 SavedModes &= ~bit;
3608 return -1; 3634 return -1;
3609 } 3635 }
3610 else 3636 else
3611 { 3637 {
3612 if (mode == 'r') 3638 if (mode == 'r')
3613 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3639 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3614 else 3640 else
3615 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3641 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3616 3642
3617 set_privmode (bit, state); 3643 if (state)
3644 priv_modes |= bit;
3645 else
3646 priv_modes &= ~bit;
3618 } 3647 }
3619 3648
3620 return state; 3649 return state;
3621} 3650}
3622 3651
3623/* we're not using priv _yet_ */ 3652/* we're not using priv _yet_ */
3624void 3653void
3625rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3654rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3626{ 3655{
3627 unsigned int i, j; 3656 unsigned int i, j;
3628 int state; 3657 int state;
3629 3658
3630 static const struct 3659 static const struct
3631 { 3660 {
3632 const int argval; 3661 const int argval;
3633 const unsigned long bit; 3662 const unsigned long bit;
3634 } argtopriv[] = { 3663 } argtopriv[] = {
3635 { 1, PrivMode_aplCUR }, // DECCKM 3664 { 1, PrivMode_aplCUR }, // DECCKM
3636 { 2, PrivMode_vt52 }, 3665 { 2, PrivMode_vt52 }, // DECANM
3637 { 3, PrivMode_132 }, // DECCOLM 3666 { 3, PrivMode_132 }, // DECCOLM
3638 { 4, PrivMode_smoothScroll }, // DECSCLM 3667 { 4, PrivMode_smoothScroll }, // DECSCLM
3639 { 5, PrivMode_rVideo }, // DECSCNM 3668 { 5, PrivMode_rVideo }, // DECSCNM
3640 { 6, PrivMode_relOrigin }, // DECOM 3669 { 6, PrivMode_relOrigin }, // DECOM
3641 { 7, PrivMode_Autowrap }, // DECAWM 3670 { 7, PrivMode_Autowrap }, // DECAWM
3642 // 8, auto-repeat keys // DECARM 3671 // 8, auto-repeat keys // DECARM
3643 { 9, PrivMode_MouseX10 }, 3672 { 9, PrivMode_MouseX10 },
3644 // 18 end FF to printer after print screen 3673 // 18 end FF to printer after print screen
3645 // 19 Print screen prints full screen/scroll region 3674 // 19 Print screen prints full screen/scroll region
3646 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3675 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3647#ifdef scrollBar_esc 3676#ifdef scrollBar_esc
3648 { scrollBar_esc, PrivMode_scrollBar }, 3677 { scrollBar_esc, PrivMode_scrollBar },
3649#endif 3678#endif
3650 { 35, PrivMode_ShiftKeys }, // rxvt extension 3679 { 35, PrivMode_ShiftKeys }, // rxvt extension
3651 // 38, tektronix mode // DECTEK 3680 // 38, tektronix mode // DECTEK
3652 { 40, PrivMode_132OK }, 3681 { 40, PrivMode_132OK },
3653 // 41 xterm more fixes NYI 3682 // 41 xterm more fixes NYI
3654 // 45 margin bell NYI 3683 // 45 margin bell NYI
3655 // 46 start logging 3684 // 46 start logging
3656 { 47, PrivMode_Screen }, 3685 { 47, PrivMode_Screen },
3657 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3686 { 66, PrivMode_aplKP }, // DECNKM
3658#ifndef NO_BACKSPACE_KEY 3687#ifndef NO_BACKSPACE_KEY
3659 { 67, PrivMode_BackSpace }, // DECBKM 3688 { 67, PrivMode_BackSpace }, // DECBKM
3660#endif 3689#endif
3661 { 1000, PrivMode_MouseX11 }, 3690 { 1000, PrivMode_MouseX11 },
3662 { 1002, PrivMode_MouseBtnEvent }, 3691 { 1002, PrivMode_MouseBtnEvent },
3691 for (i = 0; i < nargs; i++) 3720 for (i = 0; i < nargs; i++)
3692 { 3721 {
3693 state = -1; 3722 state = -1;
3694 3723
3695 /* basic handling */ 3724 /* basic handling */
3696 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++) 3725 for (j = 0; j < ecb_array_length (argtopriv); j++)
3697 if (argtopriv[j].argval == arg[i]) 3726 if (argtopriv[j].argval == arg[i])
3698 { 3727 {
3699 state = privcases (mode, argtopriv[j].bit); 3728 state = privcases (mode, argtopriv[j].bit);
3700 break; 3729 break;
3701 } 3730 }
3727 case 2: /* VT52 mode */ 3756 case 2: /* VT52 mode */
3728 /* oddball mode. should be set regardless of set/reset 3757 /* oddball mode. should be set regardless of set/reset
3729 * parameter. Return from VT52 mode with an ESC < from 3758 * parameter. Return from VT52 mode with an ESC < from
3730 * within VT52 mode 3759 * within VT52 mode
3731 */ 3760 */
3732 set_privmode (PrivMode_vt52, 1); 3761 priv_modes |= PrivMode_vt52;
3733 break; 3762 break;
3734 case 3: /* 80/132 */ 3763 case 3: /* 80/132 */
3735 if (priv_modes & PrivMode_132OK) 3764 if (priv_modes & PrivMode_132OK)
3736 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight); 3765 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3737 break; 3766 break;
3752 if (state) /* orthogonal */ 3781 if (state) /* orthogonal */
3753 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3782 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3754 break; 3783 break;
3755#ifdef scrollBar_esc 3784#ifdef scrollBar_esc
3756 case scrollBar_esc: 3785 case scrollBar_esc:
3757 if (scrollBar.map (state)) 3786 scrollBar.map (state);
3758 {
3759 resize_all_windows (0, 0, 0); 3787 resize_all_windows (0, 0, 0);
3760 scr_touch (true); 3788 scr_touch (true);
3761 }
3762 break; 3789 break;
3763#endif 3790#endif
3764 case 25: /* visible/invisible cursor */ 3791 case 25: /* visible/invisible cursor */
3765 scr_cursor_visible (state); 3792 scr_cursor_visible (state);
3766 break; 3793 break;
3821 } 3848 }
3822} 3849}
3823/*}}} */ 3850/*}}} */
3824 3851
3825/*{{{ process sgr sequences */ 3852/*{{{ process sgr sequences */
3826void 3853void ecb_hot
3827rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3854rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3828{ 3855{
3829 unsigned int i; 3856 unsigned int i;
3830 short rendset; 3857 short rendset;
3831 int rendstyle; 3858 int rendstyle;
3972 break; 3999 break;
3973#endif 4000#endif
3974 } 4001 }
3975 } 4002 }
3976} 4003}
4004
4005void
4006rxvt_term::set_cursor_style (int style)
4007{
4008 if (!IN_RANGE_INC (style, 0, 4))
4009 return;
4010
4011 set_option (Opt_cursorUnderline, style >= 3);
4012
4013#ifdef CURSOR_BLINK
4014 set_option (Opt_cursorBlink, !style || (style & 1));
4015 cursor_blink_reset ();
4016#endif
4017
4018 want_refresh = 1;
4019}
3977/*}}} */ 4020/*}}} */
3978 4021
3979/* ------------------------------------------------------------------------- */ 4022/* ------------------------------------------------------------------------- */
3980 4023
3981/* 4024/*

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines