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.220 by root, Sat Dec 31 18:19:06 2005 UTC vs.
Revision 1.303 by root, Tue Jan 31 21:47:56 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.
… …
43 * along with this program; if not, write to the Free Software 43 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 45 *----------------------------------------------------------------------*/
46 46
47/*{{{ includes: */ 47/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 48#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h"
50#include "rxvtperl.h"
50#include "version.h" 51#include "version.h"
51#include "command.h" 52#include "command.h"
52 53
53#ifdef KEYSYM_RESOURCE 54#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 55# include "keyboard.h"
55#endif 56#endif
56 57
57#include <csignal> 58#include <csignal>
58 59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
63
59/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
60 65
61#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
62
63// exception thrown when the command parser runs out of input data
64class out_of_input { } out_of_input;
65 67
66#if ENABLE_FRILLS || ISO_14755 68#if ENABLE_FRILLS || ISO_14755
67 69
68#define ISO_14755_STARTED 0x80000000UL 70#define ISO_14755_STARTED 0x80000000UL
69#define ISO_14755_51 0x40000000UL // basic (section 5.1) 71#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
141 || !IN_RANGE_EXC (y, 0, nrow)) 143 || !IN_RANGE_EXC (y, 0, nrow))
142 return; 144 return;
143 145
144 for (;;) 146 for (;;)
145 { 147 {
146 const line_t &l = ROW(y - view_start); 148 const line_t &l = ROW(y + view_start);
147 149
148 text_t t = l.t[x]; 150 text_t t = l.t[x];
149 151
150 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
151 { 153 {
… …
224# if !UNICODE3 226# if !UNICODE3
225 if (ch >= 0x10000) 227 if (ch >= 0x10000)
226 ch = 0xfffd; 228 ch = 0xfffd;
227# endif 229# endif
228 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
231
232 if (WCWIDTH (ch) >= 2)
229 scr_overlay_set (12, y, NOCHAR, r); 233 scr_overlay_set (12, y, NOCHAR, r);
230 } 234 }
231 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// }
232 scr_overlay_set (0, len , attr); 241 scr_overlay_set (0, len , attr);
233 scr_overlay_set (0, len + 1, fname); 242 scr_overlay_set (0, len + 1, fname);
234 243
235 free (fname); 244 free (fname);
236 245
… …
262 mb[0] = ch[0]; 271 mb[0] = ch[0];
263 len = 1; 272 len = 1;
264 } 273 }
265 274
266 if (len > 0) 275 if (len > 0)
267 tt_write ((unsigned char *)mb, len); 276 tt_write (mb, len);
268 else 277 else
269 scr_bell (); 278 scr_bell ();
270 } 279 }
271 280
272 iso14755buf = 0; 281 iso14755buf = 0;
… …
296rxvt_term::lookup_key (XKeyEvent &ev) 305rxvt_term::lookup_key (XKeyEvent &ev)
297{ 306{
298 int ctrl, meta, shft, len; 307 int ctrl, meta, shft, len;
299 unsigned int newlen; 308 unsigned int newlen;
300 KeySym keysym; 309 KeySym keysym;
301#ifdef DEBUG_CMD
302 static int debug_key = 1; /* accessible by a debugger only */
303#endif
304 int valid_keysym; 310 int valid_keysym;
305 unsigned char kbuf[KBUFSZ]; 311 char kbuf[KBUFSZ];
306 312
307 /* 313 /*
308 * 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
309 * escape sequence to toggle the Keypad. 315 * escape sequence to toggle the Keypad.
310 * 316 *
… …
328 Status status_return; 334 Status status_return;
329 335
330#if 0 336#if 0
331#ifdef X_HAVE_UTF8_STRING 337#ifdef X_HAVE_UTF8_STRING
332 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
333 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 339 len = Xutf8LookupString (Input_Context, &ev, kbuf,
334 KBUFSZ, &keysym, &status_return); 340 KBUFSZ, &keysym, &status_return);
335 else 341 else
336#endif 342#endif
337#endif 343#endif
338 { 344 {
… …
375 || status_return == XLookupBoth; 381 || status_return == XLookupBoth;
376 } 382 }
377 else 383 else
378#endif 384#endif
379 { 385 {
380 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 386 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
381 valid_keysym = keysym != NoSymbol; 387 valid_keysym = keysym != NoSymbol;
382 } 388 }
383 389
384 if (valid_keysym) 390 if (valid_keysym)
385 { 391 {
… …
437 scr_move_to (0, 1); 443 scr_move_to (0, 1);
438 return; 444 return;
439 } 445 }
440 else if (keysym == XK_End) 446 else if (keysym == XK_End)
441 { 447 {
442 scr_move_to (1, 0); 448 scr_move_to (1, 1);
443 return; 449 return;
444 } 450 }
445 } 451 }
446#endif 452#endif
447 } 453 }
… …
458 { 464 {
459 switch (keysym) 465 switch (keysym)
460 { 466 {
461 /* normal XTerm key bindings */ 467 /* normal XTerm key bindings */
462 case XK_Insert: /* Shift+Insert = paste mouse selection */ 468 case XK_Insert: /* Shift+Insert = paste mouse selection */
463 selection_request (ev.time, 0, 0); 469 selection_request (ev.time);
464 return; 470 return;
465#if TODO 471#if TODO
466 /* rxvt extras */ 472 /* rxvt extras */
467 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 473 case XK_KP_Add: /* Shift+KP_Add = bigger font */
468 change_font (FONT_UP); 474 change_font (FONT_UP);
… …
849 { 855 {
850#ifdef META8_OPTION 856#ifdef META8_OPTION
851 /* set 8-bit on */ 857 /* set 8-bit on */
852 if (meta && (meta_char == 0x80)) 858 if (meta && (meta_char == 0x80))
853 { 859 {
854 unsigned char *ch; 860 char *ch;
855 861
856 for (ch = kbuf; ch < kbuf + len; ch++) 862 for (ch = kbuf; ch < kbuf + len; ch++)
857 *ch |= 0x80; 863 *ch |= 0x80;
858 864
859 meta = 0; 865 meta = 0;
860 } 866 }
861#endif 867#endif
862 /* nil */ ; 868 /* nil */ ;
863 } 869 }
864 } 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;
865 874
866 if (len <= 0) 875 if (len <= 0)
867 return; /* not mapped */ 876 return; /* not mapped */
868 877
869 if (OPTION (Opt_scrollTtyKeypress)) 878 if (OPTION (Opt_scrollTtyKeypress))
… …
892#ifdef META8_OPTION 901#ifdef META8_OPTION
893 && meta_char == C0_ESC 902 && meta_char == C0_ESC
894#endif 903#endif
895 ) 904 )
896 { 905 {
897 const unsigned char ch = C0_ESC; 906 const char ch = C0_ESC;
898 tt_write (&ch, 1); 907 tt_write (&ch, 1);
899 } 908 }
900 909
901#if defined(DEBUG_CMD)
902 /* Display keyboard buffer contents */
903 unsigned char *p;
904 int i;
905
906 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
907 for (i = 0, p = kbuf; i < len; i++, p++)
908 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
909 fprintf (stderr, "'\n");
910#endif /* DEBUG_CMD */
911 tt_write (kbuf, (unsigned int)len); 910 tt_write (kbuf, (unsigned int)len);
912} 911}
913/*}}} */ 912/*}}} */
914 913
915#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 914#if defined (KEYSYM_RESOURCE)
916/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
917/* attempt to `write' count to the input buffer */
918unsigned int 915unsigned int
919rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 916rxvt_term::cmd_write (const char *str, unsigned int count)
920{ 917{
921 unsigned int n, s; 918 unsigned int n, s;
922 919
923 n = cmdbuf_ptr - cmdbuf_base; 920 n = cmdbuf_ptr - cmdbuf_base;
924 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 921 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
961 } 958 }
962#endif 959#endif
963 960
964 if (want_refresh) 961 if (want_refresh)
965 { 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
966 scr_refresh (refresh_type); 1001 scr_refresh ();
967 scrollbar_show (1); 1002 scrollbar_show (1);
968#ifdef USE_XIM 1003#ifdef USE_XIM
969 IMSendSpot (); 1004 IMSendSpot ();
970#endif 1005#endif
971 } 1006 }
… …
974} 1009}
975 1010
976void 1011void
977rxvt_term::check_cb (check_watcher &w) 1012rxvt_term::check_cb (check_watcher &w)
978{ 1013{
979 SET_R (this); 1014 make_current ();
980 SET_LOCALE (locale);
981 1015
982 display->flush (); 1016 display->flush ();
983 1017
984 if (want_refresh && !flush_ev.active) 1018 if (want_refresh && !flush_ev.active)
985 flush_ev.start (NOW + 0.01); 1019 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
986} 1020}
987 1021
988void 1022void
989rxvt_term::flush_cb (time_watcher &w) 1023rxvt_term::flush_cb (time_watcher &w)
990{ 1024{
991 SET_R (this); 1025 make_current ();
992 SET_LOCALE (locale);
993 1026
994 refresh_limit = 1; 1027 refresh_limit = 1;
995 refresh_count = 0; 1028 refresh_count = 0;
996 flush (); 1029 flush ();
997} 1030}
… …
1001rxvt_term::cursor_blink_cb (time_watcher &w) 1034rxvt_term::cursor_blink_cb (time_watcher &w)
1002{ 1035{
1003 hidden_cursor = !hidden_cursor; 1036 hidden_cursor = !hidden_cursor;
1004 want_refresh = 1; 1037 want_refresh = 1;
1005 1038
1006 w.start (w.at + BLINK_INTERVAL); 1039 w.start (w.at + CURSOR_BLINK_INTERVAL);
1007} 1040}
1008#endif 1041#endif
1009 1042
1010#ifdef TEXT_BLINK 1043#ifdef TEXT_BLINK
1011void 1044void
… …
1025rxvt_term::cont_scroll_cb (time_watcher &w) 1058rxvt_term::cont_scroll_cb (time_watcher &w)
1026{ 1059{
1027 if ((scrollbar_isUp() || scrollbar_isDn()) && 1060 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1028 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1061 scr_page (scrollbar_isUp() ? UP : DN, 1))
1029 { 1062 {
1030 refresh_type |= SMOOTH_REFRESH;
1031 want_refresh = 1; 1063 want_refresh = 1;
1032 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1064 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1033 } 1065 }
1034} 1066}
1035#endif 1067#endif
… …
1039rxvt_term::sel_scroll_cb (time_watcher &w) 1071rxvt_term::sel_scroll_cb (time_watcher &w)
1040{ 1072{
1041 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1073 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1042 { 1074 {
1043 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1075 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1044 refresh_type |= SMOOTH_REFRESH;
1045 want_refresh = 1; 1076 want_refresh = 1;
1046 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1077 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1047 } 1078 }
1048} 1079}
1049#endif 1080#endif
… …
1054{ 1085{
1055 if (mouse_slip_wheel_speed == 0 1086 if (mouse_slip_wheel_speed == 0
1056 || 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)
1057 : scr_page (UP, mouse_slip_wheel_speed)) 1088 : scr_page (UP, mouse_slip_wheel_speed))
1058 { 1089 {
1059 if (view_start == nsaved || 1090 if (view_start == top_row || view_start == 0)
1060 view_start == 0)
1061 mouse_slip_wheel_speed = 0; 1091 mouse_slip_wheel_speed = 0;
1062 1092
1063 refresh_type |= SMOOTH_REFRESH;
1064 want_refresh = 1; 1093 want_refresh = 1;
1065 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1094 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1066 } 1095 }
1067} 1096}
1068#endif 1097#endif
1069 1098
1099#if LINUX_YIELD_HACK
1100static struct event_handler
1101{
1102 check_watcher yield_ev;
1103
1104 void yield_cb (check_watcher &w)
1105 {
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.
1109
1110 struct timespec ts = { 0, 0 };
1111 nanosleep (&ts, 0);
1112
1113 w.stop ();
1114 }
1115
1116 event_handler ()
1117 : yield_ev (this, &event_handler::yield_cb)
1118 {
1119 }
1120} event_handler;
1121#endif
1122
1070bool 1123bool
1071rxvt_term::pty_fill () 1124rxvt_term::pty_fill ()
1072{ 1125{
1073 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1126 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1074 1127
1075 if (CBUFSIZ == n) 1128 if (CBUFSIZ == n)
1076 { 1129 {
1077 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1130 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1078 n = 0; 1131 n = 0;
1079 } 1132 }
1080 1133
1081 memmove (cmdbuf_base, cmdbuf_ptr, n); 1134 memmove (cmdbuf_base, cmdbuf_ptr, n);
1082 cmdbuf_ptr = cmdbuf_base; 1135 cmdbuf_ptr = cmdbuf_base;
1083 cmdbuf_endp = cmdbuf_ptr + n; 1136 cmdbuf_endp = cmdbuf_ptr + n;
1084 1137
1085 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1138 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1086 1139
1087 if (n > 0) 1140 if (r > 0)
1088 { 1141 {
1089 cmdbuf_endp += n; 1142 cmdbuf_endp += r;
1090 return true; 1143 return true;
1091 } 1144 }
1092 else if ((n < 0 && errno != EAGAIN && errno != EINTR) || n == 0) 1145 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1146 {
1147#if LINUX_YIELD_HACK
1148 if (display->is_local)
1149 event_handler.yield_ev.start ();
1150#endif
1151 }
1152 else
1093 { 1153 {
1094 pty_ev.stop (); 1154 pty_ev.stop ();
1095 1155
1096 if (!OPTION (Opt_hold)) 1156 if (!OPTION (Opt_hold))
1097 destroy (); 1157 destroy ();
… …
1101} 1161}
1102 1162
1103void 1163void
1104rxvt_term::pty_cb (io_watcher &w, short revents) 1164rxvt_term::pty_cb (io_watcher &w, short revents)
1105{ 1165{
1106 SET_R (this); 1166 make_current ();
1107 SET_LOCALE (locale);
1108 1167
1109 if (revents & EVENT_READ) 1168 if (revents & EVENT_READ)
1110 // loop, but don't allow a single term to monopolize us 1169 // loop, but don't allow a single term to monopolize us
1111 while (pty_fill ()) 1170 while (pty_fill ())
1112 if (cmd_parse ()) 1171 if (cmd_parse ())
… …
1117} 1176}
1118 1177
1119void 1178void
1120rxvt_term::pointer_unblank () 1179rxvt_term::pointer_unblank ()
1121{ 1180{
1122 XDefineCursor (display->display, vt, TermWin_cursor); 1181 XDefineCursor (xdisp, vt, TermWin_cursor);
1123 recolour_cursor (); 1182 recolour_cursor ();
1124 1183
1125#ifdef POINTER_BLANK 1184#ifdef POINTER_BLANK
1126 hidden_pointer = 0; 1185 hidden_pointer = 0;
1127 1186
… …
1132 1191
1133#ifdef POINTER_BLANK 1192#ifdef POINTER_BLANK
1134void 1193void
1135rxvt_term::pointer_blank () 1194rxvt_term::pointer_blank ()
1136{ 1195{
1137 if (! OPTION (Opt_pointerBlank)) 1196 if (!OPTION (Opt_pointerBlank))
1138 return; 1197 return;
1139 1198
1140 XDefineCursor (display->display, vt, display->blank_cursor); 1199 XDefineCursor (xdisp, vt, display->blank_cursor);
1141 XFlush (display->display); 1200 XFlush (xdisp);
1142 1201
1143 hidden_pointer = 1; 1202 hidden_pointer = 1;
1144} 1203}
1145 1204
1146void 1205void
1147rxvt_term::pointer_cb (time_watcher &w) 1206rxvt_term::pointer_cb (time_watcher &w)
1148{ 1207{
1149 SET_R (this); 1208 make_current ();
1150 SET_LOCALE (locale);
1151 1209
1152 pointer_blank (); 1210 pointer_blank ();
1153} 1211}
1154#endif 1212#endif
1155 1213
… …
1220 (32 + button_number + key_state), 1278 (32 + button_number + key_state),
1221 (32 + x + 1), 1279 (32 + x + 1),
1222 (32 + y + 1)); 1280 (32 + y + 1));
1223} 1281}
1224 1282
1225#ifdef USING_W11LIB
1226void
1227rxvt_W11_process_x_event (XEvent *ev)
1228{
1229 rxvt_t *r = rxvt_get_r ();
1230
1231 x_cb (*ev);
1232}
1233#endif
1234
1235/*{{{ process an X event */ 1283/*{{{ process an X event */
1236void 1284void
1237rxvt_term::x_cb (XEvent &ev) 1285rxvt_term::x_cb (XEvent &ev)
1238{ 1286{
1239 dDisp; 1287 make_current ();
1240 1288
1241 SET_R (this); 1289 dLocal (Display *, xdisp);
1242 SET_LOCALE (locale);
1243 1290
1244#if defined(CURSOR_BLINK) 1291 if (ev.xany.window == vt
1245 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1292 && SHOULD_INVOKE (HOOK_X_EVENT)
1246 { 1293 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1247 if (hidden_cursor) 1294 return;
1248 {
1249 hidden_cursor = 0;
1250 want_refresh = 1;
1251 }
1252 1295
1253 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1296 // for XQueryPointer
1254 }
1255#endif
1256
1257#if defined(POINTER_BLANK)
1258 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1259 {
1260 if (ev.type == MotionNotify
1261 || ev.type == ButtonPress
1262 || ev.type == ButtonRelease)
1263 if (hidden_pointer)
1264 pointer_unblank ();
1265
1266 if (ev.type == KeyPress && hidden_pointer == 0)
1267 pointer_blank ();
1268 }
1269#endif
1270
1271 Window unused_root, unused_child; 1297 Window unused_root, unused_child;
1272 int unused_root_x, unused_root_y; 1298 int unused_root_x, unused_root_y;
1273 unsigned int unused_mask; 1299 unsigned int unused_mask;
1274 1300
1275 switch (ev.type) 1301 switch (ev.type)
… …
1282 1308
1283 break; 1309 break;
1284 1310
1285 case KeyRelease: 1311 case KeyRelease:
1286 { 1312 {
1287#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1313#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1288 KeySym ks; 1314 KeySym keysym;
1289 1315
1290 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1316 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1291#endif 1317#endif
1292 1318
1293#if ENABLE_FRILLS || ISO_14755 1319#if ENABLE_FRILLS || ISO_14755
1294 // ISO 14755 support 1320 // ISO 14755 support
1295 if (iso14755buf) 1321 if (iso14755buf)
… …
1300# endif 1326# endif
1301# if ISO_14755 1327# if ISO_14755
1302 // iso14755 part 5.2 handling: release time 1328 // iso14755 part 5.2 handling: release time
1303 // first: controls 1329 // first: controls
1304 if ((ev.xkey.state & ControlMask) 1330 if ((ev.xkey.state & ControlMask)
1305 && ((ks >= 0x40 && ks <= 0x5f) 1331 && ((keysym >= 0x40 && keysym <= 0x5f)
1306 || (ks >= 0x61 && ks <= 0x7f))) 1332 || (keysym >= 0x61 && keysym <= 0x7f)))
1307 { 1333 {
1308 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1334 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1309 commit_iso14755 (); 1335 commit_iso14755 ();
1310 return; // case-break; 1336 goto skip_switch;
1311 } 1337 }
1312 1338
1313 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1339 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1314 if (i[0] == ks) 1340 if (i[0] == keysym)
1315 { 1341 {
1316 iso14755buf = ISO_14755_51 | i[1]; 1342 iso14755buf = ISO_14755_51 | i[1];
1317 commit_iso14755 (); 1343 commit_iso14755 ();
1318 return; // case-break; 1344 goto skip_switch;
1319 } 1345 }
1320 1346
1321 scr_bell (); 1347 scr_bell ();
1322# endif 1348# endif
1323 iso14755buf = 0; 1349 iso14755buf = 0;
… …
1342 else 1368 else
1343 iso14755buf = 0; 1369 iso14755buf = 0;
1344 } 1370 }
1345#endif 1371#endif
1346 1372
1373 if (ev.xany.window == vt
1374 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1375 break;
1376
1347#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1377#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1348 if (!(ev.xkey.state & ControlMask)) 1378 if (!(ev.xkey.state & ControlMask))
1349 slip_wheel_ev.stop (); 1379 slip_wheel_ev.stop ();
1350 else if (ks == XK_Control_L || ks == XK_Control_R) 1380 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1351 mouse_slip_wheel_speed = 0; 1381 mouse_slip_wheel_speed = 0;
1352#endif 1382#endif
1353 break; 1383 break;
1354 } 1384 }
1355 1385
… …
1361 button_release (ev.xbutton); 1391 button_release (ev.xbutton);
1362 break; 1392 break;
1363 1393
1364 case ClientMessage: 1394 case ClientMessage:
1365 if (ev.xclient.format == 32 1395 if (ev.xclient.format == 32
1366 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1396 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1367 { 1397 {
1398 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1399 {
1400 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1401 {
1368 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1402 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1403 {
1404 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1369 destroy (); 1405 destroy ();
1406 }
1370#if ENABLE_EWMH 1407#if ENABLE_EWMH
1371 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1408 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1372 XSendEvent (disp, ev.xclient.window = display->root, 1409 XSendEvent (xdisp, ev.xclient.window = display->root,
1373 False, SubstructureRedirectMask | SubstructureNotifyMask, 1410 False, SubstructureRedirectMask | SubstructureNotifyMask,
1374 &ev); 1411 &ev);
1412#endif
1413 }
1414 }
1415#if ENABLE_XEMBED
1416 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1417 {
1418 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1419 focus_in ();
1420 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1421 focus_out ();
1422 }
1375#endif 1423#endif
1376 } 1424 }
1377#if ENABLE_XEMBED
1378 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1379 {
1380 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1381 focus_in ();
1382 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1383 focus_out ();
1384 }
1385#endif
1386#ifdef OFFIX_DND
1387 /* OffiX Dnd (drag 'n' drop) protocol */
1388 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1389 && (ev.xclient.data.l[0] == DndFile
1390 || ev.xclient.data.l[0] == DndDir
1391 || ev.xclient.data.l[0] == DndLink))
1392 {
1393 /* Get Dnd data */
1394 Atom ActualType;
1395 int ActualFormat;
1396 unsigned char *data;
1397 unsigned long Size, RemainingBytes;
1398
1399 XGetWindowProperty (disp, display->root,
1400 xa[XA_DNDSELECTION],
1401 0L, 1000000L,
1402 False, AnyPropertyType,
1403 &ActualType, &ActualFormat,
1404 &Size, &RemainingBytes,
1405 &data);
1406 set_string_property (XA_CUT_BUFFER0, data);
1407 XFree (data);
1408 selection_paste (display->root, XA_CUT_BUFFER0, true);
1409 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1410 }
1411#endif /* OFFIX_DND */
1412 break; 1425 break;
1413 1426
1414 case MappingNotify: 1427 case MappingNotify:
1415 XRefreshKeyboardMapping (&ev.xmapping); 1428 XRefreshKeyboardMapping (&ev.xmapping);
1416 break; 1429 break;
… …
1449 break; 1462 break;
1450 1463
1451 case ConfigureNotify: 1464 case ConfigureNotify:
1452 if (ev.xconfigure.window == parent[0]) 1465 if (ev.xconfigure.window == parent[0])
1453 { 1466 {
1454 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1467 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1455 ; 1468 ;
1456 1469
1457 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1470 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1458 { 1471 {
1459 seen_resize = 1; 1472 seen_resize = 1;
1460 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1473 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1461 } 1474 }
1462 1475
1476 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1477
1463#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1478#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1464 if (OPTION (Opt_transparent)) 1479 if (OPTION (Opt_transparent))
1465 check_our_parents (); 1480 check_our_parents ();
1466#endif 1481#endif
1467 } 1482 }
1468 break; 1483 break;
1469 1484
1470 case PropertyNotify: 1485 case PropertyNotify:
1486 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1471 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1487 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1472 && ev.xproperty.state == PropertyNewValue) 1488 && ev.xproperty.state == PropertyNewValue)
1473 selection_property (ev.xproperty.window, ev.xproperty.atom); 1489 selection_property (ev.xproperty.window, ev.xproperty.atom);
1474 1490
1475 break; 1491 break;
1476 1492
1477 case SelectionClear: 1493 case SelectionClear:
1478 selection_clear (); 1494 selection_clear ();
… …
1483 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1499 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1484 break; 1500 break;
1485 1501
1486 case SelectionRequest: 1502 case SelectionRequest:
1487 selection_send (ev.xselectionrequest); 1503 selection_send (ev.xselectionrequest);
1504 break;
1505
1506 case MapNotify:
1507 mapped = 1;
1508#ifdef TEXT_BLINK
1509 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1510#endif
1511 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1488 break; 1512 break;
1489 1513
1490 case UnmapNotify: 1514 case UnmapNotify:
1491 mapped = 0; 1515 mapped = 0;
1492#ifdef TEXT_BLINK 1516#ifdef TEXT_BLINK
1493 text_blink_ev.stop (); 1517 text_blink_ev.stop ();
1494#endif 1518#endif
1495 break; 1519 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1496
1497 case MapNotify:
1498 mapped = 1;
1499#ifdef TEXT_BLINK
1500 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1501#endif
1502 break; 1520 break;
1503 1521
1504#ifdef TRANSPARENT 1522#ifdef TRANSPARENT
1505 case ReparentNotify: 1523 case ReparentNotify:
1506 rootwin_cb (ev); 1524 rootwin_cb (ev);
… …
1512 if (ev.xany.window == vt) 1530 if (ev.xany.window == vt)
1513 { 1531 {
1514 do 1532 do
1515 scr_expose (ev.xexpose.x, ev.xexpose.y, 1533 scr_expose (ev.xexpose.x, ev.xexpose.y,
1516 ev.xexpose.width, ev.xexpose.height, False); 1534 ev.xexpose.width, ev.xexpose.height, False);
1517 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1535 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1518 1536
1519 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1537 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1520 1538
1521 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1539 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1522 scr_expose (ev.xexpose.x, ev.xexpose.y, 1540 scr_expose (ev.xexpose.x, ev.xexpose.y,
1523 ev.xexpose.width, ev.xexpose.height, False); 1541 ev.xexpose.width, ev.xexpose.height, False);
1524 1542
1525 scr_refresh (refresh_type); 1543 want_refresh = 1;
1526 } 1544 }
1527 else 1545 else
1528 { 1546 {
1529 XEvent unused_event; 1547 XEvent unused_event;
1530 1548
1531 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1549 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1532 ; 1550 ;
1533 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1551 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1534 ; 1552 ;
1535 1553
1536 if (isScrollbarWindow (ev.xany.window)) 1554 if (isScrollbarWindow (ev.xany.window))
1537 { 1555 {
1538 scrollBar.setIdle (); 1556 scrollBar.setIdle ();
1539 scrollbar_show (0); 1557 scrollbar_show (0);
1540 } 1558 }
1541#ifdef MENUBAR
1542 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1543 menubar_expose ();
1544#endif
1545 1559
1546#ifdef TRANSPARENT 1560#ifdef TRANSPARENT
1547 if (am_transparent && ev.xany.window == parent[0]) 1561 if (am_transparent && ev.xany.window == parent[0])
1548 XClearWindow (disp, ev.xany.window); 1562 XClearWindow (xdisp, ev.xany.window);
1549#endif 1563#endif
1550 } 1564 }
1551 break; 1565 break;
1552 1566
1553 case MotionNotify: 1567 case MotionNotify:
1554#ifdef POINTER_BLANK 1568#ifdef POINTER_BLANK
1555 if (hidden_pointer) 1569 if (hidden_pointer)
1556 pointer_unblank (); 1570 pointer_unblank ();
1557#endif 1571#endif
1558#if MENUBAR
1559 if (isMenuBarWindow (ev.xany.window))
1560 {
1561 menubar_control (ev.xbutton);
1562 break;
1563 }
1564#endif
1565 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1572 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1566 break; 1573 break;
1567 1574
1568 if (ev.xany.window == vt) 1575 if (ev.xany.window == vt)
1569 { 1576 {
1577 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1578 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1579 ; // nop
1570 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1580 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1571 { 1581 {
1572 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1582 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1573 ; 1583 ;
1574 1584
1575 XQueryPointer (disp, vt, 1585 XQueryPointer (xdisp, vt,
1576 &unused_root, &unused_child, 1586 &unused_root, &unused_child,
1577 &unused_root_x, &unused_root_y, 1587 &unused_root_x, &unused_root_y,
1578 &ev.xbutton.x, &ev.xbutton.y, 1588 &ev.xbutton.x, &ev.xbutton.y,
1579 &ev.xbutton.state); 1589 &ev.xbutton.state);
1580#ifdef MOUSE_THRESHOLD 1590#ifdef MOUSE_THRESHOLD
… …
1644#endif 1654#endif
1645 } 1655 }
1646 } 1656 }
1647 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1657 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1648 { 1658 {
1649 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1659 while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1650 MotionNotify, &ev)) 1660 MotionNotify, &ev))
1651 ; 1661 ;
1652 1662
1653 XQueryPointer (disp, scrollBar.win, 1663 XQueryPointer (xdisp, scrollBar.win,
1654 &unused_root, &unused_child, 1664 &unused_root, &unused_child,
1655 &unused_root_x, &unused_root_y, 1665 &unused_root_x, &unused_root_y,
1656 &ev.xbutton.x, &ev.xbutton.y, 1666 &ev.xbutton.x, &ev.xbutton.y,
1657 &unused_mask); 1667 &unused_mask);
1658 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1668 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1659 scrollbar_size ()); 1669 scrollbar_size ());
1660 scr_refresh (refresh_type); 1670 want_refresh = 1;
1661 refresh_limit = 0; 1671 refresh_limit = 0;
1662 scrollbar_show (1); 1672 scrollbar_show (1);
1663 } 1673 }
1664 break; 1674 break;
1665 } 1675 }
1676
1677skip_switch: ;
1678
1679#if defined(CURSOR_BLINK)
1680 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1681 {
1682 if (hidden_cursor)
1683 {
1684 hidden_cursor = 0;
1685 want_refresh = 1;
1686 }
1687
1688 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1689 }
1690#endif
1691
1692#if defined(POINTER_BLANK)
1693 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1694 {
1695 if (ev.type == MotionNotify
1696 || ev.type == ButtonPress
1697 || ev.type == ButtonRelease)
1698 if (hidden_pointer)
1699 pointer_unblank ();
1700
1701 if (ev.type == KeyPress && hidden_pointer == 0)
1702 pointer_blank ();
1703 }
1704#endif
1666} 1705}
1667 1706
1668void 1707void
1669rxvt_term::focus_in () 1708rxvt_term::focus_in ()
1670{ 1709{
1671 if (!focus) 1710 if (!focus)
1672 { 1711 {
1673 focus = 1; 1712 focus = 1;
1674 want_refresh = 1; 1713 want_refresh = 1;
1714
1715 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1716
1675#if USE_XIM 1717#if USE_XIM
1676 if (Input_Context != NULL) 1718 if (Input_Context != NULL)
1677 { 1719 {
1678 IMSetStatusPosition (); 1720 IMSetStatusPosition ();
1679 XSetICFocus (Input_Context); 1721 XSetICFocus (Input_Context);
1680 } 1722 }
1681#endif 1723#endif
1682#if CURSOR_BLINK 1724#if CURSOR_BLINK
1683 if (OPTION (Opt_cursorBlink)) 1725 if (OPTION (Opt_cursorBlink))
1684 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1726 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1685#endif 1727#endif
1686#if OFF_FOCUS_FADING 1728#if OFF_FOCUS_FADING
1687 if (rs[Rs_fade]) 1729 if (rs[Rs_fade])
1688 { 1730 {
1689 pix_colors = pix_colors_focused; 1731 pix_colors = pix_colors_focused;
… …
1699 if (focus) 1741 if (focus)
1700 { 1742 {
1701 focus = 0; 1743 focus = 0;
1702 want_refresh = 1; 1744 want_refresh = 1;
1703 1745
1746 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1747
1704#if ENABLE_FRILLS || ISO_14755 1748#if ENABLE_FRILLS || ISO_14755
1749 if (iso14755buf)
1750 {
1705 iso14755buf = 0; 1751 iso14755buf = 0;
1706#endif
1707#if ENABLE_OVERLAY 1752# if ENABLE_OVERLAY
1708 scr_overlay_off (); 1753 scr_overlay_off ();
1754# endif
1755 }
1709#endif 1756#endif
1710#if USE_XIM 1757#if USE_XIM
1711 if (Input_Context != NULL) 1758 if (Input_Context != NULL)
1712 XUnsetICFocus (Input_Context); 1759 XUnsetICFocus (Input_Context);
1713#endif 1760#endif
… …
1728 1775
1729#if TRANSPARENT 1776#if TRANSPARENT
1730void 1777void
1731rxvt_term::rootwin_cb (XEvent &ev) 1778rxvt_term::rootwin_cb (XEvent &ev)
1732{ 1779{
1733 SET_R (this); 1780 make_current ();
1734 SET_LOCALE (locale);
1735 1781
1736 switch (ev.type) 1782 switch (ev.type)
1737 { 1783 {
1738 case PropertyNotify: 1784 case PropertyNotify:
1739 /* 1785 /*
… …
1757rxvt_term::button_press (XButtonEvent &ev) 1803rxvt_term::button_press (XButtonEvent &ev)
1758{ 1804{
1759 int reportmode = 0, clickintime; 1805 int reportmode = 0, clickintime;
1760 1806
1761 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1807 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1808
1762 if (!bypass_keystate) 1809 if (!bypass_keystate)
1763 reportmode = !! (priv_modes & PrivMode_mouse_report); 1810 reportmode = !! (priv_modes & PrivMode_mouse_report);
1764 1811
1765 /* 1812 /*
1766 * VT window processing of button press 1813 * VT window processing of button press
1767 */ 1814 */
1768 if (ev.window == vt) 1815 if (ev.window == vt)
1769 { 1816 {
1817 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1818 return;
1819
1770#if ISO_14755 1820#if ISO_14755
1771 // 5.4 1821 // 5.4
1772 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1822 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1773 { 1823 {
1774 iso14755_54 (ev.x, ev.y); 1824 iso14755_54 (ev.x, ev.y);
… …
1786#ifdef MOUSE_REPORT_DOUBLECLICK 1836#ifdef MOUSE_REPORT_DOUBLECLICK
1787 if (ev.button == MEvent.button && clickintime) 1837 if (ev.button == MEvent.button && clickintime)
1788 { 1838 {
1789 /* same button, within alloted time */ 1839 /* same button, within alloted time */
1790 MEvent.clicks++; 1840 MEvent.clicks++;
1841
1791 if (MEvent.clicks > 1) 1842 if (MEvent.clicks > 1)
1792 { 1843 {
1793 /* only report double clicks */ 1844 /* only report double clicks */
1794 MEvent.clicks = 2; 1845 MEvent.clicks = 2;
1795 mouse_report (ev); 1846 mouse_report (ev);
… …
1827#else 1878#else
1828 selection.rect = false; 1879 selection.rect = false;
1829#endif 1880#endif
1830 1881
1831 /* allow shift+left click to extend selection */ 1882 /* allow shift+left click to extend selection */
1832 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1883 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1833 { 1884 {
1834 if (MEvent.button == Button1 && clickintime) 1885 if (MEvent.button == Button1 && clickintime)
1835 selection_rotate (ev.x, ev.y); 1886 selection_rotate (ev.x, ev.y);
1836 else 1887 else
1837 selection_extend (ev.x, ev.y, 1); 1888 selection_extend (ev.x, ev.y, 1);
… …
2002 } 2053 }
2003 2054
2004 break; 2055 break;
2005 } 2056 }
2006 } 2057 }
2058
2007 return; 2059 return;
2008 } 2060 }
2009#if MENUBAR
2010 /*
2011 * Menubar window processing of button press
2012 */
2013 if (isMenuBarWindow (ev.window))
2014 menubar_control (ev);
2015#endif
2016} 2061}
2017 2062
2018void 2063void
2019rxvt_term::button_release (XButtonEvent &ev) 2064rxvt_term::button_release (XButtonEvent &ev)
2020{ 2065{
… …
2026 2071
2027 if (scrollbar_isUpDn ()) 2072 if (scrollbar_isUpDn ())
2028 { 2073 {
2029 scrollBar.setIdle (); 2074 scrollBar.setIdle ();
2030 scrollbar_show (0); 2075 scrollbar_show (0);
2031#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2032 refresh_type &= ~SMOOTH_REFRESH;
2033#endif
2034 } 2076 }
2035 2077
2036#ifdef SELECTION_SCROLLING 2078#ifdef SELECTION_SCROLLING
2037 if (sel_scroll_ev.active) 2079 if (sel_scroll_ev.active)
2038 sel_scroll_ev.stop(); 2080 sel_scroll_ev.stop();
2039#endif 2081#endif
2040 2082
2041 if (ev.window == vt) 2083 if (ev.window == vt)
2042 { 2084 {
2085 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2086 return;
2087
2043#if ISO_14755 2088#if ISO_14755
2044 // 5.4 2089 // 5.4
2045 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2090 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2046 return; 2091 return;
2047#endif 2092#endif
2093
2048 if (reportmode) 2094 if (reportmode)
2049 { 2095 {
2050 /* mouse report from vt window */ 2096 /* mouse report from vt window */
2051 /* don't report release of wheel "buttons" */ 2097 /* don't report release of wheel "buttons" */
2052 if (ev.button >= 4) 2098 if (ev.button >= 4)
… …
2082 { 2128 {
2083 case Button1: 2129 case Button1:
2084 case Button3: 2130 case Button3:
2085 selection_make (ev.time); 2131 selection_make (ev.time);
2086 break; 2132 break;
2133
2087 case Button2: 2134 case Button2:
2088 selection_request (ev.time, ev.x, ev.y); 2135 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2136 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2089 break; 2137 break;
2138
2090#ifdef MOUSE_WHEEL 2139#ifdef MOUSE_WHEEL
2091 case Button4: 2140 case Button4:
2092 case Button5: 2141 case Button5:
2093 { 2142 {
2094 int i; 2143 int i;
… …
2116 slip_wheel_ev.start (); 2165 slip_wheel_ev.start ();
2117 } 2166 }
2118 else 2167 else
2119 { 2168 {
2120# endif 2169# endif
2121# ifdef JUMP_MOUSE_WHEEL
2122 scr_page (v, i); 2170 scr_page (v, i);
2123 scr_refresh (SMOOTH_REFRESH);
2124 scrollbar_show (1); 2171 scrollbar_show (1);
2125# else
2126 while (i--)
2127 {
2128 scr_page (v, 1);
2129 scr_refresh (SMOOTH_REFRESH);
2130 scrollbar_show (1);
2131 }
2132# endif
2133# ifdef MOUSE_SLIP_WHEELING 2172# ifdef MOUSE_SLIP_WHEELING
2134 } 2173 }
2135#endif 2174# endif
2136 } 2175 }
2137 break; 2176 break;
2138#endif 2177#endif
2139 } 2178 }
2140 } 2179 }
2141#ifdef MENUBAR
2142 else if (isMenuBarWindow (ev.window))
2143 menubar_control (ev);
2144#endif
2145} 2180}
2146 2181
2147#ifdef TRANSPARENT 2182#ifdef TRANSPARENT
2148#if TINTING 2183#if TINTING
2149/* taken from aterm-0.4.2 */ 2184/* taken from aterm-0.4.2 */
2150 2185
2151typedef uint32_t RUINT32T; 2186typedef uint32_t RUINT32T;
2152 2187
2153void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2188void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2154{ 2189{
2155 int sh_r, sh_g, sh_b; 2190 int sh_r, sh_g, sh_b;
2156 RUINT32T mask_r, mask_g, mask_b; 2191 RUINT32T mask_r, mask_g, mask_b;
2157 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2192 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2158 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2193 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2159 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2194 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2160 int i; 2195 int i;
2161 2196
2162 Visual *visual = display->visual; 2197 Visual *visual = term->visual;
2163 2198
2164 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2199 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2165 2200
2166 /* for convenience */ 2201 /* for convenience */
2167 mask_r = visual->red_mask; 2202 mask_r = visual->red_mask;
… …
2388 Atom atype; 2423 Atom atype;
2389 unsigned char *prop = NULL; 2424 unsigned char *prop = NULL;
2390 Window root, oldp, *list; 2425 Window root, oldp, *list;
2391 Pixmap rootpixmap = None; 2426 Pixmap rootpixmap = None;
2392 XWindowAttributes wattr, wrootattr; 2427 XWindowAttributes wattr, wrootattr;
2393 dDisp;
2394 2428
2395 pchanged = 0; 2429 pchanged = 0;
2396 2430
2397 if (!OPTION (Opt_transparent)) 2431 if (!OPTION (Opt_transparent))
2398 return pchanged; /* Don't try any more */ 2432 return pchanged; /* Don't try any more */
2399 2433
2400 XGetWindowAttributes (disp, display->root, &wrootattr); 2434 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2401 rootdepth = wrootattr.depth; 2435 rootdepth = wrootattr.depth;
2402 2436
2403 XGetWindowAttributes (disp, parent[0], &wattr); 2437 XGetWindowAttributes (xdisp, parent[0], &wattr);
2404 2438
2405 if (rootdepth != wattr.depth) 2439 if (rootdepth != wattr.depth)
2406 { 2440 {
2407 if (am_transparent) 2441 if (am_transparent)
2408 { 2442 {
2409 pchanged = 1; 2443 pchanged = 1;
2410 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2444 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2411 am_transparent = am_pixmap_trans = 0; 2445 am_transparent = am_pixmap_trans = 0;
2412 } 2446 }
2413 2447
2414 return pchanged; /* Don't try any more */ 2448 return pchanged; /* Don't try any more */
2415 } 2449 }
2416 2450
2417 /* Get all X ops out of the queue so that our information is up-to-date. */ 2451 /* Get all X ops out of the queue so that our information is up-to-date. */
2418 XSync (disp, False); 2452 XSync (xdisp, False);
2419 2453
2420 /* 2454 /*
2421 * Make the frame window set by the window manager have 2455 * Make the frame window set by the window manager have
2422 * the root background. Some window managers put multiple nested frame 2456 * the root background. Some window managers put multiple nested frame
2423 * windows for each client, so we have to take care about that. 2457 * windows for each client, so we have to take care about that.
2424 */ 2458 */
2425 i = (xa[XA_XROOTPMAP_ID] 2459 i = (xa[XA_XROOTPMAP_ID]
2426 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2460 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2427 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2461 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2428 &nitems, &bytes_after, &prop) == Success); 2462 &nitems, &bytes_after, &prop) == Success);
2429 2463
2430 if (!i || prop == NULL) 2464 if (!i || prop == NULL)
2431 i = (xa[XA_ESETROOT_PMAP_ID] 2465 i = (xa[XA_ESETROOT_PMAP_ID]
2432 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2466 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2433 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2467 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2434 &nitems, &bytes_after, &prop) == Success); 2468 &nitems, &bytes_after, &prop) == Success);
2435 2469
2436 if (!i || prop == NULL 2470 if (!i || prop == NULL
2437#if TINTING 2471#if TINTING
2438 || !rs[Rs_color + Color_tint] 2472 || !ISSET_PIXCOLOR (Color_tint)
2439#endif 2473#endif
2440 ) 2474 )
2441 have_pixmap = 0; 2475 have_pixmap = 0;
2442 else 2476 else
2443 { 2477 {
… …
2456 Window cr; 2490 Window cr;
2457 XImage *image; 2491 XImage *image;
2458 GC gc; 2492 GC gc;
2459 XGCValues gcvalue; 2493 XGCValues gcvalue;
2460 2494
2461 XTranslateCoordinates (disp, parent[0], display->root, 2495 XTranslateCoordinates (xdisp, parent[0], display->root,
2462 0, 0, &sx, &sy, &cr); 2496 0, 0, &sx, &sy, &cr);
2463 nw = (unsigned int)szHint.width; 2497 nw = (unsigned int)szHint.width;
2464 nh = (unsigned int)szHint.height; 2498 nh = (unsigned int)szHint.height;
2465 nx = ny = 0; 2499 nx = ny = 0;
2466 2500
… …
2479 } 2513 }
2480 2514
2481 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2515 min_it (nw, (unsigned int) (wrootattr.width - sx));
2482 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2516 min_it (nh, (unsigned int) (wrootattr.height - sy));
2483 2517
2484 XSync (disp, False); 2518 XSync (xdisp, False);
2485 allowedxerror = -1; 2519 allowedxerror = -1;
2486 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2520 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2487 2521
2488 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2522 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2489 /* XXX: may need a delay here? */ 2523 /* XXX: may need a delay here? */
2490 allowedxerror = 0; 2524 allowedxerror = 0;
2491 2525
… …
2494 if (am_transparent && am_pixmap_trans) 2528 if (am_transparent && am_pixmap_trans)
2495 { 2529 {
2496 pchanged = 1; 2530 pchanged = 1;
2497 if (pixmap != None) 2531 if (pixmap != None)
2498 { 2532 {
2499 XFreePixmap (disp, pixmap); 2533 XFreePixmap (xdisp, pixmap);
2500 pixmap = None; 2534 pixmap = None;
2501 } 2535 }
2502 } 2536 }
2503 2537
2504 am_pixmap_trans = 0; 2538 am_pixmap_trans = 0;
2505 } 2539 }
2506 else 2540 else
2507 { 2541 {
2508 if (pixmap != None) 2542 if (pixmap != None)
2509 XFreePixmap (disp, pixmap); 2543 XFreePixmap (xdisp, pixmap);
2510 2544
2511#if TINTING 2545#if TINTING
2512 if (ISSET_PIXCOLOR (Color_tint)) 2546 if (ISSET_PIXCOLOR (Color_tint))
2513 { 2547 {
2514 unsigned short rm, gm, bm;
2515 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2548 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2516 2549
2550 rgba c;
2517 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2551 pix_colors_focused [Color_tint].get (c);
2518 2552
2519 ShadeXImage (display, image, shade, rm, gm, bm); 2553 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2520 } 2554 }
2521#endif 2555#endif
2522 2556
2523 pixmap = XCreatePixmap (disp, vt, 2557 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2524 szHint.width, szHint.height, image->depth);
2525 gc = XCreateGC (disp, vt, 0UL, &gcvalue); 2558 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2526 XPutImage (disp, pixmap, gc, image, 0, 0, 2559 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2527 nx, ny, image->width, image->height); 2560 nx, ny, image->width, image->height);
2528 XFreeGC (disp, gc); 2561 XFreeGC (xdisp, gc);
2529 XDestroyImage (image); 2562 XDestroyImage (image);
2530 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2563 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2531 XClearWindow (disp, parent[0]); 2564 XClearWindow (xdisp, parent[0]);
2532 2565
2533 if (!am_transparent || !am_pixmap_trans) 2566 if (!am_transparent || !am_pixmap_trans)
2534 pchanged = 1; 2567 pchanged = 1;
2535 2568
2536 am_transparent = am_pixmap_trans = 1; 2569 am_transparent = am_pixmap_trans = 1;
2537 } 2570 }
2538 } 2571 }
2539 2572
2540 if (am_pixmap_trans) 2573 if (am_pixmap_trans)
2541 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2574 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2542 else 2575 else
2543 { 2576 {
2544 unsigned int n; 2577 unsigned int n;
2545 /* 2578 /*
2546 * InheritPixmap transparency 2579 * InheritPixmap transparency
2547 */ 2580 */
2548 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2581 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2549 { 2582 {
2550 oldp = parent[i]; 2583 oldp = parent[i];
2551 XQueryTree (disp, parent[i - 1], &root, 2584 XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2552 &parent[i], &list, &n);
2553 XFree (list); 2585 XFree (list);
2554 2586
2555 if (parent[i] == display->root) 2587 if (parent[i] == display->root)
2556 { 2588 {
2557 if (oldp != None) 2589 if (oldp != None)
… …
2565 } 2597 }
2566 2598
2567 n = 0; 2599 n = 0;
2568 2600
2569 if (pchanged) 2601 if (pchanged)
2570 {
2571 for (; n < (unsigned int)i; n++) 2602 for (; n < (unsigned int)i; n++)
2572 { 2603 {
2573 XGetWindowAttributes (disp, parent[n], &wattr); 2604 XGetWindowAttributes (xdisp, parent[n], &wattr);
2605
2574 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2606 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2575 { 2607 {
2576 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2608 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2577 break; 2609 break;
2578 } 2610 }
2579 } 2611 }
2580 }
2581 2612
2582 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2613 if (n > (sizeof (parent) / sizeof (parent[0])))
2583 { 2614 {
2584 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2615 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2585 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2616 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2586 am_transparent = 0; 2617 am_transparent = 0;
2587 /* XXX: also turn off Opt_transparent? */ 2618 /* XXX: also turn off Opt_transparent? */
2588 } 2619 }
2589 else 2620 else
2590 { 2621 {
2591#if WAIT_FOR_WM
2592 /* wait (an arbitrary period) for the WM to do its thing
2593 * needed for fvwm2.2.2 (and before?) */
2594 sleep (1);
2595#endif
2596 for (n = 0; n < (unsigned int)i; n++) 2622 for (n = 0; n < (unsigned int)i; n++)
2597 { 2623 {
2598 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2624 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2599 XClearWindow (disp, parent[n]); 2625 XClearWindow (xdisp, parent[n]);
2600 } 2626 }
2601 2627
2602 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2628 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2603 am_transparent = 1; 2629 am_transparent = 1;
2604 } 2630 }
2605 2631
2606 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2632 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2607 parent[i] = None; 2633 parent[i] = None;
2608 } 2634 }
2609 2635
2610 if (scrollBar.win) 2636 if (scrollBar.win)
2611 { 2637 {
2612 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2638 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2613 scrollBar.setIdle (); 2639 scrollBar.setIdle ();
2614 scrollbar_show (0); 2640 scrollbar_show (0);
2615 } 2641 }
2616 2642
2617 if (am_transparent) 2643 if (am_transparent)
… …
2629 2655
2630bool 2656bool
2631rxvt_term::cmd_parse () 2657rxvt_term::cmd_parse ()
2632{ 2658{
2633 bool flag = false; 2659 bool flag = false;
2634 unicode_t ch = NOCHAR; 2660 wchar_t ch = NOCHAR;
2635 unsigned char *seq_begin; // remember start of esc-sequence here 2661 char *seq_begin; // remember start of esc-sequence here
2636 2662
2637 for (;;) 2663 for (;;)
2638 { 2664 {
2639 if (ch == NOCHAR) 2665 if (ch == NOCHAR)
2640 { 2666 {
2641 seq_begin = cmdbuf_ptr; 2667 seq_begin = cmdbuf_ptr;
2642 ch = next_char (); 2668 ch = next_char ();
2643 }
2644 2669
2645 if (ch == NOCHAR) // TODO: improve 2670 if (ch == NOCHAR)
2646 break; 2671 break;
2672 }
2647 2673
2648 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2674 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2649 { 2675 {
2650 if (!seen_input) 2676 if (!seen_input)
2651 { 2677 {
… …
2660 if (seen_resize && cmd_pid) 2686 if (seen_resize && cmd_pid)
2661 kill (-cmd_pid, SIGWINCH); 2687 kill (-cmd_pid, SIGWINCH);
2662 } 2688 }
2663 2689
2664 /* Read a text string from the input buffer */ 2690 /* Read a text string from the input buffer */
2665 unicode_t buf[UBUFSIZ]; 2691 wchar_t buf[UBUFSIZ];
2666 bool refreshnow = false; 2692 bool refreshnow = false;
2667 int nlines = 0; 2693 int nlines = 0;
2668 unicode_t *str = buf; 2694 wchar_t *str = buf;
2669 unicode_t *eol = str + min (ncol, UBUFSIZ); 2695 wchar_t *eol = str + min (ncol, UBUFSIZ);
2670 2696
2671 for (;;) 2697 for (;;)
2672 { 2698 {
2673 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2699 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2674 break; 2700 break;
… …
2684 2710
2685 if (!OPTION (Opt_jumpScroll) 2711 if (!OPTION (Opt_jumpScroll)
2686 || (refresh_count >= refresh_limit * (nrow - 1))) 2712 || (refresh_count >= refresh_limit * (nrow - 1)))
2687 { 2713 {
2688 refreshnow = true; 2714 refreshnow = true;
2715 refresh_count = 0;
2689 ch = NOCHAR; 2716 ch = NOCHAR;
2690 break; 2717 break;
2691 } 2718 }
2692 2719
2693 // scr_add_lines only works for nlines <= nrow - 1. 2720 // scr_add_lines only works for nlines <= nrow - 1.
2694 if (nlines >= nrow - 1) 2721 if (nlines >= nrow - 1)
2695 { 2722 {
2723 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2724 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2696 scr_add_lines (buf, nlines, str - buf); 2725 scr_add_lines (buf, str - buf, nlines);
2726
2697 nlines = 0; 2727 nlines = 0;
2698 str = buf; 2728 str = buf;
2699 eol = str + min (ncol, UBUFSIZ); 2729 eol = str + min (ncol, UBUFSIZ);
2700 } 2730 }
2701 2731
… …
2714 2744
2715 seq_begin = cmdbuf_ptr; 2745 seq_begin = cmdbuf_ptr;
2716 ch = next_char (); 2746 ch = next_char ();
2717 } 2747 }
2718 2748
2749 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2750 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2719 scr_add_lines (buf, nlines, str - buf); 2751 scr_add_lines (buf, str - buf, nlines);
2720 2752
2721 /* 2753 /*
2722 * If there have been a lot of new lines, then update the screen 2754 * If there have been a lot of new lines, then update the screen
2723 * What the heck I'll cheat and only refresh less than every page-full. 2755 * What the heck I'll cheat and only refresh less than every page-full.
2724 * the number of pages between refreshes is refresh_limit, which 2756 * the number of pages between refreshes is refresh_limit, which
… …
2729 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2761 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2730 refresh_limit++; 2762 refresh_limit++;
2731 else 2763 else
2732 { 2764 {
2733 flag = true; 2765 flag = true;
2734 scr_refresh (refresh_type); 2766 scr_refresh ();
2767 want_refresh = 1;
2735 } 2768 }
2736 } 2769 }
2737 2770
2738 } 2771 }
2739 else 2772 else
… …
2754 } 2787 }
2755 2788
2756 return flag; 2789 return flag;
2757} 2790}
2758 2791
2759// read the next octet
2760unicode_t
2761rxvt_term::next_octet ()
2762{
2763 return cmdbuf_ptr < cmdbuf_endp
2764 ? *cmdbuf_ptr++
2765 : NOCHAR;
2766}
2767
2768// read the next character 2792// read the next character
2769unicode_t 2793wchar_t
2770rxvt_term::next_char () 2794rxvt_term::next_char () NOTHROW
2771{ 2795{
2772 while (cmdbuf_ptr < cmdbuf_endp) 2796 while (cmdbuf_ptr < cmdbuf_endp)
2773 { 2797 {
2774 // assume 7-bit to be ascii ALWAYS 2798 // assume 7-bit to be ascii ALWAYS
2775 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2799 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2776 return *cmdbuf_ptr++; 2800 return *cmdbuf_ptr++;
2777 2801
2778 wchar_t wc; 2802 wchar_t wc;
2779 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2803 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2780 2804
2781 if (len == (size_t)-2) 2805 if (len == (size_t)-2)
2782 { 2806 {
2783 // the mbstate stores incomplete sequences. didn't know this :/ 2807 // the mbstate stores incomplete sequences. didn't know this :/
2784 cmdbuf_ptr = cmdbuf_endp; 2808 cmdbuf_ptr = cmdbuf_endp;
2785 break; 2809 break;
2786 } 2810 }
2787 2811
2788 if (len == (size_t)-1) 2812 if (len == (size_t)-1)
2789 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2813 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2790 2814
2791 // assume wchar == unicode 2815 // assume wchar == unicode
2792 cmdbuf_ptr += len; 2816 cmdbuf_ptr += len;
2793 return wc & UNICODE_MASK; 2817 return wc & UNICODE_MASK;
2794 } 2818 }
2795 2819
2796 return NOCHAR; 2820 return NOCHAR;
2797} 2821}
2822
2823// read the next octet
2824uint32_t
2825rxvt_term::next_octet () NOTHROW
2826{
2827 return cmdbuf_ptr < cmdbuf_endp
2828 ? (unsigned char)*cmdbuf_ptr++
2829 : NOCHAR;
2830}
2831
2832static class out_of_input out_of_input;
2798 2833
2799/* rxvt_cmd_getc () - Return next input character */ 2834/* rxvt_cmd_getc () - Return next input character */
2800/* 2835/*
2801 * Return the next input character after first passing any keyboard input 2836 * Return the next input character after first passing any keyboard input
2802 * to the command. 2837 * to the command.
2803 */ 2838 */
2804unicode_t 2839wchar_t
2805rxvt_term::cmd_getc () 2840rxvt_term::cmd_getc () THROW ((class out_of_input))
2806{ 2841{
2807 unicode_t c = next_char (); 2842 wchar_t c = next_char ();
2808 2843
2809 if (c == NOCHAR) 2844 if (c == NOCHAR)
2810 throw out_of_input; 2845 throw out_of_input;
2811 2846
2812 return c; 2847 return c;
2813} 2848}
2814 2849
2815unicode_t 2850uint32_t
2816rxvt_term::cmd_get8 () 2851rxvt_term::cmd_get8 () THROW ((class out_of_input))
2817{ 2852{
2818 unicode_t c = next_octet (); 2853 uint32_t c = next_octet ();
2819 2854
2820 if (c == NOCHAR) 2855 if (c == NOCHAR)
2821 throw out_of_input; 2856 throw out_of_input;
2822 2857
2823 return c; 2858 return c;
… …
2923 case C0_ESC: 2958 case C0_ESC:
2924 process_escape_seq (); 2959 process_escape_seq ();
2925 break; 2960 break;
2926 case C0_ENQ: /* terminal Status */ 2961 case C0_ENQ: /* terminal Status */
2927 if (rs[Rs_answerbackstring]) 2962 if (rs[Rs_answerbackstring])
2928 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2963 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2929 (unsigned int)strlen (rs[Rs_answerbackstring]));
2930 else 2964 else
2931 tt_write ((unsigned char *)VT100_ANS, 2965 tt_write (VT100_ANS, strlen (VT100_ANS));
2932 (unsigned int)strlen (VT100_ANS));
2933 break; 2966 break;
2934 case C0_BEL: /* bell */ 2967 case C0_BEL: /* bell */
2935 scr_bell (); 2968 scr_bell ();
2936 break; 2969 break;
2937 case C0_BS: /* backspace */ 2970 case C0_BS: /* backspace */
… …
3061 scr_charset_set (2, (unsigned int)cmd_getc ()); 3094 scr_charset_set (2, (unsigned int)cmd_getc ());
3062 break; 3095 break;
3063 case '+': 3096 case '+':
3064 scr_charset_set (3, (unsigned int)cmd_getc ()); 3097 scr_charset_set (3, (unsigned int)cmd_getc ());
3065 break; 3098 break;
3066#if ENABLE_FRILLS 3099#if !ENABLE_MINIMAL
3067 case '6': 3100 case '6':
3068 scr_backindex (); 3101 scr_backindex ();
3069 break; 3102 break;
3070#endif 3103#endif
3071 case '7': 3104 case '7':
3072 scr_cursor (SAVE); 3105 scr_cursor (SAVE);
3073 break; 3106 break;
3074 case '8': 3107 case '8':
3075 scr_cursor (RESTORE); 3108 scr_cursor (RESTORE);
3076 break; 3109 break;
3077#if ENABLE_FRILLS 3110#if !ENABLE_MINIMAL
3078 case '9': 3111 case '9':
3079 scr_forwardindex (); 3112 scr_forwardindex ();
3080 break; 3113 break;
3081#endif 3114#endif
3082 case '=': 3115 case '=':
… …
3092 break; 3125 break;
3093 3126
3094 /* 8.3.87: NEXT LINE */ 3127 /* 8.3.87: NEXT LINE */
3095 case C1_NEL: /* ESC E */ 3128 case C1_NEL: /* ESC E */
3096 { 3129 {
3097 unicode_t nlcr[] = { C0_LF, C0_CR }; 3130 wchar_t nlcr[] = { C0_LF, C0_CR };
3098 scr_add_lines (nlcr, 1, 2); 3131 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3099 } 3132 }
3100 break; 3133 break;
3101 3134
3102 /* kidnapped escape sequence: Should be 8.3.48 */ 3135 /* kidnapped escape sequence: Should be 8.3.48 */
3103 case C1_ESA: /* ESC G */ 3136 case C1_ESA: /* ESC G */
… …
3125 process_dcs_seq (); 3158 process_dcs_seq ();
3126 break; 3159 break;
3127 3160
3128 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3161 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3129 case C1_SCI: /* ESC Z */ 3162 case C1_SCI: /* ESC Z */
3130 tt_write ((const unsigned char *)ESCZ_ANSWER, 3163 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3131 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3132 break; /* steal obsolete ESC [ c */ 3164 break; /* steal obsolete ESC [ c */
3133 3165
3134 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3166 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3135 case C1_CSI: /* ESC [ */ 3167 case C1_CSI: /* ESC [ */
3136 process_csi_seq (); 3168 process_csi_seq ();
… …
3245 ndef = get_byte_array_bit (csi_defaults, i); 3277 ndef = get_byte_array_bit (csi_defaults, i);
3246 for (p = 0; p < nargs; p++) 3278 for (p = 0; p < nargs; p++)
3247 if (arg[p] == -1) 3279 if (arg[p] == -1)
3248 arg[p] = ndef; 3280 arg[p] = ndef;
3249 3281
3250#ifdef DEBUG_CMD
3251 fprintf (stderr, "CSI ");
3252 for (p = 0; p < nargs; p++)
3253 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3254 fprintf (stderr, "%c\n", ch);
3255#endif
3256
3257 /* 3282 /*
3258 * private mode handling 3283 * private mode handling
3259 */ 3284 */
3260 if (priv) 3285 if (priv)
3261 { 3286 {
3262 switch (priv) 3287 switch (priv)
3263 { 3288 {
3264 case '>': 3289 case '>':
3265 if (ch == CSI_DA) /* secondary device attributes */ 3290 if (ch == CSI_DA) /* secondary device attributes */
3266 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 3291 {
3292 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3293 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3294 //
3295 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3296 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3297 // that we do not support xterm mouse reporting (should be 95 when we do).
3298 //
3299 tt_printf ("\033[>%d;94;0c", 'U');
3300 }
3267 break; 3301 break;
3268 case '?': 3302 case '?':
3269 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3303 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3270 process_terminal_mode (ch, priv, nargs, arg); 3304 process_terminal_mode (ch, priv, nargs, arg);
3271 break; 3305 break;
… …
3380 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3414 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3381 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3415 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3382 break; 3416 break;
3383 3417
3384 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3418 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3385 tt_write ((const unsigned char *)VT100_ANS, 3419 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3386 (unsigned int) (sizeof (VT100_ANS) - 1));
3387 break; 3420 break;
3388 3421
3389 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3422 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3390 process_sgr_mode (nargs, arg); 3423 process_sgr_mode (nargs, arg);
3391 break; 3424 break;
… …
3475 break; 3508 break;
3476 case CSI_75: 3509 case CSI_75:
3477 scr_cursor (RESTORE); 3510 scr_cursor (RESTORE);
3478 break; 3511 break;
3479 3512
3480#if ENABLE_FRILLS 3513#if !ENABLE_MINIMAL
3481 case CSI_74: 3514 case CSI_74:
3482 process_window_ops (arg, nargs); 3515 process_window_ops (arg, nargs);
3483 break; 3516 break;
3484#endif 3517#endif
3485 3518
… …
3492 break; 3525 break;
3493 } 3526 }
3494} 3527}
3495/*}}} */ 3528/*}}} */
3496 3529
3497#if ENABLE_FRILLS 3530#if !ENABLE_MINIMAL
3498/* ARGSUSED */ 3531/* ARGSUSED */
3499void 3532void
3500rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3533rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3501{ 3534{
3502 int x, y; 3535 int x, y;
3503 XWindowAttributes wattr; 3536 XWindowAttributes wattr;
3504 Window wdummy; 3537 Window wdummy;
3505 dDisp; 3538
3539 dLocal (Display *, xdisp);
3506 3540
3507 if (nargs == 0) 3541 if (nargs == 0)
3508 return; 3542 return;
3509 3543
3510 switch (args[0]) 3544 switch (args[0])
3511 { 3545 {
3512 /* 3546 /*
3513 * commands 3547 * commands
3514 */ 3548 */
3515 case 1: /* deiconify window */ 3549 case 1: /* deiconify window */
3516 XMapWindow (disp, parent[0]); 3550 XMapWindow (xdisp, parent[0]);
3517 break; 3551 break;
3518 case 2: /* iconify window */ 3552 case 2: /* iconify window */
3519 XIconifyWindow (disp, parent[0], display->screen); 3553 XIconifyWindow (xdisp, parent[0], display->screen);
3520 break; 3554 break;
3521 case 3: /* set position (pixels) */ 3555 case 3: /* set position (pixels) */
3522 XMoveWindow (disp, parent[0], args[1], args[2]); 3556 XMoveWindow (xdisp, parent[0], args[1], args[2]);
3523 break; 3557 break;
3524 case 4: /* set size (pixels) */ 3558 case 4: /* set size (pixels) */
3525 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3559 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3526 break; 3560 break;
3527 case 5: /* raise window */ 3561 case 5: /* raise window */
3528 XRaiseWindow (disp, parent[0]); 3562 XRaiseWindow (xdisp, parent[0]);
3529 break; 3563 break;
3530 case 6: /* lower window */ 3564 case 6: /* lower window */
3531 XLowerWindow (disp, parent[0]); 3565 XLowerWindow (xdisp, parent[0]);
3532 break; 3566 break;
3533 case 7: /* refresh window */ 3567 case 7: /* refresh window */
3534 scr_touch (true); 3568 scr_touch (true);
3535 break; 3569 break;
3536 case 8: /* set size (chars) */ 3570 case 8: /* set size (chars) */
… …
3543 if (args[0] >= 24) /* set height (chars) */ 3577 if (args[0] >= 24) /* set height (chars) */
3544 set_widthheight ((unsigned int)width, 3578 set_widthheight ((unsigned int)width,
3545 (unsigned int) (args[1] * fheight)); 3579 (unsigned int) (args[1] * fheight));
3546 break; 3580 break;
3547 3581
3548
3549 /* 3582 /*
3550 * reports - some output format copied from XTerm 3583 * reports - some output format copied from XTerm
3551 */ 3584 */
3552 case 11: /* report window state */ 3585 case 11: /* report window state */
3553 XGetWindowAttributes (disp, parent[0], &wattr); 3586 XGetWindowAttributes (xdisp, parent[0], &wattr);
3554 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3587 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3555 break; 3588 break;
3556 case 13: /* report window position */ 3589 case 13: /* report window position */
3557 XGetWindowAttributes (disp, parent[0], &wattr); 3590 XGetWindowAttributes (xdisp, parent[0], &wattr);
3558 XTranslateCoordinates (disp, parent[0], wattr.root, 3591 XTranslateCoordinates (xdisp, parent[0], wattr.root,
3559 -wattr.border_width, -wattr.border_width, 3592 -wattr.border_width, -wattr.border_width,
3560 &x, &y, &wdummy); 3593 &x, &y, &wdummy);
3561 tt_printf ("\033[3;%d;%dt", x, y); 3594 tt_printf ("\033[3;%d;%dt", x, y);
3562 break; 3595 break;
3563 case 14: /* report window size (pixels) */ 3596 case 14: /* report window size (pixels) */
3564 XGetWindowAttributes (disp, parent[0], &wattr); 3597 XGetWindowAttributes (xdisp, parent[0], &wattr);
3565 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3598 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3566 break; 3599 break;
3567 case 18: /* report text area size (chars) */ 3600 case 18: /* report text area size (chars) */
3568 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3601 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3569 break; 3602 break;
… …
3571 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3604 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3572 break; 3605 break;
3573 case 20: /* report icon label */ 3606 case 20: /* report icon label */
3574 { 3607 {
3575 char *s; 3608 char *s;
3576 XGetIconName (disp, parent[0], &s); 3609 XGetIconName (xdisp, parent[0], &s);
3577 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3610 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3578 XFree (s); 3611 XFree (s);
3579 } 3612 }
3580 break; 3613 break;
3581 case 21: /* report window title */ 3614 case 21: /* report window title */
3582 { 3615 {
3583 char *s; 3616 char *s;
3584 XFetchName (disp, parent[0], &s); 3617 XFetchName (xdisp, parent[0], &s);
3585 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3618 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3586 XFree (s); 3619 XFree (s);
3587 } 3620 }
3588 break; 3621 break;
3589 } 3622 }
… …
3593/*----------------------------------------------------------------------*/ 3626/*----------------------------------------------------------------------*/
3594/* 3627/*
3595 * get input up until STRING TERMINATOR (or BEL) 3628 * get input up until STRING TERMINATOR (or BEL)
3596 * ends_how is terminator used. returned input must be free()'d 3629 * ends_how is terminator used. returned input must be free()'d
3597 */ 3630 */
3598unsigned char * 3631char *
3599rxvt_term::get_to_st (unicode_t &ends_how) 3632rxvt_term::get_to_st (unicode_t &ends_how)
3600{ 3633{
3601 unicode_t ch; 3634 unicode_t ch;
3602 bool seen_esc = false; 3635 bool seen_esc = false;
3603 unsigned int n = 0; 3636 unsigned int n = 0;
… …
3636 3669
3637 string[n++] = '\0'; 3670 string[n++] = '\0';
3638 3671
3639 ends_how = (ch == 0x5c ? C0_ESC : ch); 3672 ends_how = (ch == 0x5c ? C0_ESC : ch);
3640 3673
3641 return (unsigned char *)rxvt_wcstombs (string); 3674 return rxvt_wcstombs (string);
3642} 3675}
3643 3676
3644/*----------------------------------------------------------------------*/ 3677/*----------------------------------------------------------------------*/
3645/* 3678/*
3646 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3679 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3647 */ 3680 */
3648void 3681void
3649rxvt_term::process_dcs_seq () 3682rxvt_term::process_dcs_seq ()
3650{ 3683{
3651 unsigned char *s; 3684 char *s;
3652 unicode_t eh; 3685 unicode_t eh;
3653 3686
3654 /* 3687 /*
3655 * Not handled yet 3688 * Not handled yet
3656 */ 3689 */
… …
3675 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3708 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3676 arg = arg * 10 + (ch - '0'); 3709 arg = arg * 10 + (ch - '0');
3677 3710
3678 if (ch == ';') 3711 if (ch == ';')
3679 { 3712 {
3680 unsigned char *s = get_to_st (eh); 3713 char *s = get_to_st (eh);
3681 3714
3682 if (s) 3715 if (s)
3683 { 3716 {
3684 process_xterm_seq (arg, (char *)s, eh); 3717 process_xterm_seq (arg, s, eh);
3685 free (s); 3718 free (s);
3686 } 3719 }
3687 } 3720 }
3688} 3721}
3689 3722
3690void 3723void
3691rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3724rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3692{ 3725{
3693 if (str[0] == '?' && !str[1]) 3726 if (str[0] == '?' && !str[1])
3694 { 3727 {
3695 unsigned short r, g, b; 3728 rgba c;
3696 pix_colors_focused[color].get (display, r, g, b); 3729 pix_colors_focused[color].get (c);
3730
3731#if XFT
3732 if (c.a != rgba::MAX_CC)
3733 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3734 else
3735#endif
3697 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3736 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3698 } 3737 }
3699 else 3738 else
3700 set_window_color (color, str); 3739 set_window_color (color, str);
3701} 3740}
3702 3741
3703/* 3742/*
3704 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3743 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3705 */ 3744 */
3706void 3745void
3707rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3746rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3708{ 3747{
3709 int changed = 0;
3710 int color; 3748 int color;
3711 char *buf, *name; 3749 char *buf, *name;
3712 bool query = str[0] == '?' && !str[1]; 3750 bool query = str[0] == '?' && !str[1];
3713 int saveop = op; 3751 int saveop = op;
3714 dDisp; 3752
3753 dLocal (Display *, xdisp);
3715 3754
3716 assert (str != NULL); 3755 assert (str != NULL);
3717 switch (op) 3756 switch (op)
3718 { 3757 {
3719 case XTerm_name: 3758 case XTerm_name:
… …
3735 unsigned long bytes_after; 3774 unsigned long bytes_after;
3736 unsigned char *value = 0; 3775 unsigned char *value = 0;
3737 const char *str = ""; 3776 const char *str = "";
3738 3777
3739 if (prop 3778 if (prop
3740 && XGetWindowProperty (disp, parent[0], 3779 && XGetWindowProperty (xdisp, parent[0],
3741 prop, 0, 1<<16, 0, AnyPropertyType, 3780 prop, 0, 1<<16, 0, AnyPropertyType,
3742 &actual_type, &actual_format, 3781 &actual_type, &actual_format,
3743 &nitems, &bytes_after, &value) == Success 3782 &nitems, &bytes_after, &value) == Success
3744 && actual_type != None 3783 && actual_type != None
3745 && actual_format == 8) 3784 && actual_format == 8)
3746 str = (const char *)(value); 3785 str = (const char *)(value);
3747 3786
3748 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3787 tt_printf ("\033]%d;%s%c", op, str, resp);
3749 3788
3750 XFree (value); 3789 XFree (value);
3751 } 3790 }
3752 else 3791 else
3753 { 3792 {
… …
3757 { 3796 {
3758 *eq = 0; 3797 *eq = 0;
3759 set_utf8_property (display->atom (str), eq + 1); 3798 set_utf8_property (display->atom (str), eq + 1);
3760 } 3799 }
3761 else 3800 else
3762 XDeleteProperty (disp, parent[0], 3801 XDeleteProperty (xdisp, parent[0],
3763 display->atom (str)); 3802 display->atom (str));
3764 } 3803 }
3765 break; 3804 break;
3766 3805
3767 case XTerm_Color: 3806 case XTerm_Color:
… …
3769 { 3808 {
3770 if ((name = strchr (buf, ';')) == NULL) 3809 if ((name = strchr (buf, ';')) == NULL)
3771 break; 3810 break;
3772 3811
3773 *name++ = '\0'; 3812 *name++ = '\0';
3774 color = atoi (buf); 3813 color = atoi (buf) + minCOLOR;
3775 3814
3776 if (color < 0 || color >= TOTAL_COLORS) 3815 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3777 break; 3816 break;
3778 3817
3779 if ((buf = strchr (name, ';')) != NULL) 3818 if ((buf = strchr (name, ';')) != NULL)
3780 *buf++ = '\0'; 3819 *buf++ = '\0';
3781 3820
3782 if (name[0] == '?' && !name[1]) 3821 process_color_seq (op, color, name, resp);
3783 {
3784 unsigned short r, g, b;
3785 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3786 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3787 }
3788 else
3789 set_window_color (color + minCOLOR, name);
3790 } 3822 }
3791 break; 3823 break;
3792 case XTerm_Color00: 3824 case XTerm_Color00:
3793 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3825 process_color_seq (op, Color_fg, str, resp);
3794 break; 3826 break;
3795 case XTerm_Color01: 3827 case XTerm_Color01:
3796 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3828 process_color_seq (op, Color_bg, str, resp);
3797 break; 3829 break;
3798#ifndef NO_CURSORCOLOR 3830#ifndef NO_CURSORCOLOR
3799 case XTerm_Color_cursor: 3831 case XTerm_Color_cursor:
3800 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3832 process_color_seq (op, Color_cursor, str, resp);
3801 break; 3833 break;
3802#endif 3834#endif
3803 case XTerm_Color_pointer_fg: 3835 case XTerm_Color_pointer_fg:
3804 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3836 process_color_seq (op, Color_pointer_fg, str, resp);
3805 break; 3837 break;
3806 case XTerm_Color_pointer_bg: 3838 case XTerm_Color_pointer_bg:
3807 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3839 process_color_seq (op, Color_pointer_bg, str, resp);
3808 break; 3840 break;
3809#ifndef NO_BOLD_UNDERLINE_REVERSE 3841#ifndef NO_BOLD_UNDERLINE_REVERSE
3810 case XTerm_Color_BD:
3811 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3812 break;
3813 case XTerm_Color_UL:
3814 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3815 break;
3816 case XTerm_Color_RV: 3842 case XTerm_Color_RV:
3817 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3843 process_color_seq (op, Color_RV, str, resp);
3844 break;
3845 case Rxvt_Color_BD:
3846 case URxvt_Color_BD:
3847 process_color_seq (op, Color_BD, str, resp);
3848 break;
3849 case Rxvt_Color_UL:
3850 case URxvt_Color_UL:
3851 process_color_seq (op, Color_UL, str, resp);
3818 break; 3852 break;
3819 case URxvt_Color_IT: 3853 case URxvt_Color_IT:
3820 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3854 process_color_seq (op, Color_IT, str, resp);
3821 break; 3855 break;
3822#endif 3856#endif
3823#if TRANSPARENT && TINTING 3857#if TRANSPARENT && TINTING
3824 case URxvt_Color_tint: 3858 case URxvt_Color_tint:
3825 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3859 process_color_seq (op, Color_tint, str, resp);
3860
3826 check_our_parents (); 3861 check_our_parents ();
3862
3827 if (am_transparent) 3863 if (am_transparent)
3828 want_full_refresh = want_refresh = 1; 3864 want_full_refresh = want_refresh = 1;
3829 break;
3830#endif
3831 3865
3866 break;
3867#endif
3868
3832 case XTerm_Pixmap: 3869 case Rxvt_Pixmap:
3870 {
3833 if (*str != ';') 3871 if (*str != ';')
3834 { 3872 {
3835#if XPM_BACKGROUND 3873#if XPM_BACKGROUND
3836 scale_pixmap (""); /* reset to default scaling */ 3874 scale_pixmap (""); /* reset to default scaling */
3837 set_bgPixmap (str); /* change pixmap */ 3875 set_bgPixmap (str); /* change pixmap */
3838#endif
3839 scr_touch (true); 3876 scr_touch (true);
3877#endif
3840 } 3878 }
3879
3880 int changed = 0;
3881
3841 while ((str = strchr (str, ';')) != NULL) 3882 while ((str = strchr (str, ';')) != NULL)
3842 { 3883 {
3843 str++; 3884 str++;
3844#if XPM_BACKGROUND 3885#if XPM_BACKGROUND
3845 changed += scale_pixmap (str); 3886 changed += scale_pixmap (str);
3846#endif 3887#endif
3847 } 3888 }
3848 3889
3849 if (changed) 3890 if (changed)
3850 { 3891 {
3851#ifdef XPM_BACKGROUND 3892#ifdef XPM_BACKGROUND
3852 resize_pixmap (); 3893 resize_pixmap ();
3853#endif
3854 scr_touch (true); 3894 scr_touch (true);
3895#endif
3855 } 3896 }
3897 }
3856 break; 3898 break;
3857 3899
3858 case XTerm_restoreFG: 3900 case Rxvt_restoreFG:
3859 set_window_color (Color_fg, str); 3901 set_window_color (Color_fg, str);
3860 break; 3902 break;
3861 case XTerm_restoreBG: 3903 case Rxvt_restoreBG:
3862 set_window_color (Color_bg, str); 3904 set_window_color (Color_bg, str);
3863 break; 3905 break;
3864 3906
3865 case XTerm_logfile: 3907 case XTerm_logfile:
3866 // TODO, when secure mode? 3908 // TODO, when secure mode?
3867 break; 3909 break;
3868 3910
3869#ifdef MENUBAR
3870 case URxvt_Menu:
3871 if (OPTION (Opt_insecure))
3872 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3873 break;
3874#endif
3875#if 0 3911#if 0
3876 case XTerm_dumpscreen: /* no error notices */ 3912 case Rxvt_dumpscreen: /* no error notices */
3877 { 3913 {
3878 int fd; 3914 int fd;
3879 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3915 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3880 { 3916 {
3881 scr_dump (fd); 3917 scr_dump (fd);
… …
3905 allocated.push_back ((void *)res); 3941 allocated.push_back ((void *)res);
3906 set_fonts (); 3942 set_fonts ();
3907 } 3943 }
3908 break; 3944 break;
3909 3945
3910#if ENABLE_FRILLS 3946 case URxvt_version:
3947 if (query)
3948 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3949 op,
3950 rs[Rs_name], VERSION[0], VERSION[2],
3951 resp);
3952 break;
3953
3954#if !ENABLE_MINIMAL
3911 case URxvt_locale: 3955 case URxvt_locale:
3912 if (query) 3956 if (query)
3913 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3957 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3914 else 3958 else
3915 { 3959 {
3916 set_locale (str); 3960 set_locale (str);
3917 pty.set_utf8_mode (enc_utf8); 3961 pty->set_utf8_mode (enc_utf8);
3918 init_xlocale (); 3962 init_xlocale ();
3919 } 3963 }
3920 break; 3964 break;
3921 3965
3922 case URxvt_view_up: 3966 case URxvt_view_up:
3923 case URxvt_view_down: 3967 case URxvt_view_down:
3968 {
3924 int lines = atoi (str); 3969 int lines = atoi (str);
3925 3970
3926 if (lines) 3971 if (lines)
3927 scr_page (op == URxvt_view_up ? UP : DN, lines); 3972 scr_page (op == URxvt_view_up ? UP : DN, lines);
3928 else 3973 else
3929 {
3930 scr_erase_savelines (); 3974 scr_erase_savelines ();
3931 } 3975 }
3932 3976
3977 break;
3978#endif
3979
3980#if ENABLE_PERL
3981 case URxvt_perl:
3982 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3983 ; // no responses yet
3933 break; 3984 break;
3934#endif 3985#endif
3935 } 3986 }
3936} 3987}
3937/*----------------------------------------------------------------------*/ 3988/*----------------------------------------------------------------------*/
… …
3968 return state; 4019 return state;
3969} 4020}
3970 4021
3971/* we're not using priv _yet_ */ 4022/* we're not using priv _yet_ */
3972void 4023void
3973rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4024rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3974{ 4025{
3975 unsigned int i, j; 4026 unsigned int i, j;
3976 int state; 4027 int state;
3977 4028
3978 static const struct 4029 static const struct
… …
3989 { 5, PrivMode_rVideo }, 4040 { 5, PrivMode_rVideo },
3990 { 6, PrivMode_relOrigin }, 4041 { 6, PrivMode_relOrigin },
3991 { 7, PrivMode_Autowrap }, 4042 { 7, PrivMode_Autowrap },
3992 // 8, bi-directional support mode 4043 // 8, bi-directional support mode
3993 { 9, PrivMode_MouseX10 }, 4044 { 9, PrivMode_MouseX10 },
3994#ifdef menuBar_esc
3995 { menuBar_esc, PrivMode_menuBar },
3996#endif
3997 // 18, 19 printing-related 4045 // 18, 19 printing-related
3998 { 25, PrivMode_VisibleCursor }, 4046 { 25, PrivMode_VisibleCursor },
3999#ifdef scrollBar_esc 4047#ifdef scrollBar_esc
4000 { scrollBar_esc, PrivMode_scrollBar }, 4048 { scrollBar_esc, PrivMode_scrollBar },
4001#endif 4049#endif
… …
4048 /* extra handling for values with state unkept */ 4096 /* extra handling for values with state unkept */
4049 switch (arg[i]) 4097 switch (arg[i])
4050 { 4098 {
4051#if ENABLE_STYLES 4099#if ENABLE_STYLES
4052 case 1021: 4100 case 1021:
4053 if (mode) 4101 set_option (Opt_intensityStyles, mode);
4054 SET_OPTION (Opt_intensityStyles); 4102
4103 scr_touch (true);
4055 else 4104 break;
4056 CLR_OPTION (Opt_intensityStyles);
4057#endif 4105#endif
4058 case 1048: /* alternative cursor save */ 4106 case 1048: /* alternative cursor save */
4059 case 1049: 4107 case 1049:
4060 if (OPTION (Opt_secondaryScreen)) 4108 if (OPTION (Opt_secondaryScreen))
4061 if (mode == 0) 4109 if (mode == 0)
… …
4080 case 3: /* 80/132 */ 4128 case 3: /* 80/132 */
4081 if (priv_modes & PrivMode_132OK) 4129 if (priv_modes & PrivMode_132OK)
4082 set_widthheight (((state ? 132 : 80) * fwidth), height); 4130 set_widthheight (((state ? 132 : 80) * fwidth), height);
4083 break; 4131 break;
4084 case 4: /* smooth scrolling */ 4132 case 4: /* smooth scrolling */
4085 if (!state) 4133 set_option (Opt_jumpScroll, !state);
4086 SET_OPTION (Opt_jumpScroll);
4087 else
4088 CLR_OPTION (Opt_jumpScroll);
4089 break; 4134 break;
4090 case 5: /* reverse video */ 4135 case 5: /* reverse video */
4091 scr_rvideo_mode (state); 4136 scr_rvideo_mode (state);
4092 break; 4137 break;
4093 case 6: /* relative/absolute origins */ 4138 case 6: /* relative/absolute origins */
… …
4099 /* case 8: - auto repeat, can't do on a per window basis */ 4144 /* case 8: - auto repeat, can't do on a per window basis */
4100 case 9: /* X10 mouse reporting */ 4145 case 9: /* X10 mouse reporting */
4101 if (state) /* orthogonal */ 4146 if (state) /* orthogonal */
4102 priv_modes &= ~PrivMode_MouseX11; 4147 priv_modes &= ~PrivMode_MouseX11;
4103 break; 4148 break;
4104#ifdef menuBar_esc
4105 case menuBar_esc:
4106#ifdef MENUBAR
4107 map_menuBar (state);
4108#endif
4109 break;
4110#endif
4111#ifdef scrollBar_esc 4149#ifdef scrollBar_esc
4112 case scrollBar_esc: 4150 case scrollBar_esc:
4113 if (scrollbar_mapping (state)) 4151 if (scrollbar_mapping (state))
4114 { 4152 {
4115 resize_all_windows (0, 0, 0); 4153 resize_all_windows (0, 0, 0);
… …
4134#if 0 4172#if 0
4135 case 1001: 4173 case 1001:
4136 break; /* X11 mouse highlighting */ 4174 break; /* X11 mouse highlighting */
4137#endif 4175#endif
4138 case 1010: /* scroll to bottom on TTY output inhibit */ 4176 case 1010: /* scroll to bottom on TTY output inhibit */
4139 if (!state) 4177 set_option (Opt_scrollTtyOutput, !state);
4140 SET_OPTION (Opt_scrollTtyOutput);
4141 else
4142 CLR_OPTION (Opt_scrollTtyOutput);
4143 break; 4178 break;
4144 case 1011: /* scroll to bottom on key press */ 4179 case 1011: /* scroll to bottom on key press */
4145 if (state) 4180 set_option (Opt_scrollTtyKeypress, state);
4146 SET_OPTION (Opt_scrollTtyKeypress);
4147 else
4148 CLR_OPTION (Opt_scrollTtyKeypress);
4149 break; 4181 break;
4150 case 1047: /* secondary screen w/ clearing last */ 4182 case 1047: /* secondary screen w/ clearing last */
4151 if (OPTION (Opt_secondaryScreen)) 4183 if (OPTION (Opt_secondaryScreen))
4152 if (current_screen != PRIMARY) 4184 if (current_screen != PRIMARY)
4153 scr_erase_screen (2); 4185 scr_erase_screen (2);
… …
4291 scr_color (Color_bg, Color_bg); 4323 scr_color (Color_bg, Color_bg);
4292 break; 4324 break;
4293 4325
4294 //case 50: // not variable spacing 4326 //case 50: // not variable spacing
4295 4327
4296#ifndef NO_BRIGHTCOLOR 4328#if !ENABLE_MINIMAL
4297 case 90: 4329 case 90:
4298 case 91: /* set bright fg color */ 4330 case 91: /* set bright fg color */
4299 case 92: 4331 case 92:
4300 case 93: 4332 case 93:
4301 case 94: 4333 case 94:
… …
4313 case 106: 4345 case 106:
4314 case 107: 4346 case 107:
4315 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4347 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4316 break; 4348 break;
4317#endif 4349#endif
4318
4319 } 4350 }
4320 } 4351 }
4321} 4352}
4322/*}}} */ 4353/*}}} */
4323 4354
… …
4347 */ 4378 */
4348void 4379void
4349rxvt_term::tt_printf (const char *fmt,...) 4380rxvt_term::tt_printf (const char *fmt,...)
4350{ 4381{
4351 va_list arg_ptr; 4382 va_list arg_ptr;
4352 unsigned char buf[256]; 4383 char buf[256];
4353 4384
4354 va_start (arg_ptr, fmt); 4385 va_start (arg_ptr, fmt);
4355 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4386 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4356 va_end (arg_ptr); 4387 va_end (arg_ptr);
4357 tt_write (buf, strlen (buf)); 4388 tt_write (buf, strlen (buf));
… …
4362 * or generated by us in response to a query ESC sequence. 4393 * or generated by us in response to a query ESC sequence.
4363 */ 4394 */
4364const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4395const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4365 4396
4366void 4397void
4367rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4398rxvt_term::tt_write (const char *data, unsigned int len)
4368{ 4399{
4400 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4401 return;
4402
4403 if (pty->pty < 0)
4404 return;
4405
4369 if (v_buflen == 0) 4406 if (v_buflen == 0)
4370 { 4407 {
4371 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4408 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4372 4409
4373 if ((unsigned int)written == len) 4410 if ((unsigned int)written == len)
4374 return; 4411 return;
4375 4412
4376 data += written; 4413 data += written;
4377 len -= written; 4414 len -= written;
4378 } 4415 }
4379 4416
4380 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4417 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4381 4418
4382 memcpy (v_buffer + v_buflen, data, len); 4419 memcpy (v_buffer + v_buflen, data, len);
4383 v_buflen += len; 4420 v_buflen += len;
4384 4421
4385 pty_ev.set (EVENT_READ | EVENT_WRITE); 4422 pty_ev.set (EVENT_READ | EVENT_WRITE);
4386} 4423}
4387 4424
4388void rxvt_term::pty_write () 4425void rxvt_term::pty_write ()
4389{ 4426{
4390 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4427 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4391 4428
4392 if (written > 0) 4429 if (written > 0)
4393 { 4430 {
4394 v_buflen -= written; 4431 v_buflen -= written;
4395 4432

Diff Legend

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