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.461 by root, Tue Nov 23 22:58:08 2010 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
… …
889 commit_iso14755 (); 885 commit_iso14755 ();
890 886
891 return; 887 return;
892 } 888 }
893 889
894 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 890 for (unsigned short *i = iso14755_symtab; i[0]; i += 2)
895 if (i[0] == keysym) 891 if (i[0] == keysym)
896 { 892 {
897 iso14755buf = ISO_14755_51 | i[1]; 893 iso14755buf = ISO_14755_51 | i[1];
898 commit_iso14755 (); 894 commit_iso14755 ();
899 895
… …
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_clear (true); This needs to be researched further!
984 scr_touch (false); 946 scr_touch (false);
985 } 947 }
986#endif 948#endif
987 949
988 if (want_refresh) 950 if (want_refresh)
… …
1025 while (row < end_row); 987 while (row < end_row);
1026 } 988 }
1027 989
1028 scr_refresh (); 990 scr_refresh ();
1029 scrollBar.show (1); 991 scrollBar.show (1);
1030#ifdef USE_XIM 992#if USE_XIM
1031 IMSendSpot (); 993 im_send_spot ();
1032#endif 994#endif
1033 } 995 }
1034 996
1035 display->flush (); 997 display->flush ();
1036} 998}
… …
1054 flush (); 1016 flush ();
1055} 1017}
1056 1018
1057#ifdef CURSOR_BLINK 1019#ifdef CURSOR_BLINK
1058void 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
1059rxvt_term::cursor_blink_cb (ev::timer &w, int revents) 1036rxvt_term::cursor_blink_cb (ev::timer &w, int revents)
1060{ 1037{
1061 hidden_cursor = !hidden_cursor; 1038 hidden_cursor = !hidden_cursor;
1062 want_refresh = 1; 1039 want_refresh = 1;
1063 refresh_check (); 1040 refresh_check ();
… …
1081 1058
1082#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1059#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1083void 1060void
1084rxvt_term::cont_scroll_cb (ev::timer &w, int revents) 1061rxvt_term::cont_scroll_cb (ev::timer &w, int revents)
1085{ 1062{
1086 if ((scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 1063 if ((scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
1087 && scr_page (scrollBar.state == STATE_UP ? UP : DN, 1)) 1064 && scr_page (scrollBar.state == SB_STATE_UP ? UP : DN, 1))
1088 { 1065 {
1089 want_refresh = 1; 1066 want_refresh = 1;
1090 refresh_check (); 1067 refresh_check ();
1091 } 1068 }
1092 else 1069 else
… …
1153 { 1130 {
1154 } 1131 }
1155} event_handler; 1132} event_handler;
1156#endif 1133#endif
1157 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
1158bool 1168bool
1159rxvt_term::pty_fill () 1169rxvt_term::pty_fill ()
1160{ 1170{
1161 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1171 cmdbuf_reify ();
1162 1172
1163 if (CBUFSIZ == n) 1173 size_t avail = cmdbuf_base + CBUFSIZ - cmdbuf_endp;
1164 { 1174
1165 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); 1175 if (!avail)
1166 n = 0;
1167 } 1176 {
1168 1177 // normally this indicates a "too long" command sequence - just drop the data we have
1169 memmove (cmdbuf_base, cmdbuf_ptr, n);
1170 cmdbuf_ptr = cmdbuf_base; 1178 cmdbuf_ptr = cmdbuf_base;
1171 cmdbuf_endp = cmdbuf_ptr + n; 1179 cmdbuf_endp = cmdbuf_ptr;
1180 avail = CBUFSIZ;
1181 }
1172 1182
1173 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n); 1183 ssize_t r = read (pty->pty, cmdbuf_endp, avail);
1174 1184
1175 if (r > 0) 1185 if (r > 0)
1176 { 1186 {
1177 cmdbuf_endp += r; 1187 cmdbuf_endp += r;
1178 return true; 1188 return true;
… …
1209 pty_write (); 1219 pty_write ();
1210 1220
1211 refresh_check (); 1221 refresh_check ();
1212} 1222}
1213 1223
1214void 1224void ecb_cold
1215rxvt_term::pointer_unblank () 1225rxvt_term::pointer_unblank ()
1216{ 1226{
1217 XDefineCursor (dpy, vt, TermWin_cursor); 1227 XDefineCursor (dpy, vt, TermWin_cursor);
1218 recolour_cursor (); 1228 recolour_cursor ();
1219 1229
… …
1224 pointer_ev.start (pointerBlankDelay); 1234 pointer_ev.start (pointerBlankDelay);
1225#endif 1235#endif
1226} 1236}
1227 1237
1228#ifdef POINTER_BLANK 1238#ifdef POINTER_BLANK
1229void 1239void ecb_cold
1230rxvt_term::pointer_blank () 1240rxvt_term::pointer_blank ()
1231{ 1241{
1232 if (!option (Opt_pointerBlank)) 1242 if (!option (Opt_pointerBlank))
1233 return; 1243 return;
1234 1244
… …
1236 XFlush (dpy); 1246 XFlush (dpy);
1237 1247
1238 hidden_pointer = 1; 1248 hidden_pointer = 1;
1239} 1249}
1240 1250
1241void 1251void ecb_cold
1242rxvt_term::pointer_cb (ev::timer &w, int revents) 1252rxvt_term::pointer_cb (ev::timer &w, int revents)
1243{ 1253{
1244 make_current (); 1254 make_current ();
1245 1255
1246 pointer_blank (); 1256 pointer_blank ();
… …
1338 32 + x, 1348 32 + x,
1339 32 + y); 1349 32 + y);
1340} 1350}
1341 1351
1342/*{{{ process an X event */ 1352/*{{{ process an X event */
1343void 1353void ecb_hot
1344rxvt_term::x_cb (XEvent &ev) 1354rxvt_term::x_cb (XEvent &ev)
1345{ 1355{
1346 make_current (); 1356 make_current ();
1347 1357
1348 dLocal (Display *, dpy); 1358 dLocal (Display *, dpy);
… …
1446 && ev.xfocus.mode != NotifyGrab) 1456 && ev.xfocus.mode != NotifyGrab)
1447 focus_out (); 1457 focus_out ();
1448 break; 1458 break;
1449 1459
1450 case ConfigureNotify: 1460 case ConfigureNotify:
1451 if (ev.xconfigure.window == parent[0]) 1461 if (ev.xconfigure.window == parent)
1452 { 1462 {
1453 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1463 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1454 ; 1464 ;
1455 1465
1466 bool want_position_change = SHOULD_INVOKE (HOOK_POSITION_CHANGE);
1467
1456#ifdef HAVE_BG_PIXMAP 1468#ifdef HAVE_BG_PIXMAP
1469 if (bg_window_position_sensitive ())
1470 want_position_change = true;
1471#endif
1472
1457 bool moved = false; 1473 bool moved = false;
1458 if (bgPixmap.window_position_sensitive ()) 1474
1475 if (want_position_change)
1459 { 1476 {
1460 int x, y; 1477 int x, y;
1478
1461 if (ev.xconfigure.send_event) 1479 if (ev.xconfigure.send_event)
1462 { 1480 {
1463 x = ev.xconfigure.x; 1481 x = ev.xconfigure.x;
1464 y = ev.xconfigure.y; 1482 y = ev.xconfigure.y;
1465 } 1483 }
1466 else 1484 else
1467 get_window_origin (x, y); 1485 get_window_origin (x, y);
1468 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
1469 if (bgPixmap.set_position (x, y) 1494 if (bg_set_position (x, y)
1470 || (bgPixmap.flags & bgPixmap_t::isInvalid)) 1495 || !(bg_flags & BG_IS_VALID))
1471 moved = true; 1496 moved = true;
1472 } 1497 }
1473#endif
1474 1498
1475 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1499 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1476 { 1500 {
1477 seen_resize = 1; 1501 seen_resize = 1;
1478 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1502 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1479 } 1503 }
1480 else 1504 else
1481 { 1505 {
1482#ifdef HAVE_BG_PIXMAP 1506#ifdef HAVE_BG_PIXMAP
1483 if (moved) 1507 if (moved)
1484 {
1485 if (mapped)
1486 update_background (); 1508 update_background ();
1487 else
1488 bgPixmap.invalidate ();
1489 }
1490#endif 1509#endif
1491 } 1510 }
1492 1511
1493 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1512 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1494 } 1513 }
1495 break; 1514 break;
1496 1515
1497 case PropertyNotify: 1516 case PropertyNotify:
1498 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1517 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1499 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1500 && ev.xproperty.state == PropertyNewValue)
1501 selection_property (ev.xproperty.window, ev.xproperty.atom);
1502
1503 break; 1518 break;
1504 1519
1505 case SelectionClear: 1520 case SelectionClear:
1506 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]); 1521 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1507 break;
1508
1509 case SelectionNotify:
1510 if (selection_wait == Sel_normal)
1511 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1512 break; 1522 break;
1513 1523
1514 case SelectionRequest: 1524 case SelectionRequest:
1515 selection_send (ev.xselectionrequest); 1525 selection_send (ev.xselectionrequest);
1516 break; 1526 break;
… …
1527 * 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
1528 * bit of time for ConfigureNotifies to arrive. 1538 * bit of time for ConfigureNotifies to arrive.
1529 * 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
1530 * of ConfigureNotifys for the best results. 1540 * of ConfigureNotifys for the best results.
1531 */ 1541 */
1532 if (bgPixmap.flags & bgPixmap_t::isInvalid) 1542 if (!(bg_flags & BG_IS_VALID))
1533 update_background_ev.start (0.025); 1543 update_background_ev.start (0.025);
1534#endif 1544#endif
1535 mapped = 1; 1545 mapped = 1;
1536#ifdef TEXT_BLINK 1546#ifdef TEXT_BLINK
1537 text_blink_ev.start (); 1547 text_blink_ev.start ();
… …
1552 if (ev.xany.window == vt) 1562 if (ev.xany.window == vt)
1553 { 1563 {
1554 do 1564 do
1555 { 1565 {
1556 scr_expose (ev.xexpose.x, ev.xexpose.y, 1566 scr_expose (ev.xexpose.x, ev.xexpose.y,
1557 ev.xexpose.width, ev.xexpose.height, False); 1567 ev.xexpose.width, ev.xexpose.height, false);
1558 } 1568 }
1559 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1569 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1560 1570
1561 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1571 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1562 1572
1563 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1573 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1564 { 1574 {
1565 scr_expose (ev.xexpose.x, ev.xexpose.y, 1575 scr_expose (ev.xexpose.x, ev.xexpose.y,
1566 ev.xexpose.width, ev.xexpose.height, False); 1576 ev.xexpose.width, ev.xexpose.height, false);
1567 } 1577 }
1568 1578
1569 want_refresh = 1; 1579 want_refresh = 1;
1570 } 1580 }
1571 else 1581 else
… …
1577 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1587 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1578 ; 1588 ;
1579 1589
1580 if (scrollBar.state && ev.xany.window == scrollBar.win) 1590 if (scrollBar.state && ev.xany.window == scrollBar.win)
1581 { 1591 {
1582 scrollBar.state = STATE_IDLE; 1592 scrollBar.state = SB_STATE_IDLE;
1583 scrollBar.show (0); 1593 scrollBar.show (0);
1584 } 1594 }
1585 } 1595 }
1586 break; 1596 break;
1587 1597
… …
1653 dist = int_bwidth - ev.xbutton.y; 1663 dist = int_bwidth - ev.xbutton.y;
1654 } 1664 }
1655 else 1665 else
1656 { 1666 {
1657 scroll_selection_dir = DN; 1667 scroll_selection_dir = DN;
1658 dist = ev.xbutton.y - (int_bwidth + height); 1668 dist = ev.xbutton.y - (int_bwidth + vt_height);
1659 } 1669 }
1660 1670
1661 scroll_selection_lines = Pixel2Height (dist) 1671 scroll_selection_lines = Pixel2Height (dist)
1662 / SELECTION_SCROLL_LINE_SPEEDUP 1672 / SELECTION_SCROLL_LINE_SPEEDUP
1663 + 1; 1673 + 1;
… …
1675#ifdef MOUSE_THRESHOLD 1685#ifdef MOUSE_THRESHOLD
1676 } 1686 }
1677#endif 1687#endif
1678 } 1688 }
1679 } 1689 }
1680 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1690 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1681 { 1691 {
1682 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1692 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1683 MotionNotify, &ev)) 1693 MotionNotify, &ev))
1684 ; 1694 ;
1685 1695
1686 XQueryPointer (dpy, scrollBar.win, 1696 XQueryPointer (dpy, scrollBar.win,
1687 &unused_root, &unused_child, 1697 &unused_root, &unused_child,
1688 &unused_root_x, &unused_root_y, 1698 &unused_root_x, &unused_root_y,
1689 &ev.xbutton.x, &ev.xbutton.y, 1699 &ev.xbutton.x, &ev.xbutton.y,
1690 &unused_mask); 1700 &unused_mask);
1691 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1701 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1692 scrollBar.size ()); 1702 scrollBar.size ());
1693 want_refresh = 1; 1703 want_refresh = 1;
1694 scrollBar.show (1); 1704 scrollBar.show (1);
1695 } 1705 }
1696 break; 1706 break;
1697 } 1707 }
1698 1708
1699#if defined(CURSOR_BLINK) 1709#if defined(CURSOR_BLINK)
1700 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1710 if (ev.type == KeyPress)
1701 {
1702 if (hidden_cursor)
1703 {
1704 hidden_cursor = 0;
1705 want_refresh = 1;
1706 }
1707
1708 cursor_blink_ev.again (); 1711 cursor_blink_reset ();
1709 }
1710#endif 1712#endif
1711 1713
1712#if defined(POINTER_BLANK) 1714#if defined(POINTER_BLANK)
1713 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1715 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1714 { 1716 {
… …
1725 1727
1726 refresh_check (); 1728 refresh_check ();
1727} 1729}
1728 1730
1729#if ENABLE_FRILLS 1731#if ENABLE_FRILLS
1730void 1732void ecb_cold
1731rxvt_term::set_urgency (bool enable) 1733rxvt_term::set_urgency (bool enable)
1732{ 1734{
1733 if (enable == urgency_hint) 1735 if (enable == urgency_hint)
1734 return; 1736 return;
1735 1737
1736 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1738 if (XWMHints *h = XGetWMHints (dpy, parent))
1737 { 1739 {
1738 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1740 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1739 XSetWMHints (dpy, parent[0], h); 1741 XSetWMHints (dpy, parent, h);
1740 urgency_hint = enable; 1742 urgency_hint = enable;
1743 XFree (h);
1741 } 1744 }
1742} 1745}
1743#endif 1746#endif
1744 1747
1745void 1748void ecb_cold
1746rxvt_term::focus_in () 1749rxvt_term::focus_in ()
1747{ 1750{
1748 if (!focus) 1751 if (!focus)
1749 { 1752 {
1750 focus = 1; 1753 focus = 1;
1751 want_refresh = 1; 1754 want_refresh = 1;
1752 1755
1753#if USE_XIM 1756#if USE_XIM
1754 if (Input_Context != NULL) 1757 if (Input_Context != NULL)
1755 { 1758 {
1756 IMSetPosition (); 1759 im_set_position ();
1757 XSetICFocus (Input_Context); 1760 XSetICFocus (Input_Context);
1758 } 1761 }
1759#endif 1762#endif
1760#if CURSOR_BLINK 1763#if CURSOR_BLINK
1761 if (option (Opt_cursorBlink)) 1764 if (option (Opt_cursorBlink))
… …
1775 1778
1776 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1779 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1777 } 1780 }
1778} 1781}
1779 1782
1780void 1783void ecb_cold
1781rxvt_term::focus_out () 1784rxvt_term::focus_out ()
1782{ 1785{
1783 if (focus) 1786 if (focus)
1784 { 1787 {
1785 focus = 0; 1788 focus = 0;
… …
1818 1821
1819 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1822 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1820 } 1823 }
1821} 1824}
1822 1825
1823void 1826void ecb_cold
1824rxvt_term::update_fade_color (unsigned int idx) 1827rxvt_term::update_fade_color (unsigned int idx)
1825{ 1828{
1826#if OFF_FOCUS_FADING 1829#if OFF_FOCUS_FADING
1827 if (rs[Rs_fade]) 1830 if (rs[Rs_fade])
1828 { 1831 {
… …
1832 } 1835 }
1833#endif 1836#endif
1834} 1837}
1835 1838
1836#if ENABLE_TRANSPARENCY || ENABLE_PERL 1839#if ENABLE_TRANSPARENCY || ENABLE_PERL
1837void 1840void ecb_hot
1838rxvt_term::rootwin_cb (XEvent &ev) 1841rxvt_term::rootwin_cb (XEvent &ev)
1839{ 1842{
1840 make_current (); 1843 make_current ();
1841 1844
1842 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1845 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1843 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END))) 1846 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1844 return; 1847 return;
1845 1848
1846# if ENABLE_TRANSPARENCY
1847 switch (ev.type) 1849 switch (ev.type)
1848 { 1850 {
1849 case PropertyNotify: 1851 case PropertyNotify:
1850 /* 1852 /*
1851 * 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,
1852 * 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.
1853 */ 1855 */
1854 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1856 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1855 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1857 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1856 { 1858 {
1859# if ENABLE_TRANSPARENCY
1857 bgPixmap.set_root_pixmap (); 1860 bg_set_root_pixmap ();
1858 update_background (); 1861 update_background ();
1862#endif
1863#if ENABLE_PERL
1864 HOOK_INVOKE ((this, HOOK_ROOTPMAP_CHANGE, DT_END));
1865#endif
1859 } 1866 }
1860 1867
1861 break; 1868 break;
1862 } 1869 }
1863# endif
1864 1870
1865 refresh_check (); 1871 refresh_check ();
1866} 1872}
1867#endif 1873#endif
1868 1874
… …
1992 if (scrollBar.upButton (ev.y)) 1998 if (scrollBar.upButton (ev.y))
1993 direction = UP; /* up */ 1999 direction = UP; /* up */
1994 else if (scrollBar.dnButton (ev.y)) 2000 else if (scrollBar.dnButton (ev.y))
1995 direction = DN; /* down */ 2001 direction = DN; /* down */
1996 2002
1997 scrollBar.state = STATE_IDLE; 2003 scrollBar.state = SB_STATE_IDLE;
1998 /* 2004 /*
1999 * Rxvt-style scrollbar: 2005 * Rxvt-style scrollbar:
2000 * move up if mouse is above slider 2006 * move up if mouse is above slider
2001 * move dn if mouse is below slider 2007 * move dn if mouse is below slider
2002 * 2008 *
… …
2041 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2047 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2042#endif 2048#endif
2043 if (scr_page (direction, 1)) 2049 if (scr_page (direction, 1))
2044 { 2050 {
2045 if (direction == UP) 2051 if (direction == UP)
2046 scrollBar.state = STATE_UP; 2052 scrollBar.state = SB_STATE_UP;
2047 else 2053 else
2048 scrollBar.state = STATE_DOWN; 2054 scrollBar.state = SB_STATE_DOWN;
2049 } 2055 }
2050 } 2056 }
2051 else 2057 else
2052 switch (ev.button) 2058 switch (ev.button)
2053 { 2059 {
2054 case Button2: 2060 case Button2:
2055 switch (scrollBar.align) 2061 switch (scrollBar.align)
2056 { 2062 {
2057 case R_SB_ALIGN_TOP: 2063 case SB_ALIGN_TOP:
2058 csrO = 0; 2064 csrO = 0;
2059 break; 2065 break;
2060 case R_SB_ALIGN_CENTRE: 2066 case SB_ALIGN_CENTRE:
2061 csrO = (scrollBar.bot - scrollBar.top) / 2; 2067 csrO = (scrollBar.bot - scrollBar.top) / 2;
2062 break; 2068 break;
2063 case R_SB_ALIGN_BOTTOM: 2069 case SB_ALIGN_BOTTOM:
2064 csrO = scrollBar.bot - scrollBar.top; 2070 csrO = scrollBar.bot - scrollBar.top;
2065 break; 2071 break;
2066 } 2072 }
2067 2073
2068 if (scrollBar.style == R_SB_XTERM 2074 if (scrollBar.style == SB_STYLE_XTERM
2069 || scrollbar_above_slider (ev.y) 2075 || scrollBar.above_slider (ev.y)
2070 || scrollbar_below_slider (ev.y)) 2076 || scrollBar.below_slider (ev.y))
2071 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2077 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2072 2078
2073 scrollBar.state = STATE_MOTION; 2079 scrollBar.state = SB_STATE_MOTION;
2074 break; 2080 break;
2075 2081
2076 case Button1: 2082 case Button1:
2077 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2083 if (scrollBar.align == SB_ALIGN_CENTRE)
2078 csrO = ev.y - scrollBar.top; 2084 csrO = ev.y - scrollBar.top;
2079 /* FALLTHROUGH */ 2085 /* FALLTHROUGH */
2080 2086
2081 case Button3: 2087 case Button3:
2082 if (scrollBar.style != R_SB_XTERM) 2088 if (scrollBar.style != SB_STYLE_XTERM)
2083 { 2089 {
2084 if (scrollbar_above_slider (ev.y)) 2090 if (scrollBar.above_slider (ev.y))
2085# ifdef RXVT_SCROLL_FULL 2091# ifdef RXVT_SCROLL_FULL
2086 scr_page (UP, nrow - 1); 2092 scr_page (UP, nrow - 1);
2087# else 2093# else
2088 scr_page (UP, nrow / 4); 2094 scr_page (UP, nrow / 4);
2089# endif 2095# endif
2090 else if (scrollbar_below_slider (ev.y)) 2096 else if (scrollBar.below_slider (ev.y))
2091# ifdef RXVT_SCROLL_FULL 2097# ifdef RXVT_SCROLL_FULL
2092 scr_page (DN, nrow - 1); 2098 scr_page (DN, nrow - 1);
2093# else 2099# else
2094 scr_page (DN, nrow / 4); 2100 scr_page (DN, nrow / 4);
2095# endif 2101# endif
2096 else 2102 else
2097 scrollBar.state = STATE_MOTION; 2103 scrollBar.state = SB_STATE_MOTION;
2098 } 2104 }
2099 else 2105 else
2100 { 2106 {
2101 scr_page ((ev.button == Button1 ? DN : UP), 2107 scr_page ((ev.button == Button1 ? DN : UP),
2102 (nrow 2108 (nrow
2103 * scrollbar_position (ev.y) 2109 * scrollBar.position (ev.y)
2104 / scrollBar.size ())); 2110 / scrollBar.size ()));
2105 } 2111 }
2106 2112
2107 break; 2113 break;
2108 } 2114 }
… …
2119 2125
2120 csrO = 0; /* reset csr Offset */ 2126 csrO = 0; /* reset csr Offset */
2121 if (!bypass_keystate) 2127 if (!bypass_keystate)
2122 reportmode = !! (priv_modes & PrivMode_mouse_report); 2128 reportmode = !! (priv_modes & PrivMode_mouse_report);
2123 2129
2124 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2130 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2125 { 2131 {
2126 scrollBar.state = STATE_IDLE; 2132 scrollBar.state = SB_STATE_IDLE;
2127 scrollBar.show (0); 2133 scrollBar.show (0);
2128 } 2134 }
2129 2135
2130#ifdef SELECTION_SCROLLING 2136#ifdef SELECTION_SCROLLING
2131 sel_scroll_ev.stop(); 2137 sel_scroll_ev.stop();
… …
2181 case Button3: 2187 case Button3:
2182 selection_make (ev.time); 2188 selection_make (ev.time);
2183 break; 2189 break;
2184 2190
2185 case Button2: 2191 case Button2:
2186 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?
2187 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2193 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2188 break; 2194 break;
2189 2195
2190#ifdef MOUSE_WHEEL 2196#ifdef MOUSE_WHEEL
2191 case Button4: 2197 case Button4:
… …
2226 } 2232 }
2227} 2233}
2228 2234
2229/*}}} */ 2235/*}}} */
2230 2236
2231void 2237void ecb_hot
2232rxvt_term::cmd_parse () 2238rxvt_term::cmd_parse ()
2233{ 2239{
2234 wchar_t ch = NOCHAR; 2240 wchar_t ch = NOCHAR;
2235 char *seq_begin; // remember start of esc-sequence here 2241 char *seq_begin; // remember start of esc-sequence here
2236 2242
2237 for (;;) 2243 for (;;)
2238 { 2244 {
2239 if (expect_false (ch == NOCHAR)) 2245 if (ecb_unlikely (ch == NOCHAR))
2240 { 2246 {
2241 seq_begin = cmdbuf_ptr; 2247 seq_begin = cmdbuf_ptr;
2242 ch = next_char (); 2248 ch = next_char ();
2243 2249
2244 if (ch == NOCHAR) 2250 if (ch == NOCHAR)
2245 break; 2251 break;
2246 } 2252 }
2247 2253
2248 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))
2249 { 2255 {
2250 if (expect_false (!seen_input)) 2256 if (ecb_unlikely (!seen_input))
2251 { 2257 {
2252 seen_input = 1; 2258 seen_input = 1;
2253 // many badly-written programs (e.g. jed) contain a race condition: 2259 // many badly-written programs (e.g. jed) contain a race condition:
2254 // they first read the screensize and then install a SIGWINCH handler. 2260 // they first read the screensize and then install a SIGWINCH handler.
2255 // some window managers resize the window early, and these programs 2261 // some window managers resize the window early, and these programs
… …
2268 wchar_t *str = buf; 2274 wchar_t *str = buf;
2269 wchar_t *eol = str + min (ncol, UBUFSIZ); 2275 wchar_t *eol = str + min (ncol, UBUFSIZ);
2270 2276
2271 for (;;) 2277 for (;;)
2272 { 2278 {
2273 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)))
2274 break; 2280 break;
2275 2281
2276 *str++ = ch; 2282 *str++ = ch;
2277 2283
2278 if (expect_false (ch == C0_LF || str >= eol)) 2284 if (ecb_unlikely (ch == C0_LF || str >= eol))
2279 { 2285 {
2280 if (ch == C0_LF) 2286 if (ch == C0_LF)
2281 nlines++; 2287 nlines++;
2282 2288
2283 refresh_count++; 2289 refresh_count++;
… …
2355 } 2361 }
2356 } 2362 }
2357} 2363}
2358 2364
2359// read the next character 2365// read the next character
2360wchar_t 2366wchar_t ecb_hot
2361rxvt_term::next_char () NOTHROW 2367rxvt_term::next_char () NOTHROW
2362{ 2368{
2363 while (cmdbuf_ptr < cmdbuf_endp) 2369 while (cmdbuf_ptr < cmdbuf_endp)
2364 { 2370 {
2365 // assume 7-bit to be ascii ALWAYS 2371 // assume 7-bit to be ascii ALWAYS
2366 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2372 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2367 return *cmdbuf_ptr++; 2373 return *cmdbuf_ptr++;
2368 2374
2369 wchar_t wc; 2375 wchar_t wc;
2370 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);
2371 2377
… …
2389 2395
2390 return NOCHAR; 2396 return NOCHAR;
2391} 2397}
2392 2398
2393// read the next octet 2399// read the next octet
2394uint32_t 2400uint32_t ecb_hot
2395rxvt_term::next_octet () NOTHROW 2401rxvt_term::next_octet () NOTHROW
2396{ 2402{
2397 return cmdbuf_ptr < cmdbuf_endp 2403 return cmdbuf_ptr < cmdbuf_endp
2398 ? (unsigned char)*cmdbuf_ptr++ 2404 ? (unsigned char)*cmdbuf_ptr++
2399 : NOCHAR; 2405 : NOCHAR;
2400} 2406}
2401 2407
2402static class out_of_input out_of_input; 2408static class out_of_input out_of_input;
2403 2409
2404/* rxvt_cmd_getc () - Return next input character */ 2410wchar_t ecb_hot
2405/*
2406 * Return the next input character after first passing any keyboard input
2407 * to the command.
2408 */
2409wchar_t
2410rxvt_term::cmd_getc () THROW ((class out_of_input)) 2411rxvt_term::cmd_getc () THROW ((class out_of_input))
2411{ 2412{
2412 wchar_t c = next_char (); 2413 wchar_t c = next_char ();
2413 2414
2414 if (c == NOCHAR) 2415 if (c == NOCHAR)
2415 throw out_of_input; 2416 throw out_of_input;
2416 2417
2417 return c; 2418 return c;
2418} 2419}
2419 2420
2420uint32_t 2421uint32_t ecb_hot
2421rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2422rxvt_term::cmd_get8 () THROW ((class out_of_input))
2422{ 2423{
2423 uint32_t c = next_octet (); 2424 uint32_t c = next_octet ();
2424 2425
2425 if (c == NOCHAR) 2426 if (c == NOCHAR)
… …
2429} 2430}
2430 2431
2431/*{{{ print pipe */ 2432/*{{{ print pipe */
2432/*----------------------------------------------------------------------*/ 2433/*----------------------------------------------------------------------*/
2433#ifdef PRINTPIPE 2434#ifdef PRINTPIPE
2434FILE * 2435FILE * ecb_cold
2435rxvt_term::popen_printer () 2436rxvt_term::popen_printer ()
2436{ 2437{
2437 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");
2438 2439
2439 if (stream == NULL) 2440 if (stream == NULL)
2440 rxvt_warn ("can't open printer pipe, not printing.\n"); 2441 rxvt_warn ("can't open printer pipe, not printing.\n");
2441 2442
2442 return stream; 2443 return stream;
2443} 2444}
2444 2445
2445int 2446int ecb_cold
2446rxvt_term::pclose_printer (FILE *stream) 2447rxvt_term::pclose_printer (FILE *stream)
2447{ 2448{
2448 fflush (stream); 2449 fflush (stream);
2449 return pclose (stream); 2450 return pclose (stream);
2450} 2451}
2451 2452
2452/* 2453/*
2453 * simulate attached vt100 printer 2454 * simulate attached vt100 printer
2454 */ 2455 */
2455void 2456void ecb_cold
2456rxvt_term::process_print_pipe () 2457rxvt_term::process_print_pipe ()
2457{ 2458{
2458 FILE *fd = popen_printer (); 2459 FILE *fd = popen_printer ();
2459 2460
2460 if (!fd) 2461 if (!fd)
… …
2506 pclose_printer (fd); 2507 pclose_printer (fd);
2507} 2508}
2508#endif /* PRINTPIPE */ 2509#endif /* PRINTPIPE */
2509/*}}} */ 2510/*}}} */
2510 2511
2511/* *INDENT-OFF* */
2512enum { 2512enum {
2513 C1_40 = 0x40, 2513 C1_40 = 0x40,
2514 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,
2515 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,
2516 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,
2517 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,
2518}; 2518};
2519/* *INDENT-ON* */
2520 2519
2521/*{{{ process non-printing single characters */ 2520/*{{{ process non-printing single characters */
2522void 2521void ecb_hot
2523rxvt_term::process_nonprinting (unicode_t ch) 2522rxvt_term::process_nonprinting (unicode_t ch)
2524{ 2523{
2525 switch (ch) 2524 switch (ch)
2526 { 2525 {
2527 case C0_ESC: 2526 case C0_ESC:
… …
2573} 2572}
2574/*}}} */ 2573/*}}} */
2575 2574
2576 2575
2577/*{{{ process VT52 escape sequences */ 2576/*{{{ process VT52 escape sequences */
2578void 2577void ecb_cold
2579rxvt_term::process_escape_vt52 (unicode_t ch) 2578rxvt_term::process_escape_vt52 (unicode_t ch)
2580{ 2579{
2581 int row, col; 2580 int row, col;
2582 2581
2583 switch (ch) 2582 switch (ch)
… …
2617 break; 2616 break;
2618 case 'Z': /* identify the terminal type */ 2617 case 'Z': /* identify the terminal type */
2619 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2618 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2620 break; 2619 break;
2621 case '<': /* turn off VT52 mode */ 2620 case '<': /* turn off VT52 mode */
2622 set_privmode (PrivMode_vt52, 0); 2621 priv_modes &= ~PrivMode_vt52;
2623 break; 2622 break;
2624 case 'F': /* use special graphics character set */ 2623 case 'F': /* use special graphics character set */
2625 case 'G': /* use regular character set */ 2624 case 'G': /* use regular character set */
2626 /* unimplemented */ 2625 /* unimplemented */
2627 break; 2626 break;
… …
2633} 2632}
2634/*}}} */ 2633/*}}} */
2635 2634
2636 2635
2637/*{{{ process escape sequences */ 2636/*{{{ process escape sequences */
2638void 2637void ecb_hot
2639rxvt_term::process_escape_seq () 2638rxvt_term::process_escape_seq ()
2640{ 2639{
2641 unicode_t ch = cmd_getc (); 2640 unicode_t ch = cmd_getc ();
2642 2641
2643 if (priv_modes & PrivMode_vt52) 2642 if (priv_modes & PrivMode_vt52)
… …
2646 return; 2645 return;
2647 } 2646 }
2648 2647
2649 switch (ch) 2648 switch (ch)
2650 { 2649 {
2651 /* case 1: do_tek_mode (); break; */
2652 case '#': 2650 case '#':
2653 if (cmd_getc () == '8') 2651 if (cmd_getc () == '8')
2654 scr_E (); 2652 scr_E ();
2655 break; 2653 break;
2656 case '(': 2654 case '(':
… …
2679#if !ENABLE_MINIMAL 2677#if !ENABLE_MINIMAL
2680 case '9': 2678 case '9':
2681 scr_forwardindex (); 2679 scr_forwardindex ();
2682 break; 2680 break;
2683#endif 2681#endif
2682 // DECPAM/DECPNM
2684 case '=': 2683 case '=':
2684 priv_modes |= PrivMode_aplKP;
2685 break;
2685 case '>': 2686 case '>':
2686 set_privmode (PrivMode_aplKP, ch == '='); 2687 priv_modes &= ~PrivMode_aplKP;
2687 break; 2688 break;
2688 2689
2689 case C1_40: 2690 case C1_40:
2690 cmd_getc (); 2691 cmd_getc ();
2691 break; 2692 break;
… …
2695 2696
2696 /* 8.3.87: NEXT LINE */ 2697 /* 8.3.87: NEXT LINE */
2697 case C1_NEL: /* ESC E */ 2698 case C1_NEL: /* ESC E */
2698 { 2699 {
2699 wchar_t nlcr[] = { C0_LF, C0_CR }; 2700 wchar_t nlcr[] = { C0_LF, C0_CR };
2700 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2701 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2701 } 2702 }
2702 break; 2703 break;
2703 2704
2704 /* kidnapped escape sequence: Should be 8.3.48 */ 2705 /* kidnapped escape sequence: Should be 8.3.48 */
2705 case C1_ESA: /* ESC G */ 2706 case C1_ESA: /* ESC G */
2706 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 */
2707 break; 2710 break;
2708 2711
2709 /* 8.3.63: CHARACTER TABULATION SET */ 2712 /* 8.3.63: CHARACTER TABULATION SET */
2710 case C1_HTS: /* ESC H */ 2713 case C1_HTS: /* ESC H */
2711 scr_set_tab (1); 2714 scr_set_tab (1);
… …
2715 case C1_RI: /* ESC M */ 2718 case C1_RI: /* ESC M */
2716 scr_index (DN); 2719 scr_index (DN);
2717 break; 2720 break;
2718 2721
2719 /* 8.3.142: SINGLE-SHIFT TWO */ 2722 /* 8.3.142: SINGLE-SHIFT TWO */
2720 /*case C1_SS2: scr_single_shift (2); break; */ 2723 /* case C1_SS2: break; */
2721 2724
2722 /* 8.3.143: SINGLE-SHIFT THREE */ 2725 /* 8.3.143: SINGLE-SHIFT THREE */
2723 /*case C1_SS3: scr_single_shift (3); break; */ 2726 /* case C1_SS3: break; */
2724 2727
2725 /* 8.3.27: DEVICE CONTROL STRING */ 2728 /* 8.3.27: DEVICE CONTROL STRING */
2726 case C1_DCS: /* ESC P */ 2729 case C1_DCS: /* ESC P */
2727 process_dcs_seq (); 2730 process_dcs_seq ();
2728 break; 2731 break;
… …
2761 } 2764 }
2762} 2765}
2763/*}}} */ 2766/*}}} */
2764 2767
2765/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2768/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2766/* *INDENT-OFF* */
2767enum { 2769enum {
2768 CSI_ICH = 0x40, 2770 CSI_ICH = 0x40,
2769 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,
2770 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 ,
2771 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,
… …
2774 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2776 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2775 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2777 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2776 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2778 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2777}; 2779};
2778 2780
2779#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2781#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2780 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2782 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2781 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2783 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2782#define get_byte_array_bit(array, bit) \ 2784#define get_byte_array_bit(array, bit) \
2783 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2785 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2784 2786
2785const unsigned char csi_defaults[] = 2787static const unsigned char csi_defaults[] =
2786 { 2788 {
2787 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2789 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2788 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2790 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2789 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2791 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2790 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2792 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2791 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, */
2792 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, */
2793 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, */
2794 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, {, |, }, ~, */
2795 }; 2797 };
2796/* *INDENT-ON* */
2797 2798
2798void 2799void ecb_hot
2799rxvt_term::process_csi_seq () 2800rxvt_term::process_csi_seq ()
2800{ 2801{
2801 unicode_t ch, priv, i; 2802 unicode_t ch, priv, i;
2802 unsigned int nargs, p; 2803 unsigned int nargs, p;
2803 int n, ndef; 2804 int n, ndef;
… …
2879 { 2880 {
2880 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2881 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2881 scr_soft_reset (); 2882 scr_soft_reset ();
2882 2883
2883 static const int pm_h[] = { 7, 25 }; 2884 static const int pm_h[] = { 7, 25 };
2884 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 }; 2885 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2885 2886
2886 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h); 2887 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2887 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l); 2888 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2888 } 2889 }
2889 break; 2890 break;
2890 } 2891 }
2891 2892
2892 return; 2893 return;
… …
2910 } 2911 }
2911 break; 2912 break;
2912#endif 2913#endif
2913 2914
2914 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2915 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2915 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2916 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2916 arg[0] = -arg[0]; 2917 arg[0] = -arg[0];
2917 /* FALLTHROUGH */ 2918 /* FALLTHROUGH */
2918 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2919 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2919 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2920 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2920 scr_gotorc (arg[0], 0, RELATIVE); 2921 scr_gotorc (arg[0], 0, RELATIVE);
2921 break; 2922 break;
2922 2923
2923 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2924 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2924 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2925 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3111 } 3112 }
3112} 3113}
3113/*}}} */ 3114/*}}} */
3114 3115
3115#if !ENABLE_MINIMAL 3116#if !ENABLE_MINIMAL
3116/* ARGSUSED */
3117void 3117void
3118rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3118rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3119{ 3119{
3120 int x, y; 3120 int x, y;
3121 XWindowAttributes wattr; 3121 XWindowAttributes wattr;
… …
3130 { 3130 {
3131 /* 3131 /*
3132 * commands 3132 * commands
3133 */ 3133 */
3134 case 1: /* deiconify window */ 3134 case 1: /* deiconify window */
3135 XMapWindow (dpy, parent[0]); 3135 XMapWindow (dpy, parent);
3136 break; 3136 break;
3137 case 2: /* iconify window */ 3137 case 2: /* iconify window */
3138 XIconifyWindow (dpy, parent[0], display->screen); 3138 XIconifyWindow (dpy, parent, display->screen);
3139 break; 3139 break;
3140 case 3: /* set position (pixels) */ 3140 case 3: /* set position (pixels) */
3141 XMoveWindow (dpy, parent[0], args[1], args[2]); 3141 XMoveWindow (dpy, parent, args[1], args[2]);
3142 break; 3142 break;
3143 case 4: /* set size (pixels) */ 3143 case 4: /* set size (pixels) */
3144 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3144 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3145 break; 3145 break;
3146 case 5: /* raise window */ 3146 case 5: /* raise window */
3147 XRaiseWindow (dpy, parent[0]); 3147 XRaiseWindow (dpy, parent);
3148 break; 3148 break;
3149 case 6: /* lower window */ 3149 case 6: /* lower window */
3150 XLowerWindow (dpy, parent[0]); 3150 XLowerWindow (dpy, parent);
3151 break; 3151 break;
3152 case 7: /* refresh window */ 3152 case 7: /* refresh window */
3153 scr_touch (true); 3153 scr_touch (true);
3154 break; 3154 break;
3155 case 8: /* set size (chars) */ 3155 case 8: /* set size (chars) */
… …
3158 break; 3158 break;
3159 3159
3160 //case 9: NYI, TODO, restore maximized window or maximize window 3160 //case 9: NYI, TODO, restore maximized window or maximize window
3161 default: 3161 default:
3162 if (args[0] >= 24) /* set height (chars) */ 3162 if (args[0] >= 24) /* set height (chars) */
3163 set_widthheight ((unsigned int)width, 3163 set_widthheight ((unsigned int)vt_width,
3164 (unsigned int) (args[1] * fheight)); 3164 (unsigned int) (args[1] * fheight));
3165 break; 3165 break;
3166 3166
3167 /* 3167 /*
3168 * reports - some output format copied from XTerm 3168 * reports - some output format copied from XTerm
3169 */ 3169 */
3170 case 11: /* report window state */ 3170 case 11: /* report window state */
3171 XGetWindowAttributes (dpy, parent[0], &wattr); 3171 XGetWindowAttributes (dpy, parent, &wattr);
3172 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3172 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3173 break; 3173 break;
3174 case 13: /* report window position */ 3174 case 13: /* report window position */
3175 XGetWindowAttributes (dpy, parent[0], &wattr); 3175 XGetWindowAttributes (dpy, parent, &wattr);
3176 XTranslateCoordinates (dpy, parent[0], wattr.root, 3176 XTranslateCoordinates (dpy, parent, wattr.root,
3177 -wattr.border_width, -wattr.border_width, 3177 -wattr.border_width, -wattr.border_width,
3178 &x, &y, &wdummy); 3178 &x, &y, &wdummy);
3179 tt_printf ("\033[3;%d;%dt", x, y); 3179 tt_printf ("\033[3;%d;%dt", x, y);
3180 break; 3180 break;
3181 case 14: /* report window size (pixels) */ 3181 case 14: /* report window size (pixels) */
3182 XGetWindowAttributes (dpy, parent[0], &wattr); 3182 XGetWindowAttributes (dpy, parent, &wattr);
3183 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3183 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3184 break; 3184 break;
3185 case 18: /* report text area size (chars) */ 3185 case 18: /* report text area size (chars) */
3186 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3186 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3187 break; 3187 break;
… …
3189 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3189 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3190 break; 3190 break;
3191 case 20: /* report icon label */ 3191 case 20: /* report icon label */
3192 { 3192 {
3193 char *s; 3193 char *s;
3194 XGetIconName (dpy, parent[0], &s); 3194 XGetIconName (dpy, parent, &s);
3195 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 */
3196 XFree (s); 3196 XFree (s);
3197 } 3197 }
3198 break; 3198 break;
3199 case 21: /* report window title */ 3199 case 21: /* report window title */
3200 { 3200 {
3201 char *s; 3201 char *s;
3202 XFetchName (dpy, parent[0], &s); 3202 XFetchName (dpy, parent, &s);
3203 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 */
3204 XFree (s); 3204 XFree (s);
3205 } 3205 }
3206 break; 3206 break;
3207 } 3207 }
… …
3361 unsigned long bytes_after; 3361 unsigned long bytes_after;
3362 unsigned char *value = 0; 3362 unsigned char *value = 0;
3363 const char *str = ""; 3363 const char *str = "";
3364 3364
3365 if (prop 3365 if (prop
3366 && XGetWindowProperty (dpy, parent[0], 3366 && XGetWindowProperty (dpy, parent,
3367 prop, 0, 1<<16, 0, AnyPropertyType, 3367 prop, 0, 1<<16, 0, AnyPropertyType,
3368 &actual_type, &actual_format, 3368 &actual_type, &actual_format,
3369 &nitems, &bytes_after, &value) == Success 3369 &nitems, &bytes_after, &value) == Success
3370 && actual_type != None 3370 && actual_type != None
3371 && actual_format == 8) 3371 && actual_format == 8)
… …
3383 { 3383 {
3384 *eq = 0; 3384 *eq = 0;
3385 set_utf8_property (display->atom (str), eq + 1); 3385 set_utf8_property (display->atom (str), eq + 1);
3386 } 3386 }
3387 else 3387 else
3388 XDeleteProperty (dpy, parent[0], 3388 XDeleteProperty (dpy, parent,
3389 display->atom (str)); 3389 display->atom (str));
3390 } 3390 }
3391 break; 3391 break;
3392 3392
3393 case XTerm_Color: 3393 case XTerm_Color:
… …
3454 process_color_seq (op, Color_tint, str, resp); 3454 process_color_seq (op, Color_tint, str, resp);
3455 { 3455 {
3456 bool changed = false; 3456 bool changed = false;
3457 3457
3458 if (ISSET_PIXCOLOR (Color_tint)) 3458 if (ISSET_PIXCOLOR (Color_tint))
3459 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3459 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3460 else
3461 changed = bgPixmap.unset_tint ();
3462 3460
3463 if (changed) 3461 if (changed)
3464 update_background (); 3462 update_background ();
3465 } 3463 }
3466 3464
… …
3470#if BG_IMAGE_FROM_FILE 3468#if BG_IMAGE_FROM_FILE
3471 case Rxvt_Pixmap: 3469 case Rxvt_Pixmap:
3472 if (!strcmp (str, "?")) 3470 if (!strcmp (str, "?"))
3473 { 3471 {
3474 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 }
3475 3482
3476 sprintf (str, "[%dx%d+%d+%d]", 3483 sprintf (str, "[%dx%d+%d+%d]",
3477 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3484 h_scale, v_scale,
3478 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3485 h_align, v_align);
3479 process_xterm_seq (XTerm_title, str, CHAR_ST); 3486 process_xterm_seq (XTerm_title, str, CHAR_ST);
3480 } 3487 }
3481 else 3488 else
3482 { 3489 {
3483 int changed = 0; 3490 bool changed = false;
3484 3491
3485 if (*str != ';') 3492 if (*str != ';')
3486 { 3493 {
3487 if (bgPixmap.set_file (str)) /* change pixmap */ 3494 if (image_vec.size () > 0)
3495 changed = image_vec[0].set_file_geometry (str);
3496 else
3488 { 3497 {
3489 changed++; 3498 rxvt_image *image = new_image ();
3490 str = strchr (str, ';'); 3499 if (!image->set_file_geometry (str))
3491 if (str == NULL) 3500 image_vec.pop_back ();
3492 bgPixmap.set_defaultGeometry ();
3493 else 3501 else
3494 bgPixmap.set_geometry (str+1); 3502 changed = true;
3495 } 3503 }
3496 } 3504 }
3497 else 3505 else
3498 { 3506 {
3499 str++; 3507 str++;
3500 if (bgPixmap.set_geometry (str, true)) 3508 if (image_vec.size () > 0)
3501 changed++; 3509 changed = image_vec[0].set_geometry (str, true);
3502 } 3510 }
3503 3511
3504 if (changed) 3512 if (changed)
3505 { 3513 {
3506 if (bgPixmap.window_position_sensitive ()) 3514 if (bg_window_position_sensitive ())
3507 { 3515 {
3508 int x, y; 3516 int x, y;
3509 get_window_origin (x, y); 3517 get_window_origin (x, y);
3510 bgPixmap.set_position (x, y); 3518 bg_set_position (x, y);
3511 } 3519 }
3512 update_background (); 3520 update_background ();
3513 } 3521 }
3514 } 3522 }
3515 break; 3523 break;
… …
3605 * 's' = save 3613 * 's' = save
3606 * 'r' = restore 3614 * 'r' = restore
3607 * 't' = toggle 3615 * 't' = toggle
3608 * so no need for fancy checking 3616 * so no need for fancy checking
3609 */ 3617 */
3610int 3618int ecb_cold
3611rxvt_term::privcases (int mode, unsigned long bit) 3619rxvt_term::privcases (int mode, unsigned long bit)
3612{ 3620{
3613 int state; 3621 int state;
3614 3622
3615 if (mode == 's') 3623 if (mode == 's')
3616 { 3624 {
3617 SavedModes |= (priv_modes & bit); 3625 if (priv_modes & bit)
3626 SavedModes |= bit;
3627 else
3628 SavedModes &= ~bit;
3618 return -1; 3629 return -1;
3619 } 3630 }
3620 else 3631 else
3621 { 3632 {
3622 if (mode == 'r') 3633 if (mode == 'r')
3623 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3634 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3624 else 3635 else
3625 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3636 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3626 3637
3627 set_privmode (bit, state); 3638 if (state)
3639 priv_modes |= bit;
3640 else
3641 priv_modes &= ~bit;
3628 } 3642 }
3629 3643
3630 return state; 3644 return state;
3631} 3645}
3632 3646
3633/* we're not using priv _yet_ */ 3647/* we're not using priv _yet_ */
3634void 3648void
3635rxvt_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)
3636{ 3650{
3637 unsigned int i, j; 3651 unsigned int i, j;
3638 int state; 3652 int state;
3639 3653
3640 static const struct 3654 static const struct
3641 { 3655 {
3642 const int argval; 3656 const int argval;
3643 const unsigned long bit; 3657 const unsigned long bit;
3644 } argtopriv[] = { 3658 } argtopriv[] = {
3645 { 1, PrivMode_aplCUR }, // DECCKM 3659 { 1, PrivMode_aplCUR }, // DECCKM
3646 { 2, PrivMode_vt52 }, 3660 { 2, PrivMode_vt52 }, // DECANM
3647 { 3, PrivMode_132 }, // DECCOLM 3661 { 3, PrivMode_132 }, // DECCOLM
3648 { 4, PrivMode_smoothScroll }, // DECSCLM 3662 { 4, PrivMode_smoothScroll }, // DECSCLM
3649 { 5, PrivMode_rVideo }, // DECSCNM 3663 { 5, PrivMode_rVideo }, // DECSCNM
3650 { 6, PrivMode_relOrigin }, // DECOM 3664 { 6, PrivMode_relOrigin }, // DECOM
3651 { 7, PrivMode_Autowrap }, // DECAWM 3665 { 7, PrivMode_Autowrap }, // DECAWM
3652 // 8, auto-repeat keys // DECARM 3666 // 8, auto-repeat keys // DECARM
3653 { 9, PrivMode_MouseX10 }, 3667 { 9, PrivMode_MouseX10 },
3654 // 18 end FF to printer after print screen 3668 // 18 end FF to printer after print screen
3655 // 19 Print screen prints full screen/scroll region 3669 // 19 Print screen prints full screen/scroll region
3656 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3670 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3657#ifdef scrollBar_esc 3671#ifdef scrollBar_esc
3658 { scrollBar_esc, PrivMode_scrollBar }, 3672 { scrollBar_esc, PrivMode_scrollBar },
3659#endif 3673#endif
3660 { 35, PrivMode_ShiftKeys }, // rxvt extension 3674 { 35, PrivMode_ShiftKeys }, // rxvt extension
3661 // 38, tektronix mode // DECTEK 3675 // 38, tektronix mode // DECTEK
3662 { 40, PrivMode_132OK }, 3676 { 40, PrivMode_132OK },
3663 // 41 xterm more fixes NYI 3677 // 41 xterm more fixes NYI
3664 // 45 margin bell NYI 3678 // 45 margin bell NYI
3665 // 46 start logging 3679 // 46 start logging
3666 { 47, PrivMode_Screen }, 3680 { 47, PrivMode_Screen },
3667 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3681 { 66, PrivMode_aplKP }, // DECNKM
3668#ifndef NO_BACKSPACE_KEY 3682#ifndef NO_BACKSPACE_KEY
3669 { 67, PrivMode_BackSpace }, // DECBKM 3683 { 67, PrivMode_BackSpace }, // DECBKM
3670#endif 3684#endif
3671 { 1000, PrivMode_MouseX11 }, 3685 { 1000, PrivMode_MouseX11 },
3672 { 1002, PrivMode_MouseBtnEvent }, 3686 { 1002, PrivMode_MouseBtnEvent },
… …
3701 for (i = 0; i < nargs; i++) 3715 for (i = 0; i < nargs; i++)
3702 { 3716 {
3703 state = -1; 3717 state = -1;
3704 3718
3705 /* basic handling */ 3719 /* basic handling */
3706 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3720 for (j = 0; j < ecb_array_length (argtopriv); j++)
3707 if (argtopriv[j].argval == arg[i]) 3721 if (argtopriv[j].argval == arg[i])
3708 { 3722 {
3709 state = privcases (mode, argtopriv[j].bit); 3723 state = privcases (mode, argtopriv[j].bit);
3710 break; 3724 break;
3711 } 3725 }
… …
3737 case 2: /* VT52 mode */ 3751 case 2: /* VT52 mode */
3738 /* oddball mode. should be set regardless of set/reset 3752 /* oddball mode. should be set regardless of set/reset
3739 * parameter. Return from VT52 mode with an ESC < from 3753 * parameter. Return from VT52 mode with an ESC < from
3740 * within VT52 mode 3754 * within VT52 mode
3741 */ 3755 */
3742 set_privmode (PrivMode_vt52, 1); 3756 priv_modes |= PrivMode_vt52;
3743 break; 3757 break;
3744 case 3: /* 80/132 */ 3758 case 3: /* 80/132 */
3745 if (priv_modes & PrivMode_132OK) 3759 if (priv_modes & PrivMode_132OK)
3746 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight); 3760 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3747 break; 3761 break;
… …
3762 if (state) /* orthogonal */ 3776 if (state) /* orthogonal */
3763 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3777 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3764 break; 3778 break;
3765#ifdef scrollBar_esc 3779#ifdef scrollBar_esc
3766 case scrollBar_esc: 3780 case scrollBar_esc:
3767 if (scrollBar.map (state)) 3781 scrollBar.map (state);
3768 {
3769 resize_all_windows (0, 0, 0); 3782 resize_all_windows (0, 0, 0);
3770 scr_touch (true); 3783 scr_touch (true);
3771 }
3772 break; 3784 break;
3773#endif 3785#endif
3774 case 25: /* visible/invisible cursor */ 3786 case 25: /* visible/invisible cursor */
3775 scr_cursor_visible (state); 3787 scr_cursor_visible (state);
3776 break; 3788 break;
… …
3789 case 1003: 3801 case 1003:
3790 if (state) 3802 if (state)
3791 { 3803 {
3792 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3804 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3793 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3805 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3806 mouse_row = mouse_col = 0;
3794 vt_emask_mouse = PointerMotionMask; 3807 vt_emask_mouse = PointerMotionMask;
3795 } 3808 }
3796 else 3809 else
3797 vt_emask_mouse = NoEventMask; 3810 vt_emask_mouse = NoEventMask;
3798 3811
… …
3830 } 3843 }
3831} 3844}
3832/*}}} */ 3845/*}}} */
3833 3846
3834/*{{{ process sgr sequences */ 3847/*{{{ process sgr sequences */
3835void 3848void ecb_hot
3836rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3849rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3837{ 3850{
3838 unsigned int i; 3851 unsigned int i;
3839 short rendset; 3852 short rendset;
3840 int rendstyle; 3853 int rendstyle;
… …
3983 } 3996 }
3984 } 3997 }
3985} 3998}
3986/*}}} */ 3999/*}}} */
3987 4000
3988/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3989void
3990rxvt_term::process_graphics ()
3991{
3992 unicode_t ch, cmd = cmd_getc ();
3993
3994 if (cmd == 'Q')
3995 {
3996 /* query graphics */
3997 tt_printf ("\033G0\012"); /* no graphics */
3998 return;
3999 }
4000 /* swallow other graphics sequences until terminating ':' */
4001 do
4002 ch = cmd_getc ();
4003 while (ch != ':');
4004}
4005/*}}} */
4006
4007/* ------------------------------------------------------------------------- */ 4001/* ------------------------------------------------------------------------- */
4008 4002
4009/* 4003/*
4010 * Send printf () formatted output to the command. 4004 * Send printf () formatted output to the command.
4011 * Only use for small amounts of data. 4005 * Only use for small amounts of data.
… …
4024 4018
4025/* ---------------------------------------------------------------------- */ 4019/* ---------------------------------------------------------------------- */
4026/* Write data to the pty as typed by the user, pasted with the mouse, 4020/* Write data to the pty as typed by the user, pasted with the mouse,
4027 * or generated by us in response to a query ESC sequence. 4021 * or generated by us in response to a query ESC sequence.
4028 */ 4022 */
4029const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4023static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4030 4024
4031void 4025void
4032rxvt_term::tt_write (const char *data, unsigned int len) 4026rxvt_term::tt_write (const char *data, unsigned int len)
4033{ 4027{
4034 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4028 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
4039 4033
4040 if (v_buflen == 0) 4034 if (v_buflen == 0)
4041 { 4035 {
4042 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));
4043 4037
4038 max_it (written, 0);
4039
4044 if ((unsigned int)written == len) 4040 if (written == len)
4045 return; 4041 return;
4046 4042
4047 data += written; 4043 data += written;
4048 len -= written; 4044 len -= written;
4049 } 4045 }
4050 4046
4051 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4047 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4052 4048
4053 memcpy (v_buffer + v_buflen, data, len); 4049 memcpy (v_buffer + v_buflen, data, len);
4054 v_buflen += len; 4050 v_buflen += len;
4055 4051
4056 pty_ev.set (ev::READ | ev::WRITE); 4052 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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