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.223 by root, Sun Jan 1 05:28:28 2006 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
59#define HAVE_SCHED_YIELD 1 //D//TODO//FIXME 60#if LINUX_YIELD_HACK
60#if HAVE_SCHED_YIELD
61# include <sched.h> 61# include <ctime>
62#endif 62#endif
63 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 + 0.01); 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
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
1075bool 1123bool
1076rxvt_term::pty_fill () 1124rxvt_term::pty_fill ()
1077{ 1125{
1078 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1126 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1079 1127
1080 if (CBUFSIZ == n) 1128 if (CBUFSIZ == n)
1081 { 1129 {
1082 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");
1083 n = 0; 1131 n = 0;
1084 } 1132 }
1085 1133
1086 memmove (cmdbuf_base, cmdbuf_ptr, n); 1134 memmove (cmdbuf_base, cmdbuf_ptr, n);
1087 cmdbuf_ptr = cmdbuf_base; 1135 cmdbuf_ptr = cmdbuf_base;
1088 cmdbuf_endp = cmdbuf_ptr + n; 1136 cmdbuf_endp = cmdbuf_ptr + n;
1089 1137
1090 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1138 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1091 1139
1092 if (r > 0) 1140 if (r > 0)
1093 { 1141 {
1094 cmdbuf_endp += r; 1142 cmdbuf_endp += r;
1095 return true; 1143 return true;
1096 } 1144 }
1097 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1145 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1098 { 1146 {
1099#if HAVE_SCHED_YIELD 1147#if LINUX_YIELD_HACK
1100 sched_yield (); 1148 if (display->is_local)
1149 event_handler.yield_ev.start ();
1101#endif 1150#endif
1102 } 1151 }
1103 else 1152 else
1104 { 1153 {
1105 pty_ev.stop (); 1154 pty_ev.stop ();
… …
1112} 1161}
1113 1162
1114void 1163void
1115rxvt_term::pty_cb (io_watcher &w, short revents) 1164rxvt_term::pty_cb (io_watcher &w, short revents)
1116{ 1165{
1117 SET_R (this); 1166 make_current ();
1118 SET_LOCALE (locale);
1119 1167
1120 if (revents & EVENT_READ) 1168 if (revents & EVENT_READ)
1121 // loop, but don't allow a single term to monopolize us 1169 // loop, but don't allow a single term to monopolize us
1122 while (pty_fill ()) 1170 while (pty_fill ())
1123 if (cmd_parse ()) 1171 if (cmd_parse ())
… …
1128} 1176}
1129 1177
1130void 1178void
1131rxvt_term::pointer_unblank () 1179rxvt_term::pointer_unblank ()
1132{ 1180{
1133 XDefineCursor (display->display, vt, TermWin_cursor); 1181 XDefineCursor (xdisp, vt, TermWin_cursor);
1134 recolour_cursor (); 1182 recolour_cursor ();
1135 1183
1136#ifdef POINTER_BLANK 1184#ifdef POINTER_BLANK
1137 hidden_pointer = 0; 1185 hidden_pointer = 0;
1138 1186
… …
1143 1191
1144#ifdef POINTER_BLANK 1192#ifdef POINTER_BLANK
1145void 1193void
1146rxvt_term::pointer_blank () 1194rxvt_term::pointer_blank ()
1147{ 1195{
1148 if (! OPTION (Opt_pointerBlank)) 1196 if (!OPTION (Opt_pointerBlank))
1149 return; 1197 return;
1150 1198
1151 XDefineCursor (display->display, vt, display->blank_cursor); 1199 XDefineCursor (xdisp, vt, display->blank_cursor);
1152 XFlush (display->display); 1200 XFlush (xdisp);
1153 1201
1154 hidden_pointer = 1; 1202 hidden_pointer = 1;
1155} 1203}
1156 1204
1157void 1205void
1158rxvt_term::pointer_cb (time_watcher &w) 1206rxvt_term::pointer_cb (time_watcher &w)
1159{ 1207{
1160 SET_R (this); 1208 make_current ();
1161 SET_LOCALE (locale);
1162 1209
1163 pointer_blank (); 1210 pointer_blank ();
1164} 1211}
1165#endif 1212#endif
1166 1213
… …
1231 (32 + button_number + key_state), 1278 (32 + button_number + key_state),
1232 (32 + x + 1), 1279 (32 + x + 1),
1233 (32 + y + 1)); 1280 (32 + y + 1));
1234} 1281}
1235 1282
1236#ifdef USING_W11LIB
1237void
1238rxvt_W11_process_x_event (XEvent *ev)
1239{
1240 rxvt_t *r = rxvt_get_r ();
1241
1242 x_cb (*ev);
1243}
1244#endif
1245
1246/*{{{ process an X event */ 1283/*{{{ process an X event */
1247void 1284void
1248rxvt_term::x_cb (XEvent &ev) 1285rxvt_term::x_cb (XEvent &ev)
1249{ 1286{
1250 dDisp; 1287 make_current ();
1251 1288
1252 SET_R (this); 1289 dLocal (Display *, xdisp);
1253 SET_LOCALE (locale);
1254 1290
1255#if defined(CURSOR_BLINK) 1291 if (ev.xany.window == vt
1256 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1292 && SHOULD_INVOKE (HOOK_X_EVENT)
1257 { 1293 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1258 if (hidden_cursor) 1294 return;
1259 {
1260 hidden_cursor = 0;
1261 want_refresh = 1;
1262 }
1263 1295
1264 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1296 // for XQueryPointer
1265 }
1266#endif
1267
1268#if defined(POINTER_BLANK)
1269 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1270 {
1271 if (ev.type == MotionNotify
1272 || ev.type == ButtonPress
1273 || ev.type == ButtonRelease)
1274 if (hidden_pointer)
1275 pointer_unblank ();
1276
1277 if (ev.type == KeyPress && hidden_pointer == 0)
1278 pointer_blank ();
1279 }
1280#endif
1281
1282 Window unused_root, unused_child; 1297 Window unused_root, unused_child;
1283 int unused_root_x, unused_root_y; 1298 int unused_root_x, unused_root_y;
1284 unsigned int unused_mask; 1299 unsigned int unused_mask;
1285 1300
1286 switch (ev.type) 1301 switch (ev.type)
… …
1293 1308
1294 break; 1309 break;
1295 1310
1296 case KeyRelease: 1311 case KeyRelease:
1297 { 1312 {
1298#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1313#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1299 KeySym ks; 1314 KeySym keysym;
1300 1315
1301 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 :/
1302#endif 1317#endif
1303 1318
1304#if ENABLE_FRILLS || ISO_14755 1319#if ENABLE_FRILLS || ISO_14755
1305 // ISO 14755 support 1320 // ISO 14755 support
1306 if (iso14755buf) 1321 if (iso14755buf)
… …
1311# endif 1326# endif
1312# if ISO_14755 1327# if ISO_14755
1313 // iso14755 part 5.2 handling: release time 1328 // iso14755 part 5.2 handling: release time
1314 // first: controls 1329 // first: controls
1315 if ((ev.xkey.state & ControlMask) 1330 if ((ev.xkey.state & ControlMask)
1316 && ((ks >= 0x40 && ks <= 0x5f) 1331 && ((keysym >= 0x40 && keysym <= 0x5f)
1317 || (ks >= 0x61 && ks <= 0x7f))) 1332 || (keysym >= 0x61 && keysym <= 0x7f)))
1318 { 1333 {
1319 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1334 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1320 commit_iso14755 (); 1335 commit_iso14755 ();
1321 return; // case-break; 1336 goto skip_switch;
1322 } 1337 }
1323 1338
1324 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1339 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1325 if (i[0] == ks) 1340 if (i[0] == keysym)
1326 { 1341 {
1327 iso14755buf = ISO_14755_51 | i[1]; 1342 iso14755buf = ISO_14755_51 | i[1];
1328 commit_iso14755 (); 1343 commit_iso14755 ();
1329 return; // case-break; 1344 goto skip_switch;
1330 } 1345 }
1331 1346
1332 scr_bell (); 1347 scr_bell ();
1333# endif 1348# endif
1334 iso14755buf = 0; 1349 iso14755buf = 0;
… …
1353 else 1368 else
1354 iso14755buf = 0; 1369 iso14755buf = 0;
1355 } 1370 }
1356#endif 1371#endif
1357 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
1358#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1377#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1359 if (!(ev.xkey.state & ControlMask)) 1378 if (!(ev.xkey.state & ControlMask))
1360 slip_wheel_ev.stop (); 1379 slip_wheel_ev.stop ();
1361 else if (ks == XK_Control_L || ks == XK_Control_R) 1380 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1362 mouse_slip_wheel_speed = 0; 1381 mouse_slip_wheel_speed = 0;
1363#endif 1382#endif
1364 break; 1383 break;
1365 } 1384 }
1366 1385
… …
1372 button_release (ev.xbutton); 1391 button_release (ev.xbutton);
1373 break; 1392 break;
1374 1393
1375 case ClientMessage: 1394 case ClientMessage:
1376 if (ev.xclient.format == 32 1395 if (ev.xclient.format == 32
1377 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1396 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1378 { 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 {
1379 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)))
1380 destroy (); 1405 destroy ();
1406 }
1381#if ENABLE_EWMH 1407#if ENABLE_EWMH
1382 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])
1383 XSendEvent (disp, ev.xclient.window = display->root, 1409 XSendEvent (xdisp, ev.xclient.window = display->root,
1384 False, SubstructureRedirectMask | SubstructureNotifyMask, 1410 False, SubstructureRedirectMask | SubstructureNotifyMask,
1385 &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 }
1386#endif 1423#endif
1387 } 1424 }
1388#if ENABLE_XEMBED
1389 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1390 {
1391 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1392 focus_in ();
1393 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1394 focus_out ();
1395 }
1396#endif
1397#ifdef OFFIX_DND
1398 /* OffiX Dnd (drag 'n' drop) protocol */
1399 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1400 && (ev.xclient.data.l[0] == DndFile
1401 || ev.xclient.data.l[0] == DndDir
1402 || ev.xclient.data.l[0] == DndLink))
1403 {
1404 /* Get Dnd data */
1405 Atom ActualType;
1406 int ActualFormat;
1407 unsigned char *data;
1408 unsigned long Size, RemainingBytes;
1409
1410 XGetWindowProperty (disp, display->root,
1411 xa[XA_DNDSELECTION],
1412 0L, 1000000L,
1413 False, AnyPropertyType,
1414 &ActualType, &ActualFormat,
1415 &Size, &RemainingBytes,
1416 &data);
1417 set_string_property (XA_CUT_BUFFER0, data);
1418 XFree (data);
1419 selection_paste (display->root, XA_CUT_BUFFER0, true);
1420 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1421 }
1422#endif /* OFFIX_DND */
1423 break; 1425 break;
1424 1426
1425 case MappingNotify: 1427 case MappingNotify:
1426 XRefreshKeyboardMapping (&ev.xmapping); 1428 XRefreshKeyboardMapping (&ev.xmapping);
1427 break; 1429 break;
… …
1460 break; 1462 break;
1461 1463
1462 case ConfigureNotify: 1464 case ConfigureNotify:
1463 if (ev.xconfigure.window == parent[0]) 1465 if (ev.xconfigure.window == parent[0])
1464 { 1466 {
1465 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1467 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1466 ; 1468 ;
1467 1469
1468 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1470 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1469 { 1471 {
1470 seen_resize = 1; 1472 seen_resize = 1;
1471 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1473 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1472 } 1474 }
1473 1475
1476 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1477
1474#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1478#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1475 if (OPTION (Opt_transparent)) 1479 if (OPTION (Opt_transparent))
1476 check_our_parents (); 1480 check_our_parents ();
1477#endif 1481#endif
1478 } 1482 }
1479 break; 1483 break;
1480 1484
1481 case PropertyNotify: 1485 case PropertyNotify:
1486 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1482 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1487 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1483 && ev.xproperty.state == PropertyNewValue) 1488 && ev.xproperty.state == PropertyNewValue)
1484 selection_property (ev.xproperty.window, ev.xproperty.atom); 1489 selection_property (ev.xproperty.window, ev.xproperty.atom);
1485 1490
1486 break; 1491 break;
1487 1492
1488 case SelectionClear: 1493 case SelectionClear:
1489 selection_clear (); 1494 selection_clear ();
… …
1494 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1499 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1495 break; 1500 break;
1496 1501
1497 case SelectionRequest: 1502 case SelectionRequest:
1498 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));
1499 break; 1512 break;
1500 1513
1501 case UnmapNotify: 1514 case UnmapNotify:
1502 mapped = 0; 1515 mapped = 0;
1503#ifdef TEXT_BLINK 1516#ifdef TEXT_BLINK
1504 text_blink_ev.stop (); 1517 text_blink_ev.stop ();
1505#endif 1518#endif
1506 break; 1519 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1507
1508 case MapNotify:
1509 mapped = 1;
1510#ifdef TEXT_BLINK
1511 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1512#endif
1513 break; 1520 break;
1514 1521
1515#ifdef TRANSPARENT 1522#ifdef TRANSPARENT
1516 case ReparentNotify: 1523 case ReparentNotify:
1517 rootwin_cb (ev); 1524 rootwin_cb (ev);
… …
1523 if (ev.xany.window == vt) 1530 if (ev.xany.window == vt)
1524 { 1531 {
1525 do 1532 do
1526 scr_expose (ev.xexpose.x, ev.xexpose.y, 1533 scr_expose (ev.xexpose.x, ev.xexpose.y,
1527 ev.xexpose.width, ev.xexpose.height, False); 1534 ev.xexpose.width, ev.xexpose.height, False);
1528 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1535 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1529 1536
1530 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1537 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1531 1538
1532 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1539 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1533 scr_expose (ev.xexpose.x, ev.xexpose.y, 1540 scr_expose (ev.xexpose.x, ev.xexpose.y,
1534 ev.xexpose.width, ev.xexpose.height, False); 1541 ev.xexpose.width, ev.xexpose.height, False);
1535 1542
1536 scr_refresh (refresh_type); 1543 want_refresh = 1;
1537 } 1544 }
1538 else 1545 else
1539 { 1546 {
1540 XEvent unused_event; 1547 XEvent unused_event;
1541 1548
1542 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1549 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1543 ; 1550 ;
1544 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1551 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1545 ; 1552 ;
1546 1553
1547 if (isScrollbarWindow (ev.xany.window)) 1554 if (isScrollbarWindow (ev.xany.window))
1548 { 1555 {
1549 scrollBar.setIdle (); 1556 scrollBar.setIdle ();
1550 scrollbar_show (0); 1557 scrollbar_show (0);
1551 } 1558 }
1552#ifdef MENUBAR
1553 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1554 menubar_expose ();
1555#endif
1556 1559
1557#ifdef TRANSPARENT 1560#ifdef TRANSPARENT
1558 if (am_transparent && ev.xany.window == parent[0]) 1561 if (am_transparent && ev.xany.window == parent[0])
1559 XClearWindow (disp, ev.xany.window); 1562 XClearWindow (xdisp, ev.xany.window);
1560#endif 1563#endif
1561 } 1564 }
1562 break; 1565 break;
1563 1566
1564 case MotionNotify: 1567 case MotionNotify:
1565#ifdef POINTER_BLANK 1568#ifdef POINTER_BLANK
1566 if (hidden_pointer) 1569 if (hidden_pointer)
1567 pointer_unblank (); 1570 pointer_unblank ();
1568#endif 1571#endif
1569#if MENUBAR
1570 if (isMenuBarWindow (ev.xany.window))
1571 {
1572 menubar_control (ev.xbutton);
1573 break;
1574 }
1575#endif
1576 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1572 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1577 break; 1573 break;
1578 1574
1579 if (ev.xany.window == vt) 1575 if (ev.xany.window == vt)
1580 { 1576 {
1577 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1578 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1579 ; // nop
1581 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1580 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1582 { 1581 {
1583 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1582 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1584 ; 1583 ;
1585 1584
1586 XQueryPointer (disp, vt, 1585 XQueryPointer (xdisp, vt,
1587 &unused_root, &unused_child, 1586 &unused_root, &unused_child,
1588 &unused_root_x, &unused_root_y, 1587 &unused_root_x, &unused_root_y,
1589 &ev.xbutton.x, &ev.xbutton.y, 1588 &ev.xbutton.x, &ev.xbutton.y,
1590 &ev.xbutton.state); 1589 &ev.xbutton.state);
1591#ifdef MOUSE_THRESHOLD 1590#ifdef MOUSE_THRESHOLD
… …
1655#endif 1654#endif
1656 } 1655 }
1657 } 1656 }
1658 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1657 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1659 { 1658 {
1660 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1659 while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1661 MotionNotify, &ev)) 1660 MotionNotify, &ev))
1662 ; 1661 ;
1663 1662
1664 XQueryPointer (disp, scrollBar.win, 1663 XQueryPointer (xdisp, scrollBar.win,
1665 &unused_root, &unused_child, 1664 &unused_root, &unused_child,
1666 &unused_root_x, &unused_root_y, 1665 &unused_root_x, &unused_root_y,
1667 &ev.xbutton.x, &ev.xbutton.y, 1666 &ev.xbutton.x, &ev.xbutton.y,
1668 &unused_mask); 1667 &unused_mask);
1669 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1668 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1670 scrollbar_size ()); 1669 scrollbar_size ());
1671 scr_refresh (refresh_type); 1670 want_refresh = 1;
1672 refresh_limit = 0; 1671 refresh_limit = 0;
1673 scrollbar_show (1); 1672 scrollbar_show (1);
1674 } 1673 }
1675 break; 1674 break;
1676 } 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
1677} 1705}
1678 1706
1679void 1707void
1680rxvt_term::focus_in () 1708rxvt_term::focus_in ()
1681{ 1709{
1682 if (!focus) 1710 if (!focus)
1683 { 1711 {
1684 focus = 1; 1712 focus = 1;
1685 want_refresh = 1; 1713 want_refresh = 1;
1714
1715 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1716
1686#if USE_XIM 1717#if USE_XIM
1687 if (Input_Context != NULL) 1718 if (Input_Context != NULL)
1688 { 1719 {
1689 IMSetStatusPosition (); 1720 IMSetStatusPosition ();
1690 XSetICFocus (Input_Context); 1721 XSetICFocus (Input_Context);
1691 } 1722 }
1692#endif 1723#endif
1693#if CURSOR_BLINK 1724#if CURSOR_BLINK
1694 if (OPTION (Opt_cursorBlink)) 1725 if (OPTION (Opt_cursorBlink))
1695 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1726 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1696#endif 1727#endif
1697#if OFF_FOCUS_FADING 1728#if OFF_FOCUS_FADING
1698 if (rs[Rs_fade]) 1729 if (rs[Rs_fade])
1699 { 1730 {
1700 pix_colors = pix_colors_focused; 1731 pix_colors = pix_colors_focused;
… …
1710 if (focus) 1741 if (focus)
1711 { 1742 {
1712 focus = 0; 1743 focus = 0;
1713 want_refresh = 1; 1744 want_refresh = 1;
1714 1745
1746 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1747
1715#if ENABLE_FRILLS || ISO_14755 1748#if ENABLE_FRILLS || ISO_14755
1749 if (iso14755buf)
1750 {
1716 iso14755buf = 0; 1751 iso14755buf = 0;
1717#endif
1718#if ENABLE_OVERLAY 1752# if ENABLE_OVERLAY
1719 scr_overlay_off (); 1753 scr_overlay_off ();
1754# endif
1755 }
1720#endif 1756#endif
1721#if USE_XIM 1757#if USE_XIM
1722 if (Input_Context != NULL) 1758 if (Input_Context != NULL)
1723 XUnsetICFocus (Input_Context); 1759 XUnsetICFocus (Input_Context);
1724#endif 1760#endif
… …
1739 1775
1740#if TRANSPARENT 1776#if TRANSPARENT
1741void 1777void
1742rxvt_term::rootwin_cb (XEvent &ev) 1778rxvt_term::rootwin_cb (XEvent &ev)
1743{ 1779{
1744 SET_R (this); 1780 make_current ();
1745 SET_LOCALE (locale);
1746 1781
1747 switch (ev.type) 1782 switch (ev.type)
1748 { 1783 {
1749 case PropertyNotify: 1784 case PropertyNotify:
1750 /* 1785 /*
… …
1768rxvt_term::button_press (XButtonEvent &ev) 1803rxvt_term::button_press (XButtonEvent &ev)
1769{ 1804{
1770 int reportmode = 0, clickintime; 1805 int reportmode = 0, clickintime;
1771 1806
1772 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1807 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1808
1773 if (!bypass_keystate) 1809 if (!bypass_keystate)
1774 reportmode = !! (priv_modes & PrivMode_mouse_report); 1810 reportmode = !! (priv_modes & PrivMode_mouse_report);
1775 1811
1776 /* 1812 /*
1777 * VT window processing of button press 1813 * VT window processing of button press
1778 */ 1814 */
1779 if (ev.window == vt) 1815 if (ev.window == vt)
1780 { 1816 {
1817 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1818 return;
1819
1781#if ISO_14755 1820#if ISO_14755
1782 // 5.4 1821 // 5.4
1783 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1822 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1784 { 1823 {
1785 iso14755_54 (ev.x, ev.y); 1824 iso14755_54 (ev.x, ev.y);
… …
1797#ifdef MOUSE_REPORT_DOUBLECLICK 1836#ifdef MOUSE_REPORT_DOUBLECLICK
1798 if (ev.button == MEvent.button && clickintime) 1837 if (ev.button == MEvent.button && clickintime)
1799 { 1838 {
1800 /* same button, within alloted time */ 1839 /* same button, within alloted time */
1801 MEvent.clicks++; 1840 MEvent.clicks++;
1841
1802 if (MEvent.clicks > 1) 1842 if (MEvent.clicks > 1)
1803 { 1843 {
1804 /* only report double clicks */ 1844 /* only report double clicks */
1805 MEvent.clicks = 2; 1845 MEvent.clicks = 2;
1806 mouse_report (ev); 1846 mouse_report (ev);
… …
1838#else 1878#else
1839 selection.rect = false; 1879 selection.rect = false;
1840#endif 1880#endif
1841 1881
1842 /* allow shift+left click to extend selection */ 1882 /* allow shift+left click to extend selection */
1843 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1883 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1844 { 1884 {
1845 if (MEvent.button == Button1 && clickintime) 1885 if (MEvent.button == Button1 && clickintime)
1846 selection_rotate (ev.x, ev.y); 1886 selection_rotate (ev.x, ev.y);
1847 else 1887 else
1848 selection_extend (ev.x, ev.y, 1); 1888 selection_extend (ev.x, ev.y, 1);
… …
2013 } 2053 }
2014 2054
2015 break; 2055 break;
2016 } 2056 }
2017 } 2057 }
2058
2018 return; 2059 return;
2019 } 2060 }
2020#if MENUBAR
2021 /*
2022 * Menubar window processing of button press
2023 */
2024 if (isMenuBarWindow (ev.window))
2025 menubar_control (ev);
2026#endif
2027} 2061}
2028 2062
2029void 2063void
2030rxvt_term::button_release (XButtonEvent &ev) 2064rxvt_term::button_release (XButtonEvent &ev)
2031{ 2065{
… …
2037 2071
2038 if (scrollbar_isUpDn ()) 2072 if (scrollbar_isUpDn ())
2039 { 2073 {
2040 scrollBar.setIdle (); 2074 scrollBar.setIdle ();
2041 scrollbar_show (0); 2075 scrollbar_show (0);
2042#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2043 refresh_type &= ~SMOOTH_REFRESH;
2044#endif
2045 } 2076 }
2046 2077
2047#ifdef SELECTION_SCROLLING 2078#ifdef SELECTION_SCROLLING
2048 if (sel_scroll_ev.active) 2079 if (sel_scroll_ev.active)
2049 sel_scroll_ev.stop(); 2080 sel_scroll_ev.stop();
2050#endif 2081#endif
2051 2082
2052 if (ev.window == vt) 2083 if (ev.window == vt)
2053 { 2084 {
2085 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2086 return;
2087
2054#if ISO_14755 2088#if ISO_14755
2055 // 5.4 2089 // 5.4
2056 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2090 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2057 return; 2091 return;
2058#endif 2092#endif
2093
2059 if (reportmode) 2094 if (reportmode)
2060 { 2095 {
2061 /* mouse report from vt window */ 2096 /* mouse report from vt window */
2062 /* don't report release of wheel "buttons" */ 2097 /* don't report release of wheel "buttons" */
2063 if (ev.button >= 4) 2098 if (ev.button >= 4)
… …
2093 { 2128 {
2094 case Button1: 2129 case Button1:
2095 case Button3: 2130 case Button3:
2096 selection_make (ev.time); 2131 selection_make (ev.time);
2097 break; 2132 break;
2133
2098 case Button2: 2134 case Button2:
2099 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);
2100 break; 2137 break;
2138
2101#ifdef MOUSE_WHEEL 2139#ifdef MOUSE_WHEEL
2102 case Button4: 2140 case Button4:
2103 case Button5: 2141 case Button5:
2104 { 2142 {
2105 int i; 2143 int i;
… …
2127 slip_wheel_ev.start (); 2165 slip_wheel_ev.start ();
2128 } 2166 }
2129 else 2167 else
2130 { 2168 {
2131# endif 2169# endif
2132# ifdef JUMP_MOUSE_WHEEL
2133 scr_page (v, i); 2170 scr_page (v, i);
2134 scr_refresh (SMOOTH_REFRESH);
2135 scrollbar_show (1); 2171 scrollbar_show (1);
2136# else
2137 while (i--)
2138 {
2139 scr_page (v, 1);
2140 scr_refresh (SMOOTH_REFRESH);
2141 scrollbar_show (1);
2142 }
2143# endif
2144# ifdef MOUSE_SLIP_WHEELING 2172# ifdef MOUSE_SLIP_WHEELING
2145 } 2173 }
2146#endif 2174# endif
2147 } 2175 }
2148 break; 2176 break;
2149#endif 2177#endif
2150 } 2178 }
2151 } 2179 }
2152#ifdef MENUBAR
2153 else if (isMenuBarWindow (ev.window))
2154 menubar_control (ev);
2155#endif
2156} 2180}
2157 2181
2158#ifdef TRANSPARENT 2182#ifdef TRANSPARENT
2159#if TINTING 2183#if TINTING
2160/* taken from aterm-0.4.2 */ 2184/* taken from aterm-0.4.2 */
2161 2185
2162typedef uint32_t RUINT32T; 2186typedef uint32_t RUINT32T;
2163 2187
2164void 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)
2165{ 2189{
2166 int sh_r, sh_g, sh_b; 2190 int sh_r, sh_g, sh_b;
2167 RUINT32T mask_r, mask_g, mask_b; 2191 RUINT32T mask_r, mask_g, mask_b;
2168 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2192 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2169 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2193 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2170 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2194 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2171 int i; 2195 int i;
2172 2196
2173 Visual *visual = display->visual; 2197 Visual *visual = term->visual;
2174 2198
2175 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2199 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2176 2200
2177 /* for convenience */ 2201 /* for convenience */
2178 mask_r = visual->red_mask; 2202 mask_r = visual->red_mask;
… …
2399 Atom atype; 2423 Atom atype;
2400 unsigned char *prop = NULL; 2424 unsigned char *prop = NULL;
2401 Window root, oldp, *list; 2425 Window root, oldp, *list;
2402 Pixmap rootpixmap = None; 2426 Pixmap rootpixmap = None;
2403 XWindowAttributes wattr, wrootattr; 2427 XWindowAttributes wattr, wrootattr;
2404 dDisp;
2405 2428
2406 pchanged = 0; 2429 pchanged = 0;
2407 2430
2408 if (!OPTION (Opt_transparent)) 2431 if (!OPTION (Opt_transparent))
2409 return pchanged; /* Don't try any more */ 2432 return pchanged; /* Don't try any more */
2410 2433
2411 XGetWindowAttributes (disp, display->root, &wrootattr); 2434 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2412 rootdepth = wrootattr.depth; 2435 rootdepth = wrootattr.depth;
2413 2436
2414 XGetWindowAttributes (disp, parent[0], &wattr); 2437 XGetWindowAttributes (xdisp, parent[0], &wattr);
2415 2438
2416 if (rootdepth != wattr.depth) 2439 if (rootdepth != wattr.depth)
2417 { 2440 {
2418 if (am_transparent) 2441 if (am_transparent)
2419 { 2442 {
2420 pchanged = 1; 2443 pchanged = 1;
2421 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2444 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2422 am_transparent = am_pixmap_trans = 0; 2445 am_transparent = am_pixmap_trans = 0;
2423 } 2446 }
2424 2447
2425 return pchanged; /* Don't try any more */ 2448 return pchanged; /* Don't try any more */
2426 } 2449 }
2427 2450
2428 /* 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. */
2429 XSync (disp, False); 2452 XSync (xdisp, False);
2430 2453
2431 /* 2454 /*
2432 * Make the frame window set by the window manager have 2455 * Make the frame window set by the window manager have
2433 * the root background. Some window managers put multiple nested frame 2456 * the root background. Some window managers put multiple nested frame
2434 * 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.
2435 */ 2458 */
2436 i = (xa[XA_XROOTPMAP_ID] 2459 i = (xa[XA_XROOTPMAP_ID]
2437 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2460 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2438 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2461 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2439 &nitems, &bytes_after, &prop) == Success); 2462 &nitems, &bytes_after, &prop) == Success);
2440 2463
2441 if (!i || prop == NULL) 2464 if (!i || prop == NULL)
2442 i = (xa[XA_ESETROOT_PMAP_ID] 2465 i = (xa[XA_ESETROOT_PMAP_ID]
2443 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2466 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2444 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2467 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2445 &nitems, &bytes_after, &prop) == Success); 2468 &nitems, &bytes_after, &prop) == Success);
2446 2469
2447 if (!i || prop == NULL 2470 if (!i || prop == NULL
2448#if TINTING 2471#if TINTING
2449 || !rs[Rs_color + Color_tint] 2472 || !ISSET_PIXCOLOR (Color_tint)
2450#endif 2473#endif
2451 ) 2474 )
2452 have_pixmap = 0; 2475 have_pixmap = 0;
2453 else 2476 else
2454 { 2477 {
… …
2467 Window cr; 2490 Window cr;
2468 XImage *image; 2491 XImage *image;
2469 GC gc; 2492 GC gc;
2470 XGCValues gcvalue; 2493 XGCValues gcvalue;
2471 2494
2472 XTranslateCoordinates (disp, parent[0], display->root, 2495 XTranslateCoordinates (xdisp, parent[0], display->root,
2473 0, 0, &sx, &sy, &cr); 2496 0, 0, &sx, &sy, &cr);
2474 nw = (unsigned int)szHint.width; 2497 nw = (unsigned int)szHint.width;
2475 nh = (unsigned int)szHint.height; 2498 nh = (unsigned int)szHint.height;
2476 nx = ny = 0; 2499 nx = ny = 0;
2477 2500
… …
2490 } 2513 }
2491 2514
2492 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2515 min_it (nw, (unsigned int) (wrootattr.width - sx));
2493 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2516 min_it (nh, (unsigned int) (wrootattr.height - sy));
2494 2517
2495 XSync (disp, False); 2518 XSync (xdisp, False);
2496 allowedxerror = -1; 2519 allowedxerror = -1;
2497 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2520 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2498 2521
2499 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2522 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2500 /* XXX: may need a delay here? */ 2523 /* XXX: may need a delay here? */
2501 allowedxerror = 0; 2524 allowedxerror = 0;
2502 2525
… …
2505 if (am_transparent && am_pixmap_trans) 2528 if (am_transparent && am_pixmap_trans)
2506 { 2529 {
2507 pchanged = 1; 2530 pchanged = 1;
2508 if (pixmap != None) 2531 if (pixmap != None)
2509 { 2532 {
2510 XFreePixmap (disp, pixmap); 2533 XFreePixmap (xdisp, pixmap);
2511 pixmap = None; 2534 pixmap = None;
2512 } 2535 }
2513 } 2536 }
2514 2537
2515 am_pixmap_trans = 0; 2538 am_pixmap_trans = 0;
2516 } 2539 }
2517 else 2540 else
2518 { 2541 {
2519 if (pixmap != None) 2542 if (pixmap != None)
2520 XFreePixmap (disp, pixmap); 2543 XFreePixmap (xdisp, pixmap);
2521 2544
2522#if TINTING 2545#if TINTING
2523 if (ISSET_PIXCOLOR (Color_tint)) 2546 if (ISSET_PIXCOLOR (Color_tint))
2524 { 2547 {
2525 unsigned short rm, gm, bm;
2526 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2548 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2527 2549
2550 rgba c;
2528 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2551 pix_colors_focused [Color_tint].get (c);
2529 2552
2530 ShadeXImage (display, image, shade, rm, gm, bm); 2553 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2531 } 2554 }
2532#endif 2555#endif
2533 2556
2534 pixmap = XCreatePixmap (disp, vt, 2557 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2535 szHint.width, szHint.height, image->depth);
2536 gc = XCreateGC (disp, vt, 0UL, &gcvalue); 2558 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2537 XPutImage (disp, pixmap, gc, image, 0, 0, 2559 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2538 nx, ny, image->width, image->height); 2560 nx, ny, image->width, image->height);
2539 XFreeGC (disp, gc); 2561 XFreeGC (xdisp, gc);
2540 XDestroyImage (image); 2562 XDestroyImage (image);
2541 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2563 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2542 XClearWindow (disp, parent[0]); 2564 XClearWindow (xdisp, parent[0]);
2543 2565
2544 if (!am_transparent || !am_pixmap_trans) 2566 if (!am_transparent || !am_pixmap_trans)
2545 pchanged = 1; 2567 pchanged = 1;
2546 2568
2547 am_transparent = am_pixmap_trans = 1; 2569 am_transparent = am_pixmap_trans = 1;
2548 } 2570 }
2549 } 2571 }
2550 2572
2551 if (am_pixmap_trans) 2573 if (am_pixmap_trans)
2552 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2574 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2553 else 2575 else
2554 { 2576 {
2555 unsigned int n; 2577 unsigned int n;
2556 /* 2578 /*
2557 * InheritPixmap transparency 2579 * InheritPixmap transparency
2558 */ 2580 */
2559 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2581 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2560 { 2582 {
2561 oldp = parent[i]; 2583 oldp = parent[i];
2562 XQueryTree (disp, parent[i - 1], &root, 2584 XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2563 &parent[i], &list, &n);
2564 XFree (list); 2585 XFree (list);
2565 2586
2566 if (parent[i] == display->root) 2587 if (parent[i] == display->root)
2567 { 2588 {
2568 if (oldp != None) 2589 if (oldp != None)
… …
2576 } 2597 }
2577 2598
2578 n = 0; 2599 n = 0;
2579 2600
2580 if (pchanged) 2601 if (pchanged)
2581 {
2582 for (; n < (unsigned int)i; n++) 2602 for (; n < (unsigned int)i; n++)
2583 { 2603 {
2584 XGetWindowAttributes (disp, parent[n], &wattr); 2604 XGetWindowAttributes (xdisp, parent[n], &wattr);
2605
2585 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2606 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2586 { 2607 {
2587 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2608 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2588 break; 2609 break;
2589 } 2610 }
2590 } 2611 }
2591 }
2592 2612
2593 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2613 if (n > (sizeof (parent) / sizeof (parent[0])))
2594 { 2614 {
2595 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2615 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2596 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2616 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2597 am_transparent = 0; 2617 am_transparent = 0;
2598 /* XXX: also turn off Opt_transparent? */ 2618 /* XXX: also turn off Opt_transparent? */
2599 } 2619 }
2600 else 2620 else
2601 { 2621 {
2602#if WAIT_FOR_WM
2603 /* wait (an arbitrary period) for the WM to do its thing
2604 * needed for fvwm2.2.2 (and before?) */
2605 sleep (1);
2606#endif
2607 for (n = 0; n < (unsigned int)i; n++) 2622 for (n = 0; n < (unsigned int)i; n++)
2608 { 2623 {
2609 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2624 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2610 XClearWindow (disp, parent[n]); 2625 XClearWindow (xdisp, parent[n]);
2611 } 2626 }
2612 2627
2613 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2628 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2614 am_transparent = 1; 2629 am_transparent = 1;
2615 } 2630 }
2616 2631
2617 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2632 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2618 parent[i] = None; 2633 parent[i] = None;
2619 } 2634 }
2620 2635
2621 if (scrollBar.win) 2636 if (scrollBar.win)
2622 { 2637 {
2623 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2638 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2624 scrollBar.setIdle (); 2639 scrollBar.setIdle ();
2625 scrollbar_show (0); 2640 scrollbar_show (0);
2626 } 2641 }
2627 2642
2628 if (am_transparent) 2643 if (am_transparent)
… …
2640 2655
2641bool 2656bool
2642rxvt_term::cmd_parse () 2657rxvt_term::cmd_parse ()
2643{ 2658{
2644 bool flag = false; 2659 bool flag = false;
2645 unicode_t ch = NOCHAR; 2660 wchar_t ch = NOCHAR;
2646 unsigned char *seq_begin; // remember start of esc-sequence here 2661 char *seq_begin; // remember start of esc-sequence here
2647 2662
2648 for (;;) 2663 for (;;)
2649 { 2664 {
2650 if (ch == NOCHAR) 2665 if (ch == NOCHAR)
2651 { 2666 {
2652 seq_begin = cmdbuf_ptr; 2667 seq_begin = cmdbuf_ptr;
2653 ch = next_char (); 2668 ch = next_char ();
2654 }
2655 2669
2656 if (ch == NOCHAR) // TODO: improve 2670 if (ch == NOCHAR)
2657 break; 2671 break;
2672 }
2658 2673
2659 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)
2660 { 2675 {
2661 if (!seen_input) 2676 if (!seen_input)
2662 { 2677 {
… …
2671 if (seen_resize && cmd_pid) 2686 if (seen_resize && cmd_pid)
2672 kill (-cmd_pid, SIGWINCH); 2687 kill (-cmd_pid, SIGWINCH);
2673 } 2688 }
2674 2689
2675 /* Read a text string from the input buffer */ 2690 /* Read a text string from the input buffer */
2676 unicode_t buf[UBUFSIZ]; 2691 wchar_t buf[UBUFSIZ];
2677 bool refreshnow = false; 2692 bool refreshnow = false;
2678 int nlines = 0; 2693 int nlines = 0;
2679 unicode_t *str = buf; 2694 wchar_t *str = buf;
2680 unicode_t *eol = str + min (ncol, UBUFSIZ); 2695 wchar_t *eol = str + min (ncol, UBUFSIZ);
2681 2696
2682 for (;;) 2697 for (;;)
2683 { 2698 {
2684 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))
2685 break; 2700 break;
… …
2695 2710
2696 if (!OPTION (Opt_jumpScroll) 2711 if (!OPTION (Opt_jumpScroll)
2697 || (refresh_count >= refresh_limit * (nrow - 1))) 2712 || (refresh_count >= refresh_limit * (nrow - 1)))
2698 { 2713 {
2699 refreshnow = true; 2714 refreshnow = true;
2715 refresh_count = 0;
2700 ch = NOCHAR; 2716 ch = NOCHAR;
2701 break; 2717 break;
2702 } 2718 }
2703 2719
2704 // scr_add_lines only works for nlines <= nrow - 1. 2720 // scr_add_lines only works for nlines <= nrow - 1.
2705 if (nlines >= nrow - 1) 2721 if (nlines >= nrow - 1)
2706 { 2722 {
2723 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2724 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2707 scr_add_lines (buf, nlines, str - buf); 2725 scr_add_lines (buf, str - buf, nlines);
2726
2708 nlines = 0; 2727 nlines = 0;
2709 str = buf; 2728 str = buf;
2710 eol = str + min (ncol, UBUFSIZ); 2729 eol = str + min (ncol, UBUFSIZ);
2711 } 2730 }
2712 2731
… …
2725 2744
2726 seq_begin = cmdbuf_ptr; 2745 seq_begin = cmdbuf_ptr;
2727 ch = next_char (); 2746 ch = next_char ();
2728 } 2747 }
2729 2748
2749 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2750 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2730 scr_add_lines (buf, nlines, str - buf); 2751 scr_add_lines (buf, str - buf, nlines);
2731 2752
2732 /* 2753 /*
2733 * 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
2734 * 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.
2735 * the number of pages between refreshes is refresh_limit, which 2756 * the number of pages between refreshes is refresh_limit, which
… …
2740 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2761 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2741 refresh_limit++; 2762 refresh_limit++;
2742 else 2763 else
2743 { 2764 {
2744 flag = true; 2765 flag = true;
2745 scr_refresh (refresh_type); 2766 scr_refresh ();
2767 want_refresh = 1;
2746 } 2768 }
2747 } 2769 }
2748 2770
2749 } 2771 }
2750 else 2772 else
… …
2765 } 2787 }
2766 2788
2767 return flag; 2789 return flag;
2768} 2790}
2769 2791
2770// read the next octet
2771unicode_t
2772rxvt_term::next_octet ()
2773{
2774 return cmdbuf_ptr < cmdbuf_endp
2775 ? *cmdbuf_ptr++
2776 : NOCHAR;
2777}
2778
2779// read the next character 2792// read the next character
2780unicode_t 2793wchar_t
2781rxvt_term::next_char () 2794rxvt_term::next_char () NOTHROW
2782{ 2795{
2783 while (cmdbuf_ptr < cmdbuf_endp) 2796 while (cmdbuf_ptr < cmdbuf_endp)
2784 { 2797 {
2785 // assume 7-bit to be ascii ALWAYS 2798 // assume 7-bit to be ascii ALWAYS
2786 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2799 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2787 return *cmdbuf_ptr++; 2800 return *cmdbuf_ptr++;
2788 2801
2789 wchar_t wc; 2802 wchar_t wc;
2790 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);
2791 2804
2792 if (len == (size_t)-2) 2805 if (len == (size_t)-2)
2793 { 2806 {
2794 // the mbstate stores incomplete sequences. didn't know this :/ 2807 // the mbstate stores incomplete sequences. didn't know this :/
2795 cmdbuf_ptr = cmdbuf_endp; 2808 cmdbuf_ptr = cmdbuf_endp;
2796 break; 2809 break;
2797 } 2810 }
2798 2811
2799 if (len == (size_t)-1) 2812 if (len == (size_t)-1)
2800 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
2801 2814
2802 // assume wchar == unicode 2815 // assume wchar == unicode
2803 cmdbuf_ptr += len; 2816 cmdbuf_ptr += len;
2804 return wc & UNICODE_MASK; 2817 return wc & UNICODE_MASK;
2805 } 2818 }
2806 2819
2807 return NOCHAR; 2820 return NOCHAR;
2808} 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;
2809 2833
2810/* rxvt_cmd_getc () - Return next input character */ 2834/* rxvt_cmd_getc () - Return next input character */
2811/* 2835/*
2812 * Return the next input character after first passing any keyboard input 2836 * Return the next input character after first passing any keyboard input
2813 * to the command. 2837 * to the command.
2814 */ 2838 */
2815unicode_t 2839wchar_t
2816rxvt_term::cmd_getc () 2840rxvt_term::cmd_getc () THROW ((class out_of_input))
2817{ 2841{
2818 unicode_t c = next_char (); 2842 wchar_t c = next_char ();
2819 2843
2820 if (c == NOCHAR) 2844 if (c == NOCHAR)
2821 throw out_of_input; 2845 throw out_of_input;
2822 2846
2823 return c; 2847 return c;
2824} 2848}
2825 2849
2826unicode_t 2850uint32_t
2827rxvt_term::cmd_get8 () 2851rxvt_term::cmd_get8 () THROW ((class out_of_input))
2828{ 2852{
2829 unicode_t c = next_octet (); 2853 uint32_t c = next_octet ();
2830 2854
2831 if (c == NOCHAR) 2855 if (c == NOCHAR)
2832 throw out_of_input; 2856 throw out_of_input;
2833 2857
2834 return c; 2858 return c;
… …
2934 case C0_ESC: 2958 case C0_ESC:
2935 process_escape_seq (); 2959 process_escape_seq ();
2936 break; 2960 break;
2937 case C0_ENQ: /* terminal Status */ 2961 case C0_ENQ: /* terminal Status */
2938 if (rs[Rs_answerbackstring]) 2962 if (rs[Rs_answerbackstring])
2939 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2963 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2940 (unsigned int)strlen (rs[Rs_answerbackstring]));
2941 else 2964 else
2942 tt_write ((unsigned char *)VT100_ANS, 2965 tt_write (VT100_ANS, strlen (VT100_ANS));
2943 (unsigned int)strlen (VT100_ANS));
2944 break; 2966 break;
2945 case C0_BEL: /* bell */ 2967 case C0_BEL: /* bell */
2946 scr_bell (); 2968 scr_bell ();
2947 break; 2969 break;
2948 case C0_BS: /* backspace */ 2970 case C0_BS: /* backspace */
… …
3072 scr_charset_set (2, (unsigned int)cmd_getc ()); 3094 scr_charset_set (2, (unsigned int)cmd_getc ());
3073 break; 3095 break;
3074 case '+': 3096 case '+':
3075 scr_charset_set (3, (unsigned int)cmd_getc ()); 3097 scr_charset_set (3, (unsigned int)cmd_getc ());
3076 break; 3098 break;
3077#if ENABLE_FRILLS 3099#if !ENABLE_MINIMAL
3078 case '6': 3100 case '6':
3079 scr_backindex (); 3101 scr_backindex ();
3080 break; 3102 break;
3081#endif 3103#endif
3082 case '7': 3104 case '7':
3083 scr_cursor (SAVE); 3105 scr_cursor (SAVE);
3084 break; 3106 break;
3085 case '8': 3107 case '8':
3086 scr_cursor (RESTORE); 3108 scr_cursor (RESTORE);
3087 break; 3109 break;
3088#if ENABLE_FRILLS 3110#if !ENABLE_MINIMAL
3089 case '9': 3111 case '9':
3090 scr_forwardindex (); 3112 scr_forwardindex ();
3091 break; 3113 break;
3092#endif 3114#endif
3093 case '=': 3115 case '=':
… …
3103 break; 3125 break;
3104 3126
3105 /* 8.3.87: NEXT LINE */ 3127 /* 8.3.87: NEXT LINE */
3106 case C1_NEL: /* ESC E */ 3128 case C1_NEL: /* ESC E */
3107 { 3129 {
3108 unicode_t nlcr[] = { C0_LF, C0_CR }; 3130 wchar_t nlcr[] = { C0_LF, C0_CR };
3109 scr_add_lines (nlcr, 1, 2); 3131 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3110 } 3132 }
3111 break; 3133 break;
3112 3134
3113 /* kidnapped escape sequence: Should be 8.3.48 */ 3135 /* kidnapped escape sequence: Should be 8.3.48 */
3114 case C1_ESA: /* ESC G */ 3136 case C1_ESA: /* ESC G */
… …
3136 process_dcs_seq (); 3158 process_dcs_seq ();
3137 break; 3159 break;
3138 3160
3139 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3161 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3140 case C1_SCI: /* ESC Z */ 3162 case C1_SCI: /* ESC Z */
3141 tt_write ((const unsigned char *)ESCZ_ANSWER, 3163 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3142 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3143 break; /* steal obsolete ESC [ c */ 3164 break; /* steal obsolete ESC [ c */
3144 3165
3145 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3166 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3146 case C1_CSI: /* ESC [ */ 3167 case C1_CSI: /* ESC [ */
3147 process_csi_seq (); 3168 process_csi_seq ();
… …
3256 ndef = get_byte_array_bit (csi_defaults, i); 3277 ndef = get_byte_array_bit (csi_defaults, i);
3257 for (p = 0; p < nargs; p++) 3278 for (p = 0; p < nargs; p++)
3258 if (arg[p] == -1) 3279 if (arg[p] == -1)
3259 arg[p] = ndef; 3280 arg[p] = ndef;
3260 3281
3261#ifdef DEBUG_CMD
3262 fprintf (stderr, "CSI ");
3263 for (p = 0; p < nargs; p++)
3264 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3265 fprintf (stderr, "%c\n", ch);
3266#endif
3267
3268 /* 3282 /*
3269 * private mode handling 3283 * private mode handling
3270 */ 3284 */
3271 if (priv) 3285 if (priv)
3272 { 3286 {
3273 switch (priv) 3287 switch (priv)
3274 { 3288 {
3275 case '>': 3289 case '>':
3276 if (ch == CSI_DA) /* secondary device attributes */ 3290 if (ch == CSI_DA) /* secondary device attributes */
3277 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 }
3278 break; 3301 break;
3279 case '?': 3302 case '?':
3280 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3303 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3281 process_terminal_mode (ch, priv, nargs, arg); 3304 process_terminal_mode (ch, priv, nargs, arg);
3282 break; 3305 break;
… …
3391 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3414 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3392 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3415 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3393 break; 3416 break;
3394 3417
3395 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3418 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3396 tt_write ((const unsigned char *)VT100_ANS, 3419 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3397 (unsigned int) (sizeof (VT100_ANS) - 1));
3398 break; 3420 break;
3399 3421
3400 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3422 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3401 process_sgr_mode (nargs, arg); 3423 process_sgr_mode (nargs, arg);
3402 break; 3424 break;
… …
3486 break; 3508 break;
3487 case CSI_75: 3509 case CSI_75:
3488 scr_cursor (RESTORE); 3510 scr_cursor (RESTORE);
3489 break; 3511 break;
3490 3512
3491#if ENABLE_FRILLS 3513#if !ENABLE_MINIMAL
3492 case CSI_74: 3514 case CSI_74:
3493 process_window_ops (arg, nargs); 3515 process_window_ops (arg, nargs);
3494 break; 3516 break;
3495#endif 3517#endif
3496 3518
… …
3503 break; 3525 break;
3504 } 3526 }
3505} 3527}
3506/*}}} */ 3528/*}}} */
3507 3529
3508#if ENABLE_FRILLS 3530#if !ENABLE_MINIMAL
3509/* ARGSUSED */ 3531/* ARGSUSED */
3510void 3532void
3511rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3533rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3512{ 3534{
3513 int x, y; 3535 int x, y;
3514 XWindowAttributes wattr; 3536 XWindowAttributes wattr;
3515 Window wdummy; 3537 Window wdummy;
3516 dDisp; 3538
3539 dLocal (Display *, xdisp);
3517 3540
3518 if (nargs == 0) 3541 if (nargs == 0)
3519 return; 3542 return;
3520 3543
3521 switch (args[0]) 3544 switch (args[0])
3522 { 3545 {
3523 /* 3546 /*
3524 * commands 3547 * commands
3525 */ 3548 */
3526 case 1: /* deiconify window */ 3549 case 1: /* deiconify window */
3527 XMapWindow (disp, parent[0]); 3550 XMapWindow (xdisp, parent[0]);
3528 break; 3551 break;
3529 case 2: /* iconify window */ 3552 case 2: /* iconify window */
3530 XIconifyWindow (disp, parent[0], display->screen); 3553 XIconifyWindow (xdisp, parent[0], display->screen);
3531 break; 3554 break;
3532 case 3: /* set position (pixels) */ 3555 case 3: /* set position (pixels) */
3533 XMoveWindow (disp, parent[0], args[1], args[2]); 3556 XMoveWindow (xdisp, parent[0], args[1], args[2]);
3534 break; 3557 break;
3535 case 4: /* set size (pixels) */ 3558 case 4: /* set size (pixels) */
3536 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3559 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3537 break; 3560 break;
3538 case 5: /* raise window */ 3561 case 5: /* raise window */
3539 XRaiseWindow (disp, parent[0]); 3562 XRaiseWindow (xdisp, parent[0]);
3540 break; 3563 break;
3541 case 6: /* lower window */ 3564 case 6: /* lower window */
3542 XLowerWindow (disp, parent[0]); 3565 XLowerWindow (xdisp, parent[0]);
3543 break; 3566 break;
3544 case 7: /* refresh window */ 3567 case 7: /* refresh window */
3545 scr_touch (true); 3568 scr_touch (true);
3546 break; 3569 break;
3547 case 8: /* set size (chars) */ 3570 case 8: /* set size (chars) */
… …
3554 if (args[0] >= 24) /* set height (chars) */ 3577 if (args[0] >= 24) /* set height (chars) */
3555 set_widthheight ((unsigned int)width, 3578 set_widthheight ((unsigned int)width,
3556 (unsigned int) (args[1] * fheight)); 3579 (unsigned int) (args[1] * fheight));
3557 break; 3580 break;
3558 3581
3559
3560 /* 3582 /*
3561 * reports - some output format copied from XTerm 3583 * reports - some output format copied from XTerm
3562 */ 3584 */
3563 case 11: /* report window state */ 3585 case 11: /* report window state */
3564 XGetWindowAttributes (disp, parent[0], &wattr); 3586 XGetWindowAttributes (xdisp, parent[0], &wattr);
3565 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3587 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3566 break; 3588 break;
3567 case 13: /* report window position */ 3589 case 13: /* report window position */
3568 XGetWindowAttributes (disp, parent[0], &wattr); 3590 XGetWindowAttributes (xdisp, parent[0], &wattr);
3569 XTranslateCoordinates (disp, parent[0], wattr.root, 3591 XTranslateCoordinates (xdisp, parent[0], wattr.root,
3570 -wattr.border_width, -wattr.border_width, 3592 -wattr.border_width, -wattr.border_width,
3571 &x, &y, &wdummy); 3593 &x, &y, &wdummy);
3572 tt_printf ("\033[3;%d;%dt", x, y); 3594 tt_printf ("\033[3;%d;%dt", x, y);
3573 break; 3595 break;
3574 case 14: /* report window size (pixels) */ 3596 case 14: /* report window size (pixels) */
3575 XGetWindowAttributes (disp, parent[0], &wattr); 3597 XGetWindowAttributes (xdisp, parent[0], &wattr);
3576 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3598 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3577 break; 3599 break;
3578 case 18: /* report text area size (chars) */ 3600 case 18: /* report text area size (chars) */
3579 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3601 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3580 break; 3602 break;
… …
3582 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3604 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3583 break; 3605 break;
3584 case 20: /* report icon label */ 3606 case 20: /* report icon label */
3585 { 3607 {
3586 char *s; 3608 char *s;
3587 XGetIconName (disp, parent[0], &s); 3609 XGetIconName (xdisp, parent[0], &s);
3588 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 */
3589 XFree (s); 3611 XFree (s);
3590 } 3612 }
3591 break; 3613 break;
3592 case 21: /* report window title */ 3614 case 21: /* report window title */
3593 { 3615 {
3594 char *s; 3616 char *s;
3595 XFetchName (disp, parent[0], &s); 3617 XFetchName (xdisp, parent[0], &s);
3596 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 */
3597 XFree (s); 3619 XFree (s);
3598 } 3620 }
3599 break; 3621 break;
3600 } 3622 }
… …
3604/*----------------------------------------------------------------------*/ 3626/*----------------------------------------------------------------------*/
3605/* 3627/*
3606 * get input up until STRING TERMINATOR (or BEL) 3628 * get input up until STRING TERMINATOR (or BEL)
3607 * ends_how is terminator used. returned input must be free()'d 3629 * ends_how is terminator used. returned input must be free()'d
3608 */ 3630 */
3609unsigned char * 3631char *
3610rxvt_term::get_to_st (unicode_t &ends_how) 3632rxvt_term::get_to_st (unicode_t &ends_how)
3611{ 3633{
3612 unicode_t ch; 3634 unicode_t ch;
3613 bool seen_esc = false; 3635 bool seen_esc = false;
3614 unsigned int n = 0; 3636 unsigned int n = 0;
… …
3647 3669
3648 string[n++] = '\0'; 3670 string[n++] = '\0';
3649 3671
3650 ends_how = (ch == 0x5c ? C0_ESC : ch); 3672 ends_how = (ch == 0x5c ? C0_ESC : ch);
3651 3673
3652 return (unsigned char *)rxvt_wcstombs (string); 3674 return rxvt_wcstombs (string);
3653} 3675}
3654 3676
3655/*----------------------------------------------------------------------*/ 3677/*----------------------------------------------------------------------*/
3656/* 3678/*
3657 * 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)'
3658 */ 3680 */
3659void 3681void
3660rxvt_term::process_dcs_seq () 3682rxvt_term::process_dcs_seq ()
3661{ 3683{
3662 unsigned char *s; 3684 char *s;
3663 unicode_t eh; 3685 unicode_t eh;
3664 3686
3665 /* 3687 /*
3666 * Not handled yet 3688 * Not handled yet
3667 */ 3689 */
… …
3686 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3708 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3687 arg = arg * 10 + (ch - '0'); 3709 arg = arg * 10 + (ch - '0');
3688 3710
3689 if (ch == ';') 3711 if (ch == ';')
3690 { 3712 {
3691 unsigned char *s = get_to_st (eh); 3713 char *s = get_to_st (eh);
3692 3714
3693 if (s) 3715 if (s)
3694 { 3716 {
3695 process_xterm_seq (arg, (char *)s, eh); 3717 process_xterm_seq (arg, s, eh);
3696 free (s); 3718 free (s);
3697 } 3719 }
3698 } 3720 }
3699} 3721}
3700 3722
3701void 3723void
3702rxvt_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)
3703{ 3725{
3704 if (str[0] == '?' && !str[1]) 3726 if (str[0] == '?' && !str[1])
3705 { 3727 {
3706 unsigned short r, g, b; 3728 rgba c;
3707 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
3708 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);
3709 } 3737 }
3710 else 3738 else
3711 set_window_color (color, str); 3739 set_window_color (color, str);
3712} 3740}
3713 3741
3714/* 3742/*
3715 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3743 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3716 */ 3744 */
3717void 3745void
3718rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3746rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3719{ 3747{
3720 int changed = 0;
3721 int color; 3748 int color;
3722 char *buf, *name; 3749 char *buf, *name;
3723 bool query = str[0] == '?' && !str[1]; 3750 bool query = str[0] == '?' && !str[1];
3724 int saveop = op; 3751 int saveop = op;
3725 dDisp; 3752
3753 dLocal (Display *, xdisp);
3726 3754
3727 assert (str != NULL); 3755 assert (str != NULL);
3728 switch (op) 3756 switch (op)
3729 { 3757 {
3730 case XTerm_name: 3758 case XTerm_name:
… …
3746 unsigned long bytes_after; 3774 unsigned long bytes_after;
3747 unsigned char *value = 0; 3775 unsigned char *value = 0;
3748 const char *str = ""; 3776 const char *str = "";
3749 3777
3750 if (prop 3778 if (prop
3751 && XGetWindowProperty (disp, parent[0], 3779 && XGetWindowProperty (xdisp, parent[0],
3752 prop, 0, 1<<16, 0, AnyPropertyType, 3780 prop, 0, 1<<16, 0, AnyPropertyType,
3753 &actual_type, &actual_format, 3781 &actual_type, &actual_format,
3754 &nitems, &bytes_after, &value) == Success 3782 &nitems, &bytes_after, &value) == Success
3755 && actual_type != None 3783 && actual_type != None
3756 && actual_format == 8) 3784 && actual_format == 8)
3757 str = (const char *)(value); 3785 str = (const char *)(value);
3758 3786
3759 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3787 tt_printf ("\033]%d;%s%c", op, str, resp);
3760 3788
3761 XFree (value); 3789 XFree (value);
3762 } 3790 }
3763 else 3791 else
3764 { 3792 {
… …
3768 { 3796 {
3769 *eq = 0; 3797 *eq = 0;
3770 set_utf8_property (display->atom (str), eq + 1); 3798 set_utf8_property (display->atom (str), eq + 1);
3771 } 3799 }
3772 else 3800 else
3773 XDeleteProperty (disp, parent[0], 3801 XDeleteProperty (xdisp, parent[0],
3774 display->atom (str)); 3802 display->atom (str));
3775 } 3803 }
3776 break; 3804 break;
3777 3805
3778 case XTerm_Color: 3806 case XTerm_Color:
… …
3780 { 3808 {
3781 if ((name = strchr (buf, ';')) == NULL) 3809 if ((name = strchr (buf, ';')) == NULL)
3782 break; 3810 break;
3783 3811
3784 *name++ = '\0'; 3812 *name++ = '\0';
3785 color = atoi (buf); 3813 color = atoi (buf) + minCOLOR;
3786 3814
3787 if (color < 0 || color >= TOTAL_COLORS) 3815 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3788 break; 3816 break;
3789 3817
3790 if ((buf = strchr (name, ';')) != NULL) 3818 if ((buf = strchr (name, ';')) != NULL)
3791 *buf++ = '\0'; 3819 *buf++ = '\0';
3792 3820
3793 if (name[0] == '?' && !name[1]) 3821 process_color_seq (op, color, name, resp);
3794 {
3795 unsigned short r, g, b;
3796 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3797 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3798 }
3799 else
3800 set_window_color (color + minCOLOR, name);
3801 } 3822 }
3802 break; 3823 break;
3803 case XTerm_Color00: 3824 case XTerm_Color00:
3804 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3825 process_color_seq (op, Color_fg, str, resp);
3805 break; 3826 break;
3806 case XTerm_Color01: 3827 case XTerm_Color01:
3807 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3828 process_color_seq (op, Color_bg, str, resp);
3808 break; 3829 break;
3809#ifndef NO_CURSORCOLOR 3830#ifndef NO_CURSORCOLOR
3810 case XTerm_Color_cursor: 3831 case XTerm_Color_cursor:
3811 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3832 process_color_seq (op, Color_cursor, str, resp);
3812 break; 3833 break;
3813#endif 3834#endif
3814 case XTerm_Color_pointer_fg: 3835 case XTerm_Color_pointer_fg:
3815 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3836 process_color_seq (op, Color_pointer_fg, str, resp);
3816 break; 3837 break;
3817 case XTerm_Color_pointer_bg: 3838 case XTerm_Color_pointer_bg:
3818 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3839 process_color_seq (op, Color_pointer_bg, str, resp);
3819 break; 3840 break;
3820#ifndef NO_BOLD_UNDERLINE_REVERSE 3841#ifndef NO_BOLD_UNDERLINE_REVERSE
3821 case XTerm_Color_BD:
3822 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3823 break;
3824 case XTerm_Color_UL:
3825 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3826 break;
3827 case XTerm_Color_RV: 3842 case XTerm_Color_RV:
3828 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);
3829 break; 3852 break;
3830 case URxvt_Color_IT: 3853 case URxvt_Color_IT:
3831 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3854 process_color_seq (op, Color_IT, str, resp);
3832 break; 3855 break;
3833#endif 3856#endif
3834#if TRANSPARENT && TINTING 3857#if TRANSPARENT && TINTING
3835 case URxvt_Color_tint: 3858 case URxvt_Color_tint:
3836 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3859 process_color_seq (op, Color_tint, str, resp);
3860
3837 check_our_parents (); 3861 check_our_parents ();
3862
3838 if (am_transparent) 3863 if (am_transparent)
3839 want_full_refresh = want_refresh = 1; 3864 want_full_refresh = want_refresh = 1;
3840 break;
3841#endif
3842 3865
3866 break;
3867#endif
3868
3843 case XTerm_Pixmap: 3869 case Rxvt_Pixmap:
3870 {
3844 if (*str != ';') 3871 if (*str != ';')
3845 { 3872 {
3846#if XPM_BACKGROUND 3873#if XPM_BACKGROUND
3847 scale_pixmap (""); /* reset to default scaling */ 3874 scale_pixmap (""); /* reset to default scaling */
3848 set_bgPixmap (str); /* change pixmap */ 3875 set_bgPixmap (str); /* change pixmap */
3849#endif
3850 scr_touch (true); 3876 scr_touch (true);
3877#endif
3851 } 3878 }
3879
3880 int changed = 0;
3881
3852 while ((str = strchr (str, ';')) != NULL) 3882 while ((str = strchr (str, ';')) != NULL)
3853 { 3883 {
3854 str++; 3884 str++;
3855#if XPM_BACKGROUND 3885#if XPM_BACKGROUND
3856 changed += scale_pixmap (str); 3886 changed += scale_pixmap (str);
3857#endif 3887#endif
3858 } 3888 }
3859 3889
3860 if (changed) 3890 if (changed)
3861 { 3891 {
3862#ifdef XPM_BACKGROUND 3892#ifdef XPM_BACKGROUND
3863 resize_pixmap (); 3893 resize_pixmap ();
3864#endif
3865 scr_touch (true); 3894 scr_touch (true);
3895#endif
3866 } 3896 }
3897 }
3867 break; 3898 break;
3868 3899
3869 case XTerm_restoreFG: 3900 case Rxvt_restoreFG:
3870 set_window_color (Color_fg, str); 3901 set_window_color (Color_fg, str);
3871 break; 3902 break;
3872 case XTerm_restoreBG: 3903 case Rxvt_restoreBG:
3873 set_window_color (Color_bg, str); 3904 set_window_color (Color_bg, str);
3874 break; 3905 break;
3875 3906
3876 case XTerm_logfile: 3907 case XTerm_logfile:
3877 // TODO, when secure mode? 3908 // TODO, when secure mode?
3878 break; 3909 break;
3879 3910
3880#ifdef MENUBAR
3881 case URxvt_Menu:
3882 if (OPTION (Opt_insecure))
3883 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3884 break;
3885#endif
3886#if 0 3911#if 0
3887 case XTerm_dumpscreen: /* no error notices */ 3912 case Rxvt_dumpscreen: /* no error notices */
3888 { 3913 {
3889 int fd; 3914 int fd;
3890 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)
3891 { 3916 {
3892 scr_dump (fd); 3917 scr_dump (fd);
… …
3916 allocated.push_back ((void *)res); 3941 allocated.push_back ((void *)res);
3917 set_fonts (); 3942 set_fonts ();
3918 } 3943 }
3919 break; 3944 break;
3920 3945
3921#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
3922 case URxvt_locale: 3955 case URxvt_locale:
3923 if (query) 3956 if (query)
3924 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);
3925 else 3958 else
3926 { 3959 {
3927 set_locale (str); 3960 set_locale (str);
3928 pty.set_utf8_mode (enc_utf8); 3961 pty->set_utf8_mode (enc_utf8);
3929 init_xlocale (); 3962 init_xlocale ();
3930 } 3963 }
3931 break; 3964 break;
3932 3965
3933 case URxvt_view_up: 3966 case URxvt_view_up:
3934 case URxvt_view_down: 3967 case URxvt_view_down:
3968 {
3935 int lines = atoi (str); 3969 int lines = atoi (str);
3936 3970
3937 if (lines) 3971 if (lines)
3938 scr_page (op == URxvt_view_up ? UP : DN, lines); 3972 scr_page (op == URxvt_view_up ? UP : DN, lines);
3939 else 3973 else
3940 {
3941 scr_erase_savelines (); 3974 scr_erase_savelines ();
3942 } 3975 }
3943 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
3944 break; 3984 break;
3945#endif 3985#endif
3946 } 3986 }
3947} 3987}
3948/*----------------------------------------------------------------------*/ 3988/*----------------------------------------------------------------------*/
… …
3979 return state; 4019 return state;
3980} 4020}
3981 4021
3982/* we're not using priv _yet_ */ 4022/* we're not using priv _yet_ */
3983void 4023void
3984rxvt_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)
3985{ 4025{
3986 unsigned int i, j; 4026 unsigned int i, j;
3987 int state; 4027 int state;
3988 4028
3989 static const struct 4029 static const struct
… …
4000 { 5, PrivMode_rVideo }, 4040 { 5, PrivMode_rVideo },
4001 { 6, PrivMode_relOrigin }, 4041 { 6, PrivMode_relOrigin },
4002 { 7, PrivMode_Autowrap }, 4042 { 7, PrivMode_Autowrap },
4003 // 8, bi-directional support mode 4043 // 8, bi-directional support mode
4004 { 9, PrivMode_MouseX10 }, 4044 { 9, PrivMode_MouseX10 },
4005#ifdef menuBar_esc
4006 { menuBar_esc, PrivMode_menuBar },
4007#endif
4008 // 18, 19 printing-related 4045 // 18, 19 printing-related
4009 { 25, PrivMode_VisibleCursor }, 4046 { 25, PrivMode_VisibleCursor },
4010#ifdef scrollBar_esc 4047#ifdef scrollBar_esc
4011 { scrollBar_esc, PrivMode_scrollBar }, 4048 { scrollBar_esc, PrivMode_scrollBar },
4012#endif 4049#endif
… …
4059 /* extra handling for values with state unkept */ 4096 /* extra handling for values with state unkept */
4060 switch (arg[i]) 4097 switch (arg[i])
4061 { 4098 {
4062#if ENABLE_STYLES 4099#if ENABLE_STYLES
4063 case 1021: 4100 case 1021:
4064 if (mode) 4101 set_option (Opt_intensityStyles, mode);
4065 SET_OPTION (Opt_intensityStyles);
4066 else
4067 CLR_OPTION (Opt_intensityStyles);
4068 4102
4069 want_refresh = 1; 4103 scr_touch (true);
4070 want_full_refresh = 1;
4071 break; 4104 break;
4072#endif 4105#endif
4073 case 1048: /* alternative cursor save */ 4106 case 1048: /* alternative cursor save */
4074 case 1049: 4107 case 1049:
4075 if (OPTION (Opt_secondaryScreen)) 4108 if (OPTION (Opt_secondaryScreen))
… …
4095 case 3: /* 80/132 */ 4128 case 3: /* 80/132 */
4096 if (priv_modes & PrivMode_132OK) 4129 if (priv_modes & PrivMode_132OK)
4097 set_widthheight (((state ? 132 : 80) * fwidth), height); 4130 set_widthheight (((state ? 132 : 80) * fwidth), height);
4098 break; 4131 break;
4099 case 4: /* smooth scrolling */ 4132 case 4: /* smooth scrolling */
4100 if (!state) 4133 set_option (Opt_jumpScroll, !state);
4101 SET_OPTION (Opt_jumpScroll);
4102 else
4103 CLR_OPTION (Opt_jumpScroll);
4104 break; 4134 break;
4105 case 5: /* reverse video */ 4135 case 5: /* reverse video */
4106 scr_rvideo_mode (state); 4136 scr_rvideo_mode (state);
4107 break; 4137 break;
4108 case 6: /* relative/absolute origins */ 4138 case 6: /* relative/absolute origins */
… …
4114 /* 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 */
4115 case 9: /* X10 mouse reporting */ 4145 case 9: /* X10 mouse reporting */
4116 if (state) /* orthogonal */ 4146 if (state) /* orthogonal */
4117 priv_modes &= ~PrivMode_MouseX11; 4147 priv_modes &= ~PrivMode_MouseX11;
4118 break; 4148 break;
4119#ifdef menuBar_esc
4120 case menuBar_esc:
4121#ifdef MENUBAR
4122 map_menuBar (state);
4123#endif
4124 break;
4125#endif
4126#ifdef scrollBar_esc 4149#ifdef scrollBar_esc
4127 case scrollBar_esc: 4150 case scrollBar_esc:
4128 if (scrollbar_mapping (state)) 4151 if (scrollbar_mapping (state))
4129 { 4152 {
4130 resize_all_windows (0, 0, 0); 4153 resize_all_windows (0, 0, 0);
… …
4149#if 0 4172#if 0
4150 case 1001: 4173 case 1001:
4151 break; /* X11 mouse highlighting */ 4174 break; /* X11 mouse highlighting */
4152#endif 4175#endif
4153 case 1010: /* scroll to bottom on TTY output inhibit */ 4176 case 1010: /* scroll to bottom on TTY output inhibit */
4154 if (!state) 4177 set_option (Opt_scrollTtyOutput, !state);
4155 SET_OPTION (Opt_scrollTtyOutput);
4156 else
4157 CLR_OPTION (Opt_scrollTtyOutput);
4158 break; 4178 break;
4159 case 1011: /* scroll to bottom on key press */ 4179 case 1011: /* scroll to bottom on key press */
4160 if (state) 4180 set_option (Opt_scrollTtyKeypress, state);
4161 SET_OPTION (Opt_scrollTtyKeypress);
4162 else
4163 CLR_OPTION (Opt_scrollTtyKeypress);
4164 break; 4181 break;
4165 case 1047: /* secondary screen w/ clearing last */ 4182 case 1047: /* secondary screen w/ clearing last */
4166 if (OPTION (Opt_secondaryScreen)) 4183 if (OPTION (Opt_secondaryScreen))
4167 if (current_screen != PRIMARY) 4184 if (current_screen != PRIMARY)
4168 scr_erase_screen (2); 4185 scr_erase_screen (2);
… …
4306 scr_color (Color_bg, Color_bg); 4323 scr_color (Color_bg, Color_bg);
4307 break; 4324 break;
4308 4325
4309 //case 50: // not variable spacing 4326 //case 50: // not variable spacing
4310 4327
4311#ifndef NO_BRIGHTCOLOR 4328#if !ENABLE_MINIMAL
4312 case 90: 4329 case 90:
4313 case 91: /* set bright fg color */ 4330 case 91: /* set bright fg color */
4314 case 92: 4331 case 92:
4315 case 93: 4332 case 93:
4316 case 94: 4333 case 94:
… …
4361 */ 4378 */
4362void 4379void
4363rxvt_term::tt_printf (const char *fmt,...) 4380rxvt_term::tt_printf (const char *fmt,...)
4364{ 4381{
4365 va_list arg_ptr; 4382 va_list arg_ptr;
4366 unsigned char buf[256]; 4383 char buf[256];
4367 4384
4368 va_start (arg_ptr, fmt); 4385 va_start (arg_ptr, fmt);
4369 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4386 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4370 va_end (arg_ptr); 4387 va_end (arg_ptr);
4371 tt_write (buf, strlen (buf)); 4388 tt_write (buf, strlen (buf));
… …
4376 * or generated by us in response to a query ESC sequence. 4393 * or generated by us in response to a query ESC sequence.
4377 */ 4394 */
4378const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4395const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4379 4396
4380void 4397void
4381rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4398rxvt_term::tt_write (const char *data, unsigned int len)
4382{ 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
4383 if (v_buflen == 0) 4406 if (v_buflen == 0)
4384 { 4407 {
4385 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));
4386 4409
4387 if ((unsigned int)written == len) 4410 if ((unsigned int)written == len)
4388 return; 4411 return;
4389 4412
4390 data += written; 4413 data += written;
4391 len -= written; 4414 len -= written;
4392 } 4415 }
4393 4416
4394 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4417 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4395 4418
4396 memcpy (v_buffer + v_buflen, data, len); 4419 memcpy (v_buffer + v_buflen, data, len);
4397 v_buflen += len; 4420 v_buflen += len;
4398 4421
4399 pty_ev.set (EVENT_READ | EVENT_WRITE); 4422 pty_ev.set (EVENT_READ | EVENT_WRITE);
4400} 4423}
4401 4424
4402void rxvt_term::pty_write () 4425void rxvt_term::pty_write ()
4403{ 4426{
4404 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));
4405 4428
4406 if (written > 0) 4429 if (written > 0)
4407 { 4430 {
4408 v_buflen -= written; 4431 v_buflen -= written;
4409 4432

Diff Legend

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