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.222 by root, Sat Dec 31 19:35:56 2005 UTC vs.
Revision 1.299 by root, Tue Jan 31 19:11:43 2006 UTC

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

Diff Legend

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