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.236 by root, Thu Jan 5 01:04:10 2006 UTC vs.
Revision 1.321 by root, Tue May 1 21:30:01 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: command.C 2 * File: command.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
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
… …
295 298
296 return -1; 299 return -1;
297} 300}
298#endif 301#endif
299 302
300/*{{{ Convert the keypress event into a string */
301void 303void
302rxvt_term::lookup_key (XKeyEvent &ev) 304rxvt_term::key_press (XKeyEvent &ev)
303{ 305{
304 int ctrl, meta, shft, len; 306 int ctrl, meta, shft, len;
305 unsigned int newlen; 307 unsigned int newlen;
306 KeySym keysym; 308 KeySym keysym;
307#ifdef DEBUG_CMD
308 static int debug_key = 1; /* accessible by a debugger only */
309#endif
310 int valid_keysym; 309 int valid_keysym;
311 char kbuf[KBUFSZ]; 310 char kbuf[KBUFSZ];
311
312#if ISO_14755
313 if (iso14755buf & ISO_14755_52)
314 return;
315#endif
312 316
313 /* 317 /*
314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 318 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
315 * escape sequence to toggle the Keypad. 319 * escape sequence to toggle the Keypad.
316 * 320 *
… …
443 scr_move_to (0, 1); 447 scr_move_to (0, 1);
444 return; 448 return;
445 } 449 }
446 else if (keysym == XK_End) 450 else if (keysym == XK_End)
447 { 451 {
448 scr_move_to (1, 0); 452 scr_move_to (1, 1);
449 return; 453 return;
450 } 454 }
451 } 455 }
452#endif 456#endif
453 } 457 }
… …
464 { 468 {
465 switch (keysym) 469 switch (keysym)
466 { 470 {
467 /* normal XTerm key bindings */ 471 /* normal XTerm key bindings */
468 case XK_Insert: /* Shift+Insert = paste mouse selection */ 472 case XK_Insert: /* Shift+Insert = paste mouse selection */
469 selection_request (ev.time, 0, 0); 473 selection_request (ev.time);
470 return; 474 return;
471#if TODO 475#if TODO
472 /* rxvt extras */ 476 /* rxvt extras */
473 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 477 case XK_KP_Add: /* Shift+KP_Add = bigger font */
474 change_font (FONT_UP); 478 change_font (FONT_UP);
… …
867#endif 871#endif
868 /* nil */ ; 872 /* nil */ ;
869 } 873 }
870 } 874 }
871 875
876 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
877 return;
878
872 if (len <= 0) 879 if (len <= 0)
873 return; /* not mapped */ 880 return; /* not mapped */
874 881
875 if (OPTION (Opt_scrollTtyKeypress)) 882 if (option (Opt_scrollTtyKeypress))
876 if (view_start) 883 if (view_start)
877 { 884 {
878 view_start = 0; 885 view_start = 0;
879 want_refresh = 1; 886 want_refresh = 1;
880 } 887 }
… …
902 { 909 {
903 const char ch = C0_ESC; 910 const char ch = C0_ESC;
904 tt_write (&ch, 1); 911 tt_write (&ch, 1);
905 } 912 }
906 913
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); 914 tt_write (kbuf, (unsigned int)len);
918} 915}
919/*}}} */
920 916
917void
918rxvt_term::key_release (XKeyEvent &ev)
919{
920#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
921 KeySym keysym;
922
923 keysym = XLookupKeysym (&ev, ev.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
924#endif
925
926#if ENABLE_FRILLS || ISO_14755
927 // ISO 14755 support
928 if (iso14755buf)
929 if (iso14755buf & ISO_14755_52)
930 {
931# if ENABLE_OVERLAY
932 scr_overlay_off ();
933# endif
934# if ISO_14755
935 // iso14755 part 5.2 handling: release time
936 // first: controls
937 if ((ev.state & ControlMask)
938 && ((keysym >= 0x40 && keysym <= 0x5f)
939 || (keysym >= 0x61 && keysym <= 0x7f)))
940 {
941 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
942 commit_iso14755 ();
943
944 return;
945 }
946
947 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
948 if (i[0] == keysym)
949 {
950 iso14755buf = ISO_14755_51 | i[1];
951 commit_iso14755 ();
952
953 return;
954 }
955
956 scr_bell ();
957# endif
958 iso14755buf = 0;
959
960 return;
961 }
962 else if ((ev.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
963 {
964# if ENABLE_OVERLAY
965 scr_overlay_off ();
966# endif
967 if (iso14755buf & ISO_14755_51)
968 commit_iso14755 ();
969#if ISO_14755
970 else if (iso14755buf & ISO_14755_STARTED)
971 {
972 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
973
974 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
975 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
976 }
977# endif
978 else
979 iso14755buf = 0;
980 }
981#endif
982
983 if (HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
984 return;
985
986#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
987 if (!(ev.state & ControlMask))
988 slip_wheel_ev.stop ();
989 else if (keysym == XK_Control_L || keysym == XK_Control_R)
990 mouse_slip_wheel_speed = 0;
991#endif
992}
993
921#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 994#if defined (KEYSYM_RESOURCE)
922/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
923/* attempt to `write' count to the input buffer */
924unsigned int 995unsigned int
925rxvt_term::cmd_write (const char *str, unsigned int count) 996rxvt_term::cmd_write (const char *str, unsigned int count)
926{ 997{
927 unsigned int n, s; 998 unsigned int n, s;
928 999
… …
967 } 1038 }
968#endif 1039#endif
969 1040
970 if (want_refresh) 1041 if (want_refresh)
971 { 1042 {
1043 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
1044 {
1045 int row = view_start;
1046 int end_row = row + nrow;
1047
1048 while (row > top_row && ROW (row - 1).is_longer ())
1049 --row;
1050
1051 do
1052 {
1053 int start_row = row;
1054 line_t *l;
1055
1056 do
1057 {
1058 l = &ROW (row++);
1059
1060 if (!(l->f & LINE_FILTERED))
1061 {
1062 // line not filtered, mark it as filtered
1063 l->f |= LINE_FILTERED;
1064 while (l->is_longer ())
1065 {
1066 l = &ROW (row++);
1067 l->f |= LINE_FILTERED;
1068 }
1069
1070 // and filter it
1071 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1072
1073 break;
1074 }
1075 }
1076 while (l->is_longer () && row < end_row);
1077 }
1078 while (row < end_row);
1079 }
1080
972 scr_refresh (refresh_type); 1081 scr_refresh ();
973 scrollbar_show (1); 1082 scrollbar_show (1);
974#ifdef USE_XIM 1083#ifdef USE_XIM
975 IMSendSpot (); 1084 IMSendSpot ();
976#endif 1085#endif
977 } 1086 }
… …
980} 1089}
981 1090
982void 1091void
983rxvt_term::check_cb (check_watcher &w) 1092rxvt_term::check_cb (check_watcher &w)
984{ 1093{
985 SET_R (this); 1094 make_current ();
986 SET_LOCALE (locale);
987 1095
988 display->flush (); 1096 display->flush ();
989 1097
990 if (want_refresh && !flush_ev.active) 1098 if (want_refresh && !flush_ev.active)
991 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally 1099 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
992} 1100}
993 1101
994void 1102void
995rxvt_term::flush_cb (time_watcher &w) 1103rxvt_term::flush_cb (time_watcher &w)
996{ 1104{
997 SET_R (this); 1105 make_current ();
998 SET_LOCALE (locale);
999 1106
1000 refresh_limit = 1; 1107 refresh_limit = 1;
1001 refresh_count = 0; 1108 refresh_count = 0;
1002 flush (); 1109 flush ();
1003} 1110}
… …
1007rxvt_term::cursor_blink_cb (time_watcher &w) 1114rxvt_term::cursor_blink_cb (time_watcher &w)
1008{ 1115{
1009 hidden_cursor = !hidden_cursor; 1116 hidden_cursor = !hidden_cursor;
1010 want_refresh = 1; 1117 want_refresh = 1;
1011 1118
1012 w.start (w.at + BLINK_INTERVAL); 1119 w.start (w.at + CURSOR_BLINK_INTERVAL);
1013} 1120}
1014#endif 1121#endif
1015 1122
1016#ifdef TEXT_BLINK 1123#ifdef TEXT_BLINK
1017void 1124void
… …
1031rxvt_term::cont_scroll_cb (time_watcher &w) 1138rxvt_term::cont_scroll_cb (time_watcher &w)
1032{ 1139{
1033 if ((scrollbar_isUp() || scrollbar_isDn()) && 1140 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1034 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1141 scr_page (scrollbar_isUp() ? UP : DN, 1))
1035 { 1142 {
1036 refresh_type |= SMOOTH_REFRESH;
1037 want_refresh = 1; 1143 want_refresh = 1;
1038 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1144 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1039 } 1145 }
1040} 1146}
1041#endif 1147#endif
… …
1045rxvt_term::sel_scroll_cb (time_watcher &w) 1151rxvt_term::sel_scroll_cb (time_watcher &w)
1046{ 1152{
1047 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1153 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1048 { 1154 {
1049 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1155 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1050 refresh_type |= SMOOTH_REFRESH;
1051 want_refresh = 1; 1156 want_refresh = 1;
1052 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1157 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1053 } 1158 }
1054} 1159}
1055#endif 1160#endif
… …
1060{ 1165{
1061 if (mouse_slip_wheel_speed == 0 1166 if (mouse_slip_wheel_speed == 0
1062 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1167 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1063 : scr_page (UP, mouse_slip_wheel_speed)) 1168 : scr_page (UP, mouse_slip_wheel_speed))
1064 { 1169 {
1065 if (view_start == nsaved || 1170 if (view_start == top_row || view_start == 0)
1066 view_start == 0)
1067 mouse_slip_wheel_speed = 0; 1171 mouse_slip_wheel_speed = 0;
1068 1172
1069 refresh_type |= SMOOTH_REFRESH;
1070 want_refresh = 1; 1173 want_refresh = 1;
1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1174 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1072 } 1175 }
1073} 1176}
1074#endif 1177#endif
1075 1178
1076#if HAVE_SCHED_YIELD 1179#if LINUX_YIELD_HACK
1077static struct event_handler 1180static struct event_handler
1078{ 1181{
1079 check_watcher cw_yield; 1182 check_watcher yield_ev;
1080 1183
1081 void yield (check_watcher &w) 1184 void yield_cb (check_watcher &w)
1082 { 1185 {
1083 sched_yield (); 1186 // this should really be sched_yield(), but the linux guys thought
1187 // that giving a process calling sched_yield () less cpu time than
1188 // ones with high nice levels is a useful thing to do. It surely is is
1189 // allowed by the sus... as is returning ENOSYS.
1190
1191 struct timespec ts = { 0, 0 };
1192 nanosleep (&ts, 0);
1193
1084 w.stop (); 1194 w.stop ();
1085 } 1195 }
1086 1196
1087 event_handler () 1197 event_handler ()
1088 : cw_yield (this, &event_handler::yield) 1198 : yield_ev (this, &event_handler::yield_cb)
1089 { 1199 {
1090 } 1200 }
1091} event_handler; 1201} event_handler;
1092#endif 1202#endif
1093 1203
… …
1104 1214
1105 memmove (cmdbuf_base, cmdbuf_ptr, n); 1215 memmove (cmdbuf_base, cmdbuf_ptr, n);
1106 cmdbuf_ptr = cmdbuf_base; 1216 cmdbuf_ptr = cmdbuf_base;
1107 cmdbuf_endp = cmdbuf_ptr + n; 1217 cmdbuf_endp = cmdbuf_ptr + n;
1108 1218
1109 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1219 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1110 1220
1111 if (r > 0) 1221 if (r > 0)
1112 { 1222 {
1113 cmdbuf_endp += r; 1223 cmdbuf_endp += r;
1114 return true; 1224 return true;
1115 } 1225 }
1116 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1226 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1117 { 1227 {
1118#if HAVE_SCHED_YIELD 1228#if LINUX_YIELD_HACK
1119 if (display->is_local) 1229 if (display->is_local)
1120 event_handler.cw_yield.start (); 1230 event_handler.yield_ev.start ();
1121#endif 1231#endif
1122 } 1232 }
1123 else 1233 else
1124 { 1234 {
1125 pty_ev.stop (); 1235 pty_ev.stop ();
1126 1236
1127 if (!OPTION (Opt_hold)) 1237 if (!option (Opt_hold))
1128 destroy (); 1238 destroy ();
1129 } 1239 }
1130 1240
1131 return false; 1241 return false;
1132} 1242}
1133 1243
1134void 1244void
1135rxvt_term::pty_cb (io_watcher &w, short revents) 1245rxvt_term::pty_cb (io_watcher &w, short revents)
1136{ 1246{
1137 SET_R (this); 1247 make_current ();
1138 SET_LOCALE (locale);
1139 1248
1140 if (revents & EVENT_READ) 1249 if (revents & EVENT_READ)
1141 // loop, but don't allow a single term to monopolize us 1250 // loop, but don't allow a single term to monopolize us
1142 while (pty_fill ()) 1251 while (pty_fill ())
1143 if (cmd_parse ()) 1252 if (cmd_parse ())
… …
1148} 1257}
1149 1258
1150void 1259void
1151rxvt_term::pointer_unblank () 1260rxvt_term::pointer_unblank ()
1152{ 1261{
1153 XDefineCursor (display->display, vt, TermWin_cursor); 1262 XDefineCursor (dpy, vt, TermWin_cursor);
1154 recolour_cursor (); 1263 recolour_cursor ();
1155 1264
1156#ifdef POINTER_BLANK 1265#ifdef POINTER_BLANK
1157 hidden_pointer = 0; 1266 hidden_pointer = 0;
1158 1267
1159 if (OPTION (Opt_pointerBlank)) 1268 if (option (Opt_pointerBlank))
1160 pointer_ev.start (NOW + pointerBlankDelay); 1269 pointer_ev.start (NOW + pointerBlankDelay);
1161#endif 1270#endif
1162} 1271}
1163 1272
1164#ifdef POINTER_BLANK 1273#ifdef POINTER_BLANK
1165void 1274void
1166rxvt_term::pointer_blank () 1275rxvt_term::pointer_blank ()
1167{ 1276{
1168 if (! OPTION (Opt_pointerBlank)) 1277 if (!option (Opt_pointerBlank))
1169 return; 1278 return;
1170 1279
1171 XDefineCursor (display->display, vt, display->blank_cursor); 1280 XDefineCursor (dpy, vt, display->blank_cursor);
1172 XFlush (display->display); 1281 XFlush (dpy);
1173 1282
1174 hidden_pointer = 1; 1283 hidden_pointer = 1;
1175} 1284}
1176 1285
1177void 1286void
1178rxvt_term::pointer_cb (time_watcher &w) 1287rxvt_term::pointer_cb (time_watcher &w)
1179{ 1288{
1180 SET_R (this); 1289 make_current ();
1181 SET_LOCALE (locale);
1182 1290
1183 pointer_blank (); 1291 pointer_blank ();
1184} 1292}
1185#endif 1293#endif
1186 1294
… …
1251 (32 + button_number + key_state), 1359 (32 + button_number + key_state),
1252 (32 + x + 1), 1360 (32 + x + 1),
1253 (32 + y + 1)); 1361 (32 + y + 1));
1254} 1362}
1255 1363
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 */ 1364/*{{{ process an X event */
1267void 1365void
1268rxvt_term::x_cb (XEvent &ev) 1366rxvt_term::x_cb (XEvent &ev)
1269{ 1367{
1270 dDisp; 1368 make_current ();
1271 1369
1272 SET_R (this); 1370 dLocal (Display *, dpy);
1273 SET_LOCALE (locale);
1274 1371
1275#if defined(CURSOR_BLINK) 1372 if (ev.xany.window == vt
1276 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1373 && SHOULD_INVOKE (HOOK_X_EVENT)
1277 { 1374 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1278 if (hidden_cursor) 1375 return;
1279 {
1280 hidden_cursor = 0;
1281 want_refresh = 1;
1282 }
1283 1376
1284 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1377 // 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; 1378 Window unused_root, unused_child;
1303 int unused_root_x, unused_root_y; 1379 int unused_root_x, unused_root_y;
1304 unsigned int unused_mask; 1380 unsigned int unused_mask;
1305 1381
1306 switch (ev.type) 1382 switch (ev.type)
1307 { 1383 {
1308 case KeyPress: 1384 case KeyPress:
1309#if ISO_14755 1385 key_press (ev.xkey);
1310 if (!(iso14755buf & ISO_14755_52))
1311#endif
1312 lookup_key (ev.xkey);
1313
1314 break; 1386 break;
1315 1387
1316 case KeyRelease: 1388 case KeyRelease:
1317 { 1389 key_release (ev.xkey);
1318#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1319 KeySym ks;
1320
1321 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1322#endif
1323
1324#if ENABLE_FRILLS || ISO_14755
1325 // ISO 14755 support
1326 if (iso14755buf)
1327 if (iso14755buf & ISO_14755_52)
1328 {
1329# if ENABLE_OVERLAY
1330 scr_overlay_off ();
1331# endif
1332# if ISO_14755
1333 // iso14755 part 5.2 handling: release time
1334 // first: controls
1335 if ((ev.xkey.state & ControlMask)
1336 && ((ks >= 0x40 && ks <= 0x5f)
1337 || (ks >= 0x61 && ks <= 0x7f)))
1338 {
1339 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1340 commit_iso14755 ();
1341 return; // case-break;
1342 }
1343
1344 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1345 if (i[0] == ks)
1346 {
1347 iso14755buf = ISO_14755_51 | i[1];
1348 commit_iso14755 ();
1349 return; // case-break;
1350 }
1351
1352 scr_bell ();
1353# endif
1354 iso14755buf = 0;
1355 break;
1356 }
1357 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1358 {
1359# if ENABLE_OVERLAY
1360 scr_overlay_off ();
1361# endif
1362 if (iso14755buf & ISO_14755_51)
1363 commit_iso14755 ();
1364#if ISO_14755
1365 else if (iso14755buf & ISO_14755_STARTED)
1366 {
1367 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1368
1369 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1370 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1371 }
1372# endif
1373 else
1374 iso14755buf = 0;
1375 }
1376#endif
1377
1378#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1379 if (!(ev.xkey.state & ControlMask))
1380 slip_wheel_ev.stop ();
1381 else if (ks == XK_Control_L || ks == XK_Control_R)
1382 mouse_slip_wheel_speed = 0;
1383#endif
1384 break; 1390 break;
1385 }
1386 1391
1387 case ButtonPress: 1392 case ButtonPress:
1388 button_press (ev.xbutton); 1393 button_press (ev.xbutton);
1389 break; 1394 break;
1390 1395
… …
1392 button_release (ev.xbutton); 1397 button_release (ev.xbutton);
1393 break; 1398 break;
1394 1399
1395 case ClientMessage: 1400 case ClientMessage:
1396 if (ev.xclient.format == 32 1401 if (ev.xclient.format == 32
1397 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1402 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1398 { 1403 {
1404 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1405 {
1406 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1407 {
1399 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1408 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1409 {
1410 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1400 destroy (); 1411 destroy ();
1412 }
1401#if ENABLE_EWMH 1413#if ENABLE_EWMH
1402 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1414 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1403 XSendEvent (disp, ev.xclient.window = display->root, 1415 XSendEvent (dpy, ev.xclient.window = display->root,
1404 False, SubstructureRedirectMask | SubstructureNotifyMask, 1416 False, SubstructureRedirectMask | SubstructureNotifyMask,
1405 &ev); 1417 &ev);
1418#endif
1419 }
1420 }
1421#if ENABLE_XEMBED
1422 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1423 {
1424 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1425 focus_in ();
1426 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1427 focus_out ();
1428 }
1406#endif 1429#endif
1407 } 1430 }
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; 1431 break;
1444 1432
1445 case MappingNotify: 1433 case MappingNotify:
1446 XRefreshKeyboardMapping (&ev.xmapping); 1434 XRefreshKeyboardMapping (&ev.xmapping);
1447 break; 1435 break;
… …
1470 break; 1458 break;
1471 } 1459 }
1472 break; 1460 break;
1473 1461
1474 case FocusIn: 1462 case FocusIn:
1463 if (ev.xfocus.detail != NotifyInferior
1464 && ev.xfocus.detail != NotifyPointer
1465 && ev.xfocus.mode != NotifyGrab)
1475 focus_in (); 1466 focus_in ();
1476 break; 1467 break;
1477 1468
1478 case FocusOut: 1469 case FocusOut:
1470 if (ev.xfocus.detail != NotifyInferior
1471 && ev.xfocus.detail != NotifyPointer
1472 && ev.xfocus.mode != NotifyGrab)
1479 focus_out (); 1473 focus_out ();
1480 break; 1474 break;
1481 1475
1482 case ConfigureNotify: 1476 case ConfigureNotify:
1483 if (ev.xconfigure.window == parent[0]) 1477 if (ev.xconfigure.window == parent[0])
1484 { 1478 {
1485 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1479 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1486 ; 1480 ;
1487 1481
1488 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1482 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1489 { 1483 {
1490 seen_resize = 1; 1484 seen_resize = 1;
1491 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1485 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1492 } 1486 }
1493 1487
1494#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1488 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1489
1490#ifdef TRANSPARENT
1495 if (OPTION (Opt_transparent)) 1491 if (option (Opt_transparent))
1496 check_our_parents (); 1492 check_our_parents ();
1497#endif 1493#endif
1498 } 1494 }
1499 break; 1495 break;
1500 1496
1501 case PropertyNotify: 1497 case PropertyNotify:
1498 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1502 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1499 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1503 && ev.xproperty.state == PropertyNewValue) 1500 && ev.xproperty.state == PropertyNewValue)
1504 selection_property (ev.xproperty.window, ev.xproperty.atom); 1501 selection_property (ev.xproperty.window, ev.xproperty.atom);
1505 1502
1506 break; 1503 break;
1507 1504
1508 case SelectionClear: 1505 case SelectionClear:
1509 selection_clear (); 1506 selection_clear ();
… …
1514 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1511 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1515 break; 1512 break;
1516 1513
1517 case SelectionRequest: 1514 case SelectionRequest:
1518 selection_send (ev.xselectionrequest); 1515 selection_send (ev.xselectionrequest);
1516 break;
1517
1518 case MapNotify:
1519 mapped = 1;
1520#ifdef TEXT_BLINK
1521 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1522#endif
1523 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1519 break; 1524 break;
1520 1525
1521 case UnmapNotify: 1526 case UnmapNotify:
1522 mapped = 0; 1527 mapped = 0;
1523#ifdef TEXT_BLINK 1528#ifdef TEXT_BLINK
1524 text_blink_ev.stop (); 1529 text_blink_ev.stop ();
1525#endif 1530#endif
1526 break; 1531 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; 1532 break;
1534 1533
1535#ifdef TRANSPARENT 1534#ifdef TRANSPARENT
1536 case ReparentNotify: 1535 case ReparentNotify:
1537 rootwin_cb (ev); 1536 rootwin_cb (ev);
… …
1543 if (ev.xany.window == vt) 1542 if (ev.xany.window == vt)
1544 { 1543 {
1545 do 1544 do
1546 scr_expose (ev.xexpose.x, ev.xexpose.y, 1545 scr_expose (ev.xexpose.x, ev.xexpose.y,
1547 ev.xexpose.width, ev.xexpose.height, False); 1546 ev.xexpose.width, ev.xexpose.height, False);
1548 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1547 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1549 1548
1550 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1549 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1551 1550
1552 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1551 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1553 scr_expose (ev.xexpose.x, ev.xexpose.y, 1552 scr_expose (ev.xexpose.x, ev.xexpose.y,
1554 ev.xexpose.width, ev.xexpose.height, False); 1553 ev.xexpose.width, ev.xexpose.height, False);
1555 1554
1556 scr_refresh (refresh_type); 1555 want_refresh = 1;
1557 } 1556 }
1558 else 1557 else
1559 { 1558 {
1560 XEvent unused_event; 1559 XEvent unused_event;
1561 1560
1562 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1561 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1563 ; 1562 ;
1564 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1563 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1565 ; 1564 ;
1566 1565
1567 if (isScrollbarWindow (ev.xany.window)) 1566 if (isScrollbarWindow (ev.xany.window))
1568 { 1567 {
1569 scrollBar.setIdle (); 1568 scrollBar.setIdle ();
1570 scrollbar_show (0); 1569 scrollbar_show (0);
1571 } 1570 }
1572#ifdef MENUBAR
1573 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1574 menubar_expose ();
1575#endif
1576 1571
1577#ifdef TRANSPARENT 1572#ifdef TRANSPARENT
1578 if (am_transparent && ev.xany.window == parent[0]) 1573 if (am_transparent && ev.xany.window == parent[0])
1579 XClearWindow (disp, ev.xany.window); 1574 XClearWindow (dpy, ev.xany.window);
1580#endif 1575#endif
1581 } 1576 }
1582 break; 1577 break;
1583 1578
1584 case MotionNotify: 1579 case MotionNotify:
1585#ifdef POINTER_BLANK 1580#ifdef POINTER_BLANK
1586 if (hidden_pointer) 1581 if (hidden_pointer)
1587 pointer_unblank (); 1582 pointer_unblank ();
1588#endif 1583#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) 1584 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1597 break; 1585 break;
1598 1586
1599 if (ev.xany.window == vt) 1587 if (ev.xany.window == vt)
1600 { 1588 {
1589 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1590 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1591 ; // nop
1601 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1592 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1602 { 1593 {
1603 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1594 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1604 ; 1595 ;
1605 1596
1606 XQueryPointer (disp, vt, 1597 XQueryPointer (dpy, vt,
1607 &unused_root, &unused_child, 1598 &unused_root, &unused_child,
1608 &unused_root_x, &unused_root_y, 1599 &unused_root_x, &unused_root_y,
1609 &ev.xbutton.x, &ev.xbutton.y, 1600 &ev.xbutton.x, &ev.xbutton.y,
1610 &ev.xbutton.state); 1601 &ev.xbutton.state);
1611#ifdef MOUSE_THRESHOLD 1602#ifdef MOUSE_THRESHOLD
… …
1675#endif 1666#endif
1676 } 1667 }
1677 } 1668 }
1678 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1669 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1679 { 1670 {
1680 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1671 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1681 MotionNotify, &ev)) 1672 MotionNotify, &ev))
1682 ; 1673 ;
1683 1674
1684 XQueryPointer (disp, scrollBar.win, 1675 XQueryPointer (dpy, scrollBar.win,
1685 &unused_root, &unused_child, 1676 &unused_root, &unused_child,
1686 &unused_root_x, &unused_root_y, 1677 &unused_root_x, &unused_root_y,
1687 &ev.xbutton.x, &ev.xbutton.y, 1678 &ev.xbutton.x, &ev.xbutton.y,
1688 &unused_mask); 1679 &unused_mask);
1689 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1680 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1690 scrollbar_size ()); 1681 scrollbar_size ());
1691 scr_refresh (refresh_type); 1682 want_refresh = 1;
1692 refresh_limit = 0; 1683 refresh_limit = 0;
1693 scrollbar_show (1); 1684 scrollbar_show (1);
1694 } 1685 }
1695 break; 1686 break;
1696 } 1687 }
1688
1689#if defined(CURSOR_BLINK)
1690 if (option (Opt_cursorBlink) && ev.type == KeyPress)
1691 {
1692 if (hidden_cursor)
1693 {
1694 hidden_cursor = 0;
1695 want_refresh = 1;
1696 }
1697
1698 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1699 }
1700#endif
1701
1702#if defined(POINTER_BLANK)
1703 if (option (Opt_pointerBlank) && pointerBlankDelay > 0)
1704 {
1705 if (ev.type == MotionNotify
1706 || ev.type == ButtonPress
1707 || ev.type == ButtonRelease)
1708 if (hidden_pointer)
1709 pointer_unblank ();
1710
1711 if (ev.type == KeyPress && hidden_pointer == 0)
1712 pointer_blank ();
1713 }
1714#endif
1697} 1715}
1698 1716
1699void 1717void
1700rxvt_term::focus_in () 1718rxvt_term::focus_in ()
1701{ 1719{
1702 if (!focus) 1720 if (!focus)
1703 { 1721 {
1704 focus = 1; 1722 focus = 1;
1705 want_refresh = 1; 1723 want_refresh = 1;
1706 1724
1707 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1725 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1708 1726
1709#if USE_XIM 1727#if USE_XIM
1710 if (Input_Context != NULL) 1728 if (Input_Context != NULL)
1711 { 1729 {
1712 IMSetStatusPosition (); 1730 IMSetPosition ();
1713 XSetICFocus (Input_Context); 1731 XSetICFocus (Input_Context);
1714 } 1732 }
1715#endif 1733#endif
1716#if CURSOR_BLINK 1734#if CURSOR_BLINK
1717 if (OPTION (Opt_cursorBlink)) 1735 if (option (Opt_cursorBlink))
1718 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1736 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1719#endif 1737#endif
1720#if OFF_FOCUS_FADING 1738#if OFF_FOCUS_FADING
1721 if (rs[Rs_fade]) 1739 if (rs[Rs_fade])
1722 { 1740 {
1723 pix_colors = pix_colors_focused; 1741 pix_colors = pix_colors_focused;
… …
1733 if (focus) 1751 if (focus)
1734 { 1752 {
1735 focus = 0; 1753 focus = 0;
1736 want_refresh = 1; 1754 want_refresh = 1;
1737 1755
1738 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1756 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1739 1757
1740#if ENABLE_FRILLS || ISO_14755 1758#if ENABLE_FRILLS || ISO_14755
1741 if (iso14755buf) 1759 if (iso14755buf)
1742 { 1760 {
1743 iso14755buf = 0; 1761 iso14755buf = 0;
… …
1749#if USE_XIM 1767#if USE_XIM
1750 if (Input_Context != NULL) 1768 if (Input_Context != NULL)
1751 XUnsetICFocus (Input_Context); 1769 XUnsetICFocus (Input_Context);
1752#endif 1770#endif
1753#if CURSOR_BLINK 1771#if CURSOR_BLINK
1754 if (OPTION (Opt_cursorBlink)) 1772 if (option (Opt_cursorBlink))
1755 cursor_blink_ev.stop (); 1773 cursor_blink_ev.stop ();
1756 hidden_cursor = 0; 1774 hidden_cursor = 0;
1757#endif 1775#endif
1758#if OFF_FOCUS_FADING 1776#if OFF_FOCUS_FADING
1759 if (rs[Rs_fade]) 1777 if (rs[Rs_fade])
… …
1763 } 1781 }
1764#endif 1782#endif
1765 } 1783 }
1766} 1784}
1767 1785
1768#if TRANSPARENT 1786void
1787rxvt_term::update_fade_color (unsigned int idx)
1788{
1789#if OFF_FOCUS_FADING
1790 if (rs[Rs_fade])
1791 {
1792 rgba c;
1793 pix_colors [Color_fade].get (c);
1794 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1795 }
1796#endif
1797}
1798
1799#if TRANSPARENT || ENABLE_PERL
1769void 1800void
1770rxvt_term::rootwin_cb (XEvent &ev) 1801rxvt_term::rootwin_cb (XEvent &ev)
1771{ 1802{
1772 SET_R (this); 1803 make_current ();
1773 SET_LOCALE (locale);
1774 1804
1805 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1806 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1807 return;
1808
1809# if TRANSPARENT
1775 switch (ev.type) 1810 switch (ev.type)
1776 { 1811 {
1777 case PropertyNotify: 1812 case PropertyNotify:
1778 /* 1813 /*
1779 * if user used some Esetroot compatible prog to set the root bg, 1814 * if user used some Esetroot compatible prog to set the root bg,
… …
1783 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID]) 1818 && ev.xproperty.atom != xa[XA_ESETROOT_PMAP_ID])
1784 return; 1819 return;
1785 1820
1786 /* FALLTHROUGH */ 1821 /* FALLTHROUGH */
1787 case ReparentNotify: 1822 case ReparentNotify:
1788 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1823 if (option (Opt_transparent) && check_our_parents () && am_transparent)
1789 want_refresh = want_full_refresh = 1; 1824 want_refresh = want_full_refresh = 1;
1790 break; 1825 break;
1791 } 1826 }
1827# endif
1792} 1828}
1793#endif 1829#endif
1794 1830
1795void 1831void
1796rxvt_term::button_press (XButtonEvent &ev) 1832rxvt_term::button_press (XButtonEvent &ev)
… …
1805 /* 1841 /*
1806 * VT window processing of button press 1842 * VT window processing of button press
1807 */ 1843 */
1808 if (ev.window == vt) 1844 if (ev.window == vt)
1809 { 1845 {
1846 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1847 return;
1848
1810#if ISO_14755 1849#if ISO_14755
1811 // 5.4 1850 // 5.4
1812 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1851 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1813 { 1852 {
1814 iso14755_54 (ev.x, ev.y); 1853 iso14755_54 (ev.x, ev.y);
… …
1826#ifdef MOUSE_REPORT_DOUBLECLICK 1865#ifdef MOUSE_REPORT_DOUBLECLICK
1827 if (ev.button == MEvent.button && clickintime) 1866 if (ev.button == MEvent.button && clickintime)
1828 { 1867 {
1829 /* same button, within alloted time */ 1868 /* same button, within alloted time */
1830 MEvent.clicks++; 1869 MEvent.clicks++;
1870
1831 if (MEvent.clicks > 1) 1871 if (MEvent.clicks > 1)
1832 { 1872 {
1833 /* only report double clicks */ 1873 /* only report double clicks */
1834 MEvent.clicks = 2; 1874 MEvent.clicks = 2;
1835 mouse_report (ev); 1875 mouse_report (ev);
… …
1855 else 1895 else
1856 { 1896 {
1857 if (ev.button != MEvent.button) 1897 if (ev.button != MEvent.button)
1858 MEvent.clicks = 0; 1898 MEvent.clicks = 0;
1859 1899
1860 if (!PERL_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END)))
1861 switch (ev.button) 1900 switch (ev.button)
1862 { 1901 {
1863 case Button1: 1902 case Button1:
1864 /* allow meta + click to select rectangular areas */ 1903 /* allow meta + click to select rectangular areas */
1865 /* should be done in screen.C */ 1904 /* should be done in screen.C */
1866#if ENABLE_FRILLS 1905#if ENABLE_FRILLS
1867 selection.rect = !!(ev.state & ModMetaMask); 1906 selection.rect = !!(ev.state & ModMetaMask);
1868#else 1907#else
1869 selection.rect = false; 1908 selection.rect = false;
1870#endif 1909#endif
1871 1910
1872 /* allow shift+left click to extend selection */ 1911 /* allow shift+left click to extend selection */
1873 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1912 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1874 { 1913 {
1875 if (MEvent.button == Button1 && clickintime) 1914 if (MEvent.button == Button1 && clickintime)
1876 selection_rotate (ev.x, ev.y); 1915 selection_rotate (ev.x, ev.y);
1877 else 1916 else
1878 selection_extend (ev.x, ev.y, 1); 1917 selection_extend (ev.x, ev.y, 1);
1879 } 1918 }
1880 else 1919 else
1881 { 1920 {
1882 if (MEvent.button == Button1 && clickintime) 1921 if (MEvent.button == Button1 && clickintime)
1883 MEvent.clicks++; 1922 MEvent.clicks++;
1884 else 1923 else
1885 MEvent.clicks = 1; 1924 MEvent.clicks = 1;
1886 1925
1887 selection_click (MEvent.clicks, ev.x, ev.y); 1926 selection_click (MEvent.clicks, ev.x, ev.y);
1888 } 1927 }
1889 1928
1890 MEvent.button = Button1; 1929 MEvent.button = Button1;
1891 break; 1930 break;
1892 1931
1893 case Button3: 1932 case Button3:
1894 if (MEvent.button == Button3 && clickintime) 1933 if (MEvent.button == Button3 && clickintime)
1895 selection_rotate (ev.x, ev.y); 1934 selection_rotate (ev.x, ev.y);
1896 else 1935 else
1897 selection_extend (ev.x, ev.y, 1); 1936 selection_extend (ev.x, ev.y, 1);
1898 1937
1899 MEvent.button = Button3; 1938 MEvent.button = Button3;
1900 break; 1939 break;
1901 } 1940 }
1902 } 1941 }
1903 1942
1904 MEvent.time = ev.time; 1943 MEvent.time = ev.time;
1905 return; 1944 return;
1906 } 1945 }
1907 1946
… …
2043 } 2082 }
2044 2083
2045 break; 2084 break;
2046 } 2085 }
2047 } 2086 }
2087
2048 return; 2088 return;
2049 } 2089 }
2050#if MENUBAR
2051 /*
2052 * Menubar window processing of button press
2053 */
2054 if (isMenuBarWindow (ev.window))
2055 menubar_control (ev);
2056#endif
2057} 2090}
2058 2091
2059void 2092void
2060rxvt_term::button_release (XButtonEvent &ev) 2093rxvt_term::button_release (XButtonEvent &ev)
2061{ 2094{
… …
2067 2100
2068 if (scrollbar_isUpDn ()) 2101 if (scrollbar_isUpDn ())
2069 { 2102 {
2070 scrollBar.setIdle (); 2103 scrollBar.setIdle ();
2071 scrollbar_show (0); 2104 scrollbar_show (0);
2072#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2073 refresh_type &= ~SMOOTH_REFRESH;
2074#endif
2075 } 2105 }
2076 2106
2077#ifdef SELECTION_SCROLLING 2107#ifdef SELECTION_SCROLLING
2078 if (sel_scroll_ev.active) 2108 if (sel_scroll_ev.active)
2079 sel_scroll_ev.stop(); 2109 sel_scroll_ev.stop();
2080#endif 2110#endif
2081 2111
2082 if (ev.window == vt) 2112 if (ev.window == vt)
2083 { 2113 {
2114 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2115 return;
2116
2084#if ISO_14755 2117#if ISO_14755
2085 // 5.4 2118 // 5.4
2086 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2119 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2087 return; 2120 return;
2088#endif 2121#endif
2122
2089 if (reportmode) 2123 if (reportmode)
2090 { 2124 {
2091 /* mouse report from vt window */ 2125 /* mouse report from vt window */
2092 /* don't report release of wheel "buttons" */ 2126 /* don't report release of wheel "buttons" */
2093 if (ev.button >= 4) 2127 if (ev.button >= 4)
… …
2123 { 2157 {
2124 case Button1: 2158 case Button1:
2125 case Button3: 2159 case Button3:
2126 selection_make (ev.time); 2160 selection_make (ev.time);
2127 break; 2161 break;
2162
2128 case Button2: 2163 case Button2:
2129 selection_request (ev.time, ev.x, ev.y); 2164 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2165 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Clipboard : Sel_Primary);
2130 break; 2166 break;
2167
2131#ifdef MOUSE_WHEEL 2168#ifdef MOUSE_WHEEL
2132 case Button4: 2169 case Button4:
2133 case Button5: 2170 case Button5:
2134 { 2171 {
2135 int i; 2172 int i;
… …
2137 2174
2138 v = ev.button == Button4 ? UP : DN; 2175 v = ev.button == Button4 ? UP : DN;
2139 2176
2140 if (ev.state & ShiftMask) 2177 if (ev.state & ShiftMask)
2141 i = 1; 2178 i = 1;
2142 else if (OPTION (Opt_mouseWheelScrollPage)) 2179 else if (option (Opt_mouseWheelScrollPage))
2143 i = nrow - 1; 2180 i = nrow - 1;
2144 else 2181 else
2145 i = 5; 2182 i = 5;
2146 2183
2147# ifdef MOUSE_SLIP_WHEELING 2184# ifdef MOUSE_SLIP_WHEELING
… …
2157 slip_wheel_ev.start (); 2194 slip_wheel_ev.start ();
2158 } 2195 }
2159 else 2196 else
2160 { 2197 {
2161# endif 2198# endif
2162# ifdef JUMP_MOUSE_WHEEL
2163 scr_page (v, i); 2199 scr_page (v, i);
2164 scr_refresh (SMOOTH_REFRESH);
2165 scrollbar_show (1); 2200 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 2201# ifdef MOUSE_SLIP_WHEELING
2175 } 2202 }
2176#endif 2203# endif
2177 } 2204 }
2178 break; 2205 break;
2179#endif 2206#endif
2180 } 2207 }
2181 } 2208 }
2182#ifdef MENUBAR
2183 else if (isMenuBarWindow (ev.window))
2184 menubar_control (ev);
2185#endif
2186} 2209}
2187 2210
2188#ifdef TRANSPARENT 2211#ifdef TRANSPARENT
2189#if TINTING 2212#if TINTING
2190/* taken from aterm-0.4.2 */ 2213/* taken from aterm-0.4.2 */
2191 2214
2192typedef uint32_t RUINT32T; 2215typedef uint32_t RUINT32T;
2193 2216
2194void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2217void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2195{ 2218{
2196 int sh_r, sh_g, sh_b; 2219 int sh_r, sh_g, sh_b;
2197 RUINT32T mask_r, mask_g, mask_b; 2220 RUINT32T mask_r, mask_g, mask_b;
2198 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2221 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2199 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2222 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2200 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2223 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2201 int i; 2224 int i;
2202 2225
2203 Visual *visual = display->visual; 2226 Visual *visual = term->visual;
2204 2227
2205 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2228 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2206 2229
2207 /* for convenience */ 2230 /* for convenience */
2208 mask_r = visual->red_mask; 2231 mask_r = visual->red_mask;
… …
2429 Atom atype; 2452 Atom atype;
2430 unsigned char *prop = NULL; 2453 unsigned char *prop = NULL;
2431 Window root, oldp, *list; 2454 Window root, oldp, *list;
2432 Pixmap rootpixmap = None; 2455 Pixmap rootpixmap = None;
2433 XWindowAttributes wattr, wrootattr; 2456 XWindowAttributes wattr, wrootattr;
2434 dDisp;
2435 2457
2436 pchanged = 0; 2458 pchanged = 0;
2437 2459
2438 if (!OPTION (Opt_transparent)) 2460 if (!option (Opt_transparent))
2439 return pchanged; /* Don't try any more */ 2461 return pchanged; /* Don't try any more */
2440 2462
2441 XGetWindowAttributes (disp, display->root, &wrootattr); 2463 XGetWindowAttributes (dpy, display->root, &wrootattr);
2442 rootdepth = wrootattr.depth; 2464 rootdepth = wrootattr.depth;
2443 2465
2444 XGetWindowAttributes (disp, parent[0], &wattr); 2466 XGetWindowAttributes (dpy, parent[0], &wattr);
2445 2467
2446 if (rootdepth != wattr.depth) 2468 if (rootdepth != wattr.depth)
2447 { 2469 {
2448 if (am_transparent) 2470 if (am_transparent)
2449 { 2471 {
2450 pchanged = 1; 2472 pchanged = 1;
2451 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2473 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2452 am_transparent = am_pixmap_trans = 0; 2474 am_transparent = am_pixmap_trans = 0;
2453 } 2475 }
2454 2476
2455 return pchanged; /* Don't try any more */ 2477 return pchanged; /* Don't try any more */
2456 } 2478 }
2457 2479
2458 /* Get all X ops out of the queue so that our information is up-to-date. */ 2480 /* Get all X ops out of the queue so that our information is up-to-date. */
2459 XSync (disp, False); 2481 XSync (dpy, False);
2460 2482
2461 /* 2483 /*
2462 * Make the frame window set by the window manager have 2484 * Make the frame window set by the window manager have
2463 * the root background. Some window managers put multiple nested frame 2485 * the root background. Some window managers put multiple nested frame
2464 * windows for each client, so we have to take care about that. 2486 * windows for each client, so we have to take care about that.
2465 */ 2487 */
2466 i = (xa[XA_XROOTPMAP_ID] 2488 i = (xa[XA_XROOTPMAP_ID]
2467 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2489 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2468 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2490 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2469 &nitems, &bytes_after, &prop) == Success); 2491 &nitems, &bytes_after, &prop) == Success);
2470 2492
2471 if (!i || prop == NULL) 2493 if (!i || prop == NULL)
2472 i = (xa[XA_ESETROOT_PMAP_ID] 2494 i = (xa[XA_ESETROOT_PMAP_ID]
2473 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2495 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2474 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2496 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2475 &nitems, &bytes_after, &prop) == Success); 2497 &nitems, &bytes_after, &prop) == Success);
2476 2498
2477 if (!i || prop == NULL 2499 if (!i || prop == NULL
2478#if TINTING 2500#if TINTING
2479 || !rs[Rs_color + Color_tint] 2501 || !ISSET_PIXCOLOR (Color_tint)
2480#endif 2502#endif
2481 ) 2503 )
2482 have_pixmap = 0; 2504 have_pixmap = 0;
2483 else 2505 else
2484 { 2506 {
… …
2497 Window cr; 2519 Window cr;
2498 XImage *image; 2520 XImage *image;
2499 GC gc; 2521 GC gc;
2500 XGCValues gcvalue; 2522 XGCValues gcvalue;
2501 2523
2502 XTranslateCoordinates (disp, parent[0], display->root, 2524 XTranslateCoordinates (dpy, parent[0], display->root,
2503 0, 0, &sx, &sy, &cr); 2525 0, 0, &sx, &sy, &cr);
2504 nw = (unsigned int)szHint.width; 2526 nw = (unsigned int)szHint.width;
2505 nh = (unsigned int)szHint.height; 2527 nh = (unsigned int)szHint.height;
2506 nx = ny = 0; 2528 nx = ny = 0;
2507 2529
… …
2520 } 2542 }
2521 2543
2522 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2544 min_it (nw, (unsigned int) (wrootattr.width - sx));
2523 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2545 min_it (nh, (unsigned int) (wrootattr.height - sy));
2524 2546
2525 XSync (disp, False); 2547 XSync (dpy, False);
2526 allowedxerror = -1; 2548 allowedxerror = -1;
2527 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2549 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2528 2550
2529 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2551 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2530 /* XXX: may need a delay here? */ 2552 /* XXX: may need a delay here? */
2531 allowedxerror = 0; 2553 allowedxerror = 0;
2532 2554
… …
2535 if (am_transparent && am_pixmap_trans) 2557 if (am_transparent && am_pixmap_trans)
2536 { 2558 {
2537 pchanged = 1; 2559 pchanged = 1;
2538 if (pixmap != None) 2560 if (pixmap != None)
2539 { 2561 {
2540 XFreePixmap (disp, pixmap); 2562 XFreePixmap (dpy, pixmap);
2541 pixmap = None; 2563 pixmap = None;
2542 } 2564 }
2543 } 2565 }
2544 2566
2545 am_pixmap_trans = 0; 2567 am_pixmap_trans = 0;
2546 } 2568 }
2547 else 2569 else
2548 { 2570 {
2549 if (pixmap != None) 2571 if (pixmap != None)
2550 XFreePixmap (disp, pixmap); 2572 XFreePixmap (dpy, pixmap);
2551 2573
2552#if TINTING 2574#if TINTING
2553 if (ISSET_PIXCOLOR (Color_tint)) 2575 if (ISSET_PIXCOLOR (Color_tint))
2554 { 2576 {
2555 unsigned short rm, gm, bm;
2556 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2577 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2557 2578
2579 rgba c;
2558 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2580 pix_colors_focused [Color_tint].get (c);
2559 2581
2560 ShadeXImage (display, image, shade, rm, gm, bm); 2582 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2561 } 2583 }
2562#endif 2584#endif
2563 2585
2564 pixmap = XCreatePixmap (disp, vt, 2586 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2565 szHint.width, szHint.height, image->depth);
2566 gc = XCreateGC (disp, vt, 0UL, &gcvalue); 2587 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2567 XPutImage (disp, pixmap, gc, image, 0, 0, 2588 XPutImage (dpy, pixmap, gc, image, 0, 0,
2568 nx, ny, image->width, image->height); 2589 nx, ny, image->width, image->height);
2569 XFreeGC (disp, gc); 2590 XFreeGC (dpy, gc);
2570 XDestroyImage (image); 2591 XDestroyImage (image);
2571 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2592 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2572 XClearWindow (disp, parent[0]); 2593 XClearWindow (dpy, parent[0]);
2573 2594
2574 if (!am_transparent || !am_pixmap_trans) 2595 if (!am_transparent || !am_pixmap_trans)
2575 pchanged = 1; 2596 pchanged = 1;
2576 2597
2577 am_transparent = am_pixmap_trans = 1; 2598 am_transparent = am_pixmap_trans = 1;
2578 } 2599 }
2579 } 2600 }
2580 2601
2581 if (am_pixmap_trans) 2602 if (am_pixmap_trans)
2582 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2603 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2583 else 2604 else
2584 { 2605 {
2585 unsigned int n; 2606 unsigned int n;
2586 /* 2607 /*
2587 * InheritPixmap transparency 2608 * InheritPixmap transparency
2588 */ 2609 */
2589 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2610 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2590 { 2611 {
2591 oldp = parent[i]; 2612 oldp = parent[i];
2592 XQueryTree (disp, parent[i - 1], &root, 2613 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2593 &parent[i], &list, &n);
2594 XFree (list); 2614 XFree (list);
2595 2615
2596 if (parent[i] == display->root) 2616 if (parent[i] == display->root)
2597 { 2617 {
2598 if (oldp != None) 2618 if (oldp != None)
… …
2606 } 2626 }
2607 2627
2608 n = 0; 2628 n = 0;
2609 2629
2610 if (pchanged) 2630 if (pchanged)
2611 {
2612 for (; n < (unsigned int)i; n++) 2631 for (; n < (unsigned int)i; n++)
2613 { 2632 {
2614 XGetWindowAttributes (disp, parent[n], &wattr); 2633 XGetWindowAttributes (dpy, parent[n], &wattr);
2634
2615 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2635 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2616 { 2636 {
2617 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2637 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2618 break; 2638 break;
2619 } 2639 }
2620 } 2640 }
2621 }
2622 2641
2623 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2642 if (n > (sizeof (parent) / sizeof (parent[0])))
2624 { 2643 {
2625 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2644 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2626 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2645 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2627 am_transparent = 0; 2646 am_transparent = 0;
2628 /* XXX: also turn off Opt_transparent? */ 2647 /* XXX: also turn off Opt_transparent? */
2629 } 2648 }
2630 else 2649 else
2631 { 2650 {
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++) 2651 for (n = 0; n < (unsigned int)i; n++)
2638 { 2652 {
2639 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2653 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2640 XClearWindow (disp, parent[n]); 2654 XClearWindow (dpy, parent[n]);
2641 } 2655 }
2642 2656
2643 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2657 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2644 am_transparent = 1; 2658 am_transparent = 1;
2645 } 2659 }
2646 2660
2647 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2661 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2648 parent[i] = None; 2662 parent[i] = None;
2649 } 2663 }
2650 2664
2651 if (scrollBar.win) 2665 if (scrollBar.win)
2652 { 2666 {
2653 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2667 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2654 scrollBar.setIdle (); 2668 scrollBar.setIdle ();
2655 scrollbar_show (0); 2669 scrollbar_show (0);
2656 } 2670 }
2657 2671
2658 if (am_transparent) 2672 if (am_transparent)
… …
2670 2684
2671bool 2685bool
2672rxvt_term::cmd_parse () 2686rxvt_term::cmd_parse ()
2673{ 2687{
2674 bool flag = false; 2688 bool flag = false;
2675 unicode_t ch = NOCHAR; 2689 wchar_t ch = NOCHAR;
2676 char *seq_begin; // remember start of esc-sequence here 2690 char *seq_begin; // remember start of esc-sequence here
2677 2691
2678 for (;;) 2692 for (;;)
2679 { 2693 {
2680 if (ch == NOCHAR) 2694 if (ch == NOCHAR)
2681 { 2695 {
2682 seq_begin = cmdbuf_ptr; 2696 seq_begin = cmdbuf_ptr;
2683 ch = next_char (); 2697 ch = next_char ();
2684 }
2685 2698
2686 if (ch == NOCHAR) // TODO: improve 2699 if (ch == NOCHAR)
2687 break; 2700 break;
2701 }
2688 2702
2689 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2703 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2690 { 2704 {
2691 if (!seen_input) 2705 if (!seen_input)
2692 { 2706 {
… …
2701 if (seen_resize && cmd_pid) 2715 if (seen_resize && cmd_pid)
2702 kill (-cmd_pid, SIGWINCH); 2716 kill (-cmd_pid, SIGWINCH);
2703 } 2717 }
2704 2718
2705 /* Read a text string from the input buffer */ 2719 /* Read a text string from the input buffer */
2706 unicode_t buf[UBUFSIZ]; 2720 wchar_t buf[UBUFSIZ];
2707 bool refreshnow = false; 2721 bool refreshnow = false;
2708 int nlines = 0; 2722 int nlines = 0;
2709 unicode_t *str = buf; 2723 wchar_t *str = buf;
2710 unicode_t *eol = str + min (ncol, UBUFSIZ); 2724 wchar_t *eol = str + min (ncol, UBUFSIZ);
2711 2725
2712 for (;;) 2726 for (;;)
2713 { 2727 {
2714 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2728 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2715 break; 2729 break;
… …
2721 if (ch == C0_LF) 2735 if (ch == C0_LF)
2722 nlines++; 2736 nlines++;
2723 2737
2724 refresh_count++; 2738 refresh_count++;
2725 2739
2726 if (!OPTION (Opt_jumpScroll) 2740 if (!option (Opt_jumpScroll)
2727 || (refresh_count >= refresh_limit * (nrow - 1))) 2741 || (refresh_count >= refresh_limit * (nrow - 1)))
2728 { 2742 {
2729 refreshnow = true; 2743 refreshnow = true;
2730 refresh_count = 0; 2744 refresh_count = 0;
2731 ch = NOCHAR; 2745 ch = NOCHAR;
… …
2733 } 2747 }
2734 2748
2735 // scr_add_lines only works for nlines <= nrow - 1. 2749 // scr_add_lines only works for nlines <= nrow - 1.
2736 if (nlines >= nrow - 1) 2750 if (nlines >= nrow - 1)
2737 { 2751 {
2752 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2738 if (!PERL_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END))) 2753 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2739 scr_add_lines (buf, nlines, str - buf); 2754 scr_add_lines (buf, str - buf, nlines);
2740 2755
2741 nlines = 0; 2756 nlines = 0;
2742 str = buf; 2757 str = buf;
2743 eol = str + min (ncol, UBUFSIZ); 2758 eol = str + min (ncol, UBUFSIZ);
2744 } 2759 }
… …
2758 2773
2759 seq_begin = cmdbuf_ptr; 2774 seq_begin = cmdbuf_ptr;
2760 ch = next_char (); 2775 ch = next_char ();
2761 } 2776 }
2762 2777
2778 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2763 if (!PERL_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END))) 2779 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2764 scr_add_lines (buf, nlines, str - buf); 2780 scr_add_lines (buf, str - buf, nlines);
2765 2781
2766 /* 2782 /*
2767 * If there have been a lot of new lines, then update the screen 2783 * If there have been a lot of new lines, then update the screen
2768 * What the heck I'll cheat and only refresh less than every page-full. 2784 * What the heck I'll cheat and only refresh less than every page-full.
2769 * the number of pages between refreshes is refresh_limit, which 2785 * the number of pages between refreshes is refresh_limit, which
2770 * is incremented here because we must be doing flat-out scrolling. 2786 * is incremented here because we must be doing flat-out scrolling.
2771 */ 2787 */
2772 if (refreshnow) 2788 if (refreshnow)
2773 { 2789 {
2774 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2790 if (option (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2775 refresh_limit++; 2791 refresh_limit++;
2776 else 2792 else
2777 { 2793 {
2778 flag = true; 2794 flag = true;
2795 //TODO: due to popular request, implement "skipscroll" option here
2779 scr_refresh (refresh_type); 2796 scr_refresh ();
2780 flush_ev.stop (); 2797 want_refresh = 1;
2781 } 2798 }
2782 } 2799 }
2783 2800
2784 } 2801 }
2785 else 2802 else
… …
2800 } 2817 }
2801 2818
2802 return flag; 2819 return flag;
2803} 2820}
2804 2821
2805// read the next octet
2806unicode_t
2807rxvt_term::next_octet ()
2808{
2809 return cmdbuf_ptr < cmdbuf_endp
2810 ? *cmdbuf_ptr++
2811 : NOCHAR;
2812}
2813
2814// read the next character 2822// read the next character
2815unicode_t 2823wchar_t
2816rxvt_term::next_char () 2824rxvt_term::next_char () NOTHROW
2817{ 2825{
2818 while (cmdbuf_ptr < cmdbuf_endp) 2826 while (cmdbuf_ptr < cmdbuf_endp)
2819 { 2827 {
2820 // assume 7-bit to be ascii ALWAYS 2828 // assume 7-bit to be ascii ALWAYS
2821 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2829 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2830 cmdbuf_ptr = cmdbuf_endp; 2838 cmdbuf_ptr = cmdbuf_endp;
2831 break; 2839 break;
2832 } 2840 }
2833 2841
2834 if (len == (size_t)-1) 2842 if (len == (size_t)-1)
2835 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2843 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2836 2844
2837 // assume wchar == unicode 2845 // assume wchar == unicode
2838 cmdbuf_ptr += len; 2846 cmdbuf_ptr += len;
2839 return wc & UNICODE_MASK; 2847 return wc & UNICODE_MASK;
2840 } 2848 }
2841 2849
2842 return NOCHAR; 2850 return NOCHAR;
2843} 2851}
2852
2853// read the next octet
2854uint32_t
2855rxvt_term::next_octet () NOTHROW
2856{
2857 return cmdbuf_ptr < cmdbuf_endp
2858 ? (unsigned char)*cmdbuf_ptr++
2859 : NOCHAR;
2860}
2861
2862static class out_of_input out_of_input;
2844 2863
2845/* rxvt_cmd_getc () - Return next input character */ 2864/* rxvt_cmd_getc () - Return next input character */
2846/* 2865/*
2847 * Return the next input character after first passing any keyboard input 2866 * Return the next input character after first passing any keyboard input
2848 * to the command. 2867 * to the command.
2849 */ 2868 */
2850unicode_t 2869wchar_t
2851rxvt_term::cmd_getc () 2870rxvt_term::cmd_getc () THROW ((class out_of_input))
2852{ 2871{
2853 unicode_t c = next_char (); 2872 wchar_t c = next_char ();
2854 2873
2855 if (c == NOCHAR) 2874 if (c == NOCHAR)
2856 throw out_of_input; 2875 throw out_of_input;
2857 2876
2858 return c; 2877 return c;
2859} 2878}
2860 2879
2861unicode_t 2880uint32_t
2862rxvt_term::cmd_get8 () 2881rxvt_term::cmd_get8 () THROW ((class out_of_input))
2863{ 2882{
2864 unicode_t c = next_octet (); 2883 uint32_t c = next_octet ();
2865 2884
2866 if (c == NOCHAR) 2885 if (c == NOCHAR)
2867 throw out_of_input; 2886 throw out_of_input;
2868 2887
2869 return c; 2888 return c;
… …
3105 scr_charset_set (2, (unsigned int)cmd_getc ()); 3124 scr_charset_set (2, (unsigned int)cmd_getc ());
3106 break; 3125 break;
3107 case '+': 3126 case '+':
3108 scr_charset_set (3, (unsigned int)cmd_getc ()); 3127 scr_charset_set (3, (unsigned int)cmd_getc ());
3109 break; 3128 break;
3110#if ENABLE_FRILLS 3129#if !ENABLE_MINIMAL
3111 case '6': 3130 case '6':
3112 scr_backindex (); 3131 scr_backindex ();
3113 break; 3132 break;
3114#endif 3133#endif
3115 case '7': 3134 case '7':
3116 scr_cursor (SAVE); 3135 scr_cursor (SAVE);
3117 break; 3136 break;
3118 case '8': 3137 case '8':
3119 scr_cursor (RESTORE); 3138 scr_cursor (RESTORE);
3120 break; 3139 break;
3121#if ENABLE_FRILLS 3140#if !ENABLE_MINIMAL
3122 case '9': 3141 case '9':
3123 scr_forwardindex (); 3142 scr_forwardindex ();
3124 break; 3143 break;
3125#endif 3144#endif
3126 case '=': 3145 case '=':
… …
3136 break; 3155 break;
3137 3156
3138 /* 8.3.87: NEXT LINE */ 3157 /* 8.3.87: NEXT LINE */
3139 case C1_NEL: /* ESC E */ 3158 case C1_NEL: /* ESC E */
3140 { 3159 {
3141 unicode_t nlcr[] = { C0_LF, C0_CR }; 3160 wchar_t nlcr[] = { C0_LF, C0_CR };
3142 scr_add_lines (nlcr, 1, 2); 3161 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3143 } 3162 }
3144 break; 3163 break;
3145 3164
3146 /* kidnapped escape sequence: Should be 8.3.48 */ 3165 /* kidnapped escape sequence: Should be 8.3.48 */
3147 case C1_ESA: /* ESC G */ 3166 case C1_ESA: /* ESC G */
… …
3288 ndef = get_byte_array_bit (csi_defaults, i); 3307 ndef = get_byte_array_bit (csi_defaults, i);
3289 for (p = 0; p < nargs; p++) 3308 for (p = 0; p < nargs; p++)
3290 if (arg[p] == -1) 3309 if (arg[p] == -1)
3291 arg[p] = ndef; 3310 arg[p] = ndef;
3292 3311
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 /* 3312 /*
3301 * private mode handling 3313 * private mode handling
3302 */ 3314 */
3303 if (priv) 3315 if (priv)
3304 { 3316 {
3305 switch (priv) 3317 switch (priv)
3306 { 3318 {
3307 case '>': 3319 case '>':
3308 if (ch == CSI_DA) /* secondary device attributes */ 3320 if (ch == CSI_DA) /* secondary device attributes */
3309 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 3321 {
3322 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3323 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3324 //
3325 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3326 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3327 // that we do not support xterm mouse reporting (should be 95 when we do).
3328 //
3329 tt_printf ("\033[>%d;94;0c", 'U');
3330 }
3310 break; 3331 break;
3311 case '?': 3332 case '?':
3312 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3333 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3313 process_terminal_mode (ch, priv, nargs, arg); 3334 process_terminal_mode (ch, priv, nargs, arg);
3314 break; 3335 break;
… …
3440 break; 3461 break;
3441 case 6: /* CPR requested */ 3462 case 6: /* CPR requested */
3442 scr_report_position (); 3463 scr_report_position ();
3443 break; 3464 break;
3444 case 7: /* unofficial extension */ 3465 case 7: /* unofficial extension */
3445 if (OPTION (Opt_insecure)) 3466 if (option (Opt_insecure))
3446 tt_printf ("%-.250s\012", rs[Rs_display_name]); 3467 tt_printf ("%-.250s\012", rs[Rs_display_name]);
3447 break; 3468 break;
3448 case 8: /* unofficial extension */ 3469 case 8: /* unofficial extension */
3449 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST); 3470 process_xterm_seq (XTerm_title, RESNAME "-" VERSION, CHAR_ST);
3450 break; 3471 break;
… …
3517 break; 3538 break;
3518 case CSI_75: 3539 case CSI_75:
3519 scr_cursor (RESTORE); 3540 scr_cursor (RESTORE);
3520 break; 3541 break;
3521 3542
3522#if ENABLE_FRILLS 3543#if !ENABLE_MINIMAL
3523 case CSI_74: 3544 case CSI_74:
3524 process_window_ops (arg, nargs); 3545 process_window_ops (arg, nargs);
3525 break; 3546 break;
3526#endif 3547#endif
3527 3548
… …
3534 break; 3555 break;
3535 } 3556 }
3536} 3557}
3537/*}}} */ 3558/*}}} */
3538 3559
3539#if ENABLE_FRILLS 3560#if !ENABLE_MINIMAL
3540/* ARGSUSED */ 3561/* ARGSUSED */
3541void 3562void
3542rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3563rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3543{ 3564{
3544 int x, y; 3565 int x, y;
3545 XWindowAttributes wattr; 3566 XWindowAttributes wattr;
3546 Window wdummy; 3567 Window wdummy;
3547 dDisp; 3568
3569 dLocal (Display *, dpy);
3548 3570
3549 if (nargs == 0) 3571 if (nargs == 0)
3550 return; 3572 return;
3551 3573
3552 switch (args[0]) 3574 switch (args[0])
3553 { 3575 {
3554 /* 3576 /*
3555 * commands 3577 * commands
3556 */ 3578 */
3557 case 1: /* deiconify window */ 3579 case 1: /* deiconify window */
3558 XMapWindow (disp, parent[0]); 3580 XMapWindow (dpy, parent[0]);
3559 break; 3581 break;
3560 case 2: /* iconify window */ 3582 case 2: /* iconify window */
3561 XIconifyWindow (disp, parent[0], display->screen); 3583 XIconifyWindow (dpy, parent[0], display->screen);
3562 break; 3584 break;
3563 case 3: /* set position (pixels) */ 3585 case 3: /* set position (pixels) */
3564 XMoveWindow (disp, parent[0], args[1], args[2]); 3586 XMoveWindow (dpy, parent[0], args[1], args[2]);
3565 break; 3587 break;
3566 case 4: /* set size (pixels) */ 3588 case 4: /* set size (pixels) */
3567 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3589 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3568 break; 3590 break;
3569 case 5: /* raise window */ 3591 case 5: /* raise window */
3570 XRaiseWindow (disp, parent[0]); 3592 XRaiseWindow (dpy, parent[0]);
3571 break; 3593 break;
3572 case 6: /* lower window */ 3594 case 6: /* lower window */
3573 XLowerWindow (disp, parent[0]); 3595 XLowerWindow (dpy, parent[0]);
3574 break; 3596 break;
3575 case 7: /* refresh window */ 3597 case 7: /* refresh window */
3576 scr_touch (true); 3598 scr_touch (true);
3577 break; 3599 break;
3578 case 8: /* set size (chars) */ 3600 case 8: /* set size (chars) */
… …
3585 if (args[0] >= 24) /* set height (chars) */ 3607 if (args[0] >= 24) /* set height (chars) */
3586 set_widthheight ((unsigned int)width, 3608 set_widthheight ((unsigned int)width,
3587 (unsigned int) (args[1] * fheight)); 3609 (unsigned int) (args[1] * fheight));
3588 break; 3610 break;
3589 3611
3590
3591 /* 3612 /*
3592 * reports - some output format copied from XTerm 3613 * reports - some output format copied from XTerm
3593 */ 3614 */
3594 case 11: /* report window state */ 3615 case 11: /* report window state */
3595 XGetWindowAttributes (disp, parent[0], &wattr); 3616 XGetWindowAttributes (dpy, parent[0], &wattr);
3596 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3617 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3597 break; 3618 break;
3598 case 13: /* report window position */ 3619 case 13: /* report window position */
3599 XGetWindowAttributes (disp, parent[0], &wattr); 3620 XGetWindowAttributes (dpy, parent[0], &wattr);
3600 XTranslateCoordinates (disp, parent[0], wattr.root, 3621 XTranslateCoordinates (dpy, parent[0], wattr.root,
3601 -wattr.border_width, -wattr.border_width, 3622 -wattr.border_width, -wattr.border_width,
3602 &x, &y, &wdummy); 3623 &x, &y, &wdummy);
3603 tt_printf ("\033[3;%d;%dt", x, y); 3624 tt_printf ("\033[3;%d;%dt", x, y);
3604 break; 3625 break;
3605 case 14: /* report window size (pixels) */ 3626 case 14: /* report window size (pixels) */
3606 XGetWindowAttributes (disp, parent[0], &wattr); 3627 XGetWindowAttributes (dpy, parent[0], &wattr);
3607 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3628 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3608 break; 3629 break;
3609 case 18: /* report text area size (chars) */ 3630 case 18: /* report text area size (chars) */
3610 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3631 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3611 break; 3632 break;
… …
3613 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3634 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3614 break; 3635 break;
3615 case 20: /* report icon label */ 3636 case 20: /* report icon label */
3616 { 3637 {
3617 char *s; 3638 char *s;
3618 XGetIconName (disp, parent[0], &s); 3639 XGetIconName (dpy, parent[0], &s);
3619 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3640 tt_printf ("\033]L%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3620 XFree (s); 3641 XFree (s);
3621 } 3642 }
3622 break; 3643 break;
3623 case 21: /* report window title */ 3644 case 21: /* report window title */
3624 { 3645 {
3625 char *s; 3646 char *s;
3626 XFetchName (disp, parent[0], &s); 3647 XFetchName (dpy, parent[0], &s);
3627 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3648 tt_printf ("\033]l%-.250s\234", option (Opt_insecure) && s ? s : ""); /* 8bit ST */
3628 XFree (s); 3649 XFree (s);
3629 } 3650 }
3630 break; 3651 break;
3631 } 3652 }
3632} 3653}
… …
3659 seen_esc = true; 3680 seen_esc = true;
3660 continue; 3681 continue;
3661 } 3682 }
3662 else if (ch == C0_BEL || ch == CHAR_ST) 3683 else if (ch == C0_BEL || ch == CHAR_ST)
3663 break; 3684 break;
3685 else if (ch == C0_SYN)
3686 ch = cmd_get8 ();
3664 else if (ch < 0x20) 3687 else if (ch < 0x20)
3665 return NULL; /* other control character - exit */ 3688 return NULL; /* other control character - exit */
3666 3689
3667 seen_esc = false; 3690 seen_esc = false;
3668 3691
3669 if (n >= STRING_MAX - 1) 3692 if (n >= STRING_MAX - 1)
3670 // stop at some sane length 3693 // stop at some sane length
3671 return NULL; 3694 return NULL;
3672 3695
3673 if (ch == C0_SYN)
3674 string[n++] = cmd_get8 ();
3675 else
3676 string[n++] = ch; 3696 string[n++] = ch;
3677 } 3697 }
3678 3698
3679 string[n++] = '\0'; 3699 string[n++] = '\0';
3680 3700
3681 ends_how = (ch == 0x5c ? C0_ESC : ch); 3701 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3732void 3752void
3733rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3753rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3734{ 3754{
3735 if (str[0] == '?' && !str[1]) 3755 if (str[0] == '?' && !str[1])
3736 { 3756 {
3737 unsigned short r, g, b; 3757 rgba c;
3738 pix_colors_focused[color].get (display, r, g, b); 3758 pix_colors_focused[color].get (c);
3759
3760#if XFT
3761 if (c.a != rgba::MAX_CC)
3762 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3763 else
3764#endif
3739 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3765 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3740 } 3766 }
3741 else 3767 else
3742 set_window_color (color, str); 3768 set_window_color (color, str);
3743} 3769}
3744 3770
… …
3746 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3772 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3747 */ 3773 */
3748void 3774void
3749rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3775rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3750{ 3776{
3751 int changed = 0;
3752 int color; 3777 int color;
3753 char *buf, *name; 3778 char *buf, *name;
3754 bool query = str[0] == '?' && !str[1]; 3779 bool query = str[0] == '?' && !str[1];
3755 int saveop = op; 3780 int saveop = op;
3756 dDisp; 3781
3782 dLocal (Display *, dpy);
3757 3783
3758 assert (str != NULL); 3784 assert (str != NULL);
3785
3786 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3787 return;
3788
3759 switch (op) 3789 switch (op)
3760 { 3790 {
3761 case XTerm_name: 3791 case XTerm_name:
3762 set_title (str); 3792 set_title (str);
3763 /* FALLTHROUGH */ 3793 /* FALLTHROUGH */
… …
3777 unsigned long bytes_after; 3807 unsigned long bytes_after;
3778 unsigned char *value = 0; 3808 unsigned char *value = 0;
3779 const char *str = ""; 3809 const char *str = "";
3780 3810
3781 if (prop 3811 if (prop
3782 && XGetWindowProperty (disp, parent[0], 3812 && XGetWindowProperty (dpy, parent[0],
3783 prop, 0, 1<<16, 0, AnyPropertyType, 3813 prop, 0, 1<<16, 0, AnyPropertyType,
3784 &actual_type, &actual_format, 3814 &actual_type, &actual_format,
3785 &nitems, &bytes_after, &value) == Success 3815 &nitems, &bytes_after, &value) == Success
3786 && actual_type != None 3816 && actual_type != None
3787 && actual_format == 8) 3817 && actual_format == 8)
3788 str = (const char *)(value); 3818 str = (const char *)(value);
3789 3819
3790 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3820 tt_printf ("\033]%d;%s%c", op, str, resp);
3791 3821
3792 XFree (value); 3822 XFree (value);
3793 } 3823 }
3794 else 3824 else
3795 { 3825 {
… …
3799 { 3829 {
3800 *eq = 0; 3830 *eq = 0;
3801 set_utf8_property (display->atom (str), eq + 1); 3831 set_utf8_property (display->atom (str), eq + 1);
3802 } 3832 }
3803 else 3833 else
3804 XDeleteProperty (disp, parent[0], 3834 XDeleteProperty (dpy, parent[0],
3805 display->atom (str)); 3835 display->atom (str));
3806 } 3836 }
3807 break; 3837 break;
3808 3838
3809 case XTerm_Color: 3839 case XTerm_Color:
… …
3811 { 3841 {
3812 if ((name = strchr (buf, ';')) == NULL) 3842 if ((name = strchr (buf, ';')) == NULL)
3813 break; 3843 break;
3814 3844
3815 *name++ = '\0'; 3845 *name++ = '\0';
3816 color = atoi (buf); 3846 color = atoi (buf) + minCOLOR;
3817 3847
3818 if (color < 0 || color >= TOTAL_COLORS) 3848 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3819 break; 3849 break;
3820 3850
3821 if ((buf = strchr (name, ';')) != NULL) 3851 if ((buf = strchr (name, ';')) != NULL)
3822 *buf++ = '\0'; 3852 *buf++ = '\0';
3823 3853
3824 if (name[0] == '?' && !name[1]) 3854 process_color_seq (op, color, name, resp);
3825 {
3826 unsigned short r, g, b;
3827 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3828 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3829 }
3830 else
3831 set_window_color (color + minCOLOR, name);
3832 } 3855 }
3833 break; 3856 break;
3834 case XTerm_Color00: 3857 case XTerm_Color00:
3835 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3858 process_color_seq (op, Color_fg, str, resp);
3836 break; 3859 break;
3837 case XTerm_Color01: 3860 case XTerm_Color01:
3838 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3861 process_color_seq (op, Color_bg, str, resp);
3839 break; 3862 break;
3840#ifndef NO_CURSORCOLOR 3863#ifndef NO_CURSORCOLOR
3841 case XTerm_Color_cursor: 3864 case XTerm_Color_cursor:
3842 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3865 process_color_seq (op, Color_cursor, str, resp);
3843 break; 3866 break;
3844#endif 3867#endif
3845 case XTerm_Color_pointer_fg: 3868 case XTerm_Color_pointer_fg:
3846 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3869 process_color_seq (op, Color_pointer_fg, str, resp);
3847 break; 3870 break;
3848 case XTerm_Color_pointer_bg: 3871 case XTerm_Color_pointer_bg:
3849 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3872 process_color_seq (op, Color_pointer_bg, str, resp);
3850 break; 3873 break;
3851#ifndef NO_BOLD_UNDERLINE_REVERSE 3874#ifndef NO_BOLD_UNDERLINE_REVERSE
3852 case XTerm_Color_BD:
3853 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3854 break;
3855 case XTerm_Color_UL:
3856 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3857 break;
3858 case XTerm_Color_RV: 3875 case XTerm_Color_RV:
3859 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3876 process_color_seq (op, Color_RV, str, resp);
3877 break;
3878 case Rxvt_Color_BD:
3879 case URxvt_Color_BD:
3880 process_color_seq (op, Color_BD, str, resp);
3881 break;
3882 case Rxvt_Color_UL:
3883 case URxvt_Color_UL:
3884 process_color_seq (op, Color_UL, str, resp);
3860 break; 3885 break;
3861 case URxvt_Color_IT: 3886 case URxvt_Color_IT:
3862 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3887 process_color_seq (op, Color_IT, str, resp);
3863 break; 3888 break;
3864#endif 3889#endif
3865#if TRANSPARENT && TINTING 3890#if TRANSPARENT && TINTING
3866 case URxvt_Color_tint: 3891 case URxvt_Color_tint:
3867 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3892 process_color_seq (op, Color_tint, str, resp);
3893
3868 check_our_parents (); 3894 check_our_parents ();
3895
3869 if (am_transparent) 3896 if (am_transparent)
3870 want_full_refresh = want_refresh = 1; 3897 want_full_refresh = want_refresh = 1;
3871 break;
3872#endif
3873 3898
3899 break;
3900#endif
3901
3874 case XTerm_Pixmap: 3902 case Rxvt_Pixmap:
3903 {
3875 if (*str != ';') 3904 if (*str != ';')
3876 { 3905 {
3877#if XPM_BACKGROUND 3906#if XPM_BACKGROUND
3878 scale_pixmap (""); /* reset to default scaling */ 3907 scale_pixmap (""); /* reset to default scaling */
3879 set_bgPixmap (str); /* change pixmap */ 3908 set_bgPixmap (str); /* change pixmap */
3880#endif
3881 scr_touch (true); 3909 scr_touch (true);
3910#endif
3882 } 3911 }
3912
3913 int changed = 0;
3914
3883 while ((str = strchr (str, ';')) != NULL) 3915 while ((str = strchr (str, ';')) != NULL)
3884 { 3916 {
3885 str++; 3917 str++;
3886#if XPM_BACKGROUND 3918#if XPM_BACKGROUND
3887 changed += scale_pixmap (str); 3919 changed += scale_pixmap (str);
3888#endif 3920#endif
3889 } 3921 }
3890 3922
3891 if (changed) 3923 if (changed)
3892 { 3924 {
3893#ifdef XPM_BACKGROUND 3925#ifdef XPM_BACKGROUND
3894 resize_pixmap (); 3926 resize_pixmap ();
3895#endif
3896 scr_touch (true); 3927 scr_touch (true);
3928#endif
3897 } 3929 }
3930 }
3898 break; 3931 break;
3899 3932
3900 case XTerm_restoreFG: 3933 case Rxvt_restoreFG:
3901 set_window_color (Color_fg, str); 3934 set_window_color (Color_fg, str);
3902 break; 3935 break;
3903 case XTerm_restoreBG: 3936 case Rxvt_restoreBG:
3904 set_window_color (Color_bg, str); 3937 set_window_color (Color_bg, str);
3905 break; 3938 break;
3906 3939
3907 case XTerm_logfile: 3940 case XTerm_logfile:
3908 // TODO, when secure mode? 3941 // TODO, when secure mode?
3909 break; 3942 break;
3910 3943
3911#ifdef MENUBAR
3912 case URxvt_Menu:
3913 if (OPTION (Opt_insecure))
3914 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3915 break;
3916#endif
3917#if 0 3944#if 0
3918 case XTerm_dumpscreen: /* no error notices */ 3945 case Rxvt_dumpscreen: /* no error notices */
3919 { 3946 {
3920 int fd; 3947 int fd;
3921 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3948 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3922 { 3949 {
3923 scr_dump (fd); 3950 scr_dump (fd);
… …
3934 case URxvt_italicFont: 3961 case URxvt_italicFont:
3935 case URxvt_boldItalicFont: 3962 case URxvt_boldItalicFont:
3936#endif 3963#endif
3937 if (query) 3964 if (query)
3938 tt_printf ("\33]%d;%-.250s%c", saveop, 3965 tt_printf ("\33]%d;%-.250s%c", saveop,
3939 OPTION (Opt_insecure) && fontset[op - URxvt_font]->fontdesc 3966 option (Opt_insecure) && fontset[op - URxvt_font]->fontdesc
3940 ? fontset[op - URxvt_font]->fontdesc : "", 3967 ? fontset[op - URxvt_font]->fontdesc : "",
3941 resp); 3968 resp);
3942 else 3969 else
3943 { 3970 {
3944 const char *&res = rs[Rs_font + (op - URxvt_font)]; 3971 const char *&res = rs[Rs_font + (op - URxvt_font)];
… …
3947 allocated.push_back ((void *)res); 3974 allocated.push_back ((void *)res);
3948 set_fonts (); 3975 set_fonts ();
3949 } 3976 }
3950 break; 3977 break;
3951 3978
3952#if ENABLE_FRILLS 3979 case URxvt_version:
3980 if (query)
3981 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3982 op,
3983 rs[Rs_name], VERSION[0], VERSION[2],
3984 resp);
3985 break;
3986
3987#if !ENABLE_MINIMAL
3953 case URxvt_locale: 3988 case URxvt_locale:
3954 if (query) 3989 if (query)
3955 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3990 tt_printf ("\33]%d;%-.250s%c", op, option (Opt_insecure) ? locale : "", resp);
3956 else 3991 else
3957 { 3992 {
3958 set_locale (str); 3993 set_locale (str);
3959 pty.set_utf8_mode (enc_utf8); 3994 pty->set_utf8_mode (enc_utf8);
3960 init_xlocale (); 3995 init_xlocale ();
3961 } 3996 }
3962 break; 3997 break;
3963 3998
3964 case URxvt_view_up: 3999 case URxvt_view_up:
… …
3975 break; 4010 break;
3976#endif 4011#endif
3977 4012
3978#if ENABLE_PERL 4013#if ENABLE_PERL
3979 case URxvt_perl: 4014 case URxvt_perl:
3980 if (PERL_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END))) 4015 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
3981 ; // no responses yet 4016 ; // no responses yet
3982 break; 4017 break;
3983#endif 4018#endif
3984 } 4019 }
3985} 4020}
… …
4017 return state; 4052 return state;
4018} 4053}
4019 4054
4020/* we're not using priv _yet_ */ 4055/* we're not using priv _yet_ */
4021void 4056void
4022rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4057rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4023{ 4058{
4024 unsigned int i, j; 4059 unsigned int i, j;
4025 int state; 4060 int state;
4026 4061
4027 static const struct 4062 static const struct
… …
4038 { 5, PrivMode_rVideo }, 4073 { 5, PrivMode_rVideo },
4039 { 6, PrivMode_relOrigin }, 4074 { 6, PrivMode_relOrigin },
4040 { 7, PrivMode_Autowrap }, 4075 { 7, PrivMode_Autowrap },
4041 // 8, bi-directional support mode 4076 // 8, bi-directional support mode
4042 { 9, PrivMode_MouseX10 }, 4077 { 9, PrivMode_MouseX10 },
4043#ifdef menuBar_esc
4044 { menuBar_esc, PrivMode_menuBar },
4045#endif
4046 // 18, 19 printing-related 4078 // 18, 19 printing-related
4047 { 25, PrivMode_VisibleCursor }, 4079 { 25, PrivMode_VisibleCursor },
4048#ifdef scrollBar_esc 4080#ifdef scrollBar_esc
4049 { scrollBar_esc, PrivMode_scrollBar }, 4081 { scrollBar_esc, PrivMode_scrollBar },
4050#endif 4082#endif
… …
4097 /* extra handling for values with state unkept */ 4129 /* extra handling for values with state unkept */
4098 switch (arg[i]) 4130 switch (arg[i])
4099 { 4131 {
4100#if ENABLE_STYLES 4132#if ENABLE_STYLES
4101 case 1021: 4133 case 1021:
4102 if (mode) 4134 set_option (Opt_intensityStyles, mode);
4103 SET_OPTION (Opt_intensityStyles);
4104 else
4105 CLR_OPTION (Opt_intensityStyles);
4106 4135
4107 scr_touch (true); 4136 scr_touch (true);
4108 break; 4137 break;
4109#endif 4138#endif
4110 case 1048: /* alternative cursor save */ 4139 case 1048: /* alternative cursor save */
4111 case 1049: 4140 case 1049:
4112 if (OPTION (Opt_secondaryScreen)) 4141 if (option (Opt_secondaryScreen))
4113 if (mode == 0) 4142 if (mode == 0)
4114 scr_cursor (RESTORE); 4143 scr_cursor (RESTORE);
4115 else if (mode == 1) 4144 else if (mode == 1)
4116 scr_cursor (SAVE); 4145 scr_cursor (SAVE);
4117 break; 4146 break;
… …
4132 case 3: /* 80/132 */ 4161 case 3: /* 80/132 */
4133 if (priv_modes & PrivMode_132OK) 4162 if (priv_modes & PrivMode_132OK)
4134 set_widthheight (((state ? 132 : 80) * fwidth), height); 4163 set_widthheight (((state ? 132 : 80) * fwidth), height);
4135 break; 4164 break;
4136 case 4: /* smooth scrolling */ 4165 case 4: /* smooth scrolling */
4137 if (!state) 4166 set_option (Opt_jumpScroll, !state);
4138 SET_OPTION (Opt_jumpScroll);
4139 else
4140 CLR_OPTION (Opt_jumpScroll);
4141 break; 4167 break;
4142 case 5: /* reverse video */ 4168 case 5: /* reverse video */
4143 scr_rvideo_mode (state); 4169 scr_rvideo_mode (state);
4144 break; 4170 break;
4145 case 6: /* relative/absolute origins */ 4171 case 6: /* relative/absolute origins */
… …
4151 /* case 8: - auto repeat, can't do on a per window basis */ 4177 /* case 8: - auto repeat, can't do on a per window basis */
4152 case 9: /* X10 mouse reporting */ 4178 case 9: /* X10 mouse reporting */
4153 if (state) /* orthogonal */ 4179 if (state) /* orthogonal */
4154 priv_modes &= ~PrivMode_MouseX11; 4180 priv_modes &= ~PrivMode_MouseX11;
4155 break; 4181 break;
4156#ifdef menuBar_esc
4157 case menuBar_esc:
4158#ifdef MENUBAR
4159 map_menuBar (state);
4160#endif
4161 break;
4162#endif
4163#ifdef scrollBar_esc 4182#ifdef scrollBar_esc
4164 case scrollBar_esc: 4183 case scrollBar_esc:
4165 if (scrollbar_mapping (state)) 4184 if (scrollbar_mapping (state))
4166 { 4185 {
4167 resize_all_windows (0, 0, 0); 4186 resize_all_windows (0, 0, 0);
… …
4186#if 0 4205#if 0
4187 case 1001: 4206 case 1001:
4188 break; /* X11 mouse highlighting */ 4207 break; /* X11 mouse highlighting */
4189#endif 4208#endif
4190 case 1010: /* scroll to bottom on TTY output inhibit */ 4209 case 1010: /* scroll to bottom on TTY output inhibit */
4191 if (!state) 4210 set_option (Opt_scrollTtyOutput, !state);
4192 SET_OPTION (Opt_scrollTtyOutput);
4193 else
4194 CLR_OPTION (Opt_scrollTtyOutput);
4195 break; 4211 break;
4196 case 1011: /* scroll to bottom on key press */ 4212 case 1011: /* scroll to bottom on key press */
4197 if (state) 4213 set_option (Opt_scrollTtyKeypress, state);
4198 SET_OPTION (Opt_scrollTtyKeypress);
4199 else
4200 CLR_OPTION (Opt_scrollTtyKeypress);
4201 break; 4214 break;
4202 case 1047: /* secondary screen w/ clearing last */ 4215 case 1047: /* secondary screen w/ clearing last */
4203 if (OPTION (Opt_secondaryScreen)) 4216 if (option (Opt_secondaryScreen))
4204 if (current_screen != PRIMARY) 4217 if (current_screen != PRIMARY)
4205 scr_erase_screen (2); 4218 scr_erase_screen (2);
4206 scr_change_screen (state); 4219 scr_change_screen (state);
4207 break; 4220 break;
4208 case 1049: /* secondary screen w/ clearing first */ 4221 case 1049: /* secondary screen w/ clearing first */
4209 scr_change_screen (state); 4222 scr_change_screen (state);
4210 if (OPTION (Opt_secondaryScreen)) 4223 if (option (Opt_secondaryScreen))
4211 if (current_screen != PRIMARY) 4224 if (current_screen != PRIMARY)
4212 scr_erase_screen (2); 4225 scr_erase_screen (2);
4213 break; 4226 break;
4214 default: 4227 default:
4215 break; 4228 break;
… …
4343 scr_color (Color_bg, Color_bg); 4356 scr_color (Color_bg, Color_bg);
4344 break; 4357 break;
4345 4358
4346 //case 50: // not variable spacing 4359 //case 50: // not variable spacing
4347 4360
4348#if ENABLE_FRILLS 4361#if !ENABLE_MINIMAL
4349 case 90: 4362 case 90:
4350 case 91: /* set bright fg color */ 4363 case 91: /* set bright fg color */
4351 case 92: 4364 case 92:
4352 case 93: 4365 case 93:
4353 case 94: 4366 case 94:
… …
4415const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4428const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4416 4429
4417void 4430void
4418rxvt_term::tt_write (const char *data, unsigned int len) 4431rxvt_term::tt_write (const char *data, unsigned int len)
4419{ 4432{
4433 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4434 return;
4435
4436 if (pty->pty < 0)
4437 return;
4438
4420 if (v_buflen == 0) 4439 if (v_buflen == 0)
4421 { 4440 {
4422 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4441 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4423 4442
4424 if ((unsigned int)written == len) 4443 if ((unsigned int)written == len)
4425 return; 4444 return;
4426 4445
4427 data += written; 4446 data += written;
… …
4436 pty_ev.set (EVENT_READ | EVENT_WRITE); 4455 pty_ev.set (EVENT_READ | EVENT_WRITE);
4437} 4456}
4438 4457
4439void rxvt_term::pty_write () 4458void rxvt_term::pty_write ()
4440{ 4459{
4441 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4460 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4442 4461
4443 if (written > 0) 4462 if (written > 0)
4444 { 4463 {
4445 v_buflen -= written; 4464 v_buflen -= written;
4446 4465

Diff Legend

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