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.460 by sf-exg, Fri Nov 19 23:29:30 2010 UTC vs.
Revision 1.514 by root, Mon Jun 4 15:18:52 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 ();
… …
1252{ 1262{
1253 int button_number, key_state = 0; 1263 int button_number, key_state = 0;
1254 int x, y; 1264 int x, y;
1255 int code = 32; 1265 int code = 32;
1256 1266
1257 x = Pixel2Col (ev.x); 1267 x = Pixel2Col (ev.x) + 1;
1258 y = Pixel2Row (ev.y); 1268 y = Pixel2Row (ev.y) + 1;
1269
1259 if (ev.type == MotionNotify) 1270 if (ev.type == MotionNotify)
1260 { 1271 {
1261 if (x == mouse_row && y == mouse_col) 1272 if (x == mouse_row && y == mouse_col)
1262 return; 1273 return;
1274
1263 mouse_row = x; 1275 mouse_row = x;
1264 mouse_col = y; 1276 mouse_col = y;
1265 code += 32; 1277 code += 32;
1266 } 1278 }
1267 1279
… …
1270 else 1282 else
1271 { 1283 {
1272 button_number = MEvent.button - Button1; 1284 button_number = MEvent.button - Button1;
1273 /* add 0x3D for wheel events, like xterm does */ 1285 /* add 0x3D for wheel events, like xterm does */
1274 if (button_number >= 3) 1286 if (button_number >= 3)
1275 button_number += (64 - 3); 1287 button_number += 64 - 3;
1276 } 1288 }
1277 1289
1278 if (priv_modes & PrivMode_MouseX10) 1290 if (priv_modes & PrivMode_MouseX10)
1279 { 1291 {
1280 /* 1292 /*
… …
1312 fputc ('A', stderr); 1324 fputc ('A', stderr);
1313 if (key_state & 32) 1325 if (key_state & 32)
1314 fputc ('2', stderr); 1326 fputc ('2', stderr);
1315 fprintf (stderr, "]: <%d>, %d/%d\n", 1327 fprintf (stderr, "]: <%d>, %d/%d\n",
1316 button_number, 1328 button_number,
1317 x + 1, 1329 x,
1318 y + 1); 1330 y);
1319#endif 1331#endif
1320 1332
1333#if ENABLE_FRILLS
1334 if (priv_modes & PrivMode_ExtMouseRight)
1335 tt_printf ("\033[%d;%d;%dM",
1336 code + button_number + key_state,
1337 x,
1338 y);
1339 else if (priv_modes & PrivMode_ExtModeMouse)
1340 tt_printf ("\033[M%c%lc%lc",
1341 code + button_number + key_state,
1342 wint_t (32 + x),
1343 wint_t (32 + y));
1344 else
1345#endif
1321 tt_printf ("\033[M%c%c%c", 1346 tt_printf ("\033[M%c%c%c",
1322 (code + button_number + key_state), 1347 code + button_number + key_state,
1323 (32 + x + 1), 1348 32 + x,
1324 (32 + y + 1)); 1349 32 + y);
1325} 1350}
1326 1351
1327/*{{{ process an X event */ 1352/*{{{ process an X event */
1328void 1353void ecb_hot
1329rxvt_term::x_cb (XEvent &ev) 1354rxvt_term::x_cb (XEvent &ev)
1330{ 1355{
1331 make_current (); 1356 make_current ();
1332 1357
1333 dLocal (Display *, dpy); 1358 dLocal (Display *, dpy);
… …
1431 && ev.xfocus.mode != NotifyGrab) 1456 && ev.xfocus.mode != NotifyGrab)
1432 focus_out (); 1457 focus_out ();
1433 break; 1458 break;
1434 1459
1435 case ConfigureNotify: 1460 case ConfigureNotify:
1436 if (ev.xconfigure.window == parent[0]) 1461 if (ev.xconfigure.window == parent)
1437 { 1462 {
1438 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev)) 1463 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1439 ; 1464 ;
1440 1465
1441#ifdef HAVE_BG_PIXMAP 1466#ifdef HAVE_BG_PIXMAP
1442 bool moved = false; 1467 bool moved = false;
1443 if (bgPixmap.window_position_sensitive ()) 1468 if (bg_window_position_sensitive ())
1444 { 1469 {
1445 int x, y; 1470 int x, y;
1446 if (ev.xconfigure.send_event) 1471 if (ev.xconfigure.send_event)
1447 { 1472 {
1448 x = ev.xconfigure.x; 1473 x = ev.xconfigure.x;
1449 y = ev.xconfigure.y; 1474 y = ev.xconfigure.y;
1450 } 1475 }
1451 else 1476 else
1452 get_window_origin (x, y); 1477 get_window_origin (x, y);
1453 1478
1454 if (bgPixmap.set_position (x, y) 1479 if (bg_set_position (x, y)
1455 || (bgPixmap.flags & bgPixmap_t::isInvalid)) 1480 || !(bg_flags & BG_IS_VALID))
1456 moved = true; 1481 moved = true;
1457 } 1482 }
1458#endif 1483#endif
1459 1484
1460 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1485 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
… …
1464 } 1489 }
1465 else 1490 else
1466 { 1491 {
1467#ifdef HAVE_BG_PIXMAP 1492#ifdef HAVE_BG_PIXMAP
1468 if (moved) 1493 if (moved)
1469 {
1470 if (mapped)
1471 update_background (); 1494 update_background ();
1472 else
1473 bgPixmap.invalidate ();
1474 }
1475#endif 1495#endif
1476 } 1496 }
1477 1497
1478 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END)); 1498 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1479 } 1499 }
1480 break; 1500 break;
1481 1501
1482 case PropertyNotify: 1502 case PropertyNotify:
1483 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END))) 1503 HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END));
1484 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1485 && ev.xproperty.state == PropertyNewValue)
1486 selection_property (ev.xproperty.window, ev.xproperty.atom);
1487
1488 break; 1504 break;
1489 1505
1490 case SelectionClear: 1506 case SelectionClear:
1491 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]); 1507 selection_clear (ev.xselectionclear.selection == xa[XA_CLIPBOARD]);
1492 break;
1493
1494 case SelectionNotify:
1495 if (selection_wait == Sel_normal)
1496 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1497 break; 1508 break;
1498 1509
1499 case SelectionRequest: 1510 case SelectionRequest:
1500 selection_send (ev.xselectionrequest); 1511 selection_send (ev.xselectionrequest);
1501 break; 1512 break;
… …
1512 * by scheduling background redraw as soon as we can, but giving a short 1523 * by scheduling background redraw as soon as we can, but giving a short
1513 * bit of time for ConfigureNotifies to arrive. 1524 * bit of time for ConfigureNotifies to arrive.
1514 * We should render background PRIOR to drawing any text, but AFTER all 1525 * We should render background PRIOR to drawing any text, but AFTER all
1515 * of ConfigureNotifys for the best results. 1526 * of ConfigureNotifys for the best results.
1516 */ 1527 */
1517 if (bgPixmap.flags & bgPixmap_t::isInvalid) 1528 if (!(bg_flags & BG_IS_VALID))
1518 update_background_ev.start (0.025); 1529 update_background_ev.start (0.025);
1519#endif 1530#endif
1520 mapped = 1; 1531 mapped = 1;
1521#ifdef TEXT_BLINK 1532#ifdef TEXT_BLINK
1522 text_blink_ev.start (); 1533 text_blink_ev.start ();
… …
1537 if (ev.xany.window == vt) 1548 if (ev.xany.window == vt)
1538 { 1549 {
1539 do 1550 do
1540 { 1551 {
1541 scr_expose (ev.xexpose.x, ev.xexpose.y, 1552 scr_expose (ev.xexpose.x, ev.xexpose.y,
1542 ev.xexpose.width, ev.xexpose.height, False); 1553 ev.xexpose.width, ev.xexpose.height, false);
1543 } 1554 }
1544 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)); 1555 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1545 1556
1546 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1557 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1547 1558
1548 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev)) 1559 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1549 { 1560 {
1550 scr_expose (ev.xexpose.x, ev.xexpose.y, 1561 scr_expose (ev.xexpose.x, ev.xexpose.y,
1551 ev.xexpose.width, ev.xexpose.height, False); 1562 ev.xexpose.width, ev.xexpose.height, false);
1552 } 1563 }
1553 1564
1554 want_refresh = 1; 1565 want_refresh = 1;
1555 } 1566 }
1556 else 1567 else
… …
1562 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event)) 1573 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1563 ; 1574 ;
1564 1575
1565 if (scrollBar.state && ev.xany.window == scrollBar.win) 1576 if (scrollBar.state && ev.xany.window == scrollBar.win)
1566 { 1577 {
1567 scrollBar.state = STATE_IDLE; 1578 scrollBar.state = SB_STATE_IDLE;
1568 scrollBar.show (0); 1579 scrollBar.show (0);
1569 } 1580 }
1570 } 1581 }
1571 break; 1582 break;
1572 1583
… …
1638 dist = int_bwidth - ev.xbutton.y; 1649 dist = int_bwidth - ev.xbutton.y;
1639 } 1650 }
1640 else 1651 else
1641 { 1652 {
1642 scroll_selection_dir = DN; 1653 scroll_selection_dir = DN;
1643 dist = ev.xbutton.y - (int_bwidth + height); 1654 dist = ev.xbutton.y - (int_bwidth + vt_height);
1644 } 1655 }
1645 1656
1646 scroll_selection_lines = Pixel2Height (dist) 1657 scroll_selection_lines = Pixel2Height (dist)
1647 / SELECTION_SCROLL_LINE_SPEEDUP 1658 / SELECTION_SCROLL_LINE_SPEEDUP
1648 + 1; 1659 + 1;
… …
1660#ifdef MOUSE_THRESHOLD 1671#ifdef MOUSE_THRESHOLD
1661 } 1672 }
1662#endif 1673#endif
1663 } 1674 }
1664 } 1675 }
1665 else if (scrollBar.state == STATE_MOTION && ev.xany.window == scrollBar.win) 1676 else if (scrollBar.state == SB_STATE_MOTION && ev.xany.window == scrollBar.win)
1666 { 1677 {
1667 while (XCheckTypedWindowEvent (dpy, scrollBar.win, 1678 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1668 MotionNotify, &ev)) 1679 MotionNotify, &ev))
1669 ; 1680 ;
1670 1681
1671 XQueryPointer (dpy, scrollBar.win, 1682 XQueryPointer (dpy, scrollBar.win,
1672 &unused_root, &unused_child, 1683 &unused_root, &unused_child,
1673 &unused_root_x, &unused_root_y, 1684 &unused_root_x, &unused_root_y,
1674 &ev.xbutton.x, &ev.xbutton.y, 1685 &ev.xbutton.x, &ev.xbutton.y,
1675 &unused_mask); 1686 &unused_mask);
1676 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1687 scr_move_to (scrollBar.position (ev.xbutton.y) - csrO,
1677 scrollBar.size ()); 1688 scrollBar.size ());
1678 want_refresh = 1; 1689 want_refresh = 1;
1679 scrollBar.show (1); 1690 scrollBar.show (1);
1680 } 1691 }
1681 break; 1692 break;
1682 } 1693 }
1683 1694
1684#if defined(CURSOR_BLINK) 1695#if defined(CURSOR_BLINK)
1685 if (option (Opt_cursorBlink) && ev.type == KeyPress) 1696 if (ev.type == KeyPress)
1686 {
1687 if (hidden_cursor)
1688 {
1689 hidden_cursor = 0;
1690 want_refresh = 1;
1691 }
1692
1693 cursor_blink_ev.again (); 1697 cursor_blink_reset ();
1694 }
1695#endif 1698#endif
1696 1699
1697#if defined(POINTER_BLANK) 1700#if defined(POINTER_BLANK)
1698 if (option (Opt_pointerBlank) && pointerBlankDelay > 0) 1701 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1699 { 1702 {
… …
1710 1713
1711 refresh_check (); 1714 refresh_check ();
1712} 1715}
1713 1716
1714#if ENABLE_FRILLS 1717#if ENABLE_FRILLS
1715void 1718void ecb_cold
1716rxvt_term::set_urgency (bool enable) 1719rxvt_term::set_urgency (bool enable)
1717{ 1720{
1718 if (enable == urgency_hint) 1721 if (enable == urgency_hint)
1719 return; 1722 return;
1720 1723
1721 if (XWMHints *h = XGetWMHints (dpy, parent[0])) 1724 if (XWMHints *h = XGetWMHints (dpy, parent))
1722 { 1725 {
1723 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0); 1726 h->flags = h->flags & ~XUrgencyHint | (enable ? XUrgencyHint : 0);
1724 XSetWMHints (dpy, parent[0], h); 1727 XSetWMHints (dpy, parent, h);
1725 urgency_hint = enable; 1728 urgency_hint = enable;
1729 XFree (h);
1726 } 1730 }
1727} 1731}
1728#endif 1732#endif
1729 1733
1730void 1734void ecb_cold
1731rxvt_term::focus_in () 1735rxvt_term::focus_in ()
1732{ 1736{
1733 if (!focus) 1737 if (!focus)
1734 { 1738 {
1735 focus = 1; 1739 focus = 1;
1736 want_refresh = 1; 1740 want_refresh = 1;
1737 1741
1738#if USE_XIM 1742#if USE_XIM
1739 if (Input_Context != NULL) 1743 if (Input_Context != NULL)
1740 { 1744 {
1741 IMSetPosition (); 1745 im_set_position ();
1742 XSetICFocus (Input_Context); 1746 XSetICFocus (Input_Context);
1743 } 1747 }
1744#endif 1748#endif
1745#if CURSOR_BLINK 1749#if CURSOR_BLINK
1746 if (option (Opt_cursorBlink)) 1750 if (option (Opt_cursorBlink))
… …
1760 1764
1761 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END)); 1765 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1762 } 1766 }
1763} 1767}
1764 1768
1765void 1769void ecb_cold
1766rxvt_term::focus_out () 1770rxvt_term::focus_out ()
1767{ 1771{
1768 if (focus) 1772 if (focus)
1769 { 1773 {
1770 focus = 0; 1774 focus = 0;
… …
1803 1807
1804 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1808 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1805 } 1809 }
1806} 1810}
1807 1811
1808void 1812void ecb_cold
1809rxvt_term::update_fade_color (unsigned int idx) 1813rxvt_term::update_fade_color (unsigned int idx)
1810{ 1814{
1811#if OFF_FOCUS_FADING 1815#if OFF_FOCUS_FADING
1812 if (rs[Rs_fade]) 1816 if (rs[Rs_fade])
1813 { 1817 {
… …
1817 } 1821 }
1818#endif 1822#endif
1819} 1823}
1820 1824
1821#if ENABLE_TRANSPARENCY || ENABLE_PERL 1825#if ENABLE_TRANSPARENCY || ENABLE_PERL
1822void 1826void ecb_hot
1823rxvt_term::rootwin_cb (XEvent &ev) 1827rxvt_term::rootwin_cb (XEvent &ev)
1824{ 1828{
1825 make_current (); 1829 make_current ();
1826 1830
1827 if (SHOULD_INVOKE (HOOK_ROOT_EVENT) 1831 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
… …
1837 * use the property to determine the pixmap. We use it later on. 1841 * use the property to determine the pixmap. We use it later on.
1838 */ 1842 */
1839 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID] 1843 if (ev.xproperty.atom == xa[XA_XROOTPMAP_ID]
1840 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID]) 1844 || ev.xproperty.atom == xa[XA_ESETROOT_PMAP_ID])
1841 { 1845 {
1842 bgPixmap.set_root_pixmap (); 1846 bg_set_root_pixmap ();
1843 update_background (); 1847 update_background ();
1844 } 1848 }
1845 1849
1846 break; 1850 break;
1847 } 1851 }
… …
1977 if (scrollBar.upButton (ev.y)) 1981 if (scrollBar.upButton (ev.y))
1978 direction = UP; /* up */ 1982 direction = UP; /* up */
1979 else if (scrollBar.dnButton (ev.y)) 1983 else if (scrollBar.dnButton (ev.y))
1980 direction = DN; /* down */ 1984 direction = DN; /* down */
1981 1985
1982 scrollBar.state = STATE_IDLE; 1986 scrollBar.state = SB_STATE_IDLE;
1983 /* 1987 /*
1984 * Rxvt-style scrollbar: 1988 * Rxvt-style scrollbar:
1985 * move up if mouse is above slider 1989 * move up if mouse is above slider
1986 * move dn if mouse is below slider 1990 * move dn if mouse is below slider
1987 * 1991 *
… …
2026 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2030 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2027#endif 2031#endif
2028 if (scr_page (direction, 1)) 2032 if (scr_page (direction, 1))
2029 { 2033 {
2030 if (direction == UP) 2034 if (direction == UP)
2031 scrollBar.state = STATE_UP; 2035 scrollBar.state = SB_STATE_UP;
2032 else 2036 else
2033 scrollBar.state = STATE_DOWN; 2037 scrollBar.state = SB_STATE_DOWN;
2034 } 2038 }
2035 } 2039 }
2036 else 2040 else
2037 switch (ev.button) 2041 switch (ev.button)
2038 { 2042 {
2039 case Button2: 2043 case Button2:
2040 switch (scrollBar.align) 2044 switch (scrollBar.align)
2041 { 2045 {
2042 case R_SB_ALIGN_TOP: 2046 case SB_ALIGN_TOP:
2043 csrO = 0; 2047 csrO = 0;
2044 break; 2048 break;
2045 case R_SB_ALIGN_CENTRE: 2049 case SB_ALIGN_CENTRE:
2046 csrO = (scrollBar.bot - scrollBar.top) / 2; 2050 csrO = (scrollBar.bot - scrollBar.top) / 2;
2047 break; 2051 break;
2048 case R_SB_ALIGN_BOTTOM: 2052 case SB_ALIGN_BOTTOM:
2049 csrO = scrollBar.bot - scrollBar.top; 2053 csrO = scrollBar.bot - scrollBar.top;
2050 break; 2054 break;
2051 } 2055 }
2052 2056
2053 if (scrollBar.style == R_SB_XTERM 2057 if (scrollBar.style == SB_STYLE_XTERM
2054 || scrollbar_above_slider (ev.y) 2058 || scrollBar.above_slider (ev.y)
2055 || scrollbar_below_slider (ev.y)) 2059 || scrollBar.below_slider (ev.y))
2056 scr_move_to (scrollbar_position (ev.y) - csrO, scrollBar.size ()); 2060 scr_move_to (scrollBar.position (ev.y) - csrO, scrollBar.size ());
2057 2061
2058 scrollBar.state = STATE_MOTION; 2062 scrollBar.state = SB_STATE_MOTION;
2059 break; 2063 break;
2060 2064
2061 case Button1: 2065 case Button1:
2062 if (scrollBar.align == R_SB_ALIGN_CENTRE) 2066 if (scrollBar.align == SB_ALIGN_CENTRE)
2063 csrO = ev.y - scrollBar.top; 2067 csrO = ev.y - scrollBar.top;
2064 /* FALLTHROUGH */ 2068 /* FALLTHROUGH */
2065 2069
2066 case Button3: 2070 case Button3:
2067 if (scrollBar.style != R_SB_XTERM) 2071 if (scrollBar.style != SB_STYLE_XTERM)
2068 { 2072 {
2069 if (scrollbar_above_slider (ev.y)) 2073 if (scrollBar.above_slider (ev.y))
2070# ifdef RXVT_SCROLL_FULL 2074# ifdef RXVT_SCROLL_FULL
2071 scr_page (UP, nrow - 1); 2075 scr_page (UP, nrow - 1);
2072# else 2076# else
2073 scr_page (UP, nrow / 4); 2077 scr_page (UP, nrow / 4);
2074# endif 2078# endif
2075 else if (scrollbar_below_slider (ev.y)) 2079 else if (scrollBar.below_slider (ev.y))
2076# ifdef RXVT_SCROLL_FULL 2080# ifdef RXVT_SCROLL_FULL
2077 scr_page (DN, nrow - 1); 2081 scr_page (DN, nrow - 1);
2078# else 2082# else
2079 scr_page (DN, nrow / 4); 2083 scr_page (DN, nrow / 4);
2080# endif 2084# endif
2081 else 2085 else
2082 scrollBar.state = STATE_MOTION; 2086 scrollBar.state = SB_STATE_MOTION;
2083 } 2087 }
2084 else 2088 else
2085 { 2089 {
2086 scr_page ((ev.button == Button1 ? DN : UP), 2090 scr_page ((ev.button == Button1 ? DN : UP),
2087 (nrow 2091 (nrow
2088 * scrollbar_position (ev.y) 2092 * scrollBar.position (ev.y)
2089 / scrollBar.size ())); 2093 / scrollBar.size ()));
2090 } 2094 }
2091 2095
2092 break; 2096 break;
2093 } 2097 }
… …
2104 2108
2105 csrO = 0; /* reset csr Offset */ 2109 csrO = 0; /* reset csr Offset */
2106 if (!bypass_keystate) 2110 if (!bypass_keystate)
2107 reportmode = !! (priv_modes & PrivMode_mouse_report); 2111 reportmode = !! (priv_modes & PrivMode_mouse_report);
2108 2112
2109 if (scrollBar.state == STATE_UP || scrollBar.state == STATE_DOWN) 2113 if (scrollBar.state == SB_STATE_UP || scrollBar.state == SB_STATE_DOWN)
2110 { 2114 {
2111 scrollBar.state = STATE_IDLE; 2115 scrollBar.state = SB_STATE_IDLE;
2112 scrollBar.show (0); 2116 scrollBar.show (0);
2113 } 2117 }
2114 2118
2115#ifdef SELECTION_SCROLLING 2119#ifdef SELECTION_SCROLLING
2116 sel_scroll_ev.stop(); 2120 sel_scroll_ev.stop();
… …
2166 case Button3: 2170 case Button3:
2167 selection_make (ev.time); 2171 selection_make (ev.time);
2168 break; 2172 break;
2169 2173
2170 case Button2: 2174 case Button2:
2171 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window? 2175 if (IN_RANGE_EXC (ev.x, 0, vt_width) && IN_RANGE_EXC (ev.y, 0, vt_height)) // inside window?
2172 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary); 2176 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2173 break; 2177 break;
2174 2178
2175#ifdef MOUSE_WHEEL 2179#ifdef MOUSE_WHEEL
2176 case Button4: 2180 case Button4:
… …
2211 } 2215 }
2212} 2216}
2213 2217
2214/*}}} */ 2218/*}}} */
2215 2219
2216void 2220void ecb_hot
2217rxvt_term::cmd_parse () 2221rxvt_term::cmd_parse ()
2218{ 2222{
2219 wchar_t ch = NOCHAR; 2223 wchar_t ch = NOCHAR;
2220 char *seq_begin; // remember start of esc-sequence here 2224 char *seq_begin; // remember start of esc-sequence here
2221 2225
2222 for (;;) 2226 for (;;)
2223 { 2227 {
2224 if (expect_false (ch == NOCHAR)) 2228 if (ecb_unlikely (ch == NOCHAR))
2225 { 2229 {
2226 seq_begin = cmdbuf_ptr; 2230 seq_begin = cmdbuf_ptr;
2227 ch = next_char (); 2231 ch = next_char ();
2228 2232
2229 if (ch == NOCHAR) 2233 if (ch == NOCHAR)
2230 break; 2234 break;
2231 } 2235 }
2232 2236
2233 if (expect_true (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)) 2237 if (ecb_likely (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT))
2234 { 2238 {
2235 if (expect_false (!seen_input)) 2239 if (ecb_unlikely (!seen_input))
2236 { 2240 {
2237 seen_input = 1; 2241 seen_input = 1;
2238 // many badly-written programs (e.g. jed) contain a race condition: 2242 // many badly-written programs (e.g. jed) contain a race condition:
2239 // they first read the screensize and then install a SIGWINCH handler. 2243 // they first read the screensize and then install a SIGWINCH handler.
2240 // some window managers resize the window early, and these programs 2244 // some window managers resize the window early, and these programs
… …
2253 wchar_t *str = buf; 2257 wchar_t *str = buf;
2254 wchar_t *eol = str + min (ncol, UBUFSIZ); 2258 wchar_t *eol = str + min (ncol, UBUFSIZ);
2255 2259
2256 for (;;) 2260 for (;;)
2257 { 2261 {
2258 if (expect_false (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))) 2262 if (ecb_unlikely (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)))
2259 break; 2263 break;
2260 2264
2261 *str++ = ch; 2265 *str++ = ch;
2262 2266
2263 if (expect_false (ch == C0_LF || str >= eol)) 2267 if (ecb_unlikely (ch == C0_LF || str >= eol))
2264 { 2268 {
2265 if (ch == C0_LF) 2269 if (ch == C0_LF)
2266 nlines++; 2270 nlines++;
2267 2271
2268 refresh_count++; 2272 refresh_count++;
… …
2340 } 2344 }
2341 } 2345 }
2342} 2346}
2343 2347
2344// read the next character 2348// read the next character
2345wchar_t 2349wchar_t ecb_hot
2346rxvt_term::next_char () NOTHROW 2350rxvt_term::next_char () NOTHROW
2347{ 2351{
2348 while (cmdbuf_ptr < cmdbuf_endp) 2352 while (cmdbuf_ptr < cmdbuf_endp)
2349 { 2353 {
2350 // assume 7-bit to be ascii ALWAYS 2354 // assume 7-bit to be ascii ALWAYS
2351 if (expect_true ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)) 2355 if (ecb_likely ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b))
2352 return *cmdbuf_ptr++; 2356 return *cmdbuf_ptr++;
2353 2357
2354 wchar_t wc; 2358 wchar_t wc;
2355 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2359 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2356 2360
… …
2374 2378
2375 return NOCHAR; 2379 return NOCHAR;
2376} 2380}
2377 2381
2378// read the next octet 2382// read the next octet
2379uint32_t 2383uint32_t ecb_hot
2380rxvt_term::next_octet () NOTHROW 2384rxvt_term::next_octet () NOTHROW
2381{ 2385{
2382 return cmdbuf_ptr < cmdbuf_endp 2386 return cmdbuf_ptr < cmdbuf_endp
2383 ? (unsigned char)*cmdbuf_ptr++ 2387 ? (unsigned char)*cmdbuf_ptr++
2384 : NOCHAR; 2388 : NOCHAR;
2385} 2389}
2386 2390
2387static class out_of_input out_of_input; 2391static class out_of_input out_of_input;
2388 2392
2389/* rxvt_cmd_getc () - Return next input character */ 2393wchar_t ecb_hot
2390/*
2391 * Return the next input character after first passing any keyboard input
2392 * to the command.
2393 */
2394wchar_t
2395rxvt_term::cmd_getc () THROW ((class out_of_input)) 2394rxvt_term::cmd_getc () THROW ((class out_of_input))
2396{ 2395{
2397 wchar_t c = next_char (); 2396 wchar_t c = next_char ();
2398 2397
2399 if (c == NOCHAR) 2398 if (c == NOCHAR)
2400 throw out_of_input; 2399 throw out_of_input;
2401 2400
2402 return c; 2401 return c;
2403} 2402}
2404 2403
2405uint32_t 2404uint32_t ecb_hot
2406rxvt_term::cmd_get8 () THROW ((class out_of_input)) 2405rxvt_term::cmd_get8 () THROW ((class out_of_input))
2407{ 2406{
2408 uint32_t c = next_octet (); 2407 uint32_t c = next_octet ();
2409 2408
2410 if (c == NOCHAR) 2409 if (c == NOCHAR)
… …
2414} 2413}
2415 2414
2416/*{{{ print pipe */ 2415/*{{{ print pipe */
2417/*----------------------------------------------------------------------*/ 2416/*----------------------------------------------------------------------*/
2418#ifdef PRINTPIPE 2417#ifdef PRINTPIPE
2419FILE * 2418FILE * ecb_cold
2420rxvt_term::popen_printer () 2419rxvt_term::popen_printer ()
2421{ 2420{
2422 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w"); 2421 FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
2423 2422
2424 if (stream == NULL) 2423 if (stream == NULL)
2425 rxvt_warn ("can't open printer pipe, not printing.\n"); 2424 rxvt_warn ("can't open printer pipe, not printing.\n");
2426 2425
2427 return stream; 2426 return stream;
2428} 2427}
2429 2428
2430int 2429int ecb_cold
2431rxvt_term::pclose_printer (FILE *stream) 2430rxvt_term::pclose_printer (FILE *stream)
2432{ 2431{
2433 fflush (stream); 2432 fflush (stream);
2434 return pclose (stream); 2433 return pclose (stream);
2435} 2434}
2436 2435
2437/* 2436/*
2438 * simulate attached vt100 printer 2437 * simulate attached vt100 printer
2439 */ 2438 */
2440void 2439void ecb_cold
2441rxvt_term::process_print_pipe () 2440rxvt_term::process_print_pipe ()
2442{ 2441{
2443 FILE *fd = popen_printer (); 2442 FILE *fd = popen_printer ();
2444 2443
2445 if (!fd) 2444 if (!fd)
… …
2491 pclose_printer (fd); 2490 pclose_printer (fd);
2492} 2491}
2493#endif /* PRINTPIPE */ 2492#endif /* PRINTPIPE */
2494/*}}} */ 2493/*}}} */
2495 2494
2496/* *INDENT-OFF* */
2497enum { 2495enum {
2498 C1_40 = 0x40, 2496 C1_40 = 0x40,
2499 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA, 2497 C1_41 , C1_BPH, C1_NBH, C1_44 , C1_NEL, C1_SSA, C1_ESA,
2500 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3, 2498 C1_HTS, C1_HTJ, C1_VTS, C1_PLD, C1_PLU, C1_RI , C1_SS2, C1_SS3,
2501 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA, 2499 C1_DCS, C1_PU1, C1_PU2, C1_STS, C1_CCH, C1_MW , C1_SPA, C1_EPA,
2502 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC, 2500 C1_SOS, C1_59 , C1_SCI, C1_CSI, CS_ST , C1_OSC, C1_PM , C1_APC,
2503}; 2501};
2504/* *INDENT-ON* */
2505 2502
2506/*{{{ process non-printing single characters */ 2503/*{{{ process non-printing single characters */
2507void 2504void ecb_hot
2508rxvt_term::process_nonprinting (unicode_t ch) 2505rxvt_term::process_nonprinting (unicode_t ch)
2509{ 2506{
2510 switch (ch) 2507 switch (ch)
2511 { 2508 {
2512 case C0_ESC: 2509 case C0_ESC:
… …
2558} 2555}
2559/*}}} */ 2556/*}}} */
2560 2557
2561 2558
2562/*{{{ process VT52 escape sequences */ 2559/*{{{ process VT52 escape sequences */
2563void 2560void ecb_cold
2564rxvt_term::process_escape_vt52 (unicode_t ch) 2561rxvt_term::process_escape_vt52 (unicode_t ch)
2565{ 2562{
2566 int row, col; 2563 int row, col;
2567 2564
2568 switch (ch) 2565 switch (ch)
… …
2602 break; 2599 break;
2603 case 'Z': /* identify the terminal type */ 2600 case 'Z': /* identify the terminal type */
2604 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */ 2601 tt_printf ("\033/Z"); /* I am a VT100 emulating a VT52 */
2605 break; 2602 break;
2606 case '<': /* turn off VT52 mode */ 2603 case '<': /* turn off VT52 mode */
2607 set_privmode (PrivMode_vt52, 0); 2604 priv_modes &= ~PrivMode_vt52;
2608 break; 2605 break;
2609 case 'F': /* use special graphics character set */ 2606 case 'F': /* use special graphics character set */
2610 case 'G': /* use regular character set */ 2607 case 'G': /* use regular character set */
2611 /* unimplemented */ 2608 /* unimplemented */
2612 break; 2609 break;
… …
2618} 2615}
2619/*}}} */ 2616/*}}} */
2620 2617
2621 2618
2622/*{{{ process escape sequences */ 2619/*{{{ process escape sequences */
2623void 2620void ecb_hot
2624rxvt_term::process_escape_seq () 2621rxvt_term::process_escape_seq ()
2625{ 2622{
2626 unicode_t ch = cmd_getc (); 2623 unicode_t ch = cmd_getc ();
2627 2624
2628 if (priv_modes & PrivMode_vt52) 2625 if (priv_modes & PrivMode_vt52)
… …
2631 return; 2628 return;
2632 } 2629 }
2633 2630
2634 switch (ch) 2631 switch (ch)
2635 { 2632 {
2636 /* case 1: do_tek_mode (); break; */
2637 case '#': 2633 case '#':
2638 if (cmd_getc () == '8') 2634 if (cmd_getc () == '8')
2639 scr_E (); 2635 scr_E ();
2640 break; 2636 break;
2641 case '(': 2637 case '(':
… …
2664#if !ENABLE_MINIMAL 2660#if !ENABLE_MINIMAL
2665 case '9': 2661 case '9':
2666 scr_forwardindex (); 2662 scr_forwardindex ();
2667 break; 2663 break;
2668#endif 2664#endif
2665 // DECPAM/DECPNM
2669 case '=': 2666 case '=':
2667 priv_modes |= PrivMode_aplKP;
2668 break;
2670 case '>': 2669 case '>':
2671 set_privmode (PrivMode_aplKP, ch == '='); 2670 priv_modes &= ~PrivMode_aplKP;
2672 break; 2671 break;
2673 2672
2674 case C1_40: 2673 case C1_40:
2675 cmd_getc (); 2674 cmd_getc ();
2676 break; 2675 break;
… …
2680 2679
2681 /* 8.3.87: NEXT LINE */ 2680 /* 8.3.87: NEXT LINE */
2682 case C1_NEL: /* ESC E */ 2681 case C1_NEL: /* ESC E */
2683 { 2682 {
2684 wchar_t nlcr[] = { C0_LF, C0_CR }; 2683 wchar_t nlcr[] = { C0_LF, C0_CR };
2685 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); 2684 scr_add_lines (nlcr, ecb_array_length (nlcr), 1);
2686 } 2685 }
2687 break; 2686 break;
2688 2687
2689 /* kidnapped escape sequence: Should be 8.3.48 */ 2688 /* kidnapped escape sequence: Should be 8.3.48 */
2690 case C1_ESA: /* ESC G */ 2689 case C1_ESA: /* ESC G */
2691 process_graphics (); 2690 // used by original rxvt for rob nations own graphics mode
2691 if (cmd_getc () == 'Q')
2692 tt_printf ("\033G0\012"); /* query graphics - no graphics */
2692 break; 2693 break;
2693 2694
2694 /* 8.3.63: CHARACTER TABULATION SET */ 2695 /* 8.3.63: CHARACTER TABULATION SET */
2695 case C1_HTS: /* ESC H */ 2696 case C1_HTS: /* ESC H */
2696 scr_set_tab (1); 2697 scr_set_tab (1);
… …
2700 case C1_RI: /* ESC M */ 2701 case C1_RI: /* ESC M */
2701 scr_index (DN); 2702 scr_index (DN);
2702 break; 2703 break;
2703 2704
2704 /* 8.3.142: SINGLE-SHIFT TWO */ 2705 /* 8.3.142: SINGLE-SHIFT TWO */
2705 /*case C1_SS2: scr_single_shift (2); break; */ 2706 /* case C1_SS2: break; */
2706 2707
2707 /* 8.3.143: SINGLE-SHIFT THREE */ 2708 /* 8.3.143: SINGLE-SHIFT THREE */
2708 /*case C1_SS3: scr_single_shift (3); break; */ 2709 /* case C1_SS3: break; */
2709 2710
2710 /* 8.3.27: DEVICE CONTROL STRING */ 2711 /* 8.3.27: DEVICE CONTROL STRING */
2711 case C1_DCS: /* ESC P */ 2712 case C1_DCS: /* ESC P */
2712 process_dcs_seq (); 2713 process_dcs_seq ();
2713 break; 2714 break;
… …
2746 } 2747 }
2747} 2748}
2748/*}}} */ 2749/*}}} */
2749 2750
2750/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */ 2751/*{{{ process CONTROL SEQUENCE INTRODUCER (CSI) sequences `ESC[' */
2751/* *INDENT-OFF* */
2752enum { 2752enum {
2753 CSI_ICH = 0x40, 2753 CSI_ICH = 0x40,
2754 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA, 2754 CSI_CUU, CSI_CUD, CSI_CUF, CSI_CUB, CSI_CNL, CSI_CPL, CSI_CHA,
2755 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA , 2755 CSI_CUP, CSI_CHT, CSI_ED , CSI_EL , CSI_IL , CSI_DL , CSI_EF , CSI_EA ,
2756 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC, 2756 CSI_DCH, CSI_SEE, CSI_CPR, CSI_SU , CSI_SD , CSI_NP , CSI_PP , CSI_CTC,
… …
2759 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ, 2759 CSI_SM , CSI_MC , CSI_HPB, CSI_VPB, CSI_RM , CSI_SGR, CSI_DSR, CSI_DAQ,
2760 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 , 2760 CSI_70 , CSI_71 , CSI_72 , CSI_73 , CSI_74 , CSI_75 , CSI_76 , CSI_77 ,
2761 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F 2761 CSI_78 , CSI_79 , CSI_7A , CSI_7B , CSI_7C , CSI_7D , CSI_7E , CSI_7F
2762}; 2762};
2763 2763
2764#define make_byte(b7,b6,b5,b4,b3,b2,b1,b0) \ 2764#define make_byte(b0,b1,b2,b3,b4,b5,b6,b7) \
2765 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \ 2765 (((b7) << 7) | ((b6) << 6) | ((b5) << 5) | ((b4) << 4) \
2766 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0)) 2766 | ((b3) << 3) | ((b2) << 2) | ((b1) << 1) | (b0))
2767#define get_byte_array_bit(array, bit) \ 2767#define get_byte_array_bit(array, bit) \
2768 (!! ((array)[ (bit) / 8] & (128 >> ((bit) & 7)))) 2768 (!! ((array)[(bit) >> 3] & (1 << ((bit) & 7))))
2769 2769
2770const unsigned char csi_defaults[] = 2770static const unsigned char csi_defaults[] =
2771 { 2771 {
2772 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */ 2772 make_byte (1,1,1,1,1,1,1,1), /* @, A, B, C, D, E, F, G, */
2773 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */ 2773 make_byte (1,1,0,0,1,1,0,0), /* H, I, J, K, L, M, N, O, */
2774 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */ 2774 make_byte (1,0,1,1,1,1,1,0), /* P, Q, R, S, T, U, V, W, */
2775 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */ 2775 make_byte (1,1,1,0,0,0,1,0), /* X, Y, Z, [, \, ], ^, _, */
2776 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */ 2776 make_byte (1,1,1,0,1,1,1,0), /* `, a, b, c, d, e, f, g, */
2777 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */ 2777 make_byte (0,0,1,1,0,0,0,0), /* h, i, j, k, l, m, n, o, */
2778 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */ 2778 make_byte (0,0,0,0,0,0,0,0), /* p, q, r, s, t, u, v, w, */
2779 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */ 2779 make_byte (0,0,0,0,0,0,0,0), /* x, y, z, {, |, }, ~, */
2780 }; 2780 };
2781/* *INDENT-ON* */
2782 2781
2783void 2782void ecb_hot
2784rxvt_term::process_csi_seq () 2783rxvt_term::process_csi_seq ()
2785{ 2784{
2786 unicode_t ch, priv, i; 2785 unicode_t ch, priv, i;
2787 unsigned int nargs, p; 2786 unsigned int nargs, p;
2788 int n, ndef; 2787 int n, ndef;
… …
2864 { 2863 {
2865 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */ 2864 /* DECSTR: soft terminal reset, used by our terminfo since 9.06 */
2866 scr_soft_reset (); 2865 scr_soft_reset ();
2867 2866
2868 static const int pm_h[] = { 7, 25 }; 2867 static const int pm_h[] = { 7, 25 };
2869 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1049 }; 2868 static const int pm_l[] = { 1, 3, 4, 5, 6, 9, 66, 1000, 1001, 1005, 1015, 1049 };
2870 2869
2871 process_terminal_mode ('h', 0, sizeof (pm_h) / sizeof (pm_h[0]), pm_h); 2870 process_terminal_mode ('h', 0, ecb_array_length (pm_h), pm_h);
2872 process_terminal_mode ('l', 0, sizeof (pm_l) / sizeof (pm_l[0]), pm_l); 2871 process_terminal_mode ('l', 0, ecb_array_length (pm_l), pm_l);
2873 } 2872 }
2874 break; 2873 break;
2875 } 2874 }
2876 2875
2877 return; 2876 return;
… …
2895 } 2894 }
2896 break; 2895 break;
2897#endif 2896#endif
2898 2897
2899 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */ 2898 case CSI_CUU: /* 8.3.22: (1) CURSOR UP */
2900 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */ 2899 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */
2901 arg[0] = -arg[0]; 2900 arg[0] = -arg[0];
2902 /* FALLTHROUGH */ 2901 /* FALLTHROUGH */
2903 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */ 2902 case CSI_CUD: /* 8.3.19: (1) CURSOR DOWN */
2904 case CSI_VPB: /* 8.3.160: (1) LINE POSITION BACKWARD */ 2903 case CSI_VPR: /* 8.3.161: (1) LINE POSITION FORWARD */
2905 scr_gotorc (arg[0], 0, RELATIVE); 2904 scr_gotorc (arg[0], 0, RELATIVE);
2906 break; 2905 break;
2907 2906
2908 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */ 2907 case CSI_CUB: /* 8.3.18: (1) CURSOR LEFT */
2909 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */ 2908 case CSI_HPB: /* 8.3.59: (1) CHARACTER POSITION BACKWARD */
… …
3096 } 3095 }
3097} 3096}
3098/*}}} */ 3097/*}}} */
3099 3098
3100#if !ENABLE_MINIMAL 3099#if !ENABLE_MINIMAL
3101/* ARGSUSED */
3102void 3100void
3103rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3101rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3104{ 3102{
3105 int x, y; 3103 int x, y;
3106 XWindowAttributes wattr; 3104 XWindowAttributes wattr;
… …
3115 { 3113 {
3116 /* 3114 /*
3117 * commands 3115 * commands
3118 */ 3116 */
3119 case 1: /* deiconify window */ 3117 case 1: /* deiconify window */
3120 XMapWindow (dpy, parent[0]); 3118 XMapWindow (dpy, parent);
3121 break; 3119 break;
3122 case 2: /* iconify window */ 3120 case 2: /* iconify window */
3123 XIconifyWindow (dpy, parent[0], display->screen); 3121 XIconifyWindow (dpy, parent, display->screen);
3124 break; 3122 break;
3125 case 3: /* set position (pixels) */ 3123 case 3: /* set position (pixels) */
3126 XMoveWindow (dpy, parent[0], args[1], args[2]); 3124 XMoveWindow (dpy, parent, args[1], args[2]);
3127 break; 3125 break;
3128 case 4: /* set size (pixels) */ 3126 case 4: /* set size (pixels) */
3129 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3127 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3130 break; 3128 break;
3131 case 5: /* raise window */ 3129 case 5: /* raise window */
3132 XRaiseWindow (dpy, parent[0]); 3130 XRaiseWindow (dpy, parent);
3133 break; 3131 break;
3134 case 6: /* lower window */ 3132 case 6: /* lower window */
3135 XLowerWindow (dpy, parent[0]); 3133 XLowerWindow (dpy, parent);
3136 break; 3134 break;
3137 case 7: /* refresh window */ 3135 case 7: /* refresh window */
3138 scr_touch (true); 3136 scr_touch (true);
3139 break; 3137 break;
3140 case 8: /* set size (chars) */ 3138 case 8: /* set size (chars) */
… …
3143 break; 3141 break;
3144 3142
3145 //case 9: NYI, TODO, restore maximized window or maximize window 3143 //case 9: NYI, TODO, restore maximized window or maximize window
3146 default: 3144 default:
3147 if (args[0] >= 24) /* set height (chars) */ 3145 if (args[0] >= 24) /* set height (chars) */
3148 set_widthheight ((unsigned int)width, 3146 set_widthheight ((unsigned int)vt_width,
3149 (unsigned int) (args[1] * fheight)); 3147 (unsigned int) (args[1] * fheight));
3150 break; 3148 break;
3151 3149
3152 /* 3150 /*
3153 * reports - some output format copied from XTerm 3151 * reports - some output format copied from XTerm
3154 */ 3152 */
3155 case 11: /* report window state */ 3153 case 11: /* report window state */
3156 XGetWindowAttributes (dpy, parent[0], &wattr); 3154 XGetWindowAttributes (dpy, parent, &wattr);
3157 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3155 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3158 break; 3156 break;
3159 case 13: /* report window position */ 3157 case 13: /* report window position */
3160 XGetWindowAttributes (dpy, parent[0], &wattr); 3158 XGetWindowAttributes (dpy, parent, &wattr);
3161 XTranslateCoordinates (dpy, parent[0], wattr.root, 3159 XTranslateCoordinates (dpy, parent, wattr.root,
3162 -wattr.border_width, -wattr.border_width, 3160 -wattr.border_width, -wattr.border_width,
3163 &x, &y, &wdummy); 3161 &x, &y, &wdummy);
3164 tt_printf ("\033[3;%d;%dt", x, y); 3162 tt_printf ("\033[3;%d;%dt", x, y);
3165 break; 3163 break;
3166 case 14: /* report window size (pixels) */ 3164 case 14: /* report window size (pixels) */
3167 XGetWindowAttributes (dpy, parent[0], &wattr); 3165 XGetWindowAttributes (dpy, parent, &wattr);
3168 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3166 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3169 break; 3167 break;
3170 case 18: /* report text area size (chars) */ 3168 case 18: /* report text area size (chars) */
3171 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3169 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3172 break; 3170 break;
… …
3174 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3172 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3175 break; 3173 break;
3176 case 20: /* report icon label */ 3174 case 20: /* report icon label */
3177 { 3175 {
3178 char *s; 3176 char *s;
3179 XGetIconName (dpy, parent[0], &s); 3177 XGetIconName (dpy, parent, &s);
3180 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3178 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3181 XFree (s); 3179 XFree (s);
3182 } 3180 }
3183 break; 3181 break;
3184 case 21: /* report window title */ 3182 case 21: /* report window title */
3185 { 3183 {
3186 char *s; 3184 char *s;
3187 XFetchName (dpy, parent[0], &s); 3185 XFetchName (dpy, parent, &s);
3188 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3186 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3189 XFree (s); 3187 XFree (s);
3190 } 3188 }
3191 break; 3189 break;
3192 } 3190 }
… …
3346 unsigned long bytes_after; 3344 unsigned long bytes_after;
3347 unsigned char *value = 0; 3345 unsigned char *value = 0;
3348 const char *str = ""; 3346 const char *str = "";
3349 3347
3350 if (prop 3348 if (prop
3351 && XGetWindowProperty (dpy, parent[0], 3349 && XGetWindowProperty (dpy, parent,
3352 prop, 0, 1<<16, 0, AnyPropertyType, 3350 prop, 0, 1<<16, 0, AnyPropertyType,
3353 &actual_type, &actual_format, 3351 &actual_type, &actual_format,
3354 &nitems, &bytes_after, &value) == Success 3352 &nitems, &bytes_after, &value) == Success
3355 && actual_type != None 3353 && actual_type != None
3356 && actual_format == 8) 3354 && actual_format == 8)
… …
3368 { 3366 {
3369 *eq = 0; 3367 *eq = 0;
3370 set_utf8_property (display->atom (str), eq + 1); 3368 set_utf8_property (display->atom (str), eq + 1);
3371 } 3369 }
3372 else 3370 else
3373 XDeleteProperty (dpy, parent[0], 3371 XDeleteProperty (dpy, parent,
3374 display->atom (str)); 3372 display->atom (str));
3375 } 3373 }
3376 break; 3374 break;
3377 3375
3378 case XTerm_Color: 3376 case XTerm_Color:
… …
3439 process_color_seq (op, Color_tint, str, resp); 3437 process_color_seq (op, Color_tint, str, resp);
3440 { 3438 {
3441 bool changed = false; 3439 bool changed = false;
3442 3440
3443 if (ISSET_PIXCOLOR (Color_tint)) 3441 if (ISSET_PIXCOLOR (Color_tint))
3444 changed = bgPixmap.set_tint (pix_colors_focused [Color_tint]); 3442 changed = root_effects.set_tint (pix_colors_focused [Color_tint]);
3445 else
3446 changed = bgPixmap.unset_tint ();
3447 3443
3448 if (changed) 3444 if (changed)
3449 update_background (); 3445 update_background ();
3450 } 3446 }
3451 3447
… …
3455#if BG_IMAGE_FROM_FILE 3451#if BG_IMAGE_FROM_FILE
3456 case Rxvt_Pixmap: 3452 case Rxvt_Pixmap:
3457 if (!strcmp (str, "?")) 3453 if (!strcmp (str, "?"))
3458 { 3454 {
3459 char str[256]; 3455 char str[256];
3456 int h_scale = 0, v_scale = 0;
3457 int h_align = 0, v_align = 0;
3458 if (image_vec.size () > 0)
3459 {
3460 h_scale = image_vec[0].h_scale;
3461 v_scale = image_vec[0].v_scale;
3462 h_align = image_vec[0].h_align;
3463 v_align = image_vec[0].v_align;
3464 }
3460 3465
3461 sprintf (str, "[%dx%d+%d+%d]", 3466 sprintf (str, "[%dx%d+%d+%d]",
3462 min (bgPixmap.h_scale, 32767), min (bgPixmap.v_scale, 32767), 3467 h_scale, v_scale,
3463 min (bgPixmap.h_align, 32767), min (bgPixmap.v_align, 32767)); 3468 h_align, v_align);
3464 process_xterm_seq (XTerm_title, str, CHAR_ST); 3469 process_xterm_seq (XTerm_title, str, CHAR_ST);
3465 } 3470 }
3466 else 3471 else
3467 { 3472 {
3468 int changed = 0; 3473 bool changed = false;
3469 3474
3470 if (*str != ';') 3475 if (*str != ';')
3471 { 3476 {
3472 if (bgPixmap.set_file (str)) /* change pixmap */ 3477 if (image_vec.size () > 0)
3478 changed = image_vec[0].set_file_geometry (str);
3479 else
3473 { 3480 {
3474 changed++; 3481 rxvt_image *image = new_image ();
3475 str = strchr (str, ';'); 3482 if (!image->set_file_geometry (str))
3476 if (str == NULL) 3483 image_vec.pop_back ();
3477 bgPixmap.set_defaultGeometry ();
3478 else 3484 else
3479 bgPixmap.set_geometry (str+1); 3485 changed = true;
3480 } 3486 }
3481 } 3487 }
3482 else 3488 else
3483 { 3489 {
3484 str++; 3490 str++;
3485 if (bgPixmap.set_geometry (str, true)) 3491 if (image_vec.size () > 0)
3486 changed++; 3492 changed = image_vec[0].set_geometry (str, true);
3487 } 3493 }
3488 3494
3489 if (changed) 3495 if (changed)
3490 { 3496 {
3491 if (bgPixmap.window_position_sensitive ()) 3497 if (bg_window_position_sensitive ())
3492 { 3498 {
3493 int x, y; 3499 int x, y;
3494 get_window_origin (x, y); 3500 get_window_origin (x, y);
3495 bgPixmap.set_position (x, y); 3501 bg_set_position (x, y);
3496 } 3502 }
3497 update_background (); 3503 update_background ();
3498 } 3504 }
3499 } 3505 }
3500 break; 3506 break;
… …
3590 * 's' = save 3596 * 's' = save
3591 * 'r' = restore 3597 * 'r' = restore
3592 * 't' = toggle 3598 * 't' = toggle
3593 * so no need for fancy checking 3599 * so no need for fancy checking
3594 */ 3600 */
3595int 3601int ecb_cold
3596rxvt_term::privcases (int mode, unsigned long bit) 3602rxvt_term::privcases (int mode, unsigned long bit)
3597{ 3603{
3598 int state; 3604 int state;
3599 3605
3600 if (mode == 's') 3606 if (mode == 's')
3601 { 3607 {
3602 SavedModes |= (priv_modes & bit); 3608 if (priv_modes & bit)
3609 SavedModes |= bit;
3610 else
3611 SavedModes &= ~bit;
3603 return -1; 3612 return -1;
3604 } 3613 }
3605 else 3614 else
3606 { 3615 {
3607 if (mode == 'r') 3616 if (mode == 'r')
3608 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */ 3617 state = (SavedModes & bit) ? 1 : 0; /* no overlapping */
3609 else 3618 else
3610 state = (mode == 't') ? ! (priv_modes & bit) : mode; 3619 state = (mode == 't') ? ! (priv_modes & bit) : mode;
3611 3620
3612 set_privmode (bit, state); 3621 if (state)
3622 priv_modes |= bit;
3623 else
3624 priv_modes &= ~bit;
3613 } 3625 }
3614 3626
3615 return state; 3627 return state;
3616} 3628}
3617 3629
3618/* we're not using priv _yet_ */ 3630/* we're not using priv _yet_ */
3619void 3631void
3620rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg) 3632rxvt_term::process_terminal_mode (int mode, int priv ecb_unused, unsigned int nargs, const int *arg)
3621{ 3633{
3622 unsigned int i, j; 3634 unsigned int i, j;
3623 int state; 3635 int state;
3624 3636
3625 static const struct 3637 static const struct
3626 { 3638 {
3627 const int argval; 3639 const int argval;
3628 const unsigned long bit; 3640 const unsigned long bit;
3629 } argtopriv[] = { 3641 } argtopriv[] = {
3630 { 1, PrivMode_aplCUR }, // DECCKM 3642 { 1, PrivMode_aplCUR }, // DECCKM
3631 { 2, PrivMode_vt52 }, 3643 { 2, PrivMode_vt52 }, // DECANM
3632 { 3, PrivMode_132 }, // DECCOLM 3644 { 3, PrivMode_132 }, // DECCOLM
3633 { 4, PrivMode_smoothScroll }, // DECSCLM 3645 { 4, PrivMode_smoothScroll }, // DECSCLM
3634 { 5, PrivMode_rVideo }, // DECSCNM 3646 { 5, PrivMode_rVideo }, // DECSCNM
3635 { 6, PrivMode_relOrigin }, // DECOM 3647 { 6, PrivMode_relOrigin }, // DECOM
3636 { 7, PrivMode_Autowrap }, // DECAWM 3648 { 7, PrivMode_Autowrap }, // DECAWM
3637 // 8, auto-repeat keys // DECARM 3649 // 8, auto-repeat keys // DECARM
3638 { 9, PrivMode_MouseX10 }, 3650 { 9, PrivMode_MouseX10 },
3639 // 18 end FF to printer after print screen 3651 // 18 end FF to printer after print screen
3640 // 19 Print screen prints full screen/scroll region 3652 // 19 Print screen prints full screen/scroll region
3641 { 25, PrivMode_VisibleCursor }, // cnorm/cvvis/civis 3653 { 25, PrivMode_VisibleCursor }, // DECTCEM cnorm/cvvis/civis
3642#ifdef scrollBar_esc 3654#ifdef scrollBar_esc
3643 { scrollBar_esc, PrivMode_scrollBar }, 3655 { scrollBar_esc, PrivMode_scrollBar },
3644#endif 3656#endif
3645 { 35, PrivMode_ShiftKeys }, // rxvt extension 3657 { 35, PrivMode_ShiftKeys }, // rxvt extension
3646 // 38, tektronix mode // DECTEK 3658 // 38, tektronix mode // DECTEK
3647 { 40, PrivMode_132OK }, 3659 { 40, PrivMode_132OK },
3648 // 41 xterm more fixes NYI 3660 // 41 xterm more fixes NYI
3649 // 45 margin bell NYI 3661 // 45 margin bell NYI
3650 // 46 start logging 3662 // 46 start logging
3651 { 47, PrivMode_Screen }, 3663 { 47, PrivMode_Screen },
3652 { 66, PrivMode_aplKP }, // DECPAM/DECPNM 3664 { 66, PrivMode_aplKP }, // DECNKM
3653#ifndef NO_BACKSPACE_KEY 3665#ifndef NO_BACKSPACE_KEY
3654 { 67, PrivMode_BackSpace }, // DECBKM 3666 { 67, PrivMode_BackSpace }, // DECBKM
3655#endif 3667#endif
3656 { 1000, PrivMode_MouseX11 }, 3668 { 1000, PrivMode_MouseX11 },
3657 { 1002, PrivMode_MouseBtnEvent }, 3669 { 1002, PrivMode_MouseBtnEvent },
3658 { 1003, PrivMode_MouseAnyEvent }, 3670 { 1003, PrivMode_MouseAnyEvent },
3671#if ENABLE_FRILLS
3672 { 1005, PrivMode_ExtModeMouse },
3673#endif
3659 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3674 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3660 { 1011, PrivMode_Keypress }, // rxvt extension 3675 { 1011, PrivMode_Keypress }, // rxvt extension
3676#if ENABLE_FRILLS
3677 { 1015, PrivMode_ExtMouseRight }, // urxvt extension of 1005
3678#endif
3661 // 1035 enable modifiers for alt, numlock NYI 3679 // 1035 enable modifiers for alt, numlock NYI
3662 // 1036 send ESC for meta keys NYI 3680 // 1036 send ESC for meta keys NYI
3663 // 1037 send DEL for keypad delete NYI 3681 // 1037 send DEL for keypad delete NYI
3664 { 1047, PrivMode_Screen }, 3682 { 1047, PrivMode_Screen },
3665 // 1048 save and restore cursor 3683 // 1048 save and restore cursor, implemented in code
3666 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */ 3684 { 1049, PrivMode_Screen }, /* xterm extension, clear screen on ti rather than te */
3667 // 1051, 1052, 1060, 1061 keyboard emulation NYI 3685 // 1051, 1052, 1060, 1061 keyboard emulation NYI
3668 { 2004, PrivMode_BracketPaste }, 3686 { 2004, PrivMode_BracketPaste },
3669 }; 3687 };
3670 3688
… …
3680 for (i = 0; i < nargs; i++) 3698 for (i = 0; i < nargs; i++)
3681 { 3699 {
3682 state = -1; 3700 state = -1;
3683 3701
3684 /* basic handling */ 3702 /* basic handling */
3685 for (j = 0; j < (sizeof (argtopriv)/sizeof (argtopriv[0])); j++) 3703 for (j = 0; j < ecb_array_length (argtopriv); j++)
3686 if (argtopriv[j].argval == arg[i]) 3704 if (argtopriv[j].argval == arg[i])
3687 { 3705 {
3688 state = privcases (mode, argtopriv[j].bit); 3706 state = privcases (mode, argtopriv[j].bit);
3689 break; 3707 break;
3690 } 3708 }
… …
3716 case 2: /* VT52 mode */ 3734 case 2: /* VT52 mode */
3717 /* oddball mode. should be set regardless of set/reset 3735 /* oddball mode. should be set regardless of set/reset
3718 * parameter. Return from VT52 mode with an ESC < from 3736 * parameter. Return from VT52 mode with an ESC < from
3719 * within VT52 mode 3737 * within VT52 mode
3720 */ 3738 */
3721 set_privmode (PrivMode_vt52, 1); 3739 priv_modes |= PrivMode_vt52;
3722 break; 3740 break;
3723 case 3: /* 80/132 */ 3741 case 3: /* 80/132 */
3724 if (priv_modes & PrivMode_132OK) 3742 if (priv_modes & PrivMode_132OK)
3725 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight); 3743 set_widthheight ((state ? 132 : 80) * fwidth, 24 * fheight);
3726 break; 3744 break;
… …
3741 if (state) /* orthogonal */ 3759 if (state) /* orthogonal */
3742 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3760 priv_modes &= ~(PrivMode_MouseX11|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3743 break; 3761 break;
3744#ifdef scrollBar_esc 3762#ifdef scrollBar_esc
3745 case scrollBar_esc: 3763 case scrollBar_esc:
3746 if (scrollBar.map (state)) 3764 scrollBar.map (state);
3747 {
3748 resize_all_windows (0, 0, 0); 3765 resize_all_windows (0, 0, 0);
3749 scr_touch (true); 3766 scr_touch (true);
3750 }
3751 break; 3767 break;
3752#endif 3768#endif
3753 case 25: /* visible/invisible cursor */ 3769 case 25: /* visible/invisible cursor */
3754 scr_cursor_visible (state); 3770 scr_cursor_visible (state);
3755 break; 3771 break;
… …
3768 case 1003: 3784 case 1003:
3769 if (state) 3785 if (state)
3770 { 3786 {
3771 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3787 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3772 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3788 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3789 mouse_row = mouse_col = 0;
3773 vt_emask_mouse = PointerMotionMask; 3790 vt_emask_mouse = PointerMotionMask;
3774 } 3791 }
3775 else 3792 else
3776 vt_emask_mouse = NoEventMask; 3793 vt_emask_mouse = NoEventMask;
3777 3794
… …
3809 } 3826 }
3810} 3827}
3811/*}}} */ 3828/*}}} */
3812 3829
3813/*{{{ process sgr sequences */ 3830/*{{{ process sgr sequences */
3814void 3831void ecb_hot
3815rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg) 3832rxvt_term::process_sgr_mode (unsigned int nargs, const int *arg)
3816{ 3833{
3817 unsigned int i; 3834 unsigned int i;
3818 short rendset; 3835 short rendset;
3819 int rendstyle; 3836 int rendstyle;
… …
3962 } 3979 }
3963 } 3980 }
3964} 3981}
3965/*}}} */ 3982/*}}} */
3966 3983
3967/*{{{ (do not) process Rob Nation's own graphics mode sequences */
3968void
3969rxvt_term::process_graphics ()
3970{
3971 unicode_t ch, cmd = cmd_getc ();
3972
3973 if (cmd == 'Q')
3974 {
3975 /* query graphics */
3976 tt_printf ("\033G0\012"); /* no graphics */
3977 return;
3978 }
3979 /* swallow other graphics sequences until terminating ':' */
3980 do
3981 ch = cmd_getc ();
3982 while (ch != ':');
3983}
3984/*}}} */
3985
3986/* ------------------------------------------------------------------------- */ 3984/* ------------------------------------------------------------------------- */
3987 3985
3988/* 3986/*
3989 * Send printf () formatted output to the command. 3987 * Send printf () formatted output to the command.
3990 * Only use for small amounts of data. 3988 * Only use for small amounts of data.
… …
4003 4001
4004/* ---------------------------------------------------------------------- */ 4002/* ---------------------------------------------------------------------- */
4005/* Write data to the pty as typed by the user, pasted with the mouse, 4003/* Write data to the pty as typed by the user, pasted with the mouse,
4006 * or generated by us in response to a query ESC sequence. 4004 * or generated by us in response to a query ESC sequence.
4007 */ 4005 */
4008const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4006static const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4009 4007
4010void 4008void
4011rxvt_term::tt_write (const char *data, unsigned int len) 4009rxvt_term::tt_write (const char *data, unsigned int len)
4012{ 4010{
4013 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) 4011 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
… …
4018 4016
4019 if (v_buflen == 0) 4017 if (v_buflen == 0)
4020 { 4018 {
4021 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE)); 4019 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4022 4020
4021 max_it (written, 0);
4022
4023 if ((unsigned int)written == len) 4023 if (written == len)
4024 return; 4024 return;
4025 4025
4026 data += written; 4026 data += written;
4027 len -= written; 4027 len -= written;
4028 } 4028 }
4029 4029
4030 v_buffer = (char *)realloc (v_buffer, v_buflen + len); 4030 v_buffer = (char *)rxvt_realloc (v_buffer, v_buflen + len);
4031 4031
4032 memcpy (v_buffer + v_buflen, data, len); 4032 memcpy (v_buffer + v_buflen, data, len);
4033 v_buflen += len; 4033 v_buflen += len;
4034 4034
4035 pty_ev.set (ev::READ | ev::WRITE); 4035 pty_ev.set (ev::READ | ev::WRITE);

Diff Legend

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