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.235 by root, Wed Jan 4 20:43:37 2006 UTC vs.
Revision 1.303 by root, Tue Jan 31 21:47:56 2006 UTC

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

Diff Legend

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