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.221 by root, Sat Dec 31 18:27:57 2005 UTC vs.
Revision 1.301 by root, Tue Jan 31 21:23:13 2006 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
43 * along with this program; if not, write to the Free Software 43 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 45 *----------------------------------------------------------------------*/
46 46
47/*{{{ includes: */ 47/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 48#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h"
50#include "rxvtperl.h"
50#include "version.h" 51#include "version.h"
51#include "command.h" 52#include "command.h"
52 53
53#ifdef KEYSYM_RESOURCE 54#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 55# include "keyboard.h"
… …
57#include <csignal> 58#include <csignal>
58 59
59/*----------------------------------------------------------------------*/ 60/*----------------------------------------------------------------------*/
60 61
61#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 62#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 63
66#if ENABLE_FRILLS || ISO_14755 64#if ENABLE_FRILLS || ISO_14755
67 65
68#define ISO_14755_STARTED 0x80000000UL 66#define ISO_14755_STARTED 0x80000000UL
69#define ISO_14755_51 0x40000000UL // basic (section 5.1) 67#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
141 || !IN_RANGE_EXC (y, 0, nrow)) 139 || !IN_RANGE_EXC (y, 0, nrow))
142 return; 140 return;
143 141
144 for (;;) 142 for (;;)
145 { 143 {
146 const line_t &l = ROW(y - view_start); 144 const line_t &l = ROW(y + view_start);
147 145
148 text_t t = l.t[x]; 146 text_t t = l.t[x];
149 147
150 if (t != NOCHAR || !x) 148 if (t != NOCHAR || !x)
151 { 149 {
… …
224# if !UNICODE3 222# if !UNICODE3
225 if (ch >= 0x10000) 223 if (ch >= 0x10000)
226 ch = 0xfffd; 224 ch = 0xfffd;
227# endif 225# endif
228 scr_overlay_set (11, y, ch, r); 226 scr_overlay_set (11, y, ch, r);
227
228 if (WCWIDTH (ch) >= 2)
229 scr_overlay_set (12, y, NOCHAR, r); 229 scr_overlay_set (12, y, NOCHAR, r);
230 } 230 }
231 231
232// {
233// char buf[4+4+3+1];
234// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
235// scr_overlay_set (0, 0, buf);
236// }
232 scr_overlay_set (0, len , attr); 237 scr_overlay_set (0, len , attr);
233 scr_overlay_set (0, len + 1, fname); 238 scr_overlay_set (0, len + 1, fname);
234 239
235 free (fname); 240 free (fname);
236 241
… …
262 mb[0] = ch[0]; 267 mb[0] = ch[0];
263 len = 1; 268 len = 1;
264 } 269 }
265 270
266 if (len > 0) 271 if (len > 0)
267 tt_write ((unsigned char *)mb, len); 272 tt_write (mb, len);
268 else 273 else
269 scr_bell (); 274 scr_bell ();
270 } 275 }
271 276
272 iso14755buf = 0; 277 iso14755buf = 0;
… …
296rxvt_term::lookup_key (XKeyEvent &ev) 301rxvt_term::lookup_key (XKeyEvent &ev)
297{ 302{
298 int ctrl, meta, shft, len; 303 int ctrl, meta, shft, len;
299 unsigned int newlen; 304 unsigned int newlen;
300 KeySym keysym; 305 KeySym keysym;
301#ifdef DEBUG_CMD
302 static int debug_key = 1; /* accessible by a debugger only */
303#endif
304 int valid_keysym; 306 int valid_keysym;
305 unsigned char kbuf[KBUFSZ]; 307 char kbuf[KBUFSZ];
306 308
307 /* 309 /*
308 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 310 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
309 * escape sequence to toggle the Keypad. 311 * escape sequence to toggle the Keypad.
310 * 312 *
… …
328 Status status_return; 330 Status status_return;
329 331
330#if 0 332#if 0
331#ifdef X_HAVE_UTF8_STRING 333#ifdef X_HAVE_UTF8_STRING
332 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 334 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
333 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 335 len = Xutf8LookupString (Input_Context, &ev, kbuf,
334 KBUFSZ, &keysym, &status_return); 336 KBUFSZ, &keysym, &status_return);
335 else 337 else
336#endif 338#endif
337#endif 339#endif
338 { 340 {
… …
375 || status_return == XLookupBoth; 377 || status_return == XLookupBoth;
376 } 378 }
377 else 379 else
378#endif 380#endif
379 { 381 {
380 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 382 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
381 valid_keysym = keysym != NoSymbol; 383 valid_keysym = keysym != NoSymbol;
382 } 384 }
383 385
384 if (valid_keysym) 386 if (valid_keysym)
385 { 387 {
… …
437 scr_move_to (0, 1); 439 scr_move_to (0, 1);
438 return; 440 return;
439 } 441 }
440 else if (keysym == XK_End) 442 else if (keysym == XK_End)
441 { 443 {
442 scr_move_to (1, 0); 444 scr_move_to (1, 1);
443 return; 445 return;
444 } 446 }
445 } 447 }
446#endif 448#endif
447 } 449 }
… …
458 { 460 {
459 switch (keysym) 461 switch (keysym)
460 { 462 {
461 /* normal XTerm key bindings */ 463 /* normal XTerm key bindings */
462 case XK_Insert: /* Shift+Insert = paste mouse selection */ 464 case XK_Insert: /* Shift+Insert = paste mouse selection */
463 selection_request (ev.time, 0, 0); 465 selection_request (ev.time);
464 return; 466 return;
465#if TODO 467#if TODO
466 /* rxvt extras */ 468 /* rxvt extras */
467 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 469 case XK_KP_Add: /* Shift+KP_Add = bigger font */
468 change_font (FONT_UP); 470 change_font (FONT_UP);
… …
849 { 851 {
850#ifdef META8_OPTION 852#ifdef META8_OPTION
851 /* set 8-bit on */ 853 /* set 8-bit on */
852 if (meta && (meta_char == 0x80)) 854 if (meta && (meta_char == 0x80))
853 { 855 {
854 unsigned char *ch; 856 char *ch;
855 857
856 for (ch = kbuf; ch < kbuf + len; ch++) 858 for (ch = kbuf; ch < kbuf + len; ch++)
857 *ch |= 0x80; 859 *ch |= 0x80;
858 860
859 meta = 0; 861 meta = 0;
860 } 862 }
861#endif 863#endif
862 /* nil */ ; 864 /* nil */ ;
863 } 865 }
864 } 866 }
867
868 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
869 return;
865 870
866 if (len <= 0) 871 if (len <= 0)
867 return; /* not mapped */ 872 return; /* not mapped */
868 873
869 if (OPTION (Opt_scrollTtyKeypress)) 874 if (OPTION (Opt_scrollTtyKeypress))
… …
892#ifdef META8_OPTION 897#ifdef META8_OPTION
893 && meta_char == C0_ESC 898 && meta_char == C0_ESC
894#endif 899#endif
895 ) 900 )
896 { 901 {
897 const unsigned char ch = C0_ESC; 902 const char ch = C0_ESC;
898 tt_write (&ch, 1); 903 tt_write (&ch, 1);
899 } 904 }
900 905
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); 906 tt_write (kbuf, (unsigned int)len);
912} 907}
913/*}}} */ 908/*}}} */
914 909
915#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 910#if defined (KEYSYM_RESOURCE)
916/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
917/* attempt to `write' count to the input buffer */
918unsigned int 911unsigned int
919rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 912rxvt_term::cmd_write (const char *str, unsigned int count)
920{ 913{
921 unsigned int n, s; 914 unsigned int n, s;
922 915
923 n = cmdbuf_ptr - cmdbuf_base; 916 n = cmdbuf_ptr - cmdbuf_base;
924 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 917 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
961 } 954 }
962#endif 955#endif
963 956
964 if (want_refresh) 957 if (want_refresh)
965 { 958 {
959 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
960 {
961 int row = view_start;
962 int end_row = row + nrow;
963
964 while (row > top_row && ROW (row - 1).is_longer ())
965 --row;
966
967 do
968 {
969 int start_row = row;
970 line_t *l;
971
972 do
973 {
974 l = &ROW (row++);
975
976 if (!(l->f & LINE_FILTERED))
977 {
978 // line not filtered, mark it as filtered
979 l->f |= LINE_FILTERED;
980 while (l->is_longer ())
981 {
982 l = &ROW (row++);
983 l->f |= LINE_FILTERED;
984 }
985
986 // and filter it
987 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
988
989 break;
990 }
991 }
992 while (l->is_longer () && row < end_row);
993 }
994 while (row < end_row);
995 }
996
966 scr_refresh (refresh_type); 997 scr_refresh ();
967 scrollbar_show (1); 998 scrollbar_show (1);
968#ifdef USE_XIM 999#ifdef USE_XIM
969 IMSendSpot (); 1000 IMSendSpot ();
970#endif 1001#endif
971 } 1002 }
… …
974} 1005}
975 1006
976void 1007void
977rxvt_term::check_cb (check_watcher &w) 1008rxvt_term::check_cb (check_watcher &w)
978{ 1009{
979 SET_R (this); 1010 make_current ();
980 SET_LOCALE (locale);
981 1011
982 display->flush (); 1012 display->flush ();
983 1013
984 if (want_refresh && !flush_ev.active) 1014 if (want_refresh && !flush_ev.active)
985 flush_ev.start (NOW + 0.01); 1015 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
986} 1016}
987 1017
988void 1018void
989rxvt_term::flush_cb (time_watcher &w) 1019rxvt_term::flush_cb (time_watcher &w)
990{ 1020{
991 SET_R (this); 1021 make_current ();
992 SET_LOCALE (locale);
993 1022
994 refresh_limit = 1; 1023 refresh_limit = 1;
995 refresh_count = 0; 1024 refresh_count = 0;
996 flush (); 1025 flush ();
997} 1026}
… …
1001rxvt_term::cursor_blink_cb (time_watcher &w) 1030rxvt_term::cursor_blink_cb (time_watcher &w)
1002{ 1031{
1003 hidden_cursor = !hidden_cursor; 1032 hidden_cursor = !hidden_cursor;
1004 want_refresh = 1; 1033 want_refresh = 1;
1005 1034
1006 w.start (w.at + BLINK_INTERVAL); 1035 w.start (w.at + CURSOR_BLINK_INTERVAL);
1007} 1036}
1008#endif 1037#endif
1009 1038
1010#ifdef TEXT_BLINK 1039#ifdef TEXT_BLINK
1011void 1040void
… …
1025rxvt_term::cont_scroll_cb (time_watcher &w) 1054rxvt_term::cont_scroll_cb (time_watcher &w)
1026{ 1055{
1027 if ((scrollbar_isUp() || scrollbar_isDn()) && 1056 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1028 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1057 scr_page (scrollbar_isUp() ? UP : DN, 1))
1029 { 1058 {
1030 refresh_type |= SMOOTH_REFRESH;
1031 want_refresh = 1; 1059 want_refresh = 1;
1032 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1060 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1033 } 1061 }
1034} 1062}
1035#endif 1063#endif
… …
1039rxvt_term::sel_scroll_cb (time_watcher &w) 1067rxvt_term::sel_scroll_cb (time_watcher &w)
1040{ 1068{
1041 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1069 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1042 { 1070 {
1043 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1071 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1044 refresh_type |= SMOOTH_REFRESH;
1045 want_refresh = 1; 1072 want_refresh = 1;
1046 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1073 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1047 } 1074 }
1048} 1075}
1049#endif 1076#endif
… …
1054{ 1081{
1055 if (mouse_slip_wheel_speed == 0 1082 if (mouse_slip_wheel_speed == 0
1056 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1083 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1057 : scr_page (UP, mouse_slip_wheel_speed)) 1084 : scr_page (UP, mouse_slip_wheel_speed))
1058 { 1085 {
1059 if (view_start == nsaved || 1086 if (view_start == top_row || view_start == 0)
1060 view_start == 0)
1061 mouse_slip_wheel_speed = 0; 1087 mouse_slip_wheel_speed = 0;
1062 1088
1063 refresh_type |= SMOOTH_REFRESH;
1064 want_refresh = 1; 1089 want_refresh = 1;
1065 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1090 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1066 } 1091 }
1067} 1092}
1068#endif 1093#endif
… …
1072{ 1097{
1073 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1098 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1074 1099
1075 if (CBUFSIZ == n) 1100 if (CBUFSIZ == n)
1076 { 1101 {
1077 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1102 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1078 n = 0; 1103 n = 0;
1079 } 1104 }
1080 1105
1081 memmove (cmdbuf_base, cmdbuf_ptr, n); 1106 memmove (cmdbuf_base, cmdbuf_ptr, n);
1082 cmdbuf_ptr = cmdbuf_base; 1107 cmdbuf_ptr = cmdbuf_base;
1083 cmdbuf_endp = cmdbuf_ptr + n; 1108 cmdbuf_endp = cmdbuf_ptr + n;
1084 1109
1085 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1110 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1086 1111
1087 if (n > 0) 1112 if (r > 0)
1088 { 1113 {
1089 cmdbuf_endp += n; 1114 cmdbuf_endp += r;
1090 return true; 1115 return true;
1091 } 1116 }
1092 else if ((n < 0 && errno != EAGAIN && errno != EINTR) || n == 0) 1117 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1118 {
1119#if HAVE_SCHED_YIELD
1120 if (display->is_local)
1121 event_handler.cw_yield.start ();
1122#endif
1123 }
1124 else
1093 { 1125 {
1094 pty_ev.stop (); 1126 pty_ev.stop ();
1095 1127
1096 if (!OPTION (Opt_hold)) 1128 if (!OPTION (Opt_hold))
1097 destroy (); 1129 destroy ();
… …
1101} 1133}
1102 1134
1103void 1135void
1104rxvt_term::pty_cb (io_watcher &w, short revents) 1136rxvt_term::pty_cb (io_watcher &w, short revents)
1105{ 1137{
1106 SET_R (this); 1138 make_current ();
1107 SET_LOCALE (locale);
1108 1139
1109 if (revents & EVENT_READ) 1140 if (revents & EVENT_READ)
1110 // loop, but don't allow a single term to monopolize us 1141 // loop, but don't allow a single term to monopolize us
1111 while (pty_fill ()) 1142 while (pty_fill ())
1112 if (cmd_parse ()) 1143 if (cmd_parse ())
… …
1117} 1148}
1118 1149
1119void 1150void
1120rxvt_term::pointer_unblank () 1151rxvt_term::pointer_unblank ()
1121{ 1152{
1122 XDefineCursor (display->display, vt, TermWin_cursor); 1153 XDefineCursor (xdisp, vt, TermWin_cursor);
1123 recolour_cursor (); 1154 recolour_cursor ();
1124 1155
1125#ifdef POINTER_BLANK 1156#ifdef POINTER_BLANK
1126 hidden_pointer = 0; 1157 hidden_pointer = 0;
1127 1158
… …
1132 1163
1133#ifdef POINTER_BLANK 1164#ifdef POINTER_BLANK
1134void 1165void
1135rxvt_term::pointer_blank () 1166rxvt_term::pointer_blank ()
1136{ 1167{
1137 if (! OPTION (Opt_pointerBlank)) 1168 if (!OPTION (Opt_pointerBlank))
1138 return; 1169 return;
1139 1170
1140 XDefineCursor (display->display, vt, display->blank_cursor); 1171 XDefineCursor (xdisp, vt, display->blank_cursor);
1141 XFlush (display->display); 1172 XFlush (xdisp);
1142 1173
1143 hidden_pointer = 1; 1174 hidden_pointer = 1;
1144} 1175}
1145 1176
1146void 1177void
1147rxvt_term::pointer_cb (time_watcher &w) 1178rxvt_term::pointer_cb (time_watcher &w)
1148{ 1179{
1149 SET_R (this); 1180 make_current ();
1150 SET_LOCALE (locale);
1151 1181
1152 pointer_blank (); 1182 pointer_blank ();
1153} 1183}
1154#endif 1184#endif
1155 1185
… …
1220 (32 + button_number + key_state), 1250 (32 + button_number + key_state),
1221 (32 + x + 1), 1251 (32 + x + 1),
1222 (32 + y + 1)); 1252 (32 + y + 1));
1223} 1253}
1224 1254
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 */ 1255/*{{{ process an X event */
1236void 1256void
1237rxvt_term::x_cb (XEvent &ev) 1257rxvt_term::x_cb (XEvent &ev)
1238{ 1258{
1239 dDisp; 1259 make_current ();
1240 1260
1241 SET_R (this); 1261 dLocal (Display *, xdisp);
1242 SET_LOCALE (locale);
1243 1262
1244#if defined(CURSOR_BLINK) 1263 if (ev.xany.window == vt
1245 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1264 && SHOULD_INVOKE (HOOK_X_EVENT)
1246 { 1265 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1247 if (hidden_cursor) 1266 return;
1248 {
1249 hidden_cursor = 0;
1250 want_refresh = 1;
1251 }
1252 1267
1253 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1268 // 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; 1269 Window unused_root, unused_child;
1272 int unused_root_x, unused_root_y; 1270 int unused_root_x, unused_root_y;
1273 unsigned int unused_mask; 1271 unsigned int unused_mask;
1274 1272
1275 switch (ev.type) 1273 switch (ev.type)
… …
1282 1280
1283 break; 1281 break;
1284 1282
1285 case KeyRelease: 1283 case KeyRelease:
1286 { 1284 {
1287#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1285#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1288 KeySym ks; 1286 KeySym keysym;
1289 1287
1290 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1288 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1291#endif 1289#endif
1292 1290
1293#if ENABLE_FRILLS || ISO_14755 1291#if ENABLE_FRILLS || ISO_14755
1294 // ISO 14755 support 1292 // ISO 14755 support
1295 if (iso14755buf) 1293 if (iso14755buf)
… …
1300# endif 1298# endif
1301# if ISO_14755 1299# if ISO_14755
1302 // iso14755 part 5.2 handling: release time 1300 // iso14755 part 5.2 handling: release time
1303 // first: controls 1301 // first: controls
1304 if ((ev.xkey.state & ControlMask) 1302 if ((ev.xkey.state & ControlMask)
1305 && ((ks >= 0x40 && ks <= 0x5f) 1303 && ((keysym >= 0x40 && keysym <= 0x5f)
1306 || (ks >= 0x61 && ks <= 0x7f))) 1304 || (keysym >= 0x61 && keysym <= 0x7f)))
1307 { 1305 {
1308 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1306 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1309 commit_iso14755 (); 1307 commit_iso14755 ();
1310 return; // case-break; 1308 goto skip_switch;
1311 } 1309 }
1312 1310
1313 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1311 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1314 if (i[0] == ks) 1312 if (i[0] == keysym)
1315 { 1313 {
1316 iso14755buf = ISO_14755_51 | i[1]; 1314 iso14755buf = ISO_14755_51 | i[1];
1317 commit_iso14755 (); 1315 commit_iso14755 ();
1318 return; // case-break; 1316 goto skip_switch;
1319 } 1317 }
1320 1318
1321 scr_bell (); 1319 scr_bell ();
1322# endif 1320# endif
1323 iso14755buf = 0; 1321 iso14755buf = 0;
… …
1342 else 1340 else
1343 iso14755buf = 0; 1341 iso14755buf = 0;
1344 } 1342 }
1345#endif 1343#endif
1346 1344
1345 if (ev.xany.window == vt
1346 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1347 break;
1348
1347#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1349#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1348 if (!(ev.xkey.state & ControlMask)) 1350 if (!(ev.xkey.state & ControlMask))
1349 slip_wheel_ev.stop (); 1351 slip_wheel_ev.stop ();
1350 else if (ks == XK_Control_L || ks == XK_Control_R) 1352 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1351 mouse_slip_wheel_speed = 0; 1353 mouse_slip_wheel_speed = 0;
1352#endif 1354#endif
1353 break; 1355 break;
1354 } 1356 }
1355 1357
… …
1361 button_release (ev.xbutton); 1363 button_release (ev.xbutton);
1362 break; 1364 break;
1363 1365
1364 case ClientMessage: 1366 case ClientMessage:
1365 if (ev.xclient.format == 32 1367 if (ev.xclient.format == 32
1366 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1368 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1367 { 1369 {
1370 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1371 {
1372 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1373 {
1368 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1374 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1375 {
1376 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1369 destroy (); 1377 destroy ();
1378 }
1370#if ENABLE_EWMH 1379#if ENABLE_EWMH
1371 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1380 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1372 XSendEvent (disp, ev.xclient.window = display->root, 1381 XSendEvent (xdisp, ev.xclient.window = display->root,
1373 False, SubstructureRedirectMask | SubstructureNotifyMask, 1382 False, SubstructureRedirectMask | SubstructureNotifyMask,
1374 &ev); 1383 &ev);
1384#endif
1385 }
1386 }
1387#if ENABLE_XEMBED
1388 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1389 {
1390 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1391 focus_in ();
1392 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1393 focus_out ();
1394 }
1375#endif 1395#endif
1376 } 1396 }
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; 1397 break;
1413 1398
1414 case MappingNotify: 1399 case MappingNotify:
1415 XRefreshKeyboardMapping (&ev.xmapping); 1400 XRefreshKeyboardMapping (&ev.xmapping);
1416 break; 1401 break;
… …
1449 break; 1434 break;
1450 1435
1451 case ConfigureNotify: 1436 case ConfigureNotify:
1452 if (ev.xconfigure.window == parent[0]) 1437 if (ev.xconfigure.window == parent[0])
1453 { 1438 {
1454 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1439 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1455 ; 1440 ;
1456 1441
1457 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1442 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1458 { 1443 {
1459 seen_resize = 1; 1444 seen_resize = 1;
1460 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1445 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1461 } 1446 }
1462 1447
1448 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1449
1463#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1450#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1464 if (OPTION (Opt_transparent)) 1451 if (OPTION (Opt_transparent))
1465 check_our_parents (); 1452 check_our_parents ();
1466#endif 1453#endif
1467 } 1454 }
1468 break; 1455 break;
1469 1456
1470 case PropertyNotify: 1457 case PropertyNotify:
1458 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1471 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1459 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1472 && ev.xproperty.state == PropertyNewValue) 1460 && ev.xproperty.state == PropertyNewValue)
1473 selection_property (ev.xproperty.window, ev.xproperty.atom); 1461 selection_property (ev.xproperty.window, ev.xproperty.atom);
1474 1462
1475 break; 1463 break;
1476 1464
1477 case SelectionClear: 1465 case SelectionClear:
1478 selection_clear (); 1466 selection_clear ();
… …
1483 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1471 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1484 break; 1472 break;
1485 1473
1486 case SelectionRequest: 1474 case SelectionRequest:
1487 selection_send (ev.xselectionrequest); 1475 selection_send (ev.xselectionrequest);
1476 break;
1477
1478 case MapNotify:
1479 mapped = 1;
1480#ifdef TEXT_BLINK
1481 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1482#endif
1483 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1488 break; 1484 break;
1489 1485
1490 case UnmapNotify: 1486 case UnmapNotify:
1491 mapped = 0; 1487 mapped = 0;
1492#ifdef TEXT_BLINK 1488#ifdef TEXT_BLINK
1493 text_blink_ev.stop (); 1489 text_blink_ev.stop ();
1494#endif 1490#endif
1495 break; 1491 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; 1492 break;
1503 1493
1504#ifdef TRANSPARENT 1494#ifdef TRANSPARENT
1505 case ReparentNotify: 1495 case ReparentNotify:
1506 rootwin_cb (ev); 1496 rootwin_cb (ev);
… …
1512 if (ev.xany.window == vt) 1502 if (ev.xany.window == vt)
1513 { 1503 {
1514 do 1504 do
1515 scr_expose (ev.xexpose.x, ev.xexpose.y, 1505 scr_expose (ev.xexpose.x, ev.xexpose.y,
1516 ev.xexpose.width, ev.xexpose.height, False); 1506 ev.xexpose.width, ev.xexpose.height, False);
1517 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1507 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1518 1508
1519 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1509 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1520 1510
1521 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1511 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1522 scr_expose (ev.xexpose.x, ev.xexpose.y, 1512 scr_expose (ev.xexpose.x, ev.xexpose.y,
1523 ev.xexpose.width, ev.xexpose.height, False); 1513 ev.xexpose.width, ev.xexpose.height, False);
1524 1514
1525 scr_refresh (refresh_type); 1515 want_refresh = 1;
1526 } 1516 }
1527 else 1517 else
1528 { 1518 {
1529 XEvent unused_event; 1519 XEvent unused_event;
1530 1520
1531 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1521 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1532 ; 1522 ;
1533 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1523 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1534 ; 1524 ;
1535 1525
1536 if (isScrollbarWindow (ev.xany.window)) 1526 if (isScrollbarWindow (ev.xany.window))
1537 { 1527 {
1538 scrollBar.setIdle (); 1528 scrollBar.setIdle ();
1539 scrollbar_show (0); 1529 scrollbar_show (0);
1540 } 1530 }
1541#ifdef MENUBAR
1542 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1543 menubar_expose ();
1544#endif
1545 1531
1546#ifdef TRANSPARENT 1532#ifdef TRANSPARENT
1547 if (am_transparent && ev.xany.window == parent[0]) 1533 if (am_transparent && ev.xany.window == parent[0])
1548 XClearWindow (disp, ev.xany.window); 1534 XClearWindow (xdisp, ev.xany.window);
1549#endif 1535#endif
1550 } 1536 }
1551 break; 1537 break;
1552 1538
1553 case MotionNotify: 1539 case MotionNotify:
1554#ifdef POINTER_BLANK 1540#ifdef POINTER_BLANK
1555 if (hidden_pointer) 1541 if (hidden_pointer)
1556 pointer_unblank (); 1542 pointer_unblank ();
1557#endif 1543#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) 1544 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1566 break; 1545 break;
1567 1546
1568 if (ev.xany.window == vt) 1547 if (ev.xany.window == vt)
1569 { 1548 {
1549 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1550 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1551 ; // nop
1570 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1552 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1571 { 1553 {
1572 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1554 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1573 ; 1555 ;
1574 1556
1575 XQueryPointer (disp, vt, 1557 XQueryPointer (xdisp, vt,
1576 &unused_root, &unused_child, 1558 &unused_root, &unused_child,
1577 &unused_root_x, &unused_root_y, 1559 &unused_root_x, &unused_root_y,
1578 &ev.xbutton.x, &ev.xbutton.y, 1560 &ev.xbutton.x, &ev.xbutton.y,
1579 &ev.xbutton.state); 1561 &ev.xbutton.state);
1580#ifdef MOUSE_THRESHOLD 1562#ifdef MOUSE_THRESHOLD
… …
1644#endif 1626#endif
1645 } 1627 }
1646 } 1628 }
1647 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1629 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1648 { 1630 {
1649 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1631 while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1650 MotionNotify, &ev)) 1632 MotionNotify, &ev))
1651 ; 1633 ;
1652 1634
1653 XQueryPointer (disp, scrollBar.win, 1635 XQueryPointer (xdisp, scrollBar.win,
1654 &unused_root, &unused_child, 1636 &unused_root, &unused_child,
1655 &unused_root_x, &unused_root_y, 1637 &unused_root_x, &unused_root_y,
1656 &ev.xbutton.x, &ev.xbutton.y, 1638 &ev.xbutton.x, &ev.xbutton.y,
1657 &unused_mask); 1639 &unused_mask);
1658 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1640 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1659 scrollbar_size ()); 1641 scrollbar_size ());
1660 scr_refresh (refresh_type); 1642 want_refresh = 1;
1661 refresh_limit = 0; 1643 refresh_limit = 0;
1662 scrollbar_show (1); 1644 scrollbar_show (1);
1663 } 1645 }
1664 break; 1646 break;
1665 } 1647 }
1648
1649skip_switch: ;
1650
1651#if defined(CURSOR_BLINK)
1652 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1653 {
1654 if (hidden_cursor)
1655 {
1656 hidden_cursor = 0;
1657 want_refresh = 1;
1658 }
1659
1660 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1661 }
1662#endif
1663
1664#if defined(POINTER_BLANK)
1665 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1666 {
1667 if (ev.type == MotionNotify
1668 || ev.type == ButtonPress
1669 || ev.type == ButtonRelease)
1670 if (hidden_pointer)
1671 pointer_unblank ();
1672
1673 if (ev.type == KeyPress && hidden_pointer == 0)
1674 pointer_blank ();
1675 }
1676#endif
1666} 1677}
1667 1678
1668void 1679void
1669rxvt_term::focus_in () 1680rxvt_term::focus_in ()
1670{ 1681{
1671 if (!focus) 1682 if (!focus)
1672 { 1683 {
1673 focus = 1; 1684 focus = 1;
1674 want_refresh = 1; 1685 want_refresh = 1;
1686
1687 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1688
1675#if USE_XIM 1689#if USE_XIM
1676 if (Input_Context != NULL) 1690 if (Input_Context != NULL)
1677 { 1691 {
1678 IMSetStatusPosition (); 1692 IMSetStatusPosition ();
1679 XSetICFocus (Input_Context); 1693 XSetICFocus (Input_Context);
1680 } 1694 }
1681#endif 1695#endif
1682#if CURSOR_BLINK 1696#if CURSOR_BLINK
1683 if (OPTION (Opt_cursorBlink)) 1697 if (OPTION (Opt_cursorBlink))
1684 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1698 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1685#endif 1699#endif
1686#if OFF_FOCUS_FADING 1700#if OFF_FOCUS_FADING
1687 if (rs[Rs_fade]) 1701 if (rs[Rs_fade])
1688 { 1702 {
1689 pix_colors = pix_colors_focused; 1703 pix_colors = pix_colors_focused;
… …
1699 if (focus) 1713 if (focus)
1700 { 1714 {
1701 focus = 0; 1715 focus = 0;
1702 want_refresh = 1; 1716 want_refresh = 1;
1703 1717
1718 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1719
1704#if ENABLE_FRILLS || ISO_14755 1720#if ENABLE_FRILLS || ISO_14755
1721 if (iso14755buf)
1722 {
1705 iso14755buf = 0; 1723 iso14755buf = 0;
1706#endif
1707#if ENABLE_OVERLAY 1724# if ENABLE_OVERLAY
1708 scr_overlay_off (); 1725 scr_overlay_off ();
1726# endif
1727 }
1709#endif 1728#endif
1710#if USE_XIM 1729#if USE_XIM
1711 if (Input_Context != NULL) 1730 if (Input_Context != NULL)
1712 XUnsetICFocus (Input_Context); 1731 XUnsetICFocus (Input_Context);
1713#endif 1732#endif
… …
1728 1747
1729#if TRANSPARENT 1748#if TRANSPARENT
1730void 1749void
1731rxvt_term::rootwin_cb (XEvent &ev) 1750rxvt_term::rootwin_cb (XEvent &ev)
1732{ 1751{
1733 SET_R (this); 1752 make_current ();
1734 SET_LOCALE (locale);
1735 1753
1736 switch (ev.type) 1754 switch (ev.type)
1737 { 1755 {
1738 case PropertyNotify: 1756 case PropertyNotify:
1739 /* 1757 /*
… …
1757rxvt_term::button_press (XButtonEvent &ev) 1775rxvt_term::button_press (XButtonEvent &ev)
1758{ 1776{
1759 int reportmode = 0, clickintime; 1777 int reportmode = 0, clickintime;
1760 1778
1761 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1779 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1780
1762 if (!bypass_keystate) 1781 if (!bypass_keystate)
1763 reportmode = !! (priv_modes & PrivMode_mouse_report); 1782 reportmode = !! (priv_modes & PrivMode_mouse_report);
1764 1783
1765 /* 1784 /*
1766 * VT window processing of button press 1785 * VT window processing of button press
1767 */ 1786 */
1768 if (ev.window == vt) 1787 if (ev.window == vt)
1769 { 1788 {
1789 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1790 return;
1791
1770#if ISO_14755 1792#if ISO_14755
1771 // 5.4 1793 // 5.4
1772 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1794 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1773 { 1795 {
1774 iso14755_54 (ev.x, ev.y); 1796 iso14755_54 (ev.x, ev.y);
… …
1786#ifdef MOUSE_REPORT_DOUBLECLICK 1808#ifdef MOUSE_REPORT_DOUBLECLICK
1787 if (ev.button == MEvent.button && clickintime) 1809 if (ev.button == MEvent.button && clickintime)
1788 { 1810 {
1789 /* same button, within alloted time */ 1811 /* same button, within alloted time */
1790 MEvent.clicks++; 1812 MEvent.clicks++;
1813
1791 if (MEvent.clicks > 1) 1814 if (MEvent.clicks > 1)
1792 { 1815 {
1793 /* only report double clicks */ 1816 /* only report double clicks */
1794 MEvent.clicks = 2; 1817 MEvent.clicks = 2;
1795 mouse_report (ev); 1818 mouse_report (ev);
… …
1827#else 1850#else
1828 selection.rect = false; 1851 selection.rect = false;
1829#endif 1852#endif
1830 1853
1831 /* allow shift+left click to extend selection */ 1854 /* allow shift+left click to extend selection */
1832 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1855 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1833 { 1856 {
1834 if (MEvent.button == Button1 && clickintime) 1857 if (MEvent.button == Button1 && clickintime)
1835 selection_rotate (ev.x, ev.y); 1858 selection_rotate (ev.x, ev.y);
1836 else 1859 else
1837 selection_extend (ev.x, ev.y, 1); 1860 selection_extend (ev.x, ev.y, 1);
… …
2002 } 2025 }
2003 2026
2004 break; 2027 break;
2005 } 2028 }
2006 } 2029 }
2030
2007 return; 2031 return;
2008 } 2032 }
2009#if MENUBAR
2010 /*
2011 * Menubar window processing of button press
2012 */
2013 if (isMenuBarWindow (ev.window))
2014 menubar_control (ev);
2015#endif
2016} 2033}
2017 2034
2018void 2035void
2019rxvt_term::button_release (XButtonEvent &ev) 2036rxvt_term::button_release (XButtonEvent &ev)
2020{ 2037{
… …
2026 2043
2027 if (scrollbar_isUpDn ()) 2044 if (scrollbar_isUpDn ())
2028 { 2045 {
2029 scrollBar.setIdle (); 2046 scrollBar.setIdle ();
2030 scrollbar_show (0); 2047 scrollbar_show (0);
2031#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2032 refresh_type &= ~SMOOTH_REFRESH;
2033#endif
2034 } 2048 }
2035 2049
2036#ifdef SELECTION_SCROLLING 2050#ifdef SELECTION_SCROLLING
2037 if (sel_scroll_ev.active) 2051 if (sel_scroll_ev.active)
2038 sel_scroll_ev.stop(); 2052 sel_scroll_ev.stop();
2039#endif 2053#endif
2040 2054
2041 if (ev.window == vt) 2055 if (ev.window == vt)
2042 { 2056 {
2057 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2058 return;
2059
2043#if ISO_14755 2060#if ISO_14755
2044 // 5.4 2061 // 5.4
2045 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2062 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2046 return; 2063 return;
2047#endif 2064#endif
2065
2048 if (reportmode) 2066 if (reportmode)
2049 { 2067 {
2050 /* mouse report from vt window */ 2068 /* mouse report from vt window */
2051 /* don't report release of wheel "buttons" */ 2069 /* don't report release of wheel "buttons" */
2052 if (ev.button >= 4) 2070 if (ev.button >= 4)
… …
2082 { 2100 {
2083 case Button1: 2101 case Button1:
2084 case Button3: 2102 case Button3:
2085 selection_make (ev.time); 2103 selection_make (ev.time);
2086 break; 2104 break;
2105
2087 case Button2: 2106 case Button2:
2088 selection_request (ev.time, ev.x, ev.y); 2107 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2108 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2089 break; 2109 break;
2110
2090#ifdef MOUSE_WHEEL 2111#ifdef MOUSE_WHEEL
2091 case Button4: 2112 case Button4:
2092 case Button5: 2113 case Button5:
2093 { 2114 {
2094 int i; 2115 int i;
… …
2116 slip_wheel_ev.start (); 2137 slip_wheel_ev.start ();
2117 } 2138 }
2118 else 2139 else
2119 { 2140 {
2120# endif 2141# endif
2121# ifdef JUMP_MOUSE_WHEEL
2122 scr_page (v, i); 2142 scr_page (v, i);
2123 scr_refresh (SMOOTH_REFRESH);
2124 scrollbar_show (1); 2143 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 2144# ifdef MOUSE_SLIP_WHEELING
2134 } 2145 }
2135#endif 2146# endif
2136 } 2147 }
2137 break; 2148 break;
2138#endif 2149#endif
2139 } 2150 }
2140 } 2151 }
2141#ifdef MENUBAR
2142 else if (isMenuBarWindow (ev.window))
2143 menubar_control (ev);
2144#endif
2145} 2152}
2146 2153
2147#ifdef TRANSPARENT 2154#ifdef TRANSPARENT
2148#if TINTING 2155#if TINTING
2149/* taken from aterm-0.4.2 */ 2156/* taken from aterm-0.4.2 */
2150 2157
2151typedef uint32_t RUINT32T; 2158typedef uint32_t RUINT32T;
2152 2159
2153void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2160void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2154{ 2161{
2155 int sh_r, sh_g, sh_b; 2162 int sh_r, sh_g, sh_b;
2156 RUINT32T mask_r, mask_g, mask_b; 2163 RUINT32T mask_r, mask_g, mask_b;
2157 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2164 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2158 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2165 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2159 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2166 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2160 int i; 2167 int i;
2161 2168
2162 Visual *visual = display->visual; 2169 Visual *visual = term->visual;
2163 2170
2164 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2171 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2165 2172
2166 /* for convenience */ 2173 /* for convenience */
2167 mask_r = visual->red_mask; 2174 mask_r = visual->red_mask;
… …
2388 Atom atype; 2395 Atom atype;
2389 unsigned char *prop = NULL; 2396 unsigned char *prop = NULL;
2390 Window root, oldp, *list; 2397 Window root, oldp, *list;
2391 Pixmap rootpixmap = None; 2398 Pixmap rootpixmap = None;
2392 XWindowAttributes wattr, wrootattr; 2399 XWindowAttributes wattr, wrootattr;
2393 dDisp;
2394 2400
2395 pchanged = 0; 2401 pchanged = 0;
2396 2402
2397 if (!OPTION (Opt_transparent)) 2403 if (!OPTION (Opt_transparent))
2398 return pchanged; /* Don't try any more */ 2404 return pchanged; /* Don't try any more */
2399 2405
2400 XGetWindowAttributes (disp, display->root, &wrootattr); 2406 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2401 rootdepth = wrootattr.depth; 2407 rootdepth = wrootattr.depth;
2402 2408
2403 XGetWindowAttributes (disp, parent[0], &wattr); 2409 XGetWindowAttributes (xdisp, parent[0], &wattr);
2404 2410
2405 if (rootdepth != wattr.depth) 2411 if (rootdepth != wattr.depth)
2406 { 2412 {
2407 if (am_transparent) 2413 if (am_transparent)
2408 { 2414 {
2409 pchanged = 1; 2415 pchanged = 1;
2410 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2416 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2411 am_transparent = am_pixmap_trans = 0; 2417 am_transparent = am_pixmap_trans = 0;
2412 } 2418 }
2413 2419
2414 return pchanged; /* Don't try any more */ 2420 return pchanged; /* Don't try any more */
2415 } 2421 }
2416 2422
2417 /* Get all X ops out of the queue so that our information is up-to-date. */ 2423 /* Get all X ops out of the queue so that our information is up-to-date. */
2418 XSync (disp, False); 2424 XSync (xdisp, False);
2419 2425
2420 /* 2426 /*
2421 * Make the frame window set by the window manager have 2427 * Make the frame window set by the window manager have
2422 * the root background. Some window managers put multiple nested frame 2428 * the root background. Some window managers put multiple nested frame
2423 * windows for each client, so we have to take care about that. 2429 * windows for each client, so we have to take care about that.
2424 */ 2430 */
2425 i = (xa[XA_XROOTPMAP_ID] 2431 i = (xa[XA_XROOTPMAP_ID]
2426 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2432 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2427 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2433 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2428 &nitems, &bytes_after, &prop) == Success); 2434 &nitems, &bytes_after, &prop) == Success);
2429 2435
2430 if (!i || prop == NULL) 2436 if (!i || prop == NULL)
2431 i = (xa[XA_ESETROOT_PMAP_ID] 2437 i = (xa[XA_ESETROOT_PMAP_ID]
2432 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2438 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2433 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2439 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2434 &nitems, &bytes_after, &prop) == Success); 2440 &nitems, &bytes_after, &prop) == Success);
2435 2441
2436 if (!i || prop == NULL 2442 if (!i || prop == NULL
2437#if TINTING 2443#if TINTING
2438 || !rs[Rs_color + Color_tint] 2444 || !ISSET_PIXCOLOR (Color_tint)
2439#endif 2445#endif
2440 ) 2446 )
2441 have_pixmap = 0; 2447 have_pixmap = 0;
2442 else 2448 else
2443 { 2449 {
… …
2456 Window cr; 2462 Window cr;
2457 XImage *image; 2463 XImage *image;
2458 GC gc; 2464 GC gc;
2459 XGCValues gcvalue; 2465 XGCValues gcvalue;
2460 2466
2461 XTranslateCoordinates (disp, parent[0], display->root, 2467 XTranslateCoordinates (xdisp, parent[0], display->root,
2462 0, 0, &sx, &sy, &cr); 2468 0, 0, &sx, &sy, &cr);
2463 nw = (unsigned int)szHint.width; 2469 nw = (unsigned int)szHint.width;
2464 nh = (unsigned int)szHint.height; 2470 nh = (unsigned int)szHint.height;
2465 nx = ny = 0; 2471 nx = ny = 0;
2466 2472
… …
2479 } 2485 }
2480 2486
2481 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2487 min_it (nw, (unsigned int) (wrootattr.width - sx));
2482 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2488 min_it (nh, (unsigned int) (wrootattr.height - sy));
2483 2489
2484 XSync (disp, False); 2490 XSync (xdisp, False);
2485 allowedxerror = -1; 2491 allowedxerror = -1;
2486 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2492 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2487 2493
2488 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2494 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2489 /* XXX: may need a delay here? */ 2495 /* XXX: may need a delay here? */
2490 allowedxerror = 0; 2496 allowedxerror = 0;
2491 2497
… …
2494 if (am_transparent && am_pixmap_trans) 2500 if (am_transparent && am_pixmap_trans)
2495 { 2501 {
2496 pchanged = 1; 2502 pchanged = 1;
2497 if (pixmap != None) 2503 if (pixmap != None)
2498 { 2504 {
2499 XFreePixmap (disp, pixmap); 2505 XFreePixmap (xdisp, pixmap);
2500 pixmap = None; 2506 pixmap = None;
2501 } 2507 }
2502 } 2508 }
2503 2509
2504 am_pixmap_trans = 0; 2510 am_pixmap_trans = 0;
2505 } 2511 }
2506 else 2512 else
2507 { 2513 {
2508 if (pixmap != None) 2514 if (pixmap != None)
2509 XFreePixmap (disp, pixmap); 2515 XFreePixmap (xdisp, pixmap);
2510 2516
2511#if TINTING 2517#if TINTING
2512 if (ISSET_PIXCOLOR (Color_tint)) 2518 if (ISSET_PIXCOLOR (Color_tint))
2513 { 2519 {
2514 unsigned short rm, gm, bm;
2515 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2520 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2516 2521
2522 rgba c;
2517 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2523 pix_colors_focused [Color_tint].get (c);
2518 2524
2519 ShadeXImage (display, image, shade, rm, gm, bm); 2525 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2520 } 2526 }
2521#endif 2527#endif
2522 2528
2523 pixmap = XCreatePixmap (disp, vt, 2529 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2524 szHint.width, szHint.height, image->depth);
2525 gc = XCreateGC (disp, vt, 0UL, &gcvalue); 2530 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2526 XPutImage (disp, pixmap, gc, image, 0, 0, 2531 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2527 nx, ny, image->width, image->height); 2532 nx, ny, image->width, image->height);
2528 XFreeGC (disp, gc); 2533 XFreeGC (xdisp, gc);
2529 XDestroyImage (image); 2534 XDestroyImage (image);
2530 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2535 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2531 XClearWindow (disp, parent[0]); 2536 XClearWindow (xdisp, parent[0]);
2532 2537
2533 if (!am_transparent || !am_pixmap_trans) 2538 if (!am_transparent || !am_pixmap_trans)
2534 pchanged = 1; 2539 pchanged = 1;
2535 2540
2536 am_transparent = am_pixmap_trans = 1; 2541 am_transparent = am_pixmap_trans = 1;
2537 } 2542 }
2538 } 2543 }
2539 2544
2540 if (am_pixmap_trans) 2545 if (am_pixmap_trans)
2541 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2546 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2542 else 2547 else
2543 { 2548 {
2544 unsigned int n; 2549 unsigned int n;
2545 /* 2550 /*
2546 * InheritPixmap transparency 2551 * InheritPixmap transparency
2547 */ 2552 */
2548 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2553 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2549 { 2554 {
2550 oldp = parent[i]; 2555 oldp = parent[i];
2551 XQueryTree (disp, parent[i - 1], &root, 2556 XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2552 &parent[i], &list, &n);
2553 XFree (list); 2557 XFree (list);
2554 2558
2555 if (parent[i] == display->root) 2559 if (parent[i] == display->root)
2556 { 2560 {
2557 if (oldp != None) 2561 if (oldp != None)
… …
2565 } 2569 }
2566 2570
2567 n = 0; 2571 n = 0;
2568 2572
2569 if (pchanged) 2573 if (pchanged)
2570 {
2571 for (; n < (unsigned int)i; n++) 2574 for (; n < (unsigned int)i; n++)
2572 { 2575 {
2573 XGetWindowAttributes (disp, parent[n], &wattr); 2576 XGetWindowAttributes (xdisp, parent[n], &wattr);
2577
2574 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2578 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2575 { 2579 {
2576 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2580 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2577 break; 2581 break;
2578 } 2582 }
2579 } 2583 }
2580 }
2581 2584
2582 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2585 if (n > (sizeof (parent) / sizeof (parent[0])))
2583 { 2586 {
2584 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2587 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2585 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2588 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2586 am_transparent = 0; 2589 am_transparent = 0;
2587 /* XXX: also turn off Opt_transparent? */ 2590 /* XXX: also turn off Opt_transparent? */
2588 } 2591 }
2589 else 2592 else
2590 { 2593 {
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++) 2594 for (n = 0; n < (unsigned int)i; n++)
2597 { 2595 {
2598 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2596 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2599 XClearWindow (disp, parent[n]); 2597 XClearWindow (xdisp, parent[n]);
2600 } 2598 }
2601 2599
2602 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2600 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2603 am_transparent = 1; 2601 am_transparent = 1;
2604 } 2602 }
2605 2603
2606 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2604 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2607 parent[i] = None; 2605 parent[i] = None;
2608 } 2606 }
2609 2607
2610 if (scrollBar.win) 2608 if (scrollBar.win)
2611 { 2609 {
2612 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2610 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2613 scrollBar.setIdle (); 2611 scrollBar.setIdle ();
2614 scrollbar_show (0); 2612 scrollbar_show (0);
2615 } 2613 }
2616 2614
2617 if (am_transparent) 2615 if (am_transparent)
… …
2629 2627
2630bool 2628bool
2631rxvt_term::cmd_parse () 2629rxvt_term::cmd_parse ()
2632{ 2630{
2633 bool flag = false; 2631 bool flag = false;
2634 unicode_t ch = NOCHAR; 2632 wchar_t ch = NOCHAR;
2635 unsigned char *seq_begin; // remember start of esc-sequence here 2633 char *seq_begin; // remember start of esc-sequence here
2636 2634
2637 for (;;) 2635 for (;;)
2638 { 2636 {
2639 if (ch == NOCHAR) 2637 if (ch == NOCHAR)
2640 { 2638 {
2641 seq_begin = cmdbuf_ptr; 2639 seq_begin = cmdbuf_ptr;
2642 ch = next_char (); 2640 ch = next_char ();
2643 }
2644 2641
2645 if (ch == NOCHAR) // TODO: improve 2642 if (ch == NOCHAR)
2646 break; 2643 break;
2644 }
2647 2645
2648 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2646 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2649 { 2647 {
2650 if (!seen_input) 2648 if (!seen_input)
2651 { 2649 {
… …
2660 if (seen_resize && cmd_pid) 2658 if (seen_resize && cmd_pid)
2661 kill (-cmd_pid, SIGWINCH); 2659 kill (-cmd_pid, SIGWINCH);
2662 } 2660 }
2663 2661
2664 /* Read a text string from the input buffer */ 2662 /* Read a text string from the input buffer */
2665 unicode_t buf[UBUFSIZ]; 2663 wchar_t buf[UBUFSIZ];
2666 bool refreshnow = false; 2664 bool refreshnow = false;
2667 int nlines = 0; 2665 int nlines = 0;
2668 unicode_t *str = buf; 2666 wchar_t *str = buf;
2669 unicode_t *eol = str + min (ncol, UBUFSIZ); 2667 wchar_t *eol = str + min (ncol, UBUFSIZ);
2670 2668
2671 for (;;) 2669 for (;;)
2672 { 2670 {
2673 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2671 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2674 break; 2672 break;
… …
2684 2682
2685 if (!OPTION (Opt_jumpScroll) 2683 if (!OPTION (Opt_jumpScroll)
2686 || (refresh_count >= refresh_limit * (nrow - 1))) 2684 || (refresh_count >= refresh_limit * (nrow - 1)))
2687 { 2685 {
2688 refreshnow = true; 2686 refreshnow = true;
2687 refresh_count = 0;
2689 ch = NOCHAR; 2688 ch = NOCHAR;
2690 break; 2689 break;
2691 } 2690 }
2692 2691
2693 // scr_add_lines only works for nlines <= nrow - 1. 2692 // scr_add_lines only works for nlines <= nrow - 1.
2694 if (nlines >= nrow - 1) 2693 if (nlines >= nrow - 1)
2695 { 2694 {
2695 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2696 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2696 scr_add_lines (buf, nlines, str - buf); 2697 scr_add_lines (buf, str - buf, nlines);
2698
2697 nlines = 0; 2699 nlines = 0;
2698 str = buf; 2700 str = buf;
2699 eol = str + min (ncol, UBUFSIZ); 2701 eol = str + min (ncol, UBUFSIZ);
2700 } 2702 }
2701 2703
… …
2714 2716
2715 seq_begin = cmdbuf_ptr; 2717 seq_begin = cmdbuf_ptr;
2716 ch = next_char (); 2718 ch = next_char ();
2717 } 2719 }
2718 2720
2721 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2722 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2719 scr_add_lines (buf, nlines, str - buf); 2723 scr_add_lines (buf, str - buf, nlines);
2720 2724
2721 /* 2725 /*
2722 * If there have been a lot of new lines, then update the screen 2726 * 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. 2727 * 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 2728 * the number of pages between refreshes is refresh_limit, which
… …
2729 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2733 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2730 refresh_limit++; 2734 refresh_limit++;
2731 else 2735 else
2732 { 2736 {
2733 flag = true; 2737 flag = true;
2734 scr_refresh (refresh_type); 2738 scr_refresh ();
2739 want_refresh = 1;
2735 } 2740 }
2736 } 2741 }
2737 2742
2738 } 2743 }
2739 else 2744 else
… …
2754 } 2759 }
2755 2760
2756 return flag; 2761 return flag;
2757} 2762}
2758 2763
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 2764// read the next character
2769unicode_t 2765wchar_t
2770rxvt_term::next_char () 2766rxvt_term::next_char () NOTHROW
2771{ 2767{
2772 while (cmdbuf_ptr < cmdbuf_endp) 2768 while (cmdbuf_ptr < cmdbuf_endp)
2773 { 2769 {
2774 // assume 7-bit to be ascii ALWAYS 2770 // assume 7-bit to be ascii ALWAYS
2775 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2771 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2776 return *cmdbuf_ptr++; 2772 return *cmdbuf_ptr++;
2777 2773
2778 wchar_t wc; 2774 wchar_t wc;
2779 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2775 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2780 2776
2781 if (len == (size_t)-2) 2777 if (len == (size_t)-2)
2782 { 2778 {
2783 // the mbstate stores incomplete sequences. didn't know this :/ 2779 // the mbstate stores incomplete sequences. didn't know this :/
2784 cmdbuf_ptr = cmdbuf_endp; 2780 cmdbuf_ptr = cmdbuf_endp;
2785 break; 2781 break;
2786 } 2782 }
2787 2783
2788 if (len == (size_t)-1) 2784 if (len == (size_t)-1)
2789 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2785 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2790 2786
2791 // assume wchar == unicode 2787 // assume wchar == unicode
2792 cmdbuf_ptr += len; 2788 cmdbuf_ptr += len;
2793 return wc & UNICODE_MASK; 2789 return wc & UNICODE_MASK;
2794 } 2790 }
2795 2791
2796 return NOCHAR; 2792 return NOCHAR;
2797} 2793}
2794
2795// read the next octet
2796uint32_t
2797rxvt_term::next_octet () NOTHROW
2798{
2799 return cmdbuf_ptr < cmdbuf_endp
2800 ? (unsigned char)*cmdbuf_ptr++
2801 : NOCHAR;
2802}
2803
2804static class out_of_input out_of_input;
2798 2805
2799/* rxvt_cmd_getc () - Return next input character */ 2806/* rxvt_cmd_getc () - Return next input character */
2800/* 2807/*
2801 * Return the next input character after first passing any keyboard input 2808 * Return the next input character after first passing any keyboard input
2802 * to the command. 2809 * to the command.
2803 */ 2810 */
2804unicode_t 2811wchar_t
2805rxvt_term::cmd_getc () 2812rxvt_term::cmd_getc () THROW ((class out_of_input))
2806{ 2813{
2807 unicode_t c = next_char (); 2814 wchar_t c = next_char ();
2808 2815
2809 if (c == NOCHAR) 2816 if (c == NOCHAR)
2810 throw out_of_input; 2817 throw out_of_input;
2811 2818
2812 return c; 2819 return c;
2813} 2820}
2814 2821
2815unicode_t 2822uint32_t
2816rxvt_term::cmd_get8 () 2823rxvt_term::cmd_get8 () THROW ((class out_of_input))
2817{ 2824{
2818 unicode_t c = next_octet (); 2825 uint32_t c = next_octet ();
2819 2826
2820 if (c == NOCHAR) 2827 if (c == NOCHAR)
2821 throw out_of_input; 2828 throw out_of_input;
2822 2829
2823 return c; 2830 return c;
… …
2923 case C0_ESC: 2930 case C0_ESC:
2924 process_escape_seq (); 2931 process_escape_seq ();
2925 break; 2932 break;
2926 case C0_ENQ: /* terminal Status */ 2933 case C0_ENQ: /* terminal Status */
2927 if (rs[Rs_answerbackstring]) 2934 if (rs[Rs_answerbackstring])
2928 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2935 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2929 (unsigned int)strlen (rs[Rs_answerbackstring]));
2930 else 2936 else
2931 tt_write ((unsigned char *)VT100_ANS, 2937 tt_write (VT100_ANS, strlen (VT100_ANS));
2932 (unsigned int)strlen (VT100_ANS));
2933 break; 2938 break;
2934 case C0_BEL: /* bell */ 2939 case C0_BEL: /* bell */
2935 scr_bell (); 2940 scr_bell ();
2936 break; 2941 break;
2937 case C0_BS: /* backspace */ 2942 case C0_BS: /* backspace */
… …
3061 scr_charset_set (2, (unsigned int)cmd_getc ()); 3066 scr_charset_set (2, (unsigned int)cmd_getc ());
3062 break; 3067 break;
3063 case '+': 3068 case '+':
3064 scr_charset_set (3, (unsigned int)cmd_getc ()); 3069 scr_charset_set (3, (unsigned int)cmd_getc ());
3065 break; 3070 break;
3066#if ENABLE_FRILLS 3071#if !ENABLE_MINIMAL
3067 case '6': 3072 case '6':
3068 scr_backindex (); 3073 scr_backindex ();
3069 break; 3074 break;
3070#endif 3075#endif
3071 case '7': 3076 case '7':
3072 scr_cursor (SAVE); 3077 scr_cursor (SAVE);
3073 break; 3078 break;
3074 case '8': 3079 case '8':
3075 scr_cursor (RESTORE); 3080 scr_cursor (RESTORE);
3076 break; 3081 break;
3077#if ENABLE_FRILLS 3082#if !ENABLE_MINIMAL
3078 case '9': 3083 case '9':
3079 scr_forwardindex (); 3084 scr_forwardindex ();
3080 break; 3085 break;
3081#endif 3086#endif
3082 case '=': 3087 case '=':
… …
3092 break; 3097 break;
3093 3098
3094 /* 8.3.87: NEXT LINE */ 3099 /* 8.3.87: NEXT LINE */
3095 case C1_NEL: /* ESC E */ 3100 case C1_NEL: /* ESC E */
3096 { 3101 {
3097 unicode_t nlcr[] = { C0_LF, C0_CR }; 3102 wchar_t nlcr[] = { C0_LF, C0_CR };
3098 scr_add_lines (nlcr, 1, 2); 3103 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3099 } 3104 }
3100 break; 3105 break;
3101 3106
3102 /* kidnapped escape sequence: Should be 8.3.48 */ 3107 /* kidnapped escape sequence: Should be 8.3.48 */
3103 case C1_ESA: /* ESC G */ 3108 case C1_ESA: /* ESC G */
… …
3125 process_dcs_seq (); 3130 process_dcs_seq ();
3126 break; 3131 break;
3127 3132
3128 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3133 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3129 case C1_SCI: /* ESC Z */ 3134 case C1_SCI: /* ESC Z */
3130 tt_write ((const unsigned char *)ESCZ_ANSWER, 3135 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3131 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3132 break; /* steal obsolete ESC [ c */ 3136 break; /* steal obsolete ESC [ c */
3133 3137
3134 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3138 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3135 case C1_CSI: /* ESC [ */ 3139 case C1_CSI: /* ESC [ */
3136 process_csi_seq (); 3140 process_csi_seq ();
… …
3245 ndef = get_byte_array_bit (csi_defaults, i); 3249 ndef = get_byte_array_bit (csi_defaults, i);
3246 for (p = 0; p < nargs; p++) 3250 for (p = 0; p < nargs; p++)
3247 if (arg[p] == -1) 3251 if (arg[p] == -1)
3248 arg[p] = ndef; 3252 arg[p] = ndef;
3249 3253
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 /* 3254 /*
3258 * private mode handling 3255 * private mode handling
3259 */ 3256 */
3260 if (priv) 3257 if (priv)
3261 { 3258 {
3262 switch (priv) 3259 switch (priv)
3263 { 3260 {
3264 case '>': 3261 case '>':
3265 if (ch == CSI_DA) /* secondary device attributes */ 3262 if (ch == CSI_DA) /* secondary device attributes */
3266 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 3263 {
3264 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3265 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3266 //
3267 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3268 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3269 // that we do not support xterm mouse reporting (should be 95 when we do).
3270 //
3271 tt_printf ("\033[>%d;94;0c", 'U');
3272 }
3267 break; 3273 break;
3268 case '?': 3274 case '?':
3269 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3275 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3270 process_terminal_mode (ch, priv, nargs, arg); 3276 process_terminal_mode (ch, priv, nargs, arg);
3271 break; 3277 break;
… …
3380 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3386 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3381 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3387 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3382 break; 3388 break;
3383 3389
3384 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3390 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3385 tt_write ((const unsigned char *)VT100_ANS, 3391 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3386 (unsigned int) (sizeof (VT100_ANS) - 1));
3387 break; 3392 break;
3388 3393
3389 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3394 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3390 process_sgr_mode (nargs, arg); 3395 process_sgr_mode (nargs, arg);
3391 break; 3396 break;
… …
3475 break; 3480 break;
3476 case CSI_75: 3481 case CSI_75:
3477 scr_cursor (RESTORE); 3482 scr_cursor (RESTORE);
3478 break; 3483 break;
3479 3484
3480#if ENABLE_FRILLS 3485#if !ENABLE_MINIMAL
3481 case CSI_74: 3486 case CSI_74:
3482 process_window_ops (arg, nargs); 3487 process_window_ops (arg, nargs);
3483 break; 3488 break;
3484#endif 3489#endif
3485 3490
… …
3492 break; 3497 break;
3493 } 3498 }
3494} 3499}
3495/*}}} */ 3500/*}}} */
3496 3501
3497#if ENABLE_FRILLS 3502#if !ENABLE_MINIMAL
3498/* ARGSUSED */ 3503/* ARGSUSED */
3499void 3504void
3500rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3505rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3501{ 3506{
3502 int x, y; 3507 int x, y;
3503 XWindowAttributes wattr; 3508 XWindowAttributes wattr;
3504 Window wdummy; 3509 Window wdummy;
3505 dDisp; 3510
3511 dLocal (Display *, xdisp);
3506 3512
3507 if (nargs == 0) 3513 if (nargs == 0)
3508 return; 3514 return;
3509 3515
3510 switch (args[0]) 3516 switch (args[0])
3511 { 3517 {
3512 /* 3518 /*
3513 * commands 3519 * commands
3514 */ 3520 */
3515 case 1: /* deiconify window */ 3521 case 1: /* deiconify window */
3516 XMapWindow (disp, parent[0]); 3522 XMapWindow (xdisp, parent[0]);
3517 break; 3523 break;
3518 case 2: /* iconify window */ 3524 case 2: /* iconify window */
3519 XIconifyWindow (disp, parent[0], display->screen); 3525 XIconifyWindow (xdisp, parent[0], display->screen);
3520 break; 3526 break;
3521 case 3: /* set position (pixels) */ 3527 case 3: /* set position (pixels) */
3522 XMoveWindow (disp, parent[0], args[1], args[2]); 3528 XMoveWindow (xdisp, parent[0], args[1], args[2]);
3523 break; 3529 break;
3524 case 4: /* set size (pixels) */ 3530 case 4: /* set size (pixels) */
3525 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3531 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3526 break; 3532 break;
3527 case 5: /* raise window */ 3533 case 5: /* raise window */
3528 XRaiseWindow (disp, parent[0]); 3534 XRaiseWindow (xdisp, parent[0]);
3529 break; 3535 break;
3530 case 6: /* lower window */ 3536 case 6: /* lower window */
3531 XLowerWindow (disp, parent[0]); 3537 XLowerWindow (xdisp, parent[0]);
3532 break; 3538 break;
3533 case 7: /* refresh window */ 3539 case 7: /* refresh window */
3534 scr_touch (true); 3540 scr_touch (true);
3535 break; 3541 break;
3536 case 8: /* set size (chars) */ 3542 case 8: /* set size (chars) */
… …
3543 if (args[0] >= 24) /* set height (chars) */ 3549 if (args[0] >= 24) /* set height (chars) */
3544 set_widthheight ((unsigned int)width, 3550 set_widthheight ((unsigned int)width,
3545 (unsigned int) (args[1] * fheight)); 3551 (unsigned int) (args[1] * fheight));
3546 break; 3552 break;
3547 3553
3548
3549 /* 3554 /*
3550 * reports - some output format copied from XTerm 3555 * reports - some output format copied from XTerm
3551 */ 3556 */
3552 case 11: /* report window state */ 3557 case 11: /* report window state */
3553 XGetWindowAttributes (disp, parent[0], &wattr); 3558 XGetWindowAttributes (xdisp, parent[0], &wattr);
3554 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3559 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3555 break; 3560 break;
3556 case 13: /* report window position */ 3561 case 13: /* report window position */
3557 XGetWindowAttributes (disp, parent[0], &wattr); 3562 XGetWindowAttributes (xdisp, parent[0], &wattr);
3558 XTranslateCoordinates (disp, parent[0], wattr.root, 3563 XTranslateCoordinates (xdisp, parent[0], wattr.root,
3559 -wattr.border_width, -wattr.border_width, 3564 -wattr.border_width, -wattr.border_width,
3560 &x, &y, &wdummy); 3565 &x, &y, &wdummy);
3561 tt_printf ("\033[3;%d;%dt", x, y); 3566 tt_printf ("\033[3;%d;%dt", x, y);
3562 break; 3567 break;
3563 case 14: /* report window size (pixels) */ 3568 case 14: /* report window size (pixels) */
3564 XGetWindowAttributes (disp, parent[0], &wattr); 3569 XGetWindowAttributes (xdisp, parent[0], &wattr);
3565 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3570 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3566 break; 3571 break;
3567 case 18: /* report text area size (chars) */ 3572 case 18: /* report text area size (chars) */
3568 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3573 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3569 break; 3574 break;
… …
3571 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3576 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3572 break; 3577 break;
3573 case 20: /* report icon label */ 3578 case 20: /* report icon label */
3574 { 3579 {
3575 char *s; 3580 char *s;
3576 XGetIconName (disp, parent[0], &s); 3581 XGetIconName (xdisp, parent[0], &s);
3577 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3582 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3578 XFree (s); 3583 XFree (s);
3579 } 3584 }
3580 break; 3585 break;
3581 case 21: /* report window title */ 3586 case 21: /* report window title */
3582 { 3587 {
3583 char *s; 3588 char *s;
3584 XFetchName (disp, parent[0], &s); 3589 XFetchName (xdisp, parent[0], &s);
3585 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3590 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3586 XFree (s); 3591 XFree (s);
3587 } 3592 }
3588 break; 3593 break;
3589 } 3594 }
… …
3593/*----------------------------------------------------------------------*/ 3598/*----------------------------------------------------------------------*/
3594/* 3599/*
3595 * get input up until STRING TERMINATOR (or BEL) 3600 * get input up until STRING TERMINATOR (or BEL)
3596 * ends_how is terminator used. returned input must be free()'d 3601 * ends_how is terminator used. returned input must be free()'d
3597 */ 3602 */
3598unsigned char * 3603char *
3599rxvt_term::get_to_st (unicode_t &ends_how) 3604rxvt_term::get_to_st (unicode_t &ends_how)
3600{ 3605{
3601 unicode_t ch; 3606 unicode_t ch;
3602 bool seen_esc = false; 3607 bool seen_esc = false;
3603 unsigned int n = 0; 3608 unsigned int n = 0;
… …
3636 3641
3637 string[n++] = '\0'; 3642 string[n++] = '\0';
3638 3643
3639 ends_how = (ch == 0x5c ? C0_ESC : ch); 3644 ends_how = (ch == 0x5c ? C0_ESC : ch);
3640 3645
3641 return (unsigned char *)rxvt_wcstombs (string); 3646 return rxvt_wcstombs (string);
3642} 3647}
3643 3648
3644/*----------------------------------------------------------------------*/ 3649/*----------------------------------------------------------------------*/
3645/* 3650/*
3646 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3651 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3647 */ 3652 */
3648void 3653void
3649rxvt_term::process_dcs_seq () 3654rxvt_term::process_dcs_seq ()
3650{ 3655{
3651 unsigned char *s; 3656 char *s;
3652 unicode_t eh; 3657 unicode_t eh;
3653 3658
3654 /* 3659 /*
3655 * Not handled yet 3660 * Not handled yet
3656 */ 3661 */
… …
3675 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3680 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3676 arg = arg * 10 + (ch - '0'); 3681 arg = arg * 10 + (ch - '0');
3677 3682
3678 if (ch == ';') 3683 if (ch == ';')
3679 { 3684 {
3680 unsigned char *s = get_to_st (eh); 3685 char *s = get_to_st (eh);
3681 3686
3682 if (s) 3687 if (s)
3683 { 3688 {
3684 process_xterm_seq (arg, (char *)s, eh); 3689 process_xterm_seq (arg, s, eh);
3685 free (s); 3690 free (s);
3686 } 3691 }
3687 } 3692 }
3688} 3693}
3689 3694
3690void 3695void
3691rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3696rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3692{ 3697{
3693 if (str[0] == '?' && !str[1]) 3698 if (str[0] == '?' && !str[1])
3694 { 3699 {
3695 unsigned short r, g, b; 3700 rgba c;
3696 pix_colors_focused[color].get (display, r, g, b); 3701 pix_colors_focused[color].get (c);
3702
3703#if XFT
3704 if (c.a != rgba::MAX_CC)
3705 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3706 else
3707#endif
3697 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3708 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3698 } 3709 }
3699 else 3710 else
3700 set_window_color (color, str); 3711 set_window_color (color, str);
3701} 3712}
3702 3713
3703/* 3714/*
3704 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3715 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3705 */ 3716 */
3706void 3717void
3707rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3718rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3708{ 3719{
3709 int changed = 0;
3710 int color; 3720 int color;
3711 char *buf, *name; 3721 char *buf, *name;
3712 bool query = str[0] == '?' && !str[1]; 3722 bool query = str[0] == '?' && !str[1];
3713 int saveop = op; 3723 int saveop = op;
3714 dDisp; 3724
3725 dLocal (Display *, xdisp);
3715 3726
3716 assert (str != NULL); 3727 assert (str != NULL);
3717 switch (op) 3728 switch (op)
3718 { 3729 {
3719 case XTerm_name: 3730 case XTerm_name:
… …
3735 unsigned long bytes_after; 3746 unsigned long bytes_after;
3736 unsigned char *value = 0; 3747 unsigned char *value = 0;
3737 const char *str = ""; 3748 const char *str = "";
3738 3749
3739 if (prop 3750 if (prop
3740 && XGetWindowProperty (disp, parent[0], 3751 && XGetWindowProperty (xdisp, parent[0],
3741 prop, 0, 1<<16, 0, AnyPropertyType, 3752 prop, 0, 1<<16, 0, AnyPropertyType,
3742 &actual_type, &actual_format, 3753 &actual_type, &actual_format,
3743 &nitems, &bytes_after, &value) == Success 3754 &nitems, &bytes_after, &value) == Success
3744 && actual_type != None 3755 && actual_type != None
3745 && actual_format == 8) 3756 && actual_format == 8)
3746 str = (const char *)(value); 3757 str = (const char *)(value);
3747 3758
3748 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3759 tt_printf ("\033]%d;%s%c", op, str, resp);
3749 3760
3750 XFree (value); 3761 XFree (value);
3751 } 3762 }
3752 else 3763 else
3753 { 3764 {
… …
3757 { 3768 {
3758 *eq = 0; 3769 *eq = 0;
3759 set_utf8_property (display->atom (str), eq + 1); 3770 set_utf8_property (display->atom (str), eq + 1);
3760 } 3771 }
3761 else 3772 else
3762 XDeleteProperty (disp, parent[0], 3773 XDeleteProperty (xdisp, parent[0],
3763 display->atom (str)); 3774 display->atom (str));
3764 } 3775 }
3765 break; 3776 break;
3766 3777
3767 case XTerm_Color: 3778 case XTerm_Color:
… …
3769 { 3780 {
3770 if ((name = strchr (buf, ';')) == NULL) 3781 if ((name = strchr (buf, ';')) == NULL)
3771 break; 3782 break;
3772 3783
3773 *name++ = '\0'; 3784 *name++ = '\0';
3774 color = atoi (buf); 3785 color = atoi (buf) + minCOLOR;
3775 3786
3776 if (color < 0 || color >= TOTAL_COLORS) 3787 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3777 break; 3788 break;
3778 3789
3779 if ((buf = strchr (name, ';')) != NULL) 3790 if ((buf = strchr (name, ';')) != NULL)
3780 *buf++ = '\0'; 3791 *buf++ = '\0';
3781 3792
3782 if (name[0] == '?' && !name[1]) 3793 process_color_seq (op, color, name, resp);
3783 {
3784 unsigned short r, g, b;
3785 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3786 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3787 }
3788 else
3789 set_window_color (color + minCOLOR, name);
3790 } 3794 }
3791 break; 3795 break;
3792 case XTerm_Color00: 3796 case XTerm_Color00:
3793 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3797 process_color_seq (op, Color_fg, str, resp);
3794 break; 3798 break;
3795 case XTerm_Color01: 3799 case XTerm_Color01:
3796 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3800 process_color_seq (op, Color_bg, str, resp);
3797 break; 3801 break;
3798#ifndef NO_CURSORCOLOR 3802#ifndef NO_CURSORCOLOR
3799 case XTerm_Color_cursor: 3803 case XTerm_Color_cursor:
3800 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3804 process_color_seq (op, Color_cursor, str, resp);
3801 break; 3805 break;
3802#endif 3806#endif
3803 case XTerm_Color_pointer_fg: 3807 case XTerm_Color_pointer_fg:
3804 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3808 process_color_seq (op, Color_pointer_fg, str, resp);
3805 break; 3809 break;
3806 case XTerm_Color_pointer_bg: 3810 case XTerm_Color_pointer_bg:
3807 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3811 process_color_seq (op, Color_pointer_bg, str, resp);
3808 break; 3812 break;
3809#ifndef NO_BOLD_UNDERLINE_REVERSE 3813#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: 3814 case XTerm_Color_RV:
3817 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3815 process_color_seq (op, Color_RV, str, resp);
3816 break;
3817 case Rxvt_Color_BD:
3818 case URxvt_Color_BD:
3819 process_color_seq (op, Color_BD, str, resp);
3820 break;
3821 case Rxvt_Color_UL:
3822 case URxvt_Color_UL:
3823 process_color_seq (op, Color_UL, str, resp);
3818 break; 3824 break;
3819 case URxvt_Color_IT: 3825 case URxvt_Color_IT:
3820 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3826 process_color_seq (op, Color_IT, str, resp);
3821 break; 3827 break;
3822#endif 3828#endif
3823#if TRANSPARENT && TINTING 3829#if TRANSPARENT && TINTING
3824 case URxvt_Color_tint: 3830 case URxvt_Color_tint:
3825 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3831 process_color_seq (op, Color_tint, str, resp);
3832
3826 check_our_parents (); 3833 check_our_parents ();
3834
3827 if (am_transparent) 3835 if (am_transparent)
3828 want_full_refresh = want_refresh = 1; 3836 want_full_refresh = want_refresh = 1;
3829 break;
3830#endif
3831 3837
3838 break;
3839#endif
3840
3832 case XTerm_Pixmap: 3841 case Rxvt_Pixmap:
3842 {
3833 if (*str != ';') 3843 if (*str != ';')
3834 { 3844 {
3835#if XPM_BACKGROUND 3845#if XPM_BACKGROUND
3836 scale_pixmap (""); /* reset to default scaling */ 3846 scale_pixmap (""); /* reset to default scaling */
3837 set_bgPixmap (str); /* change pixmap */ 3847 set_bgPixmap (str); /* change pixmap */
3838#endif
3839 scr_touch (true); 3848 scr_touch (true);
3849#endif
3840 } 3850 }
3851
3852 int changed = 0;
3853
3841 while ((str = strchr (str, ';')) != NULL) 3854 while ((str = strchr (str, ';')) != NULL)
3842 { 3855 {
3843 str++; 3856 str++;
3844#if XPM_BACKGROUND 3857#if XPM_BACKGROUND
3845 changed += scale_pixmap (str); 3858 changed += scale_pixmap (str);
3846#endif 3859#endif
3847 } 3860 }
3848 3861
3849 if (changed) 3862 if (changed)
3850 { 3863 {
3851#ifdef XPM_BACKGROUND 3864#ifdef XPM_BACKGROUND
3852 resize_pixmap (); 3865 resize_pixmap ();
3853#endif
3854 scr_touch (true); 3866 scr_touch (true);
3867#endif
3855 } 3868 }
3869 }
3856 break; 3870 break;
3857 3871
3858 case XTerm_restoreFG: 3872 case Rxvt_restoreFG:
3859 set_window_color (Color_fg, str); 3873 set_window_color (Color_fg, str);
3860 break; 3874 break;
3861 case XTerm_restoreBG: 3875 case Rxvt_restoreBG:
3862 set_window_color (Color_bg, str); 3876 set_window_color (Color_bg, str);
3863 break; 3877 break;
3864 3878
3865 case XTerm_logfile: 3879 case XTerm_logfile:
3866 // TODO, when secure mode? 3880 // TODO, when secure mode?
3867 break; 3881 break;
3868 3882
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 3883#if 0
3876 case XTerm_dumpscreen: /* no error notices */ 3884 case Rxvt_dumpscreen: /* no error notices */
3877 { 3885 {
3878 int fd; 3886 int fd;
3879 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3887 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3880 { 3888 {
3881 scr_dump (fd); 3889 scr_dump (fd);
… …
3905 allocated.push_back ((void *)res); 3913 allocated.push_back ((void *)res);
3906 set_fonts (); 3914 set_fonts ();
3907 } 3915 }
3908 break; 3916 break;
3909 3917
3910#if ENABLE_FRILLS 3918 case URxvt_version:
3919 if (query)
3920 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3921 op,
3922 rs[Rs_name], VERSION[0], VERSION[2],
3923 resp);
3924 break;
3925
3926#if !ENABLE_MINIMAL
3911 case URxvt_locale: 3927 case URxvt_locale:
3912 if (query) 3928 if (query)
3913 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3929 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3914 else 3930 else
3915 { 3931 {
3916 set_locale (str); 3932 set_locale (str);
3917 pty.set_utf8_mode (enc_utf8); 3933 pty->set_utf8_mode (enc_utf8);
3918 init_xlocale (); 3934 init_xlocale ();
3919 } 3935 }
3920 break; 3936 break;
3921 3937
3922 case URxvt_view_up: 3938 case URxvt_view_up:
3923 case URxvt_view_down: 3939 case URxvt_view_down:
3940 {
3924 int lines = atoi (str); 3941 int lines = atoi (str);
3925 3942
3926 if (lines) 3943 if (lines)
3927 scr_page (op == URxvt_view_up ? UP : DN, lines); 3944 scr_page (op == URxvt_view_up ? UP : DN, lines);
3928 else 3945 else
3929 {
3930 scr_erase_savelines (); 3946 scr_erase_savelines ();
3931 } 3947 }
3932 3948
3949 break;
3950#endif
3951
3952#if ENABLE_PERL
3953 case URxvt_perl:
3954 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3955 ; // no responses yet
3933 break; 3956 break;
3934#endif 3957#endif
3935 } 3958 }
3936} 3959}
3937/*----------------------------------------------------------------------*/ 3960/*----------------------------------------------------------------------*/
… …
3968 return state; 3991 return state;
3969} 3992}
3970 3993
3971/* we're not using priv _yet_ */ 3994/* we're not using priv _yet_ */
3972void 3995void
3973rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3996rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3974{ 3997{
3975 unsigned int i, j; 3998 unsigned int i, j;
3976 int state; 3999 int state;
3977 4000
3978 static const struct 4001 static const struct
… …
3989 { 5, PrivMode_rVideo }, 4012 { 5, PrivMode_rVideo },
3990 { 6, PrivMode_relOrigin }, 4013 { 6, PrivMode_relOrigin },
3991 { 7, PrivMode_Autowrap }, 4014 { 7, PrivMode_Autowrap },
3992 // 8, bi-directional support mode 4015 // 8, bi-directional support mode
3993 { 9, PrivMode_MouseX10 }, 4016 { 9, PrivMode_MouseX10 },
3994#ifdef menuBar_esc
3995 { menuBar_esc, PrivMode_menuBar },
3996#endif
3997 // 18, 19 printing-related 4017 // 18, 19 printing-related
3998 { 25, PrivMode_VisibleCursor }, 4018 { 25, PrivMode_VisibleCursor },
3999#ifdef scrollBar_esc 4019#ifdef scrollBar_esc
4000 { scrollBar_esc, PrivMode_scrollBar }, 4020 { scrollBar_esc, PrivMode_scrollBar },
4001#endif 4021#endif
… …
4048 /* extra handling for values with state unkept */ 4068 /* extra handling for values with state unkept */
4049 switch (arg[i]) 4069 switch (arg[i])
4050 { 4070 {
4051#if ENABLE_STYLES 4071#if ENABLE_STYLES
4052 case 1021: 4072 case 1021:
4053 if (mode) 4073 set_option (Opt_intensityStyles, mode);
4054 SET_OPTION (Opt_intensityStyles); 4074
4075 scr_touch (true);
4055 else 4076 break;
4056 CLR_OPTION (Opt_intensityStyles);
4057#endif 4077#endif
4058 case 1048: /* alternative cursor save */ 4078 case 1048: /* alternative cursor save */
4059 case 1049: 4079 case 1049:
4060 if (OPTION (Opt_secondaryScreen)) 4080 if (OPTION (Opt_secondaryScreen))
4061 if (mode == 0) 4081 if (mode == 0)
… …
4080 case 3: /* 80/132 */ 4100 case 3: /* 80/132 */
4081 if (priv_modes & PrivMode_132OK) 4101 if (priv_modes & PrivMode_132OK)
4082 set_widthheight (((state ? 132 : 80) * fwidth), height); 4102 set_widthheight (((state ? 132 : 80) * fwidth), height);
4083 break; 4103 break;
4084 case 4: /* smooth scrolling */ 4104 case 4: /* smooth scrolling */
4085 if (!state) 4105 set_option (Opt_jumpScroll, !state);
4086 SET_OPTION (Opt_jumpScroll);
4087 else
4088 CLR_OPTION (Opt_jumpScroll);
4089 break; 4106 break;
4090 case 5: /* reverse video */ 4107 case 5: /* reverse video */
4091 scr_rvideo_mode (state); 4108 scr_rvideo_mode (state);
4092 break; 4109 break;
4093 case 6: /* relative/absolute origins */ 4110 case 6: /* relative/absolute origins */
… …
4099 /* case 8: - auto repeat, can't do on a per window basis */ 4116 /* case 8: - auto repeat, can't do on a per window basis */
4100 case 9: /* X10 mouse reporting */ 4117 case 9: /* X10 mouse reporting */
4101 if (state) /* orthogonal */ 4118 if (state) /* orthogonal */
4102 priv_modes &= ~PrivMode_MouseX11; 4119 priv_modes &= ~PrivMode_MouseX11;
4103 break; 4120 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 4121#ifdef scrollBar_esc
4112 case scrollBar_esc: 4122 case scrollBar_esc:
4113 if (scrollbar_mapping (state)) 4123 if (scrollbar_mapping (state))
4114 { 4124 {
4115 resize_all_windows (0, 0, 0); 4125 resize_all_windows (0, 0, 0);
… …
4134#if 0 4144#if 0
4135 case 1001: 4145 case 1001:
4136 break; /* X11 mouse highlighting */ 4146 break; /* X11 mouse highlighting */
4137#endif 4147#endif
4138 case 1010: /* scroll to bottom on TTY output inhibit */ 4148 case 1010: /* scroll to bottom on TTY output inhibit */
4139 if (!state) 4149 set_option (Opt_scrollTtyOutput, !state);
4140 SET_OPTION (Opt_scrollTtyOutput);
4141 else
4142 CLR_OPTION (Opt_scrollTtyOutput);
4143 break; 4150 break;
4144 case 1011: /* scroll to bottom on key press */ 4151 case 1011: /* scroll to bottom on key press */
4145 if (state) 4152 set_option (Opt_scrollTtyKeypress, state);
4146 SET_OPTION (Opt_scrollTtyKeypress);
4147 else
4148 CLR_OPTION (Opt_scrollTtyKeypress);
4149 break; 4153 break;
4150 case 1047: /* secondary screen w/ clearing last */ 4154 case 1047: /* secondary screen w/ clearing last */
4151 if (OPTION (Opt_secondaryScreen)) 4155 if (OPTION (Opt_secondaryScreen))
4152 if (current_screen != PRIMARY) 4156 if (current_screen != PRIMARY)
4153 scr_erase_screen (2); 4157 scr_erase_screen (2);
… …
4291 scr_color (Color_bg, Color_bg); 4295 scr_color (Color_bg, Color_bg);
4292 break; 4296 break;
4293 4297
4294 //case 50: // not variable spacing 4298 //case 50: // not variable spacing
4295 4299
4296#ifndef NO_BRIGHTCOLOR 4300#if !ENABLE_MINIMAL
4297 case 90: 4301 case 90:
4298 case 91: /* set bright fg color */ 4302 case 91: /* set bright fg color */
4299 case 92: 4303 case 92:
4300 case 93: 4304 case 93:
4301 case 94: 4305 case 94:
… …
4346 */ 4350 */
4347void 4351void
4348rxvt_term::tt_printf (const char *fmt,...) 4352rxvt_term::tt_printf (const char *fmt,...)
4349{ 4353{
4350 va_list arg_ptr; 4354 va_list arg_ptr;
4351 unsigned char buf[256]; 4355 char buf[256];
4352 4356
4353 va_start (arg_ptr, fmt); 4357 va_start (arg_ptr, fmt);
4354 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4358 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4355 va_end (arg_ptr); 4359 va_end (arg_ptr);
4356 tt_write (buf, strlen (buf)); 4360 tt_write (buf, strlen (buf));
… …
4361 * or generated by us in response to a query ESC sequence. 4365 * or generated by us in response to a query ESC sequence.
4362 */ 4366 */
4363const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4367const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4364 4368
4365void 4369void
4366rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4370rxvt_term::tt_write (const char *data, unsigned int len)
4367{ 4371{
4372 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4373 return;
4374
4375 if (pty->pty < 0)
4376 return;
4377
4368 if (v_buflen == 0) 4378 if (v_buflen == 0)
4369 { 4379 {
4370 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4380 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4371 4381
4372 if ((unsigned int)written == len) 4382 if ((unsigned int)written == len)
4373 return; 4383 return;
4374 4384
4375 data += written; 4385 data += written;
4376 len -= written; 4386 len -= written;
4377 } 4387 }
4378 4388
4379 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4389 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4380 4390
4381 memcpy (v_buffer + v_buflen, data, len); 4391 memcpy (v_buffer + v_buflen, data, len);
4382 v_buflen += len; 4392 v_buflen += len;
4383 4393
4384 pty_ev.set (EVENT_READ | EVENT_WRITE); 4394 pty_ev.set (EVENT_READ | EVENT_WRITE);
4385} 4395}
4386 4396
4387void rxvt_term::pty_write () 4397void rxvt_term::pty_write ()
4388{ 4398{
4389 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4399 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4390 4400
4391 if (written > 0) 4401 if (written > 0)
4392 { 4402 {
4393 v_buflen -= written; 4403 v_buflen -= written;
4394 4404

Diff Legend

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