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.484 by sf-exg, Fri Apr 29 10:10:20 2011 UTC vs.
Revision 1.540 by sf-exg, Sat Apr 20 19:50:04 2013 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-2011 Marc Lehmann <schmorp@schmorp.de>
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 }
779 } 780 }
780 781
781 if (newlen) 782 if (newlen)
782 len = strlen (kbuf); 783 len = strlen (kbuf);
783 784
785 if (len > 0)
786 {
784 /* 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 /*
785 * Pass meta for all function keys, if 'meta' option set 800 * Pass meta for all function keys, if 'meta' option set
786 */ 801 */
787#ifdef META8_OPTION 802#ifdef META8_OPTION
788 if (meta && (meta_char == 0x80) && len > 0) 803 if (meta && (meta_char == 0x80))
789 kbuf[len - 1] |= 0x80; 804 kbuf[len - 1] |= 0x80;
790#endif 805#endif
806 }
791 807
792 } 808 }
793 else if (ctrl && keysym == XK_minus) 809 else if (ctrl && keysym == XK_minus)
794 { 810 {
795 len = 1; 811 len = 1;
829 { 845 {
830 view_start = 0; 846 view_start = 0;
831 want_refresh = 1; 847 want_refresh = 1;
832 } 848 }
833 849
834 /*
835 * these modifications only affect the static keybuffer
836 * pass Shift/Control indicators for function keys ending with `~'
837 *
838 * eg,
839 * Prior = "ESC[5~"
840 * Shift+Prior = "ESC[5$"
841 * Ctrl+Prior = "ESC[5^"
842 * Ctrl+Shift+Prior = "ESC[5@"
843 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
844 */
845 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
846 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
847
848 /* escape prefix */ 850 /* escape prefix */
849 if (meta 851 if (meta
850#ifdef META8_OPTION 852#ifdef META8_OPTION
851 && meta_char == C0_ESC 853 && meta_char == C0_ESC
852#endif 854#endif
857 } 859 }
858 860
859 tt_write (kbuf, (unsigned int)len); 861 tt_write (kbuf, (unsigned int)len);
860} 862}
861 863
862void 864void ecb_cold
863rxvt_term::key_release (XKeyEvent &ev) 865rxvt_term::key_release (XKeyEvent &ev)
864{ 866{
865#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 867#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
866 KeySym keysym; 868 KeySym keysym;
867 869
939void 941void
940rxvt_term::flush () 942rxvt_term::flush ()
941{ 943{
942 flush_ev.stop (); 944 flush_ev.stop ();
943 945
944#ifdef HAVE_BG_PIXMAP 946#ifdef HAVE_IMG
945 if (bg_flags & BG_NEEDS_REFRESH) 947 if (bg_flags & BG_NEEDS_REFRESH)
946 { 948 {
947 bg_flags &= ~BG_NEEDS_REFRESH; 949 bg_flags &= ~BG_NEEDS_REFRESH;
948 scr_touch (false); 950 scr_touch (false);
949 } 951 }
989 while (row < end_row); 991 while (row < end_row);
990 } 992 }
991 993
992 scr_refresh (); 994 scr_refresh ();
993 scrollBar.show (1); 995 scrollBar.show (1);
994#ifdef USE_XIM 996#if USE_XIM
995 IMSendSpot (); 997 im_send_spot ();
996#endif 998#endif
997 } 999 }
998 1000
999 display->flush (); 1001 display->flush ();
1000} 1002}
1018 flush (); 1020 flush ();
1019} 1021}
1020 1022
1021#ifdef CURSOR_BLINK 1023#ifdef CURSOR_BLINK
1022void 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
1023rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1040rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1024{ 1041{
1025 hidden_cursor = !hidden_cursor; 1042 hidden_cursor = !hidden_cursor;
1026 want_refresh = 1; 1043 want_refresh = 1;
1027 refresh_check (); 1044 refresh_check ();
1045 1062
1046#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1063#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1047void 1064void
1048rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1065rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1049{ 1066{
1050 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1067 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1051 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1068 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1052 { 1069 {
1053 want_refresh = 1; 1070 want_refresh = 1;
1054 refresh_check (); 1071 refresh_check ();
1055 } 1072 }
1056 else 1073 else
1060 1077
1061#ifdef SELECTION_SCROLLING 1078#ifdef SELECTION_SCROLLING
1062void 1079void
1063rxvt_term::sel_scroll_cb (ev::timer &w, int revents) 1080rxvt_term::sel_scroll_cb (ev::timer &w, int revents)
1064{ 1081{
1065 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1082 if (scr_page (scroll_selection_lines))
1066 { 1083 {
1067 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1084 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1068 want_refresh = 1; 1085 want_refresh = 1;
1069 refresh_check (); 1086 refresh_check ();
1070 } 1087 }
1075 1092
1076#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1093#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1077void 1094void
1078rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1095rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1079{ 1096{
1080 if (scr_changeview (view_start - mouse_slip_wheel_speed)) 1097 if (scr_page (mouse_slip_wheel_speed))
1081 { 1098 {
1082 want_refresh = 1; 1099 want_refresh = 1;
1083 refresh_check (); 1100 refresh_check ();
1084 } 1101 }
1085 1102
1206 pty_write (); 1223 pty_write ();
1207 1224
1208 refresh_check (); 1225 refresh_check ();
1209} 1226}
1210 1227
1211void 1228void ecb_cold
1212rxvt_term::pointer_unblank () 1229rxvt_term::pointer_unblank ()
1213{ 1230{
1214 XDefineCursor (dpy, vt, TermWin_cursor); 1231 XDefineCursor (dpy, vt, TermWin_cursor);
1215 recolour_cursor (); 1232 recolour_cursor ();
1216 1233
1221 pointer_ev.start (pointerBlankDelay); 1238 pointer_ev.start (pointerBlankDelay);
1222#endif 1239#endif
1223} 1240}
1224 1241
1225#ifdef POINTER_BLANK 1242#ifdef POINTER_BLANK
1226void 1243void ecb_cold
1227rxvt_term::pointer_blank () 1244rxvt_term::pointer_blank ()
1228{ 1245{
1229 if (!option (Opt_pointerBlank)) 1246 if (!option (Opt_pointerBlank))
1230 return; 1247 return;
1231 1248
1233 XFlush (dpy); 1250 XFlush (dpy);
1234 1251
1235 hidden_pointer = 1; 1252 hidden_pointer = 1;
1236} 1253}
1237 1254
1238void 1255void ecb_cold
1239rxvt_term::pointer_cb (ev::timer &w, int revents) 1256rxvt_term::pointer_cb (ev::timer &w, int revents)
1240{ 1257{
1241 make_current (); 1258 make_current ();
1242 1259
1243 pointer_blank (); 1260 pointer_blank ();
1335 32 + x, 1352 32 + x,
1336 32 + y); 1353 32 + y);
1337} 1354}
1338 1355
1339/*{{{ process an X event */ 1356/*{{{ process an X event */
1340void 1357void ecb_hot
1341rxvt_term::x_cb (XEvent &ev) 1358rxvt_term::x_cb (XEvent &ev)
1342{ 1359{
1343 make_current (); 1360 make_current ();
1344 1361
1345 dLocal (Display *, dpy); 1362 dLocal (Display *, dpy);
1448 if (ev.xconfigure.window == parent) 1465 if (ev.xconfigure.window == parent)
1449 { 1466 {
1450 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1467 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1451 ; 1468 ;
1452 1469
1470 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1471
1472 bool moved = false;
1453#ifdef HAVE_BG_PIXMAP 1473#ifdef HAVE_BG_PIXMAP
1454 bool moved = false;
1455 if (bg_window_position_sensitive ()) 1474 if (bg_window_position_sensitive ())
1456 { 1475 {
1476 want_position_change = true;
1477 if (bg_img == 0)
1478 moved = true;
1479 }
1480#endif
1481
1482 if (want_position_change)
1483 {
1457 int x, y; 1484 int x, y;
1485
1458 if (ev.xconfigure.send_event) 1486 if (ev.xconfigure.send_event)
1459 { 1487 {
1460 x = ev.xconfigure.x; 1488 x = ev.xconfigure.x;
1461 y = ev.xconfigure.y; 1489 y = ev.xconfigure.y;
1462 } 1490 }
1463 else 1491 else
1464 get_window_origin (x, y); 1492 get_window_origin (x, y);
1465 1493
1466 if (bg_set_position (x, y) 1494 if (x != parent_x || y != parent_y)
1467 || !(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));
1468 moved = true; 1499 moved = true;
1500 }
1469 } 1501 }
1470#endif
1471 1502
1472 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1503 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1473 { 1504 {
1474 seen_resize = 1; 1505 seen_resize = 1;
1475 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1506 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1476 } 1507 }
1477 else 1508 else
1478 { 1509 {
1479#ifdef HAVE_BG_PIXMAP 1510#ifdef HAVE_BG_PIXMAP
1480 if (moved) 1511 if (moved)
1481 {
1482 if (mapped)
1483 update_background (); 1512 update_background ();
1484 else
1485 bg_invalidate ();
1486 }
1487#endif 1513#endif
1488 } 1514 }
1489 1515
1490 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1516 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1491 } 1517 }
1503 selection_send (ev.xselectionrequest); 1529 selection_send (ev.xselectionrequest);
1504 break; 1530 break;
1505 1531
1506 case MapNotify: 1532 case MapNotify:
1507#ifdef HAVE_BG_PIXMAP 1533#ifdef HAVE_BG_PIXMAP
1508 /* 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
1509 * non-reparenting window manager. In those cases we never get first 1535 // or a non-reparenting window manager and also because we
1510 * ConfigureNotify. Also that speeds startup under normal WM, by taking 1536 // defer bg image updates if the window is not mapped. The
1511 * care of multiplicity of ConfigureNotify events arriving while WM does 1537 // short delay is to optimize for multiple ConfigureNotify
1512 * reparenting. 1538 // events at startup when the window manager reparents the
1513 * We should not render background immediately, as there could be several 1539 // window, so as to perform the computation after we have
1514 * ConfigureNotify's to follow. Lets take care of all of them in one scoop 1540 // received all of them.
1515 * by scheduling background redraw as soon as we can, but giving a short 1541 if (bg_img == 0)
1516 * bit of time for ConfigureNotifies to arrive.
1517 * We should render background PRIOR to drawing any text, but AFTER all
1518 * of ConfigureNotifys for the best results.
1519 */
1520 if (!(bg_flags & BG_IS_VALID))
1521 update_background_ev.start (0.025); 1542 update_background_ev.start (0.025);
1522#endif 1543#endif
1523 mapped = 1; 1544 mapped = 1;
1524#ifdef TEXT_BLINK 1545#ifdef TEXT_BLINK
1525 text_blink_ev.start (); 1546 text_blink_ev.start ();
1565 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1586 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1566 ; 1587 ;
1567 1588
1568 if (scrollBar.state && ev.xany.window == scrollBar.win) 1589 if (scrollBar.state && ev.xany.window == scrollBar.win)
1569 { 1590 {
1570 scrollBar.state = STATE_IDLE; 1591 scrollBar.state = SB_STATE_IDLE;
1571 scrollBar.show (0); 1592 scrollBar.show (0);
1572 } 1593 }
1573 } 1594 }
1574 break; 1595 break;
1575 1596
1617 1638
1618#ifdef SELECTION_SCROLLING 1639#ifdef SELECTION_SCROLLING
1619 if (ev.xbutton.y < int_bwidth 1640 if (ev.xbutton.y < int_bwidth
1620 || Pixel2Row (ev.xbutton.y) > (nrow-1)) 1641 || Pixel2Row (ev.xbutton.y) > (nrow-1))
1621 { 1642 {
1643 page_dirn scroll_selection_dir;
1622 int dist; 1644 int dist;
1623 1645
1624 /* don't clobber the current delay if we are 1646 /* don't clobber the current delay if we are
1625 * already in the middle of scrolling. 1647 * already in the middle of scrolling.
1626 */ 1648 */
1641 dist = int_bwidth - ev.xbutton.y; 1663 dist = int_bwidth - ev.xbutton.y;
1642 } 1664 }
1643 else 1665 else
1644 { 1666 {
1645 scroll_selection_dir = DN; 1667 scroll_selection_dir = DN;
1646 dist = ev.xbutton.y - (int_bwidth + height); 1668 dist = ev.xbutton.y - (int_bwidth + vt_height);
1647 } 1669 }
1648 1670
1649 scroll_selection_lines = Pixel2Height (dist) 1671 scroll_selection_lines = Pixel2Height (dist)
1650 / SELECTION_SCROLL_LINE_SPEEDUP 1672 / SELECTION_SCROLL_LINE_SPEEDUP
1651 + 1; 1673 + 1;
1652 min_it (scroll_selection_lines, 1674 min_it (scroll_selection_lines,
1653 SELECTION_SCROLL_MAX_LINES); 1675 SELECTION_SCROLL_MAX_LINES);
1676 scroll_selection_lines *= scroll_selection_dir;
1654 } 1677 }
1655 else 1678 else
1656 { 1679 {
1657 /* we are within the text window, so we 1680 /* we are within the text window, so we
1658 * shouldn't be scrolling 1681 * shouldn't be scrolling
1663#ifdef MOUSE_THRESHOLD 1686#ifdef MOUSE_THRESHOLD
1664 } 1687 }
1665#endif 1688#endif
1666 } 1689 }
1667 } 1690 }
1668 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1691 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1669 { 1692 {
1670 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1693 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1671 MotionNotify, &ev)) 1694 MotionNotify, &ev))
1672 ; 1695 ;
1673 1696
1674 XQueryPointer (dpy, scrollBar.win, 1697 XQueryPointer (dpy, scrollBar.win,
1675 &unused_root, &unused_child, 1698 &unused_root, &unused_child,
1676 &unused_root_x, &unused_root_y, 1699 &unused_root_x, &unused_root_y,
1677 &ev.xbutton.x, &ev.xbutton.y, 1700 &ev.xbutton.x, &ev.xbutton.y,
1678 &unused_mask); 1701 &unused_mask);
1679 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1702 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1680 scrollBar.size ()); 1703 scrollBar.size ());
1681 want_refresh = 1; 1704 want_refresh = 1;
1682 scrollBar.show (1); 1705 scrollBar.show (1);
1683 } 1706 }
1684 break; 1707 break;
1685 } 1708 }
1686 1709
1687#if defined(CURSOR_BLINK) 1710#if defined(CURSOR_BLINK)
1688 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1711 if (ev.type == KeyPress)
1689 {
1690 if (hidden_cursor)
1691 {
1692 hidden_cursor = 0;
1693 want_refresh = 1;
1694 }
1695
1696 cursor_blink_ev.again (); 1712 cursor_blink_reset ();
1697 }
1698#endif 1713#endif
1699 1714
1700#if defined(POINTER_BLANK) 1715#if defined(POINTER_BLANK)
1701 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1716 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1702 { 1717 {
1713 1728
1714 refresh_check (); 1729 refresh_check ();
1715} 1730}
1716 1731
1717#if ENABLE_FRILLS 1732#if ENABLE_FRILLS
1718void 1733void ecb_cold
1719rxvt_term::set_urgency (bool enable) 1734rxvt_term::set_urgency (bool enable)
1720{ 1735{
1721 if (enable == urgency_hint) 1736 if (enable == urgency_hint)
1722 return; 1737 return;
1723 1738
1724 if (XWMHints *h = XGetWMHints (dpy, parent)) 1739 if (XWMHints *h = XGetWMHints (dpy, parent))
1725 { 1740 {
1726 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1741 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1727 XSetWMHints (dpy, parent, h); 1742 XSetWMHints (dpy, parent, h);
1728 urgency_hint = enable; 1743 urgency_hint = enable;
1744 XFree (h);
1729 } 1745 }
1730} 1746}
1731#endif 1747#endif
1732 1748
1733void 1749void ecb_cold
1734rxvt_term::focus_in () 1750rxvt_term::focus_in ()
1735{ 1751{
1736 if (!focus) 1752 if (!focus)
1737 { 1753 {
1738 focus = 1; 1754 focus = 1;
1739 want_refresh = 1; 1755 want_refresh = 1;
1740 1756
1741#if USE_XIM 1757#if USE_XIM
1742 if (Input_Context != NULL) 1758 if (Input_Context != NULL)
1743 { 1759 {
1744 IMSetPosition (); 1760 im_set_position ();
1745 XSetICFocus (Input_Context); 1761 XSetICFocus (Input_Context);
1746 } 1762 }
1747#endif 1763#endif
1748#if CURSOR_BLINK 1764#if CURSOR_BLINK
1749 if (option (Opt_cursorBlink)) 1765 if (option (Opt_cursorBlink))
1763 1779
1764 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1780 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1765 } 1781 }
1766} 1782}
1767 1783
1768void 1784void ecb_cold
1769rxvt_term::focus_out () 1785rxvt_term::focus_out ()
1770{ 1786{
1771 if (focus) 1787 if (focus)
1772 { 1788 {
1773 focus = 0; 1789 focus = 0;
1806 1822
1807 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1823 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1808 } 1824 }
1809} 1825}
1810 1826
1811void 1827void ecb_cold
1812rxvt_term::update_fade_color (unsigned int idx) 1828rxvt_term::update_fade_color (unsigned int idx)
1813{ 1829{
1814#if OFF_FOCUS_FADING 1830#if OFF_FOCUS_FADING
1815 if (rs[Rs_fade]) 1831 if (rs[Rs_fade])
1816 { 1832 {
1819 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);
1820 } 1836 }
1821#endif 1837#endif
1822} 1838}
1823 1839
1824#if ENABLE_TRANSPARENCY || ENABLE_PERL 1840#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
1825void 1841void ecb_hot
1826rxvt_term::rootwin_cb (XEvent &ev) 1842rxvt_term::rootwin_cb (XEvent &ev)
1827{ 1843{
1828 make_current (); 1844 make_current ();
1829 1845
1830 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1846 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1831 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1847 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1832 return; 1848 return;
1833 1849
1834# if ENABLE_TRANSPARENCY
1835 switch (ev.type) 1850 switch (ev.type)
1836 { 1851 {
1837 case PropertyNotify: 1852 case PropertyNotify:
1838 /* 1853 /*
1839 * 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,
1840 * 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.
1841 */ 1856 */
1842 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1857 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1843 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1858 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1844 { 1859 {
1845 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);
1846 update_background (); 1864 update_background ();
1865 }
1866#endif
1867 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1847 } 1868 }
1848 1869
1849 break; 1870 break;
1850 } 1871 }
1851# endif
1852 1872
1853 refresh_check (); 1873 refresh_check ();
1854} 1874}
1855#endif 1875#endif
1856 1876
1980 if (scrollBar.upButton (ev.y)) 2000 if (scrollBar.upButton (ev.y))
1981 direction = UP; /* up */ 2001 direction = UP; /* up */
1982 else if (scrollBar.dnButton (ev.y)) 2002 else if (scrollBar.dnButton (ev.y))
1983 direction = DN; /* down */ 2003 direction = DN; /* down */
1984 2004
1985 scrollBar.state = STATE_IDLE; 2005 scrollBar.state = SB_STATE_IDLE;
1986 /* 2006 /*
1987 * Rxvt-style scrollbar: 2007 * Rxvt-style scrollbar:
1988 * move up if mouse is above slider 2008 * move up if mouse is above slider
1989 * move dn if mouse is below slider 2009 * move dn if mouse is below slider
1990 * 2010 *
2029 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2049 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2030#endif 2050#endif
2031 if (scr_page (direction, 1)) 2051 if (scr_page (direction, 1))
2032 { 2052 {
2033 if (direction == UP) 2053 if (direction == UP)
2034 scrollBar.state = STATE_UP; 2054 scrollBar.state = SB_STATE_UP;
2035 else 2055 else
2036 scrollBar.state = STATE_DOWN; 2056 scrollBar.state = SB_STATE_DOWN;
2037 } 2057 }
2038 } 2058 }
2039 else 2059 else
2040 switch (ev.button) 2060 switch (ev.button)
2041 { 2061 {
2042 case Button2: 2062 case Button2:
2043 switch (scrollBar.align) 2063 switch (scrollBar.align)
2044 { 2064 {
2045 case R_SB_ALIGN_TOP: 2065 case SB_ALIGN_TOP:
2046 csrO = 0; 2066 csrO = 0;
2047 break; 2067 break;
2048 case R_SB_ALIGN_CENTRE: 2068 case SB_ALIGN_CENTRE:
2049 csrO = (scrollBar.bot - scrollBar.top) / 2; 2069 csrO = (scrollBar.bot - scrollBar.top) / 2;
2050 break; 2070 break;
2051 case R_SB_ALIGN_BOTTOM: 2071 case SB_ALIGN_BOTTOM:
2052 csrO = scrollBar.bot - scrollBar.top; 2072 csrO = scrollBar.bot - scrollBar.top;
2053 break; 2073 break;
2054 } 2074 }
2055 2075
2056 if (scrollBar.style == R_SB_XTERM 2076 if (scrollBar.style == SB_STYLE_XTERM
2057 || scrollbar_above_slider (ev.y) 2077 || scrollBar.above_slider (ev.y)
2058 || scrollbar_below_slider (ev.y)) 2078 || scrollBar.below_slider (ev.y))
2059 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2079 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2060 2080
2061 scrollBar.state = STATE_MOTION; 2081 scrollBar.state = SB_STATE_MOTION;
2062 break; 2082 break;
2063 2083
2064 case Button1: 2084 case Button1:
2065 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2085 if (scrollBar.align == SB_ALIGN_CENTRE)
2066 csrO = ev.y - scrollBar.top; 2086 csrO = ev.y - scrollBar.top;
2067 /* FALLTHROUGH */ 2087 /* FALLTHROUGH */
2068 2088
2069 case Button3: 2089 case Button3:
2070 if (scrollBar.style != R_SB_XTERM) 2090 if (scrollBar.style != SB_STYLE_XTERM)
2071 { 2091 {
2072 if (scrollbar_above_slider (ev.y)) 2092 if (scrollBar.above_slider (ev.y))
2073# ifdef RXVT_SCROLL_FULL 2093# ifdef RXVT_SCROLL_FULL
2074 scr_page (UP, nrow - 1); 2094 scr_page (UP, nrow - 1);
2075# else 2095# else
2076 scr_page (UP, nrow / 4); 2096 scr_page (UP, nrow / 4);
2077# endif 2097# endif
2078 else if (scrollbar_below_slider (ev.y)) 2098 else if (scrollBar.below_slider (ev.y))
2079# ifdef RXVT_SCROLL_FULL 2099# ifdef RXVT_SCROLL_FULL
2080 scr_page (DN, nrow - 1); 2100 scr_page (DN, nrow - 1);
2081# else 2101# else
2082 scr_page (DN, nrow / 4); 2102 scr_page (DN, nrow / 4);
2083# endif 2103# endif
2084 else 2104 else
2085 scrollBar.state = STATE_MOTION; 2105 scrollBar.state = SB_STATE_MOTION;
2086 } 2106 }
2087 else 2107 else
2088 { 2108 {
2089 scr_page ((ev.button == Button1 ? DN : UP), 2109 scr_page ((ev.button == Button1 ? DN : UP),
2090 (nrow 2110 (nrow
2091 * scrollbar_position (ev.y) 2111 * scrollBar.position (ev.y)
2092 / scrollBar.size ())); 2112 / scrollBar.size ()));
2093 } 2113 }
2094 2114
2095 break; 2115 break;
2096 } 2116 }
2107 2127
2108 csrO = 0; /* reset csr Offset */ 2128 csrO = 0; /* reset csr Offset */
2109 if (!bypass_keystate) 2129 if (!bypass_keystate)
2110 reportmode = !! (priv_modes & PrivMode_mouse_report); 2130 reportmode = !! (priv_modes & PrivMode_mouse_report);
2111 2131
2112 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2132 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2113 { 2133 {
2114 scrollBar.state = STATE_IDLE; 2134 scrollBar.state = SB_STATE_IDLE;
2115 scrollBar.show (0); 2135 scrollBar.show (0);
2116 } 2136 }
2117 2137
2118#ifdef SELECTION_SCROLLING 2138#ifdef SELECTION_SCROLLING
2119 sel_scroll_ev.stop(); 2139 sel_scroll_ev.stop();
2169 case Button3: 2189 case Button3:
2170 selection_make (ev.time); 2190 selection_make (ev.time);
2171 break; 2191 break;
2172 2192
2173 case Button2: 2193 case Button2:
2174 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?
2175 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2195 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2176 break; 2196 break;
2177 2197
2178#ifdef MOUSE_WHEEL 2198#ifdef MOUSE_WHEEL
2179 case Button4: 2199 case Button4:
2180 case Button5: 2200 case Button5:
2181 { 2201 {
2182 int i; 2202 int lines;
2183 page_dirn v; 2203 page_dirn dirn;
2184 2204
2185 v = ev.button == Button4 ? UP : DN; 2205 dirn = ev.button == Button4 ? UP : DN;
2186 2206
2187 if (ev.state & ShiftMask) 2207 if (ev.state & ShiftMask)
2188 i = 1; 2208 lines = 1;
2189 else if (option (Opt_mouseWheelScrollPage)) 2209 else if (option (Opt_mouseWheelScrollPage))
2190 i = nrow - 1; 2210 lines = nrow - 1;
2191 else 2211 else
2192 i = 5; 2212 lines = 5;
2193 2213
2194# ifdef MOUSE_SLIP_WHEELING 2214# ifdef MOUSE_SLIP_WHEELING
2195 if (ev.state & ControlMask) 2215 if (ev.state & ControlMask)
2196 { 2216 {
2197 mouse_slip_wheel_speed += v ? -1 : 1; 2217 mouse_slip_wheel_speed += dirn;
2198 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2218 clamp_it (mouse_slip_wheel_speed, -nrow, nrow);
2199 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2200 2219
2201 if (!slip_wheel_ev.is_active ()) 2220 if (!slip_wheel_ev.is_active ())
2202 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2221 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2203 } 2222 }
2204 else 2223 else
2205# endif 2224# endif
2206 { 2225 {
2207 scr_page (v, i); 2226 scr_page (dirn, lines);
2208 scrollBar.show (1); 2227 scrollBar.show (1);
2209 } 2228 }
2210 } 2229 }
2211 break; 2230 break;
2212#endif 2231#endif
2214 } 2233 }
2215} 2234}
2216 2235
2217/*}}} */ 2236/*}}} */
2218 2237
2219void 2238void ecb_hot
2220rxvt_term::cmd_parse () 2239rxvt_term::cmd_parse ()
2221{ 2240{
2222 wchar_t ch = NOCHAR; 2241 wchar_t ch = NOCHAR;
2223 char *seq_begin; // remember start of esc-sequence here 2242 char *seq_begin; // remember start of esc-sequence here
2224 2243
2225 for (;;) 2244 for (;;)
2226 { 2245 {
2227 if (expect_false (ch == NOCHAR)) 2246 if (ecb_unlikely (ch == NOCHAR))
2228 { 2247 {
2229 seq_begin = cmdbuf_ptr; 2248 seq_begin = cmdbuf_ptr;
2230 ch = next_char (); 2249 ch = next_char ();
2231 2250
2232 if (ch == NOCHAR) 2251 if (ch == NOCHAR)
2233 break; 2252 break;
2234 } 2253 }
2235 2254
2236 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))
2237 { 2256 {
2238 if (expect_false (!seen_input)) 2257 if (ecb_unlikely (!seen_input))
2239 { 2258 {
2240 seen_input = 1; 2259 seen_input = 1;
2241 // many badly-written programs (e.g. jed) contain a race condition: 2260 // many badly-written programs (e.g. jed) contain a race condition:
2242 // they first read the screensize and then install a SIGWINCH handler. 2261 // they first read the screensize and then install a SIGWINCH handler.
2243 // some window managers resize the window early, and these programs 2262 // some window managers resize the window early, and these programs
2256 wchar_t *str = buf; 2275 wchar_t *str = buf;
2257 wchar_t *eol = str + min (ncol, UBUFSIZ); 2276 wchar_t *eol = str + min (ncol, UBUFSIZ);
2258 2277
2259 for (;;) 2278 for (;;)
2260 { 2279 {
2261 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)))
2262 break; 2281 break;
2263 2282
2264 *str++ = ch; 2283 *str++ = ch;
2265 2284
2266 if (expect_false (ch == C0_LF || str >= eol)) 2285 if (ecb_unlikely (ch == C0_LF || str >= eol))
2267 { 2286 {
2268 if (ch == C0_LF) 2287 if (ch == C0_LF)
2269 nlines++; 2288 nlines++;
2270 2289
2271 refresh_count++; 2290 refresh_count++;
2343 } 2362 }
2344 } 2363 }
2345} 2364}
2346 2365
2347// read the next character 2366// read the next character
2348wchar_t 2367wchar_t ecb_hot
2349rxvt_term::next_char () NOTHROW 2368rxvt_term::next_char () NOTHROW
2350{ 2369{
2351 while (cmdbuf_ptr < cmdbuf_endp) 2370 while (cmdbuf_ptr < cmdbuf_endp)
2352 { 2371 {
2353 // assume 7-bit to be ascii ALWAYS 2372 // assume 7-bit to be ascii ALWAYS
2354 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2373 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2355 return *cmdbuf_ptr++; 2374 return *cmdbuf_ptr++;
2356 2375
2357 wchar_t wc; 2376 wchar_t wc;
2358 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);
2359 2378
2365 } 2384 }
2366 2385
2367 if (len == (size_t)-1) 2386 if (len == (size_t)-1)
2368 { 2387 {
2369 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.
2370 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
2371 } 2392 }
2372 2393
2373 // assume wchar == unicode 2394 // assume wchar == unicode
2374 cmdbuf_ptr += len; 2395 cmdbuf_ptr += len;
2377 2398
2378 return NOCHAR; 2399 return NOCHAR;
2379} 2400}
2380 2401
2381// read the next octet 2402// read the next octet
2382uint32_t 2403uint32_t ecb_hot
2383rxvt_term::next_octet () NOTHROW 2404rxvt_term::next_octet () NOTHROW
2384{ 2405{
2385 return cmdbuf_ptr < cmdbuf_endp 2406 return cmdbuf_ptr < cmdbuf_endp
2386 ? (unsigned char)*cmdbuf_ptr++ 2407 ? (unsigned char)*cmdbuf_ptr++
2387 : NOCHAR; 2408 : NOCHAR;
2388} 2409}
2389 2410
2390static class out_of_input out_of_input; 2411static class out_of_input out_of_input;
2391 2412
2392wchar_t 2413wchar_t ecb_hot
2393rxvt_term::cmd_getc () THROW ((class out_of_input)) 2414rxvt_term::cmd_getc () THROW ((class out_of_input))
2394{ 2415{
2395 wchar_t c = next_char (); 2416 wchar_t c = next_char ();
2396 2417
2397 if (c == NOCHAR) 2418 if (c == NOCHAR)
2398 throw out_of_input; 2419 throw out_of_input;
2399 2420
2400 return c; 2421 return c;
2401} 2422}
2402 2423
2403uint32_t 2424uint32_t ecb_hot
2404rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2425rxvt_term::cmd_get8 () THROW ((class out_of_input))
2405{ 2426{
2406 uint32_t c = next_octet (); 2427 uint32_t c = next_octet ();
2407 2428
2408 if (c == NOCHAR) 2429 if (c == NOCHAR)
2412} 2433}
2413 2434
2414/*{{{ print pipe */ 2435/*{{{ print pipe */
2415/*----------------------------------------------------------------------*/ 2436/*----------------------------------------------------------------------*/
2416#ifdef PRINTPIPE 2437#ifdef PRINTPIPE
2417FILE * 2438FILE * ecb_cold
2418rxvt_term::popen_printer () 2439rxvt_term::popen_printer ()
2419{ 2440{
2420 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");
2421 2442
2422 if (stream == NULL) 2443 if (stream == NULL)
2423 rxvt_warn ("can't open printer pipe, not printing.\n"); 2444 rxvt_warn ("can't open printer pipe, not printing.\n");
2424 2445
2425 return stream; 2446 return stream;
2426} 2447}
2427 2448
2428int 2449int ecb_cold
2429rxvt_term::pclose_printer (FILE *stream) 2450rxvt_term::pclose_printer (FILE *stream)
2430{ 2451{
2431 fflush (stream); 2452 fflush (stream);
2432 return pclose (stream); 2453 return pclose (stream);
2433} 2454}
2434 2455
2435/* 2456/*
2436 * simulate attached vt100 printer 2457 * simulate attached vt100 printer
2437 */ 2458 */
2438void 2459void ecb_cold
2439rxvt_term::process_print_pipe () 2460rxvt_term::process_print_pipe ()
2440{ 2461{
2441 FILE *fd = popen_printer (); 2462 FILE *fd = popen_printer ();
2442 2463
2443 if (!fd) 2464 if (!fd)
2489 pclose_printer (fd); 2510 pclose_printer (fd);
2490} 2511}
2491#endif /* PRINTPIPE */ 2512#endif /* PRINTPIPE */
2492/*}}} */ 2513/*}}} */
2493 2514
2494/* *INDENT-OFF* */
2495enum { 2515enum {
2496 C1_40 = 0x40, 2516 C1_40 = 0x40,
2497 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,
2498 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,
2499 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,
2500 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,
2501}; 2521};
2502/* *INDENT-ON* */
2503 2522
2504/*{{{ process non-printing single characters */ 2523/*{{{ process non-printing single characters */
2505void 2524void ecb_hot
2506rxvt_term::process_nonprinting (unicode_t ch) 2525rxvt_term::process_nonprinting (unicode_t ch)
2507{ 2526{
2508 switch (ch) 2527 switch (ch)
2509 { 2528 {
2510 case C0_ESC: 2529 case C0_ESC:
2556} 2575}
2557/*}}} */ 2576/*}}} */
2558 2577
2559 2578
2560/*{{{ process VT52 escape sequences */ 2579/*{{{ process VT52 escape sequences */
2561void 2580void ecb_cold
2562rxvt_term::process_escape_vt52 (unicode_t ch) 2581rxvt_term::process_escape_vt52 (unicode_t ch)
2563{ 2582{
2564 int row, col; 2583 int row, col;
2565 2584
2566 switch (ch) 2585 switch (ch)
2600 break; 2619 break;
2601 case 'Z': /* identify the terminal type */ 2620 case 'Z': /* identify the terminal type */
2602 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2621 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2603 break; 2622 break;
2604 case '<': /* turn off VT52 mode */ 2623 case '<': /* turn off VT52 mode */
2605 set_privmode (PrivMode_vt52, 0); 2624 priv_modes &= ~PrivMode_vt52;
2606 break; 2625 break;
2607 case 'F': /* use special graphics character set */ 2626 case 'F': /* use special graphics character set */
2608 case 'G': /* use regular character set */ 2627 case 'G': /* use regular character set */
2609 /* unimplemented */ 2628 /* unimplemented */
2610 break; 2629 break;
2616} 2635}
2617/*}}} */ 2636/*}}} */
2618 2637
2619 2638
2620/*{{{ process escape sequences */ 2639/*{{{ process escape sequences */
2621void 2640void ecb_hot
2622rxvt_term::process_escape_seq () 2641rxvt_term::process_escape_seq ()
2623{ 2642{
2624 unicode_t ch = cmd_getc (); 2643 unicode_t ch = cmd_getc ();
2625 2644
2626 if (priv_modes & PrivMode_vt52) 2645 if (priv_modes & PrivMode_vt52)
2629 return; 2648 return;
2630 } 2649 }
2631 2650
2632 switch (ch) 2651 switch (ch)
2633 { 2652 {
2634 /* case 1: do_tek_mode (); break; */
2635 case '#': 2653 case '#':
2636 if (cmd_getc () == '8') 2654 if (cmd_getc () == '8')
2637 scr_E (); 2655 scr_E ();
2638 break; 2656 break;
2639 case '(': 2657 case '(':
2662#if !ENABLE_MINIMAL 2680#if !ENABLE_MINIMAL
2663 case '9': 2681 case '9':
2664 scr_forwardindex (); 2682 scr_forwardindex ();
2665 break; 2683 break;
2666#endif 2684#endif
2685 // DECPAM/DECPNM
2667 case '=': 2686 case '=':
2687 priv_modes |= PrivMode_aplKP;
2688 break;
2668 case '>': 2689 case '>':
2669 set_privmode (PrivMode_aplKP, ch == '='); 2690 priv_modes &= ~PrivMode_aplKP;
2670 break; 2691 break;
2671 2692
2672 case C1_40: 2693 case C1_40:
2673 cmd_getc (); 2694 cmd_getc ();
2674 break; 2695 break;
2678 2699
2679 /* 8.3.87: NEXT LINE */ 2700 /* 8.3.87: NEXT LINE */
2680 case C1_NEL: /* ESC E */ 2701 case C1_NEL: /* ESC E */
2681 { 2702 {
2682 wchar_t nlcr[] = { C0_LF, C0_CR }; 2703 wchar_t nlcr[] = { C0_LF, C0_CR };
2683 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1); 2704 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2684 } 2705 }
2685 break; 2706 break;
2686 2707
2687 /* kidnapped escape sequence: Should be 8.3.48 */ 2708 /* kidnapped escape sequence: Should be 8.3.48 */
2688 case C1_ESA: /* ESC G */ 2709 case C1_ESA: /* ESC G */
2700 case C1_RI: /* ESC M */ 2721 case C1_RI: /* ESC M */
2701 scr_index (DN); 2722 scr_index (DN);
2702 break; 2723 break;
2703 2724
2704 /* 8.3.142: SINGLE-SHIFT TWO */ 2725 /* 8.3.142: SINGLE-SHIFT TWO */
2705 /*case C1_SS2: scr_single_shift (2); break; */ 2726 /* case C1_SS2: break; */
2706 2727
2707 /* 8.3.143: SINGLE-SHIFT THREE */ 2728 /* 8.3.143: SINGLE-SHIFT THREE */
2708 /*case C1_SS3: scr_single_shift (3); break; */ 2729 /* case C1_SS3: break; */
2709 2730
2710 /* 8.3.27: DEVICE CONTROL STRING */ 2731 /* 8.3.27: DEVICE CONTROL STRING */
2711 case C1_DCS: /* ESC P */ 2732 case C1_DCS: /* ESC P */
2712 process_dcs_seq (); 2733 process_dcs_seq ();
2713 break; 2734 break;
2746 } 2767 }
2747} 2768}
2748/*}}} */ 2769/*}}} */
2749 2770
2750/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2771/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2751/* *INDENT-OFF* */
2752enum { 2772enum {
2753 CSI_ICH = 0x40, 2773 CSI_ICH = 0x40,
2754 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,
2755 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 ,
2756 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,
2776 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, */
2777 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, */
2778 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, */
2779 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, {, |, }, ~, */
2780 }; 2800 };
2781/* *INDENT-ON* */
2782 2801
2783void 2802void ecb_hot
2784rxvt_term::process_csi_seq () 2803rxvt_term::process_csi_seq ()
2785{ 2804{
2786 unicode_t ch, priv, i; 2805 unicode_t ch, priv, prev_ch, i;
2787 unsigned int nargs, p; 2806 unsigned int nargs, p;
2788 int n, ndef; 2807 int n, ndef;
2789 int arg[ESC_ARGS] = { }; 2808 int arg[ESC_ARGS] = { };
2790 2809
2791 nargs = 0; 2810 nargs = 0;
2797 /* '<' '=' '>' '?' '!' */ 2816 /* '<' '=' '>' '?' '!' */
2798 priv = ch; 2817 priv = ch;
2799 ch = cmd_getc (); 2818 ch = cmd_getc ();
2800 } 2819 }
2801 2820
2821 prev_ch = 0;
2802 /* read any numerical arguments */ 2822 /* read any numerical arguments */
2803 for (n = -1; ch < CSI_ICH; ) 2823 for (n = -1; ch < CSI_ICH; )
2804 { 2824 {
2805 if (isdigit (ch)) 2825 if (isdigit (ch))
2806 { 2826 {
2816 n = -1; 2836 n = -1;
2817 } 2837 }
2818 else if (IS_CONTROL (ch)) 2838 else if (IS_CONTROL (ch))
2819 process_nonprinting (ch); 2839 process_nonprinting (ch);
2820 2840
2841 prev_ch = ch;
2821 ch = cmd_getc (); 2842 ch = cmd_getc ();
2822 } 2843 }
2823 2844
2824 if (ch > CSI_7F) 2845 if (ch > CSI_7F)
2825 return; 2846 return;
2866 scr_soft_reset (); 2887 scr_soft_reset ();
2867 2888
2868 static const int pm_h[] = { 7, 25 }; 2889 static const int pm_h[] = { 7, 25 };
2869 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 };
2870 2891
2871 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h); 2892 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2872 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l); 2893 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2873 } 2894 }
2874 break; 2895 break;
2875 } 2896 }
2876 2897
2877 return; 2898 return;
2895 } 2916 }
2896 break; 2917 break;
2897#endif 2918#endif
2898 2919
2899 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2920 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2900 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2921 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2901 arg[0] = -arg[0]; 2922 arg[0] = -arg[0];
2902 /* FALLTHROUGH */ 2923 /* FALLTHROUGH */
2903 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2924 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2904 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2925 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2905 scr_gotorc (arg[0], 0, RELATIVE); 2926 scr_gotorc (arg[0], 0, RELATIVE);
2906 break; 2927 break;
2907 2928
2908 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2929 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2909 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2930 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
3059 scr_insert_mode (1); 3080 scr_insert_mode (1);
3060 else if (arg[0] == 20) 3081 else if (arg[0] == 20)
3061 priv_modes |= PrivMode_LFNL; 3082 priv_modes |= PrivMode_LFNL;
3062 break; 3083 break;
3063 3084
3085 case CSI_71: // DESCUSR: set cursor style
3086 if (prev_ch == ' ')
3087 set_cursor_style (arg[0]);
3088 break;
3089
3064 /* 3090 /*
3065 * PRIVATE USE beyond this point. All CSI_7? sequences here 3091 * PRIVATE USE beyond this point. All CSI_7? sequences here
3066 */ 3092 */
3067 case CSI_72: /* DECSTBM: set top and bottom margins */ 3093 case CSI_72: /* DECSTBM: set top and bottom margins */
3068 if (nargs == 1) 3094 if (nargs == 1)
3096 } 3122 }
3097} 3123}
3098/*}}} */ 3124/*}}} */
3099 3125
3100#if !ENABLE_MINIMAL 3126#if !ENABLE_MINIMAL
3101/* ARGSUSED */
3102void 3127void
3103rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3128rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3104{ 3129{
3105 int x, y; 3130 int x, y;
3106 XWindowAttributes wattr; 3131 XWindowAttributes wattr;
3143 break; 3168 break;
3144 3169
3145 //case 9: NYI, TODO, restore maximized window or maximize window 3170 //case 9: NYI, TODO, restore maximized window or maximize window
3146 default: 3171 default:
3147 if (args[0] >= 24) /* set height (chars) */ 3172 if (args[0] >= 24) /* set height (chars) */
3148 set_widthheight ((unsigned int)width, 3173 set_widthheight ((unsigned int)vt_width,
3149 (unsigned int) (args[1] * fheight)); 3174 (unsigned int) (args[1] * fheight));
3150 break; 3175 break;
3151 3176
3152 /* 3177 /*
3153 * reports - some output format copied from XTerm 3178 * reports - some output format copied from XTerm
3432 break; 3457 break;
3433#endif 3458#endif
3434 case URxvt_Color_border: 3459 case URxvt_Color_border:
3435 process_color_seq (op, Color_border, str, resp); 3460 process_color_seq (op, Color_border, str, resp);
3436 break; 3461 break;
3437#if ENABLE_TRANSPARENCY 3462
3463#if BG_IMAGE_FROM_ROOT
3438 case URxvt_Color_tint: 3464 case URxvt_Color_tint:
3439 process_color_seq (op, Color_tint, str, resp); 3465 process_color_seq (op, Color_tint, str, resp);
3440 { 3466 {
3441 bool changed = false; 3467 bool changed = false;
3442 3468
3443 if (ISSET_PIXCOLOR (Color_tint)) 3469 if (ISSET_PIXCOLOR (Color_tint))
3444 changed = bg_set_tint (pix_colors_focused [Color_tint]); 3470 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3445 3471
3446 if (changed) 3472 if (changed)
3447 update_background (); 3473 update_background ();
3448 } 3474 }
3449 3475
3453#if BG_IMAGE_FROM_FILE 3479#if BG_IMAGE_FROM_FILE
3454 case Rxvt_Pixmap: 3480 case Rxvt_Pixmap:
3455 if (!strcmp (str, "?")) 3481 if (!strcmp (str, "?"))
3456 { 3482 {
3457 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;
3458 3488
3459 sprintf (str, "[%dx%d+%d+%d]", 3489 sprintf (str, "[%dx%d+%d+%d]",
3460 min (h_scale, 32767), min (v_scale, 32767), 3490 h_scale, v_scale,
3461 min (h_align, 32767), min (v_align, 32767)); 3491 h_align, v_align);
3462 process_xterm_seq (XTerm_title, str, CHAR_ST); 3492 process_xterm_seq (XTerm_title, str, CHAR_ST);
3463 } 3493 }
3464 else 3494 else
3465 { 3495 {
3466 int changed = 0; 3496 bool changed = false;
3467 3497
3468 if (*str != ';') 3498 if (*str != ';')
3469 { 3499 {
3470 if (bg_set_file (str)) /* change pixmap */ 3500 try
3471 { 3501 {
3502 fimage.set_file_geometry (this, str);
3472 changed++; 3503 changed = true;
3473 str = strchr (str, ';');
3474 if (str == NULL)
3475 bg_set_default_geometry ();
3476 else 3504 }
3477 bg_set_geometry (str+1); 3505 catch (const class rxvt_failure_exception &e)
3506 {
3478 } 3507 }
3479 } 3508 }
3480 else 3509 else
3481 { 3510 {
3482 str++; 3511 str++;
3483 if (bg_set_geometry (str, true)) 3512 if (fimage.set_geometry (str, true))
3484 changed++; 3513 changed = true;
3485 } 3514 }
3486 3515
3487 if (changed) 3516 if (changed)
3488 { 3517 {
3489 if (bg_window_position_sensitive ()) 3518 if (bg_window_position_sensitive ())
3490 { 3519 {
3491 int x, y; 3520 int x, y;
3492 get_window_origin (x, y); 3521 get_window_origin (x, y);
3493 bg_set_position (x, y); 3522 parent_x = x;
3523 parent_y = y;
3494 } 3524 }
3495 update_background (); 3525 update_background ();
3496 } 3526 }
3497 } 3527 }
3498 break; 3528 break;
3588 * 's' = save 3618 * 's' = save
3589 * 'r' = restore 3619 * 'r' = restore
3590 * 't' = toggle 3620 * 't' = toggle
3591 * so no need for fancy checking 3621 * so no need for fancy checking
3592 */ 3622 */
3593int 3623int ecb_cold
3594rxvt_term::privcases (int mode, unsigned long bit) 3624rxvt_term::privcases (int mode, unsigned long bit)
3595{ 3625{
3596 int state; 3626 int state;
3597 3627
3598 if (mode == 's') 3628 if (mode == 's')
3599 { 3629 {
3600 SavedModes |= (priv_modes & bit); 3630 if (priv_modes & bit)
3631 SavedModes |= bit;
3632 else
3633 SavedModes &= ~bit;
3601 return -1; 3634 return -1;
3602 } 3635 }
3603 else 3636 else
3604 { 3637 {
3605 if (mode == 'r') 3638 if (mode == 'r')
3606 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3639 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3607 else 3640 else
3608 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3641 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3609 3642
3610 set_privmode (bit, state); 3643 if (state)
3644 priv_modes |= bit;
3645 else
3646 priv_modes &= ~bit;
3611 } 3647 }
3612 3648
3613 return state; 3649 return state;
3614} 3650}
3615 3651
3616/* we're not using priv _yet_ */ 3652/* we're not using priv _yet_ */
3617void 3653void
3618rxvt_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)
3619{ 3655{
3620 unsigned int i, j; 3656 unsigned int i, j;
3621 int state; 3657 int state;
3622 3658
3623 static const struct 3659 static const struct
3624 { 3660 {
3625 const int argval; 3661 const int argval;
3626 const unsigned long bit; 3662 const unsigned long bit;
3627 } argtopriv[] = { 3663 } argtopriv[] = {
3628 { 1, PrivMode_aplCUR }, // DECCKM 3664 { 1, PrivMode_aplCUR }, // DECCKM
3629 { 2, PrivMode_vt52 }, 3665 { 2, PrivMode_vt52 }, // DECANM
3630 { 3, PrivMode_132 }, // DECCOLM 3666 { 3, PrivMode_132 }, // DECCOLM
3631 { 4, PrivMode_smoothScroll }, // DECSCLM 3667 { 4, PrivMode_smoothScroll }, // DECSCLM
3632 { 5, PrivMode_rVideo }, // DECSCNM 3668 { 5, PrivMode_rVideo }, // DECSCNM
3633 { 6, PrivMode_relOrigin }, // DECOM 3669 { 6, PrivMode_relOrigin }, // DECOM
3634 { 7, PrivMode_Autowrap }, // DECAWM 3670 { 7, PrivMode_Autowrap }, // DECAWM
3635 // 8, auto-repeat keys // DECARM 3671 // 8, auto-repeat keys // DECARM
3636 { 9, PrivMode_MouseX10 }, 3672 { 9, PrivMode_MouseX10 },
3637 // 18 end FF to printer after print screen 3673 // 18 end FF to printer after print screen
3638 // 19 Print screen prints full screen/scroll region 3674 // 19 Print screen prints full screen/scroll region
3639 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3675 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3640#ifdef scrollBar_esc 3676#ifdef scrollBar_esc
3641 { scrollBar_esc, PrivMode_scrollBar }, 3677 { scrollBar_esc, PrivMode_scrollBar },
3642#endif 3678#endif
3643 { 35, PrivMode_ShiftKeys }, // rxvt extension 3679 { 35, PrivMode_ShiftKeys }, // rxvt extension
3644 // 38, tektronix mode // DECTEK 3680 // 38, tektronix mode // DECTEK
3645 { 40, PrivMode_132OK }, 3681 { 40, PrivMode_132OK },
3646 // 41 xterm more fixes NYI 3682 // 41 xterm more fixes NYI
3647 // 45 margin bell NYI 3683 // 45 margin bell NYI
3648 // 46 start logging 3684 // 46 start logging
3649 { 47, PrivMode_Screen }, 3685 { 47, PrivMode_Screen },
3650 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3686 { 66, PrivMode_aplKP }, // DECNKM
3651#ifndef NO_BACKSPACE_KEY 3687#ifndef NO_BACKSPACE_KEY
3652 { 67, PrivMode_BackSpace }, // DECBKM 3688 { 67, PrivMode_BackSpace }, // DECBKM
3653#endif 3689#endif
3654 { 1000, PrivMode_MouseX11 }, 3690 { 1000, PrivMode_MouseX11 },
3655 { 1002, PrivMode_MouseBtnEvent }, 3691 { 1002, PrivMode_MouseBtnEvent },
3684 for (i = 0; i < nargs; i++) 3720 for (i = 0; i < nargs; i++)
3685 { 3721 {
3686 state = -1; 3722 state = -1;
3687 3723
3688 /* basic handling */ 3724 /* basic handling */
3689 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++) 3725 for (j = 0; j < ecb_array_length (argtopriv); j++)
3690 if (argtopriv[j].argval == arg[i]) 3726 if (argtopriv[j].argval == arg[i])
3691 { 3727 {
3692 state = privcases (mode, argtopriv[j].bit); 3728 state = privcases (mode, argtopriv[j].bit);
3693 break; 3729 break;
3694 } 3730 }
3720 case 2: /* VT52 mode */ 3756 case 2: /* VT52 mode */
3721 /* oddball mode. should be set regardless of set/reset 3757 /* oddball mode. should be set regardless of set/reset
3722 * parameter. Return from VT52 mode with an ESC < from 3758 * parameter. Return from VT52 mode with an ESC < from
3723 * within VT52 mode 3759 * within VT52 mode
3724 */ 3760 */
3725 set_privmode (PrivMode_vt52, 1); 3761 priv_modes |= PrivMode_vt52;
3726 break; 3762 break;
3727 case 3: /* 80/132 */ 3763 case 3: /* 80/132 */
3728 if (priv_modes & PrivMode_132OK) 3764 if (priv_modes & PrivMode_132OK)
3729 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight); 3765 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3730 break; 3766 break;
3745 if (state) /* orthogonal */ 3781 if (state) /* orthogonal */
3746 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3782 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3747 break; 3783 break;
3748#ifdef scrollBar_esc 3784#ifdef scrollBar_esc
3749 case scrollBar_esc: 3785 case scrollBar_esc:
3750 if (scrollBar.map (state)) 3786 scrollBar.map (state);
3751 {
3752 resize_all_windows (0, 0, 0); 3787 resize_all_windows (0, 0, 0);
3753 scr_touch (true); 3788 scr_touch (true);
3754 }
3755 break; 3789 break;
3756#endif 3790#endif
3757 case 25: /* visible/invisible cursor */ 3791 case 25: /* visible/invisible cursor */
3758 scr_cursor_visible (state); 3792 scr_cursor_visible (state);
3759 break; 3793 break;
3814 } 3848 }
3815} 3849}
3816/*}}} */ 3850/*}}} */
3817 3851
3818/*{{{ process sgr sequences */ 3852/*{{{ process sgr sequences */
3819void 3853void ecb_hot
3820rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3854rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3821{ 3855{
3822 unsigned int i; 3856 unsigned int i;
3823 short rendset; 3857 short rendset;
3824 int rendstyle; 3858 int rendstyle;
3965 break; 3999 break;
3966#endif 4000#endif
3967 } 4001 }
3968 } 4002 }
3969} 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}
3970/*}}} */ 4020/*}}} */
3971 4021
3972/* ------------------------------------------------------------------------- */ 4022/* ------------------------------------------------------------------------- */
3973 4023
3974/* 4024/*

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines