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.229 by root, Tue Jan 3 17:34:44 2006 UTC vs.
Revision 1.302 by root, Tue Jan 31 21:35:39 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.
… …
49#include "rxvt.h" 49#include "rxvt.h"
50#include "rxvtperl.h" 50#include "rxvtperl.h"
51#include "version.h" 51#include "version.h"
52#include "command.h" 52#include "command.h"
53 53
54#if HAVE_SCHED_YIELD
55# include <sched.h>
56#endif
57
58#ifdef KEYSYM_RESOURCE 54#ifdef KEYSYM_RESOURCE
59# include "keyboard.h" 55# include "keyboard.h"
60#endif 56#endif
61 57
62#include <csignal> 58#include <csignal>
63 59
64/*----------------------------------------------------------------------*/ 60/*----------------------------------------------------------------------*/
65 61
66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 62#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 63
71#if ENABLE_FRILLS || ISO_14755 64#if ENABLE_FRILLS || ISO_14755
72 65
73#define ISO_14755_STARTED 0x80000000UL 66#define ISO_14755_STARTED 0x80000000UL
74#define ISO_14755_51 0x40000000UL // basic (section 5.1) 67#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
146 || !IN_RANGE_EXC (y, 0, nrow)) 139 || !IN_RANGE_EXC (y, 0, nrow))
147 return; 140 return;
148 141
149 for (;;) 142 for (;;)
150 { 143 {
151 const line_t &l = ROW(y - view_start); 144 const line_t &l = ROW(y + view_start);
152 145
153 text_t t = l.t[x]; 146 text_t t = l.t[x];
154 147
155 if (t != NOCHAR || !x) 148 if (t != NOCHAR || !x)
156 { 149 {
… …
229# if !UNICODE3 222# if !UNICODE3
230 if (ch >= 0x10000) 223 if (ch >= 0x10000)
231 ch = 0xfffd; 224 ch = 0xfffd;
232# endif 225# endif
233 scr_overlay_set (11, y, ch, r); 226 scr_overlay_set (11, y, ch, r);
227
228 if (WCWIDTH (ch) >= 2)
234 scr_overlay_set (12, y, NOCHAR, r); 229 scr_overlay_set (12, y, NOCHAR, r);
235 } 230 }
236 231
232// {
233// char buf[4+4+3+1];
234// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
235// scr_overlay_set (0, 0, buf);
236// }
237 scr_overlay_set (0, len , attr); 237 scr_overlay_set (0, len , attr);
238 scr_overlay_set (0, len + 1, fname); 238 scr_overlay_set (0, len + 1, fname);
239 239
240 free (fname); 240 free (fname);
241 241
… …
267 mb[0] = ch[0]; 267 mb[0] = ch[0];
268 len = 1; 268 len = 1;
269 } 269 }
270 270
271 if (len > 0) 271 if (len > 0)
272 tt_write ((unsigned char *)mb, len); 272 tt_write (mb, len);
273 else 273 else
274 scr_bell (); 274 scr_bell ();
275 } 275 }
276 276
277 iso14755buf = 0; 277 iso14755buf = 0;
… …
301rxvt_term::lookup_key (XKeyEvent &ev) 301rxvt_term::lookup_key (XKeyEvent &ev)
302{ 302{
303 int ctrl, meta, shft, len; 303 int ctrl, meta, shft, len;
304 unsigned int newlen; 304 unsigned int newlen;
305 KeySym keysym; 305 KeySym keysym;
306#ifdef DEBUG_CMD
307 static int debug_key = 1; /* accessible by a debugger only */
308#endif
309 int valid_keysym; 306 int valid_keysym;
310 unsigned char kbuf[KBUFSZ]; 307 char kbuf[KBUFSZ];
311 308
312 /* 309 /*
313 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 310 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
314 * escape sequence to toggle the Keypad. 311 * escape sequence to toggle the Keypad.
315 * 312 *
… …
333 Status status_return; 330 Status status_return;
334 331
335#if 0 332#if 0
336#ifdef X_HAVE_UTF8_STRING 333#ifdef X_HAVE_UTF8_STRING
337 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 334 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
338 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 335 len = Xutf8LookupString (Input_Context, &ev, kbuf,
339 KBUFSZ, &keysym, &status_return); 336 KBUFSZ, &keysym, &status_return);
340 else 337 else
341#endif 338#endif
342#endif 339#endif
343 { 340 {
… …
380 || status_return == XLookupBoth; 377 || status_return == XLookupBoth;
381 } 378 }
382 else 379 else
383#endif 380#endif
384 { 381 {
385 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 382 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
386 valid_keysym = keysym != NoSymbol; 383 valid_keysym = keysym != NoSymbol;
387 } 384 }
388 385
389 if (valid_keysym) 386 if (valid_keysym)
390 { 387 {
… …
442 scr_move_to (0, 1); 439 scr_move_to (0, 1);
443 return; 440 return;
444 } 441 }
445 else if (keysym == XK_End) 442 else if (keysym == XK_End)
446 { 443 {
447 scr_move_to (1, 0); 444 scr_move_to (1, 1);
448 return; 445 return;
449 } 446 }
450 } 447 }
451#endif 448#endif
452 } 449 }
… …
463 { 460 {
464 switch (keysym) 461 switch (keysym)
465 { 462 {
466 /* normal XTerm key bindings */ 463 /* normal XTerm key bindings */
467 case XK_Insert: /* Shift+Insert = paste mouse selection */ 464 case XK_Insert: /* Shift+Insert = paste mouse selection */
468 selection_request (ev.time, 0, 0); 465 selection_request (ev.time);
469 return; 466 return;
470#if TODO 467#if TODO
471 /* rxvt extras */ 468 /* rxvt extras */
472 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 469 case XK_KP_Add: /* Shift+KP_Add = bigger font */
473 change_font (FONT_UP); 470 change_font (FONT_UP);
… …
854 { 851 {
855#ifdef META8_OPTION 852#ifdef META8_OPTION
856 /* set 8-bit on */ 853 /* set 8-bit on */
857 if (meta && (meta_char == 0x80)) 854 if (meta && (meta_char == 0x80))
858 { 855 {
859 unsigned char *ch; 856 char *ch;
860 857
861 for (ch = kbuf; ch < kbuf + len; ch++) 858 for (ch = kbuf; ch < kbuf + len; ch++)
862 *ch |= 0x80; 859 *ch |= 0x80;
863 860
864 meta = 0; 861 meta = 0;
865 } 862 }
866#endif 863#endif
867 /* nil */ ; 864 /* nil */ ;
868 } 865 }
869 } 866 }
867
868 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
869 return;
870 870
871 if (len <= 0) 871 if (len <= 0)
872 return; /* not mapped */ 872 return; /* not mapped */
873 873
874 if (OPTION (Opt_scrollTtyKeypress)) 874 if (OPTION (Opt_scrollTtyKeypress))
… …
897#ifdef META8_OPTION 897#ifdef META8_OPTION
898 && meta_char == C0_ESC 898 && meta_char == C0_ESC
899#endif 899#endif
900 ) 900 )
901 { 901 {
902 const unsigned char ch = C0_ESC; 902 const char ch = C0_ESC;
903 tt_write (&ch, 1); 903 tt_write (&ch, 1);
904 } 904 }
905 905
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); 906 tt_write (kbuf, (unsigned int)len);
917} 907}
918/*}}} */ 908/*}}} */
919 909
920#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 910#if defined (KEYSYM_RESOURCE)
921/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
922/* attempt to `write' count to the input buffer */
923unsigned int 911unsigned int
924rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 912rxvt_term::cmd_write (const char *str, unsigned int count)
925{ 913{
926 unsigned int n, s; 914 unsigned int n, s;
927 915
928 n = cmdbuf_ptr - cmdbuf_base; 916 n = cmdbuf_ptr - cmdbuf_base;
929 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 917 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
966 } 954 }
967#endif 955#endif
968 956
969 if (want_refresh) 957 if (want_refresh)
970 { 958 {
959 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
960 {
961 int row = view_start;
962 int end_row = row + nrow;
963
964 while (row > top_row && ROW (row - 1).is_longer ())
965 --row;
966
967 do
968 {
969 int start_row = row;
970 line_t *l;
971
972 do
973 {
974 l = &ROW (row++);
975
976 if (!(l->f & LINE_FILTERED))
977 {
978 // line not filtered, mark it as filtered
979 l->f |= LINE_FILTERED;
980 while (l->is_longer ())
981 {
982 l = &ROW (row++);
983 l->f |= LINE_FILTERED;
984 }
985
986 // and filter it
987 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
988
989 break;
990 }
991 }
992 while (l->is_longer () && row < end_row);
993 }
994 while (row < end_row);
995 }
996
971 scr_refresh (refresh_type); 997 scr_refresh ();
972 scrollbar_show (1); 998 scrollbar_show (1);
973#ifdef USE_XIM 999#ifdef USE_XIM
974 IMSendSpot (); 1000 IMSendSpot ();
975#endif 1001#endif
976 } 1002 }
… …
979} 1005}
980 1006
981void 1007void
982rxvt_term::check_cb (check_watcher &w) 1008rxvt_term::check_cb (check_watcher &w)
983{ 1009{
984 SET_R (this); 1010 make_current ();
985 SET_LOCALE (locale);
986 1011
987 display->flush (); 1012 display->flush ();
988 1013
989 if (want_refresh && !flush_ev.active) 1014 if (want_refresh && !flush_ev.active)
990 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally 1015 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
991} 1016}
992 1017
993void 1018void
994rxvt_term::flush_cb (time_watcher &w) 1019rxvt_term::flush_cb (time_watcher &w)
995{ 1020{
996 SET_R (this); 1021 make_current ();
997 SET_LOCALE (locale);
998 1022
999 refresh_limit = 1; 1023 refresh_limit = 1;
1000 refresh_count = 0; 1024 refresh_count = 0;
1001 flush (); 1025 flush ();
1002} 1026}
… …
1006rxvt_term::cursor_blink_cb (time_watcher &w) 1030rxvt_term::cursor_blink_cb (time_watcher &w)
1007{ 1031{
1008 hidden_cursor = !hidden_cursor; 1032 hidden_cursor = !hidden_cursor;
1009 want_refresh = 1; 1033 want_refresh = 1;
1010 1034
1011 w.start (w.at + BLINK_INTERVAL); 1035 w.start (w.at + CURSOR_BLINK_INTERVAL);
1012} 1036}
1013#endif 1037#endif
1014 1038
1015#ifdef TEXT_BLINK 1039#ifdef TEXT_BLINK
1016void 1040void
… …
1030rxvt_term::cont_scroll_cb (time_watcher &w) 1054rxvt_term::cont_scroll_cb (time_watcher &w)
1031{ 1055{
1032 if ((scrollbar_isUp() || scrollbar_isDn()) && 1056 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1033 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1057 scr_page (scrollbar_isUp() ? UP : DN, 1))
1034 { 1058 {
1035 refresh_type |= SMOOTH_REFRESH;
1036 want_refresh = 1; 1059 want_refresh = 1;
1037 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1060 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1038 } 1061 }
1039} 1062}
1040#endif 1063#endif
… …
1044rxvt_term::sel_scroll_cb (time_watcher &w) 1067rxvt_term::sel_scroll_cb (time_watcher &w)
1045{ 1068{
1046 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1069 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1047 { 1070 {
1048 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1071 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1049 refresh_type |= SMOOTH_REFRESH;
1050 want_refresh = 1; 1072 want_refresh = 1;
1051 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1073 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1052 } 1074 }
1053} 1075}
1054#endif 1076#endif
… …
1059{ 1081{
1060 if (mouse_slip_wheel_speed == 0 1082 if (mouse_slip_wheel_speed == 0
1061 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1083 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1062 : scr_page (UP, mouse_slip_wheel_speed)) 1084 : scr_page (UP, mouse_slip_wheel_speed))
1063 { 1085 {
1064 if (view_start == nsaved || 1086 if (view_start == top_row || view_start == 0)
1065 view_start == 0)
1066 mouse_slip_wheel_speed = 0; 1087 mouse_slip_wheel_speed = 0;
1067 1088
1068 refresh_type |= SMOOTH_REFRESH;
1069 want_refresh = 1; 1089 want_refresh = 1;
1070 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1090 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1071 } 1091 }
1072} 1092}
1073#endif 1093#endif
1074 1094
1075#if HAVE_SCHED_YIELD 1095#if LINUX_YIELD_HACK
1076static struct event_handler 1096static struct event_handler
1077{ 1097{
1078 check_watcher cw_yield; 1098 check_watcher yield_ev;
1079 1099
1080 void yield (check_watcher &w) 1100 void yield_cb (check_watcher &w)
1081 { 1101 {
1082 sched_yield (); 1102 usleep (0);
1083 w.stop (); 1103 w.stop ();
1084 } 1104 }
1085 1105
1086 event_handler () 1106 event_handler ()
1087 : cw_yield (this, &event_handler::yield) 1107 : yield_ev (this, &event_handler::yield_cb)
1088 { 1108 {
1089 } 1109 }
1090} event_handler; 1110} event_handler;
1091#endif 1111#endif
1092 1112
… …
1095{ 1115{
1096 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1116 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1097 1117
1098 if (CBUFSIZ == n) 1118 if (CBUFSIZ == n)
1099 { 1119 {
1100 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1120 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1101 n = 0; 1121 n = 0;
1102 } 1122 }
1103 1123
1104 memmove (cmdbuf_base, cmdbuf_ptr, n); 1124 memmove (cmdbuf_base, cmdbuf_ptr, n);
1105 cmdbuf_ptr = cmdbuf_base; 1125 cmdbuf_ptr = cmdbuf_base;
1106 cmdbuf_endp = cmdbuf_ptr + n; 1126 cmdbuf_endp = cmdbuf_ptr + n;
1107 1127
1108 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1128 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1109 1129
1110 if (r > 0) 1130 if (r > 0)
1111 { 1131 {
1112 cmdbuf_endp += r; 1132 cmdbuf_endp += r;
1113 return true; 1133 return true;
1114 } 1134 }
1115 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1135 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1116 { 1136 {
1117#if HAVE_SCHED_YIELD 1137#if LINUX_YIELD_HACK
1118 if (display->is_local) 1138 if (display->is_local)
1119 event_handler.cw_yield.start (); 1139 event_handler.yield_ev.start ();
1120#endif 1140#endif
1121 } 1141 }
1122 else 1142 else
1123 { 1143 {
1124 pty_ev.stop (); 1144 pty_ev.stop ();
… …
1131} 1151}
1132 1152
1133void 1153void
1134rxvt_term::pty_cb (io_watcher &w, short revents) 1154rxvt_term::pty_cb (io_watcher &w, short revents)
1135{ 1155{
1136 SET_R (this); 1156 make_current ();
1137 SET_LOCALE (locale);
1138 1157
1139 if (revents & EVENT_READ) 1158 if (revents & EVENT_READ)
1140 // loop, but don't allow a single term to monopolize us 1159 // loop, but don't allow a single term to monopolize us
1141 while (pty_fill ()) 1160 while (pty_fill ())
1142 if (cmd_parse ()) 1161 if (cmd_parse ())
… …
1147} 1166}
1148 1167
1149void 1168void
1150rxvt_term::pointer_unblank () 1169rxvt_term::pointer_unblank ()
1151{ 1170{
1152 XDefineCursor (display->display, vt, TermWin_cursor); 1171 XDefineCursor (xdisp, vt, TermWin_cursor);
1153 recolour_cursor (); 1172 recolour_cursor ();
1154 1173
1155#ifdef POINTER_BLANK 1174#ifdef POINTER_BLANK
1156 hidden_pointer = 0; 1175 hidden_pointer = 0;
1157 1176
… …
1162 1181
1163#ifdef POINTER_BLANK 1182#ifdef POINTER_BLANK
1164void 1183void
1165rxvt_term::pointer_blank () 1184rxvt_term::pointer_blank ()
1166{ 1185{
1167 if (! OPTION (Opt_pointerBlank)) 1186 if (!OPTION (Opt_pointerBlank))
1168 return; 1187 return;
1169 1188
1170 XDefineCursor (display->display, vt, display->blank_cursor); 1189 XDefineCursor (xdisp, vt, display->blank_cursor);
1171 XFlush (display->display); 1190 XFlush (xdisp);
1172 1191
1173 hidden_pointer = 1; 1192 hidden_pointer = 1;
1174} 1193}
1175 1194
1176void 1195void
1177rxvt_term::pointer_cb (time_watcher &w) 1196rxvt_term::pointer_cb (time_watcher &w)
1178{ 1197{
1179 SET_R (this); 1198 make_current ();
1180 SET_LOCALE (locale);
1181 1199
1182 pointer_blank (); 1200 pointer_blank ();
1183} 1201}
1184#endif 1202#endif
1185 1203
… …
1250 (32 + button_number + key_state), 1268 (32 + button_number + key_state),
1251 (32 + x + 1), 1269 (32 + x + 1),
1252 (32 + y + 1)); 1270 (32 + y + 1));
1253} 1271}
1254 1272
1255#ifdef USING_W11LIB
1256void
1257rxvt_W11_process_x_event (XEvent *ev)
1258{
1259 rxvt_t *r = rxvt_get_r ();
1260
1261 x_cb (*ev);
1262}
1263#endif
1264
1265/*{{{ process an X event */ 1273/*{{{ process an X event */
1266void 1274void
1267rxvt_term::x_cb (XEvent &ev) 1275rxvt_term::x_cb (XEvent &ev)
1268{ 1276{
1269 dDisp; 1277 make_current ();
1270 1278
1271 SET_R (this); 1279 dLocal (Display *, xdisp);
1272 SET_LOCALE (locale);
1273 1280
1274#if defined(CURSOR_BLINK) 1281 if (ev.xany.window == vt
1275 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1282 && SHOULD_INVOKE (HOOK_X_EVENT)
1276 { 1283 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1277 if (hidden_cursor) 1284 return;
1278 {
1279 hidden_cursor = 0;
1280 want_refresh = 1;
1281 }
1282 1285
1283 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1286 // for XQueryPointer
1284 }
1285#endif
1286
1287#if defined(POINTER_BLANK)
1288 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1289 {
1290 if (ev.type == MotionNotify
1291 || ev.type == ButtonPress
1292 || ev.type == ButtonRelease)
1293 if (hidden_pointer)
1294 pointer_unblank ();
1295
1296 if (ev.type == KeyPress && hidden_pointer == 0)
1297 pointer_blank ();
1298 }
1299#endif
1300
1301 Window unused_root, unused_child; 1287 Window unused_root, unused_child;
1302 int unused_root_x, unused_root_y; 1288 int unused_root_x, unused_root_y;
1303 unsigned int unused_mask; 1289 unsigned int unused_mask;
1304 1290
1305 switch (ev.type) 1291 switch (ev.type)
… …
1312 1298
1313 break; 1299 break;
1314 1300
1315 case KeyRelease: 1301 case KeyRelease:
1316 { 1302 {
1317#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1303#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1318 KeySym ks; 1304 KeySym keysym;
1319 1305
1320 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1306 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1321#endif 1307#endif
1322 1308
1323#if ENABLE_FRILLS || ISO_14755 1309#if ENABLE_FRILLS || ISO_14755
1324 // ISO 14755 support 1310 // ISO 14755 support
1325 if (iso14755buf) 1311 if (iso14755buf)
… …
1330# endif 1316# endif
1331# if ISO_14755 1317# if ISO_14755
1332 // iso14755 part 5.2 handling: release time 1318 // iso14755 part 5.2 handling: release time
1333 // first: controls 1319 // first: controls
1334 if ((ev.xkey.state & ControlMask) 1320 if ((ev.xkey.state & ControlMask)
1335 && ((ks >= 0x40 && ks <= 0x5f) 1321 && ((keysym >= 0x40 && keysym <= 0x5f)
1336 || (ks >= 0x61 && ks <= 0x7f))) 1322 || (keysym >= 0x61 && keysym <= 0x7f)))
1337 { 1323 {
1338 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1324 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1339 commit_iso14755 (); 1325 commit_iso14755 ();
1340 return; // case-break; 1326 goto skip_switch;
1341 } 1327 }
1342 1328
1343 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1329 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1344 if (i[0] == ks) 1330 if (i[0] == keysym)
1345 { 1331 {
1346 iso14755buf = ISO_14755_51 | i[1]; 1332 iso14755buf = ISO_14755_51 | i[1];
1347 commit_iso14755 (); 1333 commit_iso14755 ();
1348 return; // case-break; 1334 goto skip_switch;
1349 } 1335 }
1350 1336
1351 scr_bell (); 1337 scr_bell ();
1352# endif 1338# endif
1353 iso14755buf = 0; 1339 iso14755buf = 0;
… …
1372 else 1358 else
1373 iso14755buf = 0; 1359 iso14755buf = 0;
1374 } 1360 }
1375#endif 1361#endif
1376 1362
1363 if (ev.xany.window == vt
1364 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1365 break;
1366
1377#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1367#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1378 if (!(ev.xkey.state & ControlMask)) 1368 if (!(ev.xkey.state & ControlMask))
1379 slip_wheel_ev.stop (); 1369 slip_wheel_ev.stop ();
1380 else if (ks == XK_Control_L || ks == XK_Control_R) 1370 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1381 mouse_slip_wheel_speed = 0; 1371 mouse_slip_wheel_speed = 0;
1382#endif 1372#endif
1383 break; 1373 break;
1384 } 1374 }
1385 1375
… …
1391 button_release (ev.xbutton); 1381 button_release (ev.xbutton);
1392 break; 1382 break;
1393 1383
1394 case ClientMessage: 1384 case ClientMessage:
1395 if (ev.xclient.format == 32 1385 if (ev.xclient.format == 32
1396 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1386 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1397 { 1387 {
1388 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1389 {
1390 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1391 {
1398 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1392 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1393 {
1394 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1399 destroy (); 1395 destroy ();
1396 }
1400#if ENABLE_EWMH 1397#if ENABLE_EWMH
1401 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1398 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1402 XSendEvent (disp, ev.xclient.window = display->root, 1399 XSendEvent (xdisp, ev.xclient.window = display->root,
1403 False, SubstructureRedirectMask | SubstructureNotifyMask, 1400 False, SubstructureRedirectMask | SubstructureNotifyMask,
1404 &ev); 1401 &ev);
1402#endif
1403 }
1404 }
1405#if ENABLE_XEMBED
1406 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1407 {
1408 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1409 focus_in ();
1410 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1411 focus_out ();
1412 }
1405#endif 1413#endif
1406 } 1414 }
1407#if ENABLE_XEMBED
1408 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1409 {
1410 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1411 focus_in ();
1412 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1413 focus_out ();
1414 }
1415#endif
1416#ifdef OFFIX_DND
1417 /* OffiX Dnd (drag 'n' drop) protocol */
1418 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1419 && (ev.xclient.data.l[0] == DndFile
1420 || ev.xclient.data.l[0] == DndDir
1421 || ev.xclient.data.l[0] == DndLink))
1422 {
1423 /* Get Dnd data */
1424 Atom ActualType;
1425 int ActualFormat;
1426 unsigned char *data;
1427 unsigned long Size, RemainingBytes;
1428
1429 XGetWindowProperty (disp, display->root,
1430 xa[XA_DNDSELECTION],
1431 0L, 1000000L,
1432 False, AnyPropertyType,
1433 &ActualType, &ActualFormat,
1434 &Size, &RemainingBytes,
1435 &data);
1436 set_string_property (XA_CUT_BUFFER0, data);
1437 XFree (data);
1438 selection_paste (display->root, XA_CUT_BUFFER0, true);
1439 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1440 }
1441#endif /* OFFIX_DND */
1442 break; 1415 break;
1443 1416
1444 case MappingNotify: 1417 case MappingNotify:
1445 XRefreshKeyboardMapping (&ev.xmapping); 1418 XRefreshKeyboardMapping (&ev.xmapping);
1446 break; 1419 break;
… …
1479 break; 1452 break;
1480 1453
1481 case ConfigureNotify: 1454 case ConfigureNotify:
1482 if (ev.xconfigure.window == parent[0]) 1455 if (ev.xconfigure.window == parent[0])
1483 { 1456 {
1484 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1457 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1485 ; 1458 ;
1486 1459
1487 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1460 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1488 { 1461 {
1489 seen_resize = 1; 1462 seen_resize = 1;
1490 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1463 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1491 } 1464 }
1492 1465
1466 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1467
1493#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1468#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1494 if (OPTION (Opt_transparent)) 1469 if (OPTION (Opt_transparent))
1495 check_our_parents (); 1470 check_our_parents ();
1496#endif 1471#endif
1497 } 1472 }
1498 break; 1473 break;
1499 1474
1500 case PropertyNotify: 1475 case PropertyNotify:
1476 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1501 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1477 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1502 && ev.xproperty.state == PropertyNewValue) 1478 && ev.xproperty.state == PropertyNewValue)
1503 selection_property (ev.xproperty.window, ev.xproperty.atom); 1479 selection_property (ev.xproperty.window, ev.xproperty.atom);
1504 1480
1505 break; 1481 break;
1506 1482
1507 case SelectionClear: 1483 case SelectionClear:
1508 selection_clear (); 1484 selection_clear ();
… …
1513 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1489 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1514 break; 1490 break;
1515 1491
1516 case SelectionRequest: 1492 case SelectionRequest:
1517 selection_send (ev.xselectionrequest); 1493 selection_send (ev.xselectionrequest);
1494 break;
1495
1496 case MapNotify:
1497 mapped = 1;
1498#ifdef TEXT_BLINK
1499 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1500#endif
1501 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1518 break; 1502 break;
1519 1503
1520 case UnmapNotify: 1504 case UnmapNotify:
1521 mapped = 0; 1505 mapped = 0;
1522#ifdef TEXT_BLINK 1506#ifdef TEXT_BLINK
1523 text_blink_ev.stop (); 1507 text_blink_ev.stop ();
1524#endif 1508#endif
1525 break; 1509 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1526
1527 case MapNotify:
1528 mapped = 1;
1529#ifdef TEXT_BLINK
1530 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1531#endif
1532 break; 1510 break;
1533 1511
1534#ifdef TRANSPARENT 1512#ifdef TRANSPARENT
1535 case ReparentNotify: 1513 case ReparentNotify:
1536 rootwin_cb (ev); 1514 rootwin_cb (ev);
… …
1542 if (ev.xany.window == vt) 1520 if (ev.xany.window == vt)
1543 { 1521 {
1544 do 1522 do
1545 scr_expose (ev.xexpose.x, ev.xexpose.y, 1523 scr_expose (ev.xexpose.x, ev.xexpose.y,
1546 ev.xexpose.width, ev.xexpose.height, False); 1524 ev.xexpose.width, ev.xexpose.height, False);
1547 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1525 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1548 1526
1549 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1527 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1550 1528
1551 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1529 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1552 scr_expose (ev.xexpose.x, ev.xexpose.y, 1530 scr_expose (ev.xexpose.x, ev.xexpose.y,
1553 ev.xexpose.width, ev.xexpose.height, False); 1531 ev.xexpose.width, ev.xexpose.height, False);
1554 1532
1555 scr_refresh (refresh_type); 1533 want_refresh = 1;
1556 } 1534 }
1557 else 1535 else
1558 { 1536 {
1559 XEvent unused_event; 1537 XEvent unused_event;
1560 1538
1561 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1539 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1562 ; 1540 ;
1563 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1541 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1564 ; 1542 ;
1565 1543
1566 if (isScrollbarWindow (ev.xany.window)) 1544 if (isScrollbarWindow (ev.xany.window))
1567 { 1545 {
1568 scrollBar.setIdle (); 1546 scrollBar.setIdle ();
1569 scrollbar_show (0); 1547 scrollbar_show (0);
1570 } 1548 }
1571#ifdef MENUBAR
1572 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1573 menubar_expose ();
1574#endif
1575 1549
1576#ifdef TRANSPARENT 1550#ifdef TRANSPARENT
1577 if (am_transparent && ev.xany.window == parent[0]) 1551 if (am_transparent && ev.xany.window == parent[0])
1578 XClearWindow (disp, ev.xany.window); 1552 XClearWindow (xdisp, ev.xany.window);
1579#endif 1553#endif
1580 } 1554 }
1581 break; 1555 break;
1582 1556
1583 case MotionNotify: 1557 case MotionNotify:
1584#ifdef POINTER_BLANK 1558#ifdef POINTER_BLANK
1585 if (hidden_pointer) 1559 if (hidden_pointer)
1586 pointer_unblank (); 1560 pointer_unblank ();
1587#endif 1561#endif
1588#if MENUBAR
1589 if (isMenuBarWindow (ev.xany.window))
1590 {
1591 menubar_control (ev.xbutton);
1592 break;
1593 }
1594#endif
1595 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1562 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1596 break; 1563 break;
1597 1564
1598 if (ev.xany.window == vt) 1565 if (ev.xany.window == vt)
1599 { 1566 {
1567 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1568 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1569 ; // nop
1600 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1570 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1601 { 1571 {
1602 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1572 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1603 ; 1573 ;
1604 1574
1605 XQueryPointer (disp, vt, 1575 XQueryPointer (xdisp, vt,
1606 &unused_root, &unused_child, 1576 &unused_root, &unused_child,
1607 &unused_root_x, &unused_root_y, 1577 &unused_root_x, &unused_root_y,
1608 &ev.xbutton.x, &ev.xbutton.y, 1578 &ev.xbutton.x, &ev.xbutton.y,
1609 &ev.xbutton.state); 1579 &ev.xbutton.state);
1610#ifdef MOUSE_THRESHOLD 1580#ifdef MOUSE_THRESHOLD
… …
1674#endif 1644#endif
1675 } 1645 }
1676 } 1646 }
1677 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1647 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1678 { 1648 {
1679 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1649 while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1680 MotionNotify, &ev)) 1650 MotionNotify, &ev))
1681 ; 1651 ;
1682 1652
1683 XQueryPointer (disp, scrollBar.win, 1653 XQueryPointer (xdisp, scrollBar.win,
1684 &unused_root, &unused_child, 1654 &unused_root, &unused_child,
1685 &unused_root_x, &unused_root_y, 1655 &unused_root_x, &unused_root_y,
1686 &ev.xbutton.x, &ev.xbutton.y, 1656 &ev.xbutton.x, &ev.xbutton.y,
1687 &unused_mask); 1657 &unused_mask);
1688 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1658 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1689 scrollbar_size ()); 1659 scrollbar_size ());
1690 scr_refresh (refresh_type); 1660 want_refresh = 1;
1691 refresh_limit = 0; 1661 refresh_limit = 0;
1692 scrollbar_show (1); 1662 scrollbar_show (1);
1693 } 1663 }
1694 break; 1664 break;
1695 } 1665 }
1666
1667skip_switch: ;
1668
1669#if defined(CURSOR_BLINK)
1670 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1671 {
1672 if (hidden_cursor)
1673 {
1674 hidden_cursor = 0;
1675 want_refresh = 1;
1676 }
1677
1678 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1679 }
1680#endif
1681
1682#if defined(POINTER_BLANK)
1683 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1684 {
1685 if (ev.type == MotionNotify
1686 || ev.type == ButtonPress
1687 || ev.type == ButtonRelease)
1688 if (hidden_pointer)
1689 pointer_unblank ();
1690
1691 if (ev.type == KeyPress && hidden_pointer == 0)
1692 pointer_blank ();
1693 }
1694#endif
1696} 1695}
1697 1696
1698void 1697void
1699rxvt_term::focus_in () 1698rxvt_term::focus_in ()
1700{ 1699{
1701 if (!focus) 1700 if (!focus)
1702 { 1701 {
1703 focus = 1; 1702 focus = 1;
1704 want_refresh = 1; 1703 want_refresh = 1;
1705 1704
1706 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1705 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1707 1706
1708#if USE_XIM 1707#if USE_XIM
1709 if (Input_Context != NULL) 1708 if (Input_Context != NULL)
1710 { 1709 {
1711 IMSetStatusPosition (); 1710 IMSetStatusPosition ();
1712 XSetICFocus (Input_Context); 1711 XSetICFocus (Input_Context);
1713 } 1712 }
1714#endif 1713#endif
1715#if CURSOR_BLINK 1714#if CURSOR_BLINK
1716 if (OPTION (Opt_cursorBlink)) 1715 if (OPTION (Opt_cursorBlink))
1717 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1716 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1718#endif 1717#endif
1719#if OFF_FOCUS_FADING 1718#if OFF_FOCUS_FADING
1720 if (rs[Rs_fade]) 1719 if (rs[Rs_fade])
1721 { 1720 {
1722 pix_colors = pix_colors_focused; 1721 pix_colors = pix_colors_focused;
… …
1732 if (focus) 1731 if (focus)
1733 { 1732 {
1734 focus = 0; 1733 focus = 0;
1735 want_refresh = 1; 1734 want_refresh = 1;
1736 1735
1737 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1736 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1738 1737
1739#if ENABLE_FRILLS || ISO_14755 1738#if ENABLE_FRILLS || ISO_14755
1740 if (iso14755buf) 1739 if (iso14755buf)
1741 { 1740 {
1742 iso14755buf = 0; 1741 iso14755buf = 0;
… …
1766 1765
1767#if TRANSPARENT 1766#if TRANSPARENT
1768void 1767void
1769rxvt_term::rootwin_cb (XEvent &ev) 1768rxvt_term::rootwin_cb (XEvent &ev)
1770{ 1769{
1771 SET_R (this); 1770 make_current ();
1772 SET_LOCALE (locale);
1773 1771
1774 switch (ev.type) 1772 switch (ev.type)
1775 { 1773 {
1776 case PropertyNotify: 1774 case PropertyNotify:
1777 /* 1775 /*
… …
1804 /* 1802 /*
1805 * VT window processing of button press 1803 * VT window processing of button press
1806 */ 1804 */
1807 if (ev.window == vt) 1805 if (ev.window == vt)
1808 { 1806 {
1807 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1808 return;
1809
1809#if ISO_14755 1810#if ISO_14755
1810 // 5.4 1811 // 5.4
1811 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1812 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1812 { 1813 {
1813 iso14755_54 (ev.x, ev.y); 1814 iso14755_54 (ev.x, ev.y);
… …
1825#ifdef MOUSE_REPORT_DOUBLECLICK 1826#ifdef MOUSE_REPORT_DOUBLECLICK
1826 if (ev.button == MEvent.button && clickintime) 1827 if (ev.button == MEvent.button && clickintime)
1827 { 1828 {
1828 /* same button, within alloted time */ 1829 /* same button, within alloted time */
1829 MEvent.clicks++; 1830 MEvent.clicks++;
1831
1830 if (MEvent.clicks > 1) 1832 if (MEvent.clicks > 1)
1831 { 1833 {
1832 /* only report double clicks */ 1834 /* only report double clicks */
1833 MEvent.clicks = 2; 1835 MEvent.clicks = 2;
1834 mouse_report (ev); 1836 mouse_report (ev);
… …
1854 else 1856 else
1855 { 1857 {
1856 if (ev.button != MEvent.button) 1858 if (ev.button != MEvent.button)
1857 MEvent.clicks = 0; 1859 MEvent.clicks = 0;
1858 1860
1859 if (!PERL_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END)))
1860 switch (ev.button) 1861 switch (ev.button)
1861 { 1862 {
1862 case Button1: 1863 case Button1:
1863 /* allow meta + click to select rectangular areas */ 1864 /* allow meta + click to select rectangular areas */
1864 /* should be done in screen.C */ 1865 /* should be done in screen.C */
1865#if ENABLE_FRILLS 1866#if ENABLE_FRILLS
1866 selection.rect = !!(ev.state & ModMetaMask); 1867 selection.rect = !!(ev.state & ModMetaMask);
1867#else 1868#else
1868 selection.rect = false; 1869 selection.rect = false;
1869#endif 1870#endif
1870 1871
1871 /* allow shift+left click to extend selection */ 1872 /* allow shift+left click to extend selection */
1872 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1873 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1873 { 1874 {
1874 if (MEvent.button == Button1 && clickintime) 1875 if (MEvent.button == Button1 && clickintime)
1875 selection_rotate (ev.x, ev.y); 1876 selection_rotate (ev.x, ev.y);
1876 else 1877 else
1877 selection_extend (ev.x, ev.y, 1); 1878 selection_extend (ev.x, ev.y, 1);
1878 } 1879 }
1879 else 1880 else
1880 { 1881 {
1881 if (MEvent.button == Button1 && clickintime) 1882 if (MEvent.button == Button1 && clickintime)
1882 MEvent.clicks++; 1883 MEvent.clicks++;
1883 else 1884 else
1884 MEvent.clicks = 1; 1885 MEvent.clicks = 1;
1885 1886
1886 selection_click (MEvent.clicks, ev.x, ev.y); 1887 selection_click (MEvent.clicks, ev.x, ev.y);
1887 } 1888 }
1888 1889
1889 MEvent.button = Button1; 1890 MEvent.button = Button1;
1890 break; 1891 break;
1891 1892
1892 case Button3: 1893 case Button3:
1893 if (MEvent.button == Button3 && clickintime) 1894 if (MEvent.button == Button3 && clickintime)
1894 selection_rotate (ev.x, ev.y); 1895 selection_rotate (ev.x, ev.y);
1895 else 1896 else
1896 selection_extend (ev.x, ev.y, 1); 1897 selection_extend (ev.x, ev.y, 1);
1897 1898
1898 MEvent.button = Button3; 1899 MEvent.button = Button3;
1899 break; 1900 break;
1900 } 1901 }
1901 } 1902 }
1902 1903
1903 MEvent.time = ev.time; 1904 MEvent.time = ev.time;
1904 return; 1905 return;
1905 } 1906 }
1906 1907
… …
2042 } 2043 }
2043 2044
2044 break; 2045 break;
2045 } 2046 }
2046 } 2047 }
2048
2047 return; 2049 return;
2048 } 2050 }
2049#if MENUBAR
2050 /*
2051 * Menubar window processing of button press
2052 */
2053 if (isMenuBarWindow (ev.window))
2054 menubar_control (ev);
2055#endif
2056} 2051}
2057 2052
2058void 2053void
2059rxvt_term::button_release (XButtonEvent &ev) 2054rxvt_term::button_release (XButtonEvent &ev)
2060{ 2055{
… …
2066 2061
2067 if (scrollbar_isUpDn ()) 2062 if (scrollbar_isUpDn ())
2068 { 2063 {
2069 scrollBar.setIdle (); 2064 scrollBar.setIdle ();
2070 scrollbar_show (0); 2065 scrollbar_show (0);
2071#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2072 refresh_type &= ~SMOOTH_REFRESH;
2073#endif
2074 } 2066 }
2075 2067
2076#ifdef SELECTION_SCROLLING 2068#ifdef SELECTION_SCROLLING
2077 if (sel_scroll_ev.active) 2069 if (sel_scroll_ev.active)
2078 sel_scroll_ev.stop(); 2070 sel_scroll_ev.stop();
2079#endif 2071#endif
2080 2072
2081 if (ev.window == vt) 2073 if (ev.window == vt)
2082 { 2074 {
2075 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2076 return;
2077
2083#if ISO_14755 2078#if ISO_14755
2084 // 5.4 2079 // 5.4
2085 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2080 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2086 return; 2081 return;
2087#endif 2082#endif
2083
2088 if (reportmode) 2084 if (reportmode)
2089 { 2085 {
2090 /* mouse report from vt window */ 2086 /* mouse report from vt window */
2091 /* don't report release of wheel "buttons" */ 2087 /* don't report release of wheel "buttons" */
2092 if (ev.button >= 4) 2088 if (ev.button >= 4)
… …
2122 { 2118 {
2123 case Button1: 2119 case Button1:
2124 case Button3: 2120 case Button3:
2125 selection_make (ev.time); 2121 selection_make (ev.time);
2126 break; 2122 break;
2123
2127 case Button2: 2124 case Button2:
2128 selection_request (ev.time, ev.x, ev.y); 2125 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2126 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2129 break; 2127 break;
2128
2130#ifdef MOUSE_WHEEL 2129#ifdef MOUSE_WHEEL
2131 case Button4: 2130 case Button4:
2132 case Button5: 2131 case Button5:
2133 { 2132 {
2134 int i; 2133 int i;
… …
2156 slip_wheel_ev.start (); 2155 slip_wheel_ev.start ();
2157 } 2156 }
2158 else 2157 else
2159 { 2158 {
2160# endif 2159# endif
2161# ifdef JUMP_MOUSE_WHEEL
2162 scr_page (v, i); 2160 scr_page (v, i);
2163 scr_refresh (SMOOTH_REFRESH);
2164 scrollbar_show (1); 2161 scrollbar_show (1);
2165# else
2166 while (i--)
2167 {
2168 scr_page (v, 1);
2169 scr_refresh (SMOOTH_REFRESH);
2170 scrollbar_show (1);
2171 }
2172# endif
2173# ifdef MOUSE_SLIP_WHEELING 2162# ifdef MOUSE_SLIP_WHEELING
2174 } 2163 }
2175#endif 2164# endif
2176 } 2165 }
2177 break; 2166 break;
2178#endif 2167#endif
2179 } 2168 }
2180 } 2169 }
2181#ifdef MENUBAR
2182 else if (isMenuBarWindow (ev.window))
2183 menubar_control (ev);
2184#endif
2185} 2170}
2186 2171
2187#ifdef TRANSPARENT 2172#ifdef TRANSPARENT
2188#if TINTING 2173#if TINTING
2189/* taken from aterm-0.4.2 */ 2174/* taken from aterm-0.4.2 */
2190 2175
2191typedef uint32_t RUINT32T; 2176typedef uint32_t RUINT32T;
2192 2177
2193void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2178void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2194{ 2179{
2195 int sh_r, sh_g, sh_b; 2180 int sh_r, sh_g, sh_b;
2196 RUINT32T mask_r, mask_g, mask_b; 2181 RUINT32T mask_r, mask_g, mask_b;
2197 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2182 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2198 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2183 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2199 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2184 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2200 int i; 2185 int i;
2201 2186
2202 Visual *visual = display->visual; 2187 Visual *visual = term->visual;
2203 2188
2204 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2189 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2205 2190
2206 /* for convenience */ 2191 /* for convenience */
2207 mask_r = visual->red_mask; 2192 mask_r = visual->red_mask;
… …
2428 Atom atype; 2413 Atom atype;
2429 unsigned char *prop = NULL; 2414 unsigned char *prop = NULL;
2430 Window root, oldp, *list; 2415 Window root, oldp, *list;
2431 Pixmap rootpixmap = None; 2416 Pixmap rootpixmap = None;
2432 XWindowAttributes wattr, wrootattr; 2417 XWindowAttributes wattr, wrootattr;
2433 dDisp;
2434 2418
2435 pchanged = 0; 2419 pchanged = 0;
2436 2420
2437 if (!OPTION (Opt_transparent)) 2421 if (!OPTION (Opt_transparent))
2438 return pchanged; /* Don't try any more */ 2422 return pchanged; /* Don't try any more */
2439 2423
2440 XGetWindowAttributes (disp, display->root, &wrootattr); 2424 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2441 rootdepth = wrootattr.depth; 2425 rootdepth = wrootattr.depth;
2442 2426
2443 XGetWindowAttributes (disp, parent[0], &wattr); 2427 XGetWindowAttributes (xdisp, parent[0], &wattr);
2444 2428
2445 if (rootdepth != wattr.depth) 2429 if (rootdepth != wattr.depth)
2446 { 2430 {
2447 if (am_transparent) 2431 if (am_transparent)
2448 { 2432 {
2449 pchanged = 1; 2433 pchanged = 1;
2450 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2434 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2451 am_transparent = am_pixmap_trans = 0; 2435 am_transparent = am_pixmap_trans = 0;
2452 } 2436 }
2453 2437
2454 return pchanged; /* Don't try any more */ 2438 return pchanged; /* Don't try any more */
2455 } 2439 }
2456 2440
2457 /* Get all X ops out of the queue so that our information is up-to-date. */ 2441 /* Get all X ops out of the queue so that our information is up-to-date. */
2458 XSync (disp, False); 2442 XSync (xdisp, False);
2459 2443
2460 /* 2444 /*
2461 * Make the frame window set by the window manager have 2445 * Make the frame window set by the window manager have
2462 * the root background. Some window managers put multiple nested frame 2446 * the root background. Some window managers put multiple nested frame
2463 * windows for each client, so we have to take care about that. 2447 * windows for each client, so we have to take care about that.
2464 */ 2448 */
2465 i = (xa[XA_XROOTPMAP_ID] 2449 i = (xa[XA_XROOTPMAP_ID]
2466 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2450 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2467 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2451 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2468 &nitems, &bytes_after, &prop) == Success); 2452 &nitems, &bytes_after, &prop) == Success);
2469 2453
2470 if (!i || prop == NULL) 2454 if (!i || prop == NULL)
2471 i = (xa[XA_ESETROOT_PMAP_ID] 2455 i = (xa[XA_ESETROOT_PMAP_ID]
2472 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2456 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2473 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2457 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2474 &nitems, &bytes_after, &prop) == Success); 2458 &nitems, &bytes_after, &prop) == Success);
2475 2459
2476 if (!i || prop == NULL 2460 if (!i || prop == NULL
2477#if TINTING 2461#if TINTING
2478 || !rs[Rs_color + Color_tint] 2462 || !ISSET_PIXCOLOR (Color_tint)
2479#endif 2463#endif
2480 ) 2464 )
2481 have_pixmap = 0; 2465 have_pixmap = 0;
2482 else 2466 else
2483 { 2467 {
… …
2496 Window cr; 2480 Window cr;
2497 XImage *image; 2481 XImage *image;
2498 GC gc; 2482 GC gc;
2499 XGCValues gcvalue; 2483 XGCValues gcvalue;
2500 2484
2501 XTranslateCoordinates (disp, parent[0], display->root, 2485 XTranslateCoordinates (xdisp, parent[0], display->root,
2502 0, 0, &sx, &sy, &cr); 2486 0, 0, &sx, &sy, &cr);
2503 nw = (unsigned int)szHint.width; 2487 nw = (unsigned int)szHint.width;
2504 nh = (unsigned int)szHint.height; 2488 nh = (unsigned int)szHint.height;
2505 nx = ny = 0; 2489 nx = ny = 0;
2506 2490
… …
2519 } 2503 }
2520 2504
2521 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2505 min_it (nw, (unsigned int) (wrootattr.width - sx));
2522 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2506 min_it (nh, (unsigned int) (wrootattr.height - sy));
2523 2507
2524 XSync (disp, False); 2508 XSync (xdisp, False);
2525 allowedxerror = -1; 2509 allowedxerror = -1;
2526 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2510 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2527 2511
2528 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2512 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2529 /* XXX: may need a delay here? */ 2513 /* XXX: may need a delay here? */
2530 allowedxerror = 0; 2514 allowedxerror = 0;
2531 2515
… …
2534 if (am_transparent && am_pixmap_trans) 2518 if (am_transparent && am_pixmap_trans)
2535 { 2519 {
2536 pchanged = 1; 2520 pchanged = 1;
2537 if (pixmap != None) 2521 if (pixmap != None)
2538 { 2522 {
2539 XFreePixmap (disp, pixmap); 2523 XFreePixmap (xdisp, pixmap);
2540 pixmap = None; 2524 pixmap = None;
2541 } 2525 }
2542 } 2526 }
2543 2527
2544 am_pixmap_trans = 0; 2528 am_pixmap_trans = 0;
2545 } 2529 }
2546 else 2530 else
2547 { 2531 {
2548 if (pixmap != None) 2532 if (pixmap != None)
2549 XFreePixmap (disp, pixmap); 2533 XFreePixmap (xdisp, pixmap);
2550 2534
2551#if TINTING 2535#if TINTING
2552 if (ISSET_PIXCOLOR (Color_tint)) 2536 if (ISSET_PIXCOLOR (Color_tint))
2553 { 2537 {
2554 unsigned short rm, gm, bm;
2555 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2538 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2556 2539
2540 rgba c;
2557 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2541 pix_colors_focused [Color_tint].get (c);
2558 2542
2559 ShadeXImage (display, image, shade, rm, gm, bm); 2543 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2560 } 2544 }
2561#endif 2545#endif
2562 2546
2563 pixmap = XCreatePixmap (disp, vt, 2547 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2564 szHint.width, szHint.height, image->depth);
2565 gc = XCreateGC (disp, vt, 0UL, &gcvalue); 2548 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2566 XPutImage (disp, pixmap, gc, image, 0, 0, 2549 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2567 nx, ny, image->width, image->height); 2550 nx, ny, image->width, image->height);
2568 XFreeGC (disp, gc); 2551 XFreeGC (xdisp, gc);
2569 XDestroyImage (image); 2552 XDestroyImage (image);
2570 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2553 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2571 XClearWindow (disp, parent[0]); 2554 XClearWindow (xdisp, parent[0]);
2572 2555
2573 if (!am_transparent || !am_pixmap_trans) 2556 if (!am_transparent || !am_pixmap_trans)
2574 pchanged = 1; 2557 pchanged = 1;
2575 2558
2576 am_transparent = am_pixmap_trans = 1; 2559 am_transparent = am_pixmap_trans = 1;
2577 } 2560 }
2578 } 2561 }
2579 2562
2580 if (am_pixmap_trans) 2563 if (am_pixmap_trans)
2581 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2564 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2582 else 2565 else
2583 { 2566 {
2584 unsigned int n; 2567 unsigned int n;
2585 /* 2568 /*
2586 * InheritPixmap transparency 2569 * InheritPixmap transparency
2587 */ 2570 */
2588 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2571 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2589 { 2572 {
2590 oldp = parent[i]; 2573 oldp = parent[i];
2591 XQueryTree (disp, parent[i - 1], &root, 2574 XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2592 &parent[i], &list, &n);
2593 XFree (list); 2575 XFree (list);
2594 2576
2595 if (parent[i] == display->root) 2577 if (parent[i] == display->root)
2596 { 2578 {
2597 if (oldp != None) 2579 if (oldp != None)
… …
2605 } 2587 }
2606 2588
2607 n = 0; 2589 n = 0;
2608 2590
2609 if (pchanged) 2591 if (pchanged)
2610 {
2611 for (; n < (unsigned int)i; n++) 2592 for (; n < (unsigned int)i; n++)
2612 { 2593 {
2613 XGetWindowAttributes (disp, parent[n], &wattr); 2594 XGetWindowAttributes (xdisp, parent[n], &wattr);
2595
2614 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2596 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2615 { 2597 {
2616 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2598 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2617 break; 2599 break;
2618 } 2600 }
2619 } 2601 }
2620 }
2621 2602
2622 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2603 if (n > (sizeof (parent) / sizeof (parent[0])))
2623 { 2604 {
2624 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2605 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2625 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2606 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2626 am_transparent = 0; 2607 am_transparent = 0;
2627 /* XXX: also turn off Opt_transparent? */ 2608 /* XXX: also turn off Opt_transparent? */
2628 } 2609 }
2629 else 2610 else
2630 { 2611 {
2631#if WAIT_FOR_WM
2632 /* wait (an arbitrary period) for the WM to do its thing
2633 * needed for fvwm2.2.2 (and before?) */
2634 sleep (1);
2635#endif
2636 for (n = 0; n < (unsigned int)i; n++) 2612 for (n = 0; n < (unsigned int)i; n++)
2637 { 2613 {
2638 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2614 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2639 XClearWindow (disp, parent[n]); 2615 XClearWindow (xdisp, parent[n]);
2640 } 2616 }
2641 2617
2642 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2618 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2643 am_transparent = 1; 2619 am_transparent = 1;
2644 } 2620 }
2645 2621
2646 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2622 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2647 parent[i] = None; 2623 parent[i] = None;
2648 } 2624 }
2649 2625
2650 if (scrollBar.win) 2626 if (scrollBar.win)
2651 { 2627 {
2652 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2628 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2653 scrollBar.setIdle (); 2629 scrollBar.setIdle ();
2654 scrollbar_show (0); 2630 scrollbar_show (0);
2655 } 2631 }
2656 2632
2657 if (am_transparent) 2633 if (am_transparent)
… …
2669 2645
2670bool 2646bool
2671rxvt_term::cmd_parse () 2647rxvt_term::cmd_parse ()
2672{ 2648{
2673 bool flag = false; 2649 bool flag = false;
2674 unicode_t ch = NOCHAR; 2650 wchar_t ch = NOCHAR;
2675 unsigned char *seq_begin; // remember start of esc-sequence here 2651 char *seq_begin; // remember start of esc-sequence here
2676 2652
2677 for (;;) 2653 for (;;)
2678 { 2654 {
2679 if (ch == NOCHAR) 2655 if (ch == NOCHAR)
2680 { 2656 {
2681 seq_begin = cmdbuf_ptr; 2657 seq_begin = cmdbuf_ptr;
2682 ch = next_char (); 2658 ch = next_char ();
2683 }
2684 2659
2685 if (ch == NOCHAR) // TODO: improve 2660 if (ch == NOCHAR)
2686 break; 2661 break;
2662 }
2687 2663
2688 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2664 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2689 { 2665 {
2690 if (!seen_input) 2666 if (!seen_input)
2691 { 2667 {
… …
2700 if (seen_resize && cmd_pid) 2676 if (seen_resize && cmd_pid)
2701 kill (-cmd_pid, SIGWINCH); 2677 kill (-cmd_pid, SIGWINCH);
2702 } 2678 }
2703 2679
2704 /* Read a text string from the input buffer */ 2680 /* Read a text string from the input buffer */
2705 unicode_t buf[UBUFSIZ]; 2681 wchar_t buf[UBUFSIZ];
2706 bool refreshnow = false; 2682 bool refreshnow = false;
2707 int nlines = 0; 2683 int nlines = 0;
2708 unicode_t *str = buf; 2684 wchar_t *str = buf;
2709 unicode_t *eol = str + min (ncol, UBUFSIZ); 2685 wchar_t *eol = str + min (ncol, UBUFSIZ);
2710 2686
2711 for (;;) 2687 for (;;)
2712 { 2688 {
2713 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2689 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2714 break; 2690 break;
… …
2732 } 2708 }
2733 2709
2734 // scr_add_lines only works for nlines <= nrow - 1. 2710 // scr_add_lines only works for nlines <= nrow - 1.
2735 if (nlines >= nrow - 1) 2711 if (nlines >= nrow - 1)
2736 { 2712 {
2713 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2714 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2737 scr_add_lines (buf, nlines, str - buf); 2715 scr_add_lines (buf, str - buf, nlines);
2716
2738 nlines = 0; 2717 nlines = 0;
2739 str = buf; 2718 str = buf;
2740 eol = str + min (ncol, UBUFSIZ); 2719 eol = str + min (ncol, UBUFSIZ);
2741 } 2720 }
2742 2721
… …
2755 2734
2756 seq_begin = cmdbuf_ptr; 2735 seq_begin = cmdbuf_ptr;
2757 ch = next_char (); 2736 ch = next_char ();
2758 } 2737 }
2759 2738
2739 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2740 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2760 scr_add_lines (buf, nlines, str - buf); 2741 scr_add_lines (buf, str - buf, nlines);
2761 2742
2762 /* 2743 /*
2763 * If there have been a lot of new lines, then update the screen 2744 * If there have been a lot of new lines, then update the screen
2764 * What the heck I'll cheat and only refresh less than every page-full. 2745 * What the heck I'll cheat and only refresh less than every page-full.
2765 * the number of pages between refreshes is refresh_limit, which 2746 * the number of pages between refreshes is refresh_limit, which
… …
2770 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2751 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2771 refresh_limit++; 2752 refresh_limit++;
2772 else 2753 else
2773 { 2754 {
2774 flag = true; 2755 flag = true;
2775 scr_refresh (refresh_type); 2756 scr_refresh ();
2776 flush_ev.stop (); 2757 want_refresh = 1;
2777 } 2758 }
2778 } 2759 }
2779 2760
2780 } 2761 }
2781 else 2762 else
… …
2796 } 2777 }
2797 2778
2798 return flag; 2779 return flag;
2799} 2780}
2800 2781
2801// read the next octet
2802unicode_t
2803rxvt_term::next_octet ()
2804{
2805 return cmdbuf_ptr < cmdbuf_endp
2806 ? *cmdbuf_ptr++
2807 : NOCHAR;
2808}
2809
2810// read the next character 2782// read the next character
2811unicode_t 2783wchar_t
2812rxvt_term::next_char () 2784rxvt_term::next_char () NOTHROW
2813{ 2785{
2814 while (cmdbuf_ptr < cmdbuf_endp) 2786 while (cmdbuf_ptr < cmdbuf_endp)
2815 { 2787 {
2816 // assume 7-bit to be ascii ALWAYS 2788 // assume 7-bit to be ascii ALWAYS
2817 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2789 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2818 return *cmdbuf_ptr++; 2790 return *cmdbuf_ptr++;
2819 2791
2820 wchar_t wc; 2792 wchar_t wc;
2821 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2793 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2822 2794
2823 if (len == (size_t)-2) 2795 if (len == (size_t)-2)
2824 { 2796 {
2825 // the mbstate stores incomplete sequences. didn't know this :/ 2797 // the mbstate stores incomplete sequences. didn't know this :/
2826 cmdbuf_ptr = cmdbuf_endp; 2798 cmdbuf_ptr = cmdbuf_endp;
2827 break; 2799 break;
2828 } 2800 }
2829 2801
2830 if (len == (size_t)-1) 2802 if (len == (size_t)-1)
2831 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2803 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2832 2804
2833 // assume wchar == unicode 2805 // assume wchar == unicode
2834 cmdbuf_ptr += len; 2806 cmdbuf_ptr += len;
2835 return wc & UNICODE_MASK; 2807 return wc & UNICODE_MASK;
2836 } 2808 }
2837 2809
2838 return NOCHAR; 2810 return NOCHAR;
2839} 2811}
2812
2813// read the next octet
2814uint32_t
2815rxvt_term::next_octet () NOTHROW
2816{
2817 return cmdbuf_ptr < cmdbuf_endp
2818 ? (unsigned char)*cmdbuf_ptr++
2819 : NOCHAR;
2820}
2821
2822static class out_of_input out_of_input;
2840 2823
2841/* rxvt_cmd_getc () - Return next input character */ 2824/* rxvt_cmd_getc () - Return next input character */
2842/* 2825/*
2843 * Return the next input character after first passing any keyboard input 2826 * Return the next input character after first passing any keyboard input
2844 * to the command. 2827 * to the command.
2845 */ 2828 */
2846unicode_t 2829wchar_t
2847rxvt_term::cmd_getc () 2830rxvt_term::cmd_getc () THROW ((class out_of_input))
2848{ 2831{
2849 unicode_t c = next_char (); 2832 wchar_t c = next_char ();
2850 2833
2851 if (c == NOCHAR) 2834 if (c == NOCHAR)
2852 throw out_of_input; 2835 throw out_of_input;
2853 2836
2854 return c; 2837 return c;
2855} 2838}
2856 2839
2857unicode_t 2840uint32_t
2858rxvt_term::cmd_get8 () 2841rxvt_term::cmd_get8 () THROW ((class out_of_input))
2859{ 2842{
2860 unicode_t c = next_octet (); 2843 uint32_t c = next_octet ();
2861 2844
2862 if (c == NOCHAR) 2845 if (c == NOCHAR)
2863 throw out_of_input; 2846 throw out_of_input;
2864 2847
2865 return c; 2848 return c;
… …
2965 case C0_ESC: 2948 case C0_ESC:
2966 process_escape_seq (); 2949 process_escape_seq ();
2967 break; 2950 break;
2968 case C0_ENQ: /* terminal Status */ 2951 case C0_ENQ: /* terminal Status */
2969 if (rs[Rs_answerbackstring]) 2952 if (rs[Rs_answerbackstring])
2970 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2953 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2971 (unsigned int)strlen (rs[Rs_answerbackstring]));
2972 else 2954 else
2973 tt_write ((unsigned char *)VT100_ANS, 2955 tt_write (VT100_ANS, strlen (VT100_ANS));
2974 (unsigned int)strlen (VT100_ANS));
2975 break; 2956 break;
2976 case C0_BEL: /* bell */ 2957 case C0_BEL: /* bell */
2977 scr_bell (); 2958 scr_bell ();
2978 break; 2959 break;
2979 case C0_BS: /* backspace */ 2960 case C0_BS: /* backspace */
… …
3103 scr_charset_set (2, (unsigned int)cmd_getc ()); 3084 scr_charset_set (2, (unsigned int)cmd_getc ());
3104 break; 3085 break;
3105 case '+': 3086 case '+':
3106 scr_charset_set (3, (unsigned int)cmd_getc ()); 3087 scr_charset_set (3, (unsigned int)cmd_getc ());
3107 break; 3088 break;
3108#if ENABLE_FRILLS 3089#if !ENABLE_MINIMAL
3109 case '6': 3090 case '6':
3110 scr_backindex (); 3091 scr_backindex ();
3111 break; 3092 break;
3112#endif 3093#endif
3113 case '7': 3094 case '7':
3114 scr_cursor (SAVE); 3095 scr_cursor (SAVE);
3115 break; 3096 break;
3116 case '8': 3097 case '8':
3117 scr_cursor (RESTORE); 3098 scr_cursor (RESTORE);
3118 break; 3099 break;
3119#if ENABLE_FRILLS 3100#if !ENABLE_MINIMAL
3120 case '9': 3101 case '9':
3121 scr_forwardindex (); 3102 scr_forwardindex ();
3122 break; 3103 break;
3123#endif 3104#endif
3124 case '=': 3105 case '=':
… …
3134 break; 3115 break;
3135 3116
3136 /* 8.3.87: NEXT LINE */ 3117 /* 8.3.87: NEXT LINE */
3137 case C1_NEL: /* ESC E */ 3118 case C1_NEL: /* ESC E */
3138 { 3119 {
3139 unicode_t nlcr[] = { C0_LF, C0_CR }; 3120 wchar_t nlcr[] = { C0_LF, C0_CR };
3140 scr_add_lines (nlcr, 1, 2); 3121 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3141 } 3122 }
3142 break; 3123 break;
3143 3124
3144 /* kidnapped escape sequence: Should be 8.3.48 */ 3125 /* kidnapped escape sequence: Should be 8.3.48 */
3145 case C1_ESA: /* ESC G */ 3126 case C1_ESA: /* ESC G */
… …
3167 process_dcs_seq (); 3148 process_dcs_seq ();
3168 break; 3149 break;
3169 3150
3170 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3151 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3171 case C1_SCI: /* ESC Z */ 3152 case C1_SCI: /* ESC Z */
3172 tt_write ((const unsigned char *)ESCZ_ANSWER, 3153 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3173 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3174 break; /* steal obsolete ESC [ c */ 3154 break; /* steal obsolete ESC [ c */
3175 3155
3176 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3156 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3177 case C1_CSI: /* ESC [ */ 3157 case C1_CSI: /* ESC [ */
3178 process_csi_seq (); 3158 process_csi_seq ();
… …
3287 ndef = get_byte_array_bit (csi_defaults, i); 3267 ndef = get_byte_array_bit (csi_defaults, i);
3288 for (p = 0; p < nargs; p++) 3268 for (p = 0; p < nargs; p++)
3289 if (arg[p] == -1) 3269 if (arg[p] == -1)
3290 arg[p] = ndef; 3270 arg[p] = ndef;
3291 3271
3292#ifdef DEBUG_CMD
3293 fprintf (stderr, "CSI ");
3294 for (p = 0; p < nargs; p++)
3295 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3296 fprintf (stderr, "%c\n", ch);
3297#endif
3298
3299 /* 3272 /*
3300 * private mode handling 3273 * private mode handling
3301 */ 3274 */
3302 if (priv) 3275 if (priv)
3303 { 3276 {
3304 switch (priv) 3277 switch (priv)
3305 { 3278 {
3306 case '>': 3279 case '>':
3307 if (ch == CSI_DA) /* secondary device attributes */ 3280 if (ch == CSI_DA) /* secondary device attributes */
3308 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 3281 {
3282 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3283 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3284 //
3285 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3286 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3287 // that we do not support xterm mouse reporting (should be 95 when we do).
3288 //
3289 tt_printf ("\033[>%d;94;0c", 'U');
3290 }
3309 break; 3291 break;
3310 case '?': 3292 case '?':
3311 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3293 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3312 process_terminal_mode (ch, priv, nargs, arg); 3294 process_terminal_mode (ch, priv, nargs, arg);
3313 break; 3295 break;
… …
3422 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3404 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3423 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3405 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3424 break; 3406 break;
3425 3407
3426 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3408 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3427 tt_write ((const unsigned char *)VT100_ANS, 3409 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3428 (unsigned int) (sizeof (VT100_ANS) - 1));
3429 break; 3410 break;
3430 3411
3431 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3412 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3432 process_sgr_mode (nargs, arg); 3413 process_sgr_mode (nargs, arg);
3433 break; 3414 break;
… …
3517 break; 3498 break;
3518 case CSI_75: 3499 case CSI_75:
3519 scr_cursor (RESTORE); 3500 scr_cursor (RESTORE);
3520 break; 3501 break;
3521 3502
3522#if ENABLE_FRILLS 3503#if !ENABLE_MINIMAL
3523 case CSI_74: 3504 case CSI_74:
3524 process_window_ops (arg, nargs); 3505 process_window_ops (arg, nargs);
3525 break; 3506 break;
3526#endif 3507#endif
3527 3508
… …
3534 break; 3515 break;
3535 } 3516 }
3536} 3517}
3537/*}}} */ 3518/*}}} */
3538 3519
3539#if ENABLE_FRILLS 3520#if !ENABLE_MINIMAL
3540/* ARGSUSED */ 3521/* ARGSUSED */
3541void 3522void
3542rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3523rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3543{ 3524{
3544 int x, y; 3525 int x, y;
3545 XWindowAttributes wattr; 3526 XWindowAttributes wattr;
3546 Window wdummy; 3527 Window wdummy;
3547 dDisp; 3528
3529 dLocal (Display *, xdisp);
3548 3530
3549 if (nargs == 0) 3531 if (nargs == 0)
3550 return; 3532 return;
3551 3533
3552 switch (args[0]) 3534 switch (args[0])
3553 { 3535 {
3554 /* 3536 /*
3555 * commands 3537 * commands
3556 */ 3538 */
3557 case 1: /* deiconify window */ 3539 case 1: /* deiconify window */
3558 XMapWindow (disp, parent[0]); 3540 XMapWindow (xdisp, parent[0]);
3559 break; 3541 break;
3560 case 2: /* iconify window */ 3542 case 2: /* iconify window */
3561 XIconifyWindow (disp, parent[0], display->screen); 3543 XIconifyWindow (xdisp, parent[0], display->screen);
3562 break; 3544 break;
3563 case 3: /* set position (pixels) */ 3545 case 3: /* set position (pixels) */
3564 XMoveWindow (disp, parent[0], args[1], args[2]); 3546 XMoveWindow (xdisp, parent[0], args[1], args[2]);
3565 break; 3547 break;
3566 case 4: /* set size (pixels) */ 3548 case 4: /* set size (pixels) */
3567 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3549 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3568 break; 3550 break;
3569 case 5: /* raise window */ 3551 case 5: /* raise window */
3570 XRaiseWindow (disp, parent[0]); 3552 XRaiseWindow (xdisp, parent[0]);
3571 break; 3553 break;
3572 case 6: /* lower window */ 3554 case 6: /* lower window */
3573 XLowerWindow (disp, parent[0]); 3555 XLowerWindow (xdisp, parent[0]);
3574 break; 3556 break;
3575 case 7: /* refresh window */ 3557 case 7: /* refresh window */
3576 scr_touch (true); 3558 scr_touch (true);
3577 break; 3559 break;
3578 case 8: /* set size (chars) */ 3560 case 8: /* set size (chars) */
… …
3585 if (args[0] >= 24) /* set height (chars) */ 3567 if (args[0] >= 24) /* set height (chars) */
3586 set_widthheight ((unsigned int)width, 3568 set_widthheight ((unsigned int)width,
3587 (unsigned int) (args[1] * fheight)); 3569 (unsigned int) (args[1] * fheight));
3588 break; 3570 break;
3589 3571
3590
3591 /* 3572 /*
3592 * reports - some output format copied from XTerm 3573 * reports - some output format copied from XTerm
3593 */ 3574 */
3594 case 11: /* report window state */ 3575 case 11: /* report window state */
3595 XGetWindowAttributes (disp, parent[0], &wattr); 3576 XGetWindowAttributes (xdisp, parent[0], &wattr);
3596 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3577 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3597 break; 3578 break;
3598 case 13: /* report window position */ 3579 case 13: /* report window position */
3599 XGetWindowAttributes (disp, parent[0], &wattr); 3580 XGetWindowAttributes (xdisp, parent[0], &wattr);
3600 XTranslateCoordinates (disp, parent[0], wattr.root, 3581 XTranslateCoordinates (xdisp, parent[0], wattr.root,
3601 -wattr.border_width, -wattr.border_width, 3582 -wattr.border_width, -wattr.border_width,
3602 &x, &y, &wdummy); 3583 &x, &y, &wdummy);
3603 tt_printf ("\033[3;%d;%dt", x, y); 3584 tt_printf ("\033[3;%d;%dt", x, y);
3604 break; 3585 break;
3605 case 14: /* report window size (pixels) */ 3586 case 14: /* report window size (pixels) */
3606 XGetWindowAttributes (disp, parent[0], &wattr); 3587 XGetWindowAttributes (xdisp, parent[0], &wattr);
3607 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3588 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3608 break; 3589 break;
3609 case 18: /* report text area size (chars) */ 3590 case 18: /* report text area size (chars) */
3610 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3591 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3611 break; 3592 break;
… …
3613 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3594 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3614 break; 3595 break;
3615 case 20: /* report icon label */ 3596 case 20: /* report icon label */
3616 { 3597 {
3617 char *s; 3598 char *s;
3618 XGetIconName (disp, parent[0], &s); 3599 XGetIconName (xdisp, parent[0], &s);
3619 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3600 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3620 XFree (s); 3601 XFree (s);
3621 } 3602 }
3622 break; 3603 break;
3623 case 21: /* report window title */ 3604 case 21: /* report window title */
3624 { 3605 {
3625 char *s; 3606 char *s;
3626 XFetchName (disp, parent[0], &s); 3607 XFetchName (xdisp, parent[0], &s);
3627 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3608 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3628 XFree (s); 3609 XFree (s);
3629 } 3610 }
3630 break; 3611 break;
3631 } 3612 }
… …
3635/*----------------------------------------------------------------------*/ 3616/*----------------------------------------------------------------------*/
3636/* 3617/*
3637 * get input up until STRING TERMINATOR (or BEL) 3618 * get input up until STRING TERMINATOR (or BEL)
3638 * ends_how is terminator used. returned input must be free()'d 3619 * ends_how is terminator used. returned input must be free()'d
3639 */ 3620 */
3640unsigned char * 3621char *
3641rxvt_term::get_to_st (unicode_t &ends_how) 3622rxvt_term::get_to_st (unicode_t &ends_how)
3642{ 3623{
3643 unicode_t ch; 3624 unicode_t ch;
3644 bool seen_esc = false; 3625 bool seen_esc = false;
3645 unsigned int n = 0; 3626 unsigned int n = 0;
… …
3678 3659
3679 string[n++] = '\0'; 3660 string[n++] = '\0';
3680 3661
3681 ends_how = (ch == 0x5c ? C0_ESC : ch); 3662 ends_how = (ch == 0x5c ? C0_ESC : ch);
3682 3663
3683 return (unsigned char *)rxvt_wcstombs (string); 3664 return rxvt_wcstombs (string);
3684} 3665}
3685 3666
3686/*----------------------------------------------------------------------*/ 3667/*----------------------------------------------------------------------*/
3687/* 3668/*
3688 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3669 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3689 */ 3670 */
3690void 3671void
3691rxvt_term::process_dcs_seq () 3672rxvt_term::process_dcs_seq ()
3692{ 3673{
3693 unsigned char *s; 3674 char *s;
3694 unicode_t eh; 3675 unicode_t eh;
3695 3676
3696 /* 3677 /*
3697 * Not handled yet 3678 * Not handled yet
3698 */ 3679 */
… …
3717 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3698 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3718 arg = arg * 10 + (ch - '0'); 3699 arg = arg * 10 + (ch - '0');
3719 3700
3720 if (ch == ';') 3701 if (ch == ';')
3721 { 3702 {
3722 unsigned char *s = get_to_st (eh); 3703 char *s = get_to_st (eh);
3723 3704
3724 if (s) 3705 if (s)
3725 { 3706 {
3726 process_xterm_seq (arg, (char *)s, eh); 3707 process_xterm_seq (arg, s, eh);
3727 free (s); 3708 free (s);
3728 } 3709 }
3729 } 3710 }
3730} 3711}
3731 3712
3732void 3713void
3733rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3714rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3734{ 3715{
3735 if (str[0] == '?' && !str[1]) 3716 if (str[0] == '?' && !str[1])
3736 { 3717 {
3737 unsigned short r, g, b; 3718 rgba c;
3738 pix_colors_focused[color].get (display, r, g, b); 3719 pix_colors_focused[color].get (c);
3720
3721#if XFT
3722 if (c.a != rgba::MAX_CC)
3723 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3724 else
3725#endif
3739 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3726 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3740 } 3727 }
3741 else 3728 else
3742 set_window_color (color, str); 3729 set_window_color (color, str);
3743} 3730}
3744 3731
3745/* 3732/*
3746 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3733 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3747 */ 3734 */
3748void 3735void
3749rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3736rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3750{ 3737{
3751 int changed = 0;
3752 int color; 3738 int color;
3753 char *buf, *name; 3739 char *buf, *name;
3754 bool query = str[0] == '?' && !str[1]; 3740 bool query = str[0] == '?' && !str[1];
3755 int saveop = op; 3741 int saveop = op;
3756 dDisp; 3742
3743 dLocal (Display *, xdisp);
3757 3744
3758 assert (str != NULL); 3745 assert (str != NULL);
3759 switch (op) 3746 switch (op)
3760 { 3747 {
3761 case XTerm_name: 3748 case XTerm_name:
… …
3777 unsigned long bytes_after; 3764 unsigned long bytes_after;
3778 unsigned char *value = 0; 3765 unsigned char *value = 0;
3779 const char *str = ""; 3766 const char *str = "";
3780 3767
3781 if (prop 3768 if (prop
3782 && XGetWindowProperty (disp, parent[0], 3769 && XGetWindowProperty (xdisp, parent[0],
3783 prop, 0, 1<<16, 0, AnyPropertyType, 3770 prop, 0, 1<<16, 0, AnyPropertyType,
3784 &actual_type, &actual_format, 3771 &actual_type, &actual_format,
3785 &nitems, &bytes_after, &value) == Success 3772 &nitems, &bytes_after, &value) == Success
3786 && actual_type != None 3773 && actual_type != None
3787 && actual_format == 8) 3774 && actual_format == 8)
3788 str = (const char *)(value); 3775 str = (const char *)(value);
3789 3776
3790 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3777 tt_printf ("\033]%d;%s%c", op, str, resp);
3791 3778
3792 XFree (value); 3779 XFree (value);
3793 } 3780 }
3794 else 3781 else
3795 { 3782 {
… …
3799 { 3786 {
3800 *eq = 0; 3787 *eq = 0;
3801 set_utf8_property (display->atom (str), eq + 1); 3788 set_utf8_property (display->atom (str), eq + 1);
3802 } 3789 }
3803 else 3790 else
3804 XDeleteProperty (disp, parent[0], 3791 XDeleteProperty (xdisp, parent[0],
3805 display->atom (str)); 3792 display->atom (str));
3806 } 3793 }
3807 break; 3794 break;
3808 3795
3809 case XTerm_Color: 3796 case XTerm_Color:
… …
3811 { 3798 {
3812 if ((name = strchr (buf, ';')) == NULL) 3799 if ((name = strchr (buf, ';')) == NULL)
3813 break; 3800 break;
3814 3801
3815 *name++ = '\0'; 3802 *name++ = '\0';
3816 color = atoi (buf); 3803 color = atoi (buf) + minCOLOR;
3817 3804
3818 if (color < 0 || color >= TOTAL_COLORS) 3805 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3819 break; 3806 break;
3820 3807
3821 if ((buf = strchr (name, ';')) != NULL) 3808 if ((buf = strchr (name, ';')) != NULL)
3822 *buf++ = '\0'; 3809 *buf++ = '\0';
3823 3810
3824 if (name[0] == '?' && !name[1]) 3811 process_color_seq (op, color, name, resp);
3825 {
3826 unsigned short r, g, b;
3827 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3828 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3829 }
3830 else
3831 set_window_color (color + minCOLOR, name);
3832 } 3812 }
3833 break; 3813 break;
3834 case XTerm_Color00: 3814 case XTerm_Color00:
3835 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3815 process_color_seq (op, Color_fg, str, resp);
3836 break; 3816 break;
3837 case XTerm_Color01: 3817 case XTerm_Color01:
3838 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3818 process_color_seq (op, Color_bg, str, resp);
3839 break; 3819 break;
3840#ifndef NO_CURSORCOLOR 3820#ifndef NO_CURSORCOLOR
3841 case XTerm_Color_cursor: 3821 case XTerm_Color_cursor:
3842 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3822 process_color_seq (op, Color_cursor, str, resp);
3843 break; 3823 break;
3844#endif 3824#endif
3845 case XTerm_Color_pointer_fg: 3825 case XTerm_Color_pointer_fg:
3846 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3826 process_color_seq (op, Color_pointer_fg, str, resp);
3847 break; 3827 break;
3848 case XTerm_Color_pointer_bg: 3828 case XTerm_Color_pointer_bg:
3849 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3829 process_color_seq (op, Color_pointer_bg, str, resp);
3850 break; 3830 break;
3851#ifndef NO_BOLD_UNDERLINE_REVERSE 3831#ifndef NO_BOLD_UNDERLINE_REVERSE
3852 case XTerm_Color_BD:
3853 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3854 break;
3855 case XTerm_Color_UL:
3856 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3857 break;
3858 case XTerm_Color_RV: 3832 case XTerm_Color_RV:
3859 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3833 process_color_seq (op, Color_RV, str, resp);
3834 break;
3835 case Rxvt_Color_BD:
3836 case URxvt_Color_BD:
3837 process_color_seq (op, Color_BD, str, resp);
3838 break;
3839 case Rxvt_Color_UL:
3840 case URxvt_Color_UL:
3841 process_color_seq (op, Color_UL, str, resp);
3860 break; 3842 break;
3861 case URxvt_Color_IT: 3843 case URxvt_Color_IT:
3862 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3844 process_color_seq (op, Color_IT, str, resp);
3863 break; 3845 break;
3864#endif 3846#endif
3865#if TRANSPARENT && TINTING 3847#if TRANSPARENT && TINTING
3866 case URxvt_Color_tint: 3848 case URxvt_Color_tint:
3867 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3849 process_color_seq (op, Color_tint, str, resp);
3850
3868 check_our_parents (); 3851 check_our_parents ();
3852
3869 if (am_transparent) 3853 if (am_transparent)
3870 want_full_refresh = want_refresh = 1; 3854 want_full_refresh = want_refresh = 1;
3871 break;
3872#endif
3873 3855
3856 break;
3857#endif
3858
3874 case XTerm_Pixmap: 3859 case Rxvt_Pixmap:
3860 {
3875 if (*str != ';') 3861 if (*str != ';')
3876 { 3862 {
3877#if XPM_BACKGROUND 3863#if XPM_BACKGROUND
3878 scale_pixmap (""); /* reset to default scaling */ 3864 scale_pixmap (""); /* reset to default scaling */
3879 set_bgPixmap (str); /* change pixmap */ 3865 set_bgPixmap (str); /* change pixmap */
3880#endif
3881 scr_touch (true); 3866 scr_touch (true);
3867#endif
3882 } 3868 }
3869
3870 int changed = 0;
3871
3883 while ((str = strchr (str, ';')) != NULL) 3872 while ((str = strchr (str, ';')) != NULL)
3884 { 3873 {
3885 str++; 3874 str++;
3886#if XPM_BACKGROUND 3875#if XPM_BACKGROUND
3887 changed += scale_pixmap (str); 3876 changed += scale_pixmap (str);
3888#endif 3877#endif
3889 } 3878 }
3890 3879
3891 if (changed) 3880 if (changed)
3892 { 3881 {
3893#ifdef XPM_BACKGROUND 3882#ifdef XPM_BACKGROUND
3894 resize_pixmap (); 3883 resize_pixmap ();
3895#endif
3896 scr_touch (true); 3884 scr_touch (true);
3885#endif
3897 } 3886 }
3887 }
3898 break; 3888 break;
3899 3889
3900 case XTerm_restoreFG: 3890 case Rxvt_restoreFG:
3901 set_window_color (Color_fg, str); 3891 set_window_color (Color_fg, str);
3902 break; 3892 break;
3903 case XTerm_restoreBG: 3893 case Rxvt_restoreBG:
3904 set_window_color (Color_bg, str); 3894 set_window_color (Color_bg, str);
3905 break; 3895 break;
3906 3896
3907 case XTerm_logfile: 3897 case XTerm_logfile:
3908 // TODO, when secure mode? 3898 // TODO, when secure mode?
3909 break; 3899 break;
3910 3900
3911#ifdef MENUBAR
3912 case URxvt_Menu:
3913 if (OPTION (Opt_insecure))
3914 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3915 break;
3916#endif
3917#if 0 3901#if 0
3918 case XTerm_dumpscreen: /* no error notices */ 3902 case Rxvt_dumpscreen: /* no error notices */
3919 { 3903 {
3920 int fd; 3904 int fd;
3921 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3905 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3922 { 3906 {
3923 scr_dump (fd); 3907 scr_dump (fd);
… …
3947 allocated.push_back ((void *)res); 3931 allocated.push_back ((void *)res);
3948 set_fonts (); 3932 set_fonts ();
3949 } 3933 }
3950 break; 3934 break;
3951 3935
3952#if ENABLE_FRILLS 3936 case URxvt_version:
3937 if (query)
3938 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3939 op,
3940 rs[Rs_name], VERSION[0], VERSION[2],
3941 resp);
3942 break;
3943
3944#if !ENABLE_MINIMAL
3953 case URxvt_locale: 3945 case URxvt_locale:
3954 if (query) 3946 if (query)
3955 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3947 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3956 else 3948 else
3957 { 3949 {
3958 set_locale (str); 3950 set_locale (str);
3959 pty.set_utf8_mode (enc_utf8); 3951 pty->set_utf8_mode (enc_utf8);
3960 init_xlocale (); 3952 init_xlocale ();
3961 } 3953 }
3962 break; 3954 break;
3963 3955
3964 case URxvt_view_up: 3956 case URxvt_view_up:
3965 case URxvt_view_down: 3957 case URxvt_view_down:
3958 {
3966 int lines = atoi (str); 3959 int lines = atoi (str);
3967 3960
3968 if (lines) 3961 if (lines)
3969 scr_page (op == URxvt_view_up ? UP : DN, lines); 3962 scr_page (op == URxvt_view_up ? UP : DN, lines);
3970 else 3963 else
3971 {
3972 scr_erase_savelines (); 3964 scr_erase_savelines ();
3973 } 3965 }
3974 3966
3967 break;
3968#endif
3969
3970#if ENABLE_PERL
3971 case URxvt_perl:
3972 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3973 ; // no responses yet
3975 break; 3974 break;
3976#endif 3975#endif
3977 } 3976 }
3978} 3977}
3979/*----------------------------------------------------------------------*/ 3978/*----------------------------------------------------------------------*/
… …
4010 return state; 4009 return state;
4011} 4010}
4012 4011
4013/* we're not using priv _yet_ */ 4012/* we're not using priv _yet_ */
4014void 4013void
4015rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4014rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4016{ 4015{
4017 unsigned int i, j; 4016 unsigned int i, j;
4018 int state; 4017 int state;
4019 4018
4020 static const struct 4019 static const struct
… …
4031 { 5, PrivMode_rVideo }, 4030 { 5, PrivMode_rVideo },
4032 { 6, PrivMode_relOrigin }, 4031 { 6, PrivMode_relOrigin },
4033 { 7, PrivMode_Autowrap }, 4032 { 7, PrivMode_Autowrap },
4034 // 8, bi-directional support mode 4033 // 8, bi-directional support mode
4035 { 9, PrivMode_MouseX10 }, 4034 { 9, PrivMode_MouseX10 },
4036#ifdef menuBar_esc
4037 { menuBar_esc, PrivMode_menuBar },
4038#endif
4039 // 18, 19 printing-related 4035 // 18, 19 printing-related
4040 { 25, PrivMode_VisibleCursor }, 4036 { 25, PrivMode_VisibleCursor },
4041#ifdef scrollBar_esc 4037#ifdef scrollBar_esc
4042 { scrollBar_esc, PrivMode_scrollBar }, 4038 { scrollBar_esc, PrivMode_scrollBar },
4043#endif 4039#endif
… …
4090 /* extra handling for values with state unkept */ 4086 /* extra handling for values with state unkept */
4091 switch (arg[i]) 4087 switch (arg[i])
4092 { 4088 {
4093#if ENABLE_STYLES 4089#if ENABLE_STYLES
4094 case 1021: 4090 case 1021:
4095 if (mode) 4091 set_option (Opt_intensityStyles, mode);
4096 SET_OPTION (Opt_intensityStyles);
4097 else
4098 CLR_OPTION (Opt_intensityStyles);
4099 4092
4100 scr_touch (true); 4093 scr_touch (true);
4101 break; 4094 break;
4102#endif 4095#endif
4103 case 1048: /* alternative cursor save */ 4096 case 1048: /* alternative cursor save */
… …
4125 case 3: /* 80/132 */ 4118 case 3: /* 80/132 */
4126 if (priv_modes & PrivMode_132OK) 4119 if (priv_modes & PrivMode_132OK)
4127 set_widthheight (((state ? 132 : 80) * fwidth), height); 4120 set_widthheight (((state ? 132 : 80) * fwidth), height);
4128 break; 4121 break;
4129 case 4: /* smooth scrolling */ 4122 case 4: /* smooth scrolling */
4130 if (!state) 4123 set_option (Opt_jumpScroll, !state);
4131 SET_OPTION (Opt_jumpScroll);
4132 else
4133 CLR_OPTION (Opt_jumpScroll);
4134 break; 4124 break;
4135 case 5: /* reverse video */ 4125 case 5: /* reverse video */
4136 scr_rvideo_mode (state); 4126 scr_rvideo_mode (state);
4137 break; 4127 break;
4138 case 6: /* relative/absolute origins */ 4128 case 6: /* relative/absolute origins */
… …
4144 /* case 8: - auto repeat, can't do on a per window basis */ 4134 /* case 8: - auto repeat, can't do on a per window basis */
4145 case 9: /* X10 mouse reporting */ 4135 case 9: /* X10 mouse reporting */
4146 if (state) /* orthogonal */ 4136 if (state) /* orthogonal */
4147 priv_modes &= ~PrivMode_MouseX11; 4137 priv_modes &= ~PrivMode_MouseX11;
4148 break; 4138 break;
4149#ifdef menuBar_esc
4150 case menuBar_esc:
4151#ifdef MENUBAR
4152 map_menuBar (state);
4153#endif
4154 break;
4155#endif
4156#ifdef scrollBar_esc 4139#ifdef scrollBar_esc
4157 case scrollBar_esc: 4140 case scrollBar_esc:
4158 if (scrollbar_mapping (state)) 4141 if (scrollbar_mapping (state))
4159 { 4142 {
4160 resize_all_windows (0, 0, 0); 4143 resize_all_windows (0, 0, 0);
… …
4179#if 0 4162#if 0
4180 case 1001: 4163 case 1001:
4181 break; /* X11 mouse highlighting */ 4164 break; /* X11 mouse highlighting */
4182#endif 4165#endif
4183 case 1010: /* scroll to bottom on TTY output inhibit */ 4166 case 1010: /* scroll to bottom on TTY output inhibit */
4184 if (!state) 4167 set_option (Opt_scrollTtyOutput, !state);
4185 SET_OPTION (Opt_scrollTtyOutput);
4186 else
4187 CLR_OPTION (Opt_scrollTtyOutput);
4188 break; 4168 break;
4189 case 1011: /* scroll to bottom on key press */ 4169 case 1011: /* scroll to bottom on key press */
4190 if (state) 4170 set_option (Opt_scrollTtyKeypress, state);
4191 SET_OPTION (Opt_scrollTtyKeypress);
4192 else
4193 CLR_OPTION (Opt_scrollTtyKeypress);
4194 break; 4171 break;
4195 case 1047: /* secondary screen w/ clearing last */ 4172 case 1047: /* secondary screen w/ clearing last */
4196 if (OPTION (Opt_secondaryScreen)) 4173 if (OPTION (Opt_secondaryScreen))
4197 if (current_screen != PRIMARY) 4174 if (current_screen != PRIMARY)
4198 scr_erase_screen (2); 4175 scr_erase_screen (2);
… …
4336 scr_color (Color_bg, Color_bg); 4313 scr_color (Color_bg, Color_bg);
4337 break; 4314 break;
4338 4315
4339 //case 50: // not variable spacing 4316 //case 50: // not variable spacing
4340 4317
4341#ifndef NO_BRIGHTCOLOR 4318#if !ENABLE_MINIMAL
4342 case 90: 4319 case 90:
4343 case 91: /* set bright fg color */ 4320 case 91: /* set bright fg color */
4344 case 92: 4321 case 92:
4345 case 93: 4322 case 93:
4346 case 94: 4323 case 94:
… …
4391 */ 4368 */
4392void 4369void
4393rxvt_term::tt_printf (const char *fmt,...) 4370rxvt_term::tt_printf (const char *fmt,...)
4394{ 4371{
4395 va_list arg_ptr; 4372 va_list arg_ptr;
4396 unsigned char buf[256]; 4373 char buf[256];
4397 4374
4398 va_start (arg_ptr, fmt); 4375 va_start (arg_ptr, fmt);
4399 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4376 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4400 va_end (arg_ptr); 4377 va_end (arg_ptr);
4401 tt_write (buf, strlen (buf)); 4378 tt_write (buf, strlen (buf));
… …
4406 * or generated by us in response to a query ESC sequence. 4383 * or generated by us in response to a query ESC sequence.
4407 */ 4384 */
4408const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4385const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4409 4386
4410void 4387void
4411rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4388rxvt_term::tt_write (const char *data, unsigned int len)
4412{ 4389{
4390 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4391 return;
4392
4393 if (pty->pty < 0)
4394 return;
4395
4413 if (v_buflen == 0) 4396 if (v_buflen == 0)
4414 { 4397 {
4415 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4398 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4416 4399
4417 if ((unsigned int)written == len) 4400 if ((unsigned int)written == len)
4418 return; 4401 return;
4419 4402
4420 data += written; 4403 data += written;
4421 len -= written; 4404 len -= written;
4422 } 4405 }
4423 4406
4424 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4407 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4425 4408
4426 memcpy (v_buffer + v_buflen, data, len); 4409 memcpy (v_buffer + v_buflen, data, len);
4427 v_buflen += len; 4410 v_buflen += len;
4428 4411
4429 pty_ev.set (EVENT_READ | EVENT_WRITE); 4412 pty_ev.set (EVENT_READ | EVENT_WRITE);
4430} 4413}
4431 4414
4432void rxvt_term::pty_write () 4415void rxvt_term::pty_write ()
4433{ 4416{
4434 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4417 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4435 4418
4436 if (written > 0) 4419 if (written > 0)
4437 { 4420 {
4438 v_buflen -= written; 4421 v_buflen -= written;
4439 4422

Diff Legend

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