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.228 by root, Mon Jan 2 16:08:34 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 /*
… …
1795rxvt_term::button_press (XButtonEvent &ev) 1793rxvt_term::button_press (XButtonEvent &ev)
1796{ 1794{
1797 int reportmode = 0, clickintime; 1795 int reportmode = 0, clickintime;
1798 1796
1799 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1797 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1798
1800 if (!bypass_keystate) 1799 if (!bypass_keystate)
1801 reportmode = !! (priv_modes & PrivMode_mouse_report); 1800 reportmode = !! (priv_modes & PrivMode_mouse_report);
1802 1801
1803 /* 1802 /*
1804 * VT window processing of button press 1803 * VT window processing of button press
1805 */ 1804 */
1806 if (ev.window == vt) 1805 if (ev.window == vt)
1807 { 1806 {
1807 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1808 return;
1809
1808#if ISO_14755 1810#if ISO_14755
1809 // 5.4 1811 // 5.4
1810 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1812 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1811 { 1813 {
1812 iso14755_54 (ev.x, ev.y); 1814 iso14755_54 (ev.x, ev.y);
… …
1824#ifdef MOUSE_REPORT_DOUBLECLICK 1826#ifdef MOUSE_REPORT_DOUBLECLICK
1825 if (ev.button == MEvent.button && clickintime) 1827 if (ev.button == MEvent.button && clickintime)
1826 { 1828 {
1827 /* same button, within alloted time */ 1829 /* same button, within alloted time */
1828 MEvent.clicks++; 1830 MEvent.clicks++;
1831
1829 if (MEvent.clicks > 1) 1832 if (MEvent.clicks > 1)
1830 { 1833 {
1831 /* only report double clicks */ 1834 /* only report double clicks */
1832 MEvent.clicks = 2; 1835 MEvent.clicks = 2;
1833 mouse_report (ev); 1836 mouse_report (ev);
… …
1865#else 1868#else
1866 selection.rect = false; 1869 selection.rect = false;
1867#endif 1870#endif
1868 1871
1869 /* allow shift+left click to extend selection */ 1872 /* allow shift+left click to extend selection */
1870 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1873 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1871 { 1874 {
1872 if (MEvent.button == Button1 && clickintime) 1875 if (MEvent.button == Button1 && clickintime)
1873 selection_rotate (ev.x, ev.y); 1876 selection_rotate (ev.x, ev.y);
1874 else 1877 else
1875 selection_extend (ev.x, ev.y, 1); 1878 selection_extend (ev.x, ev.y, 1);
… …
2040 } 2043 }
2041 2044
2042 break; 2045 break;
2043 } 2046 }
2044 } 2047 }
2048
2045 return; 2049 return;
2046 } 2050 }
2047#if MENUBAR
2048 /*
2049 * Menubar window processing of button press
2050 */
2051 if (isMenuBarWindow (ev.window))
2052 menubar_control (ev);
2053#endif
2054} 2051}
2055 2052
2056void 2053void
2057rxvt_term::button_release (XButtonEvent &ev) 2054rxvt_term::button_release (XButtonEvent &ev)
2058{ 2055{
… …
2064 2061
2065 if (scrollbar_isUpDn ()) 2062 if (scrollbar_isUpDn ())
2066 { 2063 {
2067 scrollBar.setIdle (); 2064 scrollBar.setIdle ();
2068 scrollbar_show (0); 2065 scrollbar_show (0);
2069#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2070 refresh_type &= ~SMOOTH_REFRESH;
2071#endif
2072 } 2066 }
2073 2067
2074#ifdef SELECTION_SCROLLING 2068#ifdef SELECTION_SCROLLING
2075 if (sel_scroll_ev.active) 2069 if (sel_scroll_ev.active)
2076 sel_scroll_ev.stop(); 2070 sel_scroll_ev.stop();
2077#endif 2071#endif
2078 2072
2079 if (ev.window == vt) 2073 if (ev.window == vt)
2080 { 2074 {
2075 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2076 return;
2077
2081#if ISO_14755 2078#if ISO_14755
2082 // 5.4 2079 // 5.4
2083 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2080 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2084 return; 2081 return;
2085#endif 2082#endif
2083
2086 if (reportmode) 2084 if (reportmode)
2087 { 2085 {
2088 /* mouse report from vt window */ 2086 /* mouse report from vt window */
2089 /* don't report release of wheel "buttons" */ 2087 /* don't report release of wheel "buttons" */
2090 if (ev.button >= 4) 2088 if (ev.button >= 4)
… …
2120 { 2118 {
2121 case Button1: 2119 case Button1:
2122 case Button3: 2120 case Button3:
2123 selection_make (ev.time); 2121 selection_make (ev.time);
2124 break; 2122 break;
2123
2125 case Button2: 2124 case Button2:
2126 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);
2127 break; 2127 break;
2128
2128#ifdef MOUSE_WHEEL 2129#ifdef MOUSE_WHEEL
2129 case Button4: 2130 case Button4:
2130 case Button5: 2131 case Button5:
2131 { 2132 {
2132 int i; 2133 int i;
… …
2154 slip_wheel_ev.start (); 2155 slip_wheel_ev.start ();
2155 } 2156 }
2156 else 2157 else
2157 { 2158 {
2158# endif 2159# endif
2159# ifdef JUMP_MOUSE_WHEEL
2160 scr_page (v, i); 2160 scr_page (v, i);
2161 scr_refresh (SMOOTH_REFRESH);
2162 scrollbar_show (1); 2161 scrollbar_show (1);
2163# else
2164 while (i--)
2165 {
2166 scr_page (v, 1);
2167 scr_refresh (SMOOTH_REFRESH);
2168 scrollbar_show (1);
2169 }
2170# endif
2171# ifdef MOUSE_SLIP_WHEELING 2162# ifdef MOUSE_SLIP_WHEELING
2172 } 2163 }
2173#endif 2164# endif
2174 } 2165 }
2175 break; 2166 break;
2176#endif 2167#endif
2177 } 2168 }
2178 } 2169 }
2179#ifdef MENUBAR
2180 else if (isMenuBarWindow (ev.window))
2181 menubar_control (ev);
2182#endif
2183} 2170}
2184 2171
2185#ifdef TRANSPARENT 2172#ifdef TRANSPARENT
2186#if TINTING 2173#if TINTING
2187/* taken from aterm-0.4.2 */ 2174/* taken from aterm-0.4.2 */
2188 2175
2189typedef uint32_t RUINT32T; 2176typedef uint32_t RUINT32T;
2190 2177
2191void 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)
2192{ 2179{
2193 int sh_r, sh_g, sh_b; 2180 int sh_r, sh_g, sh_b;
2194 RUINT32T mask_r, mask_g, mask_b; 2181 RUINT32T mask_r, mask_g, mask_b;
2195 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2182 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2196 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2183 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2197 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2184 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2198 int i; 2185 int i;
2199 2186
2200 Visual *visual = display->visual; 2187 Visual *visual = term->visual;
2201 2188
2202 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2189 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2203 2190
2204 /* for convenience */ 2191 /* for convenience */
2205 mask_r = visual->red_mask; 2192 mask_r = visual->red_mask;
… …
2426 Atom atype; 2413 Atom atype;
2427 unsigned char *prop = NULL; 2414 unsigned char *prop = NULL;
2428 Window root, oldp, *list; 2415 Window root, oldp, *list;
2429 Pixmap rootpixmap = None; 2416 Pixmap rootpixmap = None;
2430 XWindowAttributes wattr, wrootattr; 2417 XWindowAttributes wattr, wrootattr;
2431 dDisp;
2432 2418
2433 pchanged = 0; 2419 pchanged = 0;
2434 2420
2435 if (!OPTION (Opt_transparent)) 2421 if (!OPTION (Opt_transparent))
2436 return pchanged; /* Don't try any more */ 2422 return pchanged; /* Don't try any more */
2437 2423
2438 XGetWindowAttributes (disp, display->root, &wrootattr); 2424 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2439 rootdepth = wrootattr.depth; 2425 rootdepth = wrootattr.depth;
2440 2426
2441 XGetWindowAttributes (disp, parent[0], &wattr); 2427 XGetWindowAttributes (xdisp, parent[0], &wattr);
2442 2428
2443 if (rootdepth != wattr.depth) 2429 if (rootdepth != wattr.depth)
2444 { 2430 {
2445 if (am_transparent) 2431 if (am_transparent)
2446 { 2432 {
2447 pchanged = 1; 2433 pchanged = 1;
2448 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2434 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2449 am_transparent = am_pixmap_trans = 0; 2435 am_transparent = am_pixmap_trans = 0;
2450 } 2436 }
2451 2437
2452 return pchanged; /* Don't try any more */ 2438 return pchanged; /* Don't try any more */
2453 } 2439 }
2454 2440
2455 /* 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. */
2456 XSync (disp, False); 2442 XSync (xdisp, False);
2457 2443
2458 /* 2444 /*
2459 * Make the frame window set by the window manager have 2445 * Make the frame window set by the window manager have
2460 * the root background. Some window managers put multiple nested frame 2446 * the root background. Some window managers put multiple nested frame
2461 * 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.
2462 */ 2448 */
2463 i = (xa[XA_XROOTPMAP_ID] 2449 i = (xa[XA_XROOTPMAP_ID]
2464 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2450 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2465 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2451 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2466 &nitems, &bytes_after, &prop) == Success); 2452 &nitems, &bytes_after, &prop) == Success);
2467 2453
2468 if (!i || prop == NULL) 2454 if (!i || prop == NULL)
2469 i = (xa[XA_ESETROOT_PMAP_ID] 2455 i = (xa[XA_ESETROOT_PMAP_ID]
2470 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2456 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2471 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2457 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2472 &nitems, &bytes_after, &prop) == Success); 2458 &nitems, &bytes_after, &prop) == Success);
2473 2459
2474 if (!i || prop == NULL 2460 if (!i || prop == NULL
2475#if TINTING 2461#if TINTING
2476 || !rs[Rs_color + Color_tint] 2462 || !ISSET_PIXCOLOR (Color_tint)
2477#endif 2463#endif
2478 ) 2464 )
2479 have_pixmap = 0; 2465 have_pixmap = 0;
2480 else 2466 else
2481 { 2467 {
… …
2494 Window cr; 2480 Window cr;
2495 XImage *image; 2481 XImage *image;
2496 GC gc; 2482 GC gc;
2497 XGCValues gcvalue; 2483 XGCValues gcvalue;
2498 2484
2499 XTranslateCoordinates (disp, parent[0], display->root, 2485 XTranslateCoordinates (xdisp, parent[0], display->root,
2500 0, 0, &sx, &sy, &cr); 2486 0, 0, &sx, &sy, &cr);
2501 nw = (unsigned int)szHint.width; 2487 nw = (unsigned int)szHint.width;
2502 nh = (unsigned int)szHint.height; 2488 nh = (unsigned int)szHint.height;
2503 nx = ny = 0; 2489 nx = ny = 0;
2504 2490
… …
2517 } 2503 }
2518 2504
2519 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2505 min_it (nw, (unsigned int) (wrootattr.width - sx));
2520 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2506 min_it (nh, (unsigned int) (wrootattr.height - sy));
2521 2507
2522 XSync (disp, False); 2508 XSync (xdisp, False);
2523 allowedxerror = -1; 2509 allowedxerror = -1;
2524 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2510 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2525 2511
2526 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2512 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2527 /* XXX: may need a delay here? */ 2513 /* XXX: may need a delay here? */
2528 allowedxerror = 0; 2514 allowedxerror = 0;
2529 2515
… …
2532 if (am_transparent && am_pixmap_trans) 2518 if (am_transparent && am_pixmap_trans)
2533 { 2519 {
2534 pchanged = 1; 2520 pchanged = 1;
2535 if (pixmap != None) 2521 if (pixmap != None)
2536 { 2522 {
2537 XFreePixmap (disp, pixmap); 2523 XFreePixmap (xdisp, pixmap);
2538 pixmap = None; 2524 pixmap = None;
2539 } 2525 }
2540 } 2526 }
2541 2527
2542 am_pixmap_trans = 0; 2528 am_pixmap_trans = 0;
2543 } 2529 }
2544 else 2530 else
2545 { 2531 {
2546 if (pixmap != None) 2532 if (pixmap != None)
2547 XFreePixmap (disp, pixmap); 2533 XFreePixmap (xdisp, pixmap);
2548 2534
2549#if TINTING 2535#if TINTING
2550 if (ISSET_PIXCOLOR (Color_tint)) 2536 if (ISSET_PIXCOLOR (Color_tint))
2551 { 2537 {
2552 unsigned short rm, gm, bm;
2553 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2538 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2554 2539
2540 rgba c;
2555 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2541 pix_colors_focused [Color_tint].get (c);
2556 2542
2557 ShadeXImage (display, image, shade, rm, gm, bm); 2543 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2558 } 2544 }
2559#endif 2545#endif
2560 2546
2561 pixmap = XCreatePixmap (disp, vt, 2547 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2562 szHint.width, szHint.height, image->depth);
2563 gc = XCreateGC (disp, vt, 0UL, &gcvalue); 2548 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2564 XPutImage (disp, pixmap, gc, image, 0, 0, 2549 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2565 nx, ny, image->width, image->height); 2550 nx, ny, image->width, image->height);
2566 XFreeGC (disp, gc); 2551 XFreeGC (xdisp, gc);
2567 XDestroyImage (image); 2552 XDestroyImage (image);
2568 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2553 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2569 XClearWindow (disp, parent[0]); 2554 XClearWindow (xdisp, parent[0]);
2570 2555
2571 if (!am_transparent || !am_pixmap_trans) 2556 if (!am_transparent || !am_pixmap_trans)
2572 pchanged = 1; 2557 pchanged = 1;
2573 2558
2574 am_transparent = am_pixmap_trans = 1; 2559 am_transparent = am_pixmap_trans = 1;
2575 } 2560 }
2576 } 2561 }
2577 2562
2578 if (am_pixmap_trans) 2563 if (am_pixmap_trans)
2579 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2564 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2580 else 2565 else
2581 { 2566 {
2582 unsigned int n; 2567 unsigned int n;
2583 /* 2568 /*
2584 * InheritPixmap transparency 2569 * InheritPixmap transparency
2585 */ 2570 */
2586 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2571 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2587 { 2572 {
2588 oldp = parent[i]; 2573 oldp = parent[i];
2589 XQueryTree (disp, parent[i - 1], &root, 2574 XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2590 &parent[i], &list, &n);
2591 XFree (list); 2575 XFree (list);
2592 2576
2593 if (parent[i] == display->root) 2577 if (parent[i] == display->root)
2594 { 2578 {
2595 if (oldp != None) 2579 if (oldp != None)
… …
2603 } 2587 }
2604 2588
2605 n = 0; 2589 n = 0;
2606 2590
2607 if (pchanged) 2591 if (pchanged)
2608 {
2609 for (; n < (unsigned int)i; n++) 2592 for (; n < (unsigned int)i; n++)
2610 { 2593 {
2611 XGetWindowAttributes (disp, parent[n], &wattr); 2594 XGetWindowAttributes (xdisp, parent[n], &wattr);
2595
2612 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2596 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2613 { 2597 {
2614 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2598 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2615 break; 2599 break;
2616 } 2600 }
2617 } 2601 }
2618 }
2619 2602
2620 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2603 if (n > (sizeof (parent) / sizeof (parent[0])))
2621 { 2604 {
2622 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2605 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2623 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2606 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2624 am_transparent = 0; 2607 am_transparent = 0;
2625 /* XXX: also turn off Opt_transparent? */ 2608 /* XXX: also turn off Opt_transparent? */
2626 } 2609 }
2627 else 2610 else
2628 { 2611 {
2629#if WAIT_FOR_WM
2630 /* wait (an arbitrary period) for the WM to do its thing
2631 * needed for fvwm2.2.2 (and before?) */
2632 sleep (1);
2633#endif
2634 for (n = 0; n < (unsigned int)i; n++) 2612 for (n = 0; n < (unsigned int)i; n++)
2635 { 2613 {
2636 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2614 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2637 XClearWindow (disp, parent[n]); 2615 XClearWindow (xdisp, parent[n]);
2638 } 2616 }
2639 2617
2640 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2618 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2641 am_transparent = 1; 2619 am_transparent = 1;
2642 } 2620 }
2643 2621
2644 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2622 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2645 parent[i] = None; 2623 parent[i] = None;
2646 } 2624 }
2647 2625
2648 if (scrollBar.win) 2626 if (scrollBar.win)
2649 { 2627 {
2650 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2628 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2651 scrollBar.setIdle (); 2629 scrollBar.setIdle ();
2652 scrollbar_show (0); 2630 scrollbar_show (0);
2653 } 2631 }
2654 2632
2655 if (am_transparent) 2633 if (am_transparent)
… …
2667 2645
2668bool 2646bool
2669rxvt_term::cmd_parse () 2647rxvt_term::cmd_parse ()
2670{ 2648{
2671 bool flag = false; 2649 bool flag = false;
2672 unicode_t ch = NOCHAR; 2650 wchar_t ch = NOCHAR;
2673 unsigned char *seq_begin; // remember start of esc-sequence here 2651 char *seq_begin; // remember start of esc-sequence here
2674 2652
2675 for (;;) 2653 for (;;)
2676 { 2654 {
2677 if (ch == NOCHAR) 2655 if (ch == NOCHAR)
2678 { 2656 {
2679 seq_begin = cmdbuf_ptr; 2657 seq_begin = cmdbuf_ptr;
2680 ch = next_char (); 2658 ch = next_char ();
2681 }
2682 2659
2683 if (ch == NOCHAR) // TODO: improve 2660 if (ch == NOCHAR)
2684 break; 2661 break;
2662 }
2685 2663
2686 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)
2687 { 2665 {
2688 if (!seen_input) 2666 if (!seen_input)
2689 { 2667 {
… …
2698 if (seen_resize && cmd_pid) 2676 if (seen_resize && cmd_pid)
2699 kill (-cmd_pid, SIGWINCH); 2677 kill (-cmd_pid, SIGWINCH);
2700 } 2678 }
2701 2679
2702 /* Read a text string from the input buffer */ 2680 /* Read a text string from the input buffer */
2703 unicode_t buf[UBUFSIZ]; 2681 wchar_t buf[UBUFSIZ];
2704 bool refreshnow = false; 2682 bool refreshnow = false;
2705 int nlines = 0; 2683 int nlines = 0;
2706 unicode_t *str = buf; 2684 wchar_t *str = buf;
2707 unicode_t *eol = str + min (ncol, UBUFSIZ); 2685 wchar_t *eol = str + min (ncol, UBUFSIZ);
2708 2686
2709 for (;;) 2687 for (;;)
2710 { 2688 {
2711 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))
2712 break; 2690 break;
… …
2730 } 2708 }
2731 2709
2732 // scr_add_lines only works for nlines <= nrow - 1. 2710 // scr_add_lines only works for nlines <= nrow - 1.
2733 if (nlines >= nrow - 1) 2711 if (nlines >= nrow - 1)
2734 { 2712 {
2713 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2714 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2735 scr_add_lines (buf, nlines, str - buf); 2715 scr_add_lines (buf, str - buf, nlines);
2716
2736 nlines = 0; 2717 nlines = 0;
2737 str = buf; 2718 str = buf;
2738 eol = str + min (ncol, UBUFSIZ); 2719 eol = str + min (ncol, UBUFSIZ);
2739 } 2720 }
2740 2721
… …
2753 2734
2754 seq_begin = cmdbuf_ptr; 2735 seq_begin = cmdbuf_ptr;
2755 ch = next_char (); 2736 ch = next_char ();
2756 } 2737 }
2757 2738
2739 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2740 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2758 scr_add_lines (buf, nlines, str - buf); 2741 scr_add_lines (buf, str - buf, nlines);
2759 2742
2760 /* 2743 /*
2761 * 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
2762 * 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.
2763 * the number of pages between refreshes is refresh_limit, which 2746 * the number of pages between refreshes is refresh_limit, which
… …
2768 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2751 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2769 refresh_limit++; 2752 refresh_limit++;
2770 else 2753 else
2771 { 2754 {
2772 flag = true; 2755 flag = true;
2773 scr_refresh (refresh_type); 2756 scr_refresh ();
2774 flush_ev.stop (); 2757 want_refresh = 1;
2775 } 2758 }
2776 } 2759 }
2777 2760
2778 } 2761 }
2779 else 2762 else
… …
2794 } 2777 }
2795 2778
2796 return flag; 2779 return flag;
2797} 2780}
2798 2781
2799// read the next octet
2800unicode_t
2801rxvt_term::next_octet ()
2802{
2803 return cmdbuf_ptr < cmdbuf_endp
2804 ? *cmdbuf_ptr++
2805 : NOCHAR;
2806}
2807
2808// read the next character 2782// read the next character
2809unicode_t 2783wchar_t
2810rxvt_term::next_char () 2784rxvt_term::next_char () NOTHROW
2811{ 2785{
2812 while (cmdbuf_ptr < cmdbuf_endp) 2786 while (cmdbuf_ptr < cmdbuf_endp)
2813 { 2787 {
2814 // assume 7-bit to be ascii ALWAYS 2788 // assume 7-bit to be ascii ALWAYS
2815 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2789 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2816 return *cmdbuf_ptr++; 2790 return *cmdbuf_ptr++;
2817 2791
2818 wchar_t wc; 2792 wchar_t wc;
2819 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);
2820 2794
2821 if (len == (size_t)-2) 2795 if (len == (size_t)-2)
2822 { 2796 {
2823 // the mbstate stores incomplete sequences. didn't know this :/ 2797 // the mbstate stores incomplete sequences. didn't know this :/
2824 cmdbuf_ptr = cmdbuf_endp; 2798 cmdbuf_ptr = cmdbuf_endp;
2825 break; 2799 break;
2826 } 2800 }
2827 2801
2828 if (len == (size_t)-1) 2802 if (len == (size_t)-1)
2829 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
2830 2804
2831 // assume wchar == unicode 2805 // assume wchar == unicode
2832 cmdbuf_ptr += len; 2806 cmdbuf_ptr += len;
2833 return wc & UNICODE_MASK; 2807 return wc & UNICODE_MASK;
2834 } 2808 }
2835 2809
2836 return NOCHAR; 2810 return NOCHAR;
2837} 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;
2838 2823
2839/* rxvt_cmd_getc () - Return next input character */ 2824/* rxvt_cmd_getc () - Return next input character */
2840/* 2825/*
2841 * Return the next input character after first passing any keyboard input 2826 * Return the next input character after first passing any keyboard input
2842 * to the command. 2827 * to the command.
2843 */ 2828 */
2844unicode_t 2829wchar_t
2845rxvt_term::cmd_getc () 2830rxvt_term::cmd_getc () THROW ((class out_of_input))
2846{ 2831{
2847 unicode_t c = next_char (); 2832 wchar_t c = next_char ();
2848 2833
2849 if (c == NOCHAR) 2834 if (c == NOCHAR)
2850 throw out_of_input; 2835 throw out_of_input;
2851 2836
2852 return c; 2837 return c;
2853} 2838}
2854 2839
2855unicode_t 2840uint32_t
2856rxvt_term::cmd_get8 () 2841rxvt_term::cmd_get8 () THROW ((class out_of_input))
2857{ 2842{
2858 unicode_t c = next_octet (); 2843 uint32_t c = next_octet ();
2859 2844
2860 if (c == NOCHAR) 2845 if (c == NOCHAR)
2861 throw out_of_input; 2846 throw out_of_input;
2862 2847
2863 return c; 2848 return c;
… …
2963 case C0_ESC: 2948 case C0_ESC:
2964 process_escape_seq (); 2949 process_escape_seq ();
2965 break; 2950 break;
2966 case C0_ENQ: /* terminal Status */ 2951 case C0_ENQ: /* terminal Status */
2967 if (rs[Rs_answerbackstring]) 2952 if (rs[Rs_answerbackstring])
2968 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2953 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2969 (unsigned int)strlen (rs[Rs_answerbackstring]));
2970 else 2954 else
2971 tt_write ((unsigned char *)VT100_ANS, 2955 tt_write (VT100_ANS, strlen (VT100_ANS));
2972 (unsigned int)strlen (VT100_ANS));
2973 break; 2956 break;
2974 case C0_BEL: /* bell */ 2957 case C0_BEL: /* bell */
2975 scr_bell (); 2958 scr_bell ();
2976 break; 2959 break;
2977 case C0_BS: /* backspace */ 2960 case C0_BS: /* backspace */
… …
3101 scr_charset_set (2, (unsigned int)cmd_getc ()); 3084 scr_charset_set (2, (unsigned int)cmd_getc ());
3102 break; 3085 break;
3103 case '+': 3086 case '+':
3104 scr_charset_set (3, (unsigned int)cmd_getc ()); 3087 scr_charset_set (3, (unsigned int)cmd_getc ());
3105 break; 3088 break;
3106#if ENABLE_FRILLS 3089#if !ENABLE_MINIMAL
3107 case '6': 3090 case '6':
3108 scr_backindex (); 3091 scr_backindex ();
3109 break; 3092 break;
3110#endif 3093#endif
3111 case '7': 3094 case '7':
3112 scr_cursor (SAVE); 3095 scr_cursor (SAVE);
3113 break; 3096 break;
3114 case '8': 3097 case '8':
3115 scr_cursor (RESTORE); 3098 scr_cursor (RESTORE);
3116 break; 3099 break;
3117#if ENABLE_FRILLS 3100#if !ENABLE_MINIMAL
3118 case '9': 3101 case '9':
3119 scr_forwardindex (); 3102 scr_forwardindex ();
3120 break; 3103 break;
3121#endif 3104#endif
3122 case '=': 3105 case '=':
… …
3132 break; 3115 break;
3133 3116
3134 /* 8.3.87: NEXT LINE */ 3117 /* 8.3.87: NEXT LINE */
3135 case C1_NEL: /* ESC E */ 3118 case C1_NEL: /* ESC E */
3136 { 3119 {
3137 unicode_t nlcr[] = { C0_LF, C0_CR }; 3120 wchar_t nlcr[] = { C0_LF, C0_CR };
3138 scr_add_lines (nlcr, 1, 2); 3121 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3139 } 3122 }
3140 break; 3123 break;
3141 3124
3142 /* kidnapped escape sequence: Should be 8.3.48 */ 3125 /* kidnapped escape sequence: Should be 8.3.48 */
3143 case C1_ESA: /* ESC G */ 3126 case C1_ESA: /* ESC G */
… …
3165 process_dcs_seq (); 3148 process_dcs_seq ();
3166 break; 3149 break;
3167 3150
3168 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3151 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3169 case C1_SCI: /* ESC Z */ 3152 case C1_SCI: /* ESC Z */
3170 tt_write ((const unsigned char *)ESCZ_ANSWER, 3153 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3171 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3172 break; /* steal obsolete ESC [ c */ 3154 break; /* steal obsolete ESC [ c */
3173 3155
3174 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3156 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3175 case C1_CSI: /* ESC [ */ 3157 case C1_CSI: /* ESC [ */
3176 process_csi_seq (); 3158 process_csi_seq ();
… …
3285 ndef = get_byte_array_bit (csi_defaults, i); 3267 ndef = get_byte_array_bit (csi_defaults, i);
3286 for (p = 0; p < nargs; p++) 3268 for (p = 0; p < nargs; p++)
3287 if (arg[p] == -1) 3269 if (arg[p] == -1)
3288 arg[p] = ndef; 3270 arg[p] = ndef;
3289 3271
3290#ifdef DEBUG_CMD
3291 fprintf (stderr, "CSI ");
3292 for (p = 0; p < nargs; p++)
3293 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3294 fprintf (stderr, "%c\n", ch);
3295#endif
3296
3297 /* 3272 /*
3298 * private mode handling 3273 * private mode handling
3299 */ 3274 */
3300 if (priv) 3275 if (priv)
3301 { 3276 {
3302 switch (priv) 3277 switch (priv)
3303 { 3278 {
3304 case '>': 3279 case '>':
3305 if (ch == CSI_DA) /* secondary device attributes */ 3280 if (ch == CSI_DA) /* secondary device attributes */
3306 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 }
3307 break; 3291 break;
3308 case '?': 3292 case '?':
3309 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3293 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3310 process_terminal_mode (ch, priv, nargs, arg); 3294 process_terminal_mode (ch, priv, nargs, arg);
3311 break; 3295 break;
… …
3420 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3404 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3421 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3405 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3422 break; 3406 break;
3423 3407
3424 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3408 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3425 tt_write ((const unsigned char *)VT100_ANS, 3409 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3426 (unsigned int) (sizeof (VT100_ANS) - 1));
3427 break; 3410 break;
3428 3411
3429 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3412 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3430 process_sgr_mode (nargs, arg); 3413 process_sgr_mode (nargs, arg);
3431 break; 3414 break;
… …
3515 break; 3498 break;
3516 case CSI_75: 3499 case CSI_75:
3517 scr_cursor (RESTORE); 3500 scr_cursor (RESTORE);
3518 break; 3501 break;
3519 3502
3520#if ENABLE_FRILLS 3503#if !ENABLE_MINIMAL
3521 case CSI_74: 3504 case CSI_74:
3522 process_window_ops (arg, nargs); 3505 process_window_ops (arg, nargs);
3523 break; 3506 break;
3524#endif 3507#endif
3525 3508
… …
3532 break; 3515 break;
3533 } 3516 }
3534} 3517}
3535/*}}} */ 3518/*}}} */
3536 3519
3537#if ENABLE_FRILLS 3520#if !ENABLE_MINIMAL
3538/* ARGSUSED */ 3521/* ARGSUSED */
3539void 3522void
3540rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3523rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3541{ 3524{
3542 int x, y; 3525 int x, y;
3543 XWindowAttributes wattr; 3526 XWindowAttributes wattr;
3544 Window wdummy; 3527 Window wdummy;
3545 dDisp; 3528
3529 dLocal (Display *, xdisp);
3546 3530
3547 if (nargs == 0) 3531 if (nargs == 0)
3548 return; 3532 return;
3549 3533
3550 switch (args[0]) 3534 switch (args[0])
3551 { 3535 {
3552 /* 3536 /*
3553 * commands 3537 * commands
3554 */ 3538 */
3555 case 1: /* deiconify window */ 3539 case 1: /* deiconify window */
3556 XMapWindow (disp, parent[0]); 3540 XMapWindow (xdisp, parent[0]);
3557 break; 3541 break;
3558 case 2: /* iconify window */ 3542 case 2: /* iconify window */
3559 XIconifyWindow (disp, parent[0], display->screen); 3543 XIconifyWindow (xdisp, parent[0], display->screen);
3560 break; 3544 break;
3561 case 3: /* set position (pixels) */ 3545 case 3: /* set position (pixels) */
3562 XMoveWindow (disp, parent[0], args[1], args[2]); 3546 XMoveWindow (xdisp, parent[0], args[1], args[2]);
3563 break; 3547 break;
3564 case 4: /* set size (pixels) */ 3548 case 4: /* set size (pixels) */
3565 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3549 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3566 break; 3550 break;
3567 case 5: /* raise window */ 3551 case 5: /* raise window */
3568 XRaiseWindow (disp, parent[0]); 3552 XRaiseWindow (xdisp, parent[0]);
3569 break; 3553 break;
3570 case 6: /* lower window */ 3554 case 6: /* lower window */
3571 XLowerWindow (disp, parent[0]); 3555 XLowerWindow (xdisp, parent[0]);
3572 break; 3556 break;
3573 case 7: /* refresh window */ 3557 case 7: /* refresh window */
3574 scr_touch (true); 3558 scr_touch (true);
3575 break; 3559 break;
3576 case 8: /* set size (chars) */ 3560 case 8: /* set size (chars) */
… …
3583 if (args[0] >= 24) /* set height (chars) */ 3567 if (args[0] >= 24) /* set height (chars) */
3584 set_widthheight ((unsigned int)width, 3568 set_widthheight ((unsigned int)width,
3585 (unsigned int) (args[1] * fheight)); 3569 (unsigned int) (args[1] * fheight));
3586 break; 3570 break;
3587 3571
3588
3589 /* 3572 /*
3590 * reports - some output format copied from XTerm 3573 * reports - some output format copied from XTerm
3591 */ 3574 */
3592 case 11: /* report window state */ 3575 case 11: /* report window state */
3593 XGetWindowAttributes (disp, parent[0], &wattr); 3576 XGetWindowAttributes (xdisp, parent[0], &wattr);
3594 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3577 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3595 break; 3578 break;
3596 case 13: /* report window position */ 3579 case 13: /* report window position */
3597 XGetWindowAttributes (disp, parent[0], &wattr); 3580 XGetWindowAttributes (xdisp, parent[0], &wattr);
3598 XTranslateCoordinates (disp, parent[0], wattr.root, 3581 XTranslateCoordinates (xdisp, parent[0], wattr.root,
3599 -wattr.border_width, -wattr.border_width, 3582 -wattr.border_width, -wattr.border_width,
3600 &x, &y, &wdummy); 3583 &x, &y, &wdummy);
3601 tt_printf ("\033[3;%d;%dt", x, y); 3584 tt_printf ("\033[3;%d;%dt", x, y);
3602 break; 3585 break;
3603 case 14: /* report window size (pixels) */ 3586 case 14: /* report window size (pixels) */
3604 XGetWindowAttributes (disp, parent[0], &wattr); 3587 XGetWindowAttributes (xdisp, parent[0], &wattr);
3605 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3588 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3606 break; 3589 break;
3607 case 18: /* report text area size (chars) */ 3590 case 18: /* report text area size (chars) */
3608 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3591 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3609 break; 3592 break;
… …
3611 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3594 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3612 break; 3595 break;
3613 case 20: /* report icon label */ 3596 case 20: /* report icon label */
3614 { 3597 {
3615 char *s; 3598 char *s;
3616 XGetIconName (disp, parent[0], &s); 3599 XGetIconName (xdisp, parent[0], &s);
3617 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 */
3618 XFree (s); 3601 XFree (s);
3619 } 3602 }
3620 break; 3603 break;
3621 case 21: /* report window title */ 3604 case 21: /* report window title */
3622 { 3605 {
3623 char *s; 3606 char *s;
3624 XFetchName (disp, parent[0], &s); 3607 XFetchName (xdisp, parent[0], &s);
3625 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 */
3626 XFree (s); 3609 XFree (s);
3627 } 3610 }
3628 break; 3611 break;
3629 } 3612 }
… …
3633/*----------------------------------------------------------------------*/ 3616/*----------------------------------------------------------------------*/
3634/* 3617/*
3635 * get input up until STRING TERMINATOR (or BEL) 3618 * get input up until STRING TERMINATOR (or BEL)
3636 * ends_how is terminator used. returned input must be free()'d 3619 * ends_how is terminator used. returned input must be free()'d
3637 */ 3620 */
3638unsigned char * 3621char *
3639rxvt_term::get_to_st (unicode_t &ends_how) 3622rxvt_term::get_to_st (unicode_t &ends_how)
3640{ 3623{
3641 unicode_t ch; 3624 unicode_t ch;
3642 bool seen_esc = false; 3625 bool seen_esc = false;
3643 unsigned int n = 0; 3626 unsigned int n = 0;
… …
3676 3659
3677 string[n++] = '\0'; 3660 string[n++] = '\0';
3678 3661
3679 ends_how = (ch == 0x5c ? C0_ESC : ch); 3662 ends_how = (ch == 0x5c ? C0_ESC : ch);
3680 3663
3681 return (unsigned char *)rxvt_wcstombs (string); 3664 return rxvt_wcstombs (string);
3682} 3665}
3683 3666
3684/*----------------------------------------------------------------------*/ 3667/*----------------------------------------------------------------------*/
3685/* 3668/*
3686 * 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)'
3687 */ 3670 */
3688void 3671void
3689rxvt_term::process_dcs_seq () 3672rxvt_term::process_dcs_seq ()
3690{ 3673{
3691 unsigned char *s; 3674 char *s;
3692 unicode_t eh; 3675 unicode_t eh;
3693 3676
3694 /* 3677 /*
3695 * Not handled yet 3678 * Not handled yet
3696 */ 3679 */
… …
3715 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3698 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3716 arg = arg * 10 + (ch - '0'); 3699 arg = arg * 10 + (ch - '0');
3717 3700
3718 if (ch == ';') 3701 if (ch == ';')
3719 { 3702 {
3720 unsigned char *s = get_to_st (eh); 3703 char *s = get_to_st (eh);
3721 3704
3722 if (s) 3705 if (s)
3723 { 3706 {
3724 process_xterm_seq (arg, (char *)s, eh); 3707 process_xterm_seq (arg, s, eh);
3725 free (s); 3708 free (s);
3726 } 3709 }
3727 } 3710 }
3728} 3711}
3729 3712
3730void 3713void
3731rxvt_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)
3732{ 3715{
3733 if (str[0] == '?' && !str[1]) 3716 if (str[0] == '?' && !str[1])
3734 { 3717 {
3735 unsigned short r, g, b; 3718 rgba c;
3736 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
3737 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);
3738 } 3727 }
3739 else 3728 else
3740 set_window_color (color, str); 3729 set_window_color (color, str);
3741} 3730}
3742 3731
3743/* 3732/*
3744 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3733 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3745 */ 3734 */
3746void 3735void
3747rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3736rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3748{ 3737{
3749 int changed = 0;
3750 int color; 3738 int color;
3751 char *buf, *name; 3739 char *buf, *name;
3752 bool query = str[0] == '?' && !str[1]; 3740 bool query = str[0] == '?' && !str[1];
3753 int saveop = op; 3741 int saveop = op;
3754 dDisp; 3742
3743 dLocal (Display *, xdisp);
3755 3744
3756 assert (str != NULL); 3745 assert (str != NULL);
3757 switch (op) 3746 switch (op)
3758 { 3747 {
3759 case XTerm_name: 3748 case XTerm_name:
… …
3775 unsigned long bytes_after; 3764 unsigned long bytes_after;
3776 unsigned char *value = 0; 3765 unsigned char *value = 0;
3777 const char *str = ""; 3766 const char *str = "";
3778 3767
3779 if (prop 3768 if (prop
3780 && XGetWindowProperty (disp, parent[0], 3769 && XGetWindowProperty (xdisp, parent[0],
3781 prop, 0, 1<<16, 0, AnyPropertyType, 3770 prop, 0, 1<<16, 0, AnyPropertyType,
3782 &actual_type, &actual_format, 3771 &actual_type, &actual_format,
3783 &nitems, &bytes_after, &value) == Success 3772 &nitems, &bytes_after, &value) == Success
3784 && actual_type != None 3773 && actual_type != None
3785 && actual_format == 8) 3774 && actual_format == 8)
3786 str = (const char *)(value); 3775 str = (const char *)(value);
3787 3776
3788 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3777 tt_printf ("\033]%d;%s%c", op, str, resp);
3789 3778
3790 XFree (value); 3779 XFree (value);
3791 } 3780 }
3792 else 3781 else
3793 { 3782 {
… …
3797 { 3786 {
3798 *eq = 0; 3787 *eq = 0;
3799 set_utf8_property (display->atom (str), eq + 1); 3788 set_utf8_property (display->atom (str), eq + 1);
3800 } 3789 }
3801 else 3790 else
3802 XDeleteProperty (disp, parent[0], 3791 XDeleteProperty (xdisp, parent[0],
3803 display->atom (str)); 3792 display->atom (str));
3804 } 3793 }
3805 break; 3794 break;
3806 3795
3807 case XTerm_Color: 3796 case XTerm_Color:
… …
3809 { 3798 {
3810 if ((name = strchr (buf, ';')) == NULL) 3799 if ((name = strchr (buf, ';')) == NULL)
3811 break; 3800 break;
3812 3801
3813 *name++ = '\0'; 3802 *name++ = '\0';
3814 color = atoi (buf); 3803 color = atoi (buf) + minCOLOR;
3815 3804
3816 if (color < 0 || color >= TOTAL_COLORS) 3805 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3817 break; 3806 break;
3818 3807
3819 if ((buf = strchr (name, ';')) != NULL) 3808 if ((buf = strchr (name, ';')) != NULL)
3820 *buf++ = '\0'; 3809 *buf++ = '\0';
3821 3810
3822 if (name[0] == '?' && !name[1]) 3811 process_color_seq (op, color, name, resp);
3823 {
3824 unsigned short r, g, b;
3825 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3826 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3827 }
3828 else
3829 set_window_color (color + minCOLOR, name);
3830 } 3812 }
3831 break; 3813 break;
3832 case XTerm_Color00: 3814 case XTerm_Color00:
3833 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3815 process_color_seq (op, Color_fg, str, resp);
3834 break; 3816 break;
3835 case XTerm_Color01: 3817 case XTerm_Color01:
3836 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3818 process_color_seq (op, Color_bg, str, resp);
3837 break; 3819 break;
3838#ifndef NO_CURSORCOLOR 3820#ifndef NO_CURSORCOLOR
3839 case XTerm_Color_cursor: 3821 case XTerm_Color_cursor:
3840 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3822 process_color_seq (op, Color_cursor, str, resp);
3841 break; 3823 break;
3842#endif 3824#endif
3843 case XTerm_Color_pointer_fg: 3825 case XTerm_Color_pointer_fg:
3844 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3826 process_color_seq (op, Color_pointer_fg, str, resp);
3845 break; 3827 break;
3846 case XTerm_Color_pointer_bg: 3828 case XTerm_Color_pointer_bg:
3847 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3829 process_color_seq (op, Color_pointer_bg, str, resp);
3848 break; 3830 break;
3849#ifndef NO_BOLD_UNDERLINE_REVERSE 3831#ifndef NO_BOLD_UNDERLINE_REVERSE
3850 case XTerm_Color_BD:
3851 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3852 break;
3853 case XTerm_Color_UL:
3854 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3855 break;
3856 case XTerm_Color_RV: 3832 case XTerm_Color_RV:
3857 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);
3858 break; 3842 break;
3859 case URxvt_Color_IT: 3843 case URxvt_Color_IT:
3860 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3844 process_color_seq (op, Color_IT, str, resp);
3861 break; 3845 break;
3862#endif 3846#endif
3863#if TRANSPARENT && TINTING 3847#if TRANSPARENT && TINTING
3864 case URxvt_Color_tint: 3848 case URxvt_Color_tint:
3865 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3849 process_color_seq (op, Color_tint, str, resp);
3850
3866 check_our_parents (); 3851 check_our_parents ();
3852
3867 if (am_transparent) 3853 if (am_transparent)
3868 want_full_refresh = want_refresh = 1; 3854 want_full_refresh = want_refresh = 1;
3869 break;
3870#endif
3871 3855
3856 break;
3857#endif
3858
3872 case XTerm_Pixmap: 3859 case Rxvt_Pixmap:
3860 {
3873 if (*str != ';') 3861 if (*str != ';')
3874 { 3862 {
3875#if XPM_BACKGROUND 3863#if XPM_BACKGROUND
3876 scale_pixmap (""); /* reset to default scaling */ 3864 scale_pixmap (""); /* reset to default scaling */
3877 set_bgPixmap (str); /* change pixmap */ 3865 set_bgPixmap (str); /* change pixmap */
3878#endif
3879 scr_touch (true); 3866 scr_touch (true);
3867#endif
3880 } 3868 }
3869
3870 int changed = 0;
3871
3881 while ((str = strchr (str, ';')) != NULL) 3872 while ((str = strchr (str, ';')) != NULL)
3882 { 3873 {
3883 str++; 3874 str++;
3884#if XPM_BACKGROUND 3875#if XPM_BACKGROUND
3885 changed += scale_pixmap (str); 3876 changed += scale_pixmap (str);
3886#endif 3877#endif
3887 } 3878 }
3888 3879
3889 if (changed) 3880 if (changed)
3890 { 3881 {
3891#ifdef XPM_BACKGROUND 3882#ifdef XPM_BACKGROUND
3892 resize_pixmap (); 3883 resize_pixmap ();
3893#endif
3894 scr_touch (true); 3884 scr_touch (true);
3885#endif
3895 } 3886 }
3887 }
3896 break; 3888 break;
3897 3889
3898 case XTerm_restoreFG: 3890 case Rxvt_restoreFG:
3899 set_window_color (Color_fg, str); 3891 set_window_color (Color_fg, str);
3900 break; 3892 break;
3901 case XTerm_restoreBG: 3893 case Rxvt_restoreBG:
3902 set_window_color (Color_bg, str); 3894 set_window_color (Color_bg, str);
3903 break; 3895 break;
3904 3896
3905 case XTerm_logfile: 3897 case XTerm_logfile:
3906 // TODO, when secure mode? 3898 // TODO, when secure mode?
3907 break; 3899 break;
3908 3900
3909#ifdef MENUBAR
3910 case URxvt_Menu:
3911 if (OPTION (Opt_insecure))
3912 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3913 break;
3914#endif
3915#if 0 3901#if 0
3916 case XTerm_dumpscreen: /* no error notices */ 3902 case Rxvt_dumpscreen: /* no error notices */
3917 { 3903 {
3918 int fd; 3904 int fd;
3919 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)
3920 { 3906 {
3921 scr_dump (fd); 3907 scr_dump (fd);
… …
3945 allocated.push_back ((void *)res); 3931 allocated.push_back ((void *)res);
3946 set_fonts (); 3932 set_fonts ();
3947 } 3933 }
3948 break; 3934 break;
3949 3935
3950#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
3951 case URxvt_locale: 3945 case URxvt_locale:
3952 if (query) 3946 if (query)
3953 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);
3954 else 3948 else
3955 { 3949 {
3956 set_locale (str); 3950 set_locale (str);
3957 pty.set_utf8_mode (enc_utf8); 3951 pty->set_utf8_mode (enc_utf8);
3958 init_xlocale (); 3952 init_xlocale ();
3959 } 3953 }
3960 break; 3954 break;
3961 3955
3962 case URxvt_view_up: 3956 case URxvt_view_up:
3963 case URxvt_view_down: 3957 case URxvt_view_down:
3958 {
3964 int lines = atoi (str); 3959 int lines = atoi (str);
3965 3960
3966 if (lines) 3961 if (lines)
3967 scr_page (op == URxvt_view_up ? UP : DN, lines); 3962 scr_page (op == URxvt_view_up ? UP : DN, lines);
3968 else 3963 else
3969 {
3970 scr_erase_savelines (); 3964 scr_erase_savelines ();
3971 } 3965 }
3972 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
3973 break; 3974 break;
3974#endif 3975#endif
3975 } 3976 }
3976} 3977}
3977/*----------------------------------------------------------------------*/ 3978/*----------------------------------------------------------------------*/
… …
4008 return state; 4009 return state;
4009} 4010}
4010 4011
4011/* we're not using priv _yet_ */ 4012/* we're not using priv _yet_ */
4012void 4013void
4013rxvt_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)
4014{ 4015{
4015 unsigned int i, j; 4016 unsigned int i, j;
4016 int state; 4017 int state;
4017 4018
4018 static const struct 4019 static const struct
… …
4029 { 5, PrivMode_rVideo }, 4030 { 5, PrivMode_rVideo },
4030 { 6, PrivMode_relOrigin }, 4031 { 6, PrivMode_relOrigin },
4031 { 7, PrivMode_Autowrap }, 4032 { 7, PrivMode_Autowrap },
4032 // 8, bi-directional support mode 4033 // 8, bi-directional support mode
4033 { 9, PrivMode_MouseX10 }, 4034 { 9, PrivMode_MouseX10 },
4034#ifdef menuBar_esc
4035 { menuBar_esc, PrivMode_menuBar },
4036#endif
4037 // 18, 19 printing-related 4035 // 18, 19 printing-related
4038 { 25, PrivMode_VisibleCursor }, 4036 { 25, PrivMode_VisibleCursor },
4039#ifdef scrollBar_esc 4037#ifdef scrollBar_esc
4040 { scrollBar_esc, PrivMode_scrollBar }, 4038 { scrollBar_esc, PrivMode_scrollBar },
4041#endif 4039#endif
… …
4088 /* extra handling for values with state unkept */ 4086 /* extra handling for values with state unkept */
4089 switch (arg[i]) 4087 switch (arg[i])
4090 { 4088 {
4091#if ENABLE_STYLES 4089#if ENABLE_STYLES
4092 case 1021: 4090 case 1021:
4093 if (mode) 4091 set_option (Opt_intensityStyles, mode);
4094 SET_OPTION (Opt_intensityStyles);
4095 else
4096 CLR_OPTION (Opt_intensityStyles);
4097 4092
4098 scr_touch (true); 4093 scr_touch (true);
4099 break; 4094 break;
4100#endif 4095#endif
4101 case 1048: /* alternative cursor save */ 4096 case 1048: /* alternative cursor save */
… …
4123 case 3: /* 80/132 */ 4118 case 3: /* 80/132 */
4124 if (priv_modes & PrivMode_132OK) 4119 if (priv_modes & PrivMode_132OK)
4125 set_widthheight (((state ? 132 : 80) * fwidth), height); 4120 set_widthheight (((state ? 132 : 80) * fwidth), height);
4126 break; 4121 break;
4127 case 4: /* smooth scrolling */ 4122 case 4: /* smooth scrolling */
4128 if (!state) 4123 set_option (Opt_jumpScroll, !state);
4129 SET_OPTION (Opt_jumpScroll);
4130 else
4131 CLR_OPTION (Opt_jumpScroll);
4132 break; 4124 break;
4133 case 5: /* reverse video */ 4125 case 5: /* reverse video */
4134 scr_rvideo_mode (state); 4126 scr_rvideo_mode (state);
4135 break; 4127 break;
4136 case 6: /* relative/absolute origins */ 4128 case 6: /* relative/absolute origins */
… …
4142 /* 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 */
4143 case 9: /* X10 mouse reporting */ 4135 case 9: /* X10 mouse reporting */
4144 if (state) /* orthogonal */ 4136 if (state) /* orthogonal */
4145 priv_modes &= ~PrivMode_MouseX11; 4137 priv_modes &= ~PrivMode_MouseX11;
4146 break; 4138 break;
4147#ifdef menuBar_esc
4148 case menuBar_esc:
4149#ifdef MENUBAR
4150 map_menuBar (state);
4151#endif
4152 break;
4153#endif
4154#ifdef scrollBar_esc 4139#ifdef scrollBar_esc
4155 case scrollBar_esc: 4140 case scrollBar_esc:
4156 if (scrollbar_mapping (state)) 4141 if (scrollbar_mapping (state))
4157 { 4142 {
4158 resize_all_windows (0, 0, 0); 4143 resize_all_windows (0, 0, 0);
… …
4177#if 0 4162#if 0
4178 case 1001: 4163 case 1001:
4179 break; /* X11 mouse highlighting */ 4164 break; /* X11 mouse highlighting */
4180#endif 4165#endif
4181 case 1010: /* scroll to bottom on TTY output inhibit */ 4166 case 1010: /* scroll to bottom on TTY output inhibit */
4182 if (!state) 4167 set_option (Opt_scrollTtyOutput, !state);
4183 SET_OPTION (Opt_scrollTtyOutput);
4184 else
4185 CLR_OPTION (Opt_scrollTtyOutput);
4186 break; 4168 break;
4187 case 1011: /* scroll to bottom on key press */ 4169 case 1011: /* scroll to bottom on key press */
4188 if (state) 4170 set_option (Opt_scrollTtyKeypress, state);
4189 SET_OPTION (Opt_scrollTtyKeypress);
4190 else
4191 CLR_OPTION (Opt_scrollTtyKeypress);
4192 break; 4171 break;
4193 case 1047: /* secondary screen w/ clearing last */ 4172 case 1047: /* secondary screen w/ clearing last */
4194 if (OPTION (Opt_secondaryScreen)) 4173 if (OPTION (Opt_secondaryScreen))
4195 if (current_screen != PRIMARY) 4174 if (current_screen != PRIMARY)
4196 scr_erase_screen (2); 4175 scr_erase_screen (2);
… …
4334 scr_color (Color_bg, Color_bg); 4313 scr_color (Color_bg, Color_bg);
4335 break; 4314 break;
4336 4315
4337 //case 50: // not variable spacing 4316 //case 50: // not variable spacing
4338 4317
4339#ifndef NO_BRIGHTCOLOR 4318#if !ENABLE_MINIMAL
4340 case 90: 4319 case 90:
4341 case 91: /* set bright fg color */ 4320 case 91: /* set bright fg color */
4342 case 92: 4321 case 92:
4343 case 93: 4322 case 93:
4344 case 94: 4323 case 94:
… …
4389 */ 4368 */
4390void 4369void
4391rxvt_term::tt_printf (const char *fmt,...) 4370rxvt_term::tt_printf (const char *fmt,...)
4392{ 4371{
4393 va_list arg_ptr; 4372 va_list arg_ptr;
4394 unsigned char buf[256]; 4373 char buf[256];
4395 4374
4396 va_start (arg_ptr, fmt); 4375 va_start (arg_ptr, fmt);
4397 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4376 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4398 va_end (arg_ptr); 4377 va_end (arg_ptr);
4399 tt_write (buf, strlen (buf)); 4378 tt_write (buf, strlen (buf));
… …
4404 * or generated by us in response to a query ESC sequence. 4383 * or generated by us in response to a query ESC sequence.
4405 */ 4384 */
4406const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4385const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4407 4386
4408void 4387void
4409rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4388rxvt_term::tt_write (const char *data, unsigned int len)
4410{ 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
4411 if (v_buflen == 0) 4396 if (v_buflen == 0)
4412 { 4397 {
4413 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));
4414 4399
4415 if ((unsigned int)written == len) 4400 if ((unsigned int)written == len)
4416 return; 4401 return;
4417 4402
4418 data += written; 4403 data += written;
4419 len -= written; 4404 len -= written;
4420 } 4405 }
4421 4406
4422 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4407 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4423 4408
4424 memcpy (v_buffer + v_buflen, data, len); 4409 memcpy (v_buffer + v_buflen, data, len);
4425 v_buflen += len; 4410 v_buflen += len;
4426 4411
4427 pty_ev.set (EVENT_READ | EVENT_WRITE); 4412 pty_ev.set (EVENT_READ | EVENT_WRITE);
4428} 4413}
4429 4414
4430void rxvt_term::pty_write () 4415void rxvt_term::pty_write ()
4431{ 4416{
4432 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));
4433 4418
4434 if (written > 0) 4419 if (written > 0)
4435 { 4420 {
4436 v_buflen -= written; 4421 v_buflen -= written;
4437 4422

Diff Legend

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