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.305 by root, Thu Feb 2 18:04:45 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
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
63
64/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
65 65
66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#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 67
71#if ENABLE_FRILLS || ISO_14755 68#if ENABLE_FRILLS || ISO_14755
72 69
73#define ISO_14755_STARTED 0x80000000UL 70#define ISO_14755_STARTED 0x80000000UL
74#define ISO_14755_51 0x40000000UL // basic (section 5.1) 71#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
146 || !IN_RANGE_EXC (y, 0, nrow)) 143 || !IN_RANGE_EXC (y, 0, nrow))
147 return; 144 return;
148 145
149 for (;;) 146 for (;;)
150 { 147 {
151 const line_t &l = ROW(y - view_start); 148 const line_t &l = ROW(y + view_start);
152 149
153 text_t t = l.t[x]; 150 text_t t = l.t[x];
154 151
155 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
156 { 153 {
… …
229# if !UNICODE3 226# if !UNICODE3
230 if (ch >= 0x10000) 227 if (ch >= 0x10000)
231 ch = 0xfffd; 228 ch = 0xfffd;
232# endif 229# endif
233 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
231
232 if (WCWIDTH (ch) >= 2)
234 scr_overlay_set (12, y, NOCHAR, r); 233 scr_overlay_set (12, y, NOCHAR, r);
235 } 234 }
236 235
236// {
237// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf);
240// }
237 scr_overlay_set (0, len , attr); 241 scr_overlay_set (0, len , attr);
238 scr_overlay_set (0, len + 1, fname); 242 scr_overlay_set (0, len + 1, fname);
239 243
240 free (fname); 244 free (fname);
241 245
… …
267 mb[0] = ch[0]; 271 mb[0] = ch[0];
268 len = 1; 272 len = 1;
269 } 273 }
270 274
271 if (len > 0) 275 if (len > 0)
272 tt_write ((unsigned char *)mb, len); 276 tt_write (mb, len);
273 else 277 else
274 scr_bell (); 278 scr_bell ();
275 } 279 }
276 280
277 iso14755buf = 0; 281 iso14755buf = 0;
… …
301rxvt_term::lookup_key (XKeyEvent &ev) 305rxvt_term::lookup_key (XKeyEvent &ev)
302{ 306{
303 int ctrl, meta, shft, len; 307 int ctrl, meta, shft, len;
304 unsigned int newlen; 308 unsigned int newlen;
305 KeySym keysym; 309 KeySym keysym;
306#ifdef DEBUG_CMD
307 static int debug_key = 1; /* accessible by a debugger only */
308#endif
309 int valid_keysym; 310 int valid_keysym;
310 unsigned char kbuf[KBUFSZ]; 311 char kbuf[KBUFSZ];
311 312
312 /* 313 /*
313 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
314 * escape sequence to toggle the Keypad. 315 * escape sequence to toggle the Keypad.
315 * 316 *
… …
333 Status status_return; 334 Status status_return;
334 335
335#if 0 336#if 0
336#ifdef X_HAVE_UTF8_STRING 337#ifdef X_HAVE_UTF8_STRING
337 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 338 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
338 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 339 len = Xutf8LookupString (Input_Context, &ev, kbuf,
339 KBUFSZ, &keysym, &status_return); 340 KBUFSZ, &keysym, &status_return);
340 else 341 else
341#endif 342#endif
342#endif 343#endif
343 { 344 {
… …
380 || status_return == XLookupBoth; 381 || status_return == XLookupBoth;
381 } 382 }
382 else 383 else
383#endif 384#endif
384 { 385 {
385 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 386 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
386 valid_keysym = keysym != NoSymbol; 387 valid_keysym = keysym != NoSymbol;
387 } 388 }
388 389
389 if (valid_keysym) 390 if (valid_keysym)
390 { 391 {
… …
442 scr_move_to (0, 1); 443 scr_move_to (0, 1);
443 return; 444 return;
444 } 445 }
445 else if (keysym == XK_End) 446 else if (keysym == XK_End)
446 { 447 {
447 scr_move_to (1, 0); 448 scr_move_to (1, 1);
448 return; 449 return;
449 } 450 }
450 } 451 }
451#endif 452#endif
452 } 453 }
… …
463 { 464 {
464 switch (keysym) 465 switch (keysym)
465 { 466 {
466 /* normal XTerm key bindings */ 467 /* normal XTerm key bindings */
467 case XK_Insert: /* Shift+Insert = paste mouse selection */ 468 case XK_Insert: /* Shift+Insert = paste mouse selection */
468 selection_request (ev.time, 0, 0); 469 selection_request (ev.time);
469 return; 470 return;
470#if TODO 471#if TODO
471 /* rxvt extras */ 472 /* rxvt extras */
472 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 473 case XK_KP_Add: /* Shift+KP_Add = bigger font */
473 change_font (FONT_UP); 474 change_font (FONT_UP);
… …
854 { 855 {
855#ifdef META8_OPTION 856#ifdef META8_OPTION
856 /* set 8-bit on */ 857 /* set 8-bit on */
857 if (meta && (meta_char == 0x80)) 858 if (meta && (meta_char == 0x80))
858 { 859 {
859 unsigned char *ch; 860 char *ch;
860 861
861 for (ch = kbuf; ch < kbuf + len; ch++) 862 for (ch = kbuf; ch < kbuf + len; ch++)
862 *ch |= 0x80; 863 *ch |= 0x80;
863 864
864 meta = 0; 865 meta = 0;
865 } 866 }
866#endif 867#endif
867 /* nil */ ; 868 /* nil */ ;
868 } 869 }
869 } 870 }
871
872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
873 return;
870 874
871 if (len <= 0) 875 if (len <= 0)
872 return; /* not mapped */ 876 return; /* not mapped */
873 877
874 if (OPTION (Opt_scrollTtyKeypress)) 878 if (OPTION (Opt_scrollTtyKeypress))
… …
897#ifdef META8_OPTION 901#ifdef META8_OPTION
898 && meta_char == C0_ESC 902 && meta_char == C0_ESC
899#endif 903#endif
900 ) 904 )
901 { 905 {
902 const unsigned char ch = C0_ESC; 906 const char ch = C0_ESC;
903 tt_write (&ch, 1); 907 tt_write (&ch, 1);
904 } 908 }
905 909
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); 910 tt_write (kbuf, (unsigned int)len);
917} 911}
918/*}}} */ 912/*}}} */
919 913
920#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 914#if defined (KEYSYM_RESOURCE)
921/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
922/* attempt to `write' count to the input buffer */
923unsigned int 915unsigned int
924rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 916rxvt_term::cmd_write (const char *str, unsigned int count)
925{ 917{
926 unsigned int n, s; 918 unsigned int n, s;
927 919
928 n = cmdbuf_ptr - cmdbuf_base; 920 n = cmdbuf_ptr - cmdbuf_base;
929 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 921 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
966 } 958 }
967#endif 959#endif
968 960
969 if (want_refresh) 961 if (want_refresh)
970 { 962 {
963 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
964 {
965 int row = view_start;
966 int end_row = row + nrow;
967
968 while (row > top_row && ROW (row - 1).is_longer ())
969 --row;
970
971 do
972 {
973 int start_row = row;
974 line_t *l;
975
976 do
977 {
978 l = &ROW (row++);
979
980 if (!(l->f & LINE_FILTERED))
981 {
982 // line not filtered, mark it as filtered
983 l->f |= LINE_FILTERED;
984 while (l->is_longer ())
985 {
986 l = &ROW (row++);
987 l->f |= LINE_FILTERED;
988 }
989
990 // and filter it
991 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
992
993 break;
994 }
995 }
996 while (l->is_longer () && row < end_row);
997 }
998 while (row < end_row);
999 }
1000
971 scr_refresh (refresh_type); 1001 scr_refresh ();
972 scrollbar_show (1); 1002 scrollbar_show (1);
973#ifdef USE_XIM 1003#ifdef USE_XIM
974 IMSendSpot (); 1004 IMSendSpot ();
975#endif 1005#endif
976 } 1006 }
… …
979} 1009}
980 1010
981void 1011void
982rxvt_term::check_cb (check_watcher &w) 1012rxvt_term::check_cb (check_watcher &w)
983{ 1013{
984 SET_R (this); 1014 make_current ();
985 SET_LOCALE (locale);
986 1015
987 display->flush (); 1016 display->flush ();
988 1017
989 if (want_refresh && !flush_ev.active) 1018 if (want_refresh && !flush_ev.active)
990 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally 1019 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
991} 1020}
992 1021
993void 1022void
994rxvt_term::flush_cb (time_watcher &w) 1023rxvt_term::flush_cb (time_watcher &w)
995{ 1024{
996 SET_R (this); 1025 make_current ();
997 SET_LOCALE (locale);
998 1026
999 refresh_limit = 1; 1027 refresh_limit = 1;
1000 refresh_count = 0; 1028 refresh_count = 0;
1001 flush (); 1029 flush ();
1002} 1030}
… …
1006rxvt_term::cursor_blink_cb (time_watcher &w) 1034rxvt_term::cursor_blink_cb (time_watcher &w)
1007{ 1035{
1008 hidden_cursor = !hidden_cursor; 1036 hidden_cursor = !hidden_cursor;
1009 want_refresh = 1; 1037 want_refresh = 1;
1010 1038
1011 w.start (w.at + BLINK_INTERVAL); 1039 w.start (w.at + CURSOR_BLINK_INTERVAL);
1012} 1040}
1013#endif 1041#endif
1014 1042
1015#ifdef TEXT_BLINK 1043#ifdef TEXT_BLINK
1016void 1044void
… …
1030rxvt_term::cont_scroll_cb (time_watcher &w) 1058rxvt_term::cont_scroll_cb (time_watcher &w)
1031{ 1059{
1032 if ((scrollbar_isUp() || scrollbar_isDn()) && 1060 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1033 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1061 scr_page (scrollbar_isUp() ? UP : DN, 1))
1034 { 1062 {
1035 refresh_type |= SMOOTH_REFRESH;
1036 want_refresh = 1; 1063 want_refresh = 1;
1037 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1064 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1038 } 1065 }
1039} 1066}
1040#endif 1067#endif
… …
1044rxvt_term::sel_scroll_cb (time_watcher &w) 1071rxvt_term::sel_scroll_cb (time_watcher &w)
1045{ 1072{
1046 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1073 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1047 { 1074 {
1048 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1075 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1049 refresh_type |= SMOOTH_REFRESH;
1050 want_refresh = 1; 1076 want_refresh = 1;
1051 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1077 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1052 } 1078 }
1053} 1079}
1054#endif 1080#endif
… …
1059{ 1085{
1060 if (mouse_slip_wheel_speed == 0 1086 if (mouse_slip_wheel_speed == 0
1061 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1087 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1062 : scr_page (UP, mouse_slip_wheel_speed)) 1088 : scr_page (UP, mouse_slip_wheel_speed))
1063 { 1089 {
1064 if (view_start == nsaved || 1090 if (view_start == top_row || view_start == 0)
1065 view_start == 0)
1066 mouse_slip_wheel_speed = 0; 1091 mouse_slip_wheel_speed = 0;
1067 1092
1068 refresh_type |= SMOOTH_REFRESH;
1069 want_refresh = 1; 1093 want_refresh = 1;
1070 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1094 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1071 } 1095 }
1072} 1096}
1073#endif 1097#endif
1074 1098
1075#if HAVE_SCHED_YIELD 1099#if LINUX_YIELD_HACK
1076static struct event_handler 1100static struct event_handler
1077{ 1101{
1078 check_watcher cw_yield; 1102 check_watcher yield_ev;
1079 1103
1080 void yield (check_watcher &w) 1104 void yield_cb (check_watcher &w)
1081 { 1105 {
1082 sched_yield (); 1106 // this should really be sched_yield(), but the linux guys thought
1107 // that giving a process calling sched_yield () less cpu time than
1108 // ones with high nice levels is a useful thing to do. It surely is is
1109 // allowed by the sus... as is returning ENOSYS.
1110
1111 struct timespec ts = { 0, 0 };
1112 nanosleep (&ts, 0);
1113
1083 w.stop (); 1114 w.stop ();
1084 } 1115 }
1085 1116
1086 event_handler () 1117 event_handler ()
1087 : cw_yield (this, &event_handler::yield) 1118 : yield_ev (this, &event_handler::yield_cb)
1088 { 1119 {
1089 } 1120 }
1090} event_handler; 1121} event_handler;
1091#endif 1122#endif
1092 1123
… …
1095{ 1126{
1096 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1127 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1097 1128
1098 if (CBUFSIZ == n) 1129 if (CBUFSIZ == n)
1099 { 1130 {
1100 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1131 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1101 n = 0; 1132 n = 0;
1102 } 1133 }
1103 1134
1104 memmove (cmdbuf_base, cmdbuf_ptr, n); 1135 memmove (cmdbuf_base, cmdbuf_ptr, n);
1105 cmdbuf_ptr = cmdbuf_base; 1136 cmdbuf_ptr = cmdbuf_base;
1106 cmdbuf_endp = cmdbuf_ptr + n; 1137 cmdbuf_endp = cmdbuf_ptr + n;
1107 1138
1108 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1139 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1109 1140
1110 if (r > 0) 1141 if (r > 0)
1111 { 1142 {
1112 cmdbuf_endp += r; 1143 cmdbuf_endp += r;
1113 return true; 1144 return true;
1114 } 1145 }
1115 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1146 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1116 { 1147 {
1117#if HAVE_SCHED_YIELD 1148#if LINUX_YIELD_HACK
1118 if (display->is_local) 1149 if (display->is_local)
1119 event_handler.cw_yield.start (); 1150 event_handler.yield_ev.start ();
1120#endif 1151#endif
1121 } 1152 }
1122 else 1153 else
1123 { 1154 {
1124 pty_ev.stop (); 1155 pty_ev.stop ();
… …
1131} 1162}
1132 1163
1133void 1164void
1134rxvt_term::pty_cb (io_watcher &w, short revents) 1165rxvt_term::pty_cb (io_watcher &w, short revents)
1135{ 1166{
1136 SET_R (this); 1167 make_current ();
1137 SET_LOCALE (locale);
1138 1168
1139 if (revents & EVENT_READ) 1169 if (revents & EVENT_READ)
1140 // loop, but don't allow a single term to monopolize us 1170 // loop, but don't allow a single term to monopolize us
1141 while (pty_fill ()) 1171 while (pty_fill ())
1142 if (cmd_parse ()) 1172 if (cmd_parse ())
… …
1147} 1177}
1148 1178
1149void 1179void
1150rxvt_term::pointer_unblank () 1180rxvt_term::pointer_unblank ()
1151{ 1181{
1152 XDefineCursor (display->display, vt, TermWin_cursor); 1182 XDefineCursor (dpy, vt, TermWin_cursor);
1153 recolour_cursor (); 1183 recolour_cursor ();
1154 1184
1155#ifdef POINTER_BLANK 1185#ifdef POINTER_BLANK
1156 hidden_pointer = 0; 1186 hidden_pointer = 0;
1157 1187
… …
1162 1192
1163#ifdef POINTER_BLANK 1193#ifdef POINTER_BLANK
1164void 1194void
1165rxvt_term::pointer_blank () 1195rxvt_term::pointer_blank ()
1166{ 1196{
1167 if (! OPTION (Opt_pointerBlank)) 1197 if (!OPTION (Opt_pointerBlank))
1168 return; 1198 return;
1169 1199
1170 XDefineCursor (display->display, vt, display->blank_cursor); 1200 XDefineCursor (dpy, vt, display->blank_cursor);
1171 XFlush (display->display); 1201 XFlush (dpy);
1172 1202
1173 hidden_pointer = 1; 1203 hidden_pointer = 1;
1174} 1204}
1175 1205
1176void 1206void
1177rxvt_term::pointer_cb (time_watcher &w) 1207rxvt_term::pointer_cb (time_watcher &w)
1178{ 1208{
1179 SET_R (this); 1209 make_current ();
1180 SET_LOCALE (locale);
1181 1210
1182 pointer_blank (); 1211 pointer_blank ();
1183} 1212}
1184#endif 1213#endif
1185 1214
… …
1250 (32 + button_number + key_state), 1279 (32 + button_number + key_state),
1251 (32 + x + 1), 1280 (32 + x + 1),
1252 (32 + y + 1)); 1281 (32 + y + 1));
1253} 1282}
1254 1283
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 */ 1284/*{{{ process an X event */
1266void 1285void
1267rxvt_term::x_cb (XEvent &ev) 1286rxvt_term::x_cb (XEvent &ev)
1268{ 1287{
1269 dDisp; 1288 make_current ();
1270 1289
1271 SET_R (this); 1290 dLocal (Display *, dpy);
1272 SET_LOCALE (locale);
1273 1291
1274#if defined(CURSOR_BLINK) 1292 if (ev.xany.window == vt
1275 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1293 && SHOULD_INVOKE (HOOK_X_EVENT)
1276 { 1294 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1277 if (hidden_cursor) 1295 return;
1278 {
1279 hidden_cursor = 0;
1280 want_refresh = 1;
1281 }
1282 1296
1283 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1297 // 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; 1298 Window unused_root, unused_child;
1302 int unused_root_x, unused_root_y; 1299 int unused_root_x, unused_root_y;
1303 unsigned int unused_mask; 1300 unsigned int unused_mask;
1304 1301
1305 switch (ev.type) 1302 switch (ev.type)
… …
1312 1309
1313 break; 1310 break;
1314 1311
1315 case KeyRelease: 1312 case KeyRelease:
1316 { 1313 {
1317#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1314#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1318 KeySym ks; 1315 KeySym keysym;
1319 1316
1320 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1317 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1321#endif 1318#endif
1322 1319
1323#if ENABLE_FRILLS || ISO_14755 1320#if ENABLE_FRILLS || ISO_14755
1324 // ISO 14755 support 1321 // ISO 14755 support
1325 if (iso14755buf) 1322 if (iso14755buf)
… …
1330# endif 1327# endif
1331# if ISO_14755 1328# if ISO_14755
1332 // iso14755 part 5.2 handling: release time 1329 // iso14755 part 5.2 handling: release time
1333 // first: controls 1330 // first: controls
1334 if ((ev.xkey.state & ControlMask) 1331 if ((ev.xkey.state & ControlMask)
1335 && ((ks >= 0x40 && ks <= 0x5f) 1332 && ((keysym >= 0x40 && keysym <= 0x5f)
1336 || (ks >= 0x61 && ks <= 0x7f))) 1333 || (keysym >= 0x61 && keysym <= 0x7f)))
1337 { 1334 {
1338 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1335 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1339 commit_iso14755 (); 1336 commit_iso14755 ();
1340 return; // case-break; 1337 goto skip_switch;
1341 } 1338 }
1342 1339
1343 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1340 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1344 if (i[0] == ks) 1341 if (i[0] == keysym)
1345 { 1342 {
1346 iso14755buf = ISO_14755_51 | i[1]; 1343 iso14755buf = ISO_14755_51 | i[1];
1347 commit_iso14755 (); 1344 commit_iso14755 ();
1348 return; // case-break; 1345 goto skip_switch;
1349 } 1346 }
1350 1347
1351 scr_bell (); 1348 scr_bell ();
1352# endif 1349# endif
1353 iso14755buf = 0; 1350 iso14755buf = 0;
… …
1372 else 1369 else
1373 iso14755buf = 0; 1370 iso14755buf = 0;
1374 } 1371 }
1375#endif 1372#endif
1376 1373
1374 if (ev.xany.window == vt
1375 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1376 break;
1377
1377#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1378#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1378 if (!(ev.xkey.state & ControlMask)) 1379 if (!(ev.xkey.state & ControlMask))
1379 slip_wheel_ev.stop (); 1380 slip_wheel_ev.stop ();
1380 else if (ks == XK_Control_L || ks == XK_Control_R) 1381 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1381 mouse_slip_wheel_speed = 0; 1382 mouse_slip_wheel_speed = 0;
1382#endif 1383#endif
1383 break; 1384 break;
1384 } 1385 }
1385 1386
… …
1391 button_release (ev.xbutton); 1392 button_release (ev.xbutton);
1392 break; 1393 break;
1393 1394
1394 case ClientMessage: 1395 case ClientMessage:
1395 if (ev.xclient.format == 32 1396 if (ev.xclient.format == 32
1396 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1397 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1397 { 1398 {
1399 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1400 {
1401 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1402 {
1398 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1403 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1404 {
1405 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1399 destroy (); 1406 destroy ();
1407 }
1400#if ENABLE_EWMH 1408#if ENABLE_EWMH
1401 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1409 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1402 XSendEvent (disp, ev.xclient.window = display->root, 1410 XSendEvent (dpy, ev.xclient.window = display->root,
1403 False, SubstructureRedirectMask | SubstructureNotifyMask, 1411 False, SubstructureRedirectMask | SubstructureNotifyMask,
1404 &ev); 1412 &ev);
1413#endif
1414 }
1415 }
1416#if ENABLE_XEMBED
1417 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1418 {
1419 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1420 focus_in ();
1421 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1422 focus_out ();
1423 }
1405#endif 1424#endif
1406 } 1425 }
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; 1426 break;
1443 1427
1444 case MappingNotify: 1428 case MappingNotify:
1445 XRefreshKeyboardMapping (&ev.xmapping); 1429 XRefreshKeyboardMapping (&ev.xmapping);
1446 break; 1430 break;
… …
1479 break; 1463 break;
1480 1464
1481 case ConfigureNotify: 1465 case ConfigureNotify:
1482 if (ev.xconfigure.window == parent[0]) 1466 if (ev.xconfigure.window == parent[0])
1483 { 1467 {
1484 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1468 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1485 ; 1469 ;
1486 1470
1487 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1471 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1488 { 1472 {
1489 seen_resize = 1; 1473 seen_resize = 1;
1490 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1474 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1491 } 1475 }
1492 1476
1477 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1478
1493#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1479#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1494 if (OPTION (Opt_transparent)) 1480 if (OPTION (Opt_transparent))
1495 check_our_parents (); 1481 check_our_parents ();
1496#endif 1482#endif
1497 } 1483 }
1498 break; 1484 break;
1499 1485
1500 case PropertyNotify: 1486 case PropertyNotify:
1487 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1501 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1488 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1502 && ev.xproperty.state == PropertyNewValue) 1489 && ev.xproperty.state == PropertyNewValue)
1503 selection_property (ev.xproperty.window, ev.xproperty.atom); 1490 selection_property (ev.xproperty.window, ev.xproperty.atom);
1504 1491
1505 break; 1492 break;
1506 1493
1507 case SelectionClear: 1494 case SelectionClear:
1508 selection_clear (); 1495 selection_clear ();
… …
1513 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1500 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1514 break; 1501 break;
1515 1502
1516 case SelectionRequest: 1503 case SelectionRequest:
1517 selection_send (ev.xselectionrequest); 1504 selection_send (ev.xselectionrequest);
1505 break;
1506
1507 case MapNotify:
1508 mapped = 1;
1509#ifdef TEXT_BLINK
1510 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1511#endif
1512 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1518 break; 1513 break;
1519 1514
1520 case UnmapNotify: 1515 case UnmapNotify:
1521 mapped = 0; 1516 mapped = 0;
1522#ifdef TEXT_BLINK 1517#ifdef TEXT_BLINK
1523 text_blink_ev.stop (); 1518 text_blink_ev.stop ();
1524#endif 1519#endif
1525 break; 1520 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; 1521 break;
1533 1522
1534#ifdef TRANSPARENT 1523#ifdef TRANSPARENT
1535 case ReparentNotify: 1524 case ReparentNotify:
1536 rootwin_cb (ev); 1525 rootwin_cb (ev);
… …
1542 if (ev.xany.window == vt) 1531 if (ev.xany.window == vt)
1543 { 1532 {
1544 do 1533 do
1545 scr_expose (ev.xexpose.x, ev.xexpose.y, 1534 scr_expose (ev.xexpose.x, ev.xexpose.y,
1546 ev.xexpose.width, ev.xexpose.height, False); 1535 ev.xexpose.width, ev.xexpose.height, False);
1547 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1536 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1548 1537
1549 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1538 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1550 1539
1551 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1540 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1552 scr_expose (ev.xexpose.x, ev.xexpose.y, 1541 scr_expose (ev.xexpose.x, ev.xexpose.y,
1553 ev.xexpose.width, ev.xexpose.height, False); 1542 ev.xexpose.width, ev.xexpose.height, False);
1554 1543
1555 scr_refresh (refresh_type); 1544 want_refresh = 1;
1556 } 1545 }
1557 else 1546 else
1558 { 1547 {
1559 XEvent unused_event; 1548 XEvent unused_event;
1560 1549
1561 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1550 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1562 ; 1551 ;
1563 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1552 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1564 ; 1553 ;
1565 1554
1566 if (isScrollbarWindow (ev.xany.window)) 1555 if (isScrollbarWindow (ev.xany.window))
1567 { 1556 {
1568 scrollBar.setIdle (); 1557 scrollBar.setIdle ();
1569 scrollbar_show (0); 1558 scrollbar_show (0);
1570 } 1559 }
1571#ifdef MENUBAR
1572 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1573 menubar_expose ();
1574#endif
1575 1560
1576#ifdef TRANSPARENT 1561#ifdef TRANSPARENT
1577 if (am_transparent && ev.xany.window == parent[0]) 1562 if (am_transparent && ev.xany.window == parent[0])
1578 XClearWindow (disp, ev.xany.window); 1563 XClearWindow (dpy, ev.xany.window);
1579#endif 1564#endif
1580 } 1565 }
1581 break; 1566 break;
1582 1567
1583 case MotionNotify: 1568 case MotionNotify:
1584#ifdef POINTER_BLANK 1569#ifdef POINTER_BLANK
1585 if (hidden_pointer) 1570 if (hidden_pointer)
1586 pointer_unblank (); 1571 pointer_unblank ();
1587#endif 1572#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) 1573 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1596 break; 1574 break;
1597 1575
1598 if (ev.xany.window == vt) 1576 if (ev.xany.window == vt)
1599 { 1577 {
1578 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1579 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1580 ; // nop
1600 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1581 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1601 { 1582 {
1602 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1583 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1603 ; 1584 ;
1604 1585
1605 XQueryPointer (disp, vt, 1586 XQueryPointer (dpy, vt,
1606 &unused_root, &unused_child, 1587 &unused_root, &unused_child,
1607 &unused_root_x, &unused_root_y, 1588 &unused_root_x, &unused_root_y,
1608 &ev.xbutton.x, &ev.xbutton.y, 1589 &ev.xbutton.x, &ev.xbutton.y,
1609 &ev.xbutton.state); 1590 &ev.xbutton.state);
1610#ifdef MOUSE_THRESHOLD 1591#ifdef MOUSE_THRESHOLD
… …
1674#endif 1655#endif
1675 } 1656 }
1676 } 1657 }
1677 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1658 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1678 { 1659 {
1679 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1660 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1680 MotionNotify, &ev)) 1661 MotionNotify, &ev))
1681 ; 1662 ;
1682 1663
1683 XQueryPointer (disp, scrollBar.win, 1664 XQueryPointer (dpy, scrollBar.win,
1684 &unused_root, &unused_child, 1665 &unused_root, &unused_child,
1685 &unused_root_x, &unused_root_y, 1666 &unused_root_x, &unused_root_y,
1686 &ev.xbutton.x, &ev.xbutton.y, 1667 &ev.xbutton.x, &ev.xbutton.y,
1687 &unused_mask); 1668 &unused_mask);
1688 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1669 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1689 scrollbar_size ()); 1670 scrollbar_size ());
1690 scr_refresh (refresh_type); 1671 want_refresh = 1;
1691 refresh_limit = 0; 1672 refresh_limit = 0;
1692 scrollbar_show (1); 1673 scrollbar_show (1);
1693 } 1674 }
1694 break; 1675 break;
1695 } 1676 }
1677
1678skip_switch: ;
1679
1680#if defined(CURSOR_BLINK)
1681 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1682 {
1683 if (hidden_cursor)
1684 {
1685 hidden_cursor = 0;
1686 want_refresh = 1;
1687 }
1688
1689 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1690 }
1691#endif
1692
1693#if defined(POINTER_BLANK)
1694 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1695 {
1696 if (ev.type == MotionNotify
1697 || ev.type == ButtonPress
1698 || ev.type == ButtonRelease)
1699 if (hidden_pointer)
1700 pointer_unblank ();
1701
1702 if (ev.type == KeyPress && hidden_pointer == 0)
1703 pointer_blank ();
1704 }
1705#endif
1696} 1706}
1697 1707
1698void 1708void
1699rxvt_term::focus_in () 1709rxvt_term::focus_in ()
1700{ 1710{
1701 if (!focus) 1711 if (!focus)
1702 { 1712 {
1703 focus = 1; 1713 focus = 1;
1704 want_refresh = 1; 1714 want_refresh = 1;
1705 1715
1706 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1716 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1707 1717
1708#if USE_XIM 1718#if USE_XIM
1709 if (Input_Context != NULL) 1719 if (Input_Context != NULL)
1710 { 1720 {
1711 IMSetStatusPosition (); 1721 IMSetStatusPosition ();
1712 XSetICFocus (Input_Context); 1722 XSetICFocus (Input_Context);
1713 } 1723 }
1714#endif 1724#endif
1715#if CURSOR_BLINK 1725#if CURSOR_BLINK
1716 if (OPTION (Opt_cursorBlink)) 1726 if (OPTION (Opt_cursorBlink))
1717 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1727 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1718#endif 1728#endif
1719#if OFF_FOCUS_FADING 1729#if OFF_FOCUS_FADING
1720 if (rs[Rs_fade]) 1730 if (rs[Rs_fade])
1721 { 1731 {
1722 pix_colors = pix_colors_focused; 1732 pix_colors = pix_colors_focused;
… …
1732 if (focus) 1742 if (focus)
1733 { 1743 {
1734 focus = 0; 1744 focus = 0;
1735 want_refresh = 1; 1745 want_refresh = 1;
1736 1746
1737 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1747 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1738 1748
1739#if ENABLE_FRILLS || ISO_14755 1749#if ENABLE_FRILLS || ISO_14755
1740 if (iso14755buf) 1750 if (iso14755buf)
1741 { 1751 {
1742 iso14755buf = 0; 1752 iso14755buf = 0;
… …
1766 1776
1767#if TRANSPARENT 1777#if TRANSPARENT
1768void 1778void
1769rxvt_term::rootwin_cb (XEvent &ev) 1779rxvt_term::rootwin_cb (XEvent &ev)
1770{ 1780{
1771 SET_R (this); 1781 make_current ();
1772 SET_LOCALE (locale);
1773 1782
1774 switch (ev.type) 1783 switch (ev.type)
1775 { 1784 {
1776 case PropertyNotify: 1785 case PropertyNotify:
1777 /* 1786 /*
… …
1804 /* 1813 /*
1805 * VT window processing of button press 1814 * VT window processing of button press
1806 */ 1815 */
1807 if (ev.window == vt) 1816 if (ev.window == vt)
1808 { 1817 {
1818 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1819 return;
1820
1809#if ISO_14755 1821#if ISO_14755
1810 // 5.4 1822 // 5.4
1811 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1823 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1812 { 1824 {
1813 iso14755_54 (ev.x, ev.y); 1825 iso14755_54 (ev.x, ev.y);
… …
1825#ifdef MOUSE_REPORT_DOUBLECLICK 1837#ifdef MOUSE_REPORT_DOUBLECLICK
1826 if (ev.button == MEvent.button && clickintime) 1838 if (ev.button == MEvent.button && clickintime)
1827 { 1839 {
1828 /* same button, within alloted time */ 1840 /* same button, within alloted time */
1829 MEvent.clicks++; 1841 MEvent.clicks++;
1842
1830 if (MEvent.clicks > 1) 1843 if (MEvent.clicks > 1)
1831 { 1844 {
1832 /* only report double clicks */ 1845 /* only report double clicks */
1833 MEvent.clicks = 2; 1846 MEvent.clicks = 2;
1834 mouse_report (ev); 1847 mouse_report (ev);
… …
1854 else 1867 else
1855 { 1868 {
1856 if (ev.button != MEvent.button) 1869 if (ev.button != MEvent.button)
1857 MEvent.clicks = 0; 1870 MEvent.clicks = 0;
1858 1871
1859 if (!PERL_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END)))
1860 switch (ev.button) 1872 switch (ev.button)
1861 { 1873 {
1862 case Button1: 1874 case Button1:
1863 /* allow meta + click to select rectangular areas */ 1875 /* allow meta + click to select rectangular areas */
1864 /* should be done in screen.C */ 1876 /* should be done in screen.C */
1865#if ENABLE_FRILLS 1877#if ENABLE_FRILLS
1866 selection.rect = !!(ev.state & ModMetaMask); 1878 selection.rect = !!(ev.state & ModMetaMask);
1867#else 1879#else
1868 selection.rect = false; 1880 selection.rect = false;
1869#endif 1881#endif
1870 1882
1871 /* allow shift+left click to extend selection */ 1883 /* allow shift+left click to extend selection */
1872 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1884 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1873 { 1885 {
1874 if (MEvent.button == Button1 && clickintime) 1886 if (MEvent.button == Button1 && clickintime)
1875 selection_rotate (ev.x, ev.y); 1887 selection_rotate (ev.x, ev.y);
1876 else 1888 else
1877 selection_extend (ev.x, ev.y, 1); 1889 selection_extend (ev.x, ev.y, 1);
1878 } 1890 }
1879 else 1891 else
1880 { 1892 {
1881 if (MEvent.button == Button1 && clickintime) 1893 if (MEvent.button == Button1 && clickintime)
1882 MEvent.clicks++; 1894 MEvent.clicks++;
1883 else 1895 else
1884 MEvent.clicks = 1; 1896 MEvent.clicks = 1;
1885 1897
1886 selection_click (MEvent.clicks, ev.x, ev.y); 1898 selection_click (MEvent.clicks, ev.x, ev.y);
1887 } 1899 }
1888 1900
1889 MEvent.button = Button1; 1901 MEvent.button = Button1;
1890 break; 1902 break;
1891 1903
1892 case Button3: 1904 case Button3:
1893 if (MEvent.button == Button3 && clickintime) 1905 if (MEvent.button == Button3 && clickintime)
1894 selection_rotate (ev.x, ev.y); 1906 selection_rotate (ev.x, ev.y);
1895 else 1907 else
1896 selection_extend (ev.x, ev.y, 1); 1908 selection_extend (ev.x, ev.y, 1);
1897 1909
1898 MEvent.button = Button3; 1910 MEvent.button = Button3;
1899 break; 1911 break;
1900 } 1912 }
1901 } 1913 }
1902 1914
1903 MEvent.time = ev.time; 1915 MEvent.time = ev.time;
1904 return; 1916 return;
1905 } 1917 }
1906 1918
… …
2042 } 2054 }
2043 2055
2044 break; 2056 break;
2045 } 2057 }
2046 } 2058 }
2059
2047 return; 2060 return;
2048 } 2061 }
2049#if MENUBAR
2050 /*
2051 * Menubar window processing of button press
2052 */
2053 if (isMenuBarWindow (ev.window))
2054 menubar_control (ev);
2055#endif
2056} 2062}
2057 2063
2058void 2064void
2059rxvt_term::button_release (XButtonEvent &ev) 2065rxvt_term::button_release (XButtonEvent &ev)
2060{ 2066{
… …
2066 2072
2067 if (scrollbar_isUpDn ()) 2073 if (scrollbar_isUpDn ())
2068 { 2074 {
2069 scrollBar.setIdle (); 2075 scrollBar.setIdle ();
2070 scrollbar_show (0); 2076 scrollbar_show (0);
2071#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2072 refresh_type &= ~SMOOTH_REFRESH;
2073#endif
2074 } 2077 }
2075 2078
2076#ifdef SELECTION_SCROLLING 2079#ifdef SELECTION_SCROLLING
2077 if (sel_scroll_ev.active) 2080 if (sel_scroll_ev.active)
2078 sel_scroll_ev.stop(); 2081 sel_scroll_ev.stop();
2079#endif 2082#endif
2080 2083
2081 if (ev.window == vt) 2084 if (ev.window == vt)
2082 { 2085 {
2086 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2087 return;
2088
2083#if ISO_14755 2089#if ISO_14755
2084 // 5.4 2090 // 5.4
2085 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2091 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2086 return; 2092 return;
2087#endif 2093#endif
2094
2088 if (reportmode) 2095 if (reportmode)
2089 { 2096 {
2090 /* mouse report from vt window */ 2097 /* mouse report from vt window */
2091 /* don't report release of wheel "buttons" */ 2098 /* don't report release of wheel "buttons" */
2092 if (ev.button >= 4) 2099 if (ev.button >= 4)
… …
2122 { 2129 {
2123 case Button1: 2130 case Button1:
2124 case Button3: 2131 case Button3:
2125 selection_make (ev.time); 2132 selection_make (ev.time);
2126 break; 2133 break;
2134
2127 case Button2: 2135 case Button2:
2128 selection_request (ev.time, ev.x, ev.y); 2136 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2137 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2129 break; 2138 break;
2139
2130#ifdef MOUSE_WHEEL 2140#ifdef MOUSE_WHEEL
2131 case Button4: 2141 case Button4:
2132 case Button5: 2142 case Button5:
2133 { 2143 {
2134 int i; 2144 int i;
… …
2156 slip_wheel_ev.start (); 2166 slip_wheel_ev.start ();
2157 } 2167 }
2158 else 2168 else
2159 { 2169 {
2160# endif 2170# endif
2161# ifdef JUMP_MOUSE_WHEEL
2162 scr_page (v, i); 2171 scr_page (v, i);
2163 scr_refresh (SMOOTH_REFRESH);
2164 scrollbar_show (1); 2172 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 2173# ifdef MOUSE_SLIP_WHEELING
2174 } 2174 }
2175#endif 2175# endif
2176 } 2176 }
2177 break; 2177 break;
2178#endif 2178#endif
2179 } 2179 }
2180 } 2180 }
2181#ifdef MENUBAR
2182 else if (isMenuBarWindow (ev.window))
2183 menubar_control (ev);
2184#endif
2185} 2181}
2186 2182
2187#ifdef TRANSPARENT 2183#ifdef TRANSPARENT
2188#if TINTING 2184#if TINTING
2189/* taken from aterm-0.4.2 */ 2185/* taken from aterm-0.4.2 */
2190 2186
2191typedef uint32_t RUINT32T; 2187typedef uint32_t RUINT32T;
2192 2188
2193void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2189void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2194{ 2190{
2195 int sh_r, sh_g, sh_b; 2191 int sh_r, sh_g, sh_b;
2196 RUINT32T mask_r, mask_g, mask_b; 2192 RUINT32T mask_r, mask_g, mask_b;
2197 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2193 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2198 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2194 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2199 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2195 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2200 int i; 2196 int i;
2201 2197
2202 Visual *visual = display->visual; 2198 Visual *visual = term->visual;
2203 2199
2204 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2200 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2205 2201
2206 /* for convenience */ 2202 /* for convenience */
2207 mask_r = visual->red_mask; 2203 mask_r = visual->red_mask;
… …
2428 Atom atype; 2424 Atom atype;
2429 unsigned char *prop = NULL; 2425 unsigned char *prop = NULL;
2430 Window root, oldp, *list; 2426 Window root, oldp, *list;
2431 Pixmap rootpixmap = None; 2427 Pixmap rootpixmap = None;
2432 XWindowAttributes wattr, wrootattr; 2428 XWindowAttributes wattr, wrootattr;
2433 dDisp;
2434 2429
2435 pchanged = 0; 2430 pchanged = 0;
2436 2431
2437 if (!OPTION (Opt_transparent)) 2432 if (!OPTION (Opt_transparent))
2438 return pchanged; /* Don't try any more */ 2433 return pchanged; /* Don't try any more */
2439 2434
2440 XGetWindowAttributes (disp, display->root, &wrootattr); 2435 XGetWindowAttributes (dpy, display->root, &wrootattr);
2441 rootdepth = wrootattr.depth; 2436 rootdepth = wrootattr.depth;
2442 2437
2443 XGetWindowAttributes (disp, parent[0], &wattr); 2438 XGetWindowAttributes (dpy, parent[0], &wattr);
2444 2439
2445 if (rootdepth != wattr.depth) 2440 if (rootdepth != wattr.depth)
2446 { 2441 {
2447 if (am_transparent) 2442 if (am_transparent)
2448 { 2443 {
2449 pchanged = 1; 2444 pchanged = 1;
2450 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2445 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2451 am_transparent = am_pixmap_trans = 0; 2446 am_transparent = am_pixmap_trans = 0;
2452 } 2447 }
2453 2448
2454 return pchanged; /* Don't try any more */ 2449 return pchanged; /* Don't try any more */
2455 } 2450 }
2456 2451
2457 /* Get all X ops out of the queue so that our information is up-to-date. */ 2452 /* Get all X ops out of the queue so that our information is up-to-date. */
2458 XSync (disp, False); 2453 XSync (dpy, False);
2459 2454
2460 /* 2455 /*
2461 * Make the frame window set by the window manager have 2456 * Make the frame window set by the window manager have
2462 * the root background. Some window managers put multiple nested frame 2457 * the root background. Some window managers put multiple nested frame
2463 * windows for each client, so we have to take care about that. 2458 * windows for each client, so we have to take care about that.
2464 */ 2459 */
2465 i = (xa[XA_XROOTPMAP_ID] 2460 i = (xa[XA_XROOTPMAP_ID]
2466 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2461 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2467 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2462 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2468 &nitems, &bytes_after, &prop) == Success); 2463 &nitems, &bytes_after, &prop) == Success);
2469 2464
2470 if (!i || prop == NULL) 2465 if (!i || prop == NULL)
2471 i = (xa[XA_ESETROOT_PMAP_ID] 2466 i = (xa[XA_ESETROOT_PMAP_ID]
2472 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2467 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2473 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2468 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2474 &nitems, &bytes_after, &prop) == Success); 2469 &nitems, &bytes_after, &prop) == Success);
2475 2470
2476 if (!i || prop == NULL 2471 if (!i || prop == NULL
2477#if TINTING 2472#if TINTING
2478 || !rs[Rs_color + Color_tint] 2473 || !ISSET_PIXCOLOR (Color_tint)
2479#endif 2474#endif
2480 ) 2475 )
2481 have_pixmap = 0; 2476 have_pixmap = 0;
2482 else 2477 else
2483 { 2478 {
… …
2496 Window cr; 2491 Window cr;
2497 XImage *image; 2492 XImage *image;
2498 GC gc; 2493 GC gc;
2499 XGCValues gcvalue; 2494 XGCValues gcvalue;
2500 2495
2501 XTranslateCoordinates (disp, parent[0], display->root, 2496 XTranslateCoordinates (dpy, parent[0], display->root,
2502 0, 0, &sx, &sy, &cr); 2497 0, 0, &sx, &sy, &cr);
2503 nw = (unsigned int)szHint.width; 2498 nw = (unsigned int)szHint.width;
2504 nh = (unsigned int)szHint.height; 2499 nh = (unsigned int)szHint.height;
2505 nx = ny = 0; 2500 nx = ny = 0;
2506 2501
… …
2519 } 2514 }
2520 2515
2521 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2516 min_it (nw, (unsigned int) (wrootattr.width - sx));
2522 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2517 min_it (nh, (unsigned int) (wrootattr.height - sy));
2523 2518
2524 XSync (disp, False); 2519 XSync (dpy, False);
2525 allowedxerror = -1; 2520 allowedxerror = -1;
2526 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2521 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2527 2522
2528 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2523 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2529 /* XXX: may need a delay here? */ 2524 /* XXX: may need a delay here? */
2530 allowedxerror = 0; 2525 allowedxerror = 0;
2531 2526
… …
2534 if (am_transparent && am_pixmap_trans) 2529 if (am_transparent && am_pixmap_trans)
2535 { 2530 {
2536 pchanged = 1; 2531 pchanged = 1;
2537 if (pixmap != None) 2532 if (pixmap != None)
2538 { 2533 {
2539 XFreePixmap (disp, pixmap); 2534 XFreePixmap (dpy, pixmap);
2540 pixmap = None; 2535 pixmap = None;
2541 } 2536 }
2542 } 2537 }
2543 2538
2544 am_pixmap_trans = 0; 2539 am_pixmap_trans = 0;
2545 } 2540 }
2546 else 2541 else
2547 { 2542 {
2548 if (pixmap != None) 2543 if (pixmap != None)
2549 XFreePixmap (disp, pixmap); 2544 XFreePixmap (dpy, pixmap);
2550 2545
2551#if TINTING 2546#if TINTING
2552 if (ISSET_PIXCOLOR (Color_tint)) 2547 if (ISSET_PIXCOLOR (Color_tint))
2553 { 2548 {
2554 unsigned short rm, gm, bm;
2555 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2549 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2556 2550
2551 rgba c;
2557 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2552 pix_colors_focused [Color_tint].get (c);
2558 2553
2559 ShadeXImage (display, image, shade, rm, gm, bm); 2554 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2560 } 2555 }
2561#endif 2556#endif
2562 2557
2563 pixmap = XCreatePixmap (disp, vt, 2558 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2564 szHint.width, szHint.height, image->depth);
2565 gc = XCreateGC (disp, vt, 0UL, &gcvalue); 2559 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2566 XPutImage (disp, pixmap, gc, image, 0, 0, 2560 XPutImage (dpy, pixmap, gc, image, 0, 0,
2567 nx, ny, image->width, image->height); 2561 nx, ny, image->width, image->height);
2568 XFreeGC (disp, gc); 2562 XFreeGC (dpy, gc);
2569 XDestroyImage (image); 2563 XDestroyImage (image);
2570 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2564 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2571 XClearWindow (disp, parent[0]); 2565 XClearWindow (dpy, parent[0]);
2572 2566
2573 if (!am_transparent || !am_pixmap_trans) 2567 if (!am_transparent || !am_pixmap_trans)
2574 pchanged = 1; 2568 pchanged = 1;
2575 2569
2576 am_transparent = am_pixmap_trans = 1; 2570 am_transparent = am_pixmap_trans = 1;
2577 } 2571 }
2578 } 2572 }
2579 2573
2580 if (am_pixmap_trans) 2574 if (am_pixmap_trans)
2581 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2575 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2582 else 2576 else
2583 { 2577 {
2584 unsigned int n; 2578 unsigned int n;
2585 /* 2579 /*
2586 * InheritPixmap transparency 2580 * InheritPixmap transparency
2587 */ 2581 */
2588 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2582 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2589 { 2583 {
2590 oldp = parent[i]; 2584 oldp = parent[i];
2591 XQueryTree (disp, parent[i - 1], &root, 2585 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2592 &parent[i], &list, &n);
2593 XFree (list); 2586 XFree (list);
2594 2587
2595 if (parent[i] == display->root) 2588 if (parent[i] == display->root)
2596 { 2589 {
2597 if (oldp != None) 2590 if (oldp != None)
… …
2605 } 2598 }
2606 2599
2607 n = 0; 2600 n = 0;
2608 2601
2609 if (pchanged) 2602 if (pchanged)
2610 {
2611 for (; n < (unsigned int)i; n++) 2603 for (; n < (unsigned int)i; n++)
2612 { 2604 {
2613 XGetWindowAttributes (disp, parent[n], &wattr); 2605 XGetWindowAttributes (dpy, parent[n], &wattr);
2606
2614 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2607 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2615 { 2608 {
2616 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2609 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2617 break; 2610 break;
2618 } 2611 }
2619 } 2612 }
2620 }
2621 2613
2622 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2614 if (n > (sizeof (parent) / sizeof (parent[0])))
2623 { 2615 {
2624 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2616 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2625 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2617 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2626 am_transparent = 0; 2618 am_transparent = 0;
2627 /* XXX: also turn off Opt_transparent? */ 2619 /* XXX: also turn off Opt_transparent? */
2628 } 2620 }
2629 else 2621 else
2630 { 2622 {
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++) 2623 for (n = 0; n < (unsigned int)i; n++)
2637 { 2624 {
2638 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2625 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2639 XClearWindow (disp, parent[n]); 2626 XClearWindow (dpy, parent[n]);
2640 } 2627 }
2641 2628
2642 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2629 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2643 am_transparent = 1; 2630 am_transparent = 1;
2644 } 2631 }
2645 2632
2646 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2633 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2647 parent[i] = None; 2634 parent[i] = None;
2648 } 2635 }
2649 2636
2650 if (scrollBar.win) 2637 if (scrollBar.win)
2651 { 2638 {
2652 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2639 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2653 scrollBar.setIdle (); 2640 scrollBar.setIdle ();
2654 scrollbar_show (0); 2641 scrollbar_show (0);
2655 } 2642 }
2656 2643
2657 if (am_transparent) 2644 if (am_transparent)
… …
2669 2656
2670bool 2657bool
2671rxvt_term::cmd_parse () 2658rxvt_term::cmd_parse ()
2672{ 2659{
2673 bool flag = false; 2660 bool flag = false;
2674 unicode_t ch = NOCHAR; 2661 wchar_t ch = NOCHAR;
2675 unsigned char *seq_begin; // remember start of esc-sequence here 2662 char *seq_begin; // remember start of esc-sequence here
2676 2663
2677 for (;;) 2664 for (;;)
2678 { 2665 {
2679 if (ch == NOCHAR) 2666 if (ch == NOCHAR)
2680 { 2667 {
2681 seq_begin = cmdbuf_ptr; 2668 seq_begin = cmdbuf_ptr;
2682 ch = next_char (); 2669 ch = next_char ();
2683 }
2684 2670
2685 if (ch == NOCHAR) // TODO: improve 2671 if (ch == NOCHAR)
2686 break; 2672 break;
2673 }
2687 2674
2688 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2675 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2689 { 2676 {
2690 if (!seen_input) 2677 if (!seen_input)
2691 { 2678 {
… …
2700 if (seen_resize && cmd_pid) 2687 if (seen_resize && cmd_pid)
2701 kill (-cmd_pid, SIGWINCH); 2688 kill (-cmd_pid, SIGWINCH);
2702 } 2689 }
2703 2690
2704 /* Read a text string from the input buffer */ 2691 /* Read a text string from the input buffer */
2705 unicode_t buf[UBUFSIZ]; 2692 wchar_t buf[UBUFSIZ];
2706 bool refreshnow = false; 2693 bool refreshnow = false;
2707 int nlines = 0; 2694 int nlines = 0;
2708 unicode_t *str = buf; 2695 wchar_t *str = buf;
2709 unicode_t *eol = str + min (ncol, UBUFSIZ); 2696 wchar_t *eol = str + min (ncol, UBUFSIZ);
2710 2697
2711 for (;;) 2698 for (;;)
2712 { 2699 {
2713 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2700 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2714 break; 2701 break;
… …
2732 } 2719 }
2733 2720
2734 // scr_add_lines only works for nlines <= nrow - 1. 2721 // scr_add_lines only works for nlines <= nrow - 1.
2735 if (nlines >= nrow - 1) 2722 if (nlines >= nrow - 1)
2736 { 2723 {
2724 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2725 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2737 scr_add_lines (buf, nlines, str - buf); 2726 scr_add_lines (buf, str - buf, nlines);
2727
2738 nlines = 0; 2728 nlines = 0;
2739 str = buf; 2729 str = buf;
2740 eol = str + min (ncol, UBUFSIZ); 2730 eol = str + min (ncol, UBUFSIZ);
2741 } 2731 }
2742 2732
… …
2755 2745
2756 seq_begin = cmdbuf_ptr; 2746 seq_begin = cmdbuf_ptr;
2757 ch = next_char (); 2747 ch = next_char ();
2758 } 2748 }
2759 2749
2750 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2751 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2760 scr_add_lines (buf, nlines, str - buf); 2752 scr_add_lines (buf, str - buf, nlines);
2761 2753
2762 /* 2754 /*
2763 * If there have been a lot of new lines, then update the screen 2755 * 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. 2756 * 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 2757 * the number of pages between refreshes is refresh_limit, which
… …
2770 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2762 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2771 refresh_limit++; 2763 refresh_limit++;
2772 else 2764 else
2773 { 2765 {
2774 flag = true; 2766 flag = true;
2775 scr_refresh (refresh_type); 2767 scr_refresh ();
2776 flush_ev.stop (); 2768 want_refresh = 1;
2777 } 2769 }
2778 } 2770 }
2779 2771
2780 } 2772 }
2781 else 2773 else
… …
2796 } 2788 }
2797 2789
2798 return flag; 2790 return flag;
2799} 2791}
2800 2792
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 2793// read the next character
2811unicode_t 2794wchar_t
2812rxvt_term::next_char () 2795rxvt_term::next_char () NOTHROW
2813{ 2796{
2814 while (cmdbuf_ptr < cmdbuf_endp) 2797 while (cmdbuf_ptr < cmdbuf_endp)
2815 { 2798 {
2816 // assume 7-bit to be ascii ALWAYS 2799 // assume 7-bit to be ascii ALWAYS
2817 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2800 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2818 return *cmdbuf_ptr++; 2801 return *cmdbuf_ptr++;
2819 2802
2820 wchar_t wc; 2803 wchar_t wc;
2821 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2804 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2822 2805
2823 if (len == (size_t)-2) 2806 if (len == (size_t)-2)
2824 { 2807 {
2825 // the mbstate stores incomplete sequences. didn't know this :/ 2808 // the mbstate stores incomplete sequences. didn't know this :/
2826 cmdbuf_ptr = cmdbuf_endp; 2809 cmdbuf_ptr = cmdbuf_endp;
2827 break; 2810 break;
2828 } 2811 }
2829 2812
2830 if (len == (size_t)-1) 2813 if (len == (size_t)-1)
2831 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2814 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2832 2815
2833 // assume wchar == unicode 2816 // assume wchar == unicode
2834 cmdbuf_ptr += len; 2817 cmdbuf_ptr += len;
2835 return wc & UNICODE_MASK; 2818 return wc & UNICODE_MASK;
2836 } 2819 }
2837 2820
2838 return NOCHAR; 2821 return NOCHAR;
2839} 2822}
2823
2824// read the next octet
2825uint32_t
2826rxvt_term::next_octet () NOTHROW
2827{
2828 return cmdbuf_ptr < cmdbuf_endp
2829 ? (unsigned char)*cmdbuf_ptr++
2830 : NOCHAR;
2831}
2832
2833static class out_of_input out_of_input;
2840 2834
2841/* rxvt_cmd_getc () - Return next input character */ 2835/* rxvt_cmd_getc () - Return next input character */
2842/* 2836/*
2843 * Return the next input character after first passing any keyboard input 2837 * Return the next input character after first passing any keyboard input
2844 * to the command. 2838 * to the command.
2845 */ 2839 */
2846unicode_t 2840wchar_t
2847rxvt_term::cmd_getc () 2841rxvt_term::cmd_getc () THROW ((class out_of_input))
2848{ 2842{
2849 unicode_t c = next_char (); 2843 wchar_t c = next_char ();
2850 2844
2851 if (c == NOCHAR) 2845 if (c == NOCHAR)
2852 throw out_of_input; 2846 throw out_of_input;
2853 2847
2854 return c; 2848 return c;
2855} 2849}
2856 2850
2857unicode_t 2851uint32_t
2858rxvt_term::cmd_get8 () 2852rxvt_term::cmd_get8 () THROW ((class out_of_input))
2859{ 2853{
2860 unicode_t c = next_octet (); 2854 uint32_t c = next_octet ();
2861 2855
2862 if (c == NOCHAR) 2856 if (c == NOCHAR)
2863 throw out_of_input; 2857 throw out_of_input;
2864 2858
2865 return c; 2859 return c;
… …
2965 case C0_ESC: 2959 case C0_ESC:
2966 process_escape_seq (); 2960 process_escape_seq ();
2967 break; 2961 break;
2968 case C0_ENQ: /* terminal Status */ 2962 case C0_ENQ: /* terminal Status */
2969 if (rs[Rs_answerbackstring]) 2963 if (rs[Rs_answerbackstring])
2970 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2964 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2971 (unsigned int)strlen (rs[Rs_answerbackstring]));
2972 else 2965 else
2973 tt_write ((unsigned char *)VT100_ANS, 2966 tt_write (VT100_ANS, strlen (VT100_ANS));
2974 (unsigned int)strlen (VT100_ANS));
2975 break; 2967 break;
2976 case C0_BEL: /* bell */ 2968 case C0_BEL: /* bell */
2977 scr_bell (); 2969 scr_bell ();
2978 break; 2970 break;
2979 case C0_BS: /* backspace */ 2971 case C0_BS: /* backspace */
… …
3103 scr_charset_set (2, (unsigned int)cmd_getc ()); 3095 scr_charset_set (2, (unsigned int)cmd_getc ());
3104 break; 3096 break;
3105 case '+': 3097 case '+':
3106 scr_charset_set (3, (unsigned int)cmd_getc ()); 3098 scr_charset_set (3, (unsigned int)cmd_getc ());
3107 break; 3099 break;
3108#if ENABLE_FRILLS 3100#if !ENABLE_MINIMAL
3109 case '6': 3101 case '6':
3110 scr_backindex (); 3102 scr_backindex ();
3111 break; 3103 break;
3112#endif 3104#endif
3113 case '7': 3105 case '7':
3114 scr_cursor (SAVE); 3106 scr_cursor (SAVE);
3115 break; 3107 break;
3116 case '8': 3108 case '8':
3117 scr_cursor (RESTORE); 3109 scr_cursor (RESTORE);
3118 break; 3110 break;
3119#if ENABLE_FRILLS 3111#if !ENABLE_MINIMAL
3120 case '9': 3112 case '9':
3121 scr_forwardindex (); 3113 scr_forwardindex ();
3122 break; 3114 break;
3123#endif 3115#endif
3124 case '=': 3116 case '=':
… …
3134 break; 3126 break;
3135 3127
3136 /* 8.3.87: NEXT LINE */ 3128 /* 8.3.87: NEXT LINE */
3137 case C1_NEL: /* ESC E */ 3129 case C1_NEL: /* ESC E */
3138 { 3130 {
3139 unicode_t nlcr[] = { C0_LF, C0_CR }; 3131 wchar_t nlcr[] = { C0_LF, C0_CR };
3140 scr_add_lines (nlcr, 1, 2); 3132 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3141 } 3133 }
3142 break; 3134 break;
3143 3135
3144 /* kidnapped escape sequence: Should be 8.3.48 */ 3136 /* kidnapped escape sequence: Should be 8.3.48 */
3145 case C1_ESA: /* ESC G */ 3137 case C1_ESA: /* ESC G */
… …
3167 process_dcs_seq (); 3159 process_dcs_seq ();
3168 break; 3160 break;
3169 3161
3170 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3162 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3171 case C1_SCI: /* ESC Z */ 3163 case C1_SCI: /* ESC Z */
3172 tt_write ((const unsigned char *)ESCZ_ANSWER, 3164 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3173 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3174 break; /* steal obsolete ESC [ c */ 3165 break; /* steal obsolete ESC [ c */
3175 3166
3176 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3167 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3177 case C1_CSI: /* ESC [ */ 3168 case C1_CSI: /* ESC [ */
3178 process_csi_seq (); 3169 process_csi_seq ();
… …
3287 ndef = get_byte_array_bit (csi_defaults, i); 3278 ndef = get_byte_array_bit (csi_defaults, i);
3288 for (p = 0; p < nargs; p++) 3279 for (p = 0; p < nargs; p++)
3289 if (arg[p] == -1) 3280 if (arg[p] == -1)
3290 arg[p] = ndef; 3281 arg[p] = ndef;
3291 3282
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 /* 3283 /*
3300 * private mode handling 3284 * private mode handling
3301 */ 3285 */
3302 if (priv) 3286 if (priv)
3303 { 3287 {
3304 switch (priv) 3288 switch (priv)
3305 { 3289 {
3306 case '>': 3290 case '>':
3307 if (ch == CSI_DA) /* secondary device attributes */ 3291 if (ch == CSI_DA) /* secondary device attributes */
3308 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 3292 {
3293 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3294 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3295 //
3296 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3297 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3298 // that we do not support xterm mouse reporting (should be 95 when we do).
3299 //
3300 tt_printf ("\033[>%d;94;0c", 'U');
3301 }
3309 break; 3302 break;
3310 case '?': 3303 case '?':
3311 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3304 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3312 process_terminal_mode (ch, priv, nargs, arg); 3305 process_terminal_mode (ch, priv, nargs, arg);
3313 break; 3306 break;
… …
3422 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3415 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3423 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3416 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3424 break; 3417 break;
3425 3418
3426 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3419 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3427 tt_write ((const unsigned char *)VT100_ANS, 3420 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3428 (unsigned int) (sizeof (VT100_ANS) - 1));
3429 break; 3421 break;
3430 3422
3431 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3423 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3432 process_sgr_mode (nargs, arg); 3424 process_sgr_mode (nargs, arg);
3433 break; 3425 break;
… …
3517 break; 3509 break;
3518 case CSI_75: 3510 case CSI_75:
3519 scr_cursor (RESTORE); 3511 scr_cursor (RESTORE);
3520 break; 3512 break;
3521 3513
3522#if ENABLE_FRILLS 3514#if !ENABLE_MINIMAL
3523 case CSI_74: 3515 case CSI_74:
3524 process_window_ops (arg, nargs); 3516 process_window_ops (arg, nargs);
3525 break; 3517 break;
3526#endif 3518#endif
3527 3519
… …
3534 break; 3526 break;
3535 } 3527 }
3536} 3528}
3537/*}}} */ 3529/*}}} */
3538 3530
3539#if ENABLE_FRILLS 3531#if !ENABLE_MINIMAL
3540/* ARGSUSED */ 3532/* ARGSUSED */
3541void 3533void
3542rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3534rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3543{ 3535{
3544 int x, y; 3536 int x, y;
3545 XWindowAttributes wattr; 3537 XWindowAttributes wattr;
3546 Window wdummy; 3538 Window wdummy;
3547 dDisp; 3539
3540 dLocal (Display *, dpy);
3548 3541
3549 if (nargs == 0) 3542 if (nargs == 0)
3550 return; 3543 return;
3551 3544
3552 switch (args[0]) 3545 switch (args[0])
3553 { 3546 {
3554 /* 3547 /*
3555 * commands 3548 * commands
3556 */ 3549 */
3557 case 1: /* deiconify window */ 3550 case 1: /* deiconify window */
3558 XMapWindow (disp, parent[0]); 3551 XMapWindow (dpy, parent[0]);
3559 break; 3552 break;
3560 case 2: /* iconify window */ 3553 case 2: /* iconify window */
3561 XIconifyWindow (disp, parent[0], display->screen); 3554 XIconifyWindow (dpy, parent[0], display->screen);
3562 break; 3555 break;
3563 case 3: /* set position (pixels) */ 3556 case 3: /* set position (pixels) */
3564 XMoveWindow (disp, parent[0], args[1], args[2]); 3557 XMoveWindow (dpy, parent[0], args[1], args[2]);
3565 break; 3558 break;
3566 case 4: /* set size (pixels) */ 3559 case 4: /* set size (pixels) */
3567 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3560 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3568 break; 3561 break;
3569 case 5: /* raise window */ 3562 case 5: /* raise window */
3570 XRaiseWindow (disp, parent[0]); 3563 XRaiseWindow (dpy, parent[0]);
3571 break; 3564 break;
3572 case 6: /* lower window */ 3565 case 6: /* lower window */
3573 XLowerWindow (disp, parent[0]); 3566 XLowerWindow (dpy, parent[0]);
3574 break; 3567 break;
3575 case 7: /* refresh window */ 3568 case 7: /* refresh window */
3576 scr_touch (true); 3569 scr_touch (true);
3577 break; 3570 break;
3578 case 8: /* set size (chars) */ 3571 case 8: /* set size (chars) */
… …
3585 if (args[0] >= 24) /* set height (chars) */ 3578 if (args[0] >= 24) /* set height (chars) */
3586 set_widthheight ((unsigned int)width, 3579 set_widthheight ((unsigned int)width,
3587 (unsigned int) (args[1] * fheight)); 3580 (unsigned int) (args[1] * fheight));
3588 break; 3581 break;
3589 3582
3590
3591 /* 3583 /*
3592 * reports - some output format copied from XTerm 3584 * reports - some output format copied from XTerm
3593 */ 3585 */
3594 case 11: /* report window state */ 3586 case 11: /* report window state */
3595 XGetWindowAttributes (disp, parent[0], &wattr); 3587 XGetWindowAttributes (dpy, parent[0], &wattr);
3596 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3588 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3597 break; 3589 break;
3598 case 13: /* report window position */ 3590 case 13: /* report window position */
3599 XGetWindowAttributes (disp, parent[0], &wattr); 3591 XGetWindowAttributes (dpy, parent[0], &wattr);
3600 XTranslateCoordinates (disp, parent[0], wattr.root, 3592 XTranslateCoordinates (dpy, parent[0], wattr.root,
3601 -wattr.border_width, -wattr.border_width, 3593 -wattr.border_width, -wattr.border_width,
3602 &x, &y, &wdummy); 3594 &x, &y, &wdummy);
3603 tt_printf ("\033[3;%d;%dt", x, y); 3595 tt_printf ("\033[3;%d;%dt", x, y);
3604 break; 3596 break;
3605 case 14: /* report window size (pixels) */ 3597 case 14: /* report window size (pixels) */
3606 XGetWindowAttributes (disp, parent[0], &wattr); 3598 XGetWindowAttributes (dpy, parent[0], &wattr);
3607 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3599 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3608 break; 3600 break;
3609 case 18: /* report text area size (chars) */ 3601 case 18: /* report text area size (chars) */
3610 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3602 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3611 break; 3603 break;
… …
3613 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3605 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3614 break; 3606 break;
3615 case 20: /* report icon label */ 3607 case 20: /* report icon label */
3616 { 3608 {
3617 char *s; 3609 char *s;
3618 XGetIconName (disp, parent[0], &s); 3610 XGetIconName (dpy, parent[0], &s);
3619 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3611 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3620 XFree (s); 3612 XFree (s);
3621 } 3613 }
3622 break; 3614 break;
3623 case 21: /* report window title */ 3615 case 21: /* report window title */
3624 { 3616 {
3625 char *s; 3617 char *s;
3626 XFetchName (disp, parent[0], &s); 3618 XFetchName (dpy, parent[0], &s);
3627 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3619 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3628 XFree (s); 3620 XFree (s);
3629 } 3621 }
3630 break; 3622 break;
3631 } 3623 }
… …
3635/*----------------------------------------------------------------------*/ 3627/*----------------------------------------------------------------------*/
3636/* 3628/*
3637 * get input up until STRING TERMINATOR (or BEL) 3629 * get input up until STRING TERMINATOR (or BEL)
3638 * ends_how is terminator used. returned input must be free()'d 3630 * ends_how is terminator used. returned input must be free()'d
3639 */ 3631 */
3640unsigned char * 3632char *
3641rxvt_term::get_to_st (unicode_t &ends_how) 3633rxvt_term::get_to_st (unicode_t &ends_how)
3642{ 3634{
3643 unicode_t ch; 3635 unicode_t ch;
3644 bool seen_esc = false; 3636 bool seen_esc = false;
3645 unsigned int n = 0; 3637 unsigned int n = 0;
… …
3678 3670
3679 string[n++] = '\0'; 3671 string[n++] = '\0';
3680 3672
3681 ends_how = (ch == 0x5c ? C0_ESC : ch); 3673 ends_how = (ch == 0x5c ? C0_ESC : ch);
3682 3674
3683 return (unsigned char *)rxvt_wcstombs (string); 3675 return rxvt_wcstombs (string);
3684} 3676}
3685 3677
3686/*----------------------------------------------------------------------*/ 3678/*----------------------------------------------------------------------*/
3687/* 3679/*
3688 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3680 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3689 */ 3681 */
3690void 3682void
3691rxvt_term::process_dcs_seq () 3683rxvt_term::process_dcs_seq ()
3692{ 3684{
3693 unsigned char *s; 3685 char *s;
3694 unicode_t eh; 3686 unicode_t eh;
3695 3687
3696 /* 3688 /*
3697 * Not handled yet 3689 * Not handled yet
3698 */ 3690 */
… …
3717 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3709 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3718 arg = arg * 10 + (ch - '0'); 3710 arg = arg * 10 + (ch - '0');
3719 3711
3720 if (ch == ';') 3712 if (ch == ';')
3721 { 3713 {
3722 unsigned char *s = get_to_st (eh); 3714 char *s = get_to_st (eh);
3723 3715
3724 if (s) 3716 if (s)
3725 { 3717 {
3726 process_xterm_seq (arg, (char *)s, eh); 3718 process_xterm_seq (arg, s, eh);
3727 free (s); 3719 free (s);
3728 } 3720 }
3729 } 3721 }
3730} 3722}
3731 3723
3732void 3724void
3733rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3725rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3734{ 3726{
3735 if (str[0] == '?' && !str[1]) 3727 if (str[0] == '?' && !str[1])
3736 { 3728 {
3737 unsigned short r, g, b; 3729 rgba c;
3738 pix_colors_focused[color].get (display, r, g, b); 3730 pix_colors_focused[color].get (c);
3731
3732#if XFT
3733 if (c.a != rgba::MAX_CC)
3734 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3735 else
3736#endif
3739 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3737 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3740 } 3738 }
3741 else 3739 else
3742 set_window_color (color, str); 3740 set_window_color (color, str);
3743} 3741}
3744 3742
3745/* 3743/*
3746 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3744 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3747 */ 3745 */
3748void 3746void
3749rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3747rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3750{ 3748{
3751 int changed = 0;
3752 int color; 3749 int color;
3753 char *buf, *name; 3750 char *buf, *name;
3754 bool query = str[0] == '?' && !str[1]; 3751 bool query = str[0] == '?' && !str[1];
3755 int saveop = op; 3752 int saveop = op;
3756 dDisp; 3753
3754 dLocal (Display *, dpy);
3757 3755
3758 assert (str != NULL); 3756 assert (str != NULL);
3759 switch (op) 3757 switch (op)
3760 { 3758 {
3761 case XTerm_name: 3759 case XTerm_name:
… …
3777 unsigned long bytes_after; 3775 unsigned long bytes_after;
3778 unsigned char *value = 0; 3776 unsigned char *value = 0;
3779 const char *str = ""; 3777 const char *str = "";
3780 3778
3781 if (prop 3779 if (prop
3782 && XGetWindowProperty (disp, parent[0], 3780 && XGetWindowProperty (dpy, parent[0],
3783 prop, 0, 1<<16, 0, AnyPropertyType, 3781 prop, 0, 1<<16, 0, AnyPropertyType,
3784 &actual_type, &actual_format, 3782 &actual_type, &actual_format,
3785 &nitems, &bytes_after, &value) == Success 3783 &nitems, &bytes_after, &value) == Success
3786 && actual_type != None 3784 && actual_type != None
3787 && actual_format == 8) 3785 && actual_format == 8)
3788 str = (const char *)(value); 3786 str = (const char *)(value);
3789 3787
3790 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3788 tt_printf ("\033]%d;%s%c", op, str, resp);
3791 3789
3792 XFree (value); 3790 XFree (value);
3793 } 3791 }
3794 else 3792 else
3795 { 3793 {
… …
3799 { 3797 {
3800 *eq = 0; 3798 *eq = 0;
3801 set_utf8_property (display->atom (str), eq + 1); 3799 set_utf8_property (display->atom (str), eq + 1);
3802 } 3800 }
3803 else 3801 else
3804 XDeleteProperty (disp, parent[0], 3802 XDeleteProperty (dpy, parent[0],
3805 display->atom (str)); 3803 display->atom (str));
3806 } 3804 }
3807 break; 3805 break;
3808 3806
3809 case XTerm_Color: 3807 case XTerm_Color:
… …
3811 { 3809 {
3812 if ((name = strchr (buf, ';')) == NULL) 3810 if ((name = strchr (buf, ';')) == NULL)
3813 break; 3811 break;
3814 3812
3815 *name++ = '\0'; 3813 *name++ = '\0';
3816 color = atoi (buf); 3814 color = atoi (buf) + minCOLOR;
3817 3815
3818 if (color < 0 || color >= TOTAL_COLORS) 3816 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3819 break; 3817 break;
3820 3818
3821 if ((buf = strchr (name, ';')) != NULL) 3819 if ((buf = strchr (name, ';')) != NULL)
3822 *buf++ = '\0'; 3820 *buf++ = '\0';
3823 3821
3824 if (name[0] == '?' && !name[1]) 3822 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 } 3823 }
3833 break; 3824 break;
3834 case XTerm_Color00: 3825 case XTerm_Color00:
3835 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3826 process_color_seq (op, Color_fg, str, resp);
3836 break; 3827 break;
3837 case XTerm_Color01: 3828 case XTerm_Color01:
3838 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3829 process_color_seq (op, Color_bg, str, resp);
3839 break; 3830 break;
3840#ifndef NO_CURSORCOLOR 3831#ifndef NO_CURSORCOLOR
3841 case XTerm_Color_cursor: 3832 case XTerm_Color_cursor:
3842 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3833 process_color_seq (op, Color_cursor, str, resp);
3843 break; 3834 break;
3844#endif 3835#endif
3845 case XTerm_Color_pointer_fg: 3836 case XTerm_Color_pointer_fg:
3846 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3837 process_color_seq (op, Color_pointer_fg, str, resp);
3847 break; 3838 break;
3848 case XTerm_Color_pointer_bg: 3839 case XTerm_Color_pointer_bg:
3849 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3840 process_color_seq (op, Color_pointer_bg, str, resp);
3850 break; 3841 break;
3851#ifndef NO_BOLD_UNDERLINE_REVERSE 3842#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: 3843 case XTerm_Color_RV:
3859 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3844 process_color_seq (op, Color_RV, str, resp);
3845 break;
3846 case Rxvt_Color_BD:
3847 case URxvt_Color_BD:
3848 process_color_seq (op, Color_BD, str, resp);
3849 break;
3850 case Rxvt_Color_UL:
3851 case URxvt_Color_UL:
3852 process_color_seq (op, Color_UL, str, resp);
3860 break; 3853 break;
3861 case URxvt_Color_IT: 3854 case URxvt_Color_IT:
3862 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3855 process_color_seq (op, Color_IT, str, resp);
3863 break; 3856 break;
3864#endif 3857#endif
3865#if TRANSPARENT && TINTING 3858#if TRANSPARENT && TINTING
3866 case URxvt_Color_tint: 3859 case URxvt_Color_tint:
3867 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3860 process_color_seq (op, Color_tint, str, resp);
3861
3868 check_our_parents (); 3862 check_our_parents ();
3863
3869 if (am_transparent) 3864 if (am_transparent)
3870 want_full_refresh = want_refresh = 1; 3865 want_full_refresh = want_refresh = 1;
3871 break;
3872#endif
3873 3866
3867 break;
3868#endif
3869
3874 case XTerm_Pixmap: 3870 case Rxvt_Pixmap:
3871 {
3875 if (*str != ';') 3872 if (*str != ';')
3876 { 3873 {
3877#if XPM_BACKGROUND 3874#if XPM_BACKGROUND
3878 scale_pixmap (""); /* reset to default scaling */ 3875 scale_pixmap (""); /* reset to default scaling */
3879 set_bgPixmap (str); /* change pixmap */ 3876 set_bgPixmap (str); /* change pixmap */
3880#endif
3881 scr_touch (true); 3877 scr_touch (true);
3878#endif
3882 } 3879 }
3880
3881 int changed = 0;
3882
3883 while ((str = strchr (str, ';')) != NULL) 3883 while ((str = strchr (str, ';')) != NULL)
3884 { 3884 {
3885 str++; 3885 str++;
3886#if XPM_BACKGROUND 3886#if XPM_BACKGROUND
3887 changed += scale_pixmap (str); 3887 changed += scale_pixmap (str);
3888#endif 3888#endif
3889 } 3889 }
3890 3890
3891 if (changed) 3891 if (changed)
3892 { 3892 {
3893#ifdef XPM_BACKGROUND 3893#ifdef XPM_BACKGROUND
3894 resize_pixmap (); 3894 resize_pixmap ();
3895#endif
3896 scr_touch (true); 3895 scr_touch (true);
3896#endif
3897 } 3897 }
3898 }
3898 break; 3899 break;
3899 3900
3900 case XTerm_restoreFG: 3901 case Rxvt_restoreFG:
3901 set_window_color (Color_fg, str); 3902 set_window_color (Color_fg, str);
3902 break; 3903 break;
3903 case XTerm_restoreBG: 3904 case Rxvt_restoreBG:
3904 set_window_color (Color_bg, str); 3905 set_window_color (Color_bg, str);
3905 break; 3906 break;
3906 3907
3907 case XTerm_logfile: 3908 case XTerm_logfile:
3908 // TODO, when secure mode? 3909 // TODO, when secure mode?
3909 break; 3910 break;
3910 3911
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 3912#if 0
3918 case XTerm_dumpscreen: /* no error notices */ 3913 case Rxvt_dumpscreen: /* no error notices */
3919 { 3914 {
3920 int fd; 3915 int fd;
3921 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3916 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3922 { 3917 {
3923 scr_dump (fd); 3918 scr_dump (fd);
… …
3947 allocated.push_back ((void *)res); 3942 allocated.push_back ((void *)res);
3948 set_fonts (); 3943 set_fonts ();
3949 } 3944 }
3950 break; 3945 break;
3951 3946
3952#if ENABLE_FRILLS 3947 case URxvt_version:
3948 if (query)
3949 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3950 op,
3951 rs[Rs_name], VERSION[0], VERSION[2],
3952 resp);
3953 break;
3954
3955#if !ENABLE_MINIMAL
3953 case URxvt_locale: 3956 case URxvt_locale:
3954 if (query) 3957 if (query)
3955 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3958 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3956 else 3959 else
3957 { 3960 {
3958 set_locale (str); 3961 set_locale (str);
3959 pty.set_utf8_mode (enc_utf8); 3962 pty->set_utf8_mode (enc_utf8);
3960 init_xlocale (); 3963 init_xlocale ();
3961 } 3964 }
3962 break; 3965 break;
3963 3966
3964 case URxvt_view_up: 3967 case URxvt_view_up:
3965 case URxvt_view_down: 3968 case URxvt_view_down:
3969 {
3966 int lines = atoi (str); 3970 int lines = atoi (str);
3967 3971
3968 if (lines) 3972 if (lines)
3969 scr_page (op == URxvt_view_up ? UP : DN, lines); 3973 scr_page (op == URxvt_view_up ? UP : DN, lines);
3970 else 3974 else
3971 scr_erase_savelines (); 3975 scr_erase_savelines ();
3976 }
3972 3977
3973 break; 3978 break;
3974#endif 3979#endif
3975 3980
3976#if ENABLE_PERL 3981#if ENABLE_PERL
3977 case URxvt_perl: 3982 case URxvt_perl:
3978 if (PERL_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END))) 3983 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3979 ; // no responses yet 3984 ; // no responses yet
3980 break; 3985 break;
3981
3982#endif 3986#endif
3983
3984 } 3987 }
3985} 3988}
3986/*----------------------------------------------------------------------*/ 3989/*----------------------------------------------------------------------*/
3987 3990
3988/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 3991/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
4017 return state; 4020 return state;
4018} 4021}
4019 4022
4020/* we're not using priv _yet_ */ 4023/* we're not using priv _yet_ */
4021void 4024void
4022rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4025rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4023{ 4026{
4024 unsigned int i, j; 4027 unsigned int i, j;
4025 int state; 4028 int state;
4026 4029
4027 static const struct 4030 static const struct
… …
4038 { 5, PrivMode_rVideo }, 4041 { 5, PrivMode_rVideo },
4039 { 6, PrivMode_relOrigin }, 4042 { 6, PrivMode_relOrigin },
4040 { 7, PrivMode_Autowrap }, 4043 { 7, PrivMode_Autowrap },
4041 // 8, bi-directional support mode 4044 // 8, bi-directional support mode
4042 { 9, PrivMode_MouseX10 }, 4045 { 9, PrivMode_MouseX10 },
4043#ifdef menuBar_esc
4044 { menuBar_esc, PrivMode_menuBar },
4045#endif
4046 // 18, 19 printing-related 4046 // 18, 19 printing-related
4047 { 25, PrivMode_VisibleCursor }, 4047 { 25, PrivMode_VisibleCursor },
4048#ifdef scrollBar_esc 4048#ifdef scrollBar_esc
4049 { scrollBar_esc, PrivMode_scrollBar }, 4049 { scrollBar_esc, PrivMode_scrollBar },
4050#endif 4050#endif
… …
4097 /* extra handling for values with state unkept */ 4097 /* extra handling for values with state unkept */
4098 switch (arg[i]) 4098 switch (arg[i])
4099 { 4099 {
4100#if ENABLE_STYLES 4100#if ENABLE_STYLES
4101 case 1021: 4101 case 1021:
4102 if (mode) 4102 set_option (Opt_intensityStyles, mode);
4103 SET_OPTION (Opt_intensityStyles);
4104 else
4105 CLR_OPTION (Opt_intensityStyles);
4106 4103
4107 scr_touch (true); 4104 scr_touch (true);
4108 break; 4105 break;
4109#endif 4106#endif
4110 case 1048: /* alternative cursor save */ 4107 case 1048: /* alternative cursor save */
… …
4132 case 3: /* 80/132 */ 4129 case 3: /* 80/132 */
4133 if (priv_modes & PrivMode_132OK) 4130 if (priv_modes & PrivMode_132OK)
4134 set_widthheight (((state ? 132 : 80) * fwidth), height); 4131 set_widthheight (((state ? 132 : 80) * fwidth), height);
4135 break; 4132 break;
4136 case 4: /* smooth scrolling */ 4133 case 4: /* smooth scrolling */
4137 if (!state) 4134 set_option (Opt_jumpScroll, !state);
4138 SET_OPTION (Opt_jumpScroll);
4139 else
4140 CLR_OPTION (Opt_jumpScroll);
4141 break; 4135 break;
4142 case 5: /* reverse video */ 4136 case 5: /* reverse video */
4143 scr_rvideo_mode (state); 4137 scr_rvideo_mode (state);
4144 break; 4138 break;
4145 case 6: /* relative/absolute origins */ 4139 case 6: /* relative/absolute origins */
… …
4151 /* case 8: - auto repeat, can't do on a per window basis */ 4145 /* case 8: - auto repeat, can't do on a per window basis */
4152 case 9: /* X10 mouse reporting */ 4146 case 9: /* X10 mouse reporting */
4153 if (state) /* orthogonal */ 4147 if (state) /* orthogonal */
4154 priv_modes &= ~PrivMode_MouseX11; 4148 priv_modes &= ~PrivMode_MouseX11;
4155 break; 4149 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 4150#ifdef scrollBar_esc
4164 case scrollBar_esc: 4151 case scrollBar_esc:
4165 if (scrollbar_mapping (state)) 4152 if (scrollbar_mapping (state))
4166 { 4153 {
4167 resize_all_windows (0, 0, 0); 4154 resize_all_windows (0, 0, 0);
… …
4186#if 0 4173#if 0
4187 case 1001: 4174 case 1001:
4188 break; /* X11 mouse highlighting */ 4175 break; /* X11 mouse highlighting */
4189#endif 4176#endif
4190 case 1010: /* scroll to bottom on TTY output inhibit */ 4177 case 1010: /* scroll to bottom on TTY output inhibit */
4191 if (!state) 4178 set_option (Opt_scrollTtyOutput, !state);
4192 SET_OPTION (Opt_scrollTtyOutput);
4193 else
4194 CLR_OPTION (Opt_scrollTtyOutput);
4195 break; 4179 break;
4196 case 1011: /* scroll to bottom on key press */ 4180 case 1011: /* scroll to bottom on key press */
4197 if (state) 4181 set_option (Opt_scrollTtyKeypress, state);
4198 SET_OPTION (Opt_scrollTtyKeypress);
4199 else
4200 CLR_OPTION (Opt_scrollTtyKeypress);
4201 break; 4182 break;
4202 case 1047: /* secondary screen w/ clearing last */ 4183 case 1047: /* secondary screen w/ clearing last */
4203 if (OPTION (Opt_secondaryScreen)) 4184 if (OPTION (Opt_secondaryScreen))
4204 if (current_screen != PRIMARY) 4185 if (current_screen != PRIMARY)
4205 scr_erase_screen (2); 4186 scr_erase_screen (2);
… …
4343 scr_color (Color_bg, Color_bg); 4324 scr_color (Color_bg, Color_bg);
4344 break; 4325 break;
4345 4326
4346 //case 50: // not variable spacing 4327 //case 50: // not variable spacing
4347 4328
4348#ifndef NO_BRIGHTCOLOR 4329#if !ENABLE_MINIMAL
4349 case 90: 4330 case 90:
4350 case 91: /* set bright fg color */ 4331 case 91: /* set bright fg color */
4351 case 92: 4332 case 92:
4352 case 93: 4333 case 93:
4353 case 94: 4334 case 94:
… …
4398 */ 4379 */
4399void 4380void
4400rxvt_term::tt_printf (const char *fmt,...) 4381rxvt_term::tt_printf (const char *fmt,...)
4401{ 4382{
4402 va_list arg_ptr; 4383 va_list arg_ptr;
4403 unsigned char buf[256]; 4384 char buf[256];
4404 4385
4405 va_start (arg_ptr, fmt); 4386 va_start (arg_ptr, fmt);
4406 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4387 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4407 va_end (arg_ptr); 4388 va_end (arg_ptr);
4408 tt_write (buf, strlen (buf)); 4389 tt_write (buf, strlen (buf));
… …
4413 * or generated by us in response to a query ESC sequence. 4394 * or generated by us in response to a query ESC sequence.
4414 */ 4395 */
4415const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4396const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4416 4397
4417void 4398void
4418rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4399rxvt_term::tt_write (const char *data, unsigned int len)
4419{ 4400{
4401 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4402 return;
4403
4404 if (pty->pty < 0)
4405 return;
4406
4420 if (v_buflen == 0) 4407 if (v_buflen == 0)
4421 { 4408 {
4422 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4409 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4423 4410
4424 if ((unsigned int)written == len) 4411 if ((unsigned int)written == len)
4425 return; 4412 return;
4426 4413
4427 data += written; 4414 data += written;
4428 len -= written; 4415 len -= written;
4429 } 4416 }
4430 4417
4431 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4418 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4432 4419
4433 memcpy (v_buffer + v_buflen, data, len); 4420 memcpy (v_buffer + v_buflen, data, len);
4434 v_buflen += len; 4421 v_buflen += len;
4435 4422
4436 pty_ev.set (EVENT_READ | EVENT_WRITE); 4423 pty_ev.set (EVENT_READ | EVENT_WRITE);
4437} 4424}
4438 4425
4439void rxvt_term::pty_write () 4426void rxvt_term::pty_write ()
4440{ 4427{
4441 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4428 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4442 4429
4443 if (written > 0) 4430 if (written > 0)
4444 { 4431 {
4445 v_buflen -= written; 4432 v_buflen -= written;
4446 4433

Diff Legend

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