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.237 by root, Fri Jan 6 01:16:58 2006 UTC vs.
Revision 1.316 by root, Thu Dec 7 20:59:59 2006 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)
… …
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
… …
969 1040
970 if (want_refresh) 1041 if (want_refresh)
971 { 1042 {
972 if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) 1043 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
973 { 1044 {
974 int row = -view_start; 1045 int row = view_start;
1046 int end_row = row + nrow;
975 1047
976 while (row > -nsaved && ROW (row - 1).is_longer ()) 1048 while (row > top_row && ROW (row - 1).is_longer ())
977 --row; 1049 --row;
978 1050
979 while (row < -view_start + nrow) 1051 do
980 { 1052 {
981 int start_row = row; 1053 int start_row = row;
982 line_t *l; 1054 line_t *l;
983 1055
984 do 1056 do
985 { 1057 {
986 l = &ROW (row); 1058 l = &ROW (row++);
987 1059
988 if (!(l->f & LINE_FILTERED)) 1060 if (!(l->f & LINE_FILTERED))
989 { 1061 {
990 // line not filtered, mark it as filtered 1062 // line not filtered, mark it as filtered
991 l->f |= LINE_FILTERED; 1063 l->f |= LINE_FILTERED;
992 while (l->is_longer ()) 1064 while (l->is_longer ())
993 { 1065 {
994 l = &ROW (++row); 1066 l = &ROW (row++);
995 l->f |= LINE_FILTERED; 1067 l->f |= LINE_FILTERED;
996 } 1068 }
997 1069
998 // and filter it 1070 // and filter it
999 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END)); 1071 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1000 1072
1001 break; 1073 break;
1002 } 1074 }
1003 } 1075 }
1004 while (l->is_longer ()); 1076 while (l->is_longer () && row < end_row);
1005
1006 row++;
1007 } 1077 }
1078 while (row < end_row);
1008 1079 }
1009 }
1010 1080
1011 scr_refresh (refresh_type); 1081 scr_refresh ();
1012 scrollbar_show (1); 1082 scrollbar_show (1);
1013#ifdef USE_XIM 1083#ifdef USE_XIM
1014 IMSendSpot (); 1084 IMSendSpot ();
1015#endif 1085#endif
1016 } 1086 }
… …
1019} 1089}
1020 1090
1021void 1091void
1022rxvt_term::check_cb (check_watcher &w) 1092rxvt_term::check_cb (check_watcher &w)
1023{ 1093{
1024 SET_R (this); 1094 make_current ();
1025 SET_LOCALE (locale);
1026 1095
1027 display->flush (); 1096 display->flush ();
1028 1097
1029 if (want_refresh && !flush_ev.active) 1098 if (want_refresh && !flush_ev.active)
1030 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
1031} 1100}
1032 1101
1033void 1102void
1034rxvt_term::flush_cb (time_watcher &w) 1103rxvt_term::flush_cb (time_watcher &w)
1035{ 1104{
1036 SET_R (this); 1105 make_current ();
1037 SET_LOCALE (locale);
1038 1106
1039 refresh_limit = 1; 1107 refresh_limit = 1;
1040 refresh_count = 0; 1108 refresh_count = 0;
1041 flush (); 1109 flush ();
1042} 1110}
… …
1046rxvt_term::cursor_blink_cb (time_watcher &w) 1114rxvt_term::cursor_blink_cb (time_watcher &w)
1047{ 1115{
1048 hidden_cursor = !hidden_cursor; 1116 hidden_cursor = !hidden_cursor;
1049 want_refresh = 1; 1117 want_refresh = 1;
1050 1118
1051 w.start (w.at + BLINK_INTERVAL); 1119 w.start (w.at + CURSOR_BLINK_INTERVAL);
1052} 1120}
1053#endif 1121#endif
1054 1122
1055#ifdef TEXT_BLINK 1123#ifdef TEXT_BLINK
1056void 1124void
… …
1070rxvt_term::cont_scroll_cb (time_watcher &w) 1138rxvt_term::cont_scroll_cb (time_watcher &w)
1071{ 1139{
1072 if ((scrollbar_isUp() || scrollbar_isDn()) && 1140 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1073 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1141 scr_page (scrollbar_isUp() ? UP : DN, 1))
1074 { 1142 {
1075 refresh_type |= SMOOTH_REFRESH;
1076 want_refresh = 1; 1143 want_refresh = 1;
1077 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1144 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1078 } 1145 }
1079} 1146}
1080#endif 1147#endif
… …
1084rxvt_term::sel_scroll_cb (time_watcher &w) 1151rxvt_term::sel_scroll_cb (time_watcher &w)
1085{ 1152{
1086 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1153 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1087 { 1154 {
1088 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1155 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1089 refresh_type |= SMOOTH_REFRESH;
1090 want_refresh = 1; 1156 want_refresh = 1;
1091 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1157 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1092 } 1158 }
1093} 1159}
1094#endif 1160#endif
… …
1099{ 1165{
1100 if (mouse_slip_wheel_speed == 0 1166 if (mouse_slip_wheel_speed == 0
1101 || 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)
1102 : scr_page (UP, mouse_slip_wheel_speed)) 1168 : scr_page (UP, mouse_slip_wheel_speed))
1103 { 1169 {
1104 if (view_start == nsaved || 1170 if (view_start == top_row || view_start == 0)
1105 view_start == 0)
1106 mouse_slip_wheel_speed = 0; 1171 mouse_slip_wheel_speed = 0;
1107 1172
1108 refresh_type |= SMOOTH_REFRESH;
1109 want_refresh = 1; 1173 want_refresh = 1;
1110 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1174 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1111 } 1175 }
1112} 1176}
1113#endif 1177#endif
1114 1178
1115#if HAVE_SCHED_YIELD 1179#if LINUX_YIELD_HACK
1116static struct event_handler 1180static struct event_handler
1117{ 1181{
1118 check_watcher cw_yield; 1182 check_watcher yield_ev;
1119 1183
1120 void yield (check_watcher &w) 1184 void yield_cb (check_watcher &w)
1121 { 1185 {
1122 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
1123 w.stop (); 1194 w.stop ();
1124 } 1195 }
1125 1196
1126 event_handler () 1197 event_handler ()
1127 : cw_yield (this, &event_handler::yield) 1198 : yield_ev (this, &event_handler::yield_cb)
1128 { 1199 {
1129 } 1200 }
1130} event_handler; 1201} event_handler;
1131#endif 1202#endif
1132 1203
… …
1143 1214
1144 memmove (cmdbuf_base, cmdbuf_ptr, n); 1215 memmove (cmdbuf_base, cmdbuf_ptr, n);
1145 cmdbuf_ptr = cmdbuf_base; 1216 cmdbuf_ptr = cmdbuf_base;
1146 cmdbuf_endp = cmdbuf_ptr + n; 1217 cmdbuf_endp = cmdbuf_ptr + n;
1147 1218
1148 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1219 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1149 1220
1150 if (r > 0) 1221 if (r > 0)
1151 { 1222 {
1152 cmdbuf_endp += r; 1223 cmdbuf_endp += r;
1153 return true; 1224 return true;
1154 } 1225 }
1155 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1226 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1156 { 1227 {
1157#if HAVE_SCHED_YIELD 1228#if LINUX_YIELD_HACK
1158 if (display->is_local) 1229 if (display->is_local)
1159 event_handler.cw_yield.start (); 1230 event_handler.yield_ev.start ();
1160#endif 1231#endif
1161 } 1232 }
1162 else 1233 else
1163 { 1234 {
1164 pty_ev.stop (); 1235 pty_ev.stop ();
… …
1171} 1242}
1172 1243
1173void 1244void
1174rxvt_term::pty_cb (io_watcher &w, short revents) 1245rxvt_term::pty_cb (io_watcher &w, short revents)
1175{ 1246{
1176 SET_R (this); 1247 make_current ();
1177 SET_LOCALE (locale);
1178 1248
1179 if (revents & EVENT_READ) 1249 if (revents & EVENT_READ)
1180 // loop, but don't allow a single term to monopolize us 1250 // loop, but don't allow a single term to monopolize us
1181 while (pty_fill ()) 1251 while (pty_fill ())
1182 if (cmd_parse ()) 1252 if (cmd_parse ())
… …
1187} 1257}
1188 1258
1189void 1259void
1190rxvt_term::pointer_unblank () 1260rxvt_term::pointer_unblank ()
1191{ 1261{
1192 XDefineCursor (display->display, vt, TermWin_cursor); 1262 XDefineCursor (dpy, vt, TermWin_cursor);
1193 recolour_cursor (); 1263 recolour_cursor ();
1194 1264
1195#ifdef POINTER_BLANK 1265#ifdef POINTER_BLANK
1196 hidden_pointer = 0; 1266 hidden_pointer = 0;
1197 1267
… …
1202 1272
1203#ifdef POINTER_BLANK 1273#ifdef POINTER_BLANK
1204void 1274void
1205rxvt_term::pointer_blank () 1275rxvt_term::pointer_blank ()
1206{ 1276{
1207 if (! OPTION (Opt_pointerBlank)) 1277 if (!OPTION (Opt_pointerBlank))
1208 return; 1278 return;
1209 1279
1210 XDefineCursor (display->display, vt, display->blank_cursor); 1280 XDefineCursor (dpy, vt, display->blank_cursor);
1211 XFlush (display->display); 1281 XFlush (dpy);
1212 1282
1213 hidden_pointer = 1; 1283 hidden_pointer = 1;
1214} 1284}
1215 1285
1216void 1286void
1217rxvt_term::pointer_cb (time_watcher &w) 1287rxvt_term::pointer_cb (time_watcher &w)
1218{ 1288{
1219 SET_R (this); 1289 make_current ();
1220 SET_LOCALE (locale);
1221 1290
1222 pointer_blank (); 1291 pointer_blank ();
1223} 1292}
1224#endif 1293#endif
1225 1294
… …
1290 (32 + button_number + key_state), 1359 (32 + button_number + key_state),
1291 (32 + x + 1), 1360 (32 + x + 1),
1292 (32 + y + 1)); 1361 (32 + y + 1));
1293} 1362}
1294 1363
1295#ifdef USING_W11LIB
1296void
1297rxvt_W11_process_x_event (XEvent *ev)
1298{
1299 rxvt_t *r = rxvt_get_r ();
1300
1301 x_cb (*ev);
1302}
1303#endif
1304
1305/*{{{ process an X event */ 1364/*{{{ process an X event */
1306void 1365void
1307rxvt_term::x_cb (XEvent &ev) 1366rxvt_term::x_cb (XEvent &ev)
1308{ 1367{
1309 dDisp; 1368 make_current ();
1310 1369
1311 SET_R (this); 1370 dLocal (Display *, dpy);
1312 SET_LOCALE (locale);
1313 1371
1314#if defined(CURSOR_BLINK) 1372 if (ev.xany.window == vt
1315 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1373 && SHOULD_INVOKE (HOOK_X_EVENT)
1316 { 1374 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1317 if (hidden_cursor) 1375 return;
1318 {
1319 hidden_cursor = 0;
1320 want_refresh = 1;
1321 }
1322 1376
1323 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1377 // for XQueryPointer
1324 }
1325#endif
1326
1327#if defined(POINTER_BLANK)
1328 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1329 {
1330 if (ev.type == MotionNotify
1331 || ev.type == ButtonPress
1332 || ev.type == ButtonRelease)
1333 if (hidden_pointer)
1334 pointer_unblank ();
1335
1336 if (ev.type == KeyPress && hidden_pointer == 0)
1337 pointer_blank ();
1338 }
1339#endif
1340
1341 Window unused_root, unused_child; 1378 Window unused_root, unused_child;
1342 int unused_root_x, unused_root_y; 1379 int unused_root_x, unused_root_y;
1343 unsigned int unused_mask; 1380 unsigned int unused_mask;
1344 1381
1345 switch (ev.type) 1382 switch (ev.type)
1346 { 1383 {
1347 case KeyPress: 1384 case KeyPress:
1348#if ISO_14755 1385 key_press (ev.xkey);
1349 if (!(iso14755buf & ISO_14755_52))
1350#endif
1351 lookup_key (ev.xkey);
1352
1353 break; 1386 break;
1354 1387
1355 case KeyRelease: 1388 case KeyRelease:
1356 { 1389 key_release (ev.xkey);
1357#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755
1358 KeySym ks;
1359
1360 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1361#endif
1362
1363#if ENABLE_FRILLS || ISO_14755
1364 // ISO 14755 support
1365 if (iso14755buf)
1366 if (iso14755buf & ISO_14755_52)
1367 {
1368# if ENABLE_OVERLAY
1369 scr_overlay_off ();
1370# endif
1371# if ISO_14755
1372 // iso14755 part 5.2 handling: release time
1373 // first: controls
1374 if ((ev.xkey.state & ControlMask)
1375 && ((ks >= 0x40 && ks <= 0x5f)
1376 || (ks >= 0x61 && ks <= 0x7f)))
1377 {
1378 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1379 commit_iso14755 ();
1380 return; // case-break;
1381 }
1382
1383 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1384 if (i[0] == ks)
1385 {
1386 iso14755buf = ISO_14755_51 | i[1];
1387 commit_iso14755 ();
1388 return; // case-break;
1389 }
1390
1391 scr_bell ();
1392# endif
1393 iso14755buf = 0;
1394 break;
1395 }
1396 else if ((ev.xkey.state & (ShiftMask | ControlMask)) != (ShiftMask | ControlMask))
1397 {
1398# if ENABLE_OVERLAY
1399 scr_overlay_off ();
1400# endif
1401 if (iso14755buf & ISO_14755_51)
1402 commit_iso14755 ();
1403#if ISO_14755
1404 else if (iso14755buf & ISO_14755_STARTED)
1405 {
1406 iso14755buf = ISO_14755_52; // iso14755 part 5.2: remember empty begin/end pair
1407
1408 scr_overlay_new (0, -1, sizeof ("KEYCAP PICTURE INSERT MODE") - 1, 1);
1409 scr_overlay_set (0, 0, "KEYCAP PICTURE INSERT MODE");
1410 }
1411# endif
1412 else
1413 iso14755buf = 0;
1414 }
1415#endif
1416
1417#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1418 if (!(ev.xkey.state & ControlMask))
1419 slip_wheel_ev.stop ();
1420 else if (ks == XK_Control_L || ks == XK_Control_R)
1421 mouse_slip_wheel_speed = 0;
1422#endif
1423 break; 1390 break;
1424 }
1425 1391
1426 case ButtonPress: 1392 case ButtonPress:
1427 button_press (ev.xbutton); 1393 button_press (ev.xbutton);
1428 break; 1394 break;
1429 1395
… …
1431 button_release (ev.xbutton); 1397 button_release (ev.xbutton);
1432 break; 1398 break;
1433 1399
1434 case ClientMessage: 1400 case ClientMessage:
1435 if (ev.xclient.format == 32 1401 if (ev.xclient.format == 32
1436 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1402 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1437 { 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 {
1438 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)))
1439 destroy (); 1411 destroy ();
1412 }
1440#if ENABLE_EWMH 1413#if ENABLE_EWMH
1441 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])
1442 XSendEvent (disp, ev.xclient.window = display->root, 1415 XSendEvent (dpy, ev.xclient.window = display->root,
1443 False, SubstructureRedirectMask | SubstructureNotifyMask, 1416 False, SubstructureRedirectMask | SubstructureNotifyMask,
1444 &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 }
1445#endif 1429#endif
1446 } 1430 }
1447#if ENABLE_XEMBED
1448 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1449 {
1450 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1451 focus_in ();
1452 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1453 focus_out ();
1454 }
1455#endif
1456#ifdef OFFIX_DND
1457 /* OffiX Dnd (drag 'n' drop) protocol */
1458 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1459 && (ev.xclient.data.l[0] == DndFile
1460 || ev.xclient.data.l[0] == DndDir
1461 || ev.xclient.data.l[0] == DndLink))
1462 {
1463 /* Get Dnd data */
1464 Atom ActualType;
1465 int ActualFormat;
1466 unsigned char *data;
1467 unsigned long Size, RemainingBytes;
1468
1469 XGetWindowProperty (disp, display->root,
1470 xa[XA_DNDSELECTION],
1471 0L, 1000000L,
1472 False, AnyPropertyType,
1473 &ActualType, &ActualFormat,
1474 &Size, &RemainingBytes,
1475 &data);
1476 set_string_property (XA_CUT_BUFFER0, data);
1477 XFree (data);
1478 selection_paste (display->root, XA_CUT_BUFFER0, true);
1479 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1480 }
1481#endif /* OFFIX_DND */
1482 break; 1431 break;
1483 1432
1484 case MappingNotify: 1433 case MappingNotify:
1485 XRefreshKeyboardMapping (&ev.xmapping); 1434 XRefreshKeyboardMapping (&ev.xmapping);
1486 break; 1435 break;
… …
1509 break; 1458 break;
1510 } 1459 }
1511 break; 1460 break;
1512 1461
1513 case FocusIn: 1462 case FocusIn:
1463 if (ev.xfocus.detail != NotifyInferior && ev.xfocus.detail != NotifyPointer)
1514 focus_in (); 1464 focus_in ();
1515 break; 1465 break;
1516 1466
1517 case FocusOut: 1467 case FocusOut:
1468 if (ev.xfocus.detail != NotifyInferior && ev.xfocus.detail != NotifyPointer)
1518 focus_out (); 1469 focus_out ();
1519 break; 1470 break;
1520 1471
1521 case ConfigureNotify: 1472 case ConfigureNotify:
1522 if (ev.xconfigure.window == parent[0]) 1473 if (ev.xconfigure.window == parent[0])
1523 { 1474 {
1524 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1475 while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
1525 ; 1476 ;
1526 1477
1527 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1478 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1528 { 1479 {
1529 seen_resize = 1; 1480 seen_resize = 1;
1530 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1481 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1531 } 1482 }
1532 1483
1484 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1485
1533#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1486#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1534 if (OPTION (Opt_transparent)) 1487 if (OPTION (Opt_transparent))
1535 check_our_parents (); 1488 check_our_parents ();
1536#endif 1489#endif
1537 } 1490 }
1538 break; 1491 break;
1539 1492
1540 case PropertyNotify: 1493 case PropertyNotify:
1494 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1541 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1495 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1542 && ev.xproperty.state == PropertyNewValue) 1496 && ev.xproperty.state == PropertyNewValue)
1543 selection_property (ev.xproperty.window, ev.xproperty.atom); 1497 selection_property (ev.xproperty.window, ev.xproperty.atom);
1544 1498
1545 break; 1499 break;
1546 1500
1547 case SelectionClear: 1501 case SelectionClear:
1548 selection_clear (); 1502 selection_clear ();
… …
1553 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1507 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1554 break; 1508 break;
1555 1509
1556 case SelectionRequest: 1510 case SelectionRequest:
1557 selection_send (ev.xselectionrequest); 1511 selection_send (ev.xselectionrequest);
1512 break;
1513
1514 case MapNotify:
1515 mapped = 1;
1516#ifdef TEXT_BLINK
1517 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1518#endif
1519 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1558 break; 1520 break;
1559 1521
1560 case UnmapNotify: 1522 case UnmapNotify:
1561 mapped = 0; 1523 mapped = 0;
1562#ifdef TEXT_BLINK 1524#ifdef TEXT_BLINK
1563 text_blink_ev.stop (); 1525 text_blink_ev.stop ();
1564#endif 1526#endif
1565 break; 1527 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1566
1567 case MapNotify:
1568 mapped = 1;
1569#ifdef TEXT_BLINK
1570 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1571#endif
1572 break; 1528 break;
1573 1529
1574#ifdef TRANSPARENT 1530#ifdef TRANSPARENT
1575 case ReparentNotify: 1531 case ReparentNotify:
1576 rootwin_cb (ev); 1532 rootwin_cb (ev);
… …
1582 if (ev.xany.window == vt) 1538 if (ev.xany.window == vt)
1583 { 1539 {
1584 do 1540 do
1585 scr_expose (ev.xexpose.x, ev.xexpose.y, 1541 scr_expose (ev.xexpose.x, ev.xexpose.y,
1586 ev.xexpose.width, ev.xexpose.height, False); 1542 ev.xexpose.width, ev.xexpose.height, False);
1587 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1543 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev));
1588 1544
1589 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1545 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1590 1546
1591 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1547 while (XCheckTypedWindowEvent (dpy, vt, ev.xany.type, &ev))
1592 scr_expose (ev.xexpose.x, ev.xexpose.y, 1548 scr_expose (ev.xexpose.x, ev.xexpose.y,
1593 ev.xexpose.width, ev.xexpose.height, False); 1549 ev.xexpose.width, ev.xexpose.height, False);
1594 1550
1595 scr_refresh (refresh_type); 1551 want_refresh = 1;
1596 } 1552 }
1597 else 1553 else
1598 { 1554 {
1599 XEvent unused_event; 1555 XEvent unused_event;
1600 1556
1601 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1557 while (XCheckTypedWindowEvent (dpy, ev.xany.window, Expose, &unused_event))
1602 ; 1558 ;
1603 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1559 while (XCheckTypedWindowEvent (dpy, ev.xany.window, GraphicsExpose, &unused_event))
1604 ; 1560 ;
1605 1561
1606 if (isScrollbarWindow (ev.xany.window)) 1562 if (isScrollbarWindow (ev.xany.window))
1607 { 1563 {
1608 scrollBar.setIdle (); 1564 scrollBar.setIdle ();
1609 scrollbar_show (0); 1565 scrollbar_show (0);
1610 } 1566 }
1611#ifdef MENUBAR
1612 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1613 menubar_expose ();
1614#endif
1615 1567
1616#ifdef TRANSPARENT 1568#ifdef TRANSPARENT
1617 if (am_transparent && ev.xany.window == parent[0]) 1569 if (am_transparent && ev.xany.window == parent[0])
1618 XClearWindow (disp, ev.xany.window); 1570 XClearWindow (dpy, ev.xany.window);
1619#endif 1571#endif
1620 } 1572 }
1621 break; 1573 break;
1622 1574
1623 case MotionNotify: 1575 case MotionNotify:
1624#ifdef POINTER_BLANK 1576#ifdef POINTER_BLANK
1625 if (hidden_pointer) 1577 if (hidden_pointer)
1626 pointer_unblank (); 1578 pointer_unblank ();
1627#endif 1579#endif
1628#if MENUBAR
1629 if (isMenuBarWindow (ev.xany.window))
1630 {
1631 menubar_control (ev.xbutton);
1632 break;
1633 }
1634#endif
1635 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1580 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1636 break; 1581 break;
1637 1582
1638 if (ev.xany.window == vt) 1583 if (ev.xany.window == vt)
1639 { 1584 {
1585 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1586 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1587 ; // nop
1640 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1588 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1641 { 1589 {
1642 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1590 while (XCheckTypedWindowEvent (dpy, vt, MotionNotify, &ev))
1643 ; 1591 ;
1644 1592
1645 XQueryPointer (disp, vt, 1593 XQueryPointer (dpy, vt,
1646 &unused_root, &unused_child, 1594 &unused_root, &unused_child,
1647 &unused_root_x, &unused_root_y, 1595 &unused_root_x, &unused_root_y,
1648 &ev.xbutton.x, &ev.xbutton.y, 1596 &ev.xbutton.x, &ev.xbutton.y,
1649 &ev.xbutton.state); 1597 &ev.xbutton.state);
1650#ifdef MOUSE_THRESHOLD 1598#ifdef MOUSE_THRESHOLD
… …
1714#endif 1662#endif
1715 } 1663 }
1716 } 1664 }
1717 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1665 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1718 { 1666 {
1719 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1667 while (XCheckTypedWindowEvent (dpy, scrollBar.win,
1720 MotionNotify, &ev)) 1668 MotionNotify, &ev))
1721 ; 1669 ;
1722 1670
1723 XQueryPointer (disp, scrollBar.win, 1671 XQueryPointer (dpy, scrollBar.win,
1724 &unused_root, &unused_child, 1672 &unused_root, &unused_child,
1725 &unused_root_x, &unused_root_y, 1673 &unused_root_x, &unused_root_y,
1726 &ev.xbutton.x, &ev.xbutton.y, 1674 &ev.xbutton.x, &ev.xbutton.y,
1727 &unused_mask); 1675 &unused_mask);
1728 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1676 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1729 scrollbar_size ()); 1677 scrollbar_size ());
1730 scr_refresh (refresh_type); 1678 want_refresh = 1;
1731 refresh_limit = 0; 1679 refresh_limit = 0;
1732 scrollbar_show (1); 1680 scrollbar_show (1);
1733 } 1681 }
1734 break; 1682 break;
1735 } 1683 }
1684
1685#if defined(CURSOR_BLINK)
1686 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1687 {
1688 if (hidden_cursor)
1689 {
1690 hidden_cursor = 0;
1691 want_refresh = 1;
1692 }
1693
1694 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1695 }
1696#endif
1697
1698#if defined(POINTER_BLANK)
1699 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1700 {
1701 if (ev.type == MotionNotify
1702 || ev.type == ButtonPress
1703 || ev.type == ButtonRelease)
1704 if (hidden_pointer)
1705 pointer_unblank ();
1706
1707 if (ev.type == KeyPress && hidden_pointer == 0)
1708 pointer_blank ();
1709 }
1710#endif
1736} 1711}
1737 1712
1738void 1713void
1739rxvt_term::focus_in () 1714rxvt_term::focus_in ()
1740{ 1715{
1741 if (!focus) 1716 if (!focus)
1742 { 1717 {
1743 focus = 1; 1718 focus = 1;
1744 want_refresh = 1; 1719 want_refresh = 1;
1745 1720
1746 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1721 HOOK_INVOKE ((this, HOOK_FOCUS_IN, DT_END));
1747 1722
1748#if USE_XIM 1723#if USE_XIM
1749 if (Input_Context != NULL) 1724 if (Input_Context != NULL)
1750 { 1725 {
1751 IMSetStatusPosition (); 1726 IMSetPosition ();
1752 XSetICFocus (Input_Context); 1727 XSetICFocus (Input_Context);
1753 } 1728 }
1754#endif 1729#endif
1755#if CURSOR_BLINK 1730#if CURSOR_BLINK
1756 if (OPTION (Opt_cursorBlink)) 1731 if (OPTION (Opt_cursorBlink))
1757 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1732 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1758#endif 1733#endif
1759#if OFF_FOCUS_FADING 1734#if OFF_FOCUS_FADING
1760 if (rs[Rs_fade]) 1735 if (rs[Rs_fade])
1761 { 1736 {
1762 pix_colors = pix_colors_focused; 1737 pix_colors = pix_colors_focused;
… …
1802 } 1777 }
1803#endif 1778#endif
1804 } 1779 }
1805} 1780}
1806 1781
1807#if TRANSPARENT 1782void
1783rxvt_term::update_fade_color (unsigned int idx)
1784{
1785#if OFF_FOCUS_FADING
1786 if (rs[Rs_fade])
1787 {
1788 rgba c;
1789 pix_colors [Color_fade].get (c);
1790 pix_colors_focused [idx].fade (this, atoi (rs[Rs_fade]), pix_colors_unfocused [idx], c);
1791 }
1792#endif
1793}
1794
1795#if TRANSPARENT || ENABLE_PERL
1808void 1796void
1809rxvt_term::rootwin_cb (XEvent &ev) 1797rxvt_term::rootwin_cb (XEvent &ev)
1810{ 1798{
1811 SET_R (this); 1799 make_current ();
1812 SET_LOCALE (locale);
1813 1800
1801 if (SHOULD_INVOKE (HOOK_ROOT_EVENT)
1802 && HOOK_INVOKE ((this, HOOK_ROOT_EVENT, DT_XEVENT, &ev, DT_END)))
1803 return;
1804
1805# if TRANSPARENT
1814 switch (ev.type) 1806 switch (ev.type)
1815 { 1807 {
1816 case PropertyNotify: 1808 case PropertyNotify:
1817 /* 1809 /*
1818 * if user used some Esetroot compatible prog to set the root bg, 1810 * if user used some Esetroot compatible prog to set the root bg,
… …
1826 case ReparentNotify: 1818 case ReparentNotify:
1827 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent) 1819 if (OPTION (Opt_transparent) && check_our_parents () && am_transparent)
1828 want_refresh = want_full_refresh = 1; 1820 want_refresh = want_full_refresh = 1;
1829 break; 1821 break;
1830 } 1822 }
1823# endif
1831} 1824}
1832#endif 1825#endif
1833 1826
1834void 1827void
1835rxvt_term::button_press (XButtonEvent &ev) 1828rxvt_term::button_press (XButtonEvent &ev)
… …
1844 /* 1837 /*
1845 * VT window processing of button press 1838 * VT window processing of button press
1846 */ 1839 */
1847 if (ev.window == vt) 1840 if (ev.window == vt)
1848 { 1841 {
1842 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1843 return;
1844
1849#if ISO_14755 1845#if ISO_14755
1850 // 5.4 1846 // 5.4
1851 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1847 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1852 { 1848 {
1853 iso14755_54 (ev.x, ev.y); 1849 iso14755_54 (ev.x, ev.y);
… …
1865#ifdef MOUSE_REPORT_DOUBLECLICK 1861#ifdef MOUSE_REPORT_DOUBLECLICK
1866 if (ev.button == MEvent.button && clickintime) 1862 if (ev.button == MEvent.button && clickintime)
1867 { 1863 {
1868 /* same button, within alloted time */ 1864 /* same button, within alloted time */
1869 MEvent.clicks++; 1865 MEvent.clicks++;
1866
1870 if (MEvent.clicks > 1) 1867 if (MEvent.clicks > 1)
1871 { 1868 {
1872 /* only report double clicks */ 1869 /* only report double clicks */
1873 MEvent.clicks = 2; 1870 MEvent.clicks = 2;
1874 mouse_report (ev); 1871 mouse_report (ev);
… …
1894 else 1891 else
1895 { 1892 {
1896 if (ev.button != MEvent.button) 1893 if (ev.button != MEvent.button)
1897 MEvent.clicks = 0; 1894 MEvent.clicks = 0;
1898 1895
1899 if (!HOOK_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END)))
1900 switch (ev.button) 1896 switch (ev.button)
1901 { 1897 {
1902 case Button1: 1898 case Button1:
1903 /* allow meta + click to select rectangular areas */ 1899 /* allow meta + click to select rectangular areas */
1904 /* should be done in screen.C */ 1900 /* should be done in screen.C */
1905#if ENABLE_FRILLS 1901#if ENABLE_FRILLS
1906 selection.rect = !!(ev.state & ModMetaMask); 1902 selection.rect = !!(ev.state & ModMetaMask);
1907#else 1903#else
1908 selection.rect = false; 1904 selection.rect = false;
1909#endif 1905#endif
1910 1906
1911 /* allow shift+left click to extend selection */ 1907 /* allow shift+left click to extend selection */
1912 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1908 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1913 { 1909 {
1914 if (MEvent.button == Button1 && clickintime) 1910 if (MEvent.button == Button1 && clickintime)
1915 selection_rotate (ev.x, ev.y); 1911 selection_rotate (ev.x, ev.y);
1916 else 1912 else
1917 selection_extend (ev.x, ev.y, 1); 1913 selection_extend (ev.x, ev.y, 1);
1918 } 1914 }
1919 else 1915 else
1920 { 1916 {
1921 if (MEvent.button == Button1 && clickintime) 1917 if (MEvent.button == Button1 && clickintime)
1922 MEvent.clicks++; 1918 MEvent.clicks++;
1923 else 1919 else
1924 MEvent.clicks = 1; 1920 MEvent.clicks = 1;
1925 1921
1926 selection_click (MEvent.clicks, ev.x, ev.y); 1922 selection_click (MEvent.clicks, ev.x, ev.y);
1927 } 1923 }
1928 1924
1929 MEvent.button = Button1; 1925 MEvent.button = Button1;
1930 break; 1926 break;
1931 1927
1932 case Button3: 1928 case Button3:
1933 if (MEvent.button == Button3 && clickintime) 1929 if (MEvent.button == Button3 && clickintime)
1934 selection_rotate (ev.x, ev.y); 1930 selection_rotate (ev.x, ev.y);
1935 else 1931 else
1936 selection_extend (ev.x, ev.y, 1); 1932 selection_extend (ev.x, ev.y, 1);
1937 1933
1938 MEvent.button = Button3; 1934 MEvent.button = Button3;
1939 break; 1935 break;
1940 } 1936 }
1941 } 1937 }
1942 1938
1943 MEvent.time = ev.time; 1939 MEvent.time = ev.time;
1944 return; 1940 return;
1945 } 1941 }
1946 1942
… …
2082 } 2078 }
2083 2079
2084 break; 2080 break;
2085 } 2081 }
2086 } 2082 }
2083
2087 return; 2084 return;
2088 } 2085 }
2089#if MENUBAR
2090 /*
2091 * Menubar window processing of button press
2092 */
2093 if (isMenuBarWindow (ev.window))
2094 menubar_control (ev);
2095#endif
2096} 2086}
2097 2087
2098void 2088void
2099rxvt_term::button_release (XButtonEvent &ev) 2089rxvt_term::button_release (XButtonEvent &ev)
2100{ 2090{
… …
2106 2096
2107 if (scrollbar_isUpDn ()) 2097 if (scrollbar_isUpDn ())
2108 { 2098 {
2109 scrollBar.setIdle (); 2099 scrollBar.setIdle ();
2110 scrollbar_show (0); 2100 scrollbar_show (0);
2111#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2112 refresh_type &= ~SMOOTH_REFRESH;
2113#endif
2114 } 2101 }
2115 2102
2116#ifdef SELECTION_SCROLLING 2103#ifdef SELECTION_SCROLLING
2117 if (sel_scroll_ev.active) 2104 if (sel_scroll_ev.active)
2118 sel_scroll_ev.stop(); 2105 sel_scroll_ev.stop();
2119#endif 2106#endif
2120 2107
2121 if (ev.window == vt) 2108 if (ev.window == vt)
2122 { 2109 {
2110 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2111 return;
2112
2123#if ISO_14755 2113#if ISO_14755
2124 // 5.4 2114 // 5.4
2125 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2115 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2126 return; 2116 return;
2127#endif 2117#endif
2118
2128 if (reportmode) 2119 if (reportmode)
2129 { 2120 {
2130 /* mouse report from vt window */ 2121 /* mouse report from vt window */
2131 /* don't report release of wheel "buttons" */ 2122 /* don't report release of wheel "buttons" */
2132 if (ev.button >= 4) 2123 if (ev.button >= 4)
… …
2162 { 2153 {
2163 case Button1: 2154 case Button1:
2164 case Button3: 2155 case Button3:
2165 selection_make (ev.time); 2156 selection_make (ev.time);
2166 break; 2157 break;
2158
2167 case Button2: 2159 case Button2:
2168 selection_request (ev.time, ev.x, ev.y); 2160 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2161 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2169 break; 2162 break;
2163
2170#ifdef MOUSE_WHEEL 2164#ifdef MOUSE_WHEEL
2171 case Button4: 2165 case Button4:
2172 case Button5: 2166 case Button5:
2173 { 2167 {
2174 int i; 2168 int i;
… …
2196 slip_wheel_ev.start (); 2190 slip_wheel_ev.start ();
2197 } 2191 }
2198 else 2192 else
2199 { 2193 {
2200# endif 2194# endif
2201# ifdef JUMP_MOUSE_WHEEL
2202 scr_page (v, i); 2195 scr_page (v, i);
2203 scr_refresh (SMOOTH_REFRESH);
2204 scrollbar_show (1); 2196 scrollbar_show (1);
2205# else
2206 while (i--)
2207 {
2208 scr_page (v, 1);
2209 scr_refresh (SMOOTH_REFRESH);
2210 scrollbar_show (1);
2211 }
2212# endif
2213# ifdef MOUSE_SLIP_WHEELING 2197# ifdef MOUSE_SLIP_WHEELING
2214 } 2198 }
2215#endif 2199# endif
2216 } 2200 }
2217 break; 2201 break;
2218#endif 2202#endif
2219 } 2203 }
2220 } 2204 }
2221#ifdef MENUBAR
2222 else if (isMenuBarWindow (ev.window))
2223 menubar_control (ev);
2224#endif
2225} 2205}
2226 2206
2227#ifdef TRANSPARENT 2207#ifdef TRANSPARENT
2228#if TINTING 2208#if TINTING
2229/* taken from aterm-0.4.2 */ 2209/* taken from aterm-0.4.2 */
2230 2210
2231typedef uint32_t RUINT32T; 2211typedef uint32_t RUINT32T;
2232 2212
2233void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2213void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2234{ 2214{
2235 int sh_r, sh_g, sh_b; 2215 int sh_r, sh_g, sh_b;
2236 RUINT32T mask_r, mask_g, mask_b; 2216 RUINT32T mask_r, mask_g, mask_b;
2237 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2217 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2238 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2218 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2239 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2219 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2240 int i; 2220 int i;
2241 2221
2242 Visual *visual = display->visual; 2222 Visual *visual = term->visual;
2243 2223
2244 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2224 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2245 2225
2246 /* for convenience */ 2226 /* for convenience */
2247 mask_r = visual->red_mask; 2227 mask_r = visual->red_mask;
… …
2468 Atom atype; 2448 Atom atype;
2469 unsigned char *prop = NULL; 2449 unsigned char *prop = NULL;
2470 Window root, oldp, *list; 2450 Window root, oldp, *list;
2471 Pixmap rootpixmap = None; 2451 Pixmap rootpixmap = None;
2472 XWindowAttributes wattr, wrootattr; 2452 XWindowAttributes wattr, wrootattr;
2473 dDisp;
2474 2453
2475 pchanged = 0; 2454 pchanged = 0;
2476 2455
2477 if (!OPTION (Opt_transparent)) 2456 if (!OPTION (Opt_transparent))
2478 return pchanged; /* Don't try any more */ 2457 return pchanged; /* Don't try any more */
2479 2458
2480 XGetWindowAttributes (disp, display->root, &wrootattr); 2459 XGetWindowAttributes (dpy, display->root, &wrootattr);
2481 rootdepth = wrootattr.depth; 2460 rootdepth = wrootattr.depth;
2482 2461
2483 XGetWindowAttributes (disp, parent[0], &wattr); 2462 XGetWindowAttributes (dpy, parent[0], &wattr);
2484 2463
2485 if (rootdepth != wattr.depth) 2464 if (rootdepth != wattr.depth)
2486 { 2465 {
2487 if (am_transparent) 2466 if (am_transparent)
2488 { 2467 {
2489 pchanged = 1; 2468 pchanged = 1;
2490 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2469 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2491 am_transparent = am_pixmap_trans = 0; 2470 am_transparent = am_pixmap_trans = 0;
2492 } 2471 }
2493 2472
2494 return pchanged; /* Don't try any more */ 2473 return pchanged; /* Don't try any more */
2495 } 2474 }
2496 2475
2497 /* Get all X ops out of the queue so that our information is up-to-date. */ 2476 /* Get all X ops out of the queue so that our information is up-to-date. */
2498 XSync (disp, False); 2477 XSync (dpy, False);
2499 2478
2500 /* 2479 /*
2501 * Make the frame window set by the window manager have 2480 * Make the frame window set by the window manager have
2502 * the root background. Some window managers put multiple nested frame 2481 * the root background. Some window managers put multiple nested frame
2503 * windows for each client, so we have to take care about that. 2482 * windows for each client, so we have to take care about that.
2504 */ 2483 */
2505 i = (xa[XA_XROOTPMAP_ID] 2484 i = (xa[XA_XROOTPMAP_ID]
2506 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2485 && XGetWindowProperty (dpy, display->root, xa[XA_XROOTPMAP_ID],
2507 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2486 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2508 &nitems, &bytes_after, &prop) == Success); 2487 &nitems, &bytes_after, &prop) == Success);
2509 2488
2510 if (!i || prop == NULL) 2489 if (!i || prop == NULL)
2511 i = (xa[XA_ESETROOT_PMAP_ID] 2490 i = (xa[XA_ESETROOT_PMAP_ID]
2512 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2491 && XGetWindowProperty (dpy, display->root, xa[XA_ESETROOT_PMAP_ID],
2513 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2492 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2514 &nitems, &bytes_after, &prop) == Success); 2493 &nitems, &bytes_after, &prop) == Success);
2515 2494
2516 if (!i || prop == NULL 2495 if (!i || prop == NULL
2517#if TINTING 2496#if TINTING
2518 || !rs[Rs_color + Color_tint] 2497 || !ISSET_PIXCOLOR (Color_tint)
2519#endif 2498#endif
2520 ) 2499 )
2521 have_pixmap = 0; 2500 have_pixmap = 0;
2522 else 2501 else
2523 { 2502 {
… …
2536 Window cr; 2515 Window cr;
2537 XImage *image; 2516 XImage *image;
2538 GC gc; 2517 GC gc;
2539 XGCValues gcvalue; 2518 XGCValues gcvalue;
2540 2519
2541 XTranslateCoordinates (disp, parent[0], display->root, 2520 XTranslateCoordinates (dpy, parent[0], display->root,
2542 0, 0, &sx, &sy, &cr); 2521 0, 0, &sx, &sy, &cr);
2543 nw = (unsigned int)szHint.width; 2522 nw = (unsigned int)szHint.width;
2544 nh = (unsigned int)szHint.height; 2523 nh = (unsigned int)szHint.height;
2545 nx = ny = 0; 2524 nx = ny = 0;
2546 2525
… …
2559 } 2538 }
2560 2539
2561 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2540 min_it (nw, (unsigned int) (wrootattr.width - sx));
2562 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2541 min_it (nh, (unsigned int) (wrootattr.height - sy));
2563 2542
2564 XSync (disp, False); 2543 XSync (dpy, False);
2565 allowedxerror = -1; 2544 allowedxerror = -1;
2566 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2545 image = XGetImage (dpy, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2567 2546
2568 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2547 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2569 /* XXX: may need a delay here? */ 2548 /* XXX: may need a delay here? */
2570 allowedxerror = 0; 2549 allowedxerror = 0;
2571 2550
… …
2574 if (am_transparent && am_pixmap_trans) 2553 if (am_transparent && am_pixmap_trans)
2575 { 2554 {
2576 pchanged = 1; 2555 pchanged = 1;
2577 if (pixmap != None) 2556 if (pixmap != None)
2578 { 2557 {
2579 XFreePixmap (disp, pixmap); 2558 XFreePixmap (dpy, pixmap);
2580 pixmap = None; 2559 pixmap = None;
2581 } 2560 }
2582 } 2561 }
2583 2562
2584 am_pixmap_trans = 0; 2563 am_pixmap_trans = 0;
2585 } 2564 }
2586 else 2565 else
2587 { 2566 {
2588 if (pixmap != None) 2567 if (pixmap != None)
2589 XFreePixmap (disp, pixmap); 2568 XFreePixmap (dpy, pixmap);
2590 2569
2591#if TINTING 2570#if TINTING
2592 if (ISSET_PIXCOLOR (Color_tint)) 2571 if (ISSET_PIXCOLOR (Color_tint))
2593 { 2572 {
2594 unsigned short rm, gm, bm;
2595 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2573 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2596 2574
2575 rgba c;
2597 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2576 pix_colors_focused [Color_tint].get (c);
2598 2577
2599 ShadeXImage (display, image, shade, rm, gm, bm); 2578 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2600 } 2579 }
2601#endif 2580#endif
2602 2581
2603 pixmap = XCreatePixmap (disp, vt, 2582 pixmap = XCreatePixmap (dpy, vt, szHint.width, szHint.height, image->depth);
2604 szHint.width, szHint.height, image->depth);
2605 gc = XCreateGC (disp, vt, 0UL, &gcvalue); 2583 gc = XCreateGC (dpy, vt, 0UL, &gcvalue);
2606 XPutImage (disp, pixmap, gc, image, 0, 0, 2584 XPutImage (dpy, pixmap, gc, image, 0, 0,
2607 nx, ny, image->width, image->height); 2585 nx, ny, image->width, image->height);
2608 XFreeGC (disp, gc); 2586 XFreeGC (dpy, gc);
2609 XDestroyImage (image); 2587 XDestroyImage (image);
2610 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2588 XSetWindowBackgroundPixmap (dpy, parent[0], pixmap);
2611 XClearWindow (disp, parent[0]); 2589 XClearWindow (dpy, parent[0]);
2612 2590
2613 if (!am_transparent || !am_pixmap_trans) 2591 if (!am_transparent || !am_pixmap_trans)
2614 pchanged = 1; 2592 pchanged = 1;
2615 2593
2616 am_transparent = am_pixmap_trans = 1; 2594 am_transparent = am_pixmap_trans = 1;
2617 } 2595 }
2618 } 2596 }
2619 2597
2620 if (am_pixmap_trans) 2598 if (am_pixmap_trans)
2621 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2599 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2622 else 2600 else
2623 { 2601 {
2624 unsigned int n; 2602 unsigned int n;
2625 /* 2603 /*
2626 * InheritPixmap transparency 2604 * InheritPixmap transparency
2627 */ 2605 */
2628 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2606 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2629 { 2607 {
2630 oldp = parent[i]; 2608 oldp = parent[i];
2631 XQueryTree (disp, parent[i - 1], &root, 2609 XQueryTree (dpy, parent[i - 1], &root, &parent[i], &list, &n);
2632 &parent[i], &list, &n);
2633 XFree (list); 2610 XFree (list);
2634 2611
2635 if (parent[i] == display->root) 2612 if (parent[i] == display->root)
2636 { 2613 {
2637 if (oldp != None) 2614 if (oldp != None)
… …
2645 } 2622 }
2646 2623
2647 n = 0; 2624 n = 0;
2648 2625
2649 if (pchanged) 2626 if (pchanged)
2650 {
2651 for (; n < (unsigned int)i; n++) 2627 for (; n < (unsigned int)i; n++)
2652 { 2628 {
2653 XGetWindowAttributes (disp, parent[n], &wattr); 2629 XGetWindowAttributes (dpy, parent[n], &wattr);
2630
2654 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2631 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2655 { 2632 {
2656 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2633 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2657 break; 2634 break;
2658 } 2635 }
2659 } 2636 }
2660 }
2661 2637
2662 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2638 if (n > (sizeof (parent) / sizeof (parent[0])))
2663 { 2639 {
2664 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2640 XSetWindowBackground (dpy, parent[0], pix_colors_focused[Color_border]);
2665 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2641 XSetWindowBackground (dpy, vt, pix_colors_focused[Color_bg]);
2666 am_transparent = 0; 2642 am_transparent = 0;
2667 /* XXX: also turn off Opt_transparent? */ 2643 /* XXX: also turn off Opt_transparent? */
2668 } 2644 }
2669 else 2645 else
2670 { 2646 {
2671#if WAIT_FOR_WM
2672 /* wait (an arbitrary period) for the WM to do its thing
2673 * needed for fvwm2.2.2 (and before?) */
2674 sleep (1);
2675#endif
2676 for (n = 0; n < (unsigned int)i; n++) 2647 for (n = 0; n < (unsigned int)i; n++)
2677 { 2648 {
2678 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2649 XSetWindowBackgroundPixmap (dpy, parent[n], ParentRelative);
2679 XClearWindow (disp, parent[n]); 2650 XClearWindow (dpy, parent[n]);
2680 } 2651 }
2681 2652
2682 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2653 XSetWindowBackgroundPixmap (dpy, vt, ParentRelative);
2683 am_transparent = 1; 2654 am_transparent = 1;
2684 } 2655 }
2685 2656
2686 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2657 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2687 parent[i] = None; 2658 parent[i] = None;
2688 } 2659 }
2689 2660
2690 if (scrollBar.win) 2661 if (scrollBar.win)
2691 { 2662 {
2692 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2663 XSetWindowBackgroundPixmap (dpy, scrollBar.win, ParentRelative);
2693 scrollBar.setIdle (); 2664 scrollBar.setIdle ();
2694 scrollbar_show (0); 2665 scrollbar_show (0);
2695 } 2666 }
2696 2667
2697 if (am_transparent) 2668 if (am_transparent)
… …
2709 2680
2710bool 2681bool
2711rxvt_term::cmd_parse () 2682rxvt_term::cmd_parse ()
2712{ 2683{
2713 bool flag = false; 2684 bool flag = false;
2714 unicode_t ch = NOCHAR; 2685 wchar_t ch = NOCHAR;
2715 char *seq_begin; // remember start of esc-sequence here 2686 char *seq_begin; // remember start of esc-sequence here
2716 2687
2717 for (;;) 2688 for (;;)
2718 { 2689 {
2719 if (ch == NOCHAR) 2690 if (ch == NOCHAR)
2720 { 2691 {
2721 seq_begin = cmdbuf_ptr; 2692 seq_begin = cmdbuf_ptr;
2722 ch = next_char (); 2693 ch = next_char ();
2723 }
2724 2694
2725 if (ch == NOCHAR) // TODO: improve 2695 if (ch == NOCHAR)
2726 break; 2696 break;
2697 }
2727 2698
2728 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2699 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2729 { 2700 {
2730 if (!seen_input) 2701 if (!seen_input)
2731 { 2702 {
… …
2740 if (seen_resize && cmd_pid) 2711 if (seen_resize && cmd_pid)
2741 kill (-cmd_pid, SIGWINCH); 2712 kill (-cmd_pid, SIGWINCH);
2742 } 2713 }
2743 2714
2744 /* Read a text string from the input buffer */ 2715 /* Read a text string from the input buffer */
2745 unicode_t buf[UBUFSIZ]; 2716 wchar_t buf[UBUFSIZ];
2746 bool refreshnow = false; 2717 bool refreshnow = false;
2747 int nlines = 0; 2718 int nlines = 0;
2748 unicode_t *str = buf; 2719 wchar_t *str = buf;
2749 unicode_t *eol = str + min (ncol, UBUFSIZ); 2720 wchar_t *eol = str + min (ncol, UBUFSIZ);
2750 2721
2751 for (;;) 2722 for (;;)
2752 { 2723 {
2753 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2724 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2754 break; 2725 break;
… …
2772 } 2743 }
2773 2744
2774 // scr_add_lines only works for nlines <= nrow - 1. 2745 // scr_add_lines only works for nlines <= nrow - 1.
2775 if (nlines >= nrow - 1) 2746 if (nlines >= nrow - 1)
2776 { 2747 {
2748 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2777 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END))) 2749 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2778 scr_add_lines (buf, nlines, str - buf); 2750 scr_add_lines (buf, str - buf, nlines);
2779 2751
2780 nlines = 0; 2752 nlines = 0;
2781 str = buf; 2753 str = buf;
2782 eol = str + min (ncol, UBUFSIZ); 2754 eol = str + min (ncol, UBUFSIZ);
2783 } 2755 }
… …
2797 2769
2798 seq_begin = cmdbuf_ptr; 2770 seq_begin = cmdbuf_ptr;
2799 ch = next_char (); 2771 ch = next_char ();
2800 } 2772 }
2801 2773
2774 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2802 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END))) 2775 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2803 scr_add_lines (buf, nlines, str - buf); 2776 scr_add_lines (buf, str - buf, nlines);
2804 2777
2805 /* 2778 /*
2806 * If there have been a lot of new lines, then update the screen 2779 * If there have been a lot of new lines, then update the screen
2807 * What the heck I'll cheat and only refresh less than every page-full. 2780 * What the heck I'll cheat and only refresh less than every page-full.
2808 * the number of pages between refreshes is refresh_limit, which 2781 * the number of pages between refreshes is refresh_limit, which
… …
2813 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2786 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2814 refresh_limit++; 2787 refresh_limit++;
2815 else 2788 else
2816 { 2789 {
2817 flag = true; 2790 flag = true;
2791 //TODO: due to popular request, implement "skipscroll" option here
2818 scr_refresh (refresh_type); 2792 scr_refresh ();
2819 flush_ev.stop (); 2793 want_refresh = 1;
2820 } 2794 }
2821 } 2795 }
2822 2796
2823 } 2797 }
2824 else 2798 else
… …
2839 } 2813 }
2840 2814
2841 return flag; 2815 return flag;
2842} 2816}
2843 2817
2844// read the next octet
2845unicode_t
2846rxvt_term::next_octet ()
2847{
2848 return cmdbuf_ptr < cmdbuf_endp
2849 ? *cmdbuf_ptr++
2850 : NOCHAR;
2851}
2852
2853// read the next character 2818// read the next character
2854unicode_t 2819wchar_t
2855rxvt_term::next_char () 2820rxvt_term::next_char () NOTHROW
2856{ 2821{
2857 while (cmdbuf_ptr < cmdbuf_endp) 2822 while (cmdbuf_ptr < cmdbuf_endp)
2858 { 2823 {
2859 // assume 7-bit to be ascii ALWAYS 2824 // assume 7-bit to be ascii ALWAYS
2860 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2825 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2869 cmdbuf_ptr = cmdbuf_endp; 2834 cmdbuf_ptr = cmdbuf_endp;
2870 break; 2835 break;
2871 } 2836 }
2872 2837
2873 if (len == (size_t)-1) 2838 if (len == (size_t)-1)
2874 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2839 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2875 2840
2876 // assume wchar == unicode 2841 // assume wchar == unicode
2877 cmdbuf_ptr += len; 2842 cmdbuf_ptr += len;
2878 return wc & UNICODE_MASK; 2843 return wc & UNICODE_MASK;
2879 } 2844 }
2880 2845
2881 return NOCHAR; 2846 return NOCHAR;
2882} 2847}
2848
2849// read the next octet
2850uint32_t
2851rxvt_term::next_octet () NOTHROW
2852{
2853 return cmdbuf_ptr < cmdbuf_endp
2854 ? (unsigned char)*cmdbuf_ptr++
2855 : NOCHAR;
2856}
2857
2858static class out_of_input out_of_input;
2883 2859
2884/* rxvt_cmd_getc () - Return next input character */ 2860/* rxvt_cmd_getc () - Return next input character */
2885/* 2861/*
2886 * Return the next input character after first passing any keyboard input 2862 * Return the next input character after first passing any keyboard input
2887 * to the command. 2863 * to the command.
2888 */ 2864 */
2889unicode_t 2865wchar_t
2890rxvt_term::cmd_getc () 2866rxvt_term::cmd_getc () THROW ((class out_of_input))
2891{ 2867{
2892 unicode_t c = next_char (); 2868 wchar_t c = next_char ();
2893 2869
2894 if (c == NOCHAR) 2870 if (c == NOCHAR)
2895 throw out_of_input; 2871 throw out_of_input;
2896 2872
2897 return c; 2873 return c;
2898} 2874}
2899 2875
2900unicode_t 2876uint32_t
2901rxvt_term::cmd_get8 () 2877rxvt_term::cmd_get8 () THROW ((class out_of_input))
2902{ 2878{
2903 unicode_t c = next_octet (); 2879 uint32_t c = next_octet ();
2904 2880
2905 if (c == NOCHAR) 2881 if (c == NOCHAR)
2906 throw out_of_input; 2882 throw out_of_input;
2907 2883
2908 return c; 2884 return c;
… …
3144 scr_charset_set (2, (unsigned int)cmd_getc ()); 3120 scr_charset_set (2, (unsigned int)cmd_getc ());
3145 break; 3121 break;
3146 case '+': 3122 case '+':
3147 scr_charset_set (3, (unsigned int)cmd_getc ()); 3123 scr_charset_set (3, (unsigned int)cmd_getc ());
3148 break; 3124 break;
3149#if ENABLE_FRILLS 3125#if !ENABLE_MINIMAL
3150 case '6': 3126 case '6':
3151 scr_backindex (); 3127 scr_backindex ();
3152 break; 3128 break;
3153#endif 3129#endif
3154 case '7': 3130 case '7':
3155 scr_cursor (SAVE); 3131 scr_cursor (SAVE);
3156 break; 3132 break;
3157 case '8': 3133 case '8':
3158 scr_cursor (RESTORE); 3134 scr_cursor (RESTORE);
3159 break; 3135 break;
3160#if ENABLE_FRILLS 3136#if !ENABLE_MINIMAL
3161 case '9': 3137 case '9':
3162 scr_forwardindex (); 3138 scr_forwardindex ();
3163 break; 3139 break;
3164#endif 3140#endif
3165 case '=': 3141 case '=':
… …
3175 break; 3151 break;
3176 3152
3177 /* 8.3.87: NEXT LINE */ 3153 /* 8.3.87: NEXT LINE */
3178 case C1_NEL: /* ESC E */ 3154 case C1_NEL: /* ESC E */
3179 { 3155 {
3180 unicode_t nlcr[] = { C0_LF, C0_CR }; 3156 wchar_t nlcr[] = { C0_LF, C0_CR };
3181 scr_add_lines (nlcr, 1, 2); 3157 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3182 } 3158 }
3183 break; 3159 break;
3184 3160
3185 /* kidnapped escape sequence: Should be 8.3.48 */ 3161 /* kidnapped escape sequence: Should be 8.3.48 */
3186 case C1_ESA: /* ESC G */ 3162 case C1_ESA: /* ESC G */
… …
3327 ndef = get_byte_array_bit (csi_defaults, i); 3303 ndef = get_byte_array_bit (csi_defaults, i);
3328 for (p = 0; p < nargs; p++) 3304 for (p = 0; p < nargs; p++)
3329 if (arg[p] == -1) 3305 if (arg[p] == -1)
3330 arg[p] = ndef; 3306 arg[p] = ndef;
3331 3307
3332#ifdef DEBUG_CMD
3333 fprintf (stderr, "CSI ");
3334 for (p = 0; p < nargs; p++)
3335 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3336 fprintf (stderr, "%c\n", ch);
3337#endif
3338
3339 /* 3308 /*
3340 * private mode handling 3309 * private mode handling
3341 */ 3310 */
3342 if (priv) 3311 if (priv)
3343 { 3312 {
3344 switch (priv) 3313 switch (priv)
3345 { 3314 {
3346 case '>': 3315 case '>':
3347 if (ch == CSI_DA) /* secondary device attributes */ 3316 if (ch == CSI_DA) /* secondary device attributes */
3348 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 3317 {
3318 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3319 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3320 //
3321 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3322 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3323 // that we do not support xterm mouse reporting (should be 95 when we do).
3324 //
3325 tt_printf ("\033[>%d;94;0c", 'U');
3326 }
3349 break; 3327 break;
3350 case '?': 3328 case '?':
3351 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3329 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3352 process_terminal_mode (ch, priv, nargs, arg); 3330 process_terminal_mode (ch, priv, nargs, arg);
3353 break; 3331 break;
… …
3556 break; 3534 break;
3557 case CSI_75: 3535 case CSI_75:
3558 scr_cursor (RESTORE); 3536 scr_cursor (RESTORE);
3559 break; 3537 break;
3560 3538
3561#if ENABLE_FRILLS 3539#if !ENABLE_MINIMAL
3562 case CSI_74: 3540 case CSI_74:
3563 process_window_ops (arg, nargs); 3541 process_window_ops (arg, nargs);
3564 break; 3542 break;
3565#endif 3543#endif
3566 3544
… …
3573 break; 3551 break;
3574 } 3552 }
3575} 3553}
3576/*}}} */ 3554/*}}} */
3577 3555
3578#if ENABLE_FRILLS 3556#if !ENABLE_MINIMAL
3579/* ARGSUSED */ 3557/* ARGSUSED */
3580void 3558void
3581rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3559rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3582{ 3560{
3583 int x, y; 3561 int x, y;
3584 XWindowAttributes wattr; 3562 XWindowAttributes wattr;
3585 Window wdummy; 3563 Window wdummy;
3586 dDisp; 3564
3565 dLocal (Display *, dpy);
3587 3566
3588 if (nargs == 0) 3567 if (nargs == 0)
3589 return; 3568 return;
3590 3569
3591 switch (args[0]) 3570 switch (args[0])
3592 { 3571 {
3593 /* 3572 /*
3594 * commands 3573 * commands
3595 */ 3574 */
3596 case 1: /* deiconify window */ 3575 case 1: /* deiconify window */
3597 XMapWindow (disp, parent[0]); 3576 XMapWindow (dpy, parent[0]);
3598 break; 3577 break;
3599 case 2: /* iconify window */ 3578 case 2: /* iconify window */
3600 XIconifyWindow (disp, parent[0], display->screen); 3579 XIconifyWindow (dpy, parent[0], display->screen);
3601 break; 3580 break;
3602 case 3: /* set position (pixels) */ 3581 case 3: /* set position (pixels) */
3603 XMoveWindow (disp, parent[0], args[1], args[2]); 3582 XMoveWindow (dpy, parent[0], args[1], args[2]);
3604 break; 3583 break;
3605 case 4: /* set size (pixels) */ 3584 case 4: /* set size (pixels) */
3606 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3585 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3607 break; 3586 break;
3608 case 5: /* raise window */ 3587 case 5: /* raise window */
3609 XRaiseWindow (disp, parent[0]); 3588 XRaiseWindow (dpy, parent[0]);
3610 break; 3589 break;
3611 case 6: /* lower window */ 3590 case 6: /* lower window */
3612 XLowerWindow (disp, parent[0]); 3591 XLowerWindow (dpy, parent[0]);
3613 break; 3592 break;
3614 case 7: /* refresh window */ 3593 case 7: /* refresh window */
3615 scr_touch (true); 3594 scr_touch (true);
3616 break; 3595 break;
3617 case 8: /* set size (chars) */ 3596 case 8: /* set size (chars) */
… …
3624 if (args[0] >= 24) /* set height (chars) */ 3603 if (args[0] >= 24) /* set height (chars) */
3625 set_widthheight ((unsigned int)width, 3604 set_widthheight ((unsigned int)width,
3626 (unsigned int) (args[1] * fheight)); 3605 (unsigned int) (args[1] * fheight));
3627 break; 3606 break;
3628 3607
3629
3630 /* 3608 /*
3631 * reports - some output format copied from XTerm 3609 * reports - some output format copied from XTerm
3632 */ 3610 */
3633 case 11: /* report window state */ 3611 case 11: /* report window state */
3634 XGetWindowAttributes (disp, parent[0], &wattr); 3612 XGetWindowAttributes (dpy, parent[0], &wattr);
3635 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3613 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3636 break; 3614 break;
3637 case 13: /* report window position */ 3615 case 13: /* report window position */
3638 XGetWindowAttributes (disp, parent[0], &wattr); 3616 XGetWindowAttributes (dpy, parent[0], &wattr);
3639 XTranslateCoordinates (disp, parent[0], wattr.root, 3617 XTranslateCoordinates (dpy, parent[0], wattr.root,
3640 -wattr.border_width, -wattr.border_width, 3618 -wattr.border_width, -wattr.border_width,
3641 &x, &y, &wdummy); 3619 &x, &y, &wdummy);
3642 tt_printf ("\033[3;%d;%dt", x, y); 3620 tt_printf ("\033[3;%d;%dt", x, y);
3643 break; 3621 break;
3644 case 14: /* report window size (pixels) */ 3622 case 14: /* report window size (pixels) */
3645 XGetWindowAttributes (disp, parent[0], &wattr); 3623 XGetWindowAttributes (dpy, parent[0], &wattr);
3646 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3624 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3647 break; 3625 break;
3648 case 18: /* report text area size (chars) */ 3626 case 18: /* report text area size (chars) */
3649 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3627 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3650 break; 3628 break;
… …
3652 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3630 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3653 break; 3631 break;
3654 case 20: /* report icon label */ 3632 case 20: /* report icon label */
3655 { 3633 {
3656 char *s; 3634 char *s;
3657 XGetIconName (disp, parent[0], &s); 3635 XGetIconName (dpy, parent[0], &s);
3658 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3636 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3659 XFree (s); 3637 XFree (s);
3660 } 3638 }
3661 break; 3639 break;
3662 case 21: /* report window title */ 3640 case 21: /* report window title */
3663 { 3641 {
3664 char *s; 3642 char *s;
3665 XFetchName (disp, parent[0], &s); 3643 XFetchName (dpy, parent[0], &s);
3666 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3644 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3667 XFree (s); 3645 XFree (s);
3668 } 3646 }
3669 break; 3647 break;
3670 } 3648 }
… …
3698 seen_esc = true; 3676 seen_esc = true;
3699 continue; 3677 continue;
3700 } 3678 }
3701 else if (ch == C0_BEL || ch == CHAR_ST) 3679 else if (ch == C0_BEL || ch == CHAR_ST)
3702 break; 3680 break;
3681 else if (ch == C0_SYN)
3682 ch = cmd_get8 ();
3703 else if (ch < 0x20) 3683 else if (ch < 0x20)
3704 return NULL; /* other control character - exit */ 3684 return NULL; /* other control character - exit */
3705 3685
3706 seen_esc = false; 3686 seen_esc = false;
3707 3687
3708 if (n >= STRING_MAX - 1) 3688 if (n >= STRING_MAX - 1)
3709 // stop at some sane length 3689 // stop at some sane length
3710 return NULL; 3690 return NULL;
3711 3691
3712 if (ch == C0_SYN)
3713 string[n++] = cmd_get8 ();
3714 else
3715 string[n++] = ch; 3692 string[n++] = ch;
3716 } 3693 }
3717 3694
3718 string[n++] = '\0'; 3695 string[n++] = '\0';
3719 3696
3720 ends_how = (ch == 0x5c ? C0_ESC : ch); 3697 ends_how = (ch == 0x5c ? C0_ESC : ch);
… …
3771void 3748void
3772rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3749rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3773{ 3750{
3774 if (str[0] == '?' && !str[1]) 3751 if (str[0] == '?' && !str[1])
3775 { 3752 {
3776 unsigned short r, g, b; 3753 rgba c;
3777 pix_colors_focused[color].get (display, r, g, b); 3754 pix_colors_focused[color].get (c);
3755
3756#if XFT
3757 if (c.a != rgba::MAX_CC)
3758 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3759 else
3760#endif
3778 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3761 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3779 } 3762 }
3780 else 3763 else
3781 set_window_color (color, str); 3764 set_window_color (color, str);
3782} 3765}
3783 3766
… …
3785 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3768 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3786 */ 3769 */
3787void 3770void
3788rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3771rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3789{ 3772{
3790 int changed = 0;
3791 int color; 3773 int color;
3792 char *buf, *name; 3774 char *buf, *name;
3793 bool query = str[0] == '?' && !str[1]; 3775 bool query = str[0] == '?' && !str[1];
3794 int saveop = op; 3776 int saveop = op;
3795 dDisp; 3777
3778 dLocal (Display *, dpy);
3796 3779
3797 assert (str != NULL); 3780 assert (str != NULL);
3781
3782 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_INT, op, DT_STR, str, DT_END)))
3783 return;
3784
3798 switch (op) 3785 switch (op)
3799 { 3786 {
3800 case XTerm_name: 3787 case XTerm_name:
3801 set_title (str); 3788 set_title (str);
3802 /* FALLTHROUGH */ 3789 /* FALLTHROUGH */
… …
3816 unsigned long bytes_after; 3803 unsigned long bytes_after;
3817 unsigned char *value = 0; 3804 unsigned char *value = 0;
3818 const char *str = ""; 3805 const char *str = "";
3819 3806
3820 if (prop 3807 if (prop
3821 && XGetWindowProperty (disp, parent[0], 3808 && XGetWindowProperty (dpy, parent[0],
3822 prop, 0, 1<<16, 0, AnyPropertyType, 3809 prop, 0, 1<<16, 0, AnyPropertyType,
3823 &actual_type, &actual_format, 3810 &actual_type, &actual_format,
3824 &nitems, &bytes_after, &value) == Success 3811 &nitems, &bytes_after, &value) == Success
3825 && actual_type != None 3812 && actual_type != None
3826 && actual_format == 8) 3813 && actual_format == 8)
3827 str = (const char *)(value); 3814 str = (const char *)(value);
3828 3815
3829 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3816 tt_printf ("\033]%d;%s%c", op, str, resp);
3830 3817
3831 XFree (value); 3818 XFree (value);
3832 } 3819 }
3833 else 3820 else
3834 { 3821 {
… …
3838 { 3825 {
3839 *eq = 0; 3826 *eq = 0;
3840 set_utf8_property (display->atom (str), eq + 1); 3827 set_utf8_property (display->atom (str), eq + 1);
3841 } 3828 }
3842 else 3829 else
3843 XDeleteProperty (disp, parent[0], 3830 XDeleteProperty (dpy, parent[0],
3844 display->atom (str)); 3831 display->atom (str));
3845 } 3832 }
3846 break; 3833 break;
3847 3834
3848 case XTerm_Color: 3835 case XTerm_Color:
… …
3850 { 3837 {
3851 if ((name = strchr (buf, ';')) == NULL) 3838 if ((name = strchr (buf, ';')) == NULL)
3852 break; 3839 break;
3853 3840
3854 *name++ = '\0'; 3841 *name++ = '\0';
3855 color = atoi (buf); 3842 color = atoi (buf) + minCOLOR;
3856 3843
3857 if (color < 0 || color >= TOTAL_COLORS) 3844 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3858 break; 3845 break;
3859 3846
3860 if ((buf = strchr (name, ';')) != NULL) 3847 if ((buf = strchr (name, ';')) != NULL)
3861 *buf++ = '\0'; 3848 *buf++ = '\0';
3862 3849
3863 if (name[0] == '?' && !name[1]) 3850 process_color_seq (op, color, name, resp);
3864 {
3865 unsigned short r, g, b;
3866 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3867 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3868 }
3869 else
3870 set_window_color (color + minCOLOR, name);
3871 } 3851 }
3872 break; 3852 break;
3873 case XTerm_Color00: 3853 case XTerm_Color00:
3874 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3854 process_color_seq (op, Color_fg, str, resp);
3875 break; 3855 break;
3876 case XTerm_Color01: 3856 case XTerm_Color01:
3877 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3857 process_color_seq (op, Color_bg, str, resp);
3878 break; 3858 break;
3879#ifndef NO_CURSORCOLOR 3859#ifndef NO_CURSORCOLOR
3880 case XTerm_Color_cursor: 3860 case XTerm_Color_cursor:
3881 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3861 process_color_seq (op, Color_cursor, str, resp);
3882 break; 3862 break;
3883#endif 3863#endif
3884 case XTerm_Color_pointer_fg: 3864 case XTerm_Color_pointer_fg:
3885 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3865 process_color_seq (op, Color_pointer_fg, str, resp);
3886 break; 3866 break;
3887 case XTerm_Color_pointer_bg: 3867 case XTerm_Color_pointer_bg:
3888 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3868 process_color_seq (op, Color_pointer_bg, str, resp);
3889 break; 3869 break;
3890#ifndef NO_BOLD_UNDERLINE_REVERSE 3870#ifndef NO_BOLD_UNDERLINE_REVERSE
3891 case XTerm_Color_BD:
3892 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3893 break;
3894 case XTerm_Color_UL:
3895 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3896 break;
3897 case XTerm_Color_RV: 3871 case XTerm_Color_RV:
3898 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3872 process_color_seq (op, Color_RV, str, resp);
3873 break;
3874 case Rxvt_Color_BD:
3875 case URxvt_Color_BD:
3876 process_color_seq (op, Color_BD, str, resp);
3877 break;
3878 case Rxvt_Color_UL:
3879 case URxvt_Color_UL:
3880 process_color_seq (op, Color_UL, str, resp);
3899 break; 3881 break;
3900 case URxvt_Color_IT: 3882 case URxvt_Color_IT:
3901 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3883 process_color_seq (op, Color_IT, str, resp);
3902 break; 3884 break;
3903#endif 3885#endif
3904#if TRANSPARENT && TINTING 3886#if TRANSPARENT && TINTING
3905 case URxvt_Color_tint: 3887 case URxvt_Color_tint:
3906 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3888 process_color_seq (op, Color_tint, str, resp);
3889
3907 check_our_parents (); 3890 check_our_parents ();
3891
3908 if (am_transparent) 3892 if (am_transparent)
3909 want_full_refresh = want_refresh = 1; 3893 want_full_refresh = want_refresh = 1;
3910 break;
3911#endif
3912 3894
3895 break;
3896#endif
3897
3913 case XTerm_Pixmap: 3898 case Rxvt_Pixmap:
3899 {
3914 if (*str != ';') 3900 if (*str != ';')
3915 { 3901 {
3916#if XPM_BACKGROUND 3902#if XPM_BACKGROUND
3917 scale_pixmap (""); /* reset to default scaling */ 3903 scale_pixmap (""); /* reset to default scaling */
3918 set_bgPixmap (str); /* change pixmap */ 3904 set_bgPixmap (str); /* change pixmap */
3919#endif
3920 scr_touch (true); 3905 scr_touch (true);
3906#endif
3921 } 3907 }
3908
3909 int changed = 0;
3910
3922 while ((str = strchr (str, ';')) != NULL) 3911 while ((str = strchr (str, ';')) != NULL)
3923 { 3912 {
3924 str++; 3913 str++;
3925#if XPM_BACKGROUND 3914#if XPM_BACKGROUND
3926 changed += scale_pixmap (str); 3915 changed += scale_pixmap (str);
3927#endif 3916#endif
3928 } 3917 }
3929 3918
3930 if (changed) 3919 if (changed)
3931 { 3920 {
3932#ifdef XPM_BACKGROUND 3921#ifdef XPM_BACKGROUND
3933 resize_pixmap (); 3922 resize_pixmap ();
3934#endif
3935 scr_touch (true); 3923 scr_touch (true);
3924#endif
3936 } 3925 }
3926 }
3937 break; 3927 break;
3938 3928
3939 case XTerm_restoreFG: 3929 case Rxvt_restoreFG:
3940 set_window_color (Color_fg, str); 3930 set_window_color (Color_fg, str);
3941 break; 3931 break;
3942 case XTerm_restoreBG: 3932 case Rxvt_restoreBG:
3943 set_window_color (Color_bg, str); 3933 set_window_color (Color_bg, str);
3944 break; 3934 break;
3945 3935
3946 case XTerm_logfile: 3936 case XTerm_logfile:
3947 // TODO, when secure mode? 3937 // TODO, when secure mode?
3948 break; 3938 break;
3949 3939
3950#ifdef MENUBAR
3951 case URxvt_Menu:
3952 if (OPTION (Opt_insecure))
3953 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3954 break;
3955#endif
3956#if 0 3940#if 0
3957 case XTerm_dumpscreen: /* no error notices */ 3941 case Rxvt_dumpscreen: /* no error notices */
3958 { 3942 {
3959 int fd; 3943 int fd;
3960 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3944 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3961 { 3945 {
3962 scr_dump (fd); 3946 scr_dump (fd);
… …
3986 allocated.push_back ((void *)res); 3970 allocated.push_back ((void *)res);
3987 set_fonts (); 3971 set_fonts ();
3988 } 3972 }
3989 break; 3973 break;
3990 3974
3991#if ENABLE_FRILLS 3975 case URxvt_version:
3976 if (query)
3977 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3978 op,
3979 rs[Rs_name], VERSION[0], VERSION[2],
3980 resp);
3981 break;
3982
3983#if !ENABLE_MINIMAL
3992 case URxvt_locale: 3984 case URxvt_locale:
3993 if (query) 3985 if (query)
3994 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3986 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3995 else 3987 else
3996 { 3988 {
3997 set_locale (str); 3989 set_locale (str);
3998 pty.set_utf8_mode (enc_utf8); 3990 pty->set_utf8_mode (enc_utf8);
3999 init_xlocale (); 3991 init_xlocale ();
4000 } 3992 }
4001 break; 3993 break;
4002 3994
4003 case URxvt_view_up: 3995 case URxvt_view_up:
… …
4014 break; 4006 break;
4015#endif 4007#endif
4016 4008
4017#if ENABLE_PERL 4009#if ENABLE_PERL
4018 case URxvt_perl: 4010 case URxvt_perl:
4019 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END))) 4011 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ_PERL, DT_STR, str, DT_END)))
4020 ; // no responses yet 4012 ; // no responses yet
4021 break; 4013 break;
4022#endif 4014#endif
4023 } 4015 }
4024} 4016}
… …
4056 return state; 4048 return state;
4057} 4049}
4058 4050
4059/* we're not using priv _yet_ */ 4051/* we're not using priv _yet_ */
4060void 4052void
4061rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4053rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4062{ 4054{
4063 unsigned int i, j; 4055 unsigned int i, j;
4064 int state; 4056 int state;
4065 4057
4066 static const struct 4058 static const struct
… …
4077 { 5, PrivMode_rVideo }, 4069 { 5, PrivMode_rVideo },
4078 { 6, PrivMode_relOrigin }, 4070 { 6, PrivMode_relOrigin },
4079 { 7, PrivMode_Autowrap }, 4071 { 7, PrivMode_Autowrap },
4080 // 8, bi-directional support mode 4072 // 8, bi-directional support mode
4081 { 9, PrivMode_MouseX10 }, 4073 { 9, PrivMode_MouseX10 },
4082#ifdef menuBar_esc
4083 { menuBar_esc, PrivMode_menuBar },
4084#endif
4085 // 18, 19 printing-related 4074 // 18, 19 printing-related
4086 { 25, PrivMode_VisibleCursor }, 4075 { 25, PrivMode_VisibleCursor },
4087#ifdef scrollBar_esc 4076#ifdef scrollBar_esc
4088 { scrollBar_esc, PrivMode_scrollBar }, 4077 { scrollBar_esc, PrivMode_scrollBar },
4089#endif 4078#endif
… …
4136 /* extra handling for values with state unkept */ 4125 /* extra handling for values with state unkept */
4137 switch (arg[i]) 4126 switch (arg[i])
4138 { 4127 {
4139#if ENABLE_STYLES 4128#if ENABLE_STYLES
4140 case 1021: 4129 case 1021:
4141 if (mode) 4130 set_option (Opt_intensityStyles, mode);
4142 SET_OPTION (Opt_intensityStyles);
4143 else
4144 CLR_OPTION (Opt_intensityStyles);
4145 4131
4146 scr_touch (true); 4132 scr_touch (true);
4147 break; 4133 break;
4148#endif 4134#endif
4149 case 1048: /* alternative cursor save */ 4135 case 1048: /* alternative cursor save */
… …
4171 case 3: /* 80/132 */ 4157 case 3: /* 80/132 */
4172 if (priv_modes & PrivMode_132OK) 4158 if (priv_modes & PrivMode_132OK)
4173 set_widthheight (((state ? 132 : 80) * fwidth), height); 4159 set_widthheight (((state ? 132 : 80) * fwidth), height);
4174 break; 4160 break;
4175 case 4: /* smooth scrolling */ 4161 case 4: /* smooth scrolling */
4176 if (!state) 4162 set_option (Opt_jumpScroll, !state);
4177 SET_OPTION (Opt_jumpScroll);
4178 else
4179 CLR_OPTION (Opt_jumpScroll);
4180 break; 4163 break;
4181 case 5: /* reverse video */ 4164 case 5: /* reverse video */
4182 scr_rvideo_mode (state); 4165 scr_rvideo_mode (state);
4183 break; 4166 break;
4184 case 6: /* relative/absolute origins */ 4167 case 6: /* relative/absolute origins */
… …
4190 /* case 8: - auto repeat, can't do on a per window basis */ 4173 /* case 8: - auto repeat, can't do on a per window basis */
4191 case 9: /* X10 mouse reporting */ 4174 case 9: /* X10 mouse reporting */
4192 if (state) /* orthogonal */ 4175 if (state) /* orthogonal */
4193 priv_modes &= ~PrivMode_MouseX11; 4176 priv_modes &= ~PrivMode_MouseX11;
4194 break; 4177 break;
4195#ifdef menuBar_esc
4196 case menuBar_esc:
4197#ifdef MENUBAR
4198 map_menuBar (state);
4199#endif
4200 break;
4201#endif
4202#ifdef scrollBar_esc 4178#ifdef scrollBar_esc
4203 case scrollBar_esc: 4179 case scrollBar_esc:
4204 if (scrollbar_mapping (state)) 4180 if (scrollbar_mapping (state))
4205 { 4181 {
4206 resize_all_windows (0, 0, 0); 4182 resize_all_windows (0, 0, 0);
… …
4225#if 0 4201#if 0
4226 case 1001: 4202 case 1001:
4227 break; /* X11 mouse highlighting */ 4203 break; /* X11 mouse highlighting */
4228#endif 4204#endif
4229 case 1010: /* scroll to bottom on TTY output inhibit */ 4205 case 1010: /* scroll to bottom on TTY output inhibit */
4230 if (!state) 4206 set_option (Opt_scrollTtyOutput, !state);
4231 SET_OPTION (Opt_scrollTtyOutput);
4232 else
4233 CLR_OPTION (Opt_scrollTtyOutput);
4234 break; 4207 break;
4235 case 1011: /* scroll to bottom on key press */ 4208 case 1011: /* scroll to bottom on key press */
4236 if (state) 4209 set_option (Opt_scrollTtyKeypress, state);
4237 SET_OPTION (Opt_scrollTtyKeypress);
4238 else
4239 CLR_OPTION (Opt_scrollTtyKeypress);
4240 break; 4210 break;
4241 case 1047: /* secondary screen w/ clearing last */ 4211 case 1047: /* secondary screen w/ clearing last */
4242 if (OPTION (Opt_secondaryScreen)) 4212 if (OPTION (Opt_secondaryScreen))
4243 if (current_screen != PRIMARY) 4213 if (current_screen != PRIMARY)
4244 scr_erase_screen (2); 4214 scr_erase_screen (2);
… …
4382 scr_color (Color_bg, Color_bg); 4352 scr_color (Color_bg, Color_bg);
4383 break; 4353 break;
4384 4354
4385 //case 50: // not variable spacing 4355 //case 50: // not variable spacing
4386 4356
4387#if ENABLE_FRILLS 4357#if !ENABLE_MINIMAL
4388 case 90: 4358 case 90:
4389 case 91: /* set bright fg color */ 4359 case 91: /* set bright fg color */
4390 case 92: 4360 case 92:
4391 case 93: 4361 case 93:
4392 case 94: 4362 case 94:
… …
4454const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4424const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4455 4425
4456void 4426void
4457rxvt_term::tt_write (const char *data, unsigned int len) 4427rxvt_term::tt_write (const char *data, unsigned int len)
4458{ 4428{
4429 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4430 return;
4431
4432 if (pty->pty < 0)
4433 return;
4434
4459 if (v_buflen == 0) 4435 if (v_buflen == 0)
4460 { 4436 {
4461 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4437 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4462 4438
4463 if ((unsigned int)written == len) 4439 if ((unsigned int)written == len)
4464 return; 4440 return;
4465 4441
4466 data += written; 4442 data += written;
… …
4475 pty_ev.set (EVENT_READ | EVENT_WRITE); 4451 pty_ev.set (EVENT_READ | EVENT_WRITE);
4476} 4452}
4477 4453
4478void rxvt_term::pty_write () 4454void rxvt_term::pty_write ()
4479{ 4455{
4480 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4456 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4481 4457
4482 if (written > 0) 4458 if (written > 0)
4483 { 4459 {
4484 v_buflen -= written; 4460 v_buflen -= written;
4485 4461

Diff Legend

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