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

Diff Legend

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