ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

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

Diff Legend

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