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.496 by sf-exg, Wed Aug 31 22:39:49 2011 UTC vs.
Revision 1.543 by sf-exg, Sat Apr 26 14:07:36 2014 UTC

… …
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com> 10 * Copyright (c) 1995 Garrett D'Amore <garrett@netcom.com>
11 * - vt100 printing 11 * - vt100 printing
12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu> 12 * Copyright (c) 1995 Steven Hirsch <hirsch@emba.uvm.edu>
13 * - X11 mouse report mode and support for 13 * - X11 mouse report mode and support for
14 * DEC "private mode" save/restore functions. 14 * DEC "private mode" save/restore functions.
… …
20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es> 20 * Copyright (c) 1997 Raul Garcia Garcia <rgg@tid.es>
21 * - modification and cleanups for Solaris 2.x 21 * - modification and cleanups for Solaris 2.x
22 * and Linux 1.2.x 22 * and Linux 1.2.x
23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 23 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 24 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-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 = iso14755buf & ISO_14755_MASK; 266 wchar_t ch = iso14755buf & ISO_14755_MASK;
263 267
264 if (iso14755buf & ISO_14755_51) 268 if (iso14755buf & ISO_14755_51)
… …
282 } 286 }
283 287
284 iso14755buf = 0; 288 iso14755buf = 0;
285} 289}
286 290
287static int 291static int ecb_cold
288hex_keyval (XKeyEvent &ev) 292hex_keyval (XKeyEvent &ev)
289{ 293{
290 // check whether this event corresponds to a hex digit 294 // check whether this event corresponds to a hex digit
291 // if the modifiers had not been pressed. 295 // if the modifiers had not been pressed.
292 for (int index = 0; index < 8; index++) 296 for (int index = 0; index < 8; index++)
… …
301 305
302 return -1; 306 return -1;
303} 307}
304#endif 308#endif
305 309
306static inline KeySym 310static inline KeySym ecb_cold
307translate_keypad (KeySym keysym, bool kp) 311translate_keypad (KeySym keysym, bool kp)
308{ 312{
309#ifdef XK_KP_Home 313#ifdef XK_KP_Home
310 static const KeySym keypadtrans[] = { 314 static const KeySym keypadtrans[] = {
311 XK_KP_7, // XK_KP_Home 315 XK_KP_7, // XK_KP_Home
… …
337# endif 341# endif
338#endif 342#endif
339 return keysym; 343 return keysym;
340} 344}
341 345
342static inline int 346static inline int ecb_cold
343map_function_key (KeySym keysym) 347map_function_key (KeySym keysym)
344{ 348{
345 int param = 0; 349 int param = 0;
346 350
347 if (IN_RANGE_INC (keysym, XK_F1, XK_F35)) 351 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
… …
396 break; 400 break;
397 } 401 }
398 return param; 402 return param;
399} 403}
400 404
401void 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
402rxvt_term::key_press (XKeyEvent &ev) 415rxvt_term::key_press (XKeyEvent &ev)
403{ 416{
404 int ctrl, meta, shft, len; 417 int ctrl, meta, shft, len;
405 KeySym keysym; 418 KeySym keysym;
406 int valid_keysym; 419 int valid_keysym;
… …
421 ctrl = ev.state & ControlMask; 434 ctrl = ev.state & ControlMask;
422 meta = ev.state & ModMetaMask; 435 meta = ev.state & ModMetaMask;
423 436
424 kbuf[0] = 0; 437 kbuf[0] = 0;
425 438
426#ifdef USE_XIM 439#if USE_XIM
427 if (Input_Context) 440 if (Input_Context)
428 { 441 {
429 Status status_return; 442 Status status_return;
430 443
431#if 0 444#if 0
… …
506#endif 519#endif
507 max_it (lnsppg, 1); 520 max_it (lnsppg, 1);
508 521
509 if (keysym == XK_Prior) 522 if (keysym == XK_Prior)
510 { 523 {
511 scr_page (UP, lnsppg); 524 scr_page (lnsppg);
512 return; 525 return;
513 } 526 }
514 else if (keysym == XK_Next) 527 else if (keysym == XK_Next)
515 { 528 {
516 scr_page (DN, lnsppg); 529 scr_page (-lnsppg);
517 return; 530 return;
518 } 531 }
519 } 532 }
520#ifdef SCROLL_ON_UPDOWN_KEYS 533#ifdef SCROLL_ON_UPDOWN_KEYS
521 if (IS_SCROLL_MOD) 534 if (IS_SCROLL_MOD)
522 { 535 {
523 if (keysym == XK_Up) 536 if (keysym == XK_Up)
524 { 537 {
525 scr_page (UP, 1); 538 scr_page (1);
526 return; 539 return;
527 } 540 }
528 else if (keysym == XK_Down) 541 else if (keysym == XK_Down)
529 { 542 {
530 scr_page (DN, 1); 543 scr_page (-1);
531 return; 544 return;
532 } 545 }
533 } 546 }
534#endif 547#endif
535#ifdef SCROLL_ON_HOMEEND_KEYS 548#ifdef SCROLL_ON_HOMEEND_KEYS
536 if (IS_SCROLL_MOD) 549 if (IS_SCROLL_MOD)
537 { 550 {
538 if (keysym == XK_Home) 551 if (keysym == XK_Home)
539 { 552 {
540 scr_move_to (0, 1); 553 scr_changeview (top_row);
541 return; 554 return;
542 } 555 }
543 else if (keysym == XK_End) 556 else if (keysym == XK_End)
544 { 557 {
545 scr_move_to (1, 1); 558 scr_changeview (0);
546 return; 559 return;
547 } 560 }
548 } 561 }
549#endif 562#endif
550 } 563 }
… …
572 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 585 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
573 return; 586 return;
574#endif 587#endif
575 } 588 }
576 } 589 }
590 }
591
592 if (ctrl && meta && (keysym == XK_c || keysym == XK_v))
593 {
594 if (keysym == XK_v)
595 selection_request (ev.time, Sel_Clipboard);
596 else if (selection.len > 0)
597 {
598 free (selection.clip_text);
599 selection.clip_text = rxvt_wcsdup (selection.text, selection.len);
600 selection.clip_len = selection.len;
601 selection_grab (CurrentTime, true);
602 }
603
604 return;
577 } 605 }
578 606
579#if ENABLE_FRILLS || ISO_14755 607#if ENABLE_FRILLS || ISO_14755
580 // ISO 14755 support 608 // ISO 14755 support
581 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51)) 609 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_51))
… …
776 } 804 }
777 805
778 if (newlen) 806 if (newlen)
779 len = strlen (kbuf); 807 len = strlen (kbuf);
780 808
809 if (len > 0)
810 {
781 /* 811 /*
812 * pass Shift/Control indicators for function keys ending with `~'
813 *
814 * eg,
815 * Prior = "ESC[5~"
816 * Shift+Prior = "ESC[5$"
817 * Ctrl+Prior = "ESC[5^"
818 * Ctrl+Shift+Prior = "ESC[5@"
819 */
820 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
821 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
822
823 /*
782 * Pass meta for all function keys, if 'meta' option set 824 * Pass meta for all function keys, if 'meta' option set
783 */ 825 */
784#ifdef META8_OPTION 826#ifdef META8_OPTION
785 if (meta && (meta_char == 0x80) && len > 0) 827 if (meta && (meta_char == 0x80))
786 kbuf[len - 1] |= 0x80; 828 kbuf[len - 1] |= 0x80;
787#endif 829#endif
830 }
788 831
789 } 832 }
790 else if (ctrl && keysym == XK_minus) 833 else if (ctrl && keysym == XK_minus)
791 { 834 {
792 len = 1; 835 len = 1;
… …
826 { 869 {
827 view_start = 0; 870 view_start = 0;
828 want_refresh = 1; 871 want_refresh = 1;
829 } 872 }
830 873
831 /*
832 * these modifications only affect the static keybuffer
833 * pass Shift/Control indicators for function keys ending with `~'
834 *
835 * eg,
836 * Prior = "ESC[5~"
837 * Shift+Prior = "ESC[5$"
838 * Ctrl+Prior = "ESC[5^"
839 * Ctrl+Shift+Prior = "ESC[5@"
840 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
841 */
842 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
843 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
844
845 /* escape prefix */ 874 /* escape prefix */
846 if (meta 875 if (meta
847#ifdef META8_OPTION 876#ifdef META8_OPTION
848 && meta_char == C0_ESC 877 && meta_char == C0_ESC
849#endif 878#endif
… …
854 } 883 }
855 884
856 tt_write (kbuf, (unsigned int)len); 885 tt_write (kbuf, (unsigned int)len);
857} 886}
858 887
859void 888void ecb_cold
860rxvt_term::key_release (XKeyEvent &ev) 889rxvt_term::key_release (XKeyEvent &ev)
861{ 890{
862#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 891#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
863 KeySym keysym; 892 KeySym keysym;
864 893
… …
936void 965void
937rxvt_term::flush () 966rxvt_term::flush ()
938{ 967{
939 flush_ev.stop (); 968 flush_ev.stop ();
940 969
941#ifdef HAVE_BG_PIXMAP 970#ifdef HAVE_IMG
942 if (bg_flags & BG_NEEDS_REFRESH) 971 if (bg_flags & BG_NEEDS_REFRESH)
943 { 972 {
944 bg_flags &= ~BG_NEEDS_REFRESH; 973 bg_flags &= ~BG_NEEDS_REFRESH;
945 scr_touch (false); 974 scr_touch (false);
946 } 975 }
… …
986 while (row < end_row); 1015 while (row < end_row);
987 } 1016 }
988 1017
989 scr_refresh (); 1018 scr_refresh ();
990 scrollBar.show (1); 1019 scrollBar.show (1);
991#ifdef USE_XIM 1020#if USE_XIM
992 im_send_spot (); 1021 im_send_spot ();
993#endif 1022#endif
994 } 1023 }
995 1024
996 display->flush (); 1025 display->flush ();
… …
1015 flush (); 1044 flush ();
1016} 1045}
1017 1046
1018#ifdef CURSOR_BLINK 1047#ifdef CURSOR_BLINK
1019void 1048void
1049rxvt_term::cursor_blink_reset ()
1050{
1051 if (hidden_cursor)
1052 {
1053 hidden_cursor = 0;
1054 want_refresh = 1;
1055 }
1056
1057 if (option (Opt_cursorBlink))
1058 cursor_blink_ev.again ();
1059 else
1060 cursor_blink_ev.stop ();
1061}
1062
1063void
1020rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1064rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1021{ 1065{
1022 hidden_cursor = !hidden_cursor; 1066 hidden_cursor = !hidden_cursor;
1023 want_refresh = 1; 1067 want_refresh = 1;
1024 refresh_check (); 1068 refresh_check ();
… …
1042 1086
1043#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1087#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1044void 1088void
1045rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1089rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1046{ 1090{
1047 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1091 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1048 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1092 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1049 { 1093 {
1050 want_refresh = 1; 1094 want_refresh = 1;
1051 refresh_check (); 1095 refresh_check ();
1052 } 1096 }
1053 else 1097 else
… …
1057 1101
1058#ifdef SELECTION_SCROLLING 1102#ifdef SELECTION_SCROLLING
1059void 1103void
1060rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1104rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1061{ 1105{
1062 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1106 if (scr_page (scroll_selection_lines))
1063 { 1107 {
1064 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1108 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1065 want_refresh = 1; 1109 want_refresh = 1;
1066 refresh_check (); 1110 refresh_check ();
1067 } 1111 }
… …
1072 1116
1073#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1117#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1074void 1118void
1075rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1119rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1076{ 1120{
1077 if (scr_changeview (view_start - mouse_slip_wheel_speed)) 1121 if (scr_page (mouse_slip_wheel_speed))
1078 { 1122 {
1079 want_refresh = 1; 1123 want_refresh = 1;
1080 refresh_check (); 1124 refresh_check ();
1081 } 1125 }
1082 1126
… …
1203 pty_write (); 1247 pty_write ();
1204 1248
1205 refresh_check (); 1249 refresh_check ();
1206} 1250}
1207 1251
1208void 1252void ecb_cold
1209rxvt_term::pointer_unblank () 1253rxvt_term::pointer_unblank ()
1210{ 1254{
1211 XDefineCursor (dpy, vt, TermWin_cursor); 1255 XDefineCursor (dpy, vt, TermWin_cursor);
1212 recolour_cursor (); 1256 recolour_cursor ();
1213 1257
… …
1218 pointer_ev.start (pointerBlankDelay); 1262 pointer_ev.start (pointerBlankDelay);
1219#endif 1263#endif
1220} 1264}
1221 1265
1222#ifdef POINTER_BLANK 1266#ifdef POINTER_BLANK
1223void 1267void ecb_cold
1224rxvt_term::pointer_blank () 1268rxvt_term::pointer_blank ()
1225{ 1269{
1226 if (!option (Opt_pointerBlank)) 1270 if (!option (Opt_pointerBlank))
1227 return; 1271 return;
1228 1272
… …
1230 XFlush (dpy); 1274 XFlush (dpy);
1231 1275
1232 hidden_pointer = 1; 1276 hidden_pointer = 1;
1233} 1277}
1234 1278
1235void 1279void ecb_cold
1236rxvt_term::pointer_cb (ev::timer &w, int revents) 1280rxvt_term::pointer_cb (ev::timer &w, int revents)
1237{ 1281{
1238 make_current (); 1282 make_current ();
1239 1283
1240 pointer_blank (); 1284 pointer_blank ();
… …
1332 32 + x, 1376 32 + x,
1333 32 + y); 1377 32 + y);
1334} 1378}
1335 1379
1336/*{{{ process an X event */ 1380/*{{{ process an X event */
1337void 1381void ecb_hot
1338rxvt_term::x_cb (XEvent &ev) 1382rxvt_term::x_cb (XEvent &ev)
1339{ 1383{
1340 make_current (); 1384 make_current ();
1341 1385
1342 dLocal (Display *, dpy); 1386 dLocal (Display *, dpy);
… …
1445 if (ev.xconfigure.window == parent) 1489 if (ev.xconfigure.window == parent)
1446 { 1490 {
1447 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1491 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1448 ; 1492 ;
1449 1493
1494 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1495
1496 bool moved = false;
1450#ifdef HAVE_BG_PIXMAP 1497#ifdef HAVE_BG_PIXMAP
1451 bool moved = false;
1452 if (bg_window_position_sensitive ()) 1498 if (bg_window_position_sensitive ())
1453 { 1499 {
1500 want_position_change = true;
1501 if (bg_img == 0)
1502 moved = true;
1503 }
1504#endif
1505
1506 if (want_position_change)
1507 {
1454 int x, y; 1508 int x, y;
1509
1455 if (ev.xconfigure.send_event) 1510 if (ev.xconfigure.send_event)
1456 { 1511 {
1457 x = ev.xconfigure.x; 1512 x = ev.xconfigure.x;
1458 y = ev.xconfigure.y; 1513 y = ev.xconfigure.y;
1459 } 1514 }
1460 else 1515 else
1461 get_window_origin (x, y); 1516 get_window_origin (x, y);
1462 1517
1463 if (bg_set_position (x, y) 1518 if (x != parent_x || y != parent_y)
1464 || !(bg_flags & BG_IS_VALID)) 1519 {
1520 parent_x = x;
1521 parent_y = y;
1522 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1465 moved = true; 1523 moved = true;
1524 }
1466 } 1525 }
1467#endif
1468 1526
1469 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1527 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1470 { 1528 {
1471 seen_resize = 1; 1529 seen_resize = 1;
1472 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1530 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
… …
1495 selection_send (ev.xselectionrequest); 1553 selection_send (ev.xselectionrequest);
1496 break; 1554 break;
1497 1555
1498 case MapNotify: 1556 case MapNotify:
1499#ifdef HAVE_BG_PIXMAP 1557#ifdef HAVE_BG_PIXMAP
1500 /* This is needed specifically to fix the case of no window manager or a 1558 // This is needed at startup for the case of no window manager
1501 * non-reparenting window manager. In those cases we never get first 1559 // or a non-reparenting window manager and also because we
1502 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1560 // defer bg image updates if the window is not mapped. The
1503 * care of multiplicity of ConfigureNotify events arriving while WM does 1561 // short delay is to optimize for multiple ConfigureNotify
1504 * reparenting. 1562 // events at startup when the window manager reparents the
1505 * We should not render background immediately, as there could be several 1563 // window, so as to perform the computation after we have
1506 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1564 // received all of them.
1507 * by scheduling background redraw as soon as we can, but giving a short 1565 if (bg_img == 0)
1508 * bit of time for ConfigureNotifies to arrive.
1509 * We should render background PRIOR to drawing any text, but AFTER all
1510 * of ConfigureNotifys for the best results.
1511 */
1512 if (!(bg_flags & BG_IS_VALID))
1513 update_background_ev.start (0.025); 1566 update_background_ev.start (0.025);
1514#endif 1567#endif
1515 mapped = 1; 1568 mapped = 1;
1516#ifdef TEXT_BLINK 1569#ifdef TEXT_BLINK
1517 text_blink_ev.start (); 1570 text_blink_ev.start ();
… …
1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1610 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1558 ; 1611 ;
1559 1612
1560 if (scrollBar.state && ev.xany.window == scrollBar.win) 1613 if (scrollBar.state && ev.xany.window == scrollBar.win)
1561 { 1614 {
1562 scrollBar.state = STATE_IDLE; 1615 scrollBar.state = SB_STATE_IDLE;
1563 scrollBar.show (0); 1616 scrollBar.show (0);
1564 } 1617 }
1565 } 1618 }
1566 break; 1619 break;
1567 1620
… …
1609 1662
1610#ifdef SELECTION_SCROLLING 1663#ifdef SELECTION_SCROLLING
1611 if (ev.xbutton.y < int_bwidth 1664 if (ev.xbutton.y < int_bwidth
1612 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1665 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1613 { 1666 {
1667 page_dirn scroll_selection_dir;
1614 int dist; 1668 int dist;
1615 1669
1616 /* don't clobber the current delay if we are 1670 /* don't clobber the current delay if we are
1617 * already in the middle of scrolling. 1671 * already in the middle of scrolling.
1618 */ 1672 */
… …
1633 dist = int_bwidth - ev.xbutton.y; 1687 dist = int_bwidth - ev.xbutton.y;
1634 } 1688 }
1635 else 1689 else
1636 { 1690 {
1637 scroll_selection_dir = DN; 1691 scroll_selection_dir = DN;
1638 dist = ev.xbutton.y - (int_bwidth + height); 1692 dist = ev.xbutton.y - (int_bwidth + vt_height);
1639 } 1693 }
1640 1694
1641 scroll_selection_lines = Pixel2Height (dist) 1695 scroll_selection_lines = Pixel2Height (dist)
1642 / SELECTION_SCROLL_LINE_SPEEDUP 1696 / SELECTION_SCROLL_LINE_SPEEDUP
1643 + 1; 1697 + 1;
1644 min_it (scroll_selection_lines, 1698 min_it (scroll_selection_lines,
1645 SELECTION_SCROLL_MAX_LINES); 1699 SELECTION_SCROLL_MAX_LINES);
1700 scroll_selection_lines *= scroll_selection_dir;
1646 } 1701 }
1647 else 1702 else
1648 { 1703 {
1649 /* we are within the text window, so we 1704 /* we are within the text window, so we
1650 * shouldn't be scrolling 1705 * shouldn't be scrolling
… …
1655#ifdef MOUSE_THRESHOLD 1710#ifdef MOUSE_THRESHOLD
1656 } 1711 }
1657#endif 1712#endif
1658 } 1713 }
1659 } 1714 }
1660 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1715 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1661 { 1716 {
1662 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1717 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1663 MotionNotify, &ev)) 1718 MotionNotify, &ev))
1664 ; 1719 ;
1665 1720
… …
1675 } 1730 }
1676 break; 1731 break;
1677 } 1732 }
1678 1733
1679#if defined(CURSOR_BLINK) 1734#if defined(CURSOR_BLINK)
1680 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1735 if (ev.type == KeyPress)
1681 {
1682 if (hidden_cursor)
1683 {
1684 hidden_cursor = 0;
1685 want_refresh = 1;
1686 }
1687
1688 cursor_blink_ev.again (); 1736 cursor_blink_reset ();
1689 }
1690#endif 1737#endif
1691 1738
1692#if defined(POINTER_BLANK) 1739#if defined(POINTER_BLANK)
1693 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1740 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1694 { 1741 {
… …
1705 1752
1706 refresh_check (); 1753 refresh_check ();
1707} 1754}
1708 1755
1709#if ENABLE_FRILLS 1756#if ENABLE_FRILLS
1710void 1757void ecb_cold
1711rxvt_term::set_urgency (bool enable) 1758rxvt_term::set_urgency (bool enable)
1712{ 1759{
1713 if (enable == urgency_hint) 1760 if (enable == urgency_hint)
1714 return; 1761 return;
1715 1762
1716 if (XWMHints *h = XGetWMHints (dpy, parent)) 1763 if (XWMHints *h = XGetWMHints (dpy, parent))
1717 { 1764 {
1718 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1765 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1719 XSetWMHints (dpy, parent, h); 1766 XSetWMHints (dpy, parent, h);
1720 urgency_hint = enable; 1767 urgency_hint = enable;
1768 XFree (h);
1721 } 1769 }
1722} 1770}
1723#endif 1771#endif
1724 1772
1725void 1773void ecb_cold
1726rxvt_term::focus_in () 1774rxvt_term::focus_in ()
1727{ 1775{
1728 if (!focus) 1776 if (!focus)
1729 { 1777 {
1730 focus = 1; 1778 focus = 1;
… …
1755 1803
1756 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1804 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1757 } 1805 }
1758} 1806}
1759 1807
1760void 1808void ecb_cold
1761rxvt_term::focus_out () 1809rxvt_term::focus_out ()
1762{ 1810{
1763 if (focus) 1811 if (focus)
1764 { 1812 {
1765 focus = 0; 1813 focus = 0;
… …
1798 1846
1799 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1847 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1800 } 1848 }
1801} 1849}
1802 1850
1803void 1851void ecb_cold
1804rxvt_term::update_fade_color (unsigned int idx) 1852rxvt_term::update_fade_color (unsigned int idx)
1805{ 1853{
1806#if OFF_FOCUS_FADING 1854#if OFF_FOCUS_FADING
1807 if (rs[Rs_fade]) 1855 if (rs[Rs_fade])
1808 { 1856 {
… …
1811 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c); 1859 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1812 } 1860 }
1813#endif 1861#endif
1814} 1862}
1815 1863
1816#if ENABLE_TRANSPARENCY || ENABLE_PERL 1864#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1817void 1865void ecb_hot
1818rxvt_term::rootwin_cb (XEvent &ev) 1866rxvt_term::rootwin_cb (XEvent &ev)
1819{ 1867{
1820 make_current (); 1868 make_current ();
1821 1869
1822 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1870 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1823 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1871 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1824 return; 1872 return;
1825 1873
1826# if ENABLE_TRANSPARENCY
1827 switch (ev.type) 1874 switch (ev.type)
1828 { 1875 {
1829 case PropertyNotify: 1876 case PropertyNotify:
1830 /* 1877 /*
1831 * if user used some Esetroot compatible prog to set the root bg, 1878 * if user used some Esetroot compatible prog to set the root bg,
1832 * use the property to determine the pixmap. We use it later on. 1879 * use the property to determine the pixmap. We use it later on.
1833 */ 1880 */
1834 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1881 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1835 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1882 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1836 { 1883 {
1837 bg_set_root_pixmap (); 1884#if BG_IMAGE_FROM_ROOT
1885 if (option (Opt_transparent))
1886 {
1887 rxvt_img::new_from_root (this)->replace (root_img);
1838 update_background (); 1888 update_background ();
1889 }
1890#endif
1891 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1839 } 1892 }
1840 1893
1841 break; 1894 break;
1842 } 1895 }
1843# endif
1844 1896
1845 refresh_check (); 1897 refresh_check ();
1846} 1898}
1847#endif 1899#endif
1848 1900
… …
1972 if (scrollBar.upButton (ev.y)) 2024 if (scrollBar.upButton (ev.y))
1973 direction = UP; /* up */ 2025 direction = UP; /* up */
1974 else if (scrollBar.dnButton (ev.y)) 2026 else if (scrollBar.dnButton (ev.y))
1975 direction = DN; /* down */ 2027 direction = DN; /* down */
1976 2028
1977 scrollBar.state = STATE_IDLE; 2029 scrollBar.state = SB_STATE_IDLE;
1978 /* 2030 /*
1979 * Rxvt-style scrollbar: 2031 * Rxvt-style scrollbar:
1980 * move up if mouse is above slider 2032 * move up if mouse is above slider
1981 * move dn if mouse is below slider 2033 * move dn if mouse is below slider
1982 * 2034 *
… …
2021 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2073 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2022#endif 2074#endif
2023 if (scr_page (direction, 1)) 2075 if (scr_page (direction, 1))
2024 { 2076 {
2025 if (direction == UP) 2077 if (direction == UP)
2026 scrollBar.state = STATE_UP; 2078 scrollBar.state = SB_STATE_UP;
2027 else 2079 else
2028 scrollBar.state = STATE_DOWN; 2080 scrollBar.state = SB_STATE_DOWN;
2029 } 2081 }
2030 } 2082 }
2031 else 2083 else
2032 switch (ev.button) 2084 switch (ev.button)
2033 { 2085 {
2034 case Button2: 2086 case Button2:
2035 switch (scrollBar.align) 2087 switch (scrollBar.align)
2036 { 2088 {
2037 case R_SB_ALIGN_TOP: 2089 case SB_ALIGN_TOP:
2038 csrO = 0; 2090 csrO = 0;
2039 break; 2091 break;
2040 case R_SB_ALIGN_CENTRE: 2092 case SB_ALIGN_CENTRE:
2041 csrO = (scrollBar.bot - scrollBar.top) / 2; 2093 csrO = (scrollBar.bot - scrollBar.top) / 2;
2042 break; 2094 break;
2043 case R_SB_ALIGN_BOTTOM: 2095 case SB_ALIGN_BOTTOM:
2044 csrO = scrollBar.bot - scrollBar.top; 2096 csrO = scrollBar.bot - scrollBar.top;
2045 break; 2097 break;
2046 } 2098 }
2047 2099
2048 if (scrollBar.style == R_SB_XTERM 2100 if (scrollBar.style == SB_STYLE_XTERM
2049 || scrollBar.above_slider (ev.y) 2101 || scrollBar.above_slider (ev.y)
2050 || scrollBar.below_slider (ev.y)) 2102 || scrollBar.below_slider (ev.y))
2051 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ()); 2103 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2052 2104
2053 scrollBar.state = STATE_MOTION; 2105 scrollBar.state = SB_STATE_MOTION;
2054 break; 2106 break;
2055 2107
2056 case Button1: 2108 case Button1:
2057 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2109 if (scrollBar.align == SB_ALIGN_CENTRE)
2058 csrO = ev.y - scrollBar.top; 2110 csrO = ev.y - scrollBar.top;
2059 /* FALLTHROUGH */ 2111 /* FALLTHROUGH */
2060 2112
2061 case Button3: 2113 case Button3:
2062 if (scrollBar.style != R_SB_XTERM) 2114 if (scrollBar.style != SB_STYLE_XTERM)
2063 { 2115 {
2064 if (scrollBar.above_slider (ev.y)) 2116 if (scrollBar.above_slider (ev.y))
2065# ifdef RXVT_SCROLL_FULL 2117# ifdef RXVT_SCROLL_FULL
2066 scr_page (UP, nrow - 1); 2118 scr_page (UP, nrow - 1);
2067# else 2119# else
… …
2072 scr_page (DN, nrow - 1); 2124 scr_page (DN, nrow - 1);
2073# else 2125# else
2074 scr_page (DN, nrow / 4); 2126 scr_page (DN, nrow / 4);
2075# endif 2127# endif
2076 else 2128 else
2077 scrollBar.state = STATE_MOTION; 2129 scrollBar.state = SB_STATE_MOTION;
2078 } 2130 }
2079 else 2131 else
2080 { 2132 {
2081 scr_page ((ev.button == Button1 ? DN : UP), 2133 scr_page ((ev.button == Button1 ? DN : UP),
2082 (nrow 2134 (nrow
… …
2099 2151
2100 csrO = 0; /* reset csr Offset */ 2152 csrO = 0; /* reset csr Offset */
2101 if (!bypass_keystate) 2153 if (!bypass_keystate)
2102 reportmode = !! (priv_modes & PrivMode_mouse_report); 2154 reportmode = !! (priv_modes & PrivMode_mouse_report);
2103 2155
2104 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2156 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2105 { 2157 {
2106 scrollBar.state = STATE_IDLE; 2158 scrollBar.state = SB_STATE_IDLE;
2107 scrollBar.show (0); 2159 scrollBar.show (0);
2108 } 2160 }
2109 2161
2110#ifdef SELECTION_SCROLLING 2162#ifdef SELECTION_SCROLLING
2111 sel_scroll_ev.stop(); 2163 sel_scroll_ev.stop();
… …
2161 case Button3: 2213 case Button3:
2162 selection_make (ev.time); 2214 selection_make (ev.time);
2163 break; 2215 break;
2164 2216
2165 case Button2: 2217 case Button2:
2166 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2218 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2167 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2219 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2168 break; 2220 break;
2169 2221
2170#ifdef MOUSE_WHEEL 2222#ifdef MOUSE_WHEEL
2171 case Button4: 2223 case Button4:
2172 case Button5: 2224 case Button5:
2173 { 2225 {
2174 int i; 2226 int lines;
2175 page_dirn v; 2227 page_dirn dirn;
2176 2228
2177 v = ev.button == Button4 ? UP : DN; 2229 dirn = ev.button == Button4 ? UP : DN;
2178 2230
2179 if (ev.state & ShiftMask) 2231 if (ev.state & ShiftMask)
2180 i = 1; 2232 lines = 1;
2181 else if (option (Opt_mouseWheelScrollPage)) 2233 else if (option (Opt_mouseWheelScrollPage))
2182 i = nrow - 1; 2234 lines = nrow - 1;
2183 else 2235 else
2184 i = 5; 2236 lines = 5;
2185 2237
2186# ifdef MOUSE_SLIP_WHEELING 2238# ifdef MOUSE_SLIP_WHEELING
2187 if (ev.state & ControlMask) 2239 if (ev.state & ControlMask)
2188 { 2240 {
2189 mouse_slip_wheel_speed += v ? -1 : 1; 2241 mouse_slip_wheel_speed += dirn;
2190 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2242 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2191 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2192 2243
2193 if (!slip_wheel_ev.is_active ()) 2244 if (!slip_wheel_ev.is_active ())
2194 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2245 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2195 } 2246 }
2196 else 2247 else
2197# endif 2248# endif
2198 { 2249 {
2199 scr_page (v, i); 2250 scr_page (dirn, lines);
2200 scrollBar.show (1); 2251 scrollBar.show (1);
2201 } 2252 }
2202 } 2253 }
2203 break; 2254 break;
2204#endif 2255#endif
… …
2206 } 2257 }
2207} 2258}
2208 2259
2209/*}}} */ 2260/*}}} */
2210 2261
2211void 2262void ecb_hot
2212rxvt_term::cmd_parse () 2263rxvt_term::cmd_parse ()
2213{ 2264{
2214 wchar_t ch = NOCHAR; 2265 wchar_t ch = NOCHAR;
2215 char *seq_begin; // remember start of esc-sequence here 2266 char *seq_begin; // remember start of esc-sequence here
2216 2267
… …
2335 } 2386 }
2336 } 2387 }
2337} 2388}
2338 2389
2339// read the next character 2390// read the next character
2340wchar_t 2391wchar_t ecb_hot
2341rxvt_term::next_char () NOTHROW 2392rxvt_term::next_char () NOTHROW
2342{ 2393{
2343 while (cmdbuf_ptr < cmdbuf_endp) 2394 while (cmdbuf_ptr < cmdbuf_endp)
2344 { 2395 {
2345 // assume 7-bit to be ascii ALWAYS 2396 // assume 7-bit to be ascii ALWAYS
… …
2357 } 2408 }
2358 2409
2359 if (len == (size_t)-1) 2410 if (len == (size_t)-1)
2360 { 2411 {
2361 mbstate.reset (); // reset now undefined conversion state 2412 mbstate.reset (); // reset now undefined conversion state
2413 // a -1 might indicate that a previous incomplete char is invalid (previous return -2)
2414 // in which case we "erroneously" return the next byte which might be valid.
2362 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2415 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2363 } 2416 }
2364 2417
2365 // assume wchar == unicode 2418 // assume wchar == unicode
2366 cmdbuf_ptr += len; 2419 cmdbuf_ptr += len;
… …
2369 2422
2370 return NOCHAR; 2423 return NOCHAR;
2371} 2424}
2372 2425
2373// read the next octet 2426// read the next octet
2374uint32_t 2427uint32_t ecb_hot
2375rxvt_term::next_octet () NOTHROW 2428rxvt_term::next_octet () NOTHROW
2376{ 2429{
2377 return cmdbuf_ptr < cmdbuf_endp 2430 return cmdbuf_ptr < cmdbuf_endp
2378 ? (unsigned char)*cmdbuf_ptr++ 2431 ? (unsigned char)*cmdbuf_ptr++
2379 : NOCHAR; 2432 : NOCHAR;
2380} 2433}
2381 2434
2382static class out_of_input out_of_input; 2435static class out_of_input out_of_input;
2383 2436
2384wchar_t 2437wchar_t ecb_hot
2385rxvt_term::cmd_getc () THROW ((class out_of_input)) 2438rxvt_term::cmd_getc () THROW ((class out_of_input))
2386{ 2439{
2387 wchar_t c = next_char (); 2440 wchar_t c = next_char ();
2388 2441
2389 if (c == NOCHAR) 2442 if (c == NOCHAR)
2390 throw out_of_input; 2443 throw out_of_input;
2391 2444
2392 return c; 2445 return c;
2393} 2446}
2394 2447
2395uint32_t 2448uint32_t ecb_hot
2396rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2449rxvt_term::cmd_get8 () THROW ((class out_of_input))
2397{ 2450{
2398 uint32_t c = next_octet (); 2451 uint32_t c = next_octet ();
2399 2452
2400 if (c == NOCHAR) 2453 if (c == NOCHAR)
… …
2404} 2457}
2405 2458
2406/*{{{ print pipe */ 2459/*{{{ print pipe */
2407/*----------------------------------------------------------------------*/ 2460/*----------------------------------------------------------------------*/
2408#ifdef PRINTPIPE 2461#ifdef PRINTPIPE
2409FILE * 2462FILE * ecb_cold
2410rxvt_term::popen_printer () 2463rxvt_term::popen_printer ()
2411{ 2464{
2412 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w"); 2465 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2413 2466
2414 if (stream == NULL) 2467 if (stream == NULL)
2415 rxvt_warn ("can't open printer pipe, not printing.\n"); 2468 rxvt_warn ("can't open printer pipe, not printing.\n");
2416 2469
2417 return stream; 2470 return stream;
2418} 2471}
2419 2472
2420int 2473int ecb_cold
2421rxvt_term::pclose_printer (FILE *stream) 2474rxvt_term::pclose_printer (FILE *stream)
2422{ 2475{
2423 fflush (stream); 2476 fflush (stream);
2424 return pclose (stream); 2477 return pclose (stream);
2425} 2478}
2426 2479
2427/* 2480/*
2428 * simulate attached vt100 printer 2481 * simulate attached vt100 printer
2429 */ 2482 */
2430void 2483void ecb_cold
2431rxvt_term::process_print_pipe () 2484rxvt_term::process_print_pipe ()
2432{ 2485{
2433 FILE *fd = popen_printer (); 2486 FILE *fd = popen_printer ();
2434 2487
2435 if (!fd) 2488 if (!fd)
… …
2490 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2543 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2491 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2544 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2492}; 2545};
2493 2546
2494/*{{{ process non-printing single characters */ 2547/*{{{ process non-printing single characters */
2495void 2548void ecb_hot
2496rxvt_term::process_nonprinting (unicode_t ch) 2549rxvt_term::process_nonprinting (unicode_t ch)
2497{ 2550{
2498 switch (ch) 2551 switch (ch)
2499 { 2552 {
2500 case C0_ESC: 2553 case C0_ESC:
… …
2546} 2599}
2547/*}}} */ 2600/*}}} */
2548 2601
2549 2602
2550/*{{{ process VT52 escape sequences */ 2603/*{{{ process VT52 escape sequences */
2551void 2604void ecb_cold
2552rxvt_term::process_escape_vt52 (unicode_t ch) 2605rxvt_term::process_escape_vt52 (unicode_t ch)
2553{ 2606{
2554 int row, col; 2607 int row, col;
2555 2608
2556 switch (ch) 2609 switch (ch)
… …
2606} 2659}
2607/*}}} */ 2660/*}}} */
2608 2661
2609 2662
2610/*{{{ process escape sequences */ 2663/*{{{ process escape sequences */
2611void 2664void ecb_hot
2612rxvt_term::process_escape_seq () 2665rxvt_term::process_escape_seq ()
2613{ 2666{
2614 unicode_t ch = cmd_getc (); 2667 unicode_t ch = cmd_getc ();
2615 2668
2616 if (priv_modes & PrivMode_vt52) 2669 if (priv_modes & PrivMode_vt52)
… …
2768 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2821 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2769 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2822 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2770 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2823 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2771 }; 2824 };
2772 2825
2773void 2826void ecb_hot
2774rxvt_term::process_csi_seq () 2827rxvt_term::process_csi_seq ()
2775{ 2828{
2776 unicode_t ch, priv, i; 2829 unicode_t ch, priv, prev_ch, i;
2777 unsigned int nargs, p; 2830 unsigned int nargs, p;
2778 int n, ndef; 2831 int n, ndef;
2779 int arg[ESC_ARGS] = { }; 2832 int arg[ESC_ARGS] = { };
2780 2833
2781 nargs = 0; 2834 nargs = 0;
… …
2787 /* '<' '=' '>' '?' '!' */ 2840 /* '<' '=' '>' '?' '!' */
2788 priv = ch; 2841 priv = ch;
2789 ch = cmd_getc (); 2842 ch = cmd_getc ();
2790 } 2843 }
2791 2844
2845 prev_ch = 0;
2792 /* read any numerical arguments */ 2846 /* read any numerical arguments */
2793 for (n = -1; ch < CSI_ICH; ) 2847 for (n = -1; ch < CSI_ICH; )
2794 { 2848 {
2795 if (isdigit (ch)) 2849 if (isdigit (ch))
2796 { 2850 {
… …
2806 n = -1; 2860 n = -1;
2807 } 2861 }
2808 else if (IS_CONTROL (ch)) 2862 else if (IS_CONTROL (ch))
2809 process_nonprinting (ch); 2863 process_nonprinting (ch);
2810 2864
2865 prev_ch = ch;
2811 ch = cmd_getc (); 2866 ch = cmd_getc ();
2812 } 2867 }
2813 2868
2814 if (ch > CSI_7F) 2869 if (ch > CSI_7F)
2815 return; 2870 return;
… …
2885 } 2940 }
2886 break; 2941 break;
2887#endif 2942#endif
2888 2943
2889 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2944 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2890 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2945 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2891 arg[0] = -arg[0]; 2946 arg[0] = -arg[0];
2892 /* FALLTHROUGH */ 2947 /* FALLTHROUGH */
2893 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2948 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2894 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2949 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2895 scr_gotorc (arg[0], 0, RELATIVE); 2950 scr_gotorc (arg[0], 0, RELATIVE);
2896 break; 2951 break;
2897 2952
2898 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2953 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2899 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2954 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3049 scr_insert_mode (1); 3104 scr_insert_mode (1);
3050 else if (arg[0] == 20) 3105 else if (arg[0] == 20)
3051 priv_modes |= PrivMode_LFNL; 3106 priv_modes |= PrivMode_LFNL;
3052 break; 3107 break;
3053 3108
3109 case CSI_71: // DESCUSR: set cursor style
3110 if (prev_ch == ' ')
3111 set_cursor_style (arg[0]);
3112 break;
3113
3054 /* 3114 /*
3055 * PRIVATE USE beyond this point. All CSI_7? sequences here 3115 * PRIVATE USE beyond this point. All CSI_7? sequences here
3056 */ 3116 */
3057 case CSI_72: /* DECSTBM: set top and bottom margins */ 3117 case CSI_72: /* DECSTBM: set top and bottom margins */
3058 if (nargs == 1) 3118 if (nargs == 1)
… …
3132 break; 3192 break;
3133 3193
3134 //case 9: NYI, TODO, restore maximized window or maximize window 3194 //case 9: NYI, TODO, restore maximized window or maximize window
3135 default: 3195 default:
3136 if (args[0] >= 24) /* set height (chars) */ 3196 if (args[0] >= 24) /* set height (chars) */
3137 set_widthheight ((unsigned int)width, 3197 set_widthheight ((unsigned int)vt_width,
3138 (unsigned int) (args[1] * fheight)); 3198 (unsigned int) (args[1] * fheight));
3139 break; 3199 break;
3140 3200
3141 /* 3201 /*
3142 * reports - some output format copied from XTerm 3202 * reports - some output format copied from XTerm
… …
3191rxvt_term::get_to_st (unicode_t &ends_how) 3251rxvt_term::get_to_st (unicode_t &ends_how)
3192{ 3252{
3193 unicode_t ch; 3253 unicode_t ch;
3194 bool seen_esc = false; 3254 bool seen_esc = false;
3195 unsigned int n = 0; 3255 unsigned int n = 0;
3196 wchar_t string[STRING_MAX]; 3256 wchar_t string[CBUFSIZ];
3197 3257
3198 while ((ch = cmd_getc ()) != NOCHAR) 3258 while ((ch = cmd_getc ()) != NOCHAR)
3199 { 3259 {
3200 if (seen_esc) 3260 if (seen_esc)
3201 { 3261 {
… …
3216 else if (ch < 0x20) 3276 else if (ch < 0x20)
3217 return NULL; /* other control character - exit */ 3277 return NULL; /* other control character - exit */
3218 3278
3219 seen_esc = false; 3279 seen_esc = false;
3220 3280
3221 if (n >= STRING_MAX - 1) 3281 if (n >= sizeof (string) - 1)
3222 // stop at some sane length 3282 // stop at some sane length
3223 return NULL; 3283 return NULL;
3224 3284
3225 string[n++] = ch; 3285 string[n++] = ch;
3226 } 3286 }
… …
3343 &nitems, &bytes_after, &value) == Success 3403 &nitems, &bytes_after, &value) == Success
3344 && actual_type != None 3404 && actual_type != None
3345 && actual_format == 8) 3405 && actual_format == 8)
3346 str = (const char *)(value); 3406 str = (const char *)(value);
3347 3407
3348 tt_printf ("\033]%d;%s%c", op, str, resp); 3408 tt_printf ("\033]%d;%s%c", op, option (Opt_insecure) ? str : "", resp);
3349 3409
3350 XFree (value); 3410 XFree (value);
3351 } 3411 }
3352 else 3412 else
3353 { 3413 {
… …
3421 break; 3481 break;
3422#endif 3482#endif
3423 case URxvt_Color_border: 3483 case URxvt_Color_border:
3424 process_color_seq (op, Color_border, str, resp); 3484 process_color_seq (op, Color_border, str, resp);
3425 break; 3485 break;
3426#if ENABLE_TRANSPARENCY 3486
3487#if BG_IMAGE_FROM_ROOT
3427 case URxvt_Color_tint: 3488 case URxvt_Color_tint:
3428 process_color_seq (op, Color_tint, str, resp); 3489 process_color_seq (op, Color_tint, str, resp);
3429 { 3490 {
3430 bool changed = false; 3491 bool changed = false;
3431 3492
3432 if (ISSET_PIXCOLOR (Color_tint)) 3493 if (ISSET_PIXCOLOR (Color_tint))
3433 changed = bg_set_tint (pix_colors_focused [Color_tint]); 3494 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3434 3495
3435 if (changed) 3496 if (changed)
3436 update_background (); 3497 update_background ();
3437 } 3498 }
3438 3499
… …
3442#if BG_IMAGE_FROM_FILE 3503#if BG_IMAGE_FROM_FILE
3443 case Rxvt_Pixmap: 3504 case Rxvt_Pixmap:
3444 if (!strcmp (str, "?")) 3505 if (!strcmp (str, "?"))
3445 { 3506 {
3446 char str[256]; 3507 char str[256];
3508 int h_scale = fimage.h_scale;
3509 int v_scale = fimage.v_scale;
3510 int h_align = fimage.h_align;
3511 int v_align = fimage.v_align;
3447 3512
3448 sprintf (str, "[%dx%d+%d+%d]", 3513 sprintf (str, "[%dx%d+%d+%d]",
3449 min (h_scale, 32767), min (v_scale, 32767), 3514 h_scale, v_scale,
3450 min (h_align, 32767), min (v_align, 32767)); 3515 h_align, v_align);
3451 process_xterm_seq (XTerm_title, str, CHAR_ST); 3516 process_xterm_seq (XTerm_title, str, CHAR_ST);
3452 } 3517 }
3453 else 3518 else
3454 { 3519 {
3455 bool changed = false; 3520 bool changed = false;
3456 3521
3457 if (*str != ';') 3522 if (*str != ';')
3458 { 3523 {
3459 if (bg_set_file (str)) /* change pixmap */ 3524 try
3525 {
3526 fimage.set_file_geometry (this, str);
3460 changed = true; 3527 changed = true;
3528 }
3529 catch (const class rxvt_failure_exception &e)
3530 {
3531 }
3461 } 3532 }
3462 else 3533 else
3463 { 3534 {
3464 str++; 3535 str++;
3465 if (bg_set_geometry (str, true)) 3536 if (fimage.set_geometry (str, true))
3466 changed = true; 3537 changed = true;
3467 } 3538 }
3468 3539
3469 if (changed) 3540 if (changed)
3470 { 3541 {
3471 if (bg_window_position_sensitive ()) 3542 if (bg_window_position_sensitive ())
3472 { 3543 {
3473 int x, y; 3544 int x, y;
3474 get_window_origin (x, y); 3545 get_window_origin (x, y);
3475 bg_set_position (x, y); 3546 parent_x = x;
3547 parent_y = y;
3476 } 3548 }
3477 update_background (); 3549 update_background ();
3478 } 3550 }
3479 } 3551 }
3480 break; 3552 break;
… …
3570 * 's' = save 3642 * 's' = save
3571 * 'r' = restore 3643 * 'r' = restore
3572 * 't' = toggle 3644 * 't' = toggle
3573 * so no need for fancy checking 3645 * so no need for fancy checking
3574 */ 3646 */
3575int 3647int ecb_cold
3576rxvt_term::privcases (int mode, unsigned long bit) 3648rxvt_term::privcases (int mode, unsigned long bit)
3577{ 3649{
3578 int state; 3650 int state;
3579 3651
3580 if (mode == 's') 3652 if (mode == 's')
3581 { 3653 {
3582 SavedModes |= (priv_modes & bit); 3654 if (priv_modes & bit)
3655 SavedModes |= bit;
3656 else
3657 SavedModes &= ~bit;
3583 return -1; 3658 return -1;
3584 } 3659 }
3585 else 3660 else
3586 { 3661 {
3587 if (mode == 'r') 3662 if (mode == 'r')
… …
3797 } 3872 }
3798} 3873}
3799/*}}} */ 3874/*}}} */
3800 3875
3801/*{{{ process sgr sequences */ 3876/*{{{ process sgr sequences */
3802void 3877void ecb_hot
3803rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3878rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3804{ 3879{
3805 unsigned int i; 3880 unsigned int i;
3806 short rendset; 3881 short rendset;
3807 int rendstyle; 3882 int rendstyle;
… …
3948 break; 4023 break;
3949#endif 4024#endif
3950 } 4025 }
3951 } 4026 }
3952} 4027}
4028
4029void
4030rxvt_term::set_cursor_style (int style)
4031{
4032 if (!IN_RANGE_INC (style, 0, 4))
4033 return;
4034
4035 set_option (Opt_cursorUnderline, style >= 3);
4036
4037#ifdef CURSOR_BLINK
4038 set_option (Opt_cursorBlink, !style || (style & 1));
4039 cursor_blink_reset ();
4040#endif
4041
4042 want_refresh = 1;
4043}
3953/*}}} */ 4044/*}}} */
3954 4045
3955/* ------------------------------------------------------------------------- */ 4046/* ------------------------------------------------------------------------- */
3956 4047
3957/* 4048/*

Diff Legend

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