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.234 by root, Wed Jan 4 04:42:45 2006 UTC vs.
Revision 1.301 by root, Tue Jan 31 21:23:13 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
65/*----------------------------------------------------------------------*/ 60/*----------------------------------------------------------------------*/
66 61
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 62#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 63
72#if ENABLE_FRILLS || ISO_14755 64#if ENABLE_FRILLS || ISO_14755
73 65
74#define ISO_14755_STARTED 0x80000000UL 66#define ISO_14755_STARTED 0x80000000UL
75#define ISO_14755_51 0x40000000UL // basic (section 5.1) 67#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
147 || !IN_RANGE_EXC (y, 0, nrow)) 139 || !IN_RANGE_EXC (y, 0, nrow))
148 return; 140 return;
149 141
150 for (;;) 142 for (;;)
151 { 143 {
152 const line_t &l = ROW(y - view_start); 144 const line_t &l = ROW(y + view_start);
153 145
154 text_t t = l.t[x]; 146 text_t t = l.t[x];
155 147
156 if (t != NOCHAR || !x) 148 if (t != NOCHAR || !x)
157 { 149 {
… …
230# if !UNICODE3 222# if !UNICODE3
231 if (ch >= 0x10000) 223 if (ch >= 0x10000)
232 ch = 0xfffd; 224 ch = 0xfffd;
233# endif 225# endif
234 scr_overlay_set (11, y, ch, r); 226 scr_overlay_set (11, y, ch, r);
227
228 if (WCWIDTH (ch) >= 2)
235 scr_overlay_set (12, y, NOCHAR, r); 229 scr_overlay_set (12, y, NOCHAR, r);
236 } 230 }
237 231
232// {
233// char buf[4+4+3+1];
234// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
235// scr_overlay_set (0, 0, buf);
236// }
238 scr_overlay_set (0, len , attr); 237 scr_overlay_set (0, len , attr);
239 scr_overlay_set (0, len + 1, fname); 238 scr_overlay_set (0, len + 1, fname);
240 239
241 free (fname); 240 free (fname);
242 241
… …
302rxvt_term::lookup_key (XKeyEvent &ev) 301rxvt_term::lookup_key (XKeyEvent &ev)
303{ 302{
304 int ctrl, meta, shft, len; 303 int ctrl, meta, shft, len;
305 unsigned int newlen; 304 unsigned int newlen;
306 KeySym keysym; 305 KeySym keysym;
307#ifdef DEBUG_CMD
308 static int debug_key = 1; /* accessible by a debugger only */
309#endif
310 int valid_keysym; 306 int valid_keysym;
311 char kbuf[KBUFSZ]; 307 char kbuf[KBUFSZ];
312 308
313 /* 309 /*
314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 310 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
… …
443 scr_move_to (0, 1); 439 scr_move_to (0, 1);
444 return; 440 return;
445 } 441 }
446 else if (keysym == XK_End) 442 else if (keysym == XK_End)
447 { 443 {
448 scr_move_to (1, 0); 444 scr_move_to (1, 1);
449 return; 445 return;
450 } 446 }
451 } 447 }
452#endif 448#endif
453 } 449 }
… …
464 { 460 {
465 switch (keysym) 461 switch (keysym)
466 { 462 {
467 /* normal XTerm key bindings */ 463 /* normal XTerm key bindings */
468 case XK_Insert: /* Shift+Insert = paste mouse selection */ 464 case XK_Insert: /* Shift+Insert = paste mouse selection */
469 selection_request (ev.time, 0, 0); 465 selection_request (ev.time);
470 return; 466 return;
471#if TODO 467#if TODO
472 /* rxvt extras */ 468 /* rxvt extras */
473 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 469 case XK_KP_Add: /* Shift+KP_Add = bigger font */
474 change_font (FONT_UP); 470 change_font (FONT_UP);
… …
867#endif 863#endif
868 /* nil */ ; 864 /* nil */ ;
869 } 865 }
870 } 866 }
871 867
868 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
869 return;
870
872 if (len <= 0) 871 if (len <= 0)
873 return; /* not mapped */ 872 return; /* not mapped */
874 873
875 if (OPTION (Opt_scrollTtyKeypress)) 874 if (OPTION (Opt_scrollTtyKeypress))
876 if (view_start) 875 if (view_start)
… …
902 { 901 {
903 const char ch = C0_ESC; 902 const char ch = C0_ESC;
904 tt_write (&ch, 1); 903 tt_write (&ch, 1);
905 } 904 }
906 905
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); 906 tt_write (kbuf, (unsigned int)len);
918} 907}
919/*}}} */ 908/*}}} */
920 909
921#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 910#if defined (KEYSYM_RESOURCE)
922/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
923/* attempt to `write' count to the input buffer */
924unsigned int 911unsigned int
925rxvt_term::cmd_write (const char *str, unsigned int count) 912rxvt_term::cmd_write (const char *str, unsigned int count)
926{ 913{
927 unsigned int n, s; 914 unsigned int n, s;
928 915
… …
967 } 954 }
968#endif 955#endif
969 956
970 if (want_refresh) 957 if (want_refresh)
971 { 958 {
959 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
960 {
961 int row = view_start;
962 int end_row = row + nrow;
963
964 while (row > top_row && ROW (row - 1).is_longer ())
965 --row;
966
967 do
968 {
969 int start_row = row;
970 line_t *l;
971
972 do
973 {
974 l = &ROW (row++);
975
976 if (!(l->f & LINE_FILTERED))
977 {
978 // line not filtered, mark it as filtered
979 l->f |= LINE_FILTERED;
980 while (l->is_longer ())
981 {
982 l = &ROW (row++);
983 l->f |= LINE_FILTERED;
984 }
985
986 // and filter it
987 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
988
989 break;
990 }
991 }
992 while (l->is_longer () && row < end_row);
993 }
994 while (row < end_row);
995 }
996
972 scr_refresh (refresh_type); 997 scr_refresh ();
973 scrollbar_show (1); 998 scrollbar_show (1);
974#ifdef USE_XIM 999#ifdef USE_XIM
975 IMSendSpot (); 1000 IMSendSpot ();
976#endif 1001#endif
977 } 1002 }
… …
980} 1005}
981 1006
982void 1007void
983rxvt_term::check_cb (check_watcher &w) 1008rxvt_term::check_cb (check_watcher &w)
984{ 1009{
985 SET_R (this); 1010 make_current ();
986 SET_LOCALE (locale);
987 1011
988 display->flush (); 1012 display->flush ();
989 1013
990 if (want_refresh && !flush_ev.active) 1014 if (want_refresh && !flush_ev.active)
991 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally 1015 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
992} 1016}
993 1017
994void 1018void
995rxvt_term::flush_cb (time_watcher &w) 1019rxvt_term::flush_cb (time_watcher &w)
996{ 1020{
997 SET_R (this); 1021 make_current ();
998 SET_LOCALE (locale);
999 1022
1000 refresh_limit = 1; 1023 refresh_limit = 1;
1001 refresh_count = 0; 1024 refresh_count = 0;
1002 flush (); 1025 flush ();
1003} 1026}
… …
1007rxvt_term::cursor_blink_cb (time_watcher &w) 1030rxvt_term::cursor_blink_cb (time_watcher &w)
1008{ 1031{
1009 hidden_cursor = !hidden_cursor; 1032 hidden_cursor = !hidden_cursor;
1010 want_refresh = 1; 1033 want_refresh = 1;
1011 1034
1012 w.start (w.at + BLINK_INTERVAL); 1035 w.start (w.at + CURSOR_BLINK_INTERVAL);
1013} 1036}
1014#endif 1037#endif
1015 1038
1016#ifdef TEXT_BLINK 1039#ifdef TEXT_BLINK
1017void 1040void
… …
1031rxvt_term::cont_scroll_cb (time_watcher &w) 1054rxvt_term::cont_scroll_cb (time_watcher &w)
1032{ 1055{
1033 if ((scrollbar_isUp() || scrollbar_isDn()) && 1056 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1034 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1057 scr_page (scrollbar_isUp() ? UP : DN, 1))
1035 { 1058 {
1036 refresh_type |= SMOOTH_REFRESH;
1037 want_refresh = 1; 1059 want_refresh = 1;
1038 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1060 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1039 } 1061 }
1040} 1062}
1041#endif 1063#endif
… …
1045rxvt_term::sel_scroll_cb (time_watcher &w) 1067rxvt_term::sel_scroll_cb (time_watcher &w)
1046{ 1068{
1047 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1069 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1048 { 1070 {
1049 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1071 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1050 refresh_type |= SMOOTH_REFRESH;
1051 want_refresh = 1; 1072 want_refresh = 1;
1052 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1073 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1053 } 1074 }
1054} 1075}
1055#endif 1076#endif
… …
1060{ 1081{
1061 if (mouse_slip_wheel_speed == 0 1082 if (mouse_slip_wheel_speed == 0
1062 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1083 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1063 : scr_page (UP, mouse_slip_wheel_speed)) 1084 : scr_page (UP, mouse_slip_wheel_speed))
1064 { 1085 {
1065 if (view_start == nsaved || 1086 if (view_start == top_row || view_start == 0)
1066 view_start == 0)
1067 mouse_slip_wheel_speed = 0; 1087 mouse_slip_wheel_speed = 0;
1068 1088
1069 refresh_type |= SMOOTH_REFRESH;
1070 want_refresh = 1; 1089 want_refresh = 1;
1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1090 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1072 } 1091 }
1073} 1092}
1074#endif
1075
1076#if HAVE_SCHED_YIELD
1077static struct event_handler
1078{
1079 check_watcher cw_yield;
1080
1081 void yield (check_watcher &w)
1082 {
1083 sched_yield ();
1084 w.stop ();
1085 }
1086
1087 event_handler ()
1088 : cw_yield (this, &event_handler::yield)
1089 {
1090 }
1091} event_handler;
1092#endif 1093#endif
1093 1094
1094bool 1095bool
1095rxvt_term::pty_fill () 1096rxvt_term::pty_fill ()
1096{ 1097{
… …
1104 1105
1105 memmove (cmdbuf_base, cmdbuf_ptr, n); 1106 memmove (cmdbuf_base, cmdbuf_ptr, n);
1106 cmdbuf_ptr = cmdbuf_base; 1107 cmdbuf_ptr = cmdbuf_base;
1107 cmdbuf_endp = cmdbuf_ptr + n; 1108 cmdbuf_endp = cmdbuf_ptr + n;
1108 1109
1109 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1110 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1110 1111
1111 if (r > 0) 1112 if (r > 0)
1112 { 1113 {
1113 cmdbuf_endp += r; 1114 cmdbuf_endp += r;
1114 return true; 1115 return true;
… …
1132} 1133}
1133 1134
1134void 1135void
1135rxvt_term::pty_cb (io_watcher &w, short revents) 1136rxvt_term::pty_cb (io_watcher &w, short revents)
1136{ 1137{
1137 SET_R (this); 1138 make_current ();
1138 SET_LOCALE (locale);
1139 1139
1140 if (revents & EVENT_READ) 1140 if (revents & EVENT_READ)
1141 // loop, but don't allow a single term to monopolize us 1141 // loop, but don't allow a single term to monopolize us
1142 while (pty_fill ()) 1142 while (pty_fill ())
1143 if (cmd_parse ()) 1143 if (cmd_parse ())
… …
1148} 1148}
1149 1149
1150void 1150void
1151rxvt_term::pointer_unblank () 1151rxvt_term::pointer_unblank ()
1152{ 1152{
1153 XDefineCursor (display->display, vt, TermWin_cursor); 1153 XDefineCursor (xdisp, vt, TermWin_cursor);
1154 recolour_cursor (); 1154 recolour_cursor ();
1155 1155
1156#ifdef POINTER_BLANK 1156#ifdef POINTER_BLANK
1157 hidden_pointer = 0; 1157 hidden_pointer = 0;
1158 1158
… …
1163 1163
1164#ifdef POINTER_BLANK 1164#ifdef POINTER_BLANK
1165void 1165void
1166rxvt_term::pointer_blank () 1166rxvt_term::pointer_blank ()
1167{ 1167{
1168 if (! OPTION (Opt_pointerBlank)) 1168 if (!OPTION (Opt_pointerBlank))
1169 return; 1169 return;
1170 1170
1171 XDefineCursor (display->display, vt, display->blank_cursor); 1171 XDefineCursor (xdisp, vt, display->blank_cursor);
1172 XFlush (display->display); 1172 XFlush (xdisp);
1173 1173
1174 hidden_pointer = 1; 1174 hidden_pointer = 1;
1175} 1175}
1176 1176
1177void 1177void
1178rxvt_term::pointer_cb (time_watcher &w) 1178rxvt_term::pointer_cb (time_watcher &w)
1179{ 1179{
1180 SET_R (this); 1180 make_current ();
1181 SET_LOCALE (locale);
1182 1181
1183 pointer_blank (); 1182 pointer_blank ();
1184} 1183}
1185#endif 1184#endif
1186 1185
… …
1251 (32 + button_number + key_state), 1250 (32 + button_number + key_state),
1252 (32 + x + 1), 1251 (32 + x + 1),
1253 (32 + y + 1)); 1252 (32 + y + 1));
1254} 1253}
1255 1254
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 */ 1255/*{{{ process an X event */
1267void 1256void
1268rxvt_term::x_cb (XEvent &ev) 1257rxvt_term::x_cb (XEvent &ev)
1269{ 1258{
1270 dDisp; 1259 make_current ();
1271 1260
1272 SET_R (this); 1261 dLocal (Display *, xdisp);
1273 SET_LOCALE (locale);
1274 1262
1275#if defined(CURSOR_BLINK) 1263 if (ev.xany.window == vt
1276 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1264 && SHOULD_INVOKE (HOOK_X_EVENT)
1277 { 1265 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1278 if (hidden_cursor) 1266 return;
1279 {
1280 hidden_cursor = 0;
1281 want_refresh = 1;
1282 }
1283 1267
1284 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1268 // 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; 1269 Window unused_root, unused_child;
1303 int unused_root_x, unused_root_y; 1270 int unused_root_x, unused_root_y;
1304 unsigned int unused_mask; 1271 unsigned int unused_mask;
1305 1272
1306 switch (ev.type) 1273 switch (ev.type)
… …
1313 1280
1314 break; 1281 break;
1315 1282
1316 case KeyRelease: 1283 case KeyRelease:
1317 { 1284 {
1318#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1285#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1319 KeySym ks; 1286 KeySym keysym;
1320 1287
1321 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1288 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1322#endif 1289#endif
1323 1290
1324#if ENABLE_FRILLS || ISO_14755 1291#if ENABLE_FRILLS || ISO_14755
1325 // ISO 14755 support 1292 // ISO 14755 support
1326 if (iso14755buf) 1293 if (iso14755buf)
… …
1331# endif 1298# endif
1332# if ISO_14755 1299# if ISO_14755
1333 // iso14755 part 5.2 handling: release time 1300 // iso14755 part 5.2 handling: release time
1334 // first: controls 1301 // first: controls
1335 if ((ev.xkey.state & ControlMask) 1302 if ((ev.xkey.state & ControlMask)
1336 && ((ks >= 0x40 && ks <= 0x5f) 1303 && ((keysym >= 0x40 && keysym <= 0x5f)
1337 || (ks >= 0x61 && ks <= 0x7f))) 1304 || (keysym >= 0x61 && keysym <= 0x7f)))
1338 { 1305 {
1339 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1306 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1340 commit_iso14755 (); 1307 commit_iso14755 ();
1341 return; // case-break; 1308 goto skip_switch;
1342 } 1309 }
1343 1310
1344 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1311 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1345 if (i[0] == ks) 1312 if (i[0] == keysym)
1346 { 1313 {
1347 iso14755buf = ISO_14755_51 | i[1]; 1314 iso14755buf = ISO_14755_51 | i[1];
1348 commit_iso14755 (); 1315 commit_iso14755 ();
1349 return; // case-break; 1316 goto skip_switch;
1350 } 1317 }
1351 1318
1352 scr_bell (); 1319 scr_bell ();
1353# endif 1320# endif
1354 iso14755buf = 0; 1321 iso14755buf = 0;
… …
1373 else 1340 else
1374 iso14755buf = 0; 1341 iso14755buf = 0;
1375 } 1342 }
1376#endif 1343#endif
1377 1344
1345 if (ev.xany.window == vt
1346 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1347 break;
1348
1378#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1349#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1379 if (!(ev.xkey.state & ControlMask)) 1350 if (!(ev.xkey.state & ControlMask))
1380 slip_wheel_ev.stop (); 1351 slip_wheel_ev.stop ();
1381 else if (ks == XK_Control_L || ks == XK_Control_R) 1352 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1382 mouse_slip_wheel_speed = 0; 1353 mouse_slip_wheel_speed = 0;
1383#endif 1354#endif
1384 break; 1355 break;
1385 } 1356 }
1386 1357
… …
1392 button_release (ev.xbutton); 1363 button_release (ev.xbutton);
1393 break; 1364 break;
1394 1365
1395 case ClientMessage: 1366 case ClientMessage:
1396 if (ev.xclient.format == 32 1367 if (ev.xclient.format == 32
1397 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1368 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1398 { 1369 {
1370 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1371 {
1372 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1373 {
1399 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1374 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1375 {
1376 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1400 destroy (); 1377 destroy ();
1378 }
1401#if ENABLE_EWMH 1379#if ENABLE_EWMH
1402 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1380 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1403 XSendEvent (disp, ev.xclient.window = display->root, 1381 XSendEvent (xdisp, ev.xclient.window = display->root,
1404 False, SubstructureRedirectMask | SubstructureNotifyMask, 1382 False, SubstructureRedirectMask | SubstructureNotifyMask,
1405 &ev); 1383 &ev);
1384#endif
1385 }
1386 }
1387#if ENABLE_XEMBED
1388 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1389 {
1390 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1391 focus_in ();
1392 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1393 focus_out ();
1394 }
1406#endif 1395#endif
1407 } 1396 }
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; 1397 break;
1444 1398
1445 case MappingNotify: 1399 case MappingNotify:
1446 XRefreshKeyboardMapping (&ev.xmapping); 1400 XRefreshKeyboardMapping (&ev.xmapping);
1447 break; 1401 break;
… …
1480 break; 1434 break;
1481 1435
1482 case ConfigureNotify: 1436 case ConfigureNotify:
1483 if (ev.xconfigure.window == parent[0]) 1437 if (ev.xconfigure.window == parent[0])
1484 { 1438 {
1485 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1439 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1486 ; 1440 ;
1487 1441
1488 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1442 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1489 { 1443 {
1490 seen_resize = 1; 1444 seen_resize = 1;
1491 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1445 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1492 } 1446 }
1493 1447
1448 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1449
1494#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1450#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1495 if (OPTION (Opt_transparent)) 1451 if (OPTION (Opt_transparent))
1496 check_our_parents (); 1452 check_our_parents ();
1497#endif 1453#endif
1498 } 1454 }
1499 break; 1455 break;
1500 1456
1501 case PropertyNotify: 1457 case PropertyNotify:
1458 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1502 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1459 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1503 && ev.xproperty.state == PropertyNewValue) 1460 && ev.xproperty.state == PropertyNewValue)
1504 selection_property (ev.xproperty.window, ev.xproperty.atom); 1461 selection_property (ev.xproperty.window, ev.xproperty.atom);
1505 1462
1506 break; 1463 break;
1507 1464
1508 case SelectionClear: 1465 case SelectionClear:
1509 selection_clear (); 1466 selection_clear ();
… …
1514 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1471 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1515 break; 1472 break;
1516 1473
1517 case SelectionRequest: 1474 case SelectionRequest:
1518 selection_send (ev.xselectionrequest); 1475 selection_send (ev.xselectionrequest);
1476 break;
1477
1478 case MapNotify:
1479 mapped = 1;
1480#ifdef TEXT_BLINK
1481 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1482#endif
1483 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1519 break; 1484 break;
1520 1485
1521 case UnmapNotify: 1486 case UnmapNotify:
1522 mapped = 0; 1487 mapped = 0;
1523#ifdef TEXT_BLINK 1488#ifdef TEXT_BLINK
1524 text_blink_ev.stop (); 1489 text_blink_ev.stop ();
1525#endif 1490#endif
1526 break; 1491 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; 1492 break;
1534 1493
1535#ifdef TRANSPARENT 1494#ifdef TRANSPARENT
1536 case ReparentNotify: 1495 case ReparentNotify:
1537 rootwin_cb (ev); 1496 rootwin_cb (ev);
… …
1543 if (ev.xany.window == vt) 1502 if (ev.xany.window == vt)
1544 { 1503 {
1545 do 1504 do
1546 scr_expose (ev.xexpose.x, ev.xexpose.y, 1505 scr_expose (ev.xexpose.x, ev.xexpose.y,
1547 ev.xexpose.width, ev.xexpose.height, False); 1506 ev.xexpose.width, ev.xexpose.height, False);
1548 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1507 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1549 1508
1550 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1509 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1551 1510
1552 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1511 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1553 scr_expose (ev.xexpose.x, ev.xexpose.y, 1512 scr_expose (ev.xexpose.x, ev.xexpose.y,
1554 ev.xexpose.width, ev.xexpose.height, False); 1513 ev.xexpose.width, ev.xexpose.height, False);
1555 1514
1556 scr_refresh (refresh_type); 1515 want_refresh = 1;
1557 } 1516 }
1558 else 1517 else
1559 { 1518 {
1560 XEvent unused_event; 1519 XEvent unused_event;
1561 1520
1562 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1521 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1563 ; 1522 ;
1564 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1523 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1565 ; 1524 ;
1566 1525
1567 if (isScrollbarWindow (ev.xany.window)) 1526 if (isScrollbarWindow (ev.xany.window))
1568 { 1527 {
1569 scrollBar.setIdle (); 1528 scrollBar.setIdle ();
1570 scrollbar_show (0); 1529 scrollbar_show (0);
1571 } 1530 }
1572#ifdef MENUBAR
1573 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1574 menubar_expose ();
1575#endif
1576 1531
1577#ifdef TRANSPARENT 1532#ifdef TRANSPARENT
1578 if (am_transparent && ev.xany.window == parent[0]) 1533 if (am_transparent && ev.xany.window == parent[0])
1579 XClearWindow (disp, ev.xany.window); 1534 XClearWindow (xdisp, ev.xany.window);
1580#endif 1535#endif
1581 } 1536 }
1582 break; 1537 break;
1583 1538
1584 case MotionNotify: 1539 case MotionNotify:
1585#ifdef POINTER_BLANK 1540#ifdef POINTER_BLANK
1586 if (hidden_pointer) 1541 if (hidden_pointer)
1587 pointer_unblank (); 1542 pointer_unblank ();
1588#endif 1543#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) 1544 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1597 break; 1545 break;
1598 1546
1599 if (ev.xany.window == vt) 1547 if (ev.xany.window == vt)
1600 { 1548 {
1549 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1550 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1551 ; // nop
1601 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1552 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1602 { 1553 {
1603 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1554 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1604 ; 1555 ;
1605 1556
1606 XQueryPointer (disp, vt, 1557 XQueryPointer (xdisp, vt,
1607 &unused_root, &unused_child, 1558 &unused_root, &unused_child,
1608 &unused_root_x, &unused_root_y, 1559 &unused_root_x, &unused_root_y,
1609 &ev.xbutton.x, &ev.xbutton.y, 1560 &ev.xbutton.x, &ev.xbutton.y,
1610 &ev.xbutton.state); 1561 &ev.xbutton.state);
1611#ifdef MOUSE_THRESHOLD 1562#ifdef MOUSE_THRESHOLD
… …
1675#endif 1626#endif
1676 } 1627 }
1677 } 1628 }
1678 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1629 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1679 { 1630 {
1680 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1631 while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1681 MotionNotify, &ev)) 1632 MotionNotify, &ev))
1682 ; 1633 ;
1683 1634
1684 XQueryPointer (disp, scrollBar.win, 1635 XQueryPointer (xdisp, scrollBar.win,
1685 &unused_root, &unused_child, 1636 &unused_root, &unused_child,
1686 &unused_root_x, &unused_root_y, 1637 &unused_root_x, &unused_root_y,
1687 &ev.xbutton.x, &ev.xbutton.y, 1638 &ev.xbutton.x, &ev.xbutton.y,
1688 &unused_mask); 1639 &unused_mask);
1689 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1640 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1690 scrollbar_size ()); 1641 scrollbar_size ());
1691 scr_refresh (refresh_type); 1642 want_refresh = 1;
1692 refresh_limit = 0; 1643 refresh_limit = 0;
1693 scrollbar_show (1); 1644 scrollbar_show (1);
1694 } 1645 }
1695 break; 1646 break;
1696 } 1647 }
1648
1649skip_switch: ;
1650
1651#if defined(CURSOR_BLINK)
1652 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1653 {
1654 if (hidden_cursor)
1655 {
1656 hidden_cursor = 0;
1657 want_refresh = 1;
1658 }
1659
1660 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1661 }
1662#endif
1663
1664#if defined(POINTER_BLANK)
1665 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1666 {
1667 if (ev.type == MotionNotify
1668 || ev.type == ButtonPress
1669 || ev.type == ButtonRelease)
1670 if (hidden_pointer)
1671 pointer_unblank ();
1672
1673 if (ev.type == KeyPress && hidden_pointer == 0)
1674 pointer_blank ();
1675 }
1676#endif
1697} 1677}
1698 1678
1699void 1679void
1700rxvt_term::focus_in () 1680rxvt_term::focus_in ()
1701{ 1681{
1702 if (!focus) 1682 if (!focus)
1703 { 1683 {
1704 focus = 1; 1684 focus = 1;
1705 want_refresh = 1; 1685 want_refresh = 1;
1706 1686
1707 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1687 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1708 1688
1709#if USE_XIM 1689#if USE_XIM
1710 if (Input_Context != NULL) 1690 if (Input_Context != NULL)
1711 { 1691 {
1712 IMSetStatusPosition (); 1692 IMSetStatusPosition ();
1713 XSetICFocus (Input_Context); 1693 XSetICFocus (Input_Context);
1714 } 1694 }
1715#endif 1695#endif
1716#if CURSOR_BLINK 1696#if CURSOR_BLINK
1717 if (OPTION (Opt_cursorBlink)) 1697 if (OPTION (Opt_cursorBlink))
1718 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1698 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1719#endif 1699#endif
1720#if OFF_FOCUS_FADING 1700#if OFF_FOCUS_FADING
1721 if (rs[Rs_fade]) 1701 if (rs[Rs_fade])
1722 { 1702 {
1723 pix_colors = pix_colors_focused; 1703 pix_colors = pix_colors_focused;
… …
1733 if (focus) 1713 if (focus)
1734 { 1714 {
1735 focus = 0; 1715 focus = 0;
1736 want_refresh = 1; 1716 want_refresh = 1;
1737 1717
1738 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1718 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1739 1719
1740#if ENABLE_FRILLS || ISO_14755 1720#if ENABLE_FRILLS || ISO_14755
1741 if (iso14755buf) 1721 if (iso14755buf)
1742 { 1722 {
1743 iso14755buf = 0; 1723 iso14755buf = 0;
… …
1767 1747
1768#if TRANSPARENT 1748#if TRANSPARENT
1769void 1749void
1770rxvt_term::rootwin_cb (XEvent &ev) 1750rxvt_term::rootwin_cb (XEvent &ev)
1771{ 1751{
1772 SET_R (this); 1752 make_current ();
1773 SET_LOCALE (locale);
1774 1753
1775 switch (ev.type) 1754 switch (ev.type)
1776 { 1755 {
1777 case PropertyNotify: 1756 case PropertyNotify:
1778 /* 1757 /*
… …
1805 /* 1784 /*
1806 * VT window processing of button press 1785 * VT window processing of button press
1807 */ 1786 */
1808 if (ev.window == vt) 1787 if (ev.window == vt)
1809 { 1788 {
1789 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1790 return;
1791
1810#if ISO_14755 1792#if ISO_14755
1811 // 5.4 1793 // 5.4
1812 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1794 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1813 { 1795 {
1814 iso14755_54 (ev.x, ev.y); 1796 iso14755_54 (ev.x, ev.y);
… …
1826#ifdef MOUSE_REPORT_DOUBLECLICK 1808#ifdef MOUSE_REPORT_DOUBLECLICK
1827 if (ev.button == MEvent.button && clickintime) 1809 if (ev.button == MEvent.button && clickintime)
1828 { 1810 {
1829 /* same button, within alloted time */ 1811 /* same button, within alloted time */
1830 MEvent.clicks++; 1812 MEvent.clicks++;
1813
1831 if (MEvent.clicks > 1) 1814 if (MEvent.clicks > 1)
1832 { 1815 {
1833 /* only report double clicks */ 1816 /* only report double clicks */
1834 MEvent.clicks = 2; 1817 MEvent.clicks = 2;
1835 mouse_report (ev); 1818 mouse_report (ev);
… …
1855 else 1838 else
1856 { 1839 {
1857 if (ev.button != MEvent.button) 1840 if (ev.button != MEvent.button)
1858 MEvent.clicks = 0; 1841 MEvent.clicks = 0;
1859 1842
1860 if (!PERL_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END)))
1861 switch (ev.button) 1843 switch (ev.button)
1862 { 1844 {
1863 case Button1: 1845 case Button1:
1864 /* allow meta + click to select rectangular areas */ 1846 /* allow meta + click to select rectangular areas */
1865 /* should be done in screen.C */ 1847 /* should be done in screen.C */
1866#if ENABLE_FRILLS 1848#if ENABLE_FRILLS
1867 selection.rect = !!(ev.state & ModMetaMask); 1849 selection.rect = !!(ev.state & ModMetaMask);
1868#else 1850#else
1869 selection.rect = false; 1851 selection.rect = false;
1870#endif 1852#endif
1871 1853
1872 /* allow shift+left click to extend selection */ 1854 /* allow shift+left click to extend selection */
1873 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1855 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1874 { 1856 {
1875 if (MEvent.button == Button1 && clickintime) 1857 if (MEvent.button == Button1 && clickintime)
1876 selection_rotate (ev.x, ev.y); 1858 selection_rotate (ev.x, ev.y);
1877 else 1859 else
1878 selection_extend (ev.x, ev.y, 1); 1860 selection_extend (ev.x, ev.y, 1);
1879 } 1861 }
1880 else 1862 else
1881 { 1863 {
1882 if (MEvent.button == Button1 && clickintime) 1864 if (MEvent.button == Button1 && clickintime)
1883 MEvent.clicks++; 1865 MEvent.clicks++;
1884 else 1866 else
1885 MEvent.clicks = 1; 1867 MEvent.clicks = 1;
1886 1868
1887 selection_click (MEvent.clicks, ev.x, ev.y); 1869 selection_click (MEvent.clicks, ev.x, ev.y);
1888 } 1870 }
1889 1871
1890 MEvent.button = Button1; 1872 MEvent.button = Button1;
1891 break; 1873 break;
1892 1874
1893 case Button3: 1875 case Button3:
1894 if (MEvent.button == Button3 && clickintime) 1876 if (MEvent.button == Button3 && clickintime)
1895 selection_rotate (ev.x, ev.y); 1877 selection_rotate (ev.x, ev.y);
1896 else 1878 else
1897 selection_extend (ev.x, ev.y, 1); 1879 selection_extend (ev.x, ev.y, 1);
1898 1880
1899 MEvent.button = Button3; 1881 MEvent.button = Button3;
1900 break; 1882 break;
1901 } 1883 }
1902 } 1884 }
1903 1885
1904 MEvent.time = ev.time; 1886 MEvent.time = ev.time;
1905 return; 1887 return;
1906 } 1888 }
1907 1889
… …
2043 } 2025 }
2044 2026
2045 break; 2027 break;
2046 } 2028 }
2047 } 2029 }
2030
2048 return; 2031 return;
2049 } 2032 }
2050#if MENUBAR
2051 /*
2052 * Menubar window processing of button press
2053 */
2054 if (isMenuBarWindow (ev.window))
2055 menubar_control (ev);
2056#endif
2057} 2033}
2058 2034
2059void 2035void
2060rxvt_term::button_release (XButtonEvent &ev) 2036rxvt_term::button_release (XButtonEvent &ev)
2061{ 2037{
… …
2067 2043
2068 if (scrollbar_isUpDn ()) 2044 if (scrollbar_isUpDn ())
2069 { 2045 {
2070 scrollBar.setIdle (); 2046 scrollBar.setIdle ();
2071 scrollbar_show (0); 2047 scrollbar_show (0);
2072#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2073 refresh_type &= ~SMOOTH_REFRESH;
2074#endif
2075 } 2048 }
2076 2049
2077#ifdef SELECTION_SCROLLING 2050#ifdef SELECTION_SCROLLING
2078 if (sel_scroll_ev.active) 2051 if (sel_scroll_ev.active)
2079 sel_scroll_ev.stop(); 2052 sel_scroll_ev.stop();
2080#endif 2053#endif
2081 2054
2082 if (ev.window == vt) 2055 if (ev.window == vt)
2083 { 2056 {
2057 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2058 return;
2059
2084#if ISO_14755 2060#if ISO_14755
2085 // 5.4 2061 // 5.4
2086 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2062 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2087 return; 2063 return;
2088#endif 2064#endif
2065
2089 if (reportmode) 2066 if (reportmode)
2090 { 2067 {
2091 /* mouse report from vt window */ 2068 /* mouse report from vt window */
2092 /* don't report release of wheel "buttons" */ 2069 /* don't report release of wheel "buttons" */
2093 if (ev.button >= 4) 2070 if (ev.button >= 4)
… …
2123 { 2100 {
2124 case Button1: 2101 case Button1:
2125 case Button3: 2102 case Button3:
2126 selection_make (ev.time); 2103 selection_make (ev.time);
2127 break; 2104 break;
2105
2128 case Button2: 2106 case Button2:
2129 selection_request (ev.time, ev.x, ev.y); 2107 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2108 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2130 break; 2109 break;
2110
2131#ifdef MOUSE_WHEEL 2111#ifdef MOUSE_WHEEL
2132 case Button4: 2112 case Button4:
2133 case Button5: 2113 case Button5:
2134 { 2114 {
2135 int i; 2115 int i;
… …
2157 slip_wheel_ev.start (); 2137 slip_wheel_ev.start ();
2158 } 2138 }
2159 else 2139 else
2160 { 2140 {
2161# endif 2141# endif
2162# ifdef JUMP_MOUSE_WHEEL
2163 scr_page (v, i); 2142 scr_page (v, i);
2164 scr_refresh (SMOOTH_REFRESH);
2165 scrollbar_show (1); 2143 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 2144# ifdef MOUSE_SLIP_WHEELING
2175 } 2145 }
2176#endif 2146# endif
2177 } 2147 }
2178 break; 2148 break;
2179#endif 2149#endif
2180 } 2150 }
2181 } 2151 }
2182#ifdef MENUBAR
2183 else if (isMenuBarWindow (ev.window))
2184 menubar_control (ev);
2185#endif
2186} 2152}
2187 2153
2188#ifdef TRANSPARENT 2154#ifdef TRANSPARENT
2189#if TINTING 2155#if TINTING
2190/* taken from aterm-0.4.2 */ 2156/* taken from aterm-0.4.2 */
2191 2157
2192typedef uint32_t RUINT32T; 2158typedef uint32_t RUINT32T;
2193 2159
2194void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2160void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2195{ 2161{
2196 int sh_r, sh_g, sh_b; 2162 int sh_r, sh_g, sh_b;
2197 RUINT32T mask_r, mask_g, mask_b; 2163 RUINT32T mask_r, mask_g, mask_b;
2198 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2164 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2199 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2165 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2200 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2166 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2201 int i; 2167 int i;
2202 2168
2203 Visual *visual = display->visual; 2169 Visual *visual = term->visual;
2204 2170
2205 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2171 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2206 2172
2207 /* for convenience */ 2173 /* for convenience */
2208 mask_r = visual->red_mask; 2174 mask_r = visual->red_mask;
… …
2429 Atom atype; 2395 Atom atype;
2430 unsigned char *prop = NULL; 2396 unsigned char *prop = NULL;
2431 Window root, oldp, *list; 2397 Window root, oldp, *list;
2432 Pixmap rootpixmap = None; 2398 Pixmap rootpixmap = None;
2433 XWindowAttributes wattr, wrootattr; 2399 XWindowAttributes wattr, wrootattr;
2434 dDisp;
2435 2400
2436 pchanged = 0; 2401 pchanged = 0;
2437 2402
2438 if (!OPTION (Opt_transparent)) 2403 if (!OPTION (Opt_transparent))
2439 return pchanged; /* Don't try any more */ 2404 return pchanged; /* Don't try any more */
2440 2405
2441 XGetWindowAttributes (disp, display->root, &wrootattr); 2406 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2442 rootdepth = wrootattr.depth; 2407 rootdepth = wrootattr.depth;
2443 2408
2444 XGetWindowAttributes (disp, parent[0], &wattr); 2409 XGetWindowAttributes (xdisp, parent[0], &wattr);
2445 2410
2446 if (rootdepth != wattr.depth) 2411 if (rootdepth != wattr.depth)
2447 { 2412 {
2448 if (am_transparent) 2413 if (am_transparent)
2449 { 2414 {
2450 pchanged = 1; 2415 pchanged = 1;
2451 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2416 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2452 am_transparent = am_pixmap_trans = 0; 2417 am_transparent = am_pixmap_trans = 0;
2453 } 2418 }
2454 2419
2455 return pchanged; /* Don't try any more */ 2420 return pchanged; /* Don't try any more */
2456 } 2421 }
2457 2422
2458 /* Get all X ops out of the queue so that our information is up-to-date. */ 2423 /* Get all X ops out of the queue so that our information is up-to-date. */
2459 XSync (disp, False); 2424 XSync (xdisp, False);
2460 2425
2461 /* 2426 /*
2462 * Make the frame window set by the window manager have 2427 * Make the frame window set by the window manager have
2463 * the root background. Some window managers put multiple nested frame 2428 * the root background. Some window managers put multiple nested frame
2464 * windows for each client, so we have to take care about that. 2429 * windows for each client, so we have to take care about that.
2465 */ 2430 */
2466 i = (xa[XA_XROOTPMAP_ID] 2431 i = (xa[XA_XROOTPMAP_ID]
2467 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2432 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2468 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2433 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2469 &nitems, &bytes_after, &prop) == Success); 2434 &nitems, &bytes_after, &prop) == Success);
2470 2435
2471 if (!i || prop == NULL) 2436 if (!i || prop == NULL)
2472 i = (xa[XA_ESETROOT_PMAP_ID] 2437 i = (xa[XA_ESETROOT_PMAP_ID]
2473 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2438 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2474 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2439 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2475 &nitems, &bytes_after, &prop) == Success); 2440 &nitems, &bytes_after, &prop) == Success);
2476 2441
2477 if (!i || prop == NULL 2442 if (!i || prop == NULL
2478#if TINTING 2443#if TINTING
2479 || !rs[Rs_color + Color_tint] 2444 || !ISSET_PIXCOLOR (Color_tint)
2480#endif 2445#endif
2481 ) 2446 )
2482 have_pixmap = 0; 2447 have_pixmap = 0;
2483 else 2448 else
2484 { 2449 {
… …
2497 Window cr; 2462 Window cr;
2498 XImage *image; 2463 XImage *image;
2499 GC gc; 2464 GC gc;
2500 XGCValues gcvalue; 2465 XGCValues gcvalue;
2501 2466
2502 XTranslateCoordinates (disp, parent[0], display->root, 2467 XTranslateCoordinates (xdisp, parent[0], display->root,
2503 0, 0, &sx, &sy, &cr); 2468 0, 0, &sx, &sy, &cr);
2504 nw = (unsigned int)szHint.width; 2469 nw = (unsigned int)szHint.width;
2505 nh = (unsigned int)szHint.height; 2470 nh = (unsigned int)szHint.height;
2506 nx = ny = 0; 2471 nx = ny = 0;
2507 2472
… …
2520 } 2485 }
2521 2486
2522 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2487 min_it (nw, (unsigned int) (wrootattr.width - sx));
2523 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2488 min_it (nh, (unsigned int) (wrootattr.height - sy));
2524 2489
2525 XSync (disp, False); 2490 XSync (xdisp, False);
2526 allowedxerror = -1; 2491 allowedxerror = -1;
2527 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2492 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2528 2493
2529 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2494 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2530 /* XXX: may need a delay here? */ 2495 /* XXX: may need a delay here? */
2531 allowedxerror = 0; 2496 allowedxerror = 0;
2532 2497
… …
2535 if (am_transparent && am_pixmap_trans) 2500 if (am_transparent && am_pixmap_trans)
2536 { 2501 {
2537 pchanged = 1; 2502 pchanged = 1;
2538 if (pixmap != None) 2503 if (pixmap != None)
2539 { 2504 {
2540 XFreePixmap (disp, pixmap); 2505 XFreePixmap (xdisp, pixmap);
2541 pixmap = None; 2506 pixmap = None;
2542 } 2507 }
2543 } 2508 }
2544 2509
2545 am_pixmap_trans = 0; 2510 am_pixmap_trans = 0;
2546 } 2511 }
2547 else 2512 else
2548 { 2513 {
2549 if (pixmap != None) 2514 if (pixmap != None)
2550 XFreePixmap (disp, pixmap); 2515 XFreePixmap (xdisp, pixmap);
2551 2516
2552#if TINTING 2517#if TINTING
2553 if (ISSET_PIXCOLOR (Color_tint)) 2518 if (ISSET_PIXCOLOR (Color_tint))
2554 { 2519 {
2555 unsigned short rm, gm, bm;
2556 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2520 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2557 2521
2522 rgba c;
2558 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2523 pix_colors_focused [Color_tint].get (c);
2559 2524
2560 ShadeXImage (display, image, shade, rm, gm, bm); 2525 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2561 } 2526 }
2562#endif 2527#endif
2563 2528
2564 pixmap = XCreatePixmap (disp, vt, 2529 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2565 szHint.width, szHint.height, image->depth);
2566 gc = XCreateGC (disp, vt, 0UL, &gcvalue); 2530 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2567 XPutImage (disp, pixmap, gc, image, 0, 0, 2531 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2568 nx, ny, image->width, image->height); 2532 nx, ny, image->width, image->height);
2569 XFreeGC (disp, gc); 2533 XFreeGC (xdisp, gc);
2570 XDestroyImage (image); 2534 XDestroyImage (image);
2571 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2535 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2572 XClearWindow (disp, parent[0]); 2536 XClearWindow (xdisp, parent[0]);
2573 2537
2574 if (!am_transparent || !am_pixmap_trans) 2538 if (!am_transparent || !am_pixmap_trans)
2575 pchanged = 1; 2539 pchanged = 1;
2576 2540
2577 am_transparent = am_pixmap_trans = 1; 2541 am_transparent = am_pixmap_trans = 1;
2578 } 2542 }
2579 } 2543 }
2580 2544
2581 if (am_pixmap_trans) 2545 if (am_pixmap_trans)
2582 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2546 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2583 else 2547 else
2584 { 2548 {
2585 unsigned int n; 2549 unsigned int n;
2586 /* 2550 /*
2587 * InheritPixmap transparency 2551 * InheritPixmap transparency
2588 */ 2552 */
2589 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2553 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2590 { 2554 {
2591 oldp = parent[i]; 2555 oldp = parent[i];
2592 XQueryTree (disp, parent[i - 1], &root, 2556 XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2593 &parent[i], &list, &n);
2594 XFree (list); 2557 XFree (list);
2595 2558
2596 if (parent[i] == display->root) 2559 if (parent[i] == display->root)
2597 { 2560 {
2598 if (oldp != None) 2561 if (oldp != None)
… …
2606 } 2569 }
2607 2570
2608 n = 0; 2571 n = 0;
2609 2572
2610 if (pchanged) 2573 if (pchanged)
2611 {
2612 for (; n < (unsigned int)i; n++) 2574 for (; n < (unsigned int)i; n++)
2613 { 2575 {
2614 XGetWindowAttributes (disp, parent[n], &wattr); 2576 XGetWindowAttributes (xdisp, parent[n], &wattr);
2577
2615 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2578 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2616 { 2579 {
2617 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2580 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2618 break; 2581 break;
2619 } 2582 }
2620 } 2583 }
2621 }
2622 2584
2623 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2585 if (n > (sizeof (parent) / sizeof (parent[0])))
2624 { 2586 {
2625 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2587 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2626 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2588 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2627 am_transparent = 0; 2589 am_transparent = 0;
2628 /* XXX: also turn off Opt_transparent? */ 2590 /* XXX: also turn off Opt_transparent? */
2629 } 2591 }
2630 else 2592 else
2631 { 2593 {
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++) 2594 for (n = 0; n < (unsigned int)i; n++)
2638 { 2595 {
2639 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2596 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2640 XClearWindow (disp, parent[n]); 2597 XClearWindow (xdisp, parent[n]);
2641 } 2598 }
2642 2599
2643 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2600 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2644 am_transparent = 1; 2601 am_transparent = 1;
2645 } 2602 }
2646 2603
2647 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2604 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2648 parent[i] = None; 2605 parent[i] = None;
2649 } 2606 }
2650 2607
2651 if (scrollBar.win) 2608 if (scrollBar.win)
2652 { 2609 {
2653 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2610 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2654 scrollBar.setIdle (); 2611 scrollBar.setIdle ();
2655 scrollbar_show (0); 2612 scrollbar_show (0);
2656 } 2613 }
2657 2614
2658 if (am_transparent) 2615 if (am_transparent)
… …
2670 2627
2671bool 2628bool
2672rxvt_term::cmd_parse () 2629rxvt_term::cmd_parse ()
2673{ 2630{
2674 bool flag = false; 2631 bool flag = false;
2675 unicode_t ch = NOCHAR; 2632 wchar_t ch = NOCHAR;
2676 char *seq_begin; // remember start of esc-sequence here 2633 char *seq_begin; // remember start of esc-sequence here
2677 2634
2678 for (;;) 2635 for (;;)
2679 { 2636 {
2680 if (ch == NOCHAR) 2637 if (ch == NOCHAR)
2681 { 2638 {
2682 seq_begin = cmdbuf_ptr; 2639 seq_begin = cmdbuf_ptr;
2683 ch = next_char (); 2640 ch = next_char ();
2684 }
2685 2641
2686 if (ch == NOCHAR) // TODO: improve 2642 if (ch == NOCHAR)
2687 break; 2643 break;
2644 }
2688 2645
2689 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2646 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2690 { 2647 {
2691 if (!seen_input) 2648 if (!seen_input)
2692 { 2649 {
… …
2701 if (seen_resize && cmd_pid) 2658 if (seen_resize && cmd_pid)
2702 kill (-cmd_pid, SIGWINCH); 2659 kill (-cmd_pid, SIGWINCH);
2703 } 2660 }
2704 2661
2705 /* Read a text string from the input buffer */ 2662 /* Read a text string from the input buffer */
2706 unicode_t buf[UBUFSIZ]; 2663 wchar_t buf[UBUFSIZ];
2707 bool refreshnow = false; 2664 bool refreshnow = false;
2708 int nlines = 0; 2665 int nlines = 0;
2709 unicode_t *str = buf; 2666 wchar_t *str = buf;
2710 unicode_t *eol = str + min (ncol, UBUFSIZ); 2667 wchar_t *eol = str + min (ncol, UBUFSIZ);
2711 2668
2712 for (;;) 2669 for (;;)
2713 { 2670 {
2714 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2671 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2715 break; 2672 break;
… …
2733 } 2690 }
2734 2691
2735 // scr_add_lines only works for nlines <= nrow - 1. 2692 // scr_add_lines only works for nlines <= nrow - 1.
2736 if (nlines >= nrow - 1) 2693 if (nlines >= nrow - 1)
2737 { 2694 {
2695 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2696 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2738 scr_add_lines (buf, nlines, str - buf); 2697 scr_add_lines (buf, str - buf, nlines);
2698
2739 nlines = 0; 2699 nlines = 0;
2740 str = buf; 2700 str = buf;
2741 eol = str + min (ncol, UBUFSIZ); 2701 eol = str + min (ncol, UBUFSIZ);
2742 } 2702 }
2743 2703
… …
2756 2716
2757 seq_begin = cmdbuf_ptr; 2717 seq_begin = cmdbuf_ptr;
2758 ch = next_char (); 2718 ch = next_char ();
2759 } 2719 }
2760 2720
2721 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2722 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2761 scr_add_lines (buf, nlines, str - buf); 2723 scr_add_lines (buf, str - buf, nlines);
2762 2724
2763 /* 2725 /*
2764 * If there have been a lot of new lines, then update the screen 2726 * 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. 2727 * 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 2728 * the number of pages between refreshes is refresh_limit, which
… …
2771 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2733 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2772 refresh_limit++; 2734 refresh_limit++;
2773 else 2735 else
2774 { 2736 {
2775 flag = true; 2737 flag = true;
2776 scr_refresh (refresh_type); 2738 scr_refresh ();
2777 flush_ev.stop (); 2739 want_refresh = 1;
2778 } 2740 }
2779 } 2741 }
2780 2742
2781 } 2743 }
2782 else 2744 else
… …
2797 } 2759 }
2798 2760
2799 return flag; 2761 return flag;
2800} 2762}
2801 2763
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 2764// read the next character
2812unicode_t 2765wchar_t
2813rxvt_term::next_char () 2766rxvt_term::next_char () NOTHROW
2814{ 2767{
2815 while (cmdbuf_ptr < cmdbuf_endp) 2768 while (cmdbuf_ptr < cmdbuf_endp)
2816 { 2769 {
2817 // assume 7-bit to be ascii ALWAYS 2770 // assume 7-bit to be ascii ALWAYS
2818 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2771 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2827 cmdbuf_ptr = cmdbuf_endp; 2780 cmdbuf_ptr = cmdbuf_endp;
2828 break; 2781 break;
2829 } 2782 }
2830 2783
2831 if (len == (size_t)-1) 2784 if (len == (size_t)-1)
2832 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2785 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2833 2786
2834 // assume wchar == unicode 2787 // assume wchar == unicode
2835 cmdbuf_ptr += len; 2788 cmdbuf_ptr += len;
2836 return wc & UNICODE_MASK; 2789 return wc & UNICODE_MASK;
2837 } 2790 }
2838 2791
2839 return NOCHAR; 2792 return NOCHAR;
2840} 2793}
2794
2795// read the next octet
2796uint32_t
2797rxvt_term::next_octet () NOTHROW
2798{
2799 return cmdbuf_ptr < cmdbuf_endp
2800 ? (unsigned char)*cmdbuf_ptr++
2801 : NOCHAR;
2802}
2803
2804static class out_of_input out_of_input;
2841 2805
2842/* rxvt_cmd_getc () - Return next input character */ 2806/* rxvt_cmd_getc () - Return next input character */
2843/* 2807/*
2844 * Return the next input character after first passing any keyboard input 2808 * Return the next input character after first passing any keyboard input
2845 * to the command. 2809 * to the command.
2846 */ 2810 */
2847unicode_t 2811wchar_t
2848rxvt_term::cmd_getc () 2812rxvt_term::cmd_getc () THROW ((class out_of_input))
2849{ 2813{
2850 unicode_t c = next_char (); 2814 wchar_t c = next_char ();
2851 2815
2852 if (c == NOCHAR) 2816 if (c == NOCHAR)
2853 throw out_of_input; 2817 throw out_of_input;
2854 2818
2855 return c; 2819 return c;
2856} 2820}
2857 2821
2858unicode_t 2822uint32_t
2859rxvt_term::cmd_get8 () 2823rxvt_term::cmd_get8 () THROW ((class out_of_input))
2860{ 2824{
2861 unicode_t c = next_octet (); 2825 uint32_t c = next_octet ();
2862 2826
2863 if (c == NOCHAR) 2827 if (c == NOCHAR)
2864 throw out_of_input; 2828 throw out_of_input;
2865 2829
2866 return c; 2830 return c;
… …
3102 scr_charset_set (2, (unsigned int)cmd_getc ()); 3066 scr_charset_set (2, (unsigned int)cmd_getc ());
3103 break; 3067 break;
3104 case '+': 3068 case '+':
3105 scr_charset_set (3, (unsigned int)cmd_getc ()); 3069 scr_charset_set (3, (unsigned int)cmd_getc ());
3106 break; 3070 break;
3107#if ENABLE_FRILLS 3071#if !ENABLE_MINIMAL
3108 case '6': 3072 case '6':
3109 scr_backindex (); 3073 scr_backindex ();
3110 break; 3074 break;
3111#endif 3075#endif
3112 case '7': 3076 case '7':
3113 scr_cursor (SAVE); 3077 scr_cursor (SAVE);
3114 break; 3078 break;
3115 case '8': 3079 case '8':
3116 scr_cursor (RESTORE); 3080 scr_cursor (RESTORE);
3117 break; 3081 break;
3118#if ENABLE_FRILLS 3082#if !ENABLE_MINIMAL
3119 case '9': 3083 case '9':
3120 scr_forwardindex (); 3084 scr_forwardindex ();
3121 break; 3085 break;
3122#endif 3086#endif
3123 case '=': 3087 case '=':
… …
3133 break; 3097 break;
3134 3098
3135 /* 8.3.87: NEXT LINE */ 3099 /* 8.3.87: NEXT LINE */
3136 case C1_NEL: /* ESC E */ 3100 case C1_NEL: /* ESC E */
3137 { 3101 {
3138 unicode_t nlcr[] = { C0_LF, C0_CR }; 3102 wchar_t nlcr[] = { C0_LF, C0_CR };
3139 scr_add_lines (nlcr, 1, 2); 3103 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3140 } 3104 }
3141 break; 3105 break;
3142 3106
3143 /* kidnapped escape sequence: Should be 8.3.48 */ 3107 /* kidnapped escape sequence: Should be 8.3.48 */
3144 case C1_ESA: /* ESC G */ 3108 case C1_ESA: /* ESC G */
… …
3285 ndef = get_byte_array_bit (csi_defaults, i); 3249 ndef = get_byte_array_bit (csi_defaults, i);
3286 for (p = 0; p < nargs; p++) 3250 for (p = 0; p < nargs; p++)
3287 if (arg[p] == -1) 3251 if (arg[p] == -1)
3288 arg[p] = ndef; 3252 arg[p] = ndef;
3289 3253
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 /* 3254 /*
3298 * private mode handling 3255 * private mode handling
3299 */ 3256 */
3300 if (priv) 3257 if (priv)
3301 { 3258 {
3302 switch (priv) 3259 switch (priv)
3303 { 3260 {
3304 case '>': 3261 case '>':
3305 if (ch == CSI_DA) /* secondary device attributes */ 3262 if (ch == CSI_DA) /* secondary device attributes */
3306 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 3263 {
3264 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3265 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3266 //
3267 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3268 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3269 // that we do not support xterm mouse reporting (should be 95 when we do).
3270 //
3271 tt_printf ("\033[>%d;94;0c", 'U');
3272 }
3307 break; 3273 break;
3308 case '?': 3274 case '?':
3309 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3275 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3310 process_terminal_mode (ch, priv, nargs, arg); 3276 process_terminal_mode (ch, priv, nargs, arg);
3311 break; 3277 break;
… …
3514 break; 3480 break;
3515 case CSI_75: 3481 case CSI_75:
3516 scr_cursor (RESTORE); 3482 scr_cursor (RESTORE);
3517 break; 3483 break;
3518 3484
3519#if ENABLE_FRILLS 3485#if !ENABLE_MINIMAL
3520 case CSI_74: 3486 case CSI_74:
3521 process_window_ops (arg, nargs); 3487 process_window_ops (arg, nargs);
3522 break; 3488 break;
3523#endif 3489#endif
3524 3490
… …
3531 break; 3497 break;
3532 } 3498 }
3533} 3499}
3534/*}}} */ 3500/*}}} */
3535 3501
3536#if ENABLE_FRILLS 3502#if !ENABLE_MINIMAL
3537/* ARGSUSED */ 3503/* ARGSUSED */
3538void 3504void
3539rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3505rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3540{ 3506{
3541 int x, y; 3507 int x, y;
3542 XWindowAttributes wattr; 3508 XWindowAttributes wattr;
3543 Window wdummy; 3509 Window wdummy;
3544 dDisp; 3510
3511 dLocal (Display *, xdisp);
3545 3512
3546 if (nargs == 0) 3513 if (nargs == 0)
3547 return; 3514 return;
3548 3515
3549 switch (args[0]) 3516 switch (args[0])
3550 { 3517 {
3551 /* 3518 /*
3552 * commands 3519 * commands
3553 */ 3520 */
3554 case 1: /* deiconify window */ 3521 case 1: /* deiconify window */
3555 XMapWindow (disp, parent[0]); 3522 XMapWindow (xdisp, parent[0]);
3556 break; 3523 break;
3557 case 2: /* iconify window */ 3524 case 2: /* iconify window */
3558 XIconifyWindow (disp, parent[0], display->screen); 3525 XIconifyWindow (xdisp, parent[0], display->screen);
3559 break; 3526 break;
3560 case 3: /* set position (pixels) */ 3527 case 3: /* set position (pixels) */
3561 XMoveWindow (disp, parent[0], args[1], args[2]); 3528 XMoveWindow (xdisp, parent[0], args[1], args[2]);
3562 break; 3529 break;
3563 case 4: /* set size (pixels) */ 3530 case 4: /* set size (pixels) */
3564 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3531 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3565 break; 3532 break;
3566 case 5: /* raise window */ 3533 case 5: /* raise window */
3567 XRaiseWindow (disp, parent[0]); 3534 XRaiseWindow (xdisp, parent[0]);
3568 break; 3535 break;
3569 case 6: /* lower window */ 3536 case 6: /* lower window */
3570 XLowerWindow (disp, parent[0]); 3537 XLowerWindow (xdisp, parent[0]);
3571 break; 3538 break;
3572 case 7: /* refresh window */ 3539 case 7: /* refresh window */
3573 scr_touch (true); 3540 scr_touch (true);
3574 break; 3541 break;
3575 case 8: /* set size (chars) */ 3542 case 8: /* set size (chars) */
… …
3582 if (args[0] >= 24) /* set height (chars) */ 3549 if (args[0] >= 24) /* set height (chars) */
3583 set_widthheight ((unsigned int)width, 3550 set_widthheight ((unsigned int)width,
3584 (unsigned int) (args[1] * fheight)); 3551 (unsigned int) (args[1] * fheight));
3585 break; 3552 break;
3586 3553
3587
3588 /* 3554 /*
3589 * reports - some output format copied from XTerm 3555 * reports - some output format copied from XTerm
3590 */ 3556 */
3591 case 11: /* report window state */ 3557 case 11: /* report window state */
3592 XGetWindowAttributes (disp, parent[0], &wattr); 3558 XGetWindowAttributes (xdisp, parent[0], &wattr);
3593 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3559 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3594 break; 3560 break;
3595 case 13: /* report window position */ 3561 case 13: /* report window position */
3596 XGetWindowAttributes (disp, parent[0], &wattr); 3562 XGetWindowAttributes (xdisp, parent[0], &wattr);
3597 XTranslateCoordinates (disp, parent[0], wattr.root, 3563 XTranslateCoordinates (xdisp, parent[0], wattr.root,
3598 -wattr.border_width, -wattr.border_width, 3564 -wattr.border_width, -wattr.border_width,
3599 &x, &y, &wdummy); 3565 &x, &y, &wdummy);
3600 tt_printf ("\033[3;%d;%dt", x, y); 3566 tt_printf ("\033[3;%d;%dt", x, y);
3601 break; 3567 break;
3602 case 14: /* report window size (pixels) */ 3568 case 14: /* report window size (pixels) */
3603 XGetWindowAttributes (disp, parent[0], &wattr); 3569 XGetWindowAttributes (xdisp, parent[0], &wattr);
3604 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3570 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3605 break; 3571 break;
3606 case 18: /* report text area size (chars) */ 3572 case 18: /* report text area size (chars) */
3607 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3573 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3608 break; 3574 break;
… …
3610 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3576 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3611 break; 3577 break;
3612 case 20: /* report icon label */ 3578 case 20: /* report icon label */
3613 { 3579 {
3614 char *s; 3580 char *s;
3615 XGetIconName (disp, parent[0], &s); 3581 XGetIconName (xdisp, parent[0], &s);
3616 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3582 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3617 XFree (s); 3583 XFree (s);
3618 } 3584 }
3619 break; 3585 break;
3620 case 21: /* report window title */ 3586 case 21: /* report window title */
3621 { 3587 {
3622 char *s; 3588 char *s;
3623 XFetchName (disp, parent[0], &s); 3589 XFetchName (xdisp, parent[0], &s);
3624 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3590 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3625 XFree (s); 3591 XFree (s);
3626 } 3592 }
3627 break; 3593 break;
3628 } 3594 }
… …
3729void 3695void
3730rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3696rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3731{ 3697{
3732 if (str[0] == '?' && !str[1]) 3698 if (str[0] == '?' && !str[1])
3733 { 3699 {
3734 unsigned short r, g, b; 3700 rgba c;
3735 pix_colors_focused[color].get (display, r, g, b); 3701 pix_colors_focused[color].get (c);
3702
3703#if XFT
3704 if (c.a != rgba::MAX_CC)
3705 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3706 else
3707#endif
3736 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3708 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3737 } 3709 }
3738 else 3710 else
3739 set_window_color (color, str); 3711 set_window_color (color, str);
3740} 3712}
3741 3713
… …
3743 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3715 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3744 */ 3716 */
3745void 3717void
3746rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3718rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3747{ 3719{
3748 int changed = 0;
3749 int color; 3720 int color;
3750 char *buf, *name; 3721 char *buf, *name;
3751 bool query = str[0] == '?' && !str[1]; 3722 bool query = str[0] == '?' && !str[1];
3752 int saveop = op; 3723 int saveop = op;
3753 dDisp; 3724
3725 dLocal (Display *, xdisp);
3754 3726
3755 assert (str != NULL); 3727 assert (str != NULL);
3756 switch (op) 3728 switch (op)
3757 { 3729 {
3758 case XTerm_name: 3730 case XTerm_name:
… …
3774 unsigned long bytes_after; 3746 unsigned long bytes_after;
3775 unsigned char *value = 0; 3747 unsigned char *value = 0;
3776 const char *str = ""; 3748 const char *str = "";
3777 3749
3778 if (prop 3750 if (prop
3779 && XGetWindowProperty (disp, parent[0], 3751 && XGetWindowProperty (xdisp, parent[0],
3780 prop, 0, 1<<16, 0, AnyPropertyType, 3752 prop, 0, 1<<16, 0, AnyPropertyType,
3781 &actual_type, &actual_format, 3753 &actual_type, &actual_format,
3782 &nitems, &bytes_after, &value) == Success 3754 &nitems, &bytes_after, &value) == Success
3783 && actual_type != None 3755 && actual_type != None
3784 && actual_format == 8) 3756 && actual_format == 8)
3785 str = (const char *)(value); 3757 str = (const char *)(value);
3786 3758
3787 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3759 tt_printf ("\033]%d;%s%c", op, str, resp);
3788 3760
3789 XFree (value); 3761 XFree (value);
3790 } 3762 }
3791 else 3763 else
3792 { 3764 {
… …
3796 { 3768 {
3797 *eq = 0; 3769 *eq = 0;
3798 set_utf8_property (display->atom (str), eq + 1); 3770 set_utf8_property (display->atom (str), eq + 1);
3799 } 3771 }
3800 else 3772 else
3801 XDeleteProperty (disp, parent[0], 3773 XDeleteProperty (xdisp, parent[0],
3802 display->atom (str)); 3774 display->atom (str));
3803 } 3775 }
3804 break; 3776 break;
3805 3777
3806 case XTerm_Color: 3778 case XTerm_Color:
… …
3808 { 3780 {
3809 if ((name = strchr (buf, ';')) == NULL) 3781 if ((name = strchr (buf, ';')) == NULL)
3810 break; 3782 break;
3811 3783
3812 *name++ = '\0'; 3784 *name++ = '\0';
3813 color = atoi (buf); 3785 color = atoi (buf) + minCOLOR;
3814 3786
3815 if (color < 0 || color >= TOTAL_COLORS) 3787 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3816 break; 3788 break;
3817 3789
3818 if ((buf = strchr (name, ';')) != NULL) 3790 if ((buf = strchr (name, ';')) != NULL)
3819 *buf++ = '\0'; 3791 *buf++ = '\0';
3820 3792
3821 if (name[0] == '?' && !name[1]) 3793 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 } 3794 }
3830 break; 3795 break;
3831 case XTerm_Color00: 3796 case XTerm_Color00:
3832 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3797 process_color_seq (op, Color_fg, str, resp);
3833 break; 3798 break;
3834 case XTerm_Color01: 3799 case XTerm_Color01:
3835 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3800 process_color_seq (op, Color_bg, str, resp);
3836 break; 3801 break;
3837#ifndef NO_CURSORCOLOR 3802#ifndef NO_CURSORCOLOR
3838 case XTerm_Color_cursor: 3803 case XTerm_Color_cursor:
3839 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3804 process_color_seq (op, Color_cursor, str, resp);
3840 break; 3805 break;
3841#endif 3806#endif
3842 case XTerm_Color_pointer_fg: 3807 case XTerm_Color_pointer_fg:
3843 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3808 process_color_seq (op, Color_pointer_fg, str, resp);
3844 break; 3809 break;
3845 case XTerm_Color_pointer_bg: 3810 case XTerm_Color_pointer_bg:
3846 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3811 process_color_seq (op, Color_pointer_bg, str, resp);
3847 break; 3812 break;
3848#ifndef NO_BOLD_UNDERLINE_REVERSE 3813#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: 3814 case XTerm_Color_RV:
3856 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3815 process_color_seq (op, Color_RV, str, resp);
3816 break;
3817 case Rxvt_Color_BD:
3818 case URxvt_Color_BD:
3819 process_color_seq (op, Color_BD, str, resp);
3820 break;
3821 case Rxvt_Color_UL:
3822 case URxvt_Color_UL:
3823 process_color_seq (op, Color_UL, str, resp);
3857 break; 3824 break;
3858 case URxvt_Color_IT: 3825 case URxvt_Color_IT:
3859 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3826 process_color_seq (op, Color_IT, str, resp);
3860 break; 3827 break;
3861#endif 3828#endif
3862#if TRANSPARENT && TINTING 3829#if TRANSPARENT && TINTING
3863 case URxvt_Color_tint: 3830 case URxvt_Color_tint:
3864 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3831 process_color_seq (op, Color_tint, str, resp);
3832
3865 check_our_parents (); 3833 check_our_parents ();
3834
3866 if (am_transparent) 3835 if (am_transparent)
3867 want_full_refresh = want_refresh = 1; 3836 want_full_refresh = want_refresh = 1;
3868 break;
3869#endif
3870 3837
3838 break;
3839#endif
3840
3871 case XTerm_Pixmap: 3841 case Rxvt_Pixmap:
3842 {
3872 if (*str != ';') 3843 if (*str != ';')
3873 { 3844 {
3874#if XPM_BACKGROUND 3845#if XPM_BACKGROUND
3875 scale_pixmap (""); /* reset to default scaling */ 3846 scale_pixmap (""); /* reset to default scaling */
3876 set_bgPixmap (str); /* change pixmap */ 3847 set_bgPixmap (str); /* change pixmap */
3877#endif
3878 scr_touch (true); 3848 scr_touch (true);
3849#endif
3879 } 3850 }
3851
3852 int changed = 0;
3853
3880 while ((str = strchr (str, ';')) != NULL) 3854 while ((str = strchr (str, ';')) != NULL)
3881 { 3855 {
3882 str++; 3856 str++;
3883#if XPM_BACKGROUND 3857#if XPM_BACKGROUND
3884 changed += scale_pixmap (str); 3858 changed += scale_pixmap (str);
3885#endif 3859#endif
3886 } 3860 }
3887 3861
3888 if (changed) 3862 if (changed)
3889 { 3863 {
3890#ifdef XPM_BACKGROUND 3864#ifdef XPM_BACKGROUND
3891 resize_pixmap (); 3865 resize_pixmap ();
3892#endif
3893 scr_touch (true); 3866 scr_touch (true);
3867#endif
3894 } 3868 }
3869 }
3895 break; 3870 break;
3896 3871
3897 case XTerm_restoreFG: 3872 case Rxvt_restoreFG:
3898 set_window_color (Color_fg, str); 3873 set_window_color (Color_fg, str);
3899 break; 3874 break;
3900 case XTerm_restoreBG: 3875 case Rxvt_restoreBG:
3901 set_window_color (Color_bg, str); 3876 set_window_color (Color_bg, str);
3902 break; 3877 break;
3903 3878
3904 case XTerm_logfile: 3879 case XTerm_logfile:
3905 // TODO, when secure mode? 3880 // TODO, when secure mode?
3906 break; 3881 break;
3907 3882
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 3883#if 0
3915 case XTerm_dumpscreen: /* no error notices */ 3884 case Rxvt_dumpscreen: /* no error notices */
3916 { 3885 {
3917 int fd; 3886 int fd;
3918 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3887 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3919 { 3888 {
3920 scr_dump (fd); 3889 scr_dump (fd);
… …
3944 allocated.push_back ((void *)res); 3913 allocated.push_back ((void *)res);
3945 set_fonts (); 3914 set_fonts ();
3946 } 3915 }
3947 break; 3916 break;
3948 3917
3949#if ENABLE_FRILLS 3918 case URxvt_version:
3919 if (query)
3920 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3921 op,
3922 rs[Rs_name], VERSION[0], VERSION[2],
3923 resp);
3924 break;
3925
3926#if !ENABLE_MINIMAL
3950 case URxvt_locale: 3927 case URxvt_locale:
3951 if (query) 3928 if (query)
3952 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3929 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
3953 else 3930 else
3954 { 3931 {
3955 set_locale (str); 3932 set_locale (str);
3956 pty.set_utf8_mode (enc_utf8); 3933 pty->set_utf8_mode (enc_utf8);
3957 init_xlocale (); 3934 init_xlocale ();
3958 } 3935 }
3959 break; 3936 break;
3960 3937
3961 case URxvt_view_up: 3938 case URxvt_view_up:
… …
3972 break; 3949 break;
3973#endif 3950#endif
3974 3951
3975#if ENABLE_PERL 3952#if ENABLE_PERL
3976 case URxvt_perl: 3953 case URxvt_perl:
3977 if (PERL_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END))) 3954 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3978 ; // no responses yet 3955 ; // no responses yet
3979 break; 3956 break;
3980#endif 3957#endif
3981 } 3958 }
3982} 3959}
… …
4014 return state; 3991 return state;
4015} 3992}
4016 3993
4017/* we're not using priv _yet_ */ 3994/* we're not using priv _yet_ */
4018void 3995void
4019rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 3996rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4020{ 3997{
4021 unsigned int i, j; 3998 unsigned int i, j;
4022 int state; 3999 int state;
4023 4000
4024 static const struct 4001 static const struct
… …
4035 { 5, PrivMode_rVideo }, 4012 { 5, PrivMode_rVideo },
4036 { 6, PrivMode_relOrigin }, 4013 { 6, PrivMode_relOrigin },
4037 { 7, PrivMode_Autowrap }, 4014 { 7, PrivMode_Autowrap },
4038 // 8, bi-directional support mode 4015 // 8, bi-directional support mode
4039 { 9, PrivMode_MouseX10 }, 4016 { 9, PrivMode_MouseX10 },
4040#ifdef menuBar_esc
4041 { menuBar_esc, PrivMode_menuBar },
4042#endif
4043 // 18, 19 printing-related 4017 // 18, 19 printing-related
4044 { 25, PrivMode_VisibleCursor }, 4018 { 25, PrivMode_VisibleCursor },
4045#ifdef scrollBar_esc 4019#ifdef scrollBar_esc
4046 { scrollBar_esc, PrivMode_scrollBar }, 4020 { scrollBar_esc, PrivMode_scrollBar },
4047#endif 4021#endif
… …
4094 /* extra handling for values with state unkept */ 4068 /* extra handling for values with state unkept */
4095 switch (arg[i]) 4069 switch (arg[i])
4096 { 4070 {
4097#if ENABLE_STYLES 4071#if ENABLE_STYLES
4098 case 1021: 4072 case 1021:
4099 if (mode) 4073 set_option (Opt_intensityStyles, mode);
4100 SET_OPTION (Opt_intensityStyles);
4101 else
4102 CLR_OPTION (Opt_intensityStyles);
4103 4074
4104 scr_touch (true); 4075 scr_touch (true);
4105 break; 4076 break;
4106#endif 4077#endif
4107 case 1048: /* alternative cursor save */ 4078 case 1048: /* alternative cursor save */
… …
4129 case 3: /* 80/132 */ 4100 case 3: /* 80/132 */
4130 if (priv_modes & PrivMode_132OK) 4101 if (priv_modes & PrivMode_132OK)
4131 set_widthheight (((state ? 132 : 80) * fwidth), height); 4102 set_widthheight (((state ? 132 : 80) * fwidth), height);
4132 break; 4103 break;
4133 case 4: /* smooth scrolling */ 4104 case 4: /* smooth scrolling */
4134 if (!state) 4105 set_option (Opt_jumpScroll, !state);
4135 SET_OPTION (Opt_jumpScroll);
4136 else
4137 CLR_OPTION (Opt_jumpScroll);
4138 break; 4106 break;
4139 case 5: /* reverse video */ 4107 case 5: /* reverse video */
4140 scr_rvideo_mode (state); 4108 scr_rvideo_mode (state);
4141 break; 4109 break;
4142 case 6: /* relative/absolute origins */ 4110 case 6: /* relative/absolute origins */
… …
4148 /* case 8: - auto repeat, can't do on a per window basis */ 4116 /* case 8: - auto repeat, can't do on a per window basis */
4149 case 9: /* X10 mouse reporting */ 4117 case 9: /* X10 mouse reporting */
4150 if (state) /* orthogonal */ 4118 if (state) /* orthogonal */
4151 priv_modes &= ~PrivMode_MouseX11; 4119 priv_modes &= ~PrivMode_MouseX11;
4152 break; 4120 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 4121#ifdef scrollBar_esc
4161 case scrollBar_esc: 4122 case scrollBar_esc:
4162 if (scrollbar_mapping (state)) 4123 if (scrollbar_mapping (state))
4163 { 4124 {
4164 resize_all_windows (0, 0, 0); 4125 resize_all_windows (0, 0, 0);
… …
4183#if 0 4144#if 0
4184 case 1001: 4145 case 1001:
4185 break; /* X11 mouse highlighting */ 4146 break; /* X11 mouse highlighting */
4186#endif 4147#endif
4187 case 1010: /* scroll to bottom on TTY output inhibit */ 4148 case 1010: /* scroll to bottom on TTY output inhibit */
4188 if (!state) 4149 set_option (Opt_scrollTtyOutput, !state);
4189 SET_OPTION (Opt_scrollTtyOutput);
4190 else
4191 CLR_OPTION (Opt_scrollTtyOutput);
4192 break; 4150 break;
4193 case 1011: /* scroll to bottom on key press */ 4151 case 1011: /* scroll to bottom on key press */
4194 if (state) 4152 set_option (Opt_scrollTtyKeypress, state);
4195 SET_OPTION (Opt_scrollTtyKeypress);
4196 else
4197 CLR_OPTION (Opt_scrollTtyKeypress);
4198 break; 4153 break;
4199 case 1047: /* secondary screen w/ clearing last */ 4154 case 1047: /* secondary screen w/ clearing last */
4200 if (OPTION (Opt_secondaryScreen)) 4155 if (OPTION (Opt_secondaryScreen))
4201 if (current_screen != PRIMARY) 4156 if (current_screen != PRIMARY)
4202 scr_erase_screen (2); 4157 scr_erase_screen (2);
… …
4340 scr_color (Color_bg, Color_bg); 4295 scr_color (Color_bg, Color_bg);
4341 break; 4296 break;
4342 4297
4343 //case 50: // not variable spacing 4298 //case 50: // not variable spacing
4344 4299
4345#ifndef NO_BRIGHTCOLOR 4300#if !ENABLE_MINIMAL
4346 case 90: 4301 case 90:
4347 case 91: /* set bright fg color */ 4302 case 91: /* set bright fg color */
4348 case 92: 4303 case 92:
4349 case 93: 4304 case 93:
4350 case 94: 4305 case 94:
… …
4412const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4367const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4413 4368
4414void 4369void
4415rxvt_term::tt_write (const char *data, unsigned int len) 4370rxvt_term::tt_write (const char *data, unsigned int len)
4416{ 4371{
4372 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4373 return;
4374
4375 if (pty->pty < 0)
4376 return;
4377
4417 if (v_buflen == 0) 4378 if (v_buflen == 0)
4418 { 4379 {
4419 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4380 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4420 4381
4421 if ((unsigned int)written == len) 4382 if ((unsigned int)written == len)
4422 return; 4383 return;
4423 4384
4424 data += written; 4385 data += written;
… …
4433 pty_ev.set (EVENT_READ | EVENT_WRITE); 4394 pty_ev.set (EVENT_READ | EVENT_WRITE);
4434} 4395}
4435 4396
4436void rxvt_term::pty_write () 4397void rxvt_term::pty_write ()
4437{ 4398{
4438 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4399 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4439 4400
4440 if (written > 0) 4401 if (written > 0)
4441 { 4402 {
4442 v_buflen -= written; 4403 v_buflen -= written;
4443 4404

Diff Legend

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