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

Diff Legend

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