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.230 by root, Wed Jan 4 00:09:12 2006 UTC vs.
Revision 1.301 by root, Tue Jan 31 21:23:13 2006 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-2005 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
49#include "rxvt.h" 49#include "rxvt.h"
50#include "rxvtperl.h" 50#include "rxvtperl.h"
51#include "version.h" 51#include "version.h"
52#include "command.h" 52#include "command.h"
53 53
54#if HAVE_SCHED_YIELD
55# include <sched.h>
56#endif
57
58#ifdef KEYSYM_RESOURCE 54#ifdef KEYSYM_RESOURCE
59# include "keyboard.h" 55# include "keyboard.h"
60#endif 56#endif
61 57
62#include <csignal> 58#include <csignal>
63 59
64/*----------------------------------------------------------------------*/ 60/*----------------------------------------------------------------------*/
65 61
66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 62#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
67
68// exception thrown when the command parser runs out of input data
69class out_of_input { } out_of_input;
70 63
71#if ENABLE_FRILLS || ISO_14755 64#if ENABLE_FRILLS || ISO_14755
72 65
73#define ISO_14755_STARTED 0x80000000UL 66#define ISO_14755_STARTED 0x80000000UL
74#define ISO_14755_51 0x40000000UL // basic (section 5.1) 67#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
146 || !IN_RANGE_EXC (y, 0, nrow)) 139 || !IN_RANGE_EXC (y, 0, nrow))
147 return; 140 return;
148 141
149 for (;;) 142 for (;;)
150 { 143 {
151 const line_t &l = ROW(y - view_start); 144 const line_t &l = ROW(y + view_start);
152 145
153 text_t t = l.t[x]; 146 text_t t = l.t[x];
154 147
155 if (t != NOCHAR || !x) 148 if (t != NOCHAR || !x)
156 { 149 {
… …
229# if !UNICODE3 222# if !UNICODE3
230 if (ch >= 0x10000) 223 if (ch >= 0x10000)
231 ch = 0xfffd; 224 ch = 0xfffd;
232# endif 225# endif
233 scr_overlay_set (11, y, ch, r); 226 scr_overlay_set (11, y, ch, r);
227
228 if (WCWIDTH (ch) >= 2)
234 scr_overlay_set (12, y, NOCHAR, r); 229 scr_overlay_set (12, y, NOCHAR, r);
235 } 230 }
236 231
232// {
233// char buf[4+4+3+1];
234// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
235// scr_overlay_set (0, 0, buf);
236// }
237 scr_overlay_set (0, len , attr); 237 scr_overlay_set (0, len , attr);
238 scr_overlay_set (0, len + 1, fname); 238 scr_overlay_set (0, len + 1, fname);
239 239
240 free (fname); 240 free (fname);
241 241
… …
267 mb[0] = ch[0]; 267 mb[0] = ch[0];
268 len = 1; 268 len = 1;
269 } 269 }
270 270
271 if (len > 0) 271 if (len > 0)
272 tt_write ((unsigned char *)mb, len); 272 tt_write (mb, len);
273 else 273 else
274 scr_bell (); 274 scr_bell ();
275 } 275 }
276 276
277 iso14755buf = 0; 277 iso14755buf = 0;
… …
301rxvt_term::lookup_key (XKeyEvent &ev) 301rxvt_term::lookup_key (XKeyEvent &ev)
302{ 302{
303 int ctrl, meta, shft, len; 303 int ctrl, meta, shft, len;
304 unsigned int newlen; 304 unsigned int newlen;
305 KeySym keysym; 305 KeySym keysym;
306#ifdef DEBUG_CMD
307 static int debug_key = 1; /* accessible by a debugger only */
308#endif
309 int valid_keysym; 306 int valid_keysym;
310 unsigned char kbuf[KBUFSZ]; 307 char kbuf[KBUFSZ];
311 308
312 /* 309 /*
313 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 310 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
314 * escape sequence to toggle the Keypad. 311 * escape sequence to toggle the Keypad.
315 * 312 *
… …
333 Status status_return; 330 Status status_return;
334 331
335#if 0 332#if 0
336#ifdef X_HAVE_UTF8_STRING 333#ifdef X_HAVE_UTF8_STRING
337 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 334 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
338 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 335 len = Xutf8LookupString (Input_Context, &ev, kbuf,
339 KBUFSZ, &keysym, &status_return); 336 KBUFSZ, &keysym, &status_return);
340 else 337 else
341#endif 338#endif
342#endif 339#endif
343 { 340 {
… …
380 || status_return == XLookupBoth; 377 || status_return == XLookupBoth;
381 } 378 }
382 else 379 else
383#endif 380#endif
384 { 381 {
385 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 382 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
386 valid_keysym = keysym != NoSymbol; 383 valid_keysym = keysym != NoSymbol;
387 } 384 }
388 385
389 if (valid_keysym) 386 if (valid_keysym)
390 { 387 {
… …
442 scr_move_to (0, 1); 439 scr_move_to (0, 1);
443 return; 440 return;
444 } 441 }
445 else if (keysym == XK_End) 442 else if (keysym == XK_End)
446 { 443 {
447 scr_move_to (1, 0); 444 scr_move_to (1, 1);
448 return; 445 return;
449 } 446 }
450 } 447 }
451#endif 448#endif
452 } 449 }
… …
463 { 460 {
464 switch (keysym) 461 switch (keysym)
465 { 462 {
466 /* normal XTerm key bindings */ 463 /* normal XTerm key bindings */
467 case XK_Insert: /* Shift+Insert = paste mouse selection */ 464 case XK_Insert: /* Shift+Insert = paste mouse selection */
468 selection_request (ev.time, 0, 0); 465 selection_request (ev.time);
469 return; 466 return;
470#if TODO 467#if TODO
471 /* rxvt extras */ 468 /* rxvt extras */
472 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 469 case XK_KP_Add: /* Shift+KP_Add = bigger font */
473 change_font (FONT_UP); 470 change_font (FONT_UP);
… …
854 { 851 {
855#ifdef META8_OPTION 852#ifdef META8_OPTION
856 /* set 8-bit on */ 853 /* set 8-bit on */
857 if (meta && (meta_char == 0x80)) 854 if (meta && (meta_char == 0x80))
858 { 855 {
859 unsigned char *ch; 856 char *ch;
860 857
861 for (ch = kbuf; ch < kbuf + len; ch++) 858 for (ch = kbuf; ch < kbuf + len; ch++)
862 *ch |= 0x80; 859 *ch |= 0x80;
863 860
864 meta = 0; 861 meta = 0;
865 } 862 }
866#endif 863#endif
867 /* nil */ ; 864 /* nil */ ;
868 } 865 }
869 } 866 }
867
868 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
869 return;
870 870
871 if (len <= 0) 871 if (len <= 0)
872 return; /* not mapped */ 872 return; /* not mapped */
873 873
874 if (OPTION (Opt_scrollTtyKeypress)) 874 if (OPTION (Opt_scrollTtyKeypress))
… …
897#ifdef META8_OPTION 897#ifdef META8_OPTION
898 && meta_char == C0_ESC 898 && meta_char == C0_ESC
899#endif 899#endif
900 ) 900 )
901 { 901 {
902 const unsigned char ch = C0_ESC; 902 const char ch = C0_ESC;
903 tt_write (&ch, 1); 903 tt_write (&ch, 1);
904 } 904 }
905 905
906#if defined(DEBUG_CMD)
907 /* Display keyboard buffer contents */
908 unsigned char *p;
909 int i;
910
911 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
912 for (i = 0, p = kbuf; i < len; i++, p++)
913 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
914 fprintf (stderr, "'\n");
915#endif /* DEBUG_CMD */
916 tt_write (kbuf, (unsigned int)len); 906 tt_write (kbuf, (unsigned int)len);
917} 907}
918/*}}} */ 908/*}}} */
919 909
920#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 910#if defined (KEYSYM_RESOURCE)
921/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
922/* attempt to `write' count to the input buffer */
923unsigned int 911unsigned int
924rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 912rxvt_term::cmd_write (const char *str, unsigned int count)
925{ 913{
926 unsigned int n, s; 914 unsigned int n, s;
927 915
928 n = cmdbuf_ptr - cmdbuf_base; 916 n = cmdbuf_ptr - cmdbuf_base;
929 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 917 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
966 } 954 }
967#endif 955#endif
968 956
969 if (want_refresh) 957 if (want_refresh)
970 { 958 {
959 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
960 {
961 int row = view_start;
962 int end_row = row + nrow;
963
964 while (row > top_row && ROW (row - 1).is_longer ())
965 --row;
966
967 do
968 {
969 int start_row = row;
970 line_t *l;
971
972 do
973 {
974 l = &ROW (row++);
975
976 if (!(l->f & LINE_FILTERED))
977 {
978 // line not filtered, mark it as filtered
979 l->f |= LINE_FILTERED;
980 while (l->is_longer ())
981 {
982 l = &ROW (row++);
983 l->f |= LINE_FILTERED;
984 }
985
986 // and filter it
987 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
988
989 break;
990 }
991 }
992 while (l->is_longer () && row < end_row);
993 }
994 while (row < end_row);
995 }
996
971 scr_refresh (refresh_type); 997 scr_refresh ();
972 scrollbar_show (1); 998 scrollbar_show (1);
973#ifdef USE_XIM 999#ifdef USE_XIM
974 IMSendSpot (); 1000 IMSendSpot ();
975#endif 1001#endif
976 } 1002 }
… …
979} 1005}
980 1006
981void 1007void
982rxvt_term::check_cb (check_watcher &w) 1008rxvt_term::check_cb (check_watcher &w)
983{ 1009{
984 SET_R (this); 1010 make_current ();
985 SET_LOCALE (locale);
986 1011
987 display->flush (); 1012 display->flush ();
988 1013
989 if (want_refresh && !flush_ev.active) 1014 if (want_refresh && !flush_ev.active)
990 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally 1015 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
991} 1016}
992 1017
993void 1018void
994rxvt_term::flush_cb (time_watcher &w) 1019rxvt_term::flush_cb (time_watcher &w)
995{ 1020{
996 SET_R (this); 1021 make_current ();
997 SET_LOCALE (locale);
998 1022
999 refresh_limit = 1; 1023 refresh_limit = 1;
1000 refresh_count = 0; 1024 refresh_count = 0;
1001 flush (); 1025 flush ();
1002} 1026}
… …
1006rxvt_term::cursor_blink_cb (time_watcher &w) 1030rxvt_term::cursor_blink_cb (time_watcher &w)
1007{ 1031{
1008 hidden_cursor = !hidden_cursor; 1032 hidden_cursor = !hidden_cursor;
1009 want_refresh = 1; 1033 want_refresh = 1;
1010 1034
1011 w.start (w.at + BLINK_INTERVAL); 1035 w.start (w.at + CURSOR_BLINK_INTERVAL);
1012} 1036}
1013#endif 1037#endif
1014 1038
1015#ifdef TEXT_BLINK 1039#ifdef TEXT_BLINK
1016void 1040void
… …
1030rxvt_term::cont_scroll_cb (time_watcher &w) 1054rxvt_term::cont_scroll_cb (time_watcher &w)
1031{ 1055{
1032 if ((scrollbar_isUp() || scrollbar_isDn()) && 1056 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1033 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1057 scr_page (scrollbar_isUp() ? UP : DN, 1))
1034 { 1058 {
1035 refresh_type |= SMOOTH_REFRESH;
1036 want_refresh = 1; 1059 want_refresh = 1;
1037 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1060 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1038 } 1061 }
1039} 1062}
1040#endif 1063#endif
… …
1044rxvt_term::sel_scroll_cb (time_watcher &w) 1067rxvt_term::sel_scroll_cb (time_watcher &w)
1045{ 1068{
1046 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1069 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1047 { 1070 {
1048 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1071 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1049 refresh_type |= SMOOTH_REFRESH;
1050 want_refresh = 1; 1072 want_refresh = 1;
1051 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1073 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1052 } 1074 }
1053} 1075}
1054#endif 1076#endif
… …
1059{ 1081{
1060 if (mouse_slip_wheel_speed == 0 1082 if (mouse_slip_wheel_speed == 0
1061 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1083 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1062 : scr_page (UP, mouse_slip_wheel_speed)) 1084 : scr_page (UP, mouse_slip_wheel_speed))
1063 { 1085 {
1064 if (view_start == nsaved || 1086 if (view_start == top_row || view_start == 0)
1065 view_start == 0)
1066 mouse_slip_wheel_speed = 0; 1087 mouse_slip_wheel_speed = 0;
1067 1088
1068 refresh_type |= SMOOTH_REFRESH;
1069 want_refresh = 1; 1089 want_refresh = 1;
1070 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1090 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1071 } 1091 }
1072} 1092}
1073#endif 1093#endif
1074 1094
1075#if HAVE_SCHED_YIELD
1076static struct event_handler
1077{
1078 check_watcher cw_yield;
1079
1080 void yield (check_watcher &w)
1081 {
1082 sched_yield ();
1083 w.stop ();
1084 }
1085
1086 event_handler ()
1087 : cw_yield (this, &event_handler::yield)
1088 {
1089 }
1090} event_handler;
1091#endif
1092
1093bool 1095bool
1094rxvt_term::pty_fill () 1096rxvt_term::pty_fill ()
1095{ 1097{
1096 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1098 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1097 1099
1098 if (CBUFSIZ == n) 1100 if (CBUFSIZ == n)
1099 { 1101 {
1100 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1102 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1101 n = 0; 1103 n = 0;
1102 } 1104 }
1103 1105
1104 memmove (cmdbuf_base, cmdbuf_ptr, n); 1106 memmove (cmdbuf_base, cmdbuf_ptr, n);
1105 cmdbuf_ptr = cmdbuf_base; 1107 cmdbuf_ptr = cmdbuf_base;
1106 cmdbuf_endp = cmdbuf_ptr + n; 1108 cmdbuf_endp = cmdbuf_ptr + n;
1107 1109
1108 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1110 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1109 1111
1110 if (r > 0) 1112 if (r > 0)
1111 { 1113 {
1112 cmdbuf_endp += r; 1114 cmdbuf_endp += r;
1113 return true; 1115 return true;
… …
1131} 1133}
1132 1134
1133void 1135void
1134rxvt_term::pty_cb (io_watcher &w, short revents) 1136rxvt_term::pty_cb (io_watcher &w, short revents)
1135{ 1137{
1136 SET_R (this); 1138 make_current ();
1137 SET_LOCALE (locale);
1138 1139
1139 if (revents & EVENT_READ) 1140 if (revents & EVENT_READ)
1140 // loop, but don't allow a single term to monopolize us 1141 // loop, but don't allow a single term to monopolize us
1141 while (pty_fill ()) 1142 while (pty_fill ())
1142 if (cmd_parse ()) 1143 if (cmd_parse ())
… …
1147} 1148}
1148 1149
1149void 1150void
1150rxvt_term::pointer_unblank () 1151rxvt_term::pointer_unblank ()
1151{ 1152{
1152 XDefineCursor (display->display, vt, TermWin_cursor); 1153 XDefineCursor (xdisp, vt, TermWin_cursor);
1153 recolour_cursor (); 1154 recolour_cursor ();
1154 1155
1155#ifdef POINTER_BLANK 1156#ifdef POINTER_BLANK
1156 hidden_pointer = 0; 1157 hidden_pointer = 0;
1157 1158
… …
1162 1163
1163#ifdef POINTER_BLANK 1164#ifdef POINTER_BLANK
1164void 1165void
1165rxvt_term::pointer_blank () 1166rxvt_term::pointer_blank ()
1166{ 1167{
1167 if (! OPTION (Opt_pointerBlank)) 1168 if (!OPTION (Opt_pointerBlank))
1168 return; 1169 return;
1169 1170
1170 XDefineCursor (display->display, vt, display->blank_cursor); 1171 XDefineCursor (xdisp, vt, display->blank_cursor);
1171 XFlush (display->display); 1172 XFlush (xdisp);
1172 1173
1173 hidden_pointer = 1; 1174 hidden_pointer = 1;
1174} 1175}
1175 1176
1176void 1177void
1177rxvt_term::pointer_cb (time_watcher &w) 1178rxvt_term::pointer_cb (time_watcher &w)
1178{ 1179{
1179 SET_R (this); 1180 make_current ();
1180 SET_LOCALE (locale);
1181 1181
1182 pointer_blank (); 1182 pointer_blank ();
1183} 1183}
1184#endif 1184#endif
1185 1185
… …
1250 (32 + button_number + key_state), 1250 (32 + button_number + key_state),
1251 (32 + x + 1), 1251 (32 + x + 1),
1252 (32 + y + 1)); 1252 (32 + y + 1));
1253} 1253}
1254 1254
1255#ifdef USING_W11LIB
1256void
1257rxvt_W11_process_x_event (XEvent *ev)
1258{
1259 rxvt_t *r = rxvt_get_r ();
1260
1261 x_cb (*ev);
1262}
1263#endif
1264
1265/*{{{ process an X event */ 1255/*{{{ process an X event */
1266void 1256void
1267rxvt_term::x_cb (XEvent &ev) 1257rxvt_term::x_cb (XEvent &ev)
1268{ 1258{
1269 dDisp; 1259 make_current ();
1270 1260
1271 SET_R (this); 1261 dLocal (Display *, xdisp);
1272 SET_LOCALE (locale);
1273 1262
1274#if defined(CURSOR_BLINK) 1263 if (ev.xany.window == vt
1275 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1264 && SHOULD_INVOKE (HOOK_X_EVENT)
1276 { 1265 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1277 if (hidden_cursor) 1266 return;
1278 {
1279 hidden_cursor = 0;
1280 want_refresh = 1;
1281 }
1282 1267
1283 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1268 // for XQueryPointer
1284 }
1285#endif
1286
1287#if defined(POINTER_BLANK)
1288 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1289 {
1290 if (ev.type == MotionNotify
1291 || ev.type == ButtonPress
1292 || ev.type == ButtonRelease)
1293 if (hidden_pointer)
1294 pointer_unblank ();
1295
1296 if (ev.type == KeyPress && hidden_pointer == 0)
1297 pointer_blank ();
1298 }
1299#endif
1300
1301 Window unused_root, unused_child; 1269 Window unused_root, unused_child;
1302 int unused_root_x, unused_root_y; 1270 int unused_root_x, unused_root_y;
1303 unsigned int unused_mask; 1271 unsigned int unused_mask;
1304 1272
1305 switch (ev.type) 1273 switch (ev.type)
… …
1312 1280
1313 break; 1281 break;
1314 1282
1315 case KeyRelease: 1283 case KeyRelease:
1316 { 1284 {
1317#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1285#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1318 KeySym ks; 1286 KeySym keysym;
1319 1287
1320 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1288 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1321#endif 1289#endif
1322 1290
1323#if ENABLE_FRILLS || ISO_14755 1291#if ENABLE_FRILLS || ISO_14755
1324 // ISO 14755 support 1292 // ISO 14755 support
1325 if (iso14755buf) 1293 if (iso14755buf)
… …
1330# endif 1298# endif
1331# if ISO_14755 1299# if ISO_14755
1332 // iso14755 part 5.2 handling: release time 1300 // iso14755 part 5.2 handling: release time
1333 // first: controls 1301 // first: controls
1334 if ((ev.xkey.state & ControlMask) 1302 if ((ev.xkey.state & ControlMask)
1335 && ((ks >= 0x40 && ks <= 0x5f) 1303 && ((keysym >= 0x40 && keysym <= 0x5f)
1336 || (ks >= 0x61 && ks <= 0x7f))) 1304 || (keysym >= 0x61 && keysym <= 0x7f)))
1337 { 1305 {
1338 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1306 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1339 commit_iso14755 (); 1307 commit_iso14755 ();
1340 return; // case-break; 1308 goto skip_switch;
1341 } 1309 }
1342 1310
1343 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1311 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1344 if (i[0] == ks) 1312 if (i[0] == keysym)
1345 { 1313 {
1346 iso14755buf = ISO_14755_51 | i[1]; 1314 iso14755buf = ISO_14755_51 | i[1];
1347 commit_iso14755 (); 1315 commit_iso14755 ();
1348 return; // case-break; 1316 goto skip_switch;
1349 } 1317 }
1350 1318
1351 scr_bell (); 1319 scr_bell ();
1352# endif 1320# endif
1353 iso14755buf = 0; 1321 iso14755buf = 0;
… …
1372 else 1340 else
1373 iso14755buf = 0; 1341 iso14755buf = 0;
1374 } 1342 }
1375#endif 1343#endif
1376 1344
1345 if (ev.xany.window == vt
1346 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1347 break;
1348
1377#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1349#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1378 if (!(ev.xkey.state & ControlMask)) 1350 if (!(ev.xkey.state & ControlMask))
1379 slip_wheel_ev.stop (); 1351 slip_wheel_ev.stop ();
1380 else if (ks == XK_Control_L || ks == XK_Control_R) 1352 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1381 mouse_slip_wheel_speed = 0; 1353 mouse_slip_wheel_speed = 0;
1382#endif 1354#endif
1383 break; 1355 break;
1384 } 1356 }
1385 1357
… …
1391 button_release (ev.xbutton); 1363 button_release (ev.xbutton);
1392 break; 1364 break;
1393 1365
1394 case ClientMessage: 1366 case ClientMessage:
1395 if (ev.xclient.format == 32 1367 if (ev.xclient.format == 32
1396 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1368 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1397 { 1369 {
1370 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1371 {
1372 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1373 {
1398 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1374 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1375 {
1376 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1399 destroy (); 1377 destroy ();
1378 }
1400#if ENABLE_EWMH 1379#if ENABLE_EWMH
1401 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1380 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1402 XSendEvent (disp, ev.xclient.window = display->root, 1381 XSendEvent (xdisp, ev.xclient.window = display->root,
1403 False, SubstructureRedirectMask | SubstructureNotifyMask, 1382 False, SubstructureRedirectMask | SubstructureNotifyMask,
1404 &ev); 1383 &ev);
1384#endif
1385 }
1386 }
1387#if ENABLE_XEMBED
1388 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1389 {
1390 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1391 focus_in ();
1392 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1393 focus_out ();
1394 }
1405#endif 1395#endif
1406 } 1396 }
1407#if ENABLE_XEMBED
1408 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1409 {
1410 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1411 focus_in ();
1412 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1413 focus_out ();
1414 }
1415#endif
1416#ifdef OFFIX_DND
1417 /* OffiX Dnd (drag 'n' drop) protocol */
1418 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1419 && (ev.xclient.data.l[0] == DndFile
1420 || ev.xclient.data.l[0] == DndDir
1421 || ev.xclient.data.l[0] == DndLink))
1422 {
1423 /* Get Dnd data */
1424 Atom ActualType;
1425 int ActualFormat;
1426 unsigned char *data;
1427 unsigned long Size, RemainingBytes;
1428
1429 XGetWindowProperty (disp, display->root,
1430 xa[XA_DNDSELECTION],
1431 0L, 1000000L,
1432 False, AnyPropertyType,
1433 &ActualType, &ActualFormat,
1434 &Size, &RemainingBytes,
1435 &data);
1436 set_string_property (XA_CUT_BUFFER0, data);
1437 XFree (data);
1438 selection_paste (display->root, XA_CUT_BUFFER0, true);
1439 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1440 }
1441#endif /* OFFIX_DND */
1442 break; 1397 break;
1443 1398
1444 case MappingNotify: 1399 case MappingNotify:
1445 XRefreshKeyboardMapping (&ev.xmapping); 1400 XRefreshKeyboardMapping (&ev.xmapping);
1446 break; 1401 break;
… …
1479 break; 1434 break;
1480 1435
1481 case ConfigureNotify: 1436 case ConfigureNotify:
1482 if (ev.xconfigure.window == parent[0]) 1437 if (ev.xconfigure.window == parent[0])
1483 { 1438 {
1484 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1439 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1485 ; 1440 ;
1486 1441
1487 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1442 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1488 { 1443 {
1489 seen_resize = 1; 1444 seen_resize = 1;
1490 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1445 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1491 } 1446 }
1492 1447
1448 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1449
1493#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1450#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1494 if (OPTION (Opt_transparent)) 1451 if (OPTION (Opt_transparent))
1495 check_our_parents (); 1452 check_our_parents ();
1496#endif 1453#endif
1497 } 1454 }
1498 break; 1455 break;
1499 1456
1500 case PropertyNotify: 1457 case PropertyNotify:
1458 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1501 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1459 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1502 && ev.xproperty.state == PropertyNewValue) 1460 && ev.xproperty.state == PropertyNewValue)
1503 selection_property (ev.xproperty.window, ev.xproperty.atom); 1461 selection_property (ev.xproperty.window, ev.xproperty.atom);
1504 1462
1505 break; 1463 break;
1506 1464
1507 case SelectionClear: 1465 case SelectionClear:
1508 selection_clear (); 1466 selection_clear ();
… …
1513 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1471 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1514 break; 1472 break;
1515 1473
1516 case SelectionRequest: 1474 case SelectionRequest:
1517 selection_send (ev.xselectionrequest); 1475 selection_send (ev.xselectionrequest);
1476 break;
1477
1478 case MapNotify:
1479 mapped = 1;
1480#ifdef TEXT_BLINK
1481 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1482#endif
1483 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1518 break; 1484 break;
1519 1485
1520 case UnmapNotify: 1486 case UnmapNotify:
1521 mapped = 0; 1487 mapped = 0;
1522#ifdef TEXT_BLINK 1488#ifdef TEXT_BLINK
1523 text_blink_ev.stop (); 1489 text_blink_ev.stop ();
1524#endif 1490#endif
1525 break; 1491 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1526
1527 case MapNotify:
1528 mapped = 1;
1529#ifdef TEXT_BLINK
1530 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1531#endif
1532 break; 1492 break;
1533 1493
1534#ifdef TRANSPARENT 1494#ifdef TRANSPARENT
1535 case ReparentNotify: 1495 case ReparentNotify:
1536 rootwin_cb (ev); 1496 rootwin_cb (ev);
… …
1542 if (ev.xany.window == vt) 1502 if (ev.xany.window == vt)
1543 { 1503 {
1544 do 1504 do
1545 scr_expose (ev.xexpose.x, ev.xexpose.y, 1505 scr_expose (ev.xexpose.x, ev.xexpose.y,
1546 ev.xexpose.width, ev.xexpose.height, False); 1506 ev.xexpose.width, ev.xexpose.height, False);
1547 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1507 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1548 1508
1549 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1509 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1550 1510
1551 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1511 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1552 scr_expose (ev.xexpose.x, ev.xexpose.y, 1512 scr_expose (ev.xexpose.x, ev.xexpose.y,
1553 ev.xexpose.width, ev.xexpose.height, False); 1513 ev.xexpose.width, ev.xexpose.height, False);
1554 1514
1555 scr_refresh (refresh_type); 1515 want_refresh = 1;
1556 } 1516 }
1557 else 1517 else
1558 { 1518 {
1559 XEvent unused_event; 1519 XEvent unused_event;
1560 1520
1561 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1521 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1562 ; 1522 ;
1563 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1523 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1564 ; 1524 ;
1565 1525
1566 if (isScrollbarWindow (ev.xany.window)) 1526 if (isScrollbarWindow (ev.xany.window))
1567 { 1527 {
1568 scrollBar.setIdle (); 1528 scrollBar.setIdle ();
1569 scrollbar_show (0); 1529 scrollbar_show (0);
1570 } 1530 }
1571#ifdef MENUBAR
1572 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1573 menubar_expose ();
1574#endif
1575 1531
1576#ifdef TRANSPARENT 1532#ifdef TRANSPARENT
1577 if (am_transparent && ev.xany.window == parent[0]) 1533 if (am_transparent && ev.xany.window == parent[0])
1578 XClearWindow (disp, ev.xany.window); 1534 XClearWindow (xdisp, ev.xany.window);
1579#endif 1535#endif
1580 } 1536 }
1581 break; 1537 break;
1582 1538
1583 case MotionNotify: 1539 case MotionNotify:
1584#ifdef POINTER_BLANK 1540#ifdef POINTER_BLANK
1585 if (hidden_pointer) 1541 if (hidden_pointer)
1586 pointer_unblank (); 1542 pointer_unblank ();
1587#endif 1543#endif
1588#if MENUBAR
1589 if (isMenuBarWindow (ev.xany.window))
1590 {
1591 menubar_control (ev.xbutton);
1592 break;
1593 }
1594#endif
1595 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1544 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1596 break; 1545 break;
1597 1546
1598 if (ev.xany.window == vt) 1547 if (ev.xany.window == vt)
1599 { 1548 {
1549 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1550 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1551 ; // nop
1600 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1552 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1601 { 1553 {
1602 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1554 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1603 ; 1555 ;
1604 1556
1605 XQueryPointer (disp, vt, 1557 XQueryPointer (xdisp, vt,
1606 &unused_root, &unused_child, 1558 &unused_root, &unused_child,
1607 &unused_root_x, &unused_root_y, 1559 &unused_root_x, &unused_root_y,
1608 &ev.xbutton.x, &ev.xbutton.y, 1560 &ev.xbutton.x, &ev.xbutton.y,
1609 &ev.xbutton.state); 1561 &ev.xbutton.state);
1610#ifdef MOUSE_THRESHOLD 1562#ifdef MOUSE_THRESHOLD
… …
1674#endif 1626#endif
1675 } 1627 }
1676 } 1628 }
1677 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1629 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1678 { 1630 {
1679 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1631 while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1680 MotionNotify, &ev)) 1632 MotionNotify, &ev))
1681 ; 1633 ;
1682 1634
1683 XQueryPointer (disp, scrollBar.win, 1635 XQueryPointer (xdisp, scrollBar.win,
1684 &unused_root, &unused_child, 1636 &unused_root, &unused_child,
1685 &unused_root_x, &unused_root_y, 1637 &unused_root_x, &unused_root_y,
1686 &ev.xbutton.x, &ev.xbutton.y, 1638 &ev.xbutton.x, &ev.xbutton.y,
1687 &unused_mask); 1639 &unused_mask);
1688 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1640 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1689 scrollbar_size ()); 1641 scrollbar_size ());
1690 scr_refresh (refresh_type); 1642 want_refresh = 1;
1691 refresh_limit = 0; 1643 refresh_limit = 0;
1692 scrollbar_show (1); 1644 scrollbar_show (1);
1693 } 1645 }
1694 break; 1646 break;
1695 } 1647 }
1648
1649skip_switch: ;
1650
1651#if defined(CURSOR_BLINK)
1652 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1653 {
1654 if (hidden_cursor)
1655 {
1656 hidden_cursor = 0;
1657 want_refresh = 1;
1658 }
1659
1660 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1661 }
1662#endif
1663
1664#if defined(POINTER_BLANK)
1665 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1666 {
1667 if (ev.type == MotionNotify
1668 || ev.type == ButtonPress
1669 || ev.type == ButtonRelease)
1670 if (hidden_pointer)
1671 pointer_unblank ();
1672
1673 if (ev.type == KeyPress && hidden_pointer == 0)
1674 pointer_blank ();
1675 }
1676#endif
1696} 1677}
1697 1678
1698void 1679void
1699rxvt_term::focus_in () 1680rxvt_term::focus_in ()
1700{ 1681{
1701 if (!focus) 1682 if (!focus)
1702 { 1683 {
1703 focus = 1; 1684 focus = 1;
1704 want_refresh = 1; 1685 want_refresh = 1;
1705 1686
1706 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1687 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1707 1688
1708#if USE_XIM 1689#if USE_XIM
1709 if (Input_Context != NULL) 1690 if (Input_Context != NULL)
1710 { 1691 {
1711 IMSetStatusPosition (); 1692 IMSetStatusPosition ();
1712 XSetICFocus (Input_Context); 1693 XSetICFocus (Input_Context);
1713 } 1694 }
1714#endif 1695#endif
1715#if CURSOR_BLINK 1696#if CURSOR_BLINK
1716 if (OPTION (Opt_cursorBlink)) 1697 if (OPTION (Opt_cursorBlink))
1717 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1698 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1718#endif 1699#endif
1719#if OFF_FOCUS_FADING 1700#if OFF_FOCUS_FADING
1720 if (rs[Rs_fade]) 1701 if (rs[Rs_fade])
1721 { 1702 {
1722 pix_colors = pix_colors_focused; 1703 pix_colors = pix_colors_focused;
… …
1732 if (focus) 1713 if (focus)
1733 { 1714 {
1734 focus = 0; 1715 focus = 0;
1735 want_refresh = 1; 1716 want_refresh = 1;
1736 1717
1737 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1718 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1738 1719
1739#if ENABLE_FRILLS || ISO_14755 1720#if ENABLE_FRILLS || ISO_14755
1740 if (iso14755buf) 1721 if (iso14755buf)
1741 { 1722 {
1742 iso14755buf = 0; 1723 iso14755buf = 0;
… …
1766 1747
1767#if TRANSPARENT 1748#if TRANSPARENT
1768void 1749void
1769rxvt_term::rootwin_cb (XEvent &ev) 1750rxvt_term::rootwin_cb (XEvent &ev)
1770{ 1751{
1771 SET_R (this); 1752 make_current ();
1772 SET_LOCALE (locale);
1773 1753
1774 switch (ev.type) 1754 switch (ev.type)
1775 { 1755 {
1776 case PropertyNotify: 1756 case PropertyNotify:
1777 /* 1757 /*
… …
1804 /* 1784 /*
1805 * VT window processing of button press 1785 * VT window processing of button press
1806 */ 1786 */
1807 if (ev.window == vt) 1787 if (ev.window == vt)
1808 { 1788 {
1789 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1790 return;
1791
1809#if ISO_14755 1792#if ISO_14755
1810 // 5.4 1793 // 5.4
1811 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1794 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1812 { 1795 {
1813 iso14755_54 (ev.x, ev.y); 1796 iso14755_54 (ev.x, ev.y);
… …
1825#ifdef MOUSE_REPORT_DOUBLECLICK 1808#ifdef MOUSE_REPORT_DOUBLECLICK
1826 if (ev.button == MEvent.button && clickintime) 1809 if (ev.button == MEvent.button && clickintime)
1827 { 1810 {
1828 /* same button, within alloted time */ 1811 /* same button, within alloted time */
1829 MEvent.clicks++; 1812 MEvent.clicks++;
1813
1830 if (MEvent.clicks > 1) 1814 if (MEvent.clicks > 1)
1831 { 1815 {
1832 /* only report double clicks */ 1816 /* only report double clicks */
1833 MEvent.clicks = 2; 1817 MEvent.clicks = 2;
1834 mouse_report (ev); 1818 mouse_report (ev);
… …
1854 else 1838 else
1855 { 1839 {
1856 if (ev.button != MEvent.button) 1840 if (ev.button != MEvent.button)
1857 MEvent.clicks = 0; 1841 MEvent.clicks = 0;
1858 1842
1859 if (!PERL_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END)))
1860 switch (ev.button) 1843 switch (ev.button)
1861 { 1844 {
1862 case Button1: 1845 case Button1:
1863 /* allow meta + click to select rectangular areas */ 1846 /* allow meta + click to select rectangular areas */
1864 /* should be done in screen.C */ 1847 /* should be done in screen.C */
1865#if ENABLE_FRILLS 1848#if ENABLE_FRILLS
1866 selection.rect = !!(ev.state & ModMetaMask); 1849 selection.rect = !!(ev.state & ModMetaMask);
1867#else 1850#else
1868 selection.rect = false; 1851 selection.rect = false;
1869#endif 1852#endif
1870 1853
1871 /* allow shift+left click to extend selection */ 1854 /* allow shift+left click to extend selection */
1872 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1855 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1873 { 1856 {
1874 if (MEvent.button == Button1 && clickintime) 1857 if (MEvent.button == Button1 && clickintime)
1875 selection_rotate (ev.x, ev.y); 1858 selection_rotate (ev.x, ev.y);
1876 else 1859 else
1877 selection_extend (ev.x, ev.y, 1); 1860 selection_extend (ev.x, ev.y, 1);
1878 } 1861 }
1879 else 1862 else
1880 { 1863 {
1881 if (MEvent.button == Button1 && clickintime) 1864 if (MEvent.button == Button1 && clickintime)
1882 MEvent.clicks++; 1865 MEvent.clicks++;
1883 else 1866 else
1884 MEvent.clicks = 1; 1867 MEvent.clicks = 1;
1885 1868
1886 selection_click (MEvent.clicks, ev.x, ev.y); 1869 selection_click (MEvent.clicks, ev.x, ev.y);
1887 } 1870 }
1888 1871
1889 MEvent.button = Button1; 1872 MEvent.button = Button1;
1890 break; 1873 break;
1891 1874
1892 case Button3: 1875 case Button3:
1893 if (MEvent.button == Button3 && clickintime) 1876 if (MEvent.button == Button3 && clickintime)
1894 selection_rotate (ev.x, ev.y); 1877 selection_rotate (ev.x, ev.y);
1895 else 1878 else
1896 selection_extend (ev.x, ev.y, 1); 1879 selection_extend (ev.x, ev.y, 1);
1897 1880
1898 MEvent.button = Button3; 1881 MEvent.button = Button3;
1899 break; 1882 break;
1900 } 1883 }
1901 } 1884 }
1902 1885
1903 MEvent.time = ev.time; 1886 MEvent.time = ev.time;
1904 return; 1887 return;
1905 } 1888 }
1906 1889
… …
2042 } 2025 }
2043 2026
2044 break; 2027 break;
2045 } 2028 }
2046 } 2029 }
2030
2047 return; 2031 return;
2048 } 2032 }
2049#if MENUBAR
2050 /*
2051 * Menubar window processing of button press
2052 */
2053 if (isMenuBarWindow (ev.window))
2054 menubar_control (ev);
2055#endif
2056} 2033}
2057 2034
2058void 2035void
2059rxvt_term::button_release (XButtonEvent &ev) 2036rxvt_term::button_release (XButtonEvent &ev)
2060{ 2037{
… …
2066 2043
2067 if (scrollbar_isUpDn ()) 2044 if (scrollbar_isUpDn ())
2068 { 2045 {
2069 scrollBar.setIdle (); 2046 scrollBar.setIdle ();
2070 scrollbar_show (0); 2047 scrollbar_show (0);
2071#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2072 refresh_type &= ~SMOOTH_REFRESH;
2073#endif
2074 } 2048 }
2075 2049
2076#ifdef SELECTION_SCROLLING 2050#ifdef SELECTION_SCROLLING
2077 if (sel_scroll_ev.active) 2051 if (sel_scroll_ev.active)
2078 sel_scroll_ev.stop(); 2052 sel_scroll_ev.stop();
2079#endif 2053#endif
2080 2054
2081 if (ev.window == vt) 2055 if (ev.window == vt)
2082 { 2056 {
2057 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2058 return;
2059
2083#if ISO_14755 2060#if ISO_14755
2084 // 5.4 2061 // 5.4
2085 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2062 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2086 return; 2063 return;
2087#endif 2064#endif
2065
2088 if (reportmode) 2066 if (reportmode)
2089 { 2067 {
2090 /* mouse report from vt window */ 2068 /* mouse report from vt window */
2091 /* don't report release of wheel "buttons" */ 2069 /* don't report release of wheel "buttons" */
2092 if (ev.button >= 4) 2070 if (ev.button >= 4)
… …
2122 { 2100 {
2123 case Button1: 2101 case Button1:
2124 case Button3: 2102 case Button3:
2125 selection_make (ev.time); 2103 selection_make (ev.time);
2126 break; 2104 break;
2105
2127 case Button2: 2106 case Button2:
2128 selection_request (ev.time, ev.x, ev.y); 2107 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2108 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2129 break; 2109 break;
2110
2130#ifdef MOUSE_WHEEL 2111#ifdef MOUSE_WHEEL
2131 case Button4: 2112 case Button4:
2132 case Button5: 2113 case Button5:
2133 { 2114 {
2134 int i; 2115 int i;
… …
2156 slip_wheel_ev.start (); 2137 slip_wheel_ev.start ();
2157 } 2138 }
2158 else 2139 else
2159 { 2140 {
2160# endif 2141# endif
2161# ifdef JUMP_MOUSE_WHEEL
2162 scr_page (v, i); 2142 scr_page (v, i);
2163 scr_refresh (SMOOTH_REFRESH);
2164 scrollbar_show (1); 2143 scrollbar_show (1);
2165# else
2166 while (i--)
2167 {
2168 scr_page (v, 1);
2169 scr_refresh (SMOOTH_REFRESH);
2170 scrollbar_show (1);
2171 }
2172# endif
2173# ifdef MOUSE_SLIP_WHEELING 2144# ifdef MOUSE_SLIP_WHEELING
2174 } 2145 }
2175#endif 2146# endif
2176 } 2147 }
2177 break; 2148 break;
2178#endif 2149#endif
2179 } 2150 }
2180 } 2151 }
2181#ifdef MENUBAR
2182 else if (isMenuBarWindow (ev.window))
2183 menubar_control (ev);
2184#endif
2185} 2152}
2186 2153
2187#ifdef TRANSPARENT 2154#ifdef TRANSPARENT
2188#if TINTING 2155#if TINTING
2189/* taken from aterm-0.4.2 */ 2156/* taken from aterm-0.4.2 */
2190 2157
2191typedef uint32_t RUINT32T; 2158typedef uint32_t RUINT32T;
2192 2159
2193void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2160void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2194{ 2161{
2195 int sh_r, sh_g, sh_b; 2162 int sh_r, sh_g, sh_b;
2196 RUINT32T mask_r, mask_g, mask_b; 2163 RUINT32T mask_r, mask_g, mask_b;
2197 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2164 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2198 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2165 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2199 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2166 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2200 int i; 2167 int i;
2201 2168
2202 Visual *visual = display->visual; 2169 Visual *visual = term->visual;
2203 2170
2204 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2171 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2205 2172
2206 /* for convenience */ 2173 /* for convenience */
2207 mask_r = visual->red_mask; 2174 mask_r = visual->red_mask;
… …
2428 Atom atype; 2395 Atom atype;
2429 unsigned char *prop = NULL; 2396 unsigned char *prop = NULL;
2430 Window root, oldp, *list; 2397 Window root, oldp, *list;
2431 Pixmap rootpixmap = None; 2398 Pixmap rootpixmap = None;
2432 XWindowAttributes wattr, wrootattr; 2399 XWindowAttributes wattr, wrootattr;
2433 dDisp;
2434 2400
2435 pchanged = 0; 2401 pchanged = 0;
2436 2402
2437 if (!OPTION (Opt_transparent)) 2403 if (!OPTION (Opt_transparent))
2438 return pchanged; /* Don't try any more */ 2404 return pchanged; /* Don't try any more */
2439 2405
2440 XGetWindowAttributes (disp, display->root, &wrootattr); 2406 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2441 rootdepth = wrootattr.depth; 2407 rootdepth = wrootattr.depth;
2442 2408
2443 XGetWindowAttributes (disp, parent[0], &wattr); 2409 XGetWindowAttributes (xdisp, parent[0], &wattr);
2444 2410
2445 if (rootdepth != wattr.depth) 2411 if (rootdepth != wattr.depth)
2446 { 2412 {
2447 if (am_transparent) 2413 if (am_transparent)
2448 { 2414 {
2449 pchanged = 1; 2415 pchanged = 1;
2450 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2416 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2451 am_transparent = am_pixmap_trans = 0; 2417 am_transparent = am_pixmap_trans = 0;
2452 } 2418 }
2453 2419
2454 return pchanged; /* Don't try any more */ 2420 return pchanged; /* Don't try any more */
2455 } 2421 }
2456 2422
2457 /* Get all X ops out of the queue so that our information is up-to-date. */ 2423 /* Get all X ops out of the queue so that our information is up-to-date. */
2458 XSync (disp, False); 2424 XSync (xdisp, False);
2459 2425
2460 /* 2426 /*
2461 * Make the frame window set by the window manager have 2427 * Make the frame window set by the window manager have
2462 * the root background. Some window managers put multiple nested frame 2428 * the root background. Some window managers put multiple nested frame
2463 * windows for each client, so we have to take care about that. 2429 * windows for each client, so we have to take care about that.
2464 */ 2430 */
2465 i = (xa[XA_XROOTPMAP_ID] 2431 i = (xa[XA_XROOTPMAP_ID]
2466 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2432 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2467 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2433 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2468 &nitems, &bytes_after, &prop) == Success); 2434 &nitems, &bytes_after, &prop) == Success);
2469 2435
2470 if (!i || prop == NULL) 2436 if (!i || prop == NULL)
2471 i = (xa[XA_ESETROOT_PMAP_ID] 2437 i = (xa[XA_ESETROOT_PMAP_ID]
2472 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2438 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2473 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2439 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2474 &nitems, &bytes_after, &prop) == Success); 2440 &nitems, &bytes_after, &prop) == Success);
2475 2441
2476 if (!i || prop == NULL 2442 if (!i || prop == NULL
2477#if TINTING 2443#if TINTING
2478 || !rs[Rs_color + Color_tint] 2444 || !ISSET_PIXCOLOR (Color_tint)
2479#endif 2445#endif
2480 ) 2446 )
2481 have_pixmap = 0; 2447 have_pixmap = 0;
2482 else 2448 else
2483 { 2449 {
… …
2496 Window cr; 2462 Window cr;
2497 XImage *image; 2463 XImage *image;
2498 GC gc; 2464 GC gc;
2499 XGCValues gcvalue; 2465 XGCValues gcvalue;
2500 2466
2501 XTranslateCoordinates (disp, parent[0], display->root, 2467 XTranslateCoordinates (xdisp, parent[0], display->root,
2502 0, 0, &sx, &sy, &cr); 2468 0, 0, &sx, &sy, &cr);
2503 nw = (unsigned int)szHint.width; 2469 nw = (unsigned int)szHint.width;
2504 nh = (unsigned int)szHint.height; 2470 nh = (unsigned int)szHint.height;
2505 nx = ny = 0; 2471 nx = ny = 0;
2506 2472
… …
2519 } 2485 }
2520 2486
2521 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2487 min_it (nw, (unsigned int) (wrootattr.width - sx));
2522 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2488 min_it (nh, (unsigned int) (wrootattr.height - sy));
2523 2489
2524 XSync (disp, False); 2490 XSync (xdisp, False);
2525 allowedxerror = -1; 2491 allowedxerror = -1;
2526 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2492 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2527 2493
2528 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2494 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2529 /* XXX: may need a delay here? */ 2495 /* XXX: may need a delay here? */
2530 allowedxerror = 0; 2496 allowedxerror = 0;
2531 2497
… …
2534 if (am_transparent && am_pixmap_trans) 2500 if (am_transparent && am_pixmap_trans)
2535 { 2501 {
2536 pchanged = 1; 2502 pchanged = 1;
2537 if (pixmap != None) 2503 if (pixmap != None)
2538 { 2504 {
2539 XFreePixmap (disp, pixmap); 2505 XFreePixmap (xdisp, pixmap);
2540 pixmap = None; 2506 pixmap = None;
2541 } 2507 }
2542 } 2508 }
2543 2509
2544 am_pixmap_trans = 0; 2510 am_pixmap_trans = 0;
2545 } 2511 }
2546 else 2512 else
2547 { 2513 {
2548 if (pixmap != None) 2514 if (pixmap != None)
2549 XFreePixmap (disp, pixmap); 2515 XFreePixmap (xdisp, pixmap);
2550 2516
2551#if TINTING 2517#if TINTING
2552 if (ISSET_PIXCOLOR (Color_tint)) 2518 if (ISSET_PIXCOLOR (Color_tint))
2553 { 2519 {
2554 unsigned short rm, gm, bm;
2555 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2520 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2556 2521
2522 rgba c;
2557 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2523 pix_colors_focused [Color_tint].get (c);
2558 2524
2559 ShadeXImage (display, image, shade, rm, gm, bm); 2525 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2560 } 2526 }
2561#endif 2527#endif
2562 2528
2563 pixmap = XCreatePixmap (disp, vt, 2529 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2564 szHint.width, szHint.height, image->depth);
2565 gc = XCreateGC (disp, vt, 0UL, &gcvalue); 2530 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2566 XPutImage (disp, pixmap, gc, image, 0, 0, 2531 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2567 nx, ny, image->width, image->height); 2532 nx, ny, image->width, image->height);
2568 XFreeGC (disp, gc); 2533 XFreeGC (xdisp, gc);
2569 XDestroyImage (image); 2534 XDestroyImage (image);
2570 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2535 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2571 XClearWindow (disp, parent[0]); 2536 XClearWindow (xdisp, parent[0]);
2572 2537
2573 if (!am_transparent || !am_pixmap_trans) 2538 if (!am_transparent || !am_pixmap_trans)
2574 pchanged = 1; 2539 pchanged = 1;
2575 2540
2576 am_transparent = am_pixmap_trans = 1; 2541 am_transparent = am_pixmap_trans = 1;
2577 } 2542 }
2578 } 2543 }
2579 2544
2580 if (am_pixmap_trans) 2545 if (am_pixmap_trans)
2581 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2546 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2582 else 2547 else
2583 { 2548 {
2584 unsigned int n; 2549 unsigned int n;
2585 /* 2550 /*
2586 * InheritPixmap transparency 2551 * InheritPixmap transparency
2587 */ 2552 */
2588 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2553 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2589 { 2554 {
2590 oldp = parent[i]; 2555 oldp = parent[i];
2591 XQueryTree (disp, parent[i - 1], &root, 2556 XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2592 &parent[i], &list, &n);
2593 XFree (list); 2557 XFree (list);
2594 2558
2595 if (parent[i] == display->root) 2559 if (parent[i] == display->root)
2596 { 2560 {
2597 if (oldp != None) 2561 if (oldp != None)
… …
2605 } 2569 }
2606 2570
2607 n = 0; 2571 n = 0;
2608 2572
2609 if (pchanged) 2573 if (pchanged)
2610 {
2611 for (; n < (unsigned int)i; n++) 2574 for (; n < (unsigned int)i; n++)
2612 { 2575 {
2613 XGetWindowAttributes (disp, parent[n], &wattr); 2576 XGetWindowAttributes (xdisp, parent[n], &wattr);
2577
2614 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2578 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2615 { 2579 {
2616 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2580 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2617 break; 2581 break;
2618 } 2582 }
2619 } 2583 }
2620 }
2621 2584
2622 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2585 if (n > (sizeof (parent) / sizeof (parent[0])))
2623 { 2586 {
2624 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2587 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2625 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2588 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2626 am_transparent = 0; 2589 am_transparent = 0;
2627 /* XXX: also turn off Opt_transparent? */ 2590 /* XXX: also turn off Opt_transparent? */
2628 } 2591 }
2629 else 2592 else
2630 { 2593 {
2631#if WAIT_FOR_WM
2632 /* wait (an arbitrary period) for the WM to do its thing
2633 * needed for fvwm2.2.2 (and before?) */
2634 sleep (1);
2635#endif
2636 for (n = 0; n < (unsigned int)i; n++) 2594 for (n = 0; n < (unsigned int)i; n++)
2637 { 2595 {
2638 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2596 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2639 XClearWindow (disp, parent[n]); 2597 XClearWindow (xdisp, parent[n]);
2640 } 2598 }
2641 2599
2642 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2600 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2643 am_transparent = 1; 2601 am_transparent = 1;
2644 } 2602 }
2645 2603
2646 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2604 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2647 parent[i] = None; 2605 parent[i] = None;
2648 } 2606 }
2649 2607
2650 if (scrollBar.win) 2608 if (scrollBar.win)
2651 { 2609 {
2652 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2610 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2653 scrollBar.setIdle (); 2611 scrollBar.setIdle ();
2654 scrollbar_show (0); 2612 scrollbar_show (0);
2655 } 2613 }
2656 2614
2657 if (am_transparent) 2615 if (am_transparent)
… …
2669 2627
2670bool 2628bool
2671rxvt_term::cmd_parse () 2629rxvt_term::cmd_parse ()
2672{ 2630{
2673 bool flag = false; 2631 bool flag = false;
2674 unicode_t ch = NOCHAR; 2632 wchar_t ch = NOCHAR;
2675 unsigned char *seq_begin; // remember start of esc-sequence here 2633 char *seq_begin; // remember start of esc-sequence here
2676 2634
2677 for (;;) 2635 for (;;)
2678 { 2636 {
2679 if (ch == NOCHAR) 2637 if (ch == NOCHAR)
2680 { 2638 {
2681 seq_begin = cmdbuf_ptr; 2639 seq_begin = cmdbuf_ptr;
2682 ch = next_char (); 2640 ch = next_char ();
2683 }
2684 2641
2685 if (ch == NOCHAR) // TODO: improve 2642 if (ch == NOCHAR)
2686 break; 2643 break;
2644 }
2687 2645
2688 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2646 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2689 { 2647 {
2690 if (!seen_input) 2648 if (!seen_input)
2691 { 2649 {
… …
2700 if (seen_resize && cmd_pid) 2658 if (seen_resize && cmd_pid)
2701 kill (-cmd_pid, SIGWINCH); 2659 kill (-cmd_pid, SIGWINCH);
2702 } 2660 }
2703 2661
2704 /* Read a text string from the input buffer */ 2662 /* Read a text string from the input buffer */
2705 unicode_t buf[UBUFSIZ]; 2663 wchar_t buf[UBUFSIZ];
2706 bool refreshnow = false; 2664 bool refreshnow = false;
2707 int nlines = 0; 2665 int nlines = 0;
2708 unicode_t *str = buf; 2666 wchar_t *str = buf;
2709 unicode_t *eol = str + min (ncol, UBUFSIZ); 2667 wchar_t *eol = str + min (ncol, UBUFSIZ);
2710 2668
2711 for (;;) 2669 for (;;)
2712 { 2670 {
2713 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2671 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2714 break; 2672 break;
… …
2732 } 2690 }
2733 2691
2734 // scr_add_lines only works for nlines <= nrow - 1. 2692 // scr_add_lines only works for nlines <= nrow - 1.
2735 if (nlines >= nrow - 1) 2693 if (nlines >= nrow - 1)
2736 { 2694 {
2695 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2696 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2737 scr_add_lines (buf, nlines, str - buf); 2697 scr_add_lines (buf, str - buf, nlines);
2698
2738 nlines = 0; 2699 nlines = 0;
2739 str = buf; 2700 str = buf;
2740 eol = str + min (ncol, UBUFSIZ); 2701 eol = str + min (ncol, UBUFSIZ);
2741 } 2702 }
2742 2703
… …
2755 2716
2756 seq_begin = cmdbuf_ptr; 2717 seq_begin = cmdbuf_ptr;
2757 ch = next_char (); 2718 ch = next_char ();
2758 } 2719 }
2759 2720
2721 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2722 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2760 scr_add_lines (buf, nlines, str - buf); 2723 scr_add_lines (buf, str - buf, nlines);
2761 2724
2762 /* 2725 /*
2763 * If there have been a lot of new lines, then update the screen 2726 * If there have been a lot of new lines, then update the screen
2764 * What the heck I'll cheat and only refresh less than every page-full. 2727 * What the heck I'll cheat and only refresh less than every page-full.
2765 * the number of pages between refreshes is refresh_limit, which 2728 * the number of pages between refreshes is refresh_limit, which
… …
2770 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2733 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2771 refresh_limit++; 2734 refresh_limit++;
2772 else 2735 else
2773 { 2736 {
2774 flag = true; 2737 flag = true;
2775 scr_refresh (refresh_type); 2738 scr_refresh ();
2776 flush_ev.stop (); 2739 want_refresh = 1;
2777 } 2740 }
2778 } 2741 }
2779 2742
2780 } 2743 }
2781 else 2744 else
… …
2796 } 2759 }
2797 2760
2798 return flag; 2761 return flag;
2799} 2762}
2800 2763
2801// read the next octet
2802unicode_t
2803rxvt_term::next_octet ()
2804{
2805 return cmdbuf_ptr < cmdbuf_endp
2806 ? *cmdbuf_ptr++
2807 : NOCHAR;
2808}
2809
2810// read the next character 2764// read the next character
2811unicode_t 2765wchar_t
2812rxvt_term::next_char () 2766rxvt_term::next_char () NOTHROW
2813{ 2767{
2814 while (cmdbuf_ptr < cmdbuf_endp) 2768 while (cmdbuf_ptr < cmdbuf_endp)
2815 { 2769 {
2816 // assume 7-bit to be ascii ALWAYS 2770 // assume 7-bit to be ascii ALWAYS
2817 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2771 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2818 return *cmdbuf_ptr++; 2772 return *cmdbuf_ptr++;
2819 2773
2820 wchar_t wc; 2774 wchar_t wc;
2821 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2775 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2822 2776
2823 if (len == (size_t)-2) 2777 if (len == (size_t)-2)
2824 { 2778 {
2825 // the mbstate stores incomplete sequences. didn't know this :/ 2779 // the mbstate stores incomplete sequences. didn't know this :/
2826 cmdbuf_ptr = cmdbuf_endp; 2780 cmdbuf_ptr = cmdbuf_endp;
2827 break; 2781 break;
2828 } 2782 }
2829 2783
2830 if (len == (size_t)-1) 2784 if (len == (size_t)-1)
2831 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2785 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2832 2786
2833 // assume wchar == unicode 2787 // assume wchar == unicode
2834 cmdbuf_ptr += len; 2788 cmdbuf_ptr += len;
2835 return wc & UNICODE_MASK; 2789 return wc & UNICODE_MASK;
2836 } 2790 }
2837 2791
2838 return NOCHAR; 2792 return NOCHAR;
2839} 2793}
2794
2795// read the next octet
2796uint32_t
2797rxvt_term::next_octet () NOTHROW
2798{
2799 return cmdbuf_ptr < cmdbuf_endp
2800 ? (unsigned char)*cmdbuf_ptr++
2801 : NOCHAR;
2802}
2803
2804static class out_of_input out_of_input;
2840 2805
2841/* rxvt_cmd_getc () - Return next input character */ 2806/* rxvt_cmd_getc () - Return next input character */
2842/* 2807/*
2843 * Return the next input character after first passing any keyboard input 2808 * Return the next input character after first passing any keyboard input
2844 * to the command. 2809 * to the command.
2845 */ 2810 */
2846unicode_t 2811wchar_t
2847rxvt_term::cmd_getc () 2812rxvt_term::cmd_getc () THROW ((class out_of_input))
2848{ 2813{
2849 unicode_t c = next_char (); 2814 wchar_t c = next_char ();
2850 2815
2851 if (c == NOCHAR) 2816 if (c == NOCHAR)
2852 throw out_of_input; 2817 throw out_of_input;
2853 2818
2854 return c; 2819 return c;
2855} 2820}
2856 2821
2857unicode_t 2822uint32_t
2858rxvt_term::cmd_get8 () 2823rxvt_term::cmd_get8 () THROW ((class out_of_input))
2859{ 2824{
2860 unicode_t c = next_octet (); 2825 uint32_t c = next_octet ();
2861 2826
2862 if (c == NOCHAR) 2827 if (c == NOCHAR)
2863 throw out_of_input; 2828 throw out_of_input;
2864 2829
2865 return c; 2830 return c;
… …
2965 case C0_ESC: 2930 case C0_ESC:
2966 process_escape_seq (); 2931 process_escape_seq ();
2967 break; 2932 break;
2968 case C0_ENQ: /* terminal Status */ 2933 case C0_ENQ: /* terminal Status */
2969 if (rs[Rs_answerbackstring]) 2934 if (rs[Rs_answerbackstring])
2970 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2935 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2971 (unsigned int)strlen (rs[Rs_answerbackstring]));
2972 else 2936 else
2973 tt_write ((unsigned char *)VT100_ANS, 2937 tt_write (VT100_ANS, strlen (VT100_ANS));
2974 (unsigned int)strlen (VT100_ANS));
2975 break; 2938 break;
2976 case C0_BEL: /* bell */ 2939 case C0_BEL: /* bell */
2977 scr_bell (); 2940 scr_bell ();
2978 break; 2941 break;
2979 case C0_BS: /* backspace */ 2942 case C0_BS: /* backspace */
… …
3103 scr_charset_set (2, (unsigned int)cmd_getc ()); 3066 scr_charset_set (2, (unsigned int)cmd_getc ());
3104 break; 3067 break;
3105 case '+': 3068 case '+':
3106 scr_charset_set (3, (unsigned int)cmd_getc ()); 3069 scr_charset_set (3, (unsigned int)cmd_getc ());
3107 break; 3070 break;
3108#if ENABLE_FRILLS 3071#if !ENABLE_MINIMAL
3109 case '6': 3072 case '6':
3110 scr_backindex (); 3073 scr_backindex ();
3111 break; 3074 break;
3112#endif 3075#endif
3113 case '7': 3076 case '7':
3114 scr_cursor (SAVE); 3077 scr_cursor (SAVE);
3115 break; 3078 break;
3116 case '8': 3079 case '8':
3117 scr_cursor (RESTORE); 3080 scr_cursor (RESTORE);
3118 break; 3081 break;
3119#if ENABLE_FRILLS 3082#if !ENABLE_MINIMAL
3120 case '9': 3083 case '9':
3121 scr_forwardindex (); 3084 scr_forwardindex ();
3122 break; 3085 break;
3123#endif 3086#endif
3124 case '=': 3087 case '=':
… …
3134 break; 3097 break;
3135 3098
3136 /* 8.3.87: NEXT LINE */ 3099 /* 8.3.87: NEXT LINE */
3137 case C1_NEL: /* ESC E */ 3100 case C1_NEL: /* ESC E */
3138 { 3101 {
3139 unicode_t nlcr[] = { C0_LF, C0_CR }; 3102 wchar_t nlcr[] = { C0_LF, C0_CR };
3140 scr_add_lines (nlcr, 1, 2); 3103 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3141 } 3104 }
3142 break; 3105 break;
3143 3106
3144 /* kidnapped escape sequence: Should be 8.3.48 */ 3107 /* kidnapped escape sequence: Should be 8.3.48 */
3145 case C1_ESA: /* ESC G */ 3108 case C1_ESA: /* ESC G */
… …
3167 process_dcs_seq (); 3130 process_dcs_seq ();
3168 break; 3131 break;
3169 3132
3170 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3133 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3171 case C1_SCI: /* ESC Z */ 3134 case C1_SCI: /* ESC Z */
3172 tt_write ((const unsigned char *)ESCZ_ANSWER, 3135 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3173 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3174 break; /* steal obsolete ESC [ c */ 3136 break; /* steal obsolete ESC [ c */
3175 3137
3176 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3138 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3177 case C1_CSI: /* ESC [ */ 3139 case C1_CSI: /* ESC [ */
3178 process_csi_seq (); 3140 process_csi_seq ();
… …
3287 ndef = get_byte_array_bit (csi_defaults, i); 3249 ndef = get_byte_array_bit (csi_defaults, i);
3288 for (p = 0; p < nargs; p++) 3250 for (p = 0; p < nargs; p++)
3289 if (arg[p] == -1) 3251 if (arg[p] == -1)
3290 arg[p] = ndef; 3252 arg[p] = ndef;
3291 3253
3292#ifdef DEBUG_CMD
3293 fprintf (stderr, "CSI ");
3294 for (p = 0; p < nargs; p++)
3295 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3296 fprintf (stderr, "%c\n", ch);
3297#endif
3298
3299 /* 3254 /*
3300 * private mode handling 3255 * private mode handling
3301 */ 3256 */
3302 if (priv) 3257 if (priv)
3303 { 3258 {
3304 switch (priv) 3259 switch (priv)
3305 { 3260 {
3306 case '>': 3261 case '>':
3307 if (ch == CSI_DA) /* secondary device attributes */ 3262 if (ch == CSI_DA) /* secondary device attributes */
3308 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 3263 {
3264 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3265 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3266 //
3267 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3268 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3269 // that we do not support xterm mouse reporting (should be 95 when we do).
3270 //
3271 tt_printf ("\033[>%d;94;0c", 'U');
3272 }
3309 break; 3273 break;
3310 case '?': 3274 case '?':
3311 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3275 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3312 process_terminal_mode (ch, priv, nargs, arg); 3276 process_terminal_mode (ch, priv, nargs, arg);
3313 break; 3277 break;
… …
3422 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3386 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3423 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3387 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3424 break; 3388 break;
3425 3389
3426 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3390 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3427 tt_write ((const unsigned char *)VT100_ANS, 3391 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3428 (unsigned int) (sizeof (VT100_ANS) - 1));
3429 break; 3392 break;
3430 3393
3431 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3394 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3432 process_sgr_mode (nargs, arg); 3395 process_sgr_mode (nargs, arg);
3433 break; 3396 break;
… …
3517 break; 3480 break;
3518 case CSI_75: 3481 case CSI_75:
3519 scr_cursor (RESTORE); 3482 scr_cursor (RESTORE);
3520 break; 3483 break;
3521 3484
3522#if ENABLE_FRILLS 3485#if !ENABLE_MINIMAL
3523 case CSI_74: 3486 case CSI_74:
3524 process_window_ops (arg, nargs); 3487 process_window_ops (arg, nargs);
3525 break; 3488 break;
3526#endif 3489#endif
3527 3490
… …
3534 break; 3497 break;
3535 } 3498 }
3536} 3499}
3537/*}}} */ 3500/*}}} */
3538 3501
3539#if ENABLE_FRILLS 3502#if !ENABLE_MINIMAL
3540/* ARGSUSED */ 3503/* ARGSUSED */
3541void 3504void
3542rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3505rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3543{ 3506{
3544 int x, y; 3507 int x, y;
3545 XWindowAttributes wattr; 3508 XWindowAttributes wattr;
3546 Window wdummy; 3509 Window wdummy;
3547 dDisp; 3510
3511 dLocal (Display *, xdisp);
3548 3512
3549 if (nargs == 0) 3513 if (nargs == 0)
3550 return; 3514 return;
3551 3515
3552 switch (args[0]) 3516 switch (args[0])
3553 { 3517 {
3554 /* 3518 /*
3555 * commands 3519 * commands
3556 */ 3520 */
3557 case 1: /* deiconify window */ 3521 case 1: /* deiconify window */
3558 XMapWindow (disp, parent[0]); 3522 XMapWindow (xdisp, parent[0]);
3559 break; 3523 break;
3560 case 2: /* iconify window */ 3524 case 2: /* iconify window */
3561 XIconifyWindow (disp, parent[0], display->screen); 3525 XIconifyWindow (xdisp, parent[0], display->screen);
3562 break; 3526 break;
3563 case 3: /* set position (pixels) */ 3527 case 3: /* set position (pixels) */
3564 XMoveWindow (disp, parent[0], args[1], args[2]); 3528 XMoveWindow (xdisp, parent[0], args[1], args[2]);
3565 break; 3529 break;
3566 case 4: /* set size (pixels) */ 3530 case 4: /* set size (pixels) */
3567 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3531 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3568 break; 3532 break;
3569 case 5: /* raise window */ 3533 case 5: /* raise window */
3570 XRaiseWindow (disp, parent[0]); 3534 XRaiseWindow (xdisp, parent[0]);
3571 break; 3535 break;
3572 case 6: /* lower window */ 3536 case 6: /* lower window */
3573 XLowerWindow (disp, parent[0]); 3537 XLowerWindow (xdisp, parent[0]);
3574 break; 3538 break;
3575 case 7: /* refresh window */ 3539 case 7: /* refresh window */
3576 scr_touch (true); 3540 scr_touch (true);
3577 break; 3541 break;
3578 case 8: /* set size (chars) */ 3542 case 8: /* set size (chars) */
… …
3585 if (args[0] >= 24) /* set height (chars) */ 3549 if (args[0] >= 24) /* set height (chars) */
3586 set_widthheight ((unsigned int)width, 3550 set_widthheight ((unsigned int)width,
3587 (unsigned int) (args[1] * fheight)); 3551 (unsigned int) (args[1] * fheight));
3588 break; 3552 break;
3589 3553
3590
3591 /* 3554 /*
3592 * reports - some output format copied from XTerm 3555 * reports - some output format copied from XTerm
3593 */ 3556 */
3594 case 11: /* report window state */ 3557 case 11: /* report window state */
3595 XGetWindowAttributes (disp, parent[0], &wattr); 3558 XGetWindowAttributes (xdisp, parent[0], &wattr);
3596 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3559 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3597 break; 3560 break;
3598 case 13: /* report window position */ 3561 case 13: /* report window position */
3599 XGetWindowAttributes (disp, parent[0], &wattr); 3562 XGetWindowAttributes (xdisp, parent[0], &wattr);
3600 XTranslateCoordinates (disp, parent[0], wattr.root, 3563 XTranslateCoordinates (xdisp, parent[0], wattr.root,
3601 -wattr.border_width, -wattr.border_width, 3564 -wattr.border_width, -wattr.border_width,
3602 &x, &y, &wdummy); 3565 &x, &y, &wdummy);
3603 tt_printf ("\033[3;%d;%dt", x, y); 3566 tt_printf ("\033[3;%d;%dt", x, y);
3604 break; 3567 break;
3605 case 14: /* report window size (pixels) */ 3568 case 14: /* report window size (pixels) */
3606 XGetWindowAttributes (disp, parent[0], &wattr); 3569 XGetWindowAttributes (xdisp, parent[0], &wattr);
3607 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3570 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3608 break; 3571 break;
3609 case 18: /* report text area size (chars) */ 3572 case 18: /* report text area size (chars) */
3610 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3573 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3611 break; 3574 break;
… …
3613 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3576 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3614 break; 3577 break;
3615 case 20: /* report icon label */ 3578 case 20: /* report icon label */
3616 { 3579 {
3617 char *s; 3580 char *s;
3618 XGetIconName (disp, parent[0], &s); 3581 XGetIconName (xdisp, parent[0], &s);
3619 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3582 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3620 XFree (s); 3583 XFree (s);
3621 } 3584 }
3622 break; 3585 break;
3623 case 21: /* report window title */ 3586 case 21: /* report window title */
3624 { 3587 {
3625 char *s; 3588 char *s;
3626 XFetchName (disp, parent[0], &s); 3589 XFetchName (xdisp, parent[0], &s);
3627 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3590 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3628 XFree (s); 3591 XFree (s);
3629 } 3592 }
3630 break; 3593 break;
3631 } 3594 }
… …
3635/*----------------------------------------------------------------------*/ 3598/*----------------------------------------------------------------------*/
3636/* 3599/*
3637 * get input up until STRING TERMINATOR (or BEL) 3600 * get input up until STRING TERMINATOR (or BEL)
3638 * ends_how is terminator used. returned input must be free()'d 3601 * ends_how is terminator used. returned input must be free()'d
3639 */ 3602 */
3640unsigned char * 3603char *
3641rxvt_term::get_to_st (unicode_t &ends_how) 3604rxvt_term::get_to_st (unicode_t &ends_how)
3642{ 3605{
3643 unicode_t ch; 3606 unicode_t ch;
3644 bool seen_esc = false; 3607 bool seen_esc = false;
3645 unsigned int n = 0; 3608 unsigned int n = 0;
… …
3678 3641
3679 string[n++] = '\0'; 3642 string[n++] = '\0';
3680 3643
3681 ends_how = (ch == 0x5c ? C0_ESC : ch); 3644 ends_how = (ch == 0x5c ? C0_ESC : ch);
3682 3645
3683 return (unsigned char *)rxvt_wcstombs (string); 3646 return rxvt_wcstombs (string);
3684} 3647}
3685 3648
3686/*----------------------------------------------------------------------*/ 3649/*----------------------------------------------------------------------*/
3687/* 3650/*
3688 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3651 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3689 */ 3652 */
3690void 3653void
3691rxvt_term::process_dcs_seq () 3654rxvt_term::process_dcs_seq ()
3692{ 3655{
3693 unsigned char *s; 3656 char *s;
3694 unicode_t eh; 3657 unicode_t eh;
3695 3658
3696 /* 3659 /*
3697 * Not handled yet 3660 * Not handled yet
3698 */ 3661 */
… …
3717 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3680 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3718 arg = arg * 10 + (ch - '0'); 3681 arg = arg * 10 + (ch - '0');
3719 3682
3720 if (ch == ';') 3683 if (ch == ';')
3721 { 3684 {
3722 unsigned char *s = get_to_st (eh); 3685 char *s = get_to_st (eh);
3723 3686
3724 if (s) 3687 if (s)
3725 { 3688 {
3726 process_xterm_seq (arg, (char *)s, eh); 3689 process_xterm_seq (arg, s, eh);
3727 free (s); 3690 free (s);
3728 } 3691 }
3729 } 3692 }
3730} 3693}
3731 3694
3732void 3695void
3733rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3696rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3734{ 3697{
3735 if (str[0] == '?' && !str[1]) 3698 if (str[0] == '?' && !str[1])
3736 { 3699 {
3737 unsigned short r, g, b; 3700 rgba c;
3738 pix_colors_focused[color].get (display, r, g, b); 3701 pix_colors_focused[color].get (c);
3702
3703#if XFT
3704 if (c.a != rgba::MAX_CC)
3705 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3706 else
3707#endif
3739 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3708 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3740 } 3709 }
3741 else 3710 else
3742 set_window_color (color, str); 3711 set_window_color (color, str);
3743} 3712}
3744 3713
3745/* 3714/*
3746 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3715 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3747 */ 3716 */
3748void 3717void
3749rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3718rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3750{ 3719{
3751 int changed = 0;
3752 int color; 3720 int color;
3753 char *buf, *name; 3721 char *buf, *name;
3754 bool query = str[0] == '?' && !str[1]; 3722 bool query = str[0] == '?' && !str[1];
3755 int saveop = op; 3723 int saveop = op;
3756 dDisp; 3724
3725 dLocal (Display *, xdisp);
3757 3726
3758 assert (str != NULL); 3727 assert (str != NULL);
3759 switch (op) 3728 switch (op)
3760 { 3729 {
3761 case XTerm_name: 3730 case XTerm_name:
… …
3777 unsigned long bytes_after; 3746 unsigned long bytes_after;
3778 unsigned char *value = 0; 3747 unsigned char *value = 0;
3779 const char *str = ""; 3748 const char *str = "";
3780 3749
3781 if (prop 3750 if (prop
3782 && XGetWindowProperty (disp, parent[0], 3751 && XGetWindowProperty (xdisp, parent[0],
3783 prop, 0, 1<<16, 0, AnyPropertyType, 3752 prop, 0, 1<<16, 0, AnyPropertyType,
3784 &actual_type, &actual_format, 3753 &actual_type, &actual_format,
3785 &nitems, &bytes_after, &value) == Success 3754 &nitems, &bytes_after, &value) == Success
3786 && actual_type != None 3755 && actual_type != None
3787 && actual_format == 8) 3756 && actual_format == 8)
3788 str = (const char *)(value); 3757 str = (const char *)(value);
3789 3758
3790 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3759 tt_printf ("\033]%d;%s%c", op, str, resp);
3791 3760
3792 XFree (value); 3761 XFree (value);
3793 } 3762 }
3794 else 3763 else
3795 { 3764 {
… …
3799 { 3768 {
3800 *eq = 0; 3769 *eq = 0;
3801 set_utf8_property (display->atom (str), eq + 1); 3770 set_utf8_property (display->atom (str), eq + 1);
3802 } 3771 }
3803 else 3772 else
3804 XDeleteProperty (disp, parent[0], 3773 XDeleteProperty (xdisp, parent[0],
3805 display->atom (str)); 3774 display->atom (str));
3806 } 3775 }
3807 break; 3776 break;
3808 3777
3809 case XTerm_Color: 3778 case XTerm_Color:
… …
3811 { 3780 {
3812 if ((name = strchr (buf, ';')) == NULL) 3781 if ((name = strchr (buf, ';')) == NULL)
3813 break; 3782 break;
3814 3783
3815 *name++ = '\0'; 3784 *name++ = '\0';
3816 color = atoi (buf); 3785 color = atoi (buf) + minCOLOR;
3817 3786
3818 if (color < 0 || color >= TOTAL_COLORS) 3787 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3819 break; 3788 break;
3820 3789
3821 if ((buf = strchr (name, ';')) != NULL) 3790 if ((buf = strchr (name, ';')) != NULL)
3822 *buf++ = '\0'; 3791 *buf++ = '\0';
3823 3792
3824 if (name[0] == '?' && !name[1]) 3793 process_color_seq (op, color, name, resp);
3825 {
3826 unsigned short r, g, b;
3827 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3828 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3829 }
3830 else
3831 set_window_color (color + minCOLOR, name);
3832 } 3794 }
3833 break; 3795 break;
3834 case XTerm_Color00: 3796 case XTerm_Color00:
3835 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3797 process_color_seq (op, Color_fg, str, resp);
3836 break; 3798 break;
3837 case XTerm_Color01: 3799 case XTerm_Color01:
3838 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3800 process_color_seq (op, Color_bg, str, resp);
3839 break; 3801 break;
3840#ifndef NO_CURSORCOLOR 3802#ifndef NO_CURSORCOLOR
3841 case XTerm_Color_cursor: 3803 case XTerm_Color_cursor:
3842 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3804 process_color_seq (op, Color_cursor, str, resp);
3843 break; 3805 break;
3844#endif 3806#endif
3845 case XTerm_Color_pointer_fg: 3807 case XTerm_Color_pointer_fg:
3846 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3808 process_color_seq (op, Color_pointer_fg, str, resp);
3847 break; 3809 break;
3848 case XTerm_Color_pointer_bg: 3810 case XTerm_Color_pointer_bg:
3849 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3811 process_color_seq (op, Color_pointer_bg, str, resp);
3850 break; 3812 break;
3851#ifndef NO_BOLD_UNDERLINE_REVERSE 3813#ifndef NO_BOLD_UNDERLINE_REVERSE
3852 case XTerm_Color_BD:
3853 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3854 break;
3855 case XTerm_Color_UL:
3856 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3857 break;
3858 case XTerm_Color_RV: 3814 case XTerm_Color_RV:
3859 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3815 process_color_seq (op, Color_RV, str, resp);
3816 break;
3817 case Rxvt_Color_BD:
3818 case URxvt_Color_BD:
3819 process_color_seq (op, Color_BD, str, resp);
3820 break;
3821 case Rxvt_Color_UL:
3822 case URxvt_Color_UL:
3823 process_color_seq (op, Color_UL, str, resp);
3860 break; 3824 break;
3861 case URxvt_Color_IT: 3825 case URxvt_Color_IT:
3862 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3826 process_color_seq (op, Color_IT, str, resp);
3863 break; 3827 break;
3864#endif 3828#endif
3865#if TRANSPARENT && TINTING 3829#if TRANSPARENT && TINTING
3866 case URxvt_Color_tint: 3830 case URxvt_Color_tint:
3867 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3831 process_color_seq (op, Color_tint, str, resp);
3832
3868 check_our_parents (); 3833 check_our_parents ();
3834
3869 if (am_transparent) 3835 if (am_transparent)
3870 want_full_refresh = want_refresh = 1; 3836 want_full_refresh = want_refresh = 1;
3871 break;
3872#endif
3873 3837
3838 break;
3839#endif
3840
3874 case XTerm_Pixmap: 3841 case Rxvt_Pixmap:
3842 {
3875 if (*str != ';') 3843 if (*str != ';')
3876 { 3844 {
3877#if XPM_BACKGROUND 3845#if XPM_BACKGROUND
3878 scale_pixmap (""); /* reset to default scaling */ 3846 scale_pixmap (""); /* reset to default scaling */
3879 set_bgPixmap (str); /* change pixmap */ 3847 set_bgPixmap (str); /* change pixmap */
3880#endif
3881 scr_touch (true); 3848 scr_touch (true);
3849#endif
3882 } 3850 }
3851
3852 int changed = 0;
3853
3883 while ((str = strchr (str, ';')) != NULL) 3854 while ((str = strchr (str, ';')) != NULL)
3884 { 3855 {
3885 str++; 3856 str++;
3886#if XPM_BACKGROUND 3857#if XPM_BACKGROUND
3887 changed += scale_pixmap (str); 3858 changed += scale_pixmap (str);
3888#endif 3859#endif
3889 } 3860 }
3890 3861
3891 if (changed) 3862 if (changed)
3892 { 3863 {
3893#ifdef XPM_BACKGROUND 3864#ifdef XPM_BACKGROUND
3894 resize_pixmap (); 3865 resize_pixmap ();
3895#endif
3896 scr_touch (true); 3866 scr_touch (true);
3867#endif
3897 } 3868 }
3869 }
3898 break; 3870 break;
3899 3871
3900 case XTerm_restoreFG: 3872 case Rxvt_restoreFG:
3901 set_window_color (Color_fg, str); 3873 set_window_color (Color_fg, str);
3902 break; 3874 break;
3903 case XTerm_restoreBG: 3875 case Rxvt_restoreBG:
3904 set_window_color (Color_bg, str); 3876 set_window_color (Color_bg, str);
3905 break; 3877 break;
3906 3878
3907 case XTerm_logfile: 3879 case XTerm_logfile:
3908 // TODO, when secure mode? 3880 // TODO, when secure mode?
3909 break; 3881 break;
3910 3882
3911#ifdef MENUBAR
3912 case URxvt_Menu:
3913 if (OPTION (Opt_insecure))
3914 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3915 break;
3916#endif
3917#if 0 3883#if 0
3918 case XTerm_dumpscreen: /* no error notices */ 3884 case Rxvt_dumpscreen: /* no error notices */
3919 { 3885 {
3920 int fd; 3886 int fd;
3921 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3887 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3922 { 3888 {
3923 scr_dump (fd); 3889 scr_dump (fd);
… …
3947 allocated.push_back ((void *)res); 3913 allocated.push_back ((void *)res);
3948 set_fonts (); 3914 set_fonts ();
3949 } 3915 }
3950 break; 3916 break;
3951 3917
3952#if ENABLE_FRILLS 3918 case URxvt_version:
3919 if (query)
3920 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3921 op,
3922 rs[Rs_name], VERSION[0], VERSION[2],
3923 resp);
3924 break;
3925
3926#if !ENABLE_MINIMAL
3953 case URxvt_locale: 3927 case URxvt_locale:
3954 if (query) 3928 if (query)
3955 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3929 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3956 else 3930 else
3957 { 3931 {
3958 set_locale (str); 3932 set_locale (str);
3959 pty.set_utf8_mode (enc_utf8); 3933 pty->set_utf8_mode (enc_utf8);
3960 init_xlocale (); 3934 init_xlocale ();
3961 } 3935 }
3962 break; 3936 break;
3963 3937
3964 case URxvt_view_up: 3938 case URxvt_view_up:
3965 case URxvt_view_down: 3939 case URxvt_view_down:
3940 {
3966 int lines = atoi (str); 3941 int lines = atoi (str);
3967 3942
3968 if (lines) 3943 if (lines)
3969 scr_page (op == URxvt_view_up ? UP : DN, lines); 3944 scr_page (op == URxvt_view_up ? UP : DN, lines);
3970 else 3945 else
3971 scr_erase_savelines (); 3946 scr_erase_savelines ();
3947 }
3972 3948
3973 break; 3949 break;
3974#endif 3950#endif
3975 3951
3976#if ENABLE_PERL 3952#if ENABLE_PERL
3977 case URxvt_perl: 3953 case URxvt_perl:
3978 if (PERL_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END))) 3954 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3979 ; // no responses yet 3955 ; // no responses yet
3980 break; 3956 break;
3981
3982#endif 3957#endif
3983
3984 } 3958 }
3985} 3959}
3986/*----------------------------------------------------------------------*/ 3960/*----------------------------------------------------------------------*/
3987 3961
3988/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3962/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
4017 return state; 3991 return state;
4018} 3992}
4019 3993
4020/* we're not using priv _yet_ */ 3994/* we're not using priv _yet_ */
4021void 3995void
4022rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3996rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4023{ 3997{
4024 unsigned int i, j; 3998 unsigned int i, j;
4025 int state; 3999 int state;
4026 4000
4027 static const struct 4001 static const struct
… …
4038 { 5, PrivMode_rVideo }, 4012 { 5, PrivMode_rVideo },
4039 { 6, PrivMode_relOrigin }, 4013 { 6, PrivMode_relOrigin },
4040 { 7, PrivMode_Autowrap }, 4014 { 7, PrivMode_Autowrap },
4041 // 8, bi-directional support mode 4015 // 8, bi-directional support mode
4042 { 9, PrivMode_MouseX10 }, 4016 { 9, PrivMode_MouseX10 },
4043#ifdef menuBar_esc
4044 { menuBar_esc, PrivMode_menuBar },
4045#endif
4046 // 18, 19 printing-related 4017 // 18, 19 printing-related
4047 { 25, PrivMode_VisibleCursor }, 4018 { 25, PrivMode_VisibleCursor },
4048#ifdef scrollBar_esc 4019#ifdef scrollBar_esc
4049 { scrollBar_esc, PrivMode_scrollBar }, 4020 { scrollBar_esc, PrivMode_scrollBar },
4050#endif 4021#endif
… …
4097 /* extra handling for values with state unkept */ 4068 /* extra handling for values with state unkept */
4098 switch (arg[i]) 4069 switch (arg[i])
4099 { 4070 {
4100#if ENABLE_STYLES 4071#if ENABLE_STYLES
4101 case 1021: 4072 case 1021:
4102 if (mode) 4073 set_option (Opt_intensityStyles, mode);
4103 SET_OPTION (Opt_intensityStyles);
4104 else
4105 CLR_OPTION (Opt_intensityStyles);
4106 4074
4107 scr_touch (true); 4075 scr_touch (true);
4108 break; 4076 break;
4109#endif 4077#endif
4110 case 1048: /* alternative cursor save */ 4078 case 1048: /* alternative cursor save */
… …
4132 case 3: /* 80/132 */ 4100 case 3: /* 80/132 */
4133 if (priv_modes & PrivMode_132OK) 4101 if (priv_modes & PrivMode_132OK)
4134 set_widthheight (((state ? 132 : 80) * fwidth), height); 4102 set_widthheight (((state ? 132 : 80) * fwidth), height);
4135 break; 4103 break;
4136 case 4: /* smooth scrolling */ 4104 case 4: /* smooth scrolling */
4137 if (!state) 4105 set_option (Opt_jumpScroll, !state);
4138 SET_OPTION (Opt_jumpScroll);
4139 else
4140 CLR_OPTION (Opt_jumpScroll);
4141 break; 4106 break;
4142 case 5: /* reverse video */ 4107 case 5: /* reverse video */
4143 scr_rvideo_mode (state); 4108 scr_rvideo_mode (state);
4144 break; 4109 break;
4145 case 6: /* relative/absolute origins */ 4110 case 6: /* relative/absolute origins */
… …
4151 /* case 8: - auto repeat, can't do on a per window basis */ 4116 /* case 8: - auto repeat, can't do on a per window basis */
4152 case 9: /* X10 mouse reporting */ 4117 case 9: /* X10 mouse reporting */
4153 if (state) /* orthogonal */ 4118 if (state) /* orthogonal */
4154 priv_modes &= ~PrivMode_MouseX11; 4119 priv_modes &= ~PrivMode_MouseX11;
4155 break; 4120 break;
4156#ifdef menuBar_esc
4157 case menuBar_esc:
4158#ifdef MENUBAR
4159 map_menuBar (state);
4160#endif
4161 break;
4162#endif
4163#ifdef scrollBar_esc 4121#ifdef scrollBar_esc
4164 case scrollBar_esc: 4122 case scrollBar_esc:
4165 if (scrollbar_mapping (state)) 4123 if (scrollbar_mapping (state))
4166 { 4124 {
4167 resize_all_windows (0, 0, 0); 4125 resize_all_windows (0, 0, 0);
… …
4186#if 0 4144#if 0
4187 case 1001: 4145 case 1001:
4188 break; /* X11 mouse highlighting */ 4146 break; /* X11 mouse highlighting */
4189#endif 4147#endif
4190 case 1010: /* scroll to bottom on TTY output inhibit */ 4148 case 1010: /* scroll to bottom on TTY output inhibit */
4191 if (!state) 4149 set_option (Opt_scrollTtyOutput, !state);
4192 SET_OPTION (Opt_scrollTtyOutput);
4193 else
4194 CLR_OPTION (Opt_scrollTtyOutput);
4195 break; 4150 break;
4196 case 1011: /* scroll to bottom on key press */ 4151 case 1011: /* scroll to bottom on key press */
4197 if (state) 4152 set_option (Opt_scrollTtyKeypress, state);
4198 SET_OPTION (Opt_scrollTtyKeypress);
4199 else
4200 CLR_OPTION (Opt_scrollTtyKeypress);
4201 break; 4153 break;
4202 case 1047: /* secondary screen w/ clearing last */ 4154 case 1047: /* secondary screen w/ clearing last */
4203 if (OPTION (Opt_secondaryScreen)) 4155 if (OPTION (Opt_secondaryScreen))
4204 if (current_screen != PRIMARY) 4156 if (current_screen != PRIMARY)
4205 scr_erase_screen (2); 4157 scr_erase_screen (2);
… …
4343 scr_color (Color_bg, Color_bg); 4295 scr_color (Color_bg, Color_bg);
4344 break; 4296 break;
4345 4297
4346 //case 50: // not variable spacing 4298 //case 50: // not variable spacing
4347 4299
4348#ifndef NO_BRIGHTCOLOR 4300#if !ENABLE_MINIMAL
4349 case 90: 4301 case 90:
4350 case 91: /* set bright fg color */ 4302 case 91: /* set bright fg color */
4351 case 92: 4303 case 92:
4352 case 93: 4304 case 93:
4353 case 94: 4305 case 94:
… …
4398 */ 4350 */
4399void 4351void
4400rxvt_term::tt_printf (const char *fmt,...) 4352rxvt_term::tt_printf (const char *fmt,...)
4401{ 4353{
4402 va_list arg_ptr; 4354 va_list arg_ptr;
4403 unsigned char buf[256]; 4355 char buf[256];
4404 4356
4405 va_start (arg_ptr, fmt); 4357 va_start (arg_ptr, fmt);
4406 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4358 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4407 va_end (arg_ptr); 4359 va_end (arg_ptr);
4408 tt_write (buf, strlen (buf)); 4360 tt_write (buf, strlen (buf));
… …
4413 * or generated by us in response to a query ESC sequence. 4365 * or generated by us in response to a query ESC sequence.
4414 */ 4366 */
4415const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4367const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4416 4368
4417void 4369void
4418rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4370rxvt_term::tt_write (const char *data, unsigned int len)
4419{ 4371{
4372 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4373 return;
4374
4375 if (pty->pty < 0)
4376 return;
4377
4420 if (v_buflen == 0) 4378 if (v_buflen == 0)
4421 { 4379 {
4422 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4380 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4423 4381
4424 if ((unsigned int)written == len) 4382 if ((unsigned int)written == len)
4425 return; 4383 return;
4426 4384
4427 data += written; 4385 data += written;
4428 len -= written; 4386 len -= written;
4429 } 4387 }
4430 4388
4431 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4389 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4432 4390
4433 memcpy (v_buffer + v_buflen, data, len); 4391 memcpy (v_buffer + v_buflen, data, len);
4434 v_buflen += len; 4392 v_buflen += len;
4435 4393
4436 pty_ev.set (EVENT_READ | EVENT_WRITE); 4394 pty_ev.set (EVENT_READ | EVENT_WRITE);
4437} 4395}
4438 4396
4439void rxvt_term::pty_write () 4397void rxvt_term::pty_write ()
4440{ 4398{
4441 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4399 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4442 4400
4443 if (written > 0) 4401 if (written > 0)
4444 { 4402 {
4445 v_buflen -= written; 4403 v_buflen -= written;
4446 4404

Diff Legend

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