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.471 by sf-exg, Thu Jan 20 16:41:23 2011 UTC vs.
Revision 1.516 by root, Tue Jun 5 14:46:54 2012 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2007 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2011 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
… …
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)
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;
… …
254 delete [] alloc; 254 delete [] alloc;
255# endif 255# endif
256} 256}
257#endif 257#endif
258 258
259void 259void ecb_cold
260rxvt_term::commit_iso14755 () 260rxvt_term::commit_iso14755 ()
261{ 261{
262 wchar_t ch[2];
263
264 ch[0] = iso14755buf & ISO_14755_MASK; 262 wchar_t ch = iso14755buf & ISO_14755_MASK;
265 ch[1] = 0;
266 263
267 if (iso14755buf & ISO_14755_51) 264 if (iso14755buf & ISO_14755_51)
268 { 265 {
269 char mb[16]; 266 char mb[MB_LEN_MAX];
270 int len; 267 int len;
271 268
272 // allow verbatim 0-bytes and control-bytes to be entered 269 // allow verbatim 0-bytes and control-bytes to be entered
273 if (ch[0] >= 0x20) 270 if (ch >= 0x20)
274 len = wcstombs (mb, ch, 16); 271 len = wctomb (mb, ch);
275 else 272 else
276 { 273 {
277 mb[0] = ch[0]; 274 mb[0] = ch;
278 len = 1; 275 len = 1;
279 } 276 }
280 277
281 if (len > 0) 278 if (len > 0)
282 tt_write (mb, len); 279 tt_write (mb, len);
… …
285 } 282 }
286 283
287 iso14755buf = 0; 284 iso14755buf = 0;
288} 285}
289 286
290static int 287static int ecb_cold
291hex_keyval (XKeyEvent &ev) 288hex_keyval (XKeyEvent &ev)
292{ 289{
293 // check whether this event corresponds to a hex digit 290 // check whether this event corresponds to a hex digit
294 // if the modifiers had not been pressed. 291 // if the modifiers had not been pressed.
295 for (int index = 0; index < 8; index++) 292 for (int index = 0; index < 8; index++)
… …
304 301
305 return -1; 302 return -1;
306} 303}
307#endif 304#endif
308 305
309static inline KeySym 306static inline KeySym ecb_cold
310translate_keypad (KeySym keysym, bool kp) 307translate_keypad (KeySym keysym, bool kp)
311{ 308{
312#ifdef XK_KP_Home 309#ifdef XK_KP_Home
313 static const KeySym keypadtrans[] = { 310 static const KeySym keypadtrans[] = {
314 XK_KP_7, // XK_KP_Home 311 XK_KP_7, // XK_KP_Home
… …
340# endif 337# endif
341#endif 338#endif
342 return keysym; 339 return keysym;
343} 340}
344 341
345static inline int 342static inline int ecb_cold
346map_function_key (KeySym keysym) 343map_function_key (KeySym keysym)
347{ 344{
348 int param = 0; 345 int param = 0;
349 346
350 if (IN_RANGE_INC (keysym, XK_F1, XK_F35)) 347 if (IN_RANGE_INC (keysym, XK_F1, XK_F35))
… …
399 break; 396 break;
400 } 397 }
401 return param; 398 return param;
402} 399}
403 400
404void 401void ecb_cold
405rxvt_term::key_press (XKeyEvent &ev) 402rxvt_term::key_press (XKeyEvent &ev)
406{ 403{
407 int ctrl, meta, shft, len; 404 int ctrl, meta, shft, len;
408 KeySym keysym; 405 KeySym keysym;
409 int valid_keysym; 406 int valid_keysym;
… …
424 ctrl = ev.state & ControlMask; 421 ctrl = ev.state & ControlMask;
425 meta = ev.state & ModMetaMask; 422 meta = ev.state & ModMetaMask;
426 423
427 kbuf[0] = 0; 424 kbuf[0] = 0;
428 425
429#ifdef USE_XIM 426#if USE_XIM
430 if (Input_Context) 427 if (Input_Context)
431 { 428 {
432 Status status_return; 429 Status status_return;
433 430
434#if 0 431#if 0
… …
569 selection_request (ev.time); 566 selection_request (ev.time);
570 return; 567 return;
571#if TODO 568#if TODO
572 /* rxvt extras */ 569 /* rxvt extras */
573 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 570 case XK_KP_Add: /* Shift+KP_Add = bigger font */
574 change_font (FONT_UP);
575 return; 571 return;
576 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */ 572 case XK_KP_Subtract: /* Shift+KP_Subtract = smaller font */
577 change_font (FONT_DN);
578 return; 573 return;
579#endif 574#endif
580 } 575 }
581 } 576 }
582 } 577 }
… …
781 } 776 }
782 777
783 if (newlen) 778 if (newlen)
784 len = strlen (kbuf); 779 len = strlen (kbuf);
785 780
781 if (len > 0)
782 {
786 /* 783 /*
784 * pass Shift/Control indicators for function keys ending with `~'
785 *
786 * eg,
787 * Prior = "ESC[5~"
788 * Shift+Prior = "ESC[5$"
789 * Ctrl+Prior = "ESC[5^"
790 * Ctrl+Shift+Prior = "ESC[5@"
791 */
792 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
793 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
794
795 /*
787 * Pass meta for all function keys, if 'meta' option set 796 * Pass meta for all function keys, if 'meta' option set
788 */ 797 */
789#ifdef META8_OPTION 798#ifdef META8_OPTION
790 if (meta && (meta_char == 0x80) && len > 0) 799 if (meta && (meta_char == 0x80))
791 kbuf[len - 1] |= 0x80; 800 kbuf[len - 1] |= 0x80;
792#endif 801#endif
802 }
793 803
794 } 804 }
795 else if (ctrl && keysym == XK_minus) 805 else if (ctrl && keysym == XK_minus)
796 { 806 {
797 len = 1; 807 len = 1;
… …
831 { 841 {
832 view_start = 0; 842 view_start = 0;
833 want_refresh = 1; 843 want_refresh = 1;
834 } 844 }
835 845
836 /*
837 * these modifications only affect the static keybuffer
838 * pass Shift/Control indicators for function keys ending with `~'
839 *
840 * eg,
841 * Prior = "ESC[5~"
842 * Shift+Prior = "ESC[5$"
843 * Ctrl+Prior = "ESC[5^"
844 * Ctrl+Shift+Prior = "ESC[5@"
845 * Meta adds an Escape prefix (with META8_OPTION, if meta == <escape>).
846 */
847 if (kbuf[0] == C0_ESC && kbuf[1] == '[' && kbuf[len - 1] == '~')
848 kbuf[len - 1] = (shft ? (ctrl ? '@' : '$') : (ctrl ? '^' : '~'));
849
850 /* escape prefix */ 846 /* escape prefix */
851 if (meta 847 if (meta
852#ifdef META8_OPTION 848#ifdef META8_OPTION
853 && meta_char == C0_ESC 849 && meta_char == C0_ESC
854#endif 850#endif
… …
859 } 855 }
860 856
861 tt_write (kbuf, (unsigned int)len); 857 tt_write (kbuf, (unsigned int)len);
862} 858}
863 859
864void 860void ecb_cold
865rxvt_term::key_release (XKeyEvent &ev) 861rxvt_term::key_release (XKeyEvent &ev)
866{ 862{
867#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL 863#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
868 KeySym keysym; 864 KeySym keysym;
869 865
… …
936 else if (keysym == XK_Control_L || keysym == XK_Control_R) 932 else if (keysym == XK_Control_L || keysym == XK_Control_R)
937 mouse_slip_wheel_speed = 0; 933 mouse_slip_wheel_speed = 0;
938#endif 934#endif
939} 935}
940 936
941#if defined (KEYSYM_RESOURCE)
942unsigned int
943rxvt_term::cmd_write (const char *str, unsigned int count)
944{
945 unsigned int n, s;
946
947 n = cmdbuf_ptr - cmdbuf_base;
948 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
949
950 if (n > 0 && s < count)
951 {
952 memmove (cmdbuf_base, cmdbuf_ptr,
953 (unsigned int) (cmdbuf_endp - cmdbuf_ptr));
954 cmdbuf_ptr = cmdbuf_base;
955 cmdbuf_endp -= n;
956 s += n;
957 }
958
959 if (count > s)
960 {
961 rxvt_warn ("data loss: cmd_write too large, continuing.\n");
962 count = s;
963 }
964
965 for (; count--;)
966 *cmdbuf_endp++ = *str++;
967
968 cmd_parse ();
969
970 return 0;
971}
972#endif
973
974void 937void
975rxvt_term::flush () 938rxvt_term::flush ()
976{ 939{
977 flush_ev.stop (); 940 flush_ev.stop ();
978 941
979#ifdef HAVE_BG_PIXMAP 942#ifdef HAVE_BG_PIXMAP
980 if (bgPixmap.flags & bgPixmap_t::hasChanged) 943 if (bg_flags & BG_NEEDS_REFRESH)
981 { 944 {
982 bgPixmap.flags &= ~bgPixmap_t::hasChanged; 945 bg_flags &= ~BG_NEEDS_REFRESH;
983 scr_touch (false); 946 scr_touch (false);
984 } 947 }
985#endif 948#endif
986 949
987 if (want_refresh) 950 if (want_refresh)
… …
1024 while (row < end_row); 987 while (row < end_row);
1025 } 988 }
1026 989
1027 scr_refresh (); 990 scr_refresh ();
1028 scrollBar.show (1); 991 scrollBar.show (1);
1029#ifdef USE_XIM 992#if USE_XIM
1030 IMSendSpot (); 993 im_send_spot ();
1031#endif 994#endif
1032 } 995 }
1033 996
1034 display->flush (); 997 display->flush ();
1035} 998}
… …
1053 flush (); 1016 flush ();
1054} 1017}
1055 1018
1056#ifdef CURSOR_BLINK 1019#ifdef CURSOR_BLINK
1057void 1020void
1021rxvt_term::cursor_blink_reset ()
1022{
1023 if (hidden_cursor)
1024 {
1025 hidden_cursor = 0;
1026 want_refresh = 1;
1027 }
1028
1029 if (option (Opt_cursorBlink))
1030 cursor_blink_ev.again ();
1031 else
1032 cursor_blink_ev.stop ();
1033}
1034
1035void
1058rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1036rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1059{ 1037{
1060 hidden_cursor = !hidden_cursor; 1038 hidden_cursor = !hidden_cursor;
1061 want_refresh = 1; 1039 want_refresh = 1;
1062 refresh_check (); 1040 refresh_check ();
… …
1080 1058
1081#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1059#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1082void 1060void
1083rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1061rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1084{ 1062{
1085 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1063 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1086 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1064 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1087 { 1065 {
1088 want_refresh = 1; 1066 want_refresh = 1;
1089 refresh_check (); 1067 refresh_check ();
1090 } 1068 }
1091 else 1069 else
… …
1152 { 1130 {
1153 } 1131 }
1154} event_handler; 1132} event_handler;
1155#endif 1133#endif
1156 1134
1135/* make sure all the cmd data is at beginning of cmdbuf */
1136void
1137rxvt_term::cmdbuf_reify ()
1138{
1139 if (cmdbuf_ptr == cmdbuf_base)
1140 return;
1141
1142 ssize_t used = cmdbuf_endp - cmdbuf_ptr;
1143
1144 memmove (cmdbuf_base, cmdbuf_ptr, used);
1145 cmdbuf_ptr = cmdbuf_base;
1146 cmdbuf_endp = cmdbuf_ptr + used;
1147
1148}
1149
1150#if defined (KEYSYM_RESOURCE)
1151void
1152rxvt_term::cmdbuf_append (const char *str, size_t count)
1153{
1154 cmdbuf_reify ();
1155
1156 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1157
1158 if (count > avail)
1159 return;
1160
1161 memcpy (cmdbuf_endp, str, count);
1162 cmdbuf_endp += count;
1163
1164 cmd_parse ();
1165}
1166#endif
1167
1157bool 1168bool
1158rxvt_term::pty_fill () 1169rxvt_term::pty_fill ()
1159{ 1170{
1160 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1171 cmdbuf_reify ();
1161 1172
1162 if (CBUFSIZ == n) 1173 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1163 { 1174
1164 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1175 if (!avail)
1165 n = 0;
1166 } 1176 {
1167 1177 // normally this indicates a "too long" command sequence - just drop the data we have
1168 memmove (cmdbuf_base, cmdbuf_ptr, n);
1169 cmdbuf_ptr = cmdbuf_base; 1178 cmdbuf_ptr = cmdbuf_base;
1170 cmdbuf_endp = cmdbuf_ptr + n; 1179 cmdbuf_endp = cmdbuf_ptr;
1180 avail = CBUFSIZ;
1181 }
1171 1182
1172 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1183 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1173 1184
1174 if (r > 0) 1185 if (r > 0)
1175 { 1186 {
1176 cmdbuf_endp += r; 1187 cmdbuf_endp += r;
1177 return true; 1188 return true;
… …
1208 pty_write (); 1219 pty_write ();
1209 1220
1210 refresh_check (); 1221 refresh_check ();
1211} 1222}
1212 1223
1213void 1224void ecb_cold
1214rxvt_term::pointer_unblank () 1225rxvt_term::pointer_unblank ()
1215{ 1226{
1216 XDefineCursor (dpy, vt, TermWin_cursor); 1227 XDefineCursor (dpy, vt, TermWin_cursor);
1217 recolour_cursor (); 1228 recolour_cursor ();
1218 1229
… …
1223 pointer_ev.start (pointerBlankDelay); 1234 pointer_ev.start (pointerBlankDelay);
1224#endif 1235#endif
1225} 1236}
1226 1237
1227#ifdef POINTER_BLANK 1238#ifdef POINTER_BLANK
1228void 1239void ecb_cold
1229rxvt_term::pointer_blank () 1240rxvt_term::pointer_blank ()
1230{ 1241{
1231 if (!option (Opt_pointerBlank)) 1242 if (!option (Opt_pointerBlank))
1232 return; 1243 return;
1233 1244
… …
1235 XFlush (dpy); 1246 XFlush (dpy);
1236 1247
1237 hidden_pointer = 1; 1248 hidden_pointer = 1;
1238} 1249}
1239 1250
1240void 1251void ecb_cold
1241rxvt_term::pointer_cb (ev::timer &w, int revents) 1252rxvt_term::pointer_cb (ev::timer &w, int revents)
1242{ 1253{
1243 make_current (); 1254 make_current ();
1244 1255
1245 pointer_blank (); 1256 pointer_blank ();
… …
1337 32 + x, 1348 32 + x,
1338 32 + y); 1349 32 + y);
1339} 1350}
1340 1351
1341/*{{{ process an X event */ 1352/*{{{ process an X event */
1342void 1353void ecb_hot
1343rxvt_term::x_cb (XEvent &ev) 1354rxvt_term::x_cb (XEvent &ev)
1344{ 1355{
1345 make_current (); 1356 make_current ();
1346 1357
1347 dLocal (Display *, dpy); 1358 dLocal (Display *, dpy);
… …
1445 && ev.xfocus.mode != NotifyGrab) 1456 && ev.xfocus.mode != NotifyGrab)
1446 focus_out (); 1457 focus_out ();
1447 break; 1458 break;
1448 1459
1449 case ConfigureNotify: 1460 case ConfigureNotify:
1450 if (ev.xconfigure.window == parent[0]) 1461 if (ev.xconfigure.window == parent)
1451 { 1462 {
1452 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1463 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1453 ; 1464 ;
1454 1465
1466 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1467
1455#ifdef HAVE_BG_PIXMAP 1468#ifdef HAVE_BG_PIXMAP
1469 if (bg_window_position_sensitive ())
1470 want_position_change = true;
1471#endif
1472
1456 bool moved = false; 1473 bool moved = false;
1457 if (bgPixmap.window_position_sensitive ()) 1474
1475 if (want_position_change)
1458 { 1476 {
1459 int x, y; 1477 int x, y;
1478
1460 if (ev.xconfigure.send_event) 1479 if (ev.xconfigure.send_event)
1461 { 1480 {
1462 x = ev.xconfigure.x; 1481 x = ev.xconfigure.x;
1463 y = ev.xconfigure.y; 1482 y = ev.xconfigure.y;
1464 } 1483 }
1465 else 1484 else
1466 get_window_origin (x, y); 1485 get_window_origin (x, y);
1467 1486
1487 if (x != parent_x || y != parent_y)
1488 {
1489 HOOK_INVOKE ((this, HOOK_POSITION_CHANGE, DT_INT, x, DT_INT, y, DT_END));
1490 parent_x = x;
1491 parent_y = y;
1492 }
1493
1468 if (bgPixmap.set_position (x, y) 1494 if (bg_set_position (x, y)
1469 || (bgPixmap.flags & bgPixmap_t::isInvalid)) 1495 || !(bg_flags & BG_IS_VALID))
1470 moved = true; 1496 moved = true;
1471 } 1497 }
1472#endif
1473 1498
1474 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1499 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1475 { 1500 {
1476 seen_resize = 1; 1501 seen_resize = 1;
1477 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1502 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1478 } 1503 }
1479 else 1504 else
1480 { 1505 {
1481#ifdef HAVE_BG_PIXMAP 1506#ifdef HAVE_BG_PIXMAP
1482 if (moved) 1507 if (moved)
1483 {
1484 if (mapped)
1485 update_background (); 1508 update_background ();
1486 else
1487 bgPixmap.invalidate ();
1488 }
1489#endif 1509#endif
1490 } 1510 }
1491 1511
1492 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1512 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1493 } 1513 }
1494 break; 1514 break;
1495 1515
1496 case PropertyNotify: 1516 case PropertyNotify:
1497 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1517 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1498 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1499 && ev.xproperty.state == PropertyNewValue)
1500 selection_property (ev.xproperty.window, ev.xproperty.atom);
1501
1502 break; 1518 break;
1503 1519
1504 case SelectionClear: 1520 case SelectionClear:
1505 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]); 1521 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1506 break;
1507
1508 case SelectionNotify:
1509 if (selection_wait == Sel_normal)
1510 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1511 break; 1522 break;
1512 1523
1513 case SelectionRequest: 1524 case SelectionRequest:
1514 selection_send (ev.xselectionrequest); 1525 selection_send (ev.xselectionrequest);
1515 break; 1526 break;
… …
1526 * by scheduling background redraw as soon as we can, but giving a short 1537 * by scheduling background redraw as soon as we can, but giving a short
1527 * bit of time for ConfigureNotifies to arrive. 1538 * bit of time for ConfigureNotifies to arrive.
1528 * We should render background PRIOR to drawing any text, but AFTER all 1539 * We should render background PRIOR to drawing any text, but AFTER all
1529 * of ConfigureNotifys for the best results. 1540 * of ConfigureNotifys for the best results.
1530 */ 1541 */
1531 if (bgPixmap.flags & bgPixmap_t::isInvalid) 1542 if (!(bg_flags & BG_IS_VALID))
1532 update_background_ev.start (0.025); 1543 update_background_ev.start (0.025);
1533#endif 1544#endif
1534 mapped = 1; 1545 mapped = 1;
1535#ifdef TEXT_BLINK 1546#ifdef TEXT_BLINK
1536 text_blink_ev.start (); 1547 text_blink_ev.start ();
… …
1551 if (ev.xany.window == vt) 1562 if (ev.xany.window == vt)
1552 { 1563 {
1553 do 1564 do
1554 { 1565 {
1555 scr_expose (ev.xexpose.x, ev.xexpose.y, 1566 scr_expose (ev.xexpose.x, ev.xexpose.y,
1556 ev.xexpose.width, ev.xexpose.height, False); 1567 ev.xexpose.width, ev.xexpose.height, false);
1557 } 1568 }
1558 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1569 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1559 1570
1560 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1571 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1561 1572
1562 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1573 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1563 { 1574 {
1564 scr_expose (ev.xexpose.x, ev.xexpose.y, 1575 scr_expose (ev.xexpose.x, ev.xexpose.y,
1565 ev.xexpose.width, ev.xexpose.height, False); 1576 ev.xexpose.width, ev.xexpose.height, false);
1566 } 1577 }
1567 1578
1568 want_refresh = 1; 1579 want_refresh = 1;
1569 } 1580 }
1570 else 1581 else
… …
1576 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1587 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1577 ; 1588 ;
1578 1589
1579 if (scrollBar.state && ev.xany.window == scrollBar.win) 1590 if (scrollBar.state && ev.xany.window == scrollBar.win)
1580 { 1591 {
1581 scrollBar.state = STATE_IDLE; 1592 scrollBar.state = SB_STATE_IDLE;
1582 scrollBar.show (0); 1593 scrollBar.show (0);
1583 } 1594 }
1584 } 1595 }
1585 break; 1596 break;
1586 1597
… …
1652 dist = int_bwidth - ev.xbutton.y; 1663 dist = int_bwidth - ev.xbutton.y;
1653 } 1664 }
1654 else 1665 else
1655 { 1666 {
1656 scroll_selection_dir = DN; 1667 scroll_selection_dir = DN;
1657 dist = ev.xbutton.y - (int_bwidth + height); 1668 dist = ev.xbutton.y - (int_bwidth + vt_height);
1658 } 1669 }
1659 1670
1660 scroll_selection_lines = Pixel2Height (dist) 1671 scroll_selection_lines = Pixel2Height (dist)
1661 / SELECTION_SCROLL_LINE_SPEEDUP 1672 / SELECTION_SCROLL_LINE_SPEEDUP
1662 + 1; 1673 + 1;
… …
1674#ifdef MOUSE_THRESHOLD 1685#ifdef MOUSE_THRESHOLD
1675 } 1686 }
1676#endif 1687#endif
1677 } 1688 }
1678 } 1689 }
1679 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1690 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1680 { 1691 {
1681 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1692 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1682 MotionNotify, &ev)) 1693 MotionNotify, &ev))
1683 ; 1694 ;
1684 1695
1685 XQueryPointer (dpy, scrollBar.win, 1696 XQueryPointer (dpy, scrollBar.win,
1686 &unused_root, &unused_child, 1697 &unused_root, &unused_child,
1687 &unused_root_x, &unused_root_y, 1698 &unused_root_x, &unused_root_y,
1688 &ev.xbutton.x, &ev.xbutton.y, 1699 &ev.xbutton.x, &ev.xbutton.y,
1689 &unused_mask); 1700 &unused_mask);
1690 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1701 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1691 scrollBar.size ()); 1702 scrollBar.size ());
1692 want_refresh = 1; 1703 want_refresh = 1;
1693 scrollBar.show (1); 1704 scrollBar.show (1);
1694 } 1705 }
1695 break; 1706 break;
1696 } 1707 }
1697 1708
1698#if defined(CURSOR_BLINK) 1709#if defined(CURSOR_BLINK)
1699 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1710 if (ev.type == KeyPress)
1700 {
1701 if (hidden_cursor)
1702 {
1703 hidden_cursor = 0;
1704 want_refresh = 1;
1705 }
1706
1707 cursor_blink_ev.again (); 1711 cursor_blink_reset ();
1708 }
1709#endif 1712#endif
1710 1713
1711#if defined(POINTER_BLANK) 1714#if defined(POINTER_BLANK)
1712 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1715 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1713 { 1716 {
… …
1724 1727
1725 refresh_check (); 1728 refresh_check ();
1726} 1729}
1727 1730
1728#if ENABLE_FRILLS 1731#if ENABLE_FRILLS
1729void 1732void ecb_cold
1730rxvt_term::set_urgency (bool enable) 1733rxvt_term::set_urgency (bool enable)
1731{ 1734{
1732 if (enable == urgency_hint) 1735 if (enable == urgency_hint)
1733 return; 1736 return;
1734 1737
1735 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1738 if (XWMHints *h = XGetWMHints (dpy, parent))
1736 { 1739 {
1737 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1740 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1738 XSetWMHints (dpy, parent[0], h); 1741 XSetWMHints (dpy, parent, h);
1739 urgency_hint = enable; 1742 urgency_hint = enable;
1743 XFree (h);
1740 } 1744 }
1741} 1745}
1742#endif 1746#endif
1743 1747
1744void 1748void ecb_cold
1745rxvt_term::focus_in () 1749rxvt_term::focus_in ()
1746{ 1750{
1747 if (!focus) 1751 if (!focus)
1748 { 1752 {
1749 focus = 1; 1753 focus = 1;
1750 want_refresh = 1; 1754 want_refresh = 1;
1751 1755
1752#if USE_XIM 1756#if USE_XIM
1753 if (Input_Context != NULL) 1757 if (Input_Context != NULL)
1754 { 1758 {
1755 IMSetPosition (); 1759 im_set_position ();
1756 XSetICFocus (Input_Context); 1760 XSetICFocus (Input_Context);
1757 } 1761 }
1758#endif 1762#endif
1759#if CURSOR_BLINK 1763#if CURSOR_BLINK
1760 if (option (Opt_cursorBlink)) 1764 if (option (Opt_cursorBlink))
… …
1774 1778
1775 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1779 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1776 } 1780 }
1777} 1781}
1778 1782
1779void 1783void ecb_cold
1780rxvt_term::focus_out () 1784rxvt_term::focus_out ()
1781{ 1785{
1782 if (focus) 1786 if (focus)
1783 { 1787 {
1784 focus = 0; 1788 focus = 0;
… …
1817 1821
1818 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1822 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1819 } 1823 }
1820} 1824}
1821 1825
1822void 1826void ecb_cold
1823rxvt_term::update_fade_color (unsigned int idx) 1827rxvt_term::update_fade_color (unsigned int idx)
1824{ 1828{
1825#if OFF_FOCUS_FADING 1829#if OFF_FOCUS_FADING
1826 if (rs[Rs_fade]) 1830 if (rs[Rs_fade])
1827 { 1831 {
… …
1831 } 1835 }
1832#endif 1836#endif
1833} 1837}
1834 1838
1835#if ENABLE_TRANSPARENCY || ENABLE_PERL 1839#if ENABLE_TRANSPARENCY || ENABLE_PERL
1836void 1840void ecb_hot
1837rxvt_term::rootwin_cb (XEvent &ev) 1841rxvt_term::rootwin_cb (XEvent &ev)
1838{ 1842{
1839 make_current (); 1843 make_current ();
1840 1844
1841 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1845 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1842 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1846 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1843 return; 1847 return;
1844 1848
1845# if ENABLE_TRANSPARENCY
1846 switch (ev.type) 1849 switch (ev.type)
1847 { 1850 {
1848 case PropertyNotify: 1851 case PropertyNotify:
1849 /* 1852 /*
1850 * if user used some Esetroot compatible prog to set the root bg, 1853 * if user used some Esetroot compatible prog to set the root bg,
1851 * use the property to determine the pixmap. We use it later on. 1854 * use the property to determine the pixmap. We use it later on.
1852 */ 1855 */
1853 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1856 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1854 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1857 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1855 { 1858 {
1859# if ENABLE_TRANSPARENCY
1856 bgPixmap.set_root_pixmap (); 1860 bg_set_root_pixmap ();
1857 update_background (); 1861 update_background ();
1862#endif
1863#if ENABLE_PERL
1864 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1865#endif
1858 } 1866 }
1859 1867
1860 break; 1868 break;
1861 } 1869 }
1862# endif
1863 1870
1864 refresh_check (); 1871 refresh_check ();
1865} 1872}
1866#endif 1873#endif
1867 1874
… …
1991 if (scrollBar.upButton (ev.y)) 1998 if (scrollBar.upButton (ev.y))
1992 direction = UP; /* up */ 1999 direction = UP; /* up */
1993 else if (scrollBar.dnButton (ev.y)) 2000 else if (scrollBar.dnButton (ev.y))
1994 direction = DN; /* down */ 2001 direction = DN; /* down */
1995 2002
1996 scrollBar.state = STATE_IDLE; 2003 scrollBar.state = SB_STATE_IDLE;
1997 /* 2004 /*
1998 * Rxvt-style scrollbar: 2005 * Rxvt-style scrollbar:
1999 * move up if mouse is above slider 2006 * move up if mouse is above slider
2000 * move dn if mouse is below slider 2007 * move dn if mouse is below slider
2001 * 2008 *
… …
2040 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2047 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2041#endif 2048#endif
2042 if (scr_page (direction, 1)) 2049 if (scr_page (direction, 1))
2043 { 2050 {
2044 if (direction == UP) 2051 if (direction == UP)
2045 scrollBar.state = STATE_UP; 2052 scrollBar.state = SB_STATE_UP;
2046 else 2053 else
2047 scrollBar.state = STATE_DOWN; 2054 scrollBar.state = SB_STATE_DOWN;
2048 } 2055 }
2049 } 2056 }
2050 else 2057 else
2051 switch (ev.button) 2058 switch (ev.button)
2052 { 2059 {
2053 case Button2: 2060 case Button2:
2054 switch (scrollBar.align) 2061 switch (scrollBar.align)
2055 { 2062 {
2056 case R_SB_ALIGN_TOP: 2063 case SB_ALIGN_TOP:
2057 csrO = 0; 2064 csrO = 0;
2058 break; 2065 break;
2059 case R_SB_ALIGN_CENTRE: 2066 case SB_ALIGN_CENTRE:
2060 csrO = (scrollBar.bot - scrollBar.top) / 2; 2067 csrO = (scrollBar.bot - scrollBar.top) / 2;
2061 break; 2068 break;
2062 case R_SB_ALIGN_BOTTOM: 2069 case SB_ALIGN_BOTTOM:
2063 csrO = scrollBar.bot - scrollBar.top; 2070 csrO = scrollBar.bot - scrollBar.top;
2064 break; 2071 break;
2065 } 2072 }
2066 2073
2067 if (scrollBar.style == R_SB_XTERM 2074 if (scrollBar.style == SB_STYLE_XTERM
2068 || scrollbar_above_slider (ev.y) 2075 || scrollBar.above_slider (ev.y)
2069 || scrollbar_below_slider (ev.y)) 2076 || scrollBar.below_slider (ev.y))
2070 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2077 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2071 2078
2072 scrollBar.state = STATE_MOTION; 2079 scrollBar.state = SB_STATE_MOTION;
2073 break; 2080 break;
2074 2081
2075 case Button1: 2082 case Button1:
2076 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2083 if (scrollBar.align == SB_ALIGN_CENTRE)
2077 csrO = ev.y - scrollBar.top; 2084 csrO = ev.y - scrollBar.top;
2078 /* FALLTHROUGH */ 2085 /* FALLTHROUGH */
2079 2086
2080 case Button3: 2087 case Button3:
2081 if (scrollBar.style != R_SB_XTERM) 2088 if (scrollBar.style != SB_STYLE_XTERM)
2082 { 2089 {
2083 if (scrollbar_above_slider (ev.y)) 2090 if (scrollBar.above_slider (ev.y))
2084# ifdef RXVT_SCROLL_FULL 2091# ifdef RXVT_SCROLL_FULL
2085 scr_page (UP, nrow - 1); 2092 scr_page (UP, nrow - 1);
2086# else 2093# else
2087 scr_page (UP, nrow / 4); 2094 scr_page (UP, nrow / 4);
2088# endif 2095# endif
2089 else if (scrollbar_below_slider (ev.y)) 2096 else if (scrollBar.below_slider (ev.y))
2090# ifdef RXVT_SCROLL_FULL 2097# ifdef RXVT_SCROLL_FULL
2091 scr_page (DN, nrow - 1); 2098 scr_page (DN, nrow - 1);
2092# else 2099# else
2093 scr_page (DN, nrow / 4); 2100 scr_page (DN, nrow / 4);
2094# endif 2101# endif
2095 else 2102 else
2096 scrollBar.state = STATE_MOTION; 2103 scrollBar.state = SB_STATE_MOTION;
2097 } 2104 }
2098 else 2105 else
2099 { 2106 {
2100 scr_page ((ev.button == Button1 ? DN : UP), 2107 scr_page ((ev.button == Button1 ? DN : UP),
2101 (nrow 2108 (nrow
2102 * scrollbar_position (ev.y) 2109 * scrollBar.position (ev.y)
2103 / scrollBar.size ())); 2110 / scrollBar.size ()));
2104 } 2111 }
2105 2112
2106 break; 2113 break;
2107 } 2114 }
… …
2118 2125
2119 csrO = 0; /* reset csr Offset */ 2126 csrO = 0; /* reset csr Offset */
2120 if (!bypass_keystate) 2127 if (!bypass_keystate)
2121 reportmode = !! (priv_modes & PrivMode_mouse_report); 2128 reportmode = !! (priv_modes & PrivMode_mouse_report);
2122 2129
2123 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2130 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2124 { 2131 {
2125 scrollBar.state = STATE_IDLE; 2132 scrollBar.state = SB_STATE_IDLE;
2126 scrollBar.show (0); 2133 scrollBar.show (0);
2127 } 2134 }
2128 2135
2129#ifdef SELECTION_SCROLLING 2136#ifdef SELECTION_SCROLLING
2130 sel_scroll_ev.stop(); 2137 sel_scroll_ev.stop();
… …
2180 case Button3: 2187 case Button3:
2181 selection_make (ev.time); 2188 selection_make (ev.time);
2182 break; 2189 break;
2183 2190
2184 case Button2: 2191 case Button2:
2185 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2192 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2186 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2193 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2187 break; 2194 break;
2188 2195
2189#ifdef MOUSE_WHEEL 2196#ifdef MOUSE_WHEEL
2190 case Button4: 2197 case Button4:
… …
2225 } 2232 }
2226} 2233}
2227 2234
2228/*}}} */ 2235/*}}} */
2229 2236
2230void 2237void ecb_hot
2231rxvt_term::cmd_parse () 2238rxvt_term::cmd_parse ()
2232{ 2239{
2233 wchar_t ch = NOCHAR; 2240 wchar_t ch = NOCHAR;
2234 char *seq_begin; // remember start of esc-sequence here 2241 char *seq_begin; // remember start of esc-sequence here
2235 2242
2236 for (;;) 2243 for (;;)
2237 { 2244 {
2238 if (expect_false (ch == NOCHAR)) 2245 if (ecb_unlikely (ch == NOCHAR))
2239 { 2246 {
2240 seq_begin = cmdbuf_ptr; 2247 seq_begin = cmdbuf_ptr;
2241 ch = next_char (); 2248 ch = next_char ();
2242 2249
2243 if (ch == NOCHAR) 2250 if (ch == NOCHAR)
2244 break; 2251 break;
2245 } 2252 }
2246 2253
2247 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)) 2254 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2248 { 2255 {
2249 if (expect_false (!seen_input)) 2256 if (ecb_unlikely (!seen_input))
2250 { 2257 {
2251 seen_input = 1; 2258 seen_input = 1;
2252 // many badly-written programs (e.g. jed) contain a race condition: 2259 // many badly-written programs (e.g. jed) contain a race condition:
2253 // they first read the screensize and then install a SIGWINCH handler. 2260 // they first read the screensize and then install a SIGWINCH handler.
2254 // some window managers resize the window early, and these programs 2261 // some window managers resize the window early, and these programs
… …
2267 wchar_t *str = buf; 2274 wchar_t *str = buf;
2268 wchar_t *eol = str + min (ncol, UBUFSIZ); 2275 wchar_t *eol = str + min (ncol, UBUFSIZ);
2269 2276
2270 for (;;) 2277 for (;;)
2271 { 2278 {
2272 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))) 2279 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2273 break; 2280 break;
2274 2281
2275 *str++ = ch; 2282 *str++ = ch;
2276 2283
2277 if (expect_false (ch == C0_LF || str >= eol)) 2284 if (ecb_unlikely (ch == C0_LF || str >= eol))
2278 { 2285 {
2279 if (ch == C0_LF) 2286 if (ch == C0_LF)
2280 nlines++; 2287 nlines++;
2281 2288
2282 refresh_count++; 2289 refresh_count++;
… …
2354 } 2361 }
2355 } 2362 }
2356} 2363}
2357 2364
2358// read the next character 2365// read the next character
2359wchar_t 2366wchar_t ecb_hot
2360rxvt_term::next_char () NOTHROW 2367rxvt_term::next_char () NOTHROW
2361{ 2368{
2362 while (cmdbuf_ptr < cmdbuf_endp) 2369 while (cmdbuf_ptr < cmdbuf_endp)
2363 { 2370 {
2364 // assume 7-bit to be ascii ALWAYS 2371 // assume 7-bit to be ascii ALWAYS
2365 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2372 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2366 return *cmdbuf_ptr++; 2373 return *cmdbuf_ptr++;
2367 2374
2368 wchar_t wc; 2375 wchar_t wc;
2369 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2376 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2370 2377
… …
2388 2395
2389 return NOCHAR; 2396 return NOCHAR;
2390} 2397}
2391 2398
2392// read the next octet 2399// read the next octet
2393uint32_t 2400uint32_t ecb_hot
2394rxvt_term::next_octet () NOTHROW 2401rxvt_term::next_octet () NOTHROW
2395{ 2402{
2396 return cmdbuf_ptr < cmdbuf_endp 2403 return cmdbuf_ptr < cmdbuf_endp
2397 ? (unsigned char)*cmdbuf_ptr++ 2404 ? (unsigned char)*cmdbuf_ptr++
2398 : NOCHAR; 2405 : NOCHAR;
2399} 2406}
2400 2407
2401static class out_of_input out_of_input; 2408static class out_of_input out_of_input;
2402 2409
2403/* rxvt_cmd_getc () - Return next input character */ 2410wchar_t ecb_hot
2404/*
2405 * Return the next input character after first passing any keyboard input
2406 * to the command.
2407 */
2408wchar_t
2409rxvt_term::cmd_getc () THROW ((class out_of_input)) 2411rxvt_term::cmd_getc () THROW ((class out_of_input))
2410{ 2412{
2411 wchar_t c = next_char (); 2413 wchar_t c = next_char ();
2412 2414
2413 if (c == NOCHAR) 2415 if (c == NOCHAR)
2414 throw out_of_input; 2416 throw out_of_input;
2415 2417
2416 return c; 2418 return c;
2417} 2419}
2418 2420
2419uint32_t 2421uint32_t ecb_hot
2420rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2422rxvt_term::cmd_get8 () THROW ((class out_of_input))
2421{ 2423{
2422 uint32_t c = next_octet (); 2424 uint32_t c = next_octet ();
2423 2425
2424 if (c == NOCHAR) 2426 if (c == NOCHAR)
… …
2428} 2430}
2429 2431
2430/*{{{ print pipe */ 2432/*{{{ print pipe */
2431/*----------------------------------------------------------------------*/ 2433/*----------------------------------------------------------------------*/
2432#ifdef PRINTPIPE 2434#ifdef PRINTPIPE
2433FILE * 2435FILE * ecb_cold
2434rxvt_term::popen_printer () 2436rxvt_term::popen_printer ()
2435{ 2437{
2436 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w"); 2438 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2437 2439
2438 if (stream == NULL) 2440 if (stream == NULL)
2439 rxvt_warn ("can't open printer pipe, not printing.\n"); 2441 rxvt_warn ("can't open printer pipe, not printing.\n");
2440 2442
2441 return stream; 2443 return stream;
2442} 2444}
2443 2445
2444int 2446int ecb_cold
2445rxvt_term::pclose_printer (FILE *stream) 2447rxvt_term::pclose_printer (FILE *stream)
2446{ 2448{
2447 fflush (stream); 2449 fflush (stream);
2448 return pclose (stream); 2450 return pclose (stream);
2449} 2451}
2450 2452
2451/* 2453/*
2452 * simulate attached vt100 printer 2454 * simulate attached vt100 printer
2453 */ 2455 */
2454void 2456void ecb_cold
2455rxvt_term::process_print_pipe () 2457rxvt_term::process_print_pipe ()
2456{ 2458{
2457 FILE *fd = popen_printer (); 2459 FILE *fd = popen_printer ();
2458 2460
2459 if (!fd) 2461 if (!fd)
… …
2505 pclose_printer (fd); 2507 pclose_printer (fd);
2506} 2508}
2507#endif /* PRINTPIPE */ 2509#endif /* PRINTPIPE */
2508/*}}} */ 2510/*}}} */
2509 2511
2510/* *INDENT-OFF* */
2511enum { 2512enum {
2512 C1_40 = 0x40, 2513 C1_40 = 0x40,
2513 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2514 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2514 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2515 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2515 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2516 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2516 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2517 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2517}; 2518};
2518/* *INDENT-ON* */
2519 2519
2520/*{{{ process non-printing single characters */ 2520/*{{{ process non-printing single characters */
2521void 2521void ecb_hot
2522rxvt_term::process_nonprinting (unicode_t ch) 2522rxvt_term::process_nonprinting (unicode_t ch)
2523{ 2523{
2524 switch (ch) 2524 switch (ch)
2525 { 2525 {
2526 case C0_ESC: 2526 case C0_ESC:
… …
2572} 2572}
2573/*}}} */ 2573/*}}} */
2574 2574
2575 2575
2576/*{{{ process VT52 escape sequences */ 2576/*{{{ process VT52 escape sequences */
2577void 2577void ecb_cold
2578rxvt_term::process_escape_vt52 (unicode_t ch) 2578rxvt_term::process_escape_vt52 (unicode_t ch)
2579{ 2579{
2580 int row, col; 2580 int row, col;
2581 2581
2582 switch (ch) 2582 switch (ch)
… …
2616 break; 2616 break;
2617 case 'Z': /* identify the terminal type */ 2617 case 'Z': /* identify the terminal type */
2618 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2618 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2619 break; 2619 break;
2620 case '<': /* turn off VT52 mode */ 2620 case '<': /* turn off VT52 mode */
2621 set_privmode (PrivMode_vt52, 0); 2621 priv_modes &= ~PrivMode_vt52;
2622 break; 2622 break;
2623 case 'F': /* use special graphics character set */ 2623 case 'F': /* use special graphics character set */
2624 case 'G': /* use regular character set */ 2624 case 'G': /* use regular character set */
2625 /* unimplemented */ 2625 /* unimplemented */
2626 break; 2626 break;
… …
2632} 2632}
2633/*}}} */ 2633/*}}} */
2634 2634
2635 2635
2636/*{{{ process escape sequences */ 2636/*{{{ process escape sequences */
2637void 2637void ecb_hot
2638rxvt_term::process_escape_seq () 2638rxvt_term::process_escape_seq ()
2639{ 2639{
2640 unicode_t ch = cmd_getc (); 2640 unicode_t ch = cmd_getc ();
2641 2641
2642 if (priv_modes & PrivMode_vt52) 2642 if (priv_modes & PrivMode_vt52)
… …
2645 return; 2645 return;
2646 } 2646 }
2647 2647
2648 switch (ch) 2648 switch (ch)
2649 { 2649 {
2650 /* case 1: do_tek_mode (); break; */
2651 case '#': 2650 case '#':
2652 if (cmd_getc () == '8') 2651 if (cmd_getc () == '8')
2653 scr_E (); 2652 scr_E ();
2654 break; 2653 break;
2655 case '(': 2654 case '(':
… …
2678#if !ENABLE_MINIMAL 2677#if !ENABLE_MINIMAL
2679 case '9': 2678 case '9':
2680 scr_forwardindex (); 2679 scr_forwardindex ();
2681 break; 2680 break;
2682#endif 2681#endif
2682 // DECPAM/DECPNM
2683 case '=': 2683 case '=':
2684 priv_modes |= PrivMode_aplKP;
2685 break;
2684 case '>': 2686 case '>':
2685 set_privmode (PrivMode_aplKP, ch == '='); 2687 priv_modes &= ~PrivMode_aplKP;
2686 break; 2688 break;
2687 2689
2688 case C1_40: 2690 case C1_40:
2689 cmd_getc (); 2691 cmd_getc ();
2690 break; 2692 break;
… …
2694 2696
2695 /* 8.3.87: NEXT LINE */ 2697 /* 8.3.87: NEXT LINE */
2696 case C1_NEL: /* ESC E */ 2698 case C1_NEL: /* ESC E */
2697 { 2699 {
2698 wchar_t nlcr[] = { C0_LF, C0_CR }; 2700 wchar_t nlcr[] = { C0_LF, C0_CR };
2699 scr_add_lines (nlcr, ARRAY_LENGTH(nlcr), 1); 2701 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2700 } 2702 }
2701 break; 2703 break;
2702 2704
2703 /* kidnapped escape sequence: Should be 8.3.48 */ 2705 /* kidnapped escape sequence: Should be 8.3.48 */
2704 case C1_ESA: /* ESC G */ 2706 case C1_ESA: /* ESC G */
2705 process_graphics (); 2707 // used by original rxvt for rob nations own graphics mode
2708 if (cmd_getc () == 'Q')
2709 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2706 break; 2710 break;
2707 2711
2708 /* 8.3.63: CHARACTER TABULATION SET */ 2712 /* 8.3.63: CHARACTER TABULATION SET */
2709 case C1_HTS: /* ESC H */ 2713 case C1_HTS: /* ESC H */
2710 scr_set_tab (1); 2714 scr_set_tab (1);
… …
2714 case C1_RI: /* ESC M */ 2718 case C1_RI: /* ESC M */
2715 scr_index (DN); 2719 scr_index (DN);
2716 break; 2720 break;
2717 2721
2718 /* 8.3.142: SINGLE-SHIFT TWO */ 2722 /* 8.3.142: SINGLE-SHIFT TWO */
2719 /*case C1_SS2: scr_single_shift (2); break; */ 2723 /* case C1_SS2: break; */
2720 2724
2721 /* 8.3.143: SINGLE-SHIFT THREE */ 2725 /* 8.3.143: SINGLE-SHIFT THREE */
2722 /*case C1_SS3: scr_single_shift (3); break; */ 2726 /* case C1_SS3: break; */
2723 2727
2724 /* 8.3.27: DEVICE CONTROL STRING */ 2728 /* 8.3.27: DEVICE CONTROL STRING */
2725 case C1_DCS: /* ESC P */ 2729 case C1_DCS: /* ESC P */
2726 process_dcs_seq (); 2730 process_dcs_seq ();
2727 break; 2731 break;
… …
2760 } 2764 }
2761} 2765}
2762/*}}} */ 2766/*}}} */
2763 2767
2764/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2768/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2765/* *INDENT-OFF* */
2766enum { 2769enum {
2767 CSI_ICH = 0x40, 2770 CSI_ICH = 0x40,
2768 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2771 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2769 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2772 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2770 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2773 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2790 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2793 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2791 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2794 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2792 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2795 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2793 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2796 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2794 }; 2797 };
2795/* *INDENT-ON* */
2796 2798
2797void 2799void ecb_hot
2798rxvt_term::process_csi_seq () 2800rxvt_term::process_csi_seq ()
2799{ 2801{
2800 unicode_t ch, priv, i; 2802 unicode_t ch, priv, i;
2801 unsigned int nargs, p; 2803 unsigned int nargs, p;
2802 int n, ndef; 2804 int n, ndef;
… …
2880 scr_soft_reset (); 2882 scr_soft_reset ();
2881 2883
2882 static const int pm_h[] = { 7, 25 }; 2884 static const int pm_h[] = { 7, 25 };
2883 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 }; 2885 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2884 2886
2885 process_terminal_mode ('h', 0, ARRAY_LENGTH(pm_h), pm_h); 2887 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2886 process_terminal_mode ('l', 0, ARRAY_LENGTH(pm_l), pm_l); 2888 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2887 } 2889 }
2888 break; 2890 break;
2889 } 2891 }
2890 2892
2891 return; 2893 return;
… …
2909 } 2911 }
2910 break; 2912 break;
2911#endif 2913#endif
2912 2914
2913 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2915 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2914 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2916 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2915 arg[0] = -arg[0]; 2917 arg[0] = -arg[0];
2916 /* FALLTHROUGH */ 2918 /* FALLTHROUGH */
2917 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2919 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2918 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2920 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2919 scr_gotorc (arg[0], 0, RELATIVE); 2921 scr_gotorc (arg[0], 0, RELATIVE);
2920 break; 2922 break;
2921 2923
2922 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2924 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2923 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2925 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3110 } 3112 }
3111} 3113}
3112/*}}} */ 3114/*}}} */
3113 3115
3114#if !ENABLE_MINIMAL 3116#if !ENABLE_MINIMAL
3115/* ARGSUSED */
3116void 3117void
3117rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3118rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3118{ 3119{
3119 int x, y; 3120 int x, y;
3120 XWindowAttributes wattr; 3121 XWindowAttributes wattr;
… …
3129 { 3130 {
3130 /* 3131 /*
3131 * commands 3132 * commands
3132 */ 3133 */
3133 case 1: /* deiconify window */ 3134 case 1: /* deiconify window */
3134 XMapWindow (dpy, parent[0]); 3135 XMapWindow (dpy, parent);
3135 break; 3136 break;
3136 case 2: /* iconify window */ 3137 case 2: /* iconify window */
3137 XIconifyWindow (dpy, parent[0], display->screen); 3138 XIconifyWindow (dpy, parent, display->screen);
3138 break; 3139 break;
3139 case 3: /* set position (pixels) */ 3140 case 3: /* set position (pixels) */
3140 XMoveWindow (dpy, parent[0], args[1], args[2]); 3141 XMoveWindow (dpy, parent, args[1], args[2]);
3141 break; 3142 break;
3142 case 4: /* set size (pixels) */ 3143 case 4: /* set size (pixels) */
3143 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3144 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3144 break; 3145 break;
3145 case 5: /* raise window */ 3146 case 5: /* raise window */
3146 XRaiseWindow (dpy, parent[0]); 3147 XRaiseWindow (dpy, parent);
3147 break; 3148 break;
3148 case 6: /* lower window */ 3149 case 6: /* lower window */
3149 XLowerWindow (dpy, parent[0]); 3150 XLowerWindow (dpy, parent);
3150 break; 3151 break;
3151 case 7: /* refresh window */ 3152 case 7: /* refresh window */
3152 scr_touch (true); 3153 scr_touch (true);
3153 break; 3154 break;
3154 case 8: /* set size (chars) */ 3155 case 8: /* set size (chars) */
… …
3157 break; 3158 break;
3158 3159
3159 //case 9: NYI, TODO, restore maximized window or maximize window 3160 //case 9: NYI, TODO, restore maximized window or maximize window
3160 default: 3161 default:
3161 if (args[0] >= 24) /* set height (chars) */ 3162 if (args[0] >= 24) /* set height (chars) */
3162 set_widthheight ((unsigned int)width, 3163 set_widthheight ((unsigned int)vt_width,
3163 (unsigned int) (args[1] * fheight)); 3164 (unsigned int) (args[1] * fheight));
3164 break; 3165 break;
3165 3166
3166 /* 3167 /*
3167 * reports - some output format copied from XTerm 3168 * reports - some output format copied from XTerm
3168 */ 3169 */
3169 case 11: /* report window state */ 3170 case 11: /* report window state */
3170 XGetWindowAttributes (dpy, parent[0], &wattr); 3171 XGetWindowAttributes (dpy, parent, &wattr);
3171 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3172 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3172 break; 3173 break;
3173 case 13: /* report window position */ 3174 case 13: /* report window position */
3174 XGetWindowAttributes (dpy, parent[0], &wattr); 3175 XGetWindowAttributes (dpy, parent, &wattr);
3175 XTranslateCoordinates (dpy, parent[0], wattr.root, 3176 XTranslateCoordinates (dpy, parent, wattr.root,
3176 -wattr.border_width, -wattr.border_width, 3177 -wattr.border_width, -wattr.border_width,
3177 &x, &y, &wdummy); 3178 &x, &y, &wdummy);
3178 tt_printf ("\033[3;%d;%dt", x, y); 3179 tt_printf ("\033[3;%d;%dt", x, y);
3179 break; 3180 break;
3180 case 14: /* report window size (pixels) */ 3181 case 14: /* report window size (pixels) */
3181 XGetWindowAttributes (dpy, parent[0], &wattr); 3182 XGetWindowAttributes (dpy, parent, &wattr);
3182 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3183 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3183 break; 3184 break;
3184 case 18: /* report text area size (chars) */ 3185 case 18: /* report text area size (chars) */
3185 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3186 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3186 break; 3187 break;
… …
3188 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3189 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3189 break; 3190 break;
3190 case 20: /* report icon label */ 3191 case 20: /* report icon label */
3191 { 3192 {
3192 char *s; 3193 char *s;
3193 XGetIconName (dpy, parent[0], &s); 3194 XGetIconName (dpy, parent, &s);
3194 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3195 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3195 XFree (s); 3196 XFree (s);
3196 } 3197 }
3197 break; 3198 break;
3198 case 21: /* report window title */ 3199 case 21: /* report window title */
3199 { 3200 {
3200 char *s; 3201 char *s;
3201 XFetchName (dpy, parent[0], &s); 3202 XFetchName (dpy, parent, &s);
3202 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3203 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3203 XFree (s); 3204 XFree (s);
3204 } 3205 }
3205 break; 3206 break;
3206 } 3207 }
… …
3360 unsigned long bytes_after; 3361 unsigned long bytes_after;
3361 unsigned char *value = 0; 3362 unsigned char *value = 0;
3362 const char *str = ""; 3363 const char *str = "";
3363 3364
3364 if (prop 3365 if (prop
3365 && XGetWindowProperty (dpy, parent[0], 3366 && XGetWindowProperty (dpy, parent,
3366 prop, 0, 1<<16, 0, AnyPropertyType, 3367 prop, 0, 1<<16, 0, AnyPropertyType,
3367 &actual_type, &actual_format, 3368 &actual_type, &actual_format,
3368 &nitems, &bytes_after, &value) == Success 3369 &nitems, &bytes_after, &value) == Success
3369 && actual_type != None 3370 && actual_type != None
3370 && actual_format == 8) 3371 && actual_format == 8)
… …
3382 { 3383 {
3383 *eq = 0; 3384 *eq = 0;
3384 set_utf8_property (display->atom (str), eq + 1); 3385 set_utf8_property (display->atom (str), eq + 1);
3385 } 3386 }
3386 else 3387 else
3387 XDeleteProperty (dpy, parent[0], 3388 XDeleteProperty (dpy, parent,
3388 display->atom (str)); 3389 display->atom (str));
3389 } 3390 }
3390 break; 3391 break;
3391 3392
3392 case XTerm_Color: 3393 case XTerm_Color:
… …
3453 process_color_seq (op, Color_tint, str, resp); 3454 process_color_seq (op, Color_tint, str, resp);
3454 { 3455 {
3455 bool changed = false; 3456 bool changed = false;
3456 3457
3457 if (ISSET_PIXCOLOR (Color_tint)) 3458 if (ISSET_PIXCOLOR (Color_tint))
3458 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3459 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3459 3460
3460 if (changed) 3461 if (changed)
3461 update_background (); 3462 update_background ();
3462 } 3463 }
3463 3464
… …
3467#if BG_IMAGE_FROM_FILE 3468#if BG_IMAGE_FROM_FILE
3468 case Rxvt_Pixmap: 3469 case Rxvt_Pixmap:
3469 if (!strcmp (str, "?")) 3470 if (!strcmp (str, "?"))
3470 { 3471 {
3471 char str[256]; 3472 char str[256];
3473 int h_scale = 0, v_scale = 0;
3474 int h_align = 0, v_align = 0;
3475 if (image_vec.size () > 0)
3476 {
3477 h_scale = image_vec[0].h_scale;
3478 v_scale = image_vec[0].v_scale;
3479 h_align = image_vec[0].h_align;
3480 v_align = image_vec[0].v_align;
3481 }
3472 3482
3473 sprintf (str, "[%dx%d+%d+%d]", 3483 sprintf (str, "[%dx%d+%d+%d]",
3474 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3484 h_scale, v_scale,
3475 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3485 h_align, v_align);
3476 process_xterm_seq (XTerm_title, str, CHAR_ST); 3486 process_xterm_seq (XTerm_title, str, CHAR_ST);
3477 } 3487 }
3478 else 3488 else
3479 { 3489 {
3480 int changed = 0; 3490 bool changed = false;
3481 3491
3482 if (*str != ';') 3492 if (*str != ';')
3483 { 3493 {
3484 if (bgPixmap.set_file (str)) /* change pixmap */ 3494 if (image_vec.size () > 0)
3495 changed = image_vec[0].set_file_geometry (str);
3496 else
3485 { 3497 {
3486 changed++; 3498 rxvt_image *image = new_image ();
3487 str = strchr (str, ';'); 3499 if (!image->set_file_geometry (str))
3488 if (str == NULL) 3500 image_vec.pop_back ();
3489 bgPixmap.set_defaultGeometry ();
3490 else 3501 else
3491 bgPixmap.set_geometry (str+1); 3502 changed = true;
3492 } 3503 }
3493 } 3504 }
3494 else 3505 else
3495 { 3506 {
3496 str++; 3507 str++;
3497 if (bgPixmap.set_geometry (str, true)) 3508 if (image_vec.size () > 0)
3498 changed++; 3509 changed = image_vec[0].set_geometry (str, true);
3499 } 3510 }
3500 3511
3501 if (changed) 3512 if (changed)
3502 { 3513 {
3503 if (bgPixmap.window_position_sensitive ()) 3514 if (bg_window_position_sensitive ())
3504 { 3515 {
3505 int x, y; 3516 int x, y;
3506 get_window_origin (x, y); 3517 get_window_origin (x, y);
3507 bgPixmap.set_position (x, y); 3518 bg_set_position (x, y);
3508 } 3519 }
3509 update_background (); 3520 update_background ();
3510 } 3521 }
3511 } 3522 }
3512 break; 3523 break;
… …
3602 * 's' = save 3613 * 's' = save
3603 * 'r' = restore 3614 * 'r' = restore
3604 * 't' = toggle 3615 * 't' = toggle
3605 * so no need for fancy checking 3616 * so no need for fancy checking
3606 */ 3617 */
3607int 3618int ecb_cold
3608rxvt_term::privcases (int mode, unsigned long bit) 3619rxvt_term::privcases (int mode, unsigned long bit)
3609{ 3620{
3610 int state; 3621 int state;
3611 3622
3612 if (mode == 's') 3623 if (mode == 's')
3613 { 3624 {
3614 SavedModes |= (priv_modes & bit); 3625 if (priv_modes & bit)
3626 SavedModes |= bit;
3627 else
3628 SavedModes &= ~bit;
3615 return -1; 3629 return -1;
3616 } 3630 }
3617 else 3631 else
3618 { 3632 {
3619 if (mode == 'r') 3633 if (mode == 'r')
3620 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3634 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3621 else 3635 else
3622 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3636 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3623 3637
3624 set_privmode (bit, state); 3638 if (state)
3639 priv_modes |= bit;
3640 else
3641 priv_modes &= ~bit;
3625 } 3642 }
3626 3643
3627 return state; 3644 return state;
3628} 3645}
3629 3646
3630/* we're not using priv _yet_ */ 3647/* we're not using priv _yet_ */
3631void 3648void
3632rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3649rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3633{ 3650{
3634 unsigned int i, j; 3651 unsigned int i, j;
3635 int state; 3652 int state;
3636 3653
3637 static const struct 3654 static const struct
3638 { 3655 {
3639 const int argval; 3656 const int argval;
3640 const unsigned long bit; 3657 const unsigned long bit;
3641 } argtopriv[] = { 3658 } argtopriv[] = {
3642 { 1, PrivMode_aplCUR }, // DECCKM 3659 { 1, PrivMode_aplCUR }, // DECCKM
3643 { 2, PrivMode_vt52 }, 3660 { 2, PrivMode_vt52 }, // DECANM
3644 { 3, PrivMode_132 }, // DECCOLM 3661 { 3, PrivMode_132 }, // DECCOLM
3645 { 4, PrivMode_smoothScroll }, // DECSCLM 3662 { 4, PrivMode_smoothScroll }, // DECSCLM
3646 { 5, PrivMode_rVideo }, // DECSCNM 3663 { 5, PrivMode_rVideo }, // DECSCNM
3647 { 6, PrivMode_relOrigin }, // DECOM 3664 { 6, PrivMode_relOrigin }, // DECOM
3648 { 7, PrivMode_Autowrap }, // DECAWM 3665 { 7, PrivMode_Autowrap }, // DECAWM
3649 // 8, auto-repeat keys // DECARM 3666 // 8, auto-repeat keys // DECARM
3650 { 9, PrivMode_MouseX10 }, 3667 { 9, PrivMode_MouseX10 },
3651 // 18 end FF to printer after print screen 3668 // 18 end FF to printer after print screen
3652 // 19 Print screen prints full screen/scroll region 3669 // 19 Print screen prints full screen/scroll region
3653 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3670 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3654#ifdef scrollBar_esc 3671#ifdef scrollBar_esc
3655 { scrollBar_esc, PrivMode_scrollBar }, 3672 { scrollBar_esc, PrivMode_scrollBar },
3656#endif 3673#endif
3657 { 35, PrivMode_ShiftKeys }, // rxvt extension 3674 { 35, PrivMode_ShiftKeys }, // rxvt extension
3658 // 38, tektronix mode // DECTEK 3675 // 38, tektronix mode // DECTEK
3659 { 40, PrivMode_132OK }, 3676 { 40, PrivMode_132OK },
3660 // 41 xterm more fixes NYI 3677 // 41 xterm more fixes NYI
3661 // 45 margin bell NYI 3678 // 45 margin bell NYI
3662 // 46 start logging 3679 // 46 start logging
3663 { 47, PrivMode_Screen }, 3680 { 47, PrivMode_Screen },
3664 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3681 { 66, PrivMode_aplKP }, // DECNKM
3665#ifndef NO_BACKSPACE_KEY 3682#ifndef NO_BACKSPACE_KEY
3666 { 67, PrivMode_BackSpace }, // DECBKM 3683 { 67, PrivMode_BackSpace }, // DECBKM
3667#endif 3684#endif
3668 { 1000, PrivMode_MouseX11 }, 3685 { 1000, PrivMode_MouseX11 },
3669 { 1002, PrivMode_MouseBtnEvent }, 3686 { 1002, PrivMode_MouseBtnEvent },
… …
3698 for (i = 0; i < nargs; i++) 3715 for (i = 0; i < nargs; i++)
3699 { 3716 {
3700 state = -1; 3717 state = -1;
3701 3718
3702 /* basic handling */ 3719 /* basic handling */
3703 for (j = 0; j < ARRAY_LENGTH(argtopriv); j++) 3720 for (j = 0; j < ecb_array_length (argtopriv); j++)
3704 if (argtopriv[j].argval == arg[i]) 3721 if (argtopriv[j].argval == arg[i])
3705 { 3722 {
3706 state = privcases (mode, argtopriv[j].bit); 3723 state = privcases (mode, argtopriv[j].bit);
3707 break; 3724 break;
3708 } 3725 }
… …
3734 case 2: /* VT52 mode */ 3751 case 2: /* VT52 mode */
3735 /* oddball mode. should be set regardless of set/reset 3752 /* oddball mode. should be set regardless of set/reset
3736 * parameter. Return from VT52 mode with an ESC < from 3753 * parameter. Return from VT52 mode with an ESC < from
3737 * within VT52 mode 3754 * within VT52 mode
3738 */ 3755 */
3739 set_privmode (PrivMode_vt52, 1); 3756 priv_modes |= PrivMode_vt52;
3740 break; 3757 break;
3741 case 3: /* 80/132 */ 3758 case 3: /* 80/132 */
3742 if (priv_modes & PrivMode_132OK) 3759 if (priv_modes & PrivMode_132OK)
3743 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight); 3760 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3744 break; 3761 break;
… …
3759 if (state) /* orthogonal */ 3776 if (state) /* orthogonal */
3760 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3777 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3761 break; 3778 break;
3762#ifdef scrollBar_esc 3779#ifdef scrollBar_esc
3763 case scrollBar_esc: 3780 case scrollBar_esc:
3764 if (scrollBar.map (state)) 3781 scrollBar.map (state);
3765 {
3766 resize_all_windows (0, 0, 0); 3782 resize_all_windows (0, 0, 0);
3767 scr_touch (true); 3783 scr_touch (true);
3768 }
3769 break; 3784 break;
3770#endif 3785#endif
3771 case 25: /* visible/invisible cursor */ 3786 case 25: /* visible/invisible cursor */
3772 scr_cursor_visible (state); 3787 scr_cursor_visible (state);
3773 break; 3788 break;
… …
3828 } 3843 }
3829} 3844}
3830/*}}} */ 3845/*}}} */
3831 3846
3832/*{{{ process sgr sequences */ 3847/*{{{ process sgr sequences */
3833void 3848void ecb_hot
3834rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3849rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3835{ 3850{
3836 unsigned int i; 3851 unsigned int i;
3837 short rendset; 3852 short rendset;
3838 int rendstyle; 3853 int rendstyle;
… …
3981 } 3996 }
3982 } 3997 }
3983} 3998}
3984/*}}} */ 3999/*}}} */
3985 4000
3986/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3987void
3988rxvt_term::process_graphics ()
3989{
3990 unicode_t ch, cmd = cmd_getc ();
3991
3992 if (cmd == 'Q')
3993 {
3994 /* query graphics */
3995 tt_printf ("\033G0\012"); /* no graphics */
3996 return;
3997 }
3998 /* swallow other graphics sequences until terminating ':' */
3999 do
4000 ch = cmd_getc ();
4001 while (ch != ':');
4002}
4003/*}}} */
4004
4005/* ------------------------------------------------------------------------- */ 4001/* ------------------------------------------------------------------------- */
4006 4002
4007/* 4003/*
4008 * Send printf () formatted output to the command. 4004 * Send printf () formatted output to the command.
4009 * Only use for small amounts of data. 4005 * Only use for small amounts of data.
… …
4037 4033
4038 if (v_buflen == 0) 4034 if (v_buflen == 0)
4039 { 4035 {
4040 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4036 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4041 4037
4038 max_it (written, 0);
4039
4042 if ((unsigned int)written == len) 4040 if (written == len)
4043 return; 4041 return;
4044 4042
4045 data += written; 4043 data += written;
4046 len -= written; 4044 len -= written;
4047 } 4045 }

Diff Legend

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