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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.223 by root, Sun Jan 1 05:28:28 2006 UTC vs.
Revision 1.298 by root, Tue Jan 31 18:36:35 2006 UTC

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

Diff Legend

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