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

Diff Legend

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