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.241 by root, Fri Jan 6 05:28:55 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_STRING_LEN, kbuf, len, DT_END))) 872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
873 return; 873 return;
874 874
875 if (len <= 0) 875 if (len <= 0)
876 return; /* not mapped */ 876 return; /* not mapped */
877 877
… …
905 { 905 {
906 const char ch = C0_ESC; 906 const char ch = C0_ESC;
907 tt_write (&ch, 1); 907 tt_write (&ch, 1);
908 } 908 }
909 909
910#if defined(DEBUG_CMD)
911 /* Display keyboard buffer contents */
912 unsigned char *p;
913 int i;
914
915 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
916 for (i = 0, p = kbuf; i < len; i++, p++)
917 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
918 fprintf (stderr, "'\n");
919#endif /* DEBUG_CMD */
920 tt_write (kbuf, (unsigned int)len); 910 tt_write (kbuf, (unsigned int)len);
921} 911}
922/*}}} */ 912/*}}} */
923 913
924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 914#if defined (KEYSYM_RESOURCE)
925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
926/* attempt to `write' count to the input buffer */
927unsigned int 915unsigned int
928rxvt_term::cmd_write (const char *str, unsigned int count) 916rxvt_term::cmd_write (const char *str, unsigned int count)
929{ 917{
930 unsigned int n, s; 918 unsigned int n, s;
931 919
… …
972 960
973 if (want_refresh) 961 if (want_refresh)
974 { 962 {
975 if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) 963 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976 { 964 {
977 int row = -view_start; 965 int row = view_start;
966 int end_row = row + nrow;
978 967
979 while (row > -nsaved && ROW (row - 1).is_longer ()) 968 while (row > top_row && ROW (row - 1).is_longer ())
980 --row; 969 --row;
981 970
982 while (row < -view_start + nrow) 971 do
983 { 972 {
984 int start_row = row; 973 int start_row = row;
985 line_t *l; 974 line_t *l;
986 975
987 do 976 do
988 { 977 {
989 l = &ROW (row); 978 l = &ROW (row++);
990 979
991 if (!(l->f & LINE_FILTERED)) 980 if (!(l->f & LINE_FILTERED))
992 { 981 {
993 // line not filtered, mark it as filtered 982 // line not filtered, mark it as filtered
994 l->f |= LINE_FILTERED; 983 l->f |= LINE_FILTERED;
995 while (l->is_longer ()) 984 while (l->is_longer ())
996 { 985 {
997 l = &ROW (++row); 986 l = &ROW (row++);
998 l->f |= LINE_FILTERED; 987 l->f |= LINE_FILTERED;
999 } 988 }
1000 989
1001 // and filter it 990 // and filter it
1002 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));
1003 992
1004 break; 993 break;
1005 } 994 }
1006 } 995 }
1007 while (l->is_longer ()); 996 while (l->is_longer () && row < end_row);
1008
1009 row++;
1010 } 997 }
998 while (row < end_row);
1011 999 }
1012 }
1013 1000
1014 scr_refresh (refresh_type); 1001 scr_refresh ();
1015 scrollbar_show (1); 1002 scrollbar_show (1);
1016#ifdef USE_XIM 1003#ifdef USE_XIM
1017 IMSendSpot (); 1004 IMSendSpot ();
1018#endif 1005#endif
1019 } 1006 }
… …
1022} 1009}
1023 1010
1024void 1011void
1025rxvt_term::check_cb (check_watcher &w) 1012rxvt_term::check_cb (check_watcher &w)
1026{ 1013{
1027 SET_R (this); 1014 make_current ();
1028 SET_LOCALE (locale);
1029 1015
1030 display->flush (); 1016 display->flush ();
1031 1017
1032 if (want_refresh && !flush_ev.active) 1018 if (want_refresh && !flush_ev.active)
1033 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
1034} 1020}
1035 1021
1036void 1022void
1037rxvt_term::flush_cb (time_watcher &w) 1023rxvt_term::flush_cb (time_watcher &w)
1038{ 1024{
1039 SET_R (this); 1025 make_current ();
1040 SET_LOCALE (locale);
1041 1026
1042 refresh_limit = 1; 1027 refresh_limit = 1;
1043 refresh_count = 0; 1028 refresh_count = 0;
1044 flush (); 1029 flush ();
1045} 1030}
… …
1049rxvt_term::cursor_blink_cb (time_watcher &w) 1034rxvt_term::cursor_blink_cb (time_watcher &w)
1050{ 1035{
1051 hidden_cursor = !hidden_cursor; 1036 hidden_cursor = !hidden_cursor;
1052 want_refresh = 1; 1037 want_refresh = 1;
1053 1038
1054 w.start (w.at + BLINK_INTERVAL); 1039 w.start (w.at + CURSOR_BLINK_INTERVAL);
1055} 1040}
1056#endif 1041#endif
1057 1042
1058#ifdef TEXT_BLINK 1043#ifdef TEXT_BLINK
1059void 1044void
… …
1073rxvt_term::cont_scroll_cb (time_watcher &w) 1058rxvt_term::cont_scroll_cb (time_watcher &w)
1074{ 1059{
1075 if ((scrollbar_isUp() || scrollbar_isDn()) && 1060 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1076 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1061 scr_page (scrollbar_isUp() ? UP : DN, 1))
1077 { 1062 {
1078 refresh_type |= SMOOTH_REFRESH;
1079 want_refresh = 1; 1063 want_refresh = 1;
1080 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1064 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1081 } 1065 }
1082} 1066}
1083#endif 1067#endif
… …
1087rxvt_term::sel_scroll_cb (time_watcher &w) 1071rxvt_term::sel_scroll_cb (time_watcher &w)
1088{ 1072{
1089 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1073 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1090 { 1074 {
1091 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1075 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1092 refresh_type |= SMOOTH_REFRESH;
1093 want_refresh = 1; 1076 want_refresh = 1;
1094 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1077 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1095 } 1078 }
1096} 1079}
1097#endif 1080#endif
… …
1102{ 1085{
1103 if (mouse_slip_wheel_speed == 0 1086 if (mouse_slip_wheel_speed == 0
1104 || 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)
1105 : scr_page (UP, mouse_slip_wheel_speed)) 1088 : scr_page (UP, mouse_slip_wheel_speed))
1106 { 1089 {
1107 if (view_start == nsaved || 1090 if (view_start == top_row || view_start == 0)
1108 view_start == 0)
1109 mouse_slip_wheel_speed = 0; 1091 mouse_slip_wheel_speed = 0;
1110 1092
1111 refresh_type |= SMOOTH_REFRESH;
1112 want_refresh = 1; 1093 want_refresh = 1;
1113 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1094 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1114 } 1095 }
1115} 1096}
1116#endif 1097#endif
1117 1098
1118#if HAVE_SCHED_YIELD 1099#if LINUX_YIELD_HACK
1119static struct event_handler 1100static struct event_handler
1120{ 1101{
1121 check_watcher cw_yield; 1102 check_watcher yield_ev;
1122 1103
1123 void yield (check_watcher &w) 1104 void yield_cb (check_watcher &w)
1124 { 1105 {
1125 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
1126 w.stop (); 1114 w.stop ();
1127 } 1115 }
1128 1116
1129 event_handler () 1117 event_handler ()
1130 : cw_yield (this, &event_handler::yield) 1118 : yield_ev (this, &event_handler::yield_cb)
1131 { 1119 {
1132 } 1120 }
1133} event_handler; 1121} event_handler;
1134#endif 1122#endif
1135 1123
… …
1146 1134
1147 memmove (cmdbuf_base, cmdbuf_ptr, n); 1135 memmove (cmdbuf_base, cmdbuf_ptr, n);
1148 cmdbuf_ptr = cmdbuf_base; 1136 cmdbuf_ptr = cmdbuf_base;
1149 cmdbuf_endp = cmdbuf_ptr + n; 1137 cmdbuf_endp = cmdbuf_ptr + n;
1150 1138
1151 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1139 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1152 1140
1153 if (r > 0) 1141 if (r > 0)
1154 { 1142 {
1155 cmdbuf_endp += r; 1143 cmdbuf_endp += r;
1156 return true; 1144 return true;
1157 } 1145 }
1158 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1146 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1159 { 1147 {
1160#if HAVE_SCHED_YIELD 1148#if LINUX_YIELD_HACK
1161 if (display->is_local) 1149 if (display->is_local)
1162 event_handler.cw_yield.start (); 1150 event_handler.yield_ev.start ();
1163#endif 1151#endif
1164 } 1152 }
1165 else 1153 else
1166 { 1154 {
1167 pty_ev.stop (); 1155 pty_ev.stop ();
… …
1174} 1162}
1175 1163
1176void 1164void
1177rxvt_term::pty_cb (io_watcher &w, short revents) 1165rxvt_term::pty_cb (io_watcher &w, short revents)
1178{ 1166{
1179 SET_R (this); 1167 make_current ();
1180 SET_LOCALE (locale);
1181 1168
1182 if (revents & EVENT_READ) 1169 if (revents & EVENT_READ)
1183 // loop, but don't allow a single term to monopolize us 1170 // loop, but don't allow a single term to monopolize us
1184 while (pty_fill ()) 1171 while (pty_fill ())
1185 if (cmd_parse ()) 1172 if (cmd_parse ())
… …
1190} 1177}
1191 1178
1192void 1179void
1193rxvt_term::pointer_unblank () 1180rxvt_term::pointer_unblank ()
1194{ 1181{
1195 XDefineCursor (display->display, vt, TermWin_cursor); 1182 XDefineCursor (xdisp, vt, TermWin_cursor);
1196 recolour_cursor (); 1183 recolour_cursor ();
1197 1184
1198#ifdef POINTER_BLANK 1185#ifdef POINTER_BLANK
1199 hidden_pointer = 0; 1186 hidden_pointer = 0;
1200 1187
… …
1208rxvt_term::pointer_blank () 1195rxvt_term::pointer_blank ()
1209{ 1196{
1210 if (!OPTION (Opt_pointerBlank)) 1197 if (!OPTION (Opt_pointerBlank))
1211 return; 1198 return;
1212 1199
1213 XDefineCursor (display->display, vt, display->blank_cursor); 1200 XDefineCursor (xdisp, vt, display->blank_cursor);
1214 XFlush (display->display); 1201 XFlush (xdisp);
1215 1202
1216 hidden_pointer = 1; 1203 hidden_pointer = 1;
1217} 1204}
1218 1205
1219void 1206void
1220rxvt_term::pointer_cb (time_watcher &w) 1207rxvt_term::pointer_cb (time_watcher &w)
1221{ 1208{
1222 SET_R (this); 1209 make_current ();
1223 SET_LOCALE (locale);
1224 1210
1225 pointer_blank (); 1211 pointer_blank ();
1226} 1212}
1227#endif 1213#endif
1228 1214
… …
1293 (32 + button_number + key_state), 1279 (32 + button_number + key_state),
1294 (32 + x + 1), 1280 (32 + x + 1),
1295 (32 + y + 1)); 1281 (32 + y + 1));
1296} 1282}
1297 1283
1298#ifdef USING_W11LIB
1299void
1300rxvt_W11_process_x_event (XEvent *ev)
1301{
1302 rxvt_t *r = rxvt_get_r ();
1303
1304 x_cb (*ev);
1305}
1306#endif
1307
1308/*{{{ process an X event */ 1284/*{{{ process an X event */
1309void 1285void
1310rxvt_term::x_cb (XEvent &ev) 1286rxvt_term::x_cb (XEvent &ev)
1311{ 1287{
1312 dDisp; 1288 make_current ();
1313 1289
1314 SET_R (this); 1290 dLocal (Display *, xdisp);
1315 SET_LOCALE (locale);
1316 1291
1317#if defined(CURSOR_BLINK) 1292 if (ev.xany.window == vt
1318 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1293 && SHOULD_INVOKE (HOOK_X_EVENT)
1319 { 1294 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1320 if (hidden_cursor) 1295 return;
1321 {
1322 hidden_cursor = 0;
1323 want_refresh = 1;
1324 }
1325 1296
1326 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1297 // for XQueryPointer
1327 }
1328#endif
1329
1330#if defined(POINTER_BLANK)
1331 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1332 {
1333 if (ev.type == MotionNotify
1334 || ev.type == ButtonPress
1335 || ev.type == ButtonRelease)
1336 if (hidden_pointer)
1337 pointer_unblank ();
1338
1339 if (ev.type == KeyPress && hidden_pointer == 0)
1340 pointer_blank ();
1341 }
1342#endif
1343
1344 Window unused_root, unused_child; 1298 Window unused_root, unused_child;
1345 int unused_root_x, unused_root_y; 1299 int unused_root_x, unused_root_y;
1346 unsigned int unused_mask; 1300 unsigned int unused_mask;
1347 1301
1348 switch (ev.type) 1302 switch (ev.type)
… …
1355 1309
1356 break; 1310 break;
1357 1311
1358 case KeyRelease: 1312 case KeyRelease:
1359 { 1313 {
1360#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1314#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1361 KeySym ks; 1315 KeySym keysym;
1362 1316
1363 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 :/
1364#endif 1318#endif
1365 1319
1366#if ENABLE_FRILLS || ISO_14755 1320#if ENABLE_FRILLS || ISO_14755
1367 // ISO 14755 support 1321 // ISO 14755 support
1368 if (iso14755buf) 1322 if (iso14755buf)
… …
1373# endif 1327# endif
1374# if ISO_14755 1328# if ISO_14755
1375 // iso14755 part 5.2 handling: release time 1329 // iso14755 part 5.2 handling: release time
1376 // first: controls 1330 // first: controls
1377 if ((ev.xkey.state & ControlMask) 1331 if ((ev.xkey.state & ControlMask)
1378 && ((ks >= 0x40 && ks <= 0x5f) 1332 && ((keysym >= 0x40 && keysym <= 0x5f)
1379 || (ks >= 0x61 && ks <= 0x7f))) 1333 || (keysym >= 0x61 && keysym <= 0x7f)))
1380 { 1334 {
1381 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1335 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1382 commit_iso14755 (); 1336 commit_iso14755 ();
1383 return; // case-break; 1337 goto skip_switch;
1384 } 1338 }
1385 1339
1386 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1340 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1387 if (i[0] == ks) 1341 if (i[0] == keysym)
1388 { 1342 {
1389 iso14755buf = ISO_14755_51 | i[1]; 1343 iso14755buf = ISO_14755_51 | i[1];
1390 commit_iso14755 (); 1344 commit_iso14755 ();
1391 return; // case-break; 1345 goto skip_switch;
1392 } 1346 }
1393 1347
1394 scr_bell (); 1348 scr_bell ();
1395# endif 1349# endif
1396 iso14755buf = 0; 1350 iso14755buf = 0;
… …
1415 else 1369 else
1416 iso14755buf = 0; 1370 iso14755buf = 0;
1417 } 1371 }
1418#endif 1372#endif
1419 1373
1374 if (ev.xany.window == vt
1420 if (ev.xany.window == vt && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END))) 1375 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1421 break; 1376 break;
1422 1377
1423#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1378#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1424 if (!(ev.xkey.state & ControlMask)) 1379 if (!(ev.xkey.state & ControlMask))
1425 slip_wheel_ev.stop (); 1380 slip_wheel_ev.stop ();
1426 else if (ks == XK_Control_L || ks == XK_Control_R) 1381 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1427 mouse_slip_wheel_speed = 0; 1382 mouse_slip_wheel_speed = 0;
1428#endif 1383#endif
1429 break; 1384 break;
1430 } 1385 }
1431 1386
… …
1437 button_release (ev.xbutton); 1392 button_release (ev.xbutton);
1438 break; 1393 break;
1439 1394
1440 case ClientMessage: 1395 case ClientMessage:
1441 if (ev.xclient.format == 32 1396 if (ev.xclient.format == 32
1442 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1397 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1443 { 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 {
1444 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)))
1445 destroy (); 1406 destroy ();
1407 }
1446#if ENABLE_EWMH 1408#if ENABLE_EWMH
1447 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])
1448 XSendEvent (disp, ev.xclient.window = display->root, 1410 XSendEvent (xdisp, ev.xclient.window = display->root,
1449 False, SubstructureRedirectMask | SubstructureNotifyMask, 1411 False, SubstructureRedirectMask | SubstructureNotifyMask,
1450 &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 }
1451#endif 1424#endif
1452 } 1425 }
1453#if ENABLE_XEMBED
1454 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1455 {
1456 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1457 focus_in ();
1458 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1459 focus_out ();
1460 }
1461#endif
1462#ifdef OFFIX_DND
1463 /* OffiX Dnd (drag 'n' drop) protocol */
1464 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1465 && (ev.xclient.data.l[0] == DndFile
1466 || ev.xclient.data.l[0] == DndDir
1467 || ev.xclient.data.l[0] == DndLink))
1468 {
1469 /* Get Dnd data */
1470 Atom ActualType;
1471 int ActualFormat;
1472 unsigned char *data;
1473 unsigned long Size, RemainingBytes;
1474
1475 XGetWindowProperty (disp, display->root,
1476 xa[XA_DNDSELECTION],
1477 0L, 1000000L,
1478 False, AnyPropertyType,
1479 &ActualType, &ActualFormat,
1480 &Size, &RemainingBytes,
1481 &data);
1482 set_string_property (XA_CUT_BUFFER0, data);
1483 XFree (data);
1484 selection_paste (display->root, XA_CUT_BUFFER0, true);
1485 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1486 }
1487#endif /* OFFIX_DND */
1488 break; 1426 break;
1489 1427
1490 case MappingNotify: 1428 case MappingNotify:
1491 XRefreshKeyboardMapping (&ev.xmapping); 1429 XRefreshKeyboardMapping (&ev.xmapping);
1492 break; 1430 break;
… …
1525 break; 1463 break;
1526 1464
1527 case ConfigureNotify: 1465 case ConfigureNotify:
1528 if (ev.xconfigure.window == parent[0]) 1466 if (ev.xconfigure.window == parent[0])
1529 { 1467 {
1530 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1468 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1531 ; 1469 ;
1532 1470
1533 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1471 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1534 { 1472 {
1535 seen_resize = 1; 1473 seen_resize = 1;
1536 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1474 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1537 } 1475 }
1538 1476
1477 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1478
1539#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1479#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1540 if (OPTION (Opt_transparent)) 1480 if (OPTION (Opt_transparent))
1541 check_our_parents (); 1481 check_our_parents ();
1542#endif 1482#endif
1543 } 1483 }
1544 break; 1484 break;
1545 1485
1546 case PropertyNotify: 1486 case PropertyNotify:
1487 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1547 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1488 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1548 && ev.xproperty.state == PropertyNewValue) 1489 && ev.xproperty.state == PropertyNewValue)
1549 selection_property (ev.xproperty.window, ev.xproperty.atom); 1490 selection_property (ev.xproperty.window, ev.xproperty.atom);
1550 1491
1551 break; 1492 break;
1552 1493
1553 case SelectionClear: 1494 case SelectionClear:
1554 selection_clear (); 1495 selection_clear ();
… …
1559 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1500 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1560 break; 1501 break;
1561 1502
1562 case SelectionRequest: 1503 case SelectionRequest:
1563 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));
1564 break; 1513 break;
1565 1514
1566 case UnmapNotify: 1515 case UnmapNotify:
1567 mapped = 0; 1516 mapped = 0;
1568#ifdef TEXT_BLINK 1517#ifdef TEXT_BLINK
1569 text_blink_ev.stop (); 1518 text_blink_ev.stop ();
1570#endif 1519#endif
1571 break; 1520 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1572
1573 case MapNotify:
1574 mapped = 1;
1575#ifdef TEXT_BLINK
1576 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1577#endif
1578 break; 1521 break;
1579 1522
1580#ifdef TRANSPARENT 1523#ifdef TRANSPARENT
1581 case ReparentNotify: 1524 case ReparentNotify:
1582 rootwin_cb (ev); 1525 rootwin_cb (ev);
… …
1588 if (ev.xany.window == vt) 1531 if (ev.xany.window == vt)
1589 { 1532 {
1590 do 1533 do
1591 scr_expose (ev.xexpose.x, ev.xexpose.y, 1534 scr_expose (ev.xexpose.x, ev.xexpose.y,
1592 ev.xexpose.width, ev.xexpose.height, False); 1535 ev.xexpose.width, ev.xexpose.height, False);
1593 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1536 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1594 1537
1595 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1538 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1596 1539
1597 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1540 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1598 scr_expose (ev.xexpose.x, ev.xexpose.y, 1541 scr_expose (ev.xexpose.x, ev.xexpose.y,
1599 ev.xexpose.width, ev.xexpose.height, False); 1542 ev.xexpose.width, ev.xexpose.height, False);
1600 1543
1601 scr_refresh (refresh_type); 1544 want_refresh = 1;
1602 } 1545 }
1603 else 1546 else
1604 { 1547 {
1605 XEvent unused_event; 1548 XEvent unused_event;
1606 1549
1607 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1550 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1608 ; 1551 ;
1609 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1552 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1610 ; 1553 ;
1611 1554
1612 if (isScrollbarWindow (ev.xany.window)) 1555 if (isScrollbarWindow (ev.xany.window))
1613 { 1556 {
1614 scrollBar.setIdle (); 1557 scrollBar.setIdle ();
1615 scrollbar_show (0); 1558 scrollbar_show (0);
1616 } 1559 }
1617#ifdef MENUBAR
1618 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1619 menubar_expose ();
1620#endif
1621 1560
1622#ifdef TRANSPARENT 1561#ifdef TRANSPARENT
1623 if (am_transparent && ev.xany.window == parent[0]) 1562 if (am_transparent && ev.xany.window == parent[0])
1624 XClearWindow (disp, ev.xany.window); 1563 XClearWindow (xdisp, ev.xany.window);
1625#endif 1564#endif
1626 } 1565 }
1627 break; 1566 break;
1628 1567
1629 case MotionNotify: 1568 case MotionNotify:
1630#ifdef POINTER_BLANK 1569#ifdef POINTER_BLANK
1631 if (hidden_pointer) 1570 if (hidden_pointer)
1632 pointer_unblank (); 1571 pointer_unblank ();
1633#endif 1572#endif
1634#if MENUBAR
1635 if (isMenuBarWindow (ev.xany.window))
1636 {
1637 menubar_control (ev.xbutton);
1638 break;
1639 }
1640#endif
1641 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1573 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1642 break; 1574 break;
1643 1575
1644 if (ev.xany.window == vt) 1576 if (ev.xany.window == vt)
1645 { 1577 {
1578 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1646 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1579 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1647 ; // nop 1580 ; // nop
1648 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1581 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1649 { 1582 {
1650 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1583 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1651 ; 1584 ;
1652 1585
1653 XQueryPointer (disp, vt, 1586 XQueryPointer (xdisp, vt,
1654 &unused_root, &unused_child, 1587 &unused_root, &unused_child,
1655 &unused_root_x, &unused_root_y, 1588 &unused_root_x, &unused_root_y,
1656 &ev.xbutton.x, &ev.xbutton.y, 1589 &ev.xbutton.x, &ev.xbutton.y,
1657 &ev.xbutton.state); 1590 &ev.xbutton.state);
1658#ifdef MOUSE_THRESHOLD 1591#ifdef MOUSE_THRESHOLD
… …
1722#endif 1655#endif
1723 } 1656 }
1724 } 1657 }
1725 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1658 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1726 { 1659 {
1727 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1660 while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1728 MotionNotify, &ev)) 1661 MotionNotify, &ev))
1729 ; 1662 ;
1730 1663
1731 XQueryPointer (disp, scrollBar.win, 1664 XQueryPointer (xdisp, scrollBar.win,
1732 &unused_root, &unused_child, 1665 &unused_root, &unused_child,
1733 &unused_root_x, &unused_root_y, 1666 &unused_root_x, &unused_root_y,
1734 &ev.xbutton.x, &ev.xbutton.y, 1667 &ev.xbutton.x, &ev.xbutton.y,
1735 &unused_mask); 1668 &unused_mask);
1736 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1669 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1737 scrollbar_size ()); 1670 scrollbar_size ());
1738 scr_refresh (refresh_type); 1671 want_refresh = 1;
1739 refresh_limit = 0; 1672 refresh_limit = 0;
1740 scrollbar_show (1); 1673 scrollbar_show (1);
1741 } 1674 }
1742 break; 1675 break;
1743 } 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
1744} 1706}
1745 1707
1746void 1708void
1747rxvt_term::focus_in () 1709rxvt_term::focus_in ()
1748{ 1710{
… …
1760 XSetICFocus (Input_Context); 1722 XSetICFocus (Input_Context);
1761 } 1723 }
1762#endif 1724#endif
1763#if CURSOR_BLINK 1725#if CURSOR_BLINK
1764 if (OPTION (Opt_cursorBlink)) 1726 if (OPTION (Opt_cursorBlink))
1765 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1727 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1766#endif 1728#endif
1767#if OFF_FOCUS_FADING 1729#if OFF_FOCUS_FADING
1768 if (rs[Rs_fade]) 1730 if (rs[Rs_fade])
1769 { 1731 {
1770 pix_colors = pix_colors_focused; 1732 pix_colors = pix_colors_focused;
… …
1814 1776
1815#if TRANSPARENT 1777#if TRANSPARENT
1816void 1778void
1817rxvt_term::rootwin_cb (XEvent &ev) 1779rxvt_term::rootwin_cb (XEvent &ev)
1818{ 1780{
1819 SET_R (this); 1781 make_current ();
1820 SET_LOCALE (locale);
1821 1782
1822 switch (ev.type) 1783 switch (ev.type)
1823 { 1784 {
1824 case PropertyNotify: 1785 case PropertyNotify:
1825 /* 1786 /*
… …
1852 /* 1813 /*
1853 * VT window processing of button press 1814 * VT window processing of button press
1854 */ 1815 */
1855 if (ev.window == vt) 1816 if (ev.window == vt)
1856 { 1817 {
1818 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1819 return;
1820
1857#if ISO_14755 1821#if ISO_14755
1858 // 5.4 1822 // 5.4
1859 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1823 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1860 { 1824 {
1861 iso14755_54 (ev.x, ev.y); 1825 iso14755_54 (ev.x, ev.y);
… …
1873#ifdef MOUSE_REPORT_DOUBLECLICK 1837#ifdef MOUSE_REPORT_DOUBLECLICK
1874 if (ev.button == MEvent.button && clickintime) 1838 if (ev.button == MEvent.button && clickintime)
1875 { 1839 {
1876 /* same button, within alloted time */ 1840 /* same button, within alloted time */
1877 MEvent.clicks++; 1841 MEvent.clicks++;
1842
1878 if (MEvent.clicks > 1) 1843 if (MEvent.clicks > 1)
1879 { 1844 {
1880 /* only report double clicks */ 1845 /* only report double clicks */
1881 MEvent.clicks = 2; 1846 MEvent.clicks = 2;
1882 mouse_report (ev); 1847 mouse_report (ev);
… …
1902 else 1867 else
1903 { 1868 {
1904 if (ev.button != MEvent.button) 1869 if (ev.button != MEvent.button)
1905 MEvent.clicks = 0; 1870 MEvent.clicks = 0;
1906 1871
1907 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1908 switch (ev.button) 1872 switch (ev.button)
1909 { 1873 {
1910 case Button1: 1874 case Button1:
1911 /* allow meta + click to select rectangular areas */ 1875 /* allow meta + click to select rectangular areas */
1912 /* should be done in screen.C */ 1876 /* should be done in screen.C */
1913#if ENABLE_FRILLS 1877#if ENABLE_FRILLS
1914 selection.rect = !!(ev.state & ModMetaMask); 1878 selection.rect = !!(ev.state & ModMetaMask);
1915#else 1879#else
1916 selection.rect = false; 1880 selection.rect = false;
1917#endif 1881#endif
1918 1882
1919 /* allow shift+left click to extend selection */ 1883 /* allow shift+left click to extend selection */
1920 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1884 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1921 { 1885 {
1922 if (MEvent.button == Button1 && clickintime) 1886 if (MEvent.button == Button1 && clickintime)
1923 selection_rotate (ev.x, ev.y); 1887 selection_rotate (ev.x, ev.y);
1924 else 1888 else
1925 selection_extend (ev.x, ev.y, 1); 1889 selection_extend (ev.x, ev.y, 1);
1926 } 1890 }
1927 else 1891 else
1928 { 1892 {
1929 if (MEvent.button == Button1 && clickintime) 1893 if (MEvent.button == Button1 && clickintime)
1930 MEvent.clicks++; 1894 MEvent.clicks++;
1931 else 1895 else
1932 MEvent.clicks = 1; 1896 MEvent.clicks = 1;
1933 1897
1934 selection_click (MEvent.clicks, ev.x, ev.y); 1898 selection_click (MEvent.clicks, ev.x, ev.y);
1935 } 1899 }
1936 1900
1937 MEvent.button = Button1; 1901 MEvent.button = Button1;
1938 break; 1902 break;
1939 1903
1940 case Button3: 1904 case Button3:
1941 if (MEvent.button == Button3 && clickintime) 1905 if (MEvent.button == Button3 && clickintime)
1942 selection_rotate (ev.x, ev.y); 1906 selection_rotate (ev.x, ev.y);
1943 else 1907 else
1944 selection_extend (ev.x, ev.y, 1); 1908 selection_extend (ev.x, ev.y, 1);
1945 1909
1946 MEvent.button = Button3; 1910 MEvent.button = Button3;
1947 break; 1911 break;
1948 } 1912 }
1949 } 1913 }
1950 1914
1951 MEvent.time = ev.time; 1915 MEvent.time = ev.time;
1952 return; 1916 return;
1953 } 1917 }
1954 1918
… …
2090 } 2054 }
2091 2055
2092 break; 2056 break;
2093 } 2057 }
2094 } 2058 }
2059
2095 return; 2060 return;
2096 } 2061 }
2097#if MENUBAR
2098 /*
2099 * Menubar window processing of button press
2100 */
2101 if (isMenuBarWindow (ev.window))
2102 menubar_control (ev);
2103#endif
2104} 2062}
2105 2063
2106void 2064void
2107rxvt_term::button_release (XButtonEvent &ev) 2065rxvt_term::button_release (XButtonEvent &ev)
2108{ 2066{
… …
2114 2072
2115 if (scrollbar_isUpDn ()) 2073 if (scrollbar_isUpDn ())
2116 { 2074 {
2117 scrollBar.setIdle (); 2075 scrollBar.setIdle ();
2118 scrollbar_show (0); 2076 scrollbar_show (0);
2119#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2120 refresh_type &= ~SMOOTH_REFRESH;
2121#endif
2122 } 2077 }
2123 2078
2124#ifdef SELECTION_SCROLLING 2079#ifdef SELECTION_SCROLLING
2125 if (sel_scroll_ev.active) 2080 if (sel_scroll_ev.active)
2126 sel_scroll_ev.stop(); 2081 sel_scroll_ev.stop();
2127#endif 2082#endif
2128 2083
2129 if (ev.window == vt) 2084 if (ev.window == vt)
2130 { 2085 {
2086 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2087 return;
2088
2131#if ISO_14755 2089#if ISO_14755
2132 // 5.4 2090 // 5.4
2133 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2091 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2134 return; 2092 return;
2135#endif 2093#endif
2094
2136 if (reportmode) 2095 if (reportmode)
2137 { 2096 {
2138 /* mouse report from vt window */ 2097 /* mouse report from vt window */
2139 /* don't report release of wheel "buttons" */ 2098 /* don't report release of wheel "buttons" */
2140 if (ev.button >= 4) 2099 if (ev.button >= 4)
… …
2164 if (priv_modes & PrivMode_mouse_report 2123 if (priv_modes & PrivMode_mouse_report
2165 && bypass_keystate 2124 && bypass_keystate
2166 && ev.button == Button1 && MEvent.clicks <= 1) 2125 && ev.button == Button1 && MEvent.clicks <= 1)
2167 selection_extend (ev.x, ev.y, 0); 2126 selection_extend (ev.x, ev.y, 0);
2168 2127
2169 if (!HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2170 return;
2171
2172 switch (ev.button) 2128 switch (ev.button)
2173 { 2129 {
2174 case Button1: 2130 case Button1:
2175 case Button3: 2131 case Button3:
2176 selection_make (ev.time); 2132 selection_make (ev.time);
2177 break; 2133 break;
2134
2178 case Button2: 2135 case Button2:
2179 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);
2180 break; 2138 break;
2139
2181#ifdef MOUSE_WHEEL 2140#ifdef MOUSE_WHEEL
2182 case Button4: 2141 case Button4:
2183 case Button5: 2142 case Button5:
2184 { 2143 {
2185 int i; 2144 int i;
… …
2207 slip_wheel_ev.start (); 2166 slip_wheel_ev.start ();
2208 } 2167 }
2209 else 2168 else
2210 { 2169 {
2211# endif 2170# endif
2212# ifdef JUMP_MOUSE_WHEEL
2213 scr_page (v, i); 2171 scr_page (v, i);
2214 scr_refresh (SMOOTH_REFRESH);
2215 scrollbar_show (1); 2172 scrollbar_show (1);
2216# else
2217 while (i--)
2218 {
2219 scr_page (v, 1);
2220 scr_refresh (SMOOTH_REFRESH);
2221 scrollbar_show (1);
2222 }
2223# endif
2224# ifdef MOUSE_SLIP_WHEELING 2173# ifdef MOUSE_SLIP_WHEELING
2225 } 2174 }
2226#endif 2175# endif
2227 } 2176 }
2228 break; 2177 break;
2229#endif 2178#endif
2230 } 2179 }
2231 } 2180 }
2232#ifdef MENUBAR
2233 else if (isMenuBarWindow (ev.window))
2234 menubar_control (ev);
2235#endif
2236} 2181}
2237 2182
2238#ifdef TRANSPARENT 2183#ifdef TRANSPARENT
2239#if TINTING 2184#if TINTING
2240/* taken from aterm-0.4.2 */ 2185/* taken from aterm-0.4.2 */
2241 2186
2242typedef uint32_t RUINT32T; 2187typedef uint32_t RUINT32T;
2243 2188
2244void 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)
2245{ 2190{
2246 int sh_r, sh_g, sh_b; 2191 int sh_r, sh_g, sh_b;
2247 RUINT32T mask_r, mask_g, mask_b; 2192 RUINT32T mask_r, mask_g, mask_b;
2248 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2193 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2249 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2194 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2250 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2195 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2251 int i; 2196 int i;
2252 2197
2253 Visual *visual = display->visual; 2198 Visual *visual = term->visual;
2254 2199
2255 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2200 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2256 2201
2257 /* for convenience */ 2202 /* for convenience */
2258 mask_r = visual->red_mask; 2203 mask_r = visual->red_mask;
… …
2479 Atom atype; 2424 Atom atype;
2480 unsigned char *prop = NULL; 2425 unsigned char *prop = NULL;
2481 Window root, oldp, *list; 2426 Window root, oldp, *list;
2482 Pixmap rootpixmap = None; 2427 Pixmap rootpixmap = None;
2483 XWindowAttributes wattr, wrootattr; 2428 XWindowAttributes wattr, wrootattr;
2484 dDisp;
2485 2429
2486 pchanged = 0; 2430 pchanged = 0;
2487 2431
2488 if (!OPTION (Opt_transparent)) 2432 if (!OPTION (Opt_transparent))
2489 return pchanged; /* Don't try any more */ 2433 return pchanged; /* Don't try any more */
2490 2434
2491 XGetWindowAttributes (disp, display->root, &wrootattr); 2435 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2492 rootdepth = wrootattr.depth; 2436 rootdepth = wrootattr.depth;
2493 2437
2494 XGetWindowAttributes (disp, parent[0], &wattr); 2438 XGetWindowAttributes (xdisp, parent[0], &wattr);
2495 2439
2496 if (rootdepth != wattr.depth) 2440 if (rootdepth != wattr.depth)
2497 { 2441 {
2498 if (am_transparent) 2442 if (am_transparent)
2499 { 2443 {
2500 pchanged = 1; 2444 pchanged = 1;
2501 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2445 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2502 am_transparent = am_pixmap_trans = 0; 2446 am_transparent = am_pixmap_trans = 0;
2503 } 2447 }
2504 2448
2505 return pchanged; /* Don't try any more */ 2449 return pchanged; /* Don't try any more */
2506 } 2450 }
2507 2451
2508 /* 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. */
2509 XSync (disp, False); 2453 XSync (xdisp, False);
2510 2454
2511 /* 2455 /*
2512 * Make the frame window set by the window manager have 2456 * Make the frame window set by the window manager have
2513 * the root background. Some window managers put multiple nested frame 2457 * the root background. Some window managers put multiple nested frame
2514 * 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.
2515 */ 2459 */
2516 i = (xa[XA_XROOTPMAP_ID] 2460 i = (xa[XA_XROOTPMAP_ID]
2517 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2461 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2518 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2462 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2519 &nitems, &bytes_after, &prop) == Success); 2463 &nitems, &bytes_after, &prop) == Success);
2520 2464
2521 if (!i || prop == NULL) 2465 if (!i || prop == NULL)
2522 i = (xa[XA_ESETROOT_PMAP_ID] 2466 i = (xa[XA_ESETROOT_PMAP_ID]
2523 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2467 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2524 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2468 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2525 &nitems, &bytes_after, &prop) == Success); 2469 &nitems, &bytes_after, &prop) == Success);
2526 2470
2527 if (!i || prop == NULL 2471 if (!i || prop == NULL
2528#if TINTING 2472#if TINTING
2529 || !rs[Rs_color + Color_tint] 2473 || !ISSET_PIXCOLOR (Color_tint)
2530#endif 2474#endif
2531 ) 2475 )
2532 have_pixmap = 0; 2476 have_pixmap = 0;
2533 else 2477 else
2534 { 2478 {
… …
2547 Window cr; 2491 Window cr;
2548 XImage *image; 2492 XImage *image;
2549 GC gc; 2493 GC gc;
2550 XGCValues gcvalue; 2494 XGCValues gcvalue;
2551 2495
2552 XTranslateCoordinates (disp, parent[0], display->root, 2496 XTranslateCoordinates (xdisp, parent[0], display->root,
2553 0, 0, &sx, &sy, &cr); 2497 0, 0, &sx, &sy, &cr);
2554 nw = (unsigned int)szHint.width; 2498 nw = (unsigned int)szHint.width;
2555 nh = (unsigned int)szHint.height; 2499 nh = (unsigned int)szHint.height;
2556 nx = ny = 0; 2500 nx = ny = 0;
2557 2501
… …
2570 } 2514 }
2571 2515
2572 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2516 min_it (nw, (unsigned int) (wrootattr.width - sx));
2573 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2517 min_it (nh, (unsigned int) (wrootattr.height - sy));
2574 2518
2575 XSync (disp, False); 2519 XSync (xdisp, False);
2576 allowedxerror = -1; 2520 allowedxerror = -1;
2577 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2521 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2578 2522
2579 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2523 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2580 /* XXX: may need a delay here? */ 2524 /* XXX: may need a delay here? */
2581 allowedxerror = 0; 2525 allowedxerror = 0;
2582 2526
… …
2585 if (am_transparent && am_pixmap_trans) 2529 if (am_transparent && am_pixmap_trans)
2586 { 2530 {
2587 pchanged = 1; 2531 pchanged = 1;
2588 if (pixmap != None) 2532 if (pixmap != None)
2589 { 2533 {
2590 XFreePixmap (disp, pixmap); 2534 XFreePixmap (xdisp, pixmap);
2591 pixmap = None; 2535 pixmap = None;
2592 } 2536 }
2593 } 2537 }
2594 2538
2595 am_pixmap_trans = 0; 2539 am_pixmap_trans = 0;
2596 } 2540 }
2597 else 2541 else
2598 { 2542 {
2599 if (pixmap != None) 2543 if (pixmap != None)
2600 XFreePixmap (disp, pixmap); 2544 XFreePixmap (xdisp, pixmap);
2601 2545
2602#if TINTING 2546#if TINTING
2603 if (ISSET_PIXCOLOR (Color_tint)) 2547 if (ISSET_PIXCOLOR (Color_tint))
2604 { 2548 {
2605 unsigned short rm, gm, bm;
2606 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2549 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2607 2550
2551 rgba c;
2608 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2552 pix_colors_focused [Color_tint].get (c);
2609 2553
2610 ShadeXImage (display, image, shade, rm, gm, bm); 2554 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2611 } 2555 }
2612#endif 2556#endif
2613 2557
2614 pixmap = XCreatePixmap (disp, vt, 2558 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2615 szHint.width, szHint.height, image->depth);
2616 gc = XCreateGC (disp, vt, 0UL, &gcvalue); 2559 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2617 XPutImage (disp, pixmap, gc, image, 0, 0, 2560 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2618 nx, ny, image->width, image->height); 2561 nx, ny, image->width, image->height);
2619 XFreeGC (disp, gc); 2562 XFreeGC (xdisp, gc);
2620 XDestroyImage (image); 2563 XDestroyImage (image);
2621 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2564 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2622 XClearWindow (disp, parent[0]); 2565 XClearWindow (xdisp, parent[0]);
2623 2566
2624 if (!am_transparent || !am_pixmap_trans) 2567 if (!am_transparent || !am_pixmap_trans)
2625 pchanged = 1; 2568 pchanged = 1;
2626 2569
2627 am_transparent = am_pixmap_trans = 1; 2570 am_transparent = am_pixmap_trans = 1;
2628 } 2571 }
2629 } 2572 }
2630 2573
2631 if (am_pixmap_trans) 2574 if (am_pixmap_trans)
2632 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2575 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2633 else 2576 else
2634 { 2577 {
2635 unsigned int n; 2578 unsigned int n;
2636 /* 2579 /*
2637 * InheritPixmap transparency 2580 * InheritPixmap transparency
2638 */ 2581 */
2639 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2582 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2640 { 2583 {
2641 oldp = parent[i]; 2584 oldp = parent[i];
2642 XQueryTree (disp, parent[i - 1], &root, 2585 XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2643 &parent[i], &list, &n);
2644 XFree (list); 2586 XFree (list);
2645 2587
2646 if (parent[i] == display->root) 2588 if (parent[i] == display->root)
2647 { 2589 {
2648 if (oldp != None) 2590 if (oldp != None)
… …
2656 } 2598 }
2657 2599
2658 n = 0; 2600 n = 0;
2659 2601
2660 if (pchanged) 2602 if (pchanged)
2661 {
2662 for (; n < (unsigned int)i; n++) 2603 for (; n < (unsigned int)i; n++)
2663 { 2604 {
2664 XGetWindowAttributes (disp, parent[n], &wattr); 2605 XGetWindowAttributes (xdisp, parent[n], &wattr);
2606
2665 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2607 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2666 { 2608 {
2667 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2609 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2668 break; 2610 break;
2669 } 2611 }
2670 } 2612 }
2671 }
2672 2613
2673 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2614 if (n > (sizeof (parent) / sizeof (parent[0])))
2674 { 2615 {
2675 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2616 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2676 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2617 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2677 am_transparent = 0; 2618 am_transparent = 0;
2678 /* XXX: also turn off Opt_transparent? */ 2619 /* XXX: also turn off Opt_transparent? */
2679 } 2620 }
2680 else 2621 else
2681 { 2622 {
2682#if WAIT_FOR_WM
2683 /* wait (an arbitrary period) for the WM to do its thing
2684 * needed for fvwm2.2.2 (and before?) */
2685 sleep (1);
2686#endif
2687 for (n = 0; n < (unsigned int)i; n++) 2623 for (n = 0; n < (unsigned int)i; n++)
2688 { 2624 {
2689 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2625 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2690 XClearWindow (disp, parent[n]); 2626 XClearWindow (xdisp, parent[n]);
2691 } 2627 }
2692 2628
2693 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2629 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2694 am_transparent = 1; 2630 am_transparent = 1;
2695 } 2631 }
2696 2632
2697 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2633 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2698 parent[i] = None; 2634 parent[i] = None;
2699 } 2635 }
2700 2636
2701 if (scrollBar.win) 2637 if (scrollBar.win)
2702 { 2638 {
2703 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2639 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2704 scrollBar.setIdle (); 2640 scrollBar.setIdle ();
2705 scrollbar_show (0); 2641 scrollbar_show (0);
2706 } 2642 }
2707 2643
2708 if (am_transparent) 2644 if (am_transparent)
… …
2720 2656
2721bool 2657bool
2722rxvt_term::cmd_parse () 2658rxvt_term::cmd_parse ()
2723{ 2659{
2724 bool flag = false; 2660 bool flag = false;
2725 unicode_t ch = NOCHAR; 2661 wchar_t ch = NOCHAR;
2726 char *seq_begin; // remember start of esc-sequence here 2662 char *seq_begin; // remember start of esc-sequence here
2727 2663
2728 for (;;) 2664 for (;;)
2729 { 2665 {
2730 if (ch == NOCHAR) 2666 if (ch == NOCHAR)
… …
2751 if (seen_resize && cmd_pid) 2687 if (seen_resize && cmd_pid)
2752 kill (-cmd_pid, SIGWINCH); 2688 kill (-cmd_pid, SIGWINCH);
2753 } 2689 }
2754 2690
2755 /* Read a text string from the input buffer */ 2691 /* Read a text string from the input buffer */
2756 unicode_t buf[UBUFSIZ]; 2692 wchar_t buf[UBUFSIZ];
2757 bool refreshnow = false; 2693 bool refreshnow = false;
2758 int nlines = 0; 2694 int nlines = 0;
2759 unicode_t *str = buf; 2695 wchar_t *str = buf;
2760 unicode_t *eol = str + min (ncol, UBUFSIZ); 2696 wchar_t *eol = str + min (ncol, UBUFSIZ);
2761 2697
2762 for (;;) 2698 for (;;)
2763 { 2699 {
2764 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))
2765 break; 2701 break;
… …
2783 } 2719 }
2784 2720
2785 // scr_add_lines only works for nlines <= nrow - 1. 2721 // scr_add_lines only works for nlines <= nrow - 1.
2786 if (nlines >= nrow - 1) 2722 if (nlines >= nrow - 1)
2787 { 2723 {
2724 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2788 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))))
2789 scr_add_lines (buf, nlines, str - buf); 2726 scr_add_lines (buf, str - buf, nlines);
2790 2727
2791 nlines = 0; 2728 nlines = 0;
2792 str = buf; 2729 str = buf;
2793 eol = str + min (ncol, UBUFSIZ); 2730 eol = str + min (ncol, UBUFSIZ);
2794 } 2731 }
… …
2808 2745
2809 seq_begin = cmdbuf_ptr; 2746 seq_begin = cmdbuf_ptr;
2810 ch = next_char (); 2747 ch = next_char ();
2811 } 2748 }
2812 2749
2750 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2813 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))))
2814 scr_add_lines (buf, nlines, str - buf); 2752 scr_add_lines (buf, str - buf, nlines);
2815 2753
2816 /* 2754 /*
2817 * 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
2818 * 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.
2819 * the number of pages between refreshes is refresh_limit, which 2757 * the number of pages between refreshes is refresh_limit, which
… …
2824 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2762 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2825 refresh_limit++; 2763 refresh_limit++;
2826 else 2764 else
2827 { 2765 {
2828 flag = true; 2766 flag = true;
2829 scr_refresh (refresh_type); 2767 scr_refresh ();
2830 flush_ev.stop (); 2768 want_refresh = 1;
2831 } 2769 }
2832 } 2770 }
2833 2771
2834 } 2772 }
2835 else 2773 else
… …
2850 } 2788 }
2851 2789
2852 return flag; 2790 return flag;
2853} 2791}
2854 2792
2855// read the next octet
2856unicode_t
2857rxvt_term::next_octet ()
2858{
2859 return cmdbuf_ptr < cmdbuf_endp
2860 ? *cmdbuf_ptr++
2861 : NOCHAR;
2862}
2863
2864// read the next character 2793// read the next character
2865unicode_t 2794wchar_t
2866rxvt_term::next_char () 2795rxvt_term::next_char () NOTHROW
2867{ 2796{
2868 while (cmdbuf_ptr < cmdbuf_endp) 2797 while (cmdbuf_ptr < cmdbuf_endp)
2869 { 2798 {
2870 // assume 7-bit to be ascii ALWAYS 2799 // assume 7-bit to be ascii ALWAYS
2871 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2800 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2880 cmdbuf_ptr = cmdbuf_endp; 2809 cmdbuf_ptr = cmdbuf_endp;
2881 break; 2810 break;
2882 } 2811 }
2883 2812
2884 if (len == (size_t)-1) 2813 if (len == (size_t)-1)
2885 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
2886 2815
2887 // assume wchar == unicode 2816 // assume wchar == unicode
2888 cmdbuf_ptr += len; 2817 cmdbuf_ptr += len;
2889 return wc & UNICODE_MASK; 2818 return wc & UNICODE_MASK;
2890 } 2819 }
2891 2820
2892 return NOCHAR; 2821 return NOCHAR;
2893} 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;
2894 2834
2895/* rxvt_cmd_getc () - Return next input character */ 2835/* rxvt_cmd_getc () - Return next input character */
2896/* 2836/*
2897 * Return the next input character after first passing any keyboard input 2837 * Return the next input character after first passing any keyboard input
2898 * to the command. 2838 * to the command.
2899 */ 2839 */
2900unicode_t 2840wchar_t
2901rxvt_term::cmd_getc () 2841rxvt_term::cmd_getc () THROW ((class out_of_input))
2902{ 2842{
2903 unicode_t c = next_char (); 2843 wchar_t c = next_char ();
2904 2844
2905 if (c == NOCHAR) 2845 if (c == NOCHAR)
2906 throw out_of_input; 2846 throw out_of_input;
2907 2847
2908 return c; 2848 return c;
2909} 2849}
2910 2850
2911unicode_t 2851uint32_t
2912rxvt_term::cmd_get8 () 2852rxvt_term::cmd_get8 () THROW ((class out_of_input))
2913{ 2853{
2914 unicode_t c = next_octet (); 2854 uint32_t c = next_octet ();
2915 2855
2916 if (c == NOCHAR) 2856 if (c == NOCHAR)
2917 throw out_of_input; 2857 throw out_of_input;
2918 2858
2919 return c; 2859 return c;
… …
3155 scr_charset_set (2, (unsigned int)cmd_getc ()); 3095 scr_charset_set (2, (unsigned int)cmd_getc ());
3156 break; 3096 break;
3157 case '+': 3097 case '+':
3158 scr_charset_set (3, (unsigned int)cmd_getc ()); 3098 scr_charset_set (3, (unsigned int)cmd_getc ());
3159 break; 3099 break;
3160#if ENABLE_FRILLS 3100#if !ENABLE_MINIMAL
3161 case '6': 3101 case '6':
3162 scr_backindex (); 3102 scr_backindex ();
3163 break; 3103 break;
3164#endif 3104#endif
3165 case '7': 3105 case '7':
3166 scr_cursor (SAVE); 3106 scr_cursor (SAVE);
3167 break; 3107 break;
3168 case '8': 3108 case '8':
3169 scr_cursor (RESTORE); 3109 scr_cursor (RESTORE);
3170 break; 3110 break;
3171#if ENABLE_FRILLS 3111#if !ENABLE_MINIMAL
3172 case '9': 3112 case '9':
3173 scr_forwardindex (); 3113 scr_forwardindex ();
3174 break; 3114 break;
3175#endif 3115#endif
3176 case '=': 3116 case '=':
… …
3186 break; 3126 break;
3187 3127
3188 /* 8.3.87: NEXT LINE */ 3128 /* 8.3.87: NEXT LINE */
3189 case C1_NEL: /* ESC E */ 3129 case C1_NEL: /* ESC E */
3190 { 3130 {
3191 unicode_t nlcr[] = { C0_LF, C0_CR }; 3131 wchar_t nlcr[] = { C0_LF, C0_CR };
3192 scr_add_lines (nlcr, 1, 2); 3132 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3193 } 3133 }
3194 break; 3134 break;
3195 3135
3196 /* kidnapped escape sequence: Should be 8.3.48 */ 3136 /* kidnapped escape sequence: Should be 8.3.48 */
3197 case C1_ESA: /* ESC G */ 3137 case C1_ESA: /* ESC G */
… …
3338 ndef = get_byte_array_bit (csi_defaults, i); 3278 ndef = get_byte_array_bit (csi_defaults, i);
3339 for (p = 0; p < nargs; p++) 3279 for (p = 0; p < nargs; p++)
3340 if (arg[p] == -1) 3280 if (arg[p] == -1)
3341 arg[p] = ndef; 3281 arg[p] = ndef;
3342 3282
3343#ifdef DEBUG_CMD
3344 fprintf (stderr, "CSI ");
3345 for (p = 0; p < nargs; p++)
3346 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3347 fprintf (stderr, "%c\n", ch);
3348#endif
3349
3350 /* 3283 /*
3351 * private mode handling 3284 * private mode handling
3352 */ 3285 */
3353 if (priv) 3286 if (priv)
3354 { 3287 {
3355 switch (priv) 3288 switch (priv)
3356 { 3289 {
3357 case '>': 3290 case '>':
3358 if (ch == CSI_DA) /* secondary device attributes */ 3291 if (ch == CSI_DA) /* secondary device attributes */
3359 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 }
3360 break; 3302 break;
3361 case '?': 3303 case '?':
3362 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3304 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3363 process_terminal_mode (ch, priv, nargs, arg); 3305 process_terminal_mode (ch, priv, nargs, arg);
3364 break; 3306 break;
… …
3567 break; 3509 break;
3568 case CSI_75: 3510 case CSI_75:
3569 scr_cursor (RESTORE); 3511 scr_cursor (RESTORE);
3570 break; 3512 break;
3571 3513
3572#if ENABLE_FRILLS 3514#if !ENABLE_MINIMAL
3573 case CSI_74: 3515 case CSI_74:
3574 process_window_ops (arg, nargs); 3516 process_window_ops (arg, nargs);
3575 break; 3517 break;
3576#endif 3518#endif
3577 3519
… …
3584 break; 3526 break;
3585 } 3527 }
3586} 3528}
3587/*}}} */ 3529/*}}} */
3588 3530
3589#if ENABLE_FRILLS 3531#if !ENABLE_MINIMAL
3590/* ARGSUSED */ 3532/* ARGSUSED */
3591void 3533void
3592rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3534rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3593{ 3535{
3594 int x, y; 3536 int x, y;
3595 XWindowAttributes wattr; 3537 XWindowAttributes wattr;
3596 Window wdummy; 3538 Window wdummy;
3597 dDisp; 3539
3540 dLocal (Display *, xdisp);
3598 3541
3599 if (nargs == 0) 3542 if (nargs == 0)
3600 return; 3543 return;
3601 3544
3602 switch (args[0]) 3545 switch (args[0])
3603 { 3546 {
3604 /* 3547 /*
3605 * commands 3548 * commands
3606 */ 3549 */
3607 case 1: /* deiconify window */ 3550 case 1: /* deiconify window */
3608 XMapWindow (disp, parent[0]); 3551 XMapWindow (xdisp, parent[0]);
3609 break; 3552 break;
3610 case 2: /* iconify window */ 3553 case 2: /* iconify window */
3611 XIconifyWindow (disp, parent[0], display->screen); 3554 XIconifyWindow (xdisp, parent[0], display->screen);
3612 break; 3555 break;
3613 case 3: /* set position (pixels) */ 3556 case 3: /* set position (pixels) */
3614 XMoveWindow (disp, parent[0], args[1], args[2]); 3557 XMoveWindow (xdisp, parent[0], args[1], args[2]);
3615 break; 3558 break;
3616 case 4: /* set size (pixels) */ 3559 case 4: /* set size (pixels) */
3617 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3560 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3618 break; 3561 break;
3619 case 5: /* raise window */ 3562 case 5: /* raise window */
3620 XRaiseWindow (disp, parent[0]); 3563 XRaiseWindow (xdisp, parent[0]);
3621 break; 3564 break;
3622 case 6: /* lower window */ 3565 case 6: /* lower window */
3623 XLowerWindow (disp, parent[0]); 3566 XLowerWindow (xdisp, parent[0]);
3624 break; 3567 break;
3625 case 7: /* refresh window */ 3568 case 7: /* refresh window */
3626 scr_touch (true); 3569 scr_touch (true);
3627 break; 3570 break;
3628 case 8: /* set size (chars) */ 3571 case 8: /* set size (chars) */
… …
3635 if (args[0] >= 24) /* set height (chars) */ 3578 if (args[0] >= 24) /* set height (chars) */
3636 set_widthheight ((unsigned int)width, 3579 set_widthheight ((unsigned int)width,
3637 (unsigned int) (args[1] * fheight)); 3580 (unsigned int) (args[1] * fheight));
3638 break; 3581 break;
3639 3582
3640
3641 /* 3583 /*
3642 * reports - some output format copied from XTerm 3584 * reports - some output format copied from XTerm
3643 */ 3585 */
3644 case 11: /* report window state */ 3586 case 11: /* report window state */
3645 XGetWindowAttributes (disp, parent[0], &wattr); 3587 XGetWindowAttributes (xdisp, parent[0], &wattr);
3646 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3588 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3647 break; 3589 break;
3648 case 13: /* report window position */ 3590 case 13: /* report window position */
3649 XGetWindowAttributes (disp, parent[0], &wattr); 3591 XGetWindowAttributes (xdisp, parent[0], &wattr);
3650 XTranslateCoordinates (disp, parent[0], wattr.root, 3592 XTranslateCoordinates (xdisp, parent[0], wattr.root,
3651 -wattr.border_width, -wattr.border_width, 3593 -wattr.border_width, -wattr.border_width,
3652 &x, &y, &wdummy); 3594 &x, &y, &wdummy);
3653 tt_printf ("\033[3;%d;%dt", x, y); 3595 tt_printf ("\033[3;%d;%dt", x, y);
3654 break; 3596 break;
3655 case 14: /* report window size (pixels) */ 3597 case 14: /* report window size (pixels) */
3656 XGetWindowAttributes (disp, parent[0], &wattr); 3598 XGetWindowAttributes (xdisp, parent[0], &wattr);
3657 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3599 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3658 break; 3600 break;
3659 case 18: /* report text area size (chars) */ 3601 case 18: /* report text area size (chars) */
3660 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3602 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3661 break; 3603 break;
… …
3663 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3605 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3664 break; 3606 break;
3665 case 20: /* report icon label */ 3607 case 20: /* report icon label */
3666 { 3608 {
3667 char *s; 3609 char *s;
3668 XGetIconName (disp, parent[0], &s); 3610 XGetIconName (xdisp, parent[0], &s);
3669 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 */
3670 XFree (s); 3612 XFree (s);
3671 } 3613 }
3672 break; 3614 break;
3673 case 21: /* report window title */ 3615 case 21: /* report window title */
3674 { 3616 {
3675 char *s; 3617 char *s;
3676 XFetchName (disp, parent[0], &s); 3618 XFetchName (xdisp, parent[0], &s);
3677 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 */
3678 XFree (s); 3620 XFree (s);
3679 } 3621 }
3680 break; 3622 break;
3681 } 3623 }
… …
3782void 3724void
3783rxvt_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)
3784{ 3726{
3785 if (str[0] == '?' && !str[1]) 3727 if (str[0] == '?' && !str[1])
3786 { 3728 {
3787 unsigned short r, g, b; 3729 rgba c;
3788 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
3789 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);
3790 } 3738 }
3791 else 3739 else
3792 set_window_color (color, str); 3740 set_window_color (color, str);
3793} 3741}
3794 3742
… …
3796 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3744 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3797 */ 3745 */
3798void 3746void
3799rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3747rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3800{ 3748{
3801 int changed = 0;
3802 int color; 3749 int color;
3803 char *buf, *name; 3750 char *buf, *name;
3804 bool query = str[0] == '?' && !str[1]; 3751 bool query = str[0] == '?' && !str[1];
3805 int saveop = op; 3752 int saveop = op;
3806 dDisp; 3753
3754 dLocal (Display *, xdisp);
3807 3755
3808 assert (str != NULL); 3756 assert (str != NULL);
3809 switch (op) 3757 switch (op)
3810 { 3758 {
3811 case XTerm_name: 3759 case XTerm_name:
… …
3827 unsigned long bytes_after; 3775 unsigned long bytes_after;
3828 unsigned char *value = 0; 3776 unsigned char *value = 0;
3829 const char *str = ""; 3777 const char *str = "";
3830 3778
3831 if (prop 3779 if (prop
3832 && XGetWindowProperty (disp, parent[0], 3780 && XGetWindowProperty (xdisp, parent[0],
3833 prop, 0, 1<<16, 0, AnyPropertyType, 3781 prop, 0, 1<<16, 0, AnyPropertyType,
3834 &actual_type, &actual_format, 3782 &actual_type, &actual_format,
3835 &nitems, &bytes_after, &value) == Success 3783 &nitems, &bytes_after, &value) == Success
3836 && actual_type != None 3784 && actual_type != None
3837 && actual_format == 8) 3785 && actual_format == 8)
3838 str = (const char *)(value); 3786 str = (const char *)(value);
3839 3787
3840 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3788 tt_printf ("\033]%d;%s%c", op, str, resp);
3841 3789
3842 XFree (value); 3790 XFree (value);
3843 } 3791 }
3844 else 3792 else
3845 { 3793 {
… …
3849 { 3797 {
3850 *eq = 0; 3798 *eq = 0;
3851 set_utf8_property (display->atom (str), eq + 1); 3799 set_utf8_property (display->atom (str), eq + 1);
3852 } 3800 }
3853 else 3801 else
3854 XDeleteProperty (disp, parent[0], 3802 XDeleteProperty (xdisp, parent[0],
3855 display->atom (str)); 3803 display->atom (str));
3856 } 3804 }
3857 break; 3805 break;
3858 3806
3859 case XTerm_Color: 3807 case XTerm_Color:
… …
3861 { 3809 {
3862 if ((name = strchr (buf, ';')) == NULL) 3810 if ((name = strchr (buf, ';')) == NULL)
3863 break; 3811 break;
3864 3812
3865 *name++ = '\0'; 3813 *name++ = '\0';
3866 color = atoi (buf); 3814 color = atoi (buf) + minCOLOR;
3867 3815
3868 if (color < 0 || color >= TOTAL_COLORS) 3816 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3869 break; 3817 break;
3870 3818
3871 if ((buf = strchr (name, ';')) != NULL) 3819 if ((buf = strchr (name, ';')) != NULL)
3872 *buf++ = '\0'; 3820 *buf++ = '\0';
3873 3821
3874 if (name[0] == '?' && !name[1]) 3822 process_color_seq (op, color, name, resp);
3875 {
3876 unsigned short r, g, b;
3877 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3878 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3879 }
3880 else
3881 set_window_color (color + minCOLOR, name);
3882 } 3823 }
3883 break; 3824 break;
3884 case XTerm_Color00: 3825 case XTerm_Color00:
3885 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3826 process_color_seq (op, Color_fg, str, resp);
3886 break; 3827 break;
3887 case XTerm_Color01: 3828 case XTerm_Color01:
3888 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3829 process_color_seq (op, Color_bg, str, resp);
3889 break; 3830 break;
3890#ifndef NO_CURSORCOLOR 3831#ifndef NO_CURSORCOLOR
3891 case XTerm_Color_cursor: 3832 case XTerm_Color_cursor:
3892 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3833 process_color_seq (op, Color_cursor, str, resp);
3893 break; 3834 break;
3894#endif 3835#endif
3895 case XTerm_Color_pointer_fg: 3836 case XTerm_Color_pointer_fg:
3896 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3837 process_color_seq (op, Color_pointer_fg, str, resp);
3897 break; 3838 break;
3898 case XTerm_Color_pointer_bg: 3839 case XTerm_Color_pointer_bg:
3899 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3840 process_color_seq (op, Color_pointer_bg, str, resp);
3900 break; 3841 break;
3901#ifndef NO_BOLD_UNDERLINE_REVERSE 3842#ifndef NO_BOLD_UNDERLINE_REVERSE
3902 case XTerm_Color_BD:
3903 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3904 break;
3905 case XTerm_Color_UL:
3906 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3907 break;
3908 case XTerm_Color_RV: 3843 case XTerm_Color_RV:
3909 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);
3910 break; 3853 break;
3911 case URxvt_Color_IT: 3854 case URxvt_Color_IT:
3912 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3855 process_color_seq (op, Color_IT, str, resp);
3913 break; 3856 break;
3914#endif 3857#endif
3915#if TRANSPARENT && TINTING 3858#if TRANSPARENT && TINTING
3916 case URxvt_Color_tint: 3859 case URxvt_Color_tint:
3917 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3860 process_color_seq (op, Color_tint, str, resp);
3861
3918 check_our_parents (); 3862 check_our_parents ();
3863
3919 if (am_transparent) 3864 if (am_transparent)
3920 want_full_refresh = want_refresh = 1; 3865 want_full_refresh = want_refresh = 1;
3921 break;
3922#endif
3923 3866
3867 break;
3868#endif
3869
3924 case XTerm_Pixmap: 3870 case Rxvt_Pixmap:
3871 {
3925 if (*str != ';') 3872 if (*str != ';')
3926 { 3873 {
3927#if XPM_BACKGROUND 3874#if XPM_BACKGROUND
3928 scale_pixmap (""); /* reset to default scaling */ 3875 scale_pixmap (""); /* reset to default scaling */
3929 set_bgPixmap (str); /* change pixmap */ 3876 set_bgPixmap (str); /* change pixmap */
3930#endif
3931 scr_touch (true); 3877 scr_touch (true);
3878#endif
3932 } 3879 }
3880
3881 int changed = 0;
3882
3933 while ((str = strchr (str, ';')) != NULL) 3883 while ((str = strchr (str, ';')) != NULL)
3934 { 3884 {
3935 str++; 3885 str++;
3936#if XPM_BACKGROUND 3886#if XPM_BACKGROUND
3937 changed += scale_pixmap (str); 3887 changed += scale_pixmap (str);
3938#endif 3888#endif
3939 } 3889 }
3940 3890
3941 if (changed) 3891 if (changed)
3942 { 3892 {
3943#ifdef XPM_BACKGROUND 3893#ifdef XPM_BACKGROUND
3944 resize_pixmap (); 3894 resize_pixmap ();
3945#endif
3946 scr_touch (true); 3895 scr_touch (true);
3896#endif
3947 } 3897 }
3898 }
3948 break; 3899 break;
3949 3900
3950 case XTerm_restoreFG: 3901 case Rxvt_restoreFG:
3951 set_window_color (Color_fg, str); 3902 set_window_color (Color_fg, str);
3952 break; 3903 break;
3953 case XTerm_restoreBG: 3904 case Rxvt_restoreBG:
3954 set_window_color (Color_bg, str); 3905 set_window_color (Color_bg, str);
3955 break; 3906 break;
3956 3907
3957 case XTerm_logfile: 3908 case XTerm_logfile:
3958 // TODO, when secure mode? 3909 // TODO, when secure mode?
3959 break; 3910 break;
3960 3911
3961#ifdef MENUBAR
3962 case URxvt_Menu:
3963 if (OPTION (Opt_insecure))
3964 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3965 break;
3966#endif
3967#if 0 3912#if 0
3968 case XTerm_dumpscreen: /* no error notices */ 3913 case Rxvt_dumpscreen: /* no error notices */
3969 { 3914 {
3970 int fd; 3915 int fd;
3971 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)
3972 { 3917 {
3973 scr_dump (fd); 3918 scr_dump (fd);
… …
3997 allocated.push_back ((void *)res); 3942 allocated.push_back ((void *)res);
3998 set_fonts (); 3943 set_fonts ();
3999 } 3944 }
4000 break; 3945 break;
4001 3946
4002#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
4003 case URxvt_locale: 3956 case URxvt_locale:
4004 if (query) 3957 if (query)
4005 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);
4006 else 3959 else
4007 { 3960 {
4008 set_locale (str); 3961 set_locale (str);
4009 pty.set_utf8_mode (enc_utf8); 3962 pty->set_utf8_mode (enc_utf8);
4010 init_xlocale (); 3963 init_xlocale ();
4011 } 3964 }
4012 break; 3965 break;
4013 3966
4014 case URxvt_view_up: 3967 case URxvt_view_up:
… …
4025 break; 3978 break;
4026#endif 3979#endif
4027 3980
4028#if ENABLE_PERL 3981#if ENABLE_PERL
4029 case URxvt_perl: 3982 case URxvt_perl:
4030 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)))
4031 ; // no responses yet 3984 ; // no responses yet
4032 break; 3985 break;
4033#endif 3986#endif
4034 } 3987 }
4035} 3988}
… …
4067 return state; 4020 return state;
4068} 4021}
4069 4022
4070/* we're not using priv _yet_ */ 4023/* we're not using priv _yet_ */
4071void 4024void
4072rxvt_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)
4073{ 4026{
4074 unsigned int i, j; 4027 unsigned int i, j;
4075 int state; 4028 int state;
4076 4029
4077 static const struct 4030 static const struct
… …
4088 { 5, PrivMode_rVideo }, 4041 { 5, PrivMode_rVideo },
4089 { 6, PrivMode_relOrigin }, 4042 { 6, PrivMode_relOrigin },
4090 { 7, PrivMode_Autowrap }, 4043 { 7, PrivMode_Autowrap },
4091 // 8, bi-directional support mode 4044 // 8, bi-directional support mode
4092 { 9, PrivMode_MouseX10 }, 4045 { 9, PrivMode_MouseX10 },
4093#ifdef menuBar_esc
4094 { menuBar_esc, PrivMode_menuBar },
4095#endif
4096 // 18, 19 printing-related 4046 // 18, 19 printing-related
4097 { 25, PrivMode_VisibleCursor }, 4047 { 25, PrivMode_VisibleCursor },
4098#ifdef scrollBar_esc 4048#ifdef scrollBar_esc
4099 { scrollBar_esc, PrivMode_scrollBar }, 4049 { scrollBar_esc, PrivMode_scrollBar },
4100#endif 4050#endif
… …
4147 /* extra handling for values with state unkept */ 4097 /* extra handling for values with state unkept */
4148 switch (arg[i]) 4098 switch (arg[i])
4149 { 4099 {
4150#if ENABLE_STYLES 4100#if ENABLE_STYLES
4151 case 1021: 4101 case 1021:
4152 if (mode) 4102 set_option (Opt_intensityStyles, mode);
4153 SET_OPTION (Opt_intensityStyles);
4154 else
4155 CLR_OPTION (Opt_intensityStyles);
4156 4103
4157 scr_touch (true); 4104 scr_touch (true);
4158 break; 4105 break;
4159#endif 4106#endif
4160 case 1048: /* alternative cursor save */ 4107 case 1048: /* alternative cursor save */
… …
4182 case 3: /* 80/132 */ 4129 case 3: /* 80/132 */
4183 if (priv_modes & PrivMode_132OK) 4130 if (priv_modes & PrivMode_132OK)
4184 set_widthheight (((state ? 132 : 80) * fwidth), height); 4131 set_widthheight (((state ? 132 : 80) * fwidth), height);
4185 break; 4132 break;
4186 case 4: /* smooth scrolling */ 4133 case 4: /* smooth scrolling */
4187 if (!state) 4134 set_option (Opt_jumpScroll, !state);
4188 SET_OPTION (Opt_jumpScroll);
4189 else
4190 CLR_OPTION (Opt_jumpScroll);
4191 break; 4135 break;
4192 case 5: /* reverse video */ 4136 case 5: /* reverse video */
4193 scr_rvideo_mode (state); 4137 scr_rvideo_mode (state);
4194 break; 4138 break;
4195 case 6: /* relative/absolute origins */ 4139 case 6: /* relative/absolute origins */
… …
4201 /* 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 */
4202 case 9: /* X10 mouse reporting */ 4146 case 9: /* X10 mouse reporting */
4203 if (state) /* orthogonal */ 4147 if (state) /* orthogonal */
4204 priv_modes &= ~PrivMode_MouseX11; 4148 priv_modes &= ~PrivMode_MouseX11;
4205 break; 4149 break;
4206#ifdef menuBar_esc
4207 case menuBar_esc:
4208#ifdef MENUBAR
4209 map_menuBar (state);
4210#endif
4211 break;
4212#endif
4213#ifdef scrollBar_esc 4150#ifdef scrollBar_esc
4214 case scrollBar_esc: 4151 case scrollBar_esc:
4215 if (scrollbar_mapping (state)) 4152 if (scrollbar_mapping (state))
4216 { 4153 {
4217 resize_all_windows (0, 0, 0); 4154 resize_all_windows (0, 0, 0);
… …
4236#if 0 4173#if 0
4237 case 1001: 4174 case 1001:
4238 break; /* X11 mouse highlighting */ 4175 break; /* X11 mouse highlighting */
4239#endif 4176#endif
4240 case 1010: /* scroll to bottom on TTY output inhibit */ 4177 case 1010: /* scroll to bottom on TTY output inhibit */
4241 if (!state) 4178 set_option (Opt_scrollTtyOutput, !state);
4242 SET_OPTION (Opt_scrollTtyOutput);
4243 else
4244 CLR_OPTION (Opt_scrollTtyOutput);
4245 break; 4179 break;
4246 case 1011: /* scroll to bottom on key press */ 4180 case 1011: /* scroll to bottom on key press */
4247 if (state) 4181 set_option (Opt_scrollTtyKeypress, state);
4248 SET_OPTION (Opt_scrollTtyKeypress);
4249 else
4250 CLR_OPTION (Opt_scrollTtyKeypress);
4251 break; 4182 break;
4252 case 1047: /* secondary screen w/ clearing last */ 4183 case 1047: /* secondary screen w/ clearing last */
4253 if (OPTION (Opt_secondaryScreen)) 4184 if (OPTION (Opt_secondaryScreen))
4254 if (current_screen != PRIMARY) 4185 if (current_screen != PRIMARY)
4255 scr_erase_screen (2); 4186 scr_erase_screen (2);
… …
4393 scr_color (Color_bg, Color_bg); 4324 scr_color (Color_bg, Color_bg);
4394 break; 4325 break;
4395 4326
4396 //case 50: // not variable spacing 4327 //case 50: // not variable spacing
4397 4328
4398#if ENABLE_FRILLS 4329#if !ENABLE_MINIMAL
4399 case 90: 4330 case 90:
4400 case 91: /* set bright fg color */ 4331 case 91: /* set bright fg color */
4401 case 92: 4332 case 92:
4402 case 93: 4333 case 93:
4403 case 94: 4334 case 94:
… …
4465const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4396const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4466 4397
4467void 4398void
4468rxvt_term::tt_write (const char *data, unsigned int len) 4399rxvt_term::tt_write (const char *data, unsigned int len)
4469{ 4400{
4470 if (pty.pty < 0) 4401 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4471 return; 4402 return;
4472 4403
4404 if (pty->pty < 0)
4405 return;
4406
4473 if (v_buflen == 0) 4407 if (v_buflen == 0)
4474 { 4408 {
4475 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));
4476 4410
4477 if ((unsigned int)written == len) 4411 if ((unsigned int)written == len)
4478 return; 4412 return;
4479 4413
4480 data += written; 4414 data += written;
… …
4489 pty_ev.set (EVENT_READ | EVENT_WRITE); 4423 pty_ev.set (EVENT_READ | EVENT_WRITE);
4490} 4424}
4491 4425
4492void rxvt_term::pty_write () 4426void rxvt_term::pty_write ()
4493{ 4427{
4494 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));
4495 4429
4496 if (written > 0) 4430 if (written > 0)
4497 { 4431 {
4498 v_buflen -= written; 4432 v_buflen -= written;
4499 4433

Diff Legend

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