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

Diff Legend

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