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.303 by root, Tue Jan 31 21:47:56 2006 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
49#include "rxvt.h" 49#include "rxvt.h"
50#include "rxvtperl.h" 50#include "rxvtperl.h"
51#include "version.h" 51#include "version.h"
52#include "command.h" 52#include "command.h"
53 53
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE 54#ifdef KEYSYM_RESOURCE
60# include "keyboard.h" 55# include "keyboard.h"
61#endif 56#endif
62 57
63#include <csignal> 58#include <csignal>
64 59
60#if LINUX_YIELD_HACK
61# include <ctime>
62#endif
63
65/*----------------------------------------------------------------------*/ 64/*----------------------------------------------------------------------*/
66 65
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68
69// exception thrown when the command parser runs out of input data
70class out_of_input { } out_of_input;
71 67
72#if ENABLE_FRILLS || ISO_14755 68#if ENABLE_FRILLS || ISO_14755
73 69
74#define ISO_14755_STARTED 0x80000000UL 70#define ISO_14755_STARTED 0x80000000UL
75#define ISO_14755_51 0x40000000UL // basic (section 5.1) 71#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
147 || !IN_RANGE_EXC (y, 0, nrow)) 143 || !IN_RANGE_EXC (y, 0, nrow))
148 return; 144 return;
149 145
150 for (;;) 146 for (;;)
151 { 147 {
152 const line_t &l = ROW(y - view_start); 148 const line_t &l = ROW(y + view_start);
153 149
154 text_t t = l.t[x]; 150 text_t t = l.t[x];
155 151
156 if (t != NOCHAR || !x) 152 if (t != NOCHAR || !x)
157 { 153 {
… …
230# if !UNICODE3 226# if !UNICODE3
231 if (ch >= 0x10000) 227 if (ch >= 0x10000)
232 ch = 0xfffd; 228 ch = 0xfffd;
233# endif 229# endif
234 scr_overlay_set (11, y, ch, r); 230 scr_overlay_set (11, y, ch, r);
231
232 if (WCWIDTH (ch) >= 2)
235 scr_overlay_set (12, y, NOCHAR, r); 233 scr_overlay_set (12, y, NOCHAR, r);
236 } 234 }
237 235
236// {
237// char buf[4+4+3+1];
238// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
239// scr_overlay_set (0, 0, buf);
240// }
238 scr_overlay_set (0, len , attr); 241 scr_overlay_set (0, len , attr);
239 scr_overlay_set (0, len + 1, fname); 242 scr_overlay_set (0, len + 1, fname);
240 243
241 free (fname); 244 free (fname);
242 245
… …
302rxvt_term::lookup_key (XKeyEvent &ev) 305rxvt_term::lookup_key (XKeyEvent &ev)
303{ 306{
304 int ctrl, meta, shft, len; 307 int ctrl, meta, shft, len;
305 unsigned int newlen; 308 unsigned int newlen;
306 KeySym keysym; 309 KeySym keysym;
307#ifdef DEBUG_CMD
308 static int debug_key = 1; /* accessible by a debugger only */
309#endif
310 int valid_keysym; 310 int valid_keysym;
311 char kbuf[KBUFSZ]; 311 char kbuf[KBUFSZ];
312 312
313 /* 313 /*
314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
… …
443 scr_move_to (0, 1); 443 scr_move_to (0, 1);
444 return; 444 return;
445 } 445 }
446 else if (keysym == XK_End) 446 else if (keysym == XK_End)
447 { 447 {
448 scr_move_to (1, 0); 448 scr_move_to (1, 1);
449 return; 449 return;
450 } 450 }
451 } 451 }
452#endif 452#endif
453 } 453 }
… …
464 { 464 {
465 switch (keysym) 465 switch (keysym)
466 { 466 {
467 /* normal XTerm key bindings */ 467 /* normal XTerm key bindings */
468 case XK_Insert: /* Shift+Insert = paste mouse selection */ 468 case XK_Insert: /* Shift+Insert = paste mouse selection */
469 selection_request (ev.time, 0, 0); 469 selection_request (ev.time);
470 return; 470 return;
471#if TODO 471#if TODO
472 /* rxvt extras */ 472 /* rxvt extras */
473 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 473 case XK_KP_Add: /* Shift+KP_Add = bigger font */
474 change_font (FONT_UP); 474 change_font (FONT_UP);
… …
867#endif 867#endif
868 /* nil */ ; 868 /* nil */ ;
869 } 869 }
870 } 870 }
871 871
872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_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.
1109
1110 struct timespec ts = { 0, 0 };
1111 nanosleep (&ts, 0);
1112
1126 w.stop (); 1113 w.stop ();
1127 } 1114 }
1128 1115
1129 event_handler () 1116 event_handler ()
1130 : cw_yield (this, &event_handler::yield) 1117 : yield_ev (this, &event_handler::yield_cb)
1131 { 1118 {
1132 } 1119 }
1133} event_handler; 1120} event_handler;
1134#endif 1121#endif
1135 1122
… …
1146 1133
1147 memmove (cmdbuf_base, cmdbuf_ptr, n); 1134 memmove (cmdbuf_base, cmdbuf_ptr, n);
1148 cmdbuf_ptr = cmdbuf_base; 1135 cmdbuf_ptr = cmdbuf_base;
1149 cmdbuf_endp = cmdbuf_ptr + n; 1136 cmdbuf_endp = cmdbuf_ptr + n;
1150 1137
1151 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1138 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1152 1139
1153 if (r > 0) 1140 if (r > 0)
1154 { 1141 {
1155 cmdbuf_endp += r; 1142 cmdbuf_endp += r;
1156 return true; 1143 return true;
1157 } 1144 }
1158 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1145 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1159 { 1146 {
1160#if HAVE_SCHED_YIELD 1147#if LINUX_YIELD_HACK
1161 if (display->is_local) 1148 if (display->is_local)
1162 event_handler.cw_yield.start (); 1149 event_handler.yield_ev.start ();
1163#endif 1150#endif
1164 } 1151 }
1165 else 1152 else
1166 { 1153 {
1167 pty_ev.stop (); 1154 pty_ev.stop ();
… …
1174} 1161}
1175 1162
1176void 1163void
1177rxvt_term::pty_cb (io_watcher &w, short revents) 1164rxvt_term::pty_cb (io_watcher &w, short revents)
1178{ 1165{
1179 SET_R (this); 1166 make_current ();
1180 SET_LOCALE (locale);
1181 1167
1182 if (revents & EVENT_READ) 1168 if (revents & EVENT_READ)
1183 // loop, but don't allow a single term to monopolize us 1169 // loop, but don't allow a single term to monopolize us
1184 while (pty_fill ()) 1170 while (pty_fill ())
1185 if (cmd_parse ()) 1171 if (cmd_parse ())
… …
1190} 1176}
1191 1177
1192void 1178void
1193rxvt_term::pointer_unblank () 1179rxvt_term::pointer_unblank ()
1194{ 1180{
1195 XDefineCursor (display->display, vt, TermWin_cursor); 1181 XDefineCursor (xdisp, vt, TermWin_cursor);
1196 recolour_cursor (); 1182 recolour_cursor ();
1197 1183
1198#ifdef POINTER_BLANK 1184#ifdef POINTER_BLANK
1199 hidden_pointer = 0; 1185 hidden_pointer = 0;
1200 1186
… …
1208rxvt_term::pointer_blank () 1194rxvt_term::pointer_blank ()
1209{ 1195{
1210 if (!OPTION (Opt_pointerBlank)) 1196 if (!OPTION (Opt_pointerBlank))
1211 return; 1197 return;
1212 1198
1213 XDefineCursor (display->display, vt, display->blank_cursor); 1199 XDefineCursor (xdisp, vt, display->blank_cursor);
1214 XFlush (display->display); 1200 XFlush (xdisp);
1215 1201
1216 hidden_pointer = 1; 1202 hidden_pointer = 1;
1217} 1203}
1218 1204
1219void 1205void
1220rxvt_term::pointer_cb (time_watcher &w) 1206rxvt_term::pointer_cb (time_watcher &w)
1221{ 1207{
1222 SET_R (this); 1208 make_current ();
1223 SET_LOCALE (locale);
1224 1209
1225 pointer_blank (); 1210 pointer_blank ();
1226} 1211}
1227#endif 1212#endif
1228 1213
… …
1293 (32 + button_number + key_state), 1278 (32 + button_number + key_state),
1294 (32 + x + 1), 1279 (32 + x + 1),
1295 (32 + y + 1)); 1280 (32 + y + 1));
1296} 1281}
1297 1282
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 */ 1283/*{{{ process an X event */
1309void 1284void
1310rxvt_term::x_cb (XEvent &ev) 1285rxvt_term::x_cb (XEvent &ev)
1311{ 1286{
1312 dDisp; 1287 make_current ();
1313 1288
1314 SET_R (this); 1289 dLocal (Display *, xdisp);
1315 SET_LOCALE (locale);
1316 1290
1317#if defined(CURSOR_BLINK) 1291 if (ev.xany.window == vt
1318 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1292 && SHOULD_INVOKE (HOOK_X_EVENT)
1319 { 1293 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1320 if (hidden_cursor) 1294 return;
1321 {
1322 hidden_cursor = 0;
1323 want_refresh = 1;
1324 }
1325 1295
1326 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1296 // 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; 1297 Window unused_root, unused_child;
1345 int unused_root_x, unused_root_y; 1298 int unused_root_x, unused_root_y;
1346 unsigned int unused_mask; 1299 unsigned int unused_mask;
1347 1300
1348 switch (ev.type) 1301 switch (ev.type)
… …
1355 1308
1356 break; 1309 break;
1357 1310
1358 case KeyRelease: 1311 case KeyRelease:
1359 { 1312 {
1360#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1313#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1361 KeySym ks; 1314 KeySym keysym;
1362 1315
1363 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1316 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1364#endif 1317#endif
1365 1318
1366#if ENABLE_FRILLS || ISO_14755 1319#if ENABLE_FRILLS || ISO_14755
1367 // ISO 14755 support 1320 // ISO 14755 support
1368 if (iso14755buf) 1321 if (iso14755buf)
… …
1373# endif 1326# endif
1374# if ISO_14755 1327# if ISO_14755
1375 // iso14755 part 5.2 handling: release time 1328 // iso14755 part 5.2 handling: release time
1376 // first: controls 1329 // first: controls
1377 if ((ev.xkey.state & ControlMask) 1330 if ((ev.xkey.state & ControlMask)
1378 && ((ks >= 0x40 && ks <= 0x5f) 1331 && ((keysym >= 0x40 && keysym <= 0x5f)
1379 || (ks >= 0x61 && ks <= 0x7f))) 1332 || (keysym >= 0x61 && keysym <= 0x7f)))
1380 { 1333 {
1381 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1334 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1382 commit_iso14755 (); 1335 commit_iso14755 ();
1383 return; // case-break; 1336 goto skip_switch;
1384 } 1337 }
1385 1338
1386 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1339 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1387 if (i[0] == ks) 1340 if (i[0] == keysym)
1388 { 1341 {
1389 iso14755buf = ISO_14755_51 | i[1]; 1342 iso14755buf = ISO_14755_51 | i[1];
1390 commit_iso14755 (); 1343 commit_iso14755 ();
1391 return; // case-break; 1344 goto skip_switch;
1392 } 1345 }
1393 1346
1394 scr_bell (); 1347 scr_bell ();
1395# endif 1348# endif
1396 iso14755buf = 0; 1349 iso14755buf = 0;
… …
1415 else 1368 else
1416 iso14755buf = 0; 1369 iso14755buf = 0;
1417 } 1370 }
1418#endif 1371#endif
1419 1372
1373 if (ev.xany.window == vt
1420 if (ev.xany.window == vt && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END))) 1374 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1421 break; 1375 break;
1422 1376
1423#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1377#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1424 if (!(ev.xkey.state & ControlMask)) 1378 if (!(ev.xkey.state & ControlMask))
1425 slip_wheel_ev.stop (); 1379 slip_wheel_ev.stop ();
1426 else if (ks == XK_Control_L || ks == XK_Control_R) 1380 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1427 mouse_slip_wheel_speed = 0; 1381 mouse_slip_wheel_speed = 0;
1428#endif 1382#endif
1429 break; 1383 break;
1430 } 1384 }
1431 1385
… …
1437 button_release (ev.xbutton); 1391 button_release (ev.xbutton);
1438 break; 1392 break;
1439 1393
1440 case ClientMessage: 1394 case ClientMessage:
1441 if (ev.xclient.format == 32 1395 if (ev.xclient.format == 32
1442 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1396 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1443 { 1397 {
1398 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1399 {
1400 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1401 {
1444 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1402 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1403 {
1404 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1445 destroy (); 1405 destroy ();
1406 }
1446#if ENABLE_EWMH 1407#if ENABLE_EWMH
1447 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1408 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1448 XSendEvent (disp, ev.xclient.window = display->root, 1409 XSendEvent (xdisp, ev.xclient.window = display->root,
1449 False, SubstructureRedirectMask | SubstructureNotifyMask, 1410 False, SubstructureRedirectMask | SubstructureNotifyMask,
1450 &ev); 1411 &ev);
1412#endif
1413 }
1414 }
1415#if ENABLE_XEMBED
1416 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1417 {
1418 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1419 focus_in ();
1420 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1421 focus_out ();
1422 }
1451#endif 1423#endif
1452 } 1424 }
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; 1425 break;
1489 1426
1490 case MappingNotify: 1427 case MappingNotify:
1491 XRefreshKeyboardMapping (&ev.xmapping); 1428 XRefreshKeyboardMapping (&ev.xmapping);
1492 break; 1429 break;
… …
1525 break; 1462 break;
1526 1463
1527 case ConfigureNotify: 1464 case ConfigureNotify:
1528 if (ev.xconfigure.window == parent[0]) 1465 if (ev.xconfigure.window == parent[0])
1529 { 1466 {
1530 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1467 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1531 ; 1468 ;
1532 1469
1533 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1470 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1534 { 1471 {
1535 seen_resize = 1; 1472 seen_resize = 1;
1536 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1473 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1537 } 1474 }
1538 1475
1476 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1477
1539#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1478#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1540 if (OPTION (Opt_transparent)) 1479 if (OPTION (Opt_transparent))
1541 check_our_parents (); 1480 check_our_parents ();
1542#endif 1481#endif
1543 } 1482 }
1544 break; 1483 break;
1545 1484
1546 case PropertyNotify: 1485 case PropertyNotify:
1486 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1547 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1487 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1548 && ev.xproperty.state == PropertyNewValue) 1488 && ev.xproperty.state == PropertyNewValue)
1549 selection_property (ev.xproperty.window, ev.xproperty.atom); 1489 selection_property (ev.xproperty.window, ev.xproperty.atom);
1550 1490
1551 break; 1491 break;
1552 1492
1553 case SelectionClear: 1493 case SelectionClear:
1554 selection_clear (); 1494 selection_clear ();
… …
1559 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1499 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1560 break; 1500 break;
1561 1501
1562 case SelectionRequest: 1502 case SelectionRequest:
1563 selection_send (ev.xselectionrequest); 1503 selection_send (ev.xselectionrequest);
1504 break;
1505
1506 case MapNotify:
1507 mapped = 1;
1508#ifdef TEXT_BLINK
1509 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1510#endif
1511 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1564 break; 1512 break;
1565 1513
1566 case UnmapNotify: 1514 case UnmapNotify:
1567 mapped = 0; 1515 mapped = 0;
1568#ifdef TEXT_BLINK 1516#ifdef TEXT_BLINK
1569 text_blink_ev.stop (); 1517 text_blink_ev.stop ();
1570#endif 1518#endif
1571 break; 1519 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; 1520 break;
1579 1521
1580#ifdef TRANSPARENT 1522#ifdef TRANSPARENT
1581 case ReparentNotify: 1523 case ReparentNotify:
1582 rootwin_cb (ev); 1524 rootwin_cb (ev);
… …
1588 if (ev.xany.window == vt) 1530 if (ev.xany.window == vt)
1589 { 1531 {
1590 do 1532 do
1591 scr_expose (ev.xexpose.x, ev.xexpose.y, 1533 scr_expose (ev.xexpose.x, ev.xexpose.y,
1592 ev.xexpose.width, ev.xexpose.height, False); 1534 ev.xexpose.width, ev.xexpose.height, False);
1593 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1535 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1594 1536
1595 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1537 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1596 1538
1597 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1539 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1598 scr_expose (ev.xexpose.x, ev.xexpose.y, 1540 scr_expose (ev.xexpose.x, ev.xexpose.y,
1599 ev.xexpose.width, ev.xexpose.height, False); 1541 ev.xexpose.width, ev.xexpose.height, False);
1600 1542
1601 scr_refresh (refresh_type); 1543 want_refresh = 1;
1602 } 1544 }
1603 else 1545 else
1604 { 1546 {
1605 XEvent unused_event; 1547 XEvent unused_event;
1606 1548
1607 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1549 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1608 ; 1550 ;
1609 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1551 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1610 ; 1552 ;
1611 1553
1612 if (isScrollbarWindow (ev.xany.window)) 1554 if (isScrollbarWindow (ev.xany.window))
1613 { 1555 {
1614 scrollBar.setIdle (); 1556 scrollBar.setIdle ();
1615 scrollbar_show (0); 1557 scrollbar_show (0);
1616 } 1558 }
1617#ifdef MENUBAR
1618 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1619 menubar_expose ();
1620#endif
1621 1559
1622#ifdef TRANSPARENT 1560#ifdef TRANSPARENT
1623 if (am_transparent && ev.xany.window == parent[0]) 1561 if (am_transparent && ev.xany.window == parent[0])
1624 XClearWindow (disp, ev.xany.window); 1562 XClearWindow (xdisp, ev.xany.window);
1625#endif 1563#endif
1626 } 1564 }
1627 break; 1565 break;
1628 1566
1629 case MotionNotify: 1567 case MotionNotify:
1630#ifdef POINTER_BLANK 1568#ifdef POINTER_BLANK
1631 if (hidden_pointer) 1569 if (hidden_pointer)
1632 pointer_unblank (); 1570 pointer_unblank ();
1633#endif 1571#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) 1572 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1642 break; 1573 break;
1643 1574
1644 if (ev.xany.window == vt) 1575 if (ev.xany.window == vt)
1645 { 1576 {
1577 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1646 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1578 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1647 ; // nop 1579 ; // nop
1648 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1580 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1649 { 1581 {
1650 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1582 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1651 ; 1583 ;
1652 1584
1653 XQueryPointer (disp, vt, 1585 XQueryPointer (xdisp, vt,
1654 &unused_root, &unused_child, 1586 &unused_root, &unused_child,
1655 &unused_root_x, &unused_root_y, 1587 &unused_root_x, &unused_root_y,
1656 &ev.xbutton.x, &ev.xbutton.y, 1588 &ev.xbutton.x, &ev.xbutton.y,
1657 &ev.xbutton.state); 1589 &ev.xbutton.state);
1658#ifdef MOUSE_THRESHOLD 1590#ifdef MOUSE_THRESHOLD
… …
1722#endif 1654#endif
1723 } 1655 }
1724 } 1656 }
1725 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1657 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1726 { 1658 {
1727 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1659 while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1728 MotionNotify, &ev)) 1660 MotionNotify, &ev))
1729 ; 1661 ;
1730 1662
1731 XQueryPointer (disp, scrollBar.win, 1663 XQueryPointer (xdisp, scrollBar.win,
1732 &unused_root, &unused_child, 1664 &unused_root, &unused_child,
1733 &unused_root_x, &unused_root_y, 1665 &unused_root_x, &unused_root_y,
1734 &ev.xbutton.x, &ev.xbutton.y, 1666 &ev.xbutton.x, &ev.xbutton.y,
1735 &unused_mask); 1667 &unused_mask);
1736 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1668 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1737 scrollbar_size ()); 1669 scrollbar_size ());
1738 scr_refresh (refresh_type); 1670 want_refresh = 1;
1739 refresh_limit = 0; 1671 refresh_limit = 0;
1740 scrollbar_show (1); 1672 scrollbar_show (1);
1741 } 1673 }
1742 break; 1674 break;
1743 } 1675 }
1676
1677skip_switch: ;
1678
1679#if defined(CURSOR_BLINK)
1680 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1681 {
1682 if (hidden_cursor)
1683 {
1684 hidden_cursor = 0;
1685 want_refresh = 1;
1686 }
1687
1688 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1689 }
1690#endif
1691
1692#if defined(POINTER_BLANK)
1693 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1694 {
1695 if (ev.type == MotionNotify
1696 || ev.type == ButtonPress
1697 || ev.type == ButtonRelease)
1698 if (hidden_pointer)
1699 pointer_unblank ();
1700
1701 if (ev.type == KeyPress && hidden_pointer == 0)
1702 pointer_blank ();
1703 }
1704#endif
1744} 1705}
1745 1706
1746void 1707void
1747rxvt_term::focus_in () 1708rxvt_term::focus_in ()
1748{ 1709{
… …
1760 XSetICFocus (Input_Context); 1721 XSetICFocus (Input_Context);
1761 } 1722 }
1762#endif 1723#endif
1763#if CURSOR_BLINK 1724#if CURSOR_BLINK
1764 if (OPTION (Opt_cursorBlink)) 1725 if (OPTION (Opt_cursorBlink))
1765 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1726 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1766#endif 1727#endif
1767#if OFF_FOCUS_FADING 1728#if OFF_FOCUS_FADING
1768 if (rs[Rs_fade]) 1729 if (rs[Rs_fade])
1769 { 1730 {
1770 pix_colors = pix_colors_focused; 1731 pix_colors = pix_colors_focused;
… …
1814 1775
1815#if TRANSPARENT 1776#if TRANSPARENT
1816void 1777void
1817rxvt_term::rootwin_cb (XEvent &ev) 1778rxvt_term::rootwin_cb (XEvent &ev)
1818{ 1779{
1819 SET_R (this); 1780 make_current ();
1820 SET_LOCALE (locale);
1821 1781
1822 switch (ev.type) 1782 switch (ev.type)
1823 { 1783 {
1824 case PropertyNotify: 1784 case PropertyNotify:
1825 /* 1785 /*
… …
1852 /* 1812 /*
1853 * VT window processing of button press 1813 * VT window processing of button press
1854 */ 1814 */
1855 if (ev.window == vt) 1815 if (ev.window == vt)
1856 { 1816 {
1817 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1818 return;
1819
1857#if ISO_14755 1820#if ISO_14755
1858 // 5.4 1821 // 5.4
1859 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1822 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1860 { 1823 {
1861 iso14755_54 (ev.x, ev.y); 1824 iso14755_54 (ev.x, ev.y);
… …
1873#ifdef MOUSE_REPORT_DOUBLECLICK 1836#ifdef MOUSE_REPORT_DOUBLECLICK
1874 if (ev.button == MEvent.button && clickintime) 1837 if (ev.button == MEvent.button && clickintime)
1875 { 1838 {
1876 /* same button, within alloted time */ 1839 /* same button, within alloted time */
1877 MEvent.clicks++; 1840 MEvent.clicks++;
1841
1878 if (MEvent.clicks > 1) 1842 if (MEvent.clicks > 1)
1879 { 1843 {
1880 /* only report double clicks */ 1844 /* only report double clicks */
1881 MEvent.clicks = 2; 1845 MEvent.clicks = 2;
1882 mouse_report (ev); 1846 mouse_report (ev);
… …
1902 else 1866 else
1903 { 1867 {
1904 if (ev.button != MEvent.button) 1868 if (ev.button != MEvent.button)
1905 MEvent.clicks = 0; 1869 MEvent.clicks = 0;
1906 1870
1907 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1908 switch (ev.button) 1871 switch (ev.button)
1909 { 1872 {
1910 case Button1: 1873 case Button1:
1911 /* allow meta + click to select rectangular areas */ 1874 /* allow meta + click to select rectangular areas */
1912 /* should be done in screen.C */ 1875 /* should be done in screen.C */
1913#if ENABLE_FRILLS 1876#if ENABLE_FRILLS
1914 selection.rect = !!(ev.state & ModMetaMask); 1877 selection.rect = !!(ev.state & ModMetaMask);
1915#else 1878#else
1916 selection.rect = false; 1879 selection.rect = false;
1917#endif 1880#endif
1918 1881
1919 /* allow shift+left click to extend selection */ 1882 /* allow shift+left click to extend selection */
1920 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1883 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1921 { 1884 {
1922 if (MEvent.button == Button1 && clickintime) 1885 if (MEvent.button == Button1 && clickintime)
1923 selection_rotate (ev.x, ev.y); 1886 selection_rotate (ev.x, ev.y);
1924 else 1887 else
1925 selection_extend (ev.x, ev.y, 1); 1888 selection_extend (ev.x, ev.y, 1);
1926 } 1889 }
1927 else 1890 else
1928 { 1891 {
1929 if (MEvent.button == Button1 && clickintime) 1892 if (MEvent.button == Button1 && clickintime)
1930 MEvent.clicks++; 1893 MEvent.clicks++;
1931 else 1894 else
1932 MEvent.clicks = 1; 1895 MEvent.clicks = 1;
1933 1896
1934 selection_click (MEvent.clicks, ev.x, ev.y); 1897 selection_click (MEvent.clicks, ev.x, ev.y);
1935 } 1898 }
1936 1899
1937 MEvent.button = Button1; 1900 MEvent.button = Button1;
1938 break; 1901 break;
1939 1902
1940 case Button3: 1903 case Button3:
1941 if (MEvent.button == Button3 && clickintime) 1904 if (MEvent.button == Button3 && clickintime)
1942 selection_rotate (ev.x, ev.y); 1905 selection_rotate (ev.x, ev.y);
1943 else 1906 else
1944 selection_extend (ev.x, ev.y, 1); 1907 selection_extend (ev.x, ev.y, 1);
1945 1908
1946 MEvent.button = Button3; 1909 MEvent.button = Button3;
1947 break; 1910 break;
1948 } 1911 }
1949 } 1912 }
1950 1913
1951 MEvent.time = ev.time; 1914 MEvent.time = ev.time;
1952 return; 1915 return;
1953 } 1916 }
1954 1917
… …
2090 } 2053 }
2091 2054
2092 break; 2055 break;
2093 } 2056 }
2094 } 2057 }
2058
2095 return; 2059 return;
2096 } 2060 }
2097#if MENUBAR
2098 /*
2099 * Menubar window processing of button press
2100 */
2101 if (isMenuBarWindow (ev.window))
2102 menubar_control (ev);
2103#endif
2104} 2061}
2105 2062
2106void 2063void
2107rxvt_term::button_release (XButtonEvent &ev) 2064rxvt_term::button_release (XButtonEvent &ev)
2108{ 2065{
… …
2114 2071
2115 if (scrollbar_isUpDn ()) 2072 if (scrollbar_isUpDn ())
2116 { 2073 {
2117 scrollBar.setIdle (); 2074 scrollBar.setIdle ();
2118 scrollbar_show (0); 2075 scrollbar_show (0);
2119#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2120 refresh_type &= ~SMOOTH_REFRESH;
2121#endif
2122 } 2076 }
2123 2077
2124#ifdef SELECTION_SCROLLING 2078#ifdef SELECTION_SCROLLING
2125 if (sel_scroll_ev.active) 2079 if (sel_scroll_ev.active)
2126 sel_scroll_ev.stop(); 2080 sel_scroll_ev.stop();
2127#endif 2081#endif
2128 2082
2129 if (ev.window == vt) 2083 if (ev.window == vt)
2130 { 2084 {
2085 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2086 return;
2087
2131#if ISO_14755 2088#if ISO_14755
2132 // 5.4 2089 // 5.4
2133 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2090 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2134 return; 2091 return;
2135#endif 2092#endif
2093
2136 if (reportmode) 2094 if (reportmode)
2137 { 2095 {
2138 /* mouse report from vt window */ 2096 /* mouse report from vt window */
2139 /* don't report release of wheel "buttons" */ 2097 /* don't report release of wheel "buttons" */
2140 if (ev.button >= 4) 2098 if (ev.button >= 4)
… …
2164 if (priv_modes & PrivMode_mouse_report 2122 if (priv_modes & PrivMode_mouse_report
2165 && bypass_keystate 2123 && bypass_keystate
2166 && ev.button == Button1 && MEvent.clicks <= 1) 2124 && ev.button == Button1 && MEvent.clicks <= 1)
2167 selection_extend (ev.x, ev.y, 0); 2125 selection_extend (ev.x, ev.y, 0);
2168 2126
2169 if (!HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2170 return;
2171
2172 switch (ev.button) 2127 switch (ev.button)
2173 { 2128 {
2174 case Button1: 2129 case Button1:
2175 case Button3: 2130 case Button3:
2176 selection_make (ev.time); 2131 selection_make (ev.time);
2177 break; 2132 break;
2133
2178 case Button2: 2134 case Button2:
2179 selection_request (ev.time, ev.x, ev.y); 2135 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2136 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2180 break; 2137 break;
2138
2181#ifdef MOUSE_WHEEL 2139#ifdef MOUSE_WHEEL
2182 case Button4: 2140 case Button4:
2183 case Button5: 2141 case Button5:
2184 { 2142 {
2185 int i; 2143 int i;
… …
2207 slip_wheel_ev.start (); 2165 slip_wheel_ev.start ();
2208 } 2166 }
2209 else 2167 else
2210 { 2168 {
2211# endif 2169# endif
2212# ifdef JUMP_MOUSE_WHEEL
2213 scr_page (v, i); 2170 scr_page (v, i);
2214 scr_refresh (SMOOTH_REFRESH);
2215 scrollbar_show (1); 2171 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 2172# ifdef MOUSE_SLIP_WHEELING
2225 } 2173 }
2226#endif 2174# endif
2227 } 2175 }
2228 break; 2176 break;
2229#endif 2177#endif
2230 } 2178 }
2231 } 2179 }
2232#ifdef MENUBAR
2233 else if (isMenuBarWindow (ev.window))
2234 menubar_control (ev);
2235#endif
2236} 2180}
2237 2181
2238#ifdef TRANSPARENT 2182#ifdef TRANSPARENT
2239#if TINTING 2183#if TINTING
2240/* taken from aterm-0.4.2 */ 2184/* taken from aterm-0.4.2 */
2241 2185
2242typedef uint32_t RUINT32T; 2186typedef uint32_t RUINT32T;
2243 2187
2244void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2188void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2245{ 2189{
2246 int sh_r, sh_g, sh_b; 2190 int sh_r, sh_g, sh_b;
2247 RUINT32T mask_r, mask_g, mask_b; 2191 RUINT32T mask_r, mask_g, mask_b;
2248 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2192 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2249 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2193 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2250 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2194 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2251 int i; 2195 int i;
2252 2196
2253 Visual *visual = display->visual; 2197 Visual *visual = term->visual;
2254 2198
2255 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2199 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2256 2200
2257 /* for convenience */ 2201 /* for convenience */
2258 mask_r = visual->red_mask; 2202 mask_r = visual->red_mask;
… …
2479 Atom atype; 2423 Atom atype;
2480 unsigned char *prop = NULL; 2424 unsigned char *prop = NULL;
2481 Window root, oldp, *list; 2425 Window root, oldp, *list;
2482 Pixmap rootpixmap = None; 2426 Pixmap rootpixmap = None;
2483 XWindowAttributes wattr, wrootattr; 2427 XWindowAttributes wattr, wrootattr;
2484 dDisp;
2485 2428
2486 pchanged = 0; 2429 pchanged = 0;
2487 2430
2488 if (!OPTION (Opt_transparent)) 2431 if (!OPTION (Opt_transparent))
2489 return pchanged; /* Don't try any more */ 2432 return pchanged; /* Don't try any more */
2490 2433
2491 XGetWindowAttributes (disp, display->root, &wrootattr); 2434 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2492 rootdepth = wrootattr.depth; 2435 rootdepth = wrootattr.depth;
2493 2436
2494 XGetWindowAttributes (disp, parent[0], &wattr); 2437 XGetWindowAttributes (xdisp, parent[0], &wattr);
2495 2438
2496 if (rootdepth != wattr.depth) 2439 if (rootdepth != wattr.depth)
2497 { 2440 {
2498 if (am_transparent) 2441 if (am_transparent)
2499 { 2442 {
2500 pchanged = 1; 2443 pchanged = 1;
2501 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2444 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2502 am_transparent = am_pixmap_trans = 0; 2445 am_transparent = am_pixmap_trans = 0;
2503 } 2446 }
2504 2447
2505 return pchanged; /* Don't try any more */ 2448 return pchanged; /* Don't try any more */
2506 } 2449 }
2507 2450
2508 /* Get all X ops out of the queue so that our information is up-to-date. */ 2451 /* Get all X ops out of the queue so that our information is up-to-date. */
2509 XSync (disp, False); 2452 XSync (xdisp, False);
2510 2453
2511 /* 2454 /*
2512 * Make the frame window set by the window manager have 2455 * Make the frame window set by the window manager have
2513 * the root background. Some window managers put multiple nested frame 2456 * the root background. Some window managers put multiple nested frame
2514 * windows for each client, so we have to take care about that. 2457 * windows for each client, so we have to take care about that.
2515 */ 2458 */
2516 i = (xa[XA_XROOTPMAP_ID] 2459 i = (xa[XA_XROOTPMAP_ID]
2517 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2460 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2518 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2461 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2519 &nitems, &bytes_after, &prop) == Success); 2462 &nitems, &bytes_after, &prop) == Success);
2520 2463
2521 if (!i || prop == NULL) 2464 if (!i || prop == NULL)
2522 i = (xa[XA_ESETROOT_PMAP_ID] 2465 i = (xa[XA_ESETROOT_PMAP_ID]
2523 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2466 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2524 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2467 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2525 &nitems, &bytes_after, &prop) == Success); 2468 &nitems, &bytes_after, &prop) == Success);
2526 2469
2527 if (!i || prop == NULL 2470 if (!i || prop == NULL
2528#if TINTING 2471#if TINTING
2529 || !rs[Rs_color + Color_tint] 2472 || !ISSET_PIXCOLOR (Color_tint)
2530#endif 2473#endif
2531 ) 2474 )
2532 have_pixmap = 0; 2475 have_pixmap = 0;
2533 else 2476 else
2534 { 2477 {
… …
2547 Window cr; 2490 Window cr;
2548 XImage *image; 2491 XImage *image;
2549 GC gc; 2492 GC gc;
2550 XGCValues gcvalue; 2493 XGCValues gcvalue;
2551 2494
2552 XTranslateCoordinates (disp, parent[0], display->root, 2495 XTranslateCoordinates (xdisp, parent[0], display->root,
2553 0, 0, &sx, &sy, &cr); 2496 0, 0, &sx, &sy, &cr);
2554 nw = (unsigned int)szHint.width; 2497 nw = (unsigned int)szHint.width;
2555 nh = (unsigned int)szHint.height; 2498 nh = (unsigned int)szHint.height;
2556 nx = ny = 0; 2499 nx = ny = 0;
2557 2500
… …
2570 } 2513 }
2571 2514
2572 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2515 min_it (nw, (unsigned int) (wrootattr.width - sx));
2573 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2516 min_it (nh, (unsigned int) (wrootattr.height - sy));
2574 2517
2575 XSync (disp, False); 2518 XSync (xdisp, False);
2576 allowedxerror = -1; 2519 allowedxerror = -1;
2577 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2520 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2578 2521
2579 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2522 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2580 /* XXX: may need a delay here? */ 2523 /* XXX: may need a delay here? */
2581 allowedxerror = 0; 2524 allowedxerror = 0;
2582 2525
… …
2585 if (am_transparent && am_pixmap_trans) 2528 if (am_transparent && am_pixmap_trans)
2586 { 2529 {
2587 pchanged = 1; 2530 pchanged = 1;
2588 if (pixmap != None) 2531 if (pixmap != None)
2589 { 2532 {
2590 XFreePixmap (disp, pixmap); 2533 XFreePixmap (xdisp, pixmap);
2591 pixmap = None; 2534 pixmap = None;
2592 } 2535 }
2593 } 2536 }
2594 2537
2595 am_pixmap_trans = 0; 2538 am_pixmap_trans = 0;
2596 } 2539 }
2597 else 2540 else
2598 { 2541 {
2599 if (pixmap != None) 2542 if (pixmap != None)
2600 XFreePixmap (disp, pixmap); 2543 XFreePixmap (xdisp, pixmap);
2601 2544
2602#if TINTING 2545#if TINTING
2603 if (ISSET_PIXCOLOR (Color_tint)) 2546 if (ISSET_PIXCOLOR (Color_tint))
2604 { 2547 {
2605 unsigned short rm, gm, bm;
2606 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2548 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2607 2549
2550 rgba c;
2608 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2551 pix_colors_focused [Color_tint].get (c);
2609 2552
2610 ShadeXImage (display, image, shade, rm, gm, bm); 2553 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2611 } 2554 }
2612#endif 2555#endif
2613 2556
2614 pixmap = XCreatePixmap (disp, vt, 2557 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2615 szHint.width, szHint.height, image->depth);
2616 gc = XCreateGC (disp, vt, 0UL, &gcvalue); 2558 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2617 XPutImage (disp, pixmap, gc, image, 0, 0, 2559 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2618 nx, ny, image->width, image->height); 2560 nx, ny, image->width, image->height);
2619 XFreeGC (disp, gc); 2561 XFreeGC (xdisp, gc);
2620 XDestroyImage (image); 2562 XDestroyImage (image);
2621 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2563 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2622 XClearWindow (disp, parent[0]); 2564 XClearWindow (xdisp, parent[0]);
2623 2565
2624 if (!am_transparent || !am_pixmap_trans) 2566 if (!am_transparent || !am_pixmap_trans)
2625 pchanged = 1; 2567 pchanged = 1;
2626 2568
2627 am_transparent = am_pixmap_trans = 1; 2569 am_transparent = am_pixmap_trans = 1;
2628 } 2570 }
2629 } 2571 }
2630 2572
2631 if (am_pixmap_trans) 2573 if (am_pixmap_trans)
2632 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2574 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2633 else 2575 else
2634 { 2576 {
2635 unsigned int n; 2577 unsigned int n;
2636 /* 2578 /*
2637 * InheritPixmap transparency 2579 * InheritPixmap transparency
2638 */ 2580 */
2639 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2581 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2640 { 2582 {
2641 oldp = parent[i]; 2583 oldp = parent[i];
2642 XQueryTree (disp, parent[i - 1], &root, 2584 XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2643 &parent[i], &list, &n);
2644 XFree (list); 2585 XFree (list);
2645 2586
2646 if (parent[i] == display->root) 2587 if (parent[i] == display->root)
2647 { 2588 {
2648 if (oldp != None) 2589 if (oldp != None)
… …
2656 } 2597 }
2657 2598
2658 n = 0; 2599 n = 0;
2659 2600
2660 if (pchanged) 2601 if (pchanged)
2661 {
2662 for (; n < (unsigned int)i; n++) 2602 for (; n < (unsigned int)i; n++)
2663 { 2603 {
2664 XGetWindowAttributes (disp, parent[n], &wattr); 2604 XGetWindowAttributes (xdisp, parent[n], &wattr);
2605
2665 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2606 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2666 { 2607 {
2667 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2608 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2668 break; 2609 break;
2669 } 2610 }
2670 } 2611 }
2671 }
2672 2612
2673 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2613 if (n > (sizeof (parent) / sizeof (parent[0])))
2674 { 2614 {
2675 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2615 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2676 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2616 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2677 am_transparent = 0; 2617 am_transparent = 0;
2678 /* XXX: also turn off Opt_transparent? */ 2618 /* XXX: also turn off Opt_transparent? */
2679 } 2619 }
2680 else 2620 else
2681 { 2621 {
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++) 2622 for (n = 0; n < (unsigned int)i; n++)
2688 { 2623 {
2689 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2624 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2690 XClearWindow (disp, parent[n]); 2625 XClearWindow (xdisp, parent[n]);
2691 } 2626 }
2692 2627
2693 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2628 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2694 am_transparent = 1; 2629 am_transparent = 1;
2695 } 2630 }
2696 2631
2697 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2632 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2698 parent[i] = None; 2633 parent[i] = None;
2699 } 2634 }
2700 2635
2701 if (scrollBar.win) 2636 if (scrollBar.win)
2702 { 2637 {
2703 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2638 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2704 scrollBar.setIdle (); 2639 scrollBar.setIdle ();
2705 scrollbar_show (0); 2640 scrollbar_show (0);
2706 } 2641 }
2707 2642
2708 if (am_transparent) 2643 if (am_transparent)
… …
2720 2655
2721bool 2656bool
2722rxvt_term::cmd_parse () 2657rxvt_term::cmd_parse ()
2723{ 2658{
2724 bool flag = false; 2659 bool flag = false;
2725 unicode_t ch = NOCHAR; 2660 wchar_t ch = NOCHAR;
2726 char *seq_begin; // remember start of esc-sequence here 2661 char *seq_begin; // remember start of esc-sequence here
2727 2662
2728 for (;;) 2663 for (;;)
2729 { 2664 {
2730 if (ch == NOCHAR) 2665 if (ch == NOCHAR)
… …
2751 if (seen_resize && cmd_pid) 2686 if (seen_resize && cmd_pid)
2752 kill (-cmd_pid, SIGWINCH); 2687 kill (-cmd_pid, SIGWINCH);
2753 } 2688 }
2754 2689
2755 /* Read a text string from the input buffer */ 2690 /* Read a text string from the input buffer */
2756 unicode_t buf[UBUFSIZ]; 2691 wchar_t buf[UBUFSIZ];
2757 bool refreshnow = false; 2692 bool refreshnow = false;
2758 int nlines = 0; 2693 int nlines = 0;
2759 unicode_t *str = buf; 2694 wchar_t *str = buf;
2760 unicode_t *eol = str + min (ncol, UBUFSIZ); 2695 wchar_t *eol = str + min (ncol, UBUFSIZ);
2761 2696
2762 for (;;) 2697 for (;;)
2763 { 2698 {
2764 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2699 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2765 break; 2700 break;
… …
2783 } 2718 }
2784 2719
2785 // scr_add_lines only works for nlines <= nrow - 1. 2720 // scr_add_lines only works for nlines <= nrow - 1.
2786 if (nlines >= nrow - 1) 2721 if (nlines >= nrow - 1)
2787 { 2722 {
2723 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2788 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END))) 2724 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2789 scr_add_lines (buf, nlines, str - buf); 2725 scr_add_lines (buf, str - buf, nlines);
2790 2726
2791 nlines = 0; 2727 nlines = 0;
2792 str = buf; 2728 str = buf;
2793 eol = str + min (ncol, UBUFSIZ); 2729 eol = str + min (ncol, UBUFSIZ);
2794 } 2730 }
… …
2808 2744
2809 seq_begin = cmdbuf_ptr; 2745 seq_begin = cmdbuf_ptr;
2810 ch = next_char (); 2746 ch = next_char ();
2811 } 2747 }
2812 2748
2749 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2813 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END))) 2750 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2814 scr_add_lines (buf, nlines, str - buf); 2751 scr_add_lines (buf, str - buf, nlines);
2815 2752
2816 /* 2753 /*
2817 * If there have been a lot of new lines, then update the screen 2754 * If there have been a lot of new lines, then update the screen
2818 * What the heck I'll cheat and only refresh less than every page-full. 2755 * What the heck I'll cheat and only refresh less than every page-full.
2819 * the number of pages between refreshes is refresh_limit, which 2756 * the number of pages between refreshes is refresh_limit, which
… …
2824 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2761 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2825 refresh_limit++; 2762 refresh_limit++;
2826 else 2763 else
2827 { 2764 {
2828 flag = true; 2765 flag = true;
2829 scr_refresh (refresh_type); 2766 scr_refresh ();
2830 flush_ev.stop (); 2767 want_refresh = 1;
2831 } 2768 }
2832 } 2769 }
2833 2770
2834 } 2771 }
2835 else 2772 else
… …
2850 } 2787 }
2851 2788
2852 return flag; 2789 return flag;
2853} 2790}
2854 2791
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 2792// read the next character
2865unicode_t 2793wchar_t
2866rxvt_term::next_char () 2794rxvt_term::next_char () NOTHROW
2867{ 2795{
2868 while (cmdbuf_ptr < cmdbuf_endp) 2796 while (cmdbuf_ptr < cmdbuf_endp)
2869 { 2797 {
2870 // assume 7-bit to be ascii ALWAYS 2798 // assume 7-bit to be ascii ALWAYS
2871 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2799 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2880 cmdbuf_ptr = cmdbuf_endp; 2808 cmdbuf_ptr = cmdbuf_endp;
2881 break; 2809 break;
2882 } 2810 }
2883 2811
2884 if (len == (size_t)-1) 2812 if (len == (size_t)-1)
2885 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2813 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2886 2814
2887 // assume wchar == unicode 2815 // assume wchar == unicode
2888 cmdbuf_ptr += len; 2816 cmdbuf_ptr += len;
2889 return wc & UNICODE_MASK; 2817 return wc & UNICODE_MASK;
2890 } 2818 }
2891 2819
2892 return NOCHAR; 2820 return NOCHAR;
2893} 2821}
2822
2823// read the next octet
2824uint32_t
2825rxvt_term::next_octet () NOTHROW
2826{
2827 return cmdbuf_ptr < cmdbuf_endp
2828 ? (unsigned char)*cmdbuf_ptr++
2829 : NOCHAR;
2830}
2831
2832static class out_of_input out_of_input;
2894 2833
2895/* rxvt_cmd_getc () - Return next input character */ 2834/* rxvt_cmd_getc () - Return next input character */
2896/* 2835/*
2897 * Return the next input character after first passing any keyboard input 2836 * Return the next input character after first passing any keyboard input
2898 * to the command. 2837 * to the command.
2899 */ 2838 */
2900unicode_t 2839wchar_t
2901rxvt_term::cmd_getc () 2840rxvt_term::cmd_getc () THROW ((class out_of_input))
2902{ 2841{
2903 unicode_t c = next_char (); 2842 wchar_t c = next_char ();
2904 2843
2905 if (c == NOCHAR) 2844 if (c == NOCHAR)
2906 throw out_of_input; 2845 throw out_of_input;
2907 2846
2908 return c; 2847 return c;
2909} 2848}
2910 2849
2911unicode_t 2850uint32_t
2912rxvt_term::cmd_get8 () 2851rxvt_term::cmd_get8 () THROW ((class out_of_input))
2913{ 2852{
2914 unicode_t c = next_octet (); 2853 uint32_t c = next_octet ();
2915 2854
2916 if (c == NOCHAR) 2855 if (c == NOCHAR)
2917 throw out_of_input; 2856 throw out_of_input;
2918 2857
2919 return c; 2858 return c;
… …
3155 scr_charset_set (2, (unsigned int)cmd_getc ()); 3094 scr_charset_set (2, (unsigned int)cmd_getc ());
3156 break; 3095 break;
3157 case '+': 3096 case '+':
3158 scr_charset_set (3, (unsigned int)cmd_getc ()); 3097 scr_charset_set (3, (unsigned int)cmd_getc ());
3159 break; 3098 break;
3160#if ENABLE_FRILLS 3099#if !ENABLE_MINIMAL
3161 case '6': 3100 case '6':
3162 scr_backindex (); 3101 scr_backindex ();
3163 break; 3102 break;
3164#endif 3103#endif
3165 case '7': 3104 case '7':
3166 scr_cursor (SAVE); 3105 scr_cursor (SAVE);
3167 break; 3106 break;
3168 case '8': 3107 case '8':
3169 scr_cursor (RESTORE); 3108 scr_cursor (RESTORE);
3170 break; 3109 break;
3171#if ENABLE_FRILLS 3110#if !ENABLE_MINIMAL
3172 case '9': 3111 case '9':
3173 scr_forwardindex (); 3112 scr_forwardindex ();
3174 break; 3113 break;
3175#endif 3114#endif
3176 case '=': 3115 case '=':
… …
3186 break; 3125 break;
3187 3126
3188 /* 8.3.87: NEXT LINE */ 3127 /* 8.3.87: NEXT LINE */
3189 case C1_NEL: /* ESC E */ 3128 case C1_NEL: /* ESC E */
3190 { 3129 {
3191 unicode_t nlcr[] = { C0_LF, C0_CR }; 3130 wchar_t nlcr[] = { C0_LF, C0_CR };
3192 scr_add_lines (nlcr, 1, 2); 3131 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3193 } 3132 }
3194 break; 3133 break;
3195 3134
3196 /* kidnapped escape sequence: Should be 8.3.48 */ 3135 /* kidnapped escape sequence: Should be 8.3.48 */
3197 case C1_ESA: /* ESC G */ 3136 case C1_ESA: /* ESC G */
… …
3338 ndef = get_byte_array_bit (csi_defaults, i); 3277 ndef = get_byte_array_bit (csi_defaults, i);
3339 for (p = 0; p < nargs; p++) 3278 for (p = 0; p < nargs; p++)
3340 if (arg[p] == -1) 3279 if (arg[p] == -1)
3341 arg[p] = ndef; 3280 arg[p] = ndef;
3342 3281
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 /* 3282 /*
3351 * private mode handling 3283 * private mode handling
3352 */ 3284 */
3353 if (priv) 3285 if (priv)
3354 { 3286 {
3355 switch (priv) 3287 switch (priv)
3356 { 3288 {
3357 case '>': 3289 case '>':
3358 if (ch == CSI_DA) /* secondary device attributes */ 3290 if (ch == CSI_DA) /* secondary device attributes */
3359 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 3291 {
3292 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3293 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3294 //
3295 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3296 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3297 // that we do not support xterm mouse reporting (should be 95 when we do).
3298 //
3299 tt_printf ("\033[>%d;94;0c", 'U');
3300 }
3360 break; 3301 break;
3361 case '?': 3302 case '?':
3362 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3303 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3363 process_terminal_mode (ch, priv, nargs, arg); 3304 process_terminal_mode (ch, priv, nargs, arg);
3364 break; 3305 break;
… …
3567 break; 3508 break;
3568 case CSI_75: 3509 case CSI_75:
3569 scr_cursor (RESTORE); 3510 scr_cursor (RESTORE);
3570 break; 3511 break;
3571 3512
3572#if ENABLE_FRILLS 3513#if !ENABLE_MINIMAL
3573 case CSI_74: 3514 case CSI_74:
3574 process_window_ops (arg, nargs); 3515 process_window_ops (arg, nargs);
3575 break; 3516 break;
3576#endif 3517#endif
3577 3518
… …
3584 break; 3525 break;
3585 } 3526 }
3586} 3527}
3587/*}}} */ 3528/*}}} */
3588 3529
3589#if ENABLE_FRILLS 3530#if !ENABLE_MINIMAL
3590/* ARGSUSED */ 3531/* ARGSUSED */
3591void 3532void
3592rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3533rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3593{ 3534{
3594 int x, y; 3535 int x, y;
3595 XWindowAttributes wattr; 3536 XWindowAttributes wattr;
3596 Window wdummy; 3537 Window wdummy;
3597 dDisp; 3538
3539 dLocal (Display *, xdisp);
3598 3540
3599 if (nargs == 0) 3541 if (nargs == 0)
3600 return; 3542 return;
3601 3543
3602 switch (args[0]) 3544 switch (args[0])
3603 { 3545 {
3604 /* 3546 /*
3605 * commands 3547 * commands
3606 */ 3548 */
3607 case 1: /* deiconify window */ 3549 case 1: /* deiconify window */
3608 XMapWindow (disp, parent[0]); 3550 XMapWindow (xdisp, parent[0]);
3609 break; 3551 break;
3610 case 2: /* iconify window */ 3552 case 2: /* iconify window */
3611 XIconifyWindow (disp, parent[0], display->screen); 3553 XIconifyWindow (xdisp, parent[0], display->screen);
3612 break; 3554 break;
3613 case 3: /* set position (pixels) */ 3555 case 3: /* set position (pixels) */
3614 XMoveWindow (disp, parent[0], args[1], args[2]); 3556 XMoveWindow (xdisp, parent[0], args[1], args[2]);
3615 break; 3557 break;
3616 case 4: /* set size (pixels) */ 3558 case 4: /* set size (pixels) */
3617 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3559 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3618 break; 3560 break;
3619 case 5: /* raise window */ 3561 case 5: /* raise window */
3620 XRaiseWindow (disp, parent[0]); 3562 XRaiseWindow (xdisp, parent[0]);
3621 break; 3563 break;
3622 case 6: /* lower window */ 3564 case 6: /* lower window */
3623 XLowerWindow (disp, parent[0]); 3565 XLowerWindow (xdisp, parent[0]);
3624 break; 3566 break;
3625 case 7: /* refresh window */ 3567 case 7: /* refresh window */
3626 scr_touch (true); 3568 scr_touch (true);
3627 break; 3569 break;
3628 case 8: /* set size (chars) */ 3570 case 8: /* set size (chars) */
… …
3635 if (args[0] >= 24) /* set height (chars) */ 3577 if (args[0] >= 24) /* set height (chars) */
3636 set_widthheight ((unsigned int)width, 3578 set_widthheight ((unsigned int)width,
3637 (unsigned int) (args[1] * fheight)); 3579 (unsigned int) (args[1] * fheight));
3638 break; 3580 break;
3639 3581
3640
3641 /* 3582 /*
3642 * reports - some output format copied from XTerm 3583 * reports - some output format copied from XTerm
3643 */ 3584 */
3644 case 11: /* report window state */ 3585 case 11: /* report window state */
3645 XGetWindowAttributes (disp, parent[0], &wattr); 3586 XGetWindowAttributes (xdisp, parent[0], &wattr);
3646 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3587 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3647 break; 3588 break;
3648 case 13: /* report window position */ 3589 case 13: /* report window position */
3649 XGetWindowAttributes (disp, parent[0], &wattr); 3590 XGetWindowAttributes (xdisp, parent[0], &wattr);
3650 XTranslateCoordinates (disp, parent[0], wattr.root, 3591 XTranslateCoordinates (xdisp, parent[0], wattr.root,
3651 -wattr.border_width, -wattr.border_width, 3592 -wattr.border_width, -wattr.border_width,
3652 &x, &y, &wdummy); 3593 &x, &y, &wdummy);
3653 tt_printf ("\033[3;%d;%dt", x, y); 3594 tt_printf ("\033[3;%d;%dt", x, y);
3654 break; 3595 break;
3655 case 14: /* report window size (pixels) */ 3596 case 14: /* report window size (pixels) */
3656 XGetWindowAttributes (disp, parent[0], &wattr); 3597 XGetWindowAttributes (xdisp, parent[0], &wattr);
3657 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3598 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3658 break; 3599 break;
3659 case 18: /* report text area size (chars) */ 3600 case 18: /* report text area size (chars) */
3660 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3601 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3661 break; 3602 break;
… …
3663 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3604 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3664 break; 3605 break;
3665 case 20: /* report icon label */ 3606 case 20: /* report icon label */
3666 { 3607 {
3667 char *s; 3608 char *s;
3668 XGetIconName (disp, parent[0], &s); 3609 XGetIconName (xdisp, parent[0], &s);
3669 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3610 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3670 XFree (s); 3611 XFree (s);
3671 } 3612 }
3672 break; 3613 break;
3673 case 21: /* report window title */ 3614 case 21: /* report window title */
3674 { 3615 {
3675 char *s; 3616 char *s;
3676 XFetchName (disp, parent[0], &s); 3617 XFetchName (xdisp, parent[0], &s);
3677 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3618 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3678 XFree (s); 3619 XFree (s);
3679 } 3620 }
3680 break; 3621 break;
3681 } 3622 }
… …
3782void 3723void
3783rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3724rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3784{ 3725{
3785 if (str[0] == '?' && !str[1]) 3726 if (str[0] == '?' && !str[1])
3786 { 3727 {
3787 unsigned short r, g, b; 3728 rgba c;
3788 pix_colors_focused[color].get (display, r, g, b); 3729 pix_colors_focused[color].get (c);
3730
3731#if XFT
3732 if (c.a != rgba::MAX_CC)
3733 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3734 else
3735#endif
3789 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3736 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3790 } 3737 }
3791 else 3738 else
3792 set_window_color (color, str); 3739 set_window_color (color, str);
3793} 3740}
3794 3741
… …
3796 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3743 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3797 */ 3744 */
3798void 3745void
3799rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3746rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3800{ 3747{
3801 int changed = 0;
3802 int color; 3748 int color;
3803 char *buf, *name; 3749 char *buf, *name;
3804 bool query = str[0] == '?' && !str[1]; 3750 bool query = str[0] == '?' && !str[1];
3805 int saveop = op; 3751 int saveop = op;
3806 dDisp; 3752
3753 dLocal (Display *, xdisp);
3807 3754
3808 assert (str != NULL); 3755 assert (str != NULL);
3809 switch (op) 3756 switch (op)
3810 { 3757 {
3811 case XTerm_name: 3758 case XTerm_name:
… …
3827 unsigned long bytes_after; 3774 unsigned long bytes_after;
3828 unsigned char *value = 0; 3775 unsigned char *value = 0;
3829 const char *str = ""; 3776 const char *str = "";
3830 3777
3831 if (prop 3778 if (prop
3832 && XGetWindowProperty (disp, parent[0], 3779 && XGetWindowProperty (xdisp, parent[0],
3833 prop, 0, 1<<16, 0, AnyPropertyType, 3780 prop, 0, 1<<16, 0, AnyPropertyType,
3834 &actual_type, &actual_format, 3781 &actual_type, &actual_format,
3835 &nitems, &bytes_after, &value) == Success 3782 &nitems, &bytes_after, &value) == Success
3836 && actual_type != None 3783 && actual_type != None
3837 && actual_format == 8) 3784 && actual_format == 8)
3838 str = (const char *)(value); 3785 str = (const char *)(value);
3839 3786
3840 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3787 tt_printf ("\033]%d;%s%c", op, str, resp);
3841 3788
3842 XFree (value); 3789 XFree (value);
3843 } 3790 }
3844 else 3791 else
3845 { 3792 {
… …
3849 { 3796 {
3850 *eq = 0; 3797 *eq = 0;
3851 set_utf8_property (display->atom (str), eq + 1); 3798 set_utf8_property (display->atom (str), eq + 1);
3852 } 3799 }
3853 else 3800 else
3854 XDeleteProperty (disp, parent[0], 3801 XDeleteProperty (xdisp, parent[0],
3855 display->atom (str)); 3802 display->atom (str));
3856 } 3803 }
3857 break; 3804 break;
3858 3805
3859 case XTerm_Color: 3806 case XTerm_Color:
… …
3861 { 3808 {
3862 if ((name = strchr (buf, ';')) == NULL) 3809 if ((name = strchr (buf, ';')) == NULL)
3863 break; 3810 break;
3864 3811
3865 *name++ = '\0'; 3812 *name++ = '\0';
3866 color = atoi (buf); 3813 color = atoi (buf) + minCOLOR;
3867 3814
3868 if (color < 0 || color >= TOTAL_COLORS) 3815 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3869 break; 3816 break;
3870 3817
3871 if ((buf = strchr (name, ';')) != NULL) 3818 if ((buf = strchr (name, ';')) != NULL)
3872 *buf++ = '\0'; 3819 *buf++ = '\0';
3873 3820
3874 if (name[0] == '?' && !name[1]) 3821 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 } 3822 }
3883 break; 3823 break;
3884 case XTerm_Color00: 3824 case XTerm_Color00:
3885 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3825 process_color_seq (op, Color_fg, str, resp);
3886 break; 3826 break;
3887 case XTerm_Color01: 3827 case XTerm_Color01:
3888 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3828 process_color_seq (op, Color_bg, str, resp);
3889 break; 3829 break;
3890#ifndef NO_CURSORCOLOR 3830#ifndef NO_CURSORCOLOR
3891 case XTerm_Color_cursor: 3831 case XTerm_Color_cursor:
3892 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3832 process_color_seq (op, Color_cursor, str, resp);
3893 break; 3833 break;
3894#endif 3834#endif
3895 case XTerm_Color_pointer_fg: 3835 case XTerm_Color_pointer_fg:
3896 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3836 process_color_seq (op, Color_pointer_fg, str, resp);
3897 break; 3837 break;
3898 case XTerm_Color_pointer_bg: 3838 case XTerm_Color_pointer_bg:
3899 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3839 process_color_seq (op, Color_pointer_bg, str, resp);
3900 break; 3840 break;
3901#ifndef NO_BOLD_UNDERLINE_REVERSE 3841#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: 3842 case XTerm_Color_RV:
3909 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3843 process_color_seq (op, Color_RV, str, resp);
3844 break;
3845 case Rxvt_Color_BD:
3846 case URxvt_Color_BD:
3847 process_color_seq (op, Color_BD, str, resp);
3848 break;
3849 case Rxvt_Color_UL:
3850 case URxvt_Color_UL:
3851 process_color_seq (op, Color_UL, str, resp);
3910 break; 3852 break;
3911 case URxvt_Color_IT: 3853 case URxvt_Color_IT:
3912 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3854 process_color_seq (op, Color_IT, str, resp);
3913 break; 3855 break;
3914#endif 3856#endif
3915#if TRANSPARENT && TINTING 3857#if TRANSPARENT && TINTING
3916 case URxvt_Color_tint: 3858 case URxvt_Color_tint:
3917 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3859 process_color_seq (op, Color_tint, str, resp);
3860
3918 check_our_parents (); 3861 check_our_parents ();
3862
3919 if (am_transparent) 3863 if (am_transparent)
3920 want_full_refresh = want_refresh = 1; 3864 want_full_refresh = want_refresh = 1;
3921 break;
3922#endif
3923 3865
3866 break;
3867#endif
3868
3924 case XTerm_Pixmap: 3869 case Rxvt_Pixmap:
3870 {
3925 if (*str != ';') 3871 if (*str != ';')
3926 { 3872 {
3927#if XPM_BACKGROUND 3873#if XPM_BACKGROUND
3928 scale_pixmap (""); /* reset to default scaling */ 3874 scale_pixmap (""); /* reset to default scaling */
3929 set_bgPixmap (str); /* change pixmap */ 3875 set_bgPixmap (str); /* change pixmap */
3930#endif
3931 scr_touch (true); 3876 scr_touch (true);
3877#endif
3932 } 3878 }
3879
3880 int changed = 0;
3881
3933 while ((str = strchr (str, ';')) != NULL) 3882 while ((str = strchr (str, ';')) != NULL)
3934 { 3883 {
3935 str++; 3884 str++;
3936#if XPM_BACKGROUND 3885#if XPM_BACKGROUND
3937 changed += scale_pixmap (str); 3886 changed += scale_pixmap (str);
3938#endif 3887#endif
3939 } 3888 }
3940 3889
3941 if (changed) 3890 if (changed)
3942 { 3891 {
3943#ifdef XPM_BACKGROUND 3892#ifdef XPM_BACKGROUND
3944 resize_pixmap (); 3893 resize_pixmap ();
3945#endif
3946 scr_touch (true); 3894 scr_touch (true);
3895#endif
3947 } 3896 }
3897 }
3948 break; 3898 break;
3949 3899
3950 case XTerm_restoreFG: 3900 case Rxvt_restoreFG:
3951 set_window_color (Color_fg, str); 3901 set_window_color (Color_fg, str);
3952 break; 3902 break;
3953 case XTerm_restoreBG: 3903 case Rxvt_restoreBG:
3954 set_window_color (Color_bg, str); 3904 set_window_color (Color_bg, str);
3955 break; 3905 break;
3956 3906
3957 case XTerm_logfile: 3907 case XTerm_logfile:
3958 // TODO, when secure mode? 3908 // TODO, when secure mode?
3959 break; 3909 break;
3960 3910
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 3911#if 0
3968 case XTerm_dumpscreen: /* no error notices */ 3912 case Rxvt_dumpscreen: /* no error notices */
3969 { 3913 {
3970 int fd; 3914 int fd;
3971 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3915 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3972 { 3916 {
3973 scr_dump (fd); 3917 scr_dump (fd);
… …
3997 allocated.push_back ((void *)res); 3941 allocated.push_back ((void *)res);
3998 set_fonts (); 3942 set_fonts ();
3999 } 3943 }
4000 break; 3944 break;
4001 3945
4002#if ENABLE_FRILLS 3946 case URxvt_version:
3947 if (query)
3948 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3949 op,
3950 rs[Rs_name], VERSION[0], VERSION[2],
3951 resp);
3952 break;
3953
3954#if !ENABLE_MINIMAL
4003 case URxvt_locale: 3955 case URxvt_locale:
4004 if (query) 3956 if (query)
4005 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3957 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
4006 else 3958 else
4007 { 3959 {
4008 set_locale (str); 3960 set_locale (str);
4009 pty.set_utf8_mode (enc_utf8); 3961 pty->set_utf8_mode (enc_utf8);
4010 init_xlocale (); 3962 init_xlocale ();
4011 } 3963 }
4012 break; 3964 break;
4013 3965
4014 case URxvt_view_up: 3966 case URxvt_view_up:
… …
4025 break; 3977 break;
4026#endif 3978#endif
4027 3979
4028#if ENABLE_PERL 3980#if ENABLE_PERL
4029 case URxvt_perl: 3981 case URxvt_perl:
4030 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END))) 3982 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
4031 ; // no responses yet 3983 ; // no responses yet
4032 break; 3984 break;
4033#endif 3985#endif
4034 } 3986 }
4035} 3987}
… …
4067 return state; 4019 return state;
4068} 4020}
4069 4021
4070/* we're not using priv _yet_ */ 4022/* we're not using priv _yet_ */
4071void 4023void
4072rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4024rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4073{ 4025{
4074 unsigned int i, j; 4026 unsigned int i, j;
4075 int state; 4027 int state;
4076 4028
4077 static const struct 4029 static const struct
… …
4088 { 5, PrivMode_rVideo }, 4040 { 5, PrivMode_rVideo },
4089 { 6, PrivMode_relOrigin }, 4041 { 6, PrivMode_relOrigin },
4090 { 7, PrivMode_Autowrap }, 4042 { 7, PrivMode_Autowrap },
4091 // 8, bi-directional support mode 4043 // 8, bi-directional support mode
4092 { 9, PrivMode_MouseX10 }, 4044 { 9, PrivMode_MouseX10 },
4093#ifdef menuBar_esc
4094 { menuBar_esc, PrivMode_menuBar },
4095#endif
4096 // 18, 19 printing-related 4045 // 18, 19 printing-related
4097 { 25, PrivMode_VisibleCursor }, 4046 { 25, PrivMode_VisibleCursor },
4098#ifdef scrollBar_esc 4047#ifdef scrollBar_esc
4099 { scrollBar_esc, PrivMode_scrollBar }, 4048 { scrollBar_esc, PrivMode_scrollBar },
4100#endif 4049#endif
… …
4147 /* extra handling for values with state unkept */ 4096 /* extra handling for values with state unkept */
4148 switch (arg[i]) 4097 switch (arg[i])
4149 { 4098 {
4150#if ENABLE_STYLES 4099#if ENABLE_STYLES
4151 case 1021: 4100 case 1021:
4152 if (mode) 4101 set_option (Opt_intensityStyles, mode);
4153 SET_OPTION (Opt_intensityStyles);
4154 else
4155 CLR_OPTION (Opt_intensityStyles);
4156 4102
4157 scr_touch (true); 4103 scr_touch (true);
4158 break; 4104 break;
4159#endif 4105#endif
4160 case 1048: /* alternative cursor save */ 4106 case 1048: /* alternative cursor save */
… …
4182 case 3: /* 80/132 */ 4128 case 3: /* 80/132 */
4183 if (priv_modes & PrivMode_132OK) 4129 if (priv_modes & PrivMode_132OK)
4184 set_widthheight (((state ? 132 : 80) * fwidth), height); 4130 set_widthheight (((state ? 132 : 80) * fwidth), height);
4185 break; 4131 break;
4186 case 4: /* smooth scrolling */ 4132 case 4: /* smooth scrolling */
4187 if (!state) 4133 set_option (Opt_jumpScroll, !state);
4188 SET_OPTION (Opt_jumpScroll);
4189 else
4190 CLR_OPTION (Opt_jumpScroll);
4191 break; 4134 break;
4192 case 5: /* reverse video */ 4135 case 5: /* reverse video */
4193 scr_rvideo_mode (state); 4136 scr_rvideo_mode (state);
4194 break; 4137 break;
4195 case 6: /* relative/absolute origins */ 4138 case 6: /* relative/absolute origins */
… …
4201 /* case 8: - auto repeat, can't do on a per window basis */ 4144 /* case 8: - auto repeat, can't do on a per window basis */
4202 case 9: /* X10 mouse reporting */ 4145 case 9: /* X10 mouse reporting */
4203 if (state) /* orthogonal */ 4146 if (state) /* orthogonal */
4204 priv_modes &= ~PrivMode_MouseX11; 4147 priv_modes &= ~PrivMode_MouseX11;
4205 break; 4148 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 4149#ifdef scrollBar_esc
4214 case scrollBar_esc: 4150 case scrollBar_esc:
4215 if (scrollbar_mapping (state)) 4151 if (scrollbar_mapping (state))
4216 { 4152 {
4217 resize_all_windows (0, 0, 0); 4153 resize_all_windows (0, 0, 0);
… …
4236#if 0 4172#if 0
4237 case 1001: 4173 case 1001:
4238 break; /* X11 mouse highlighting */ 4174 break; /* X11 mouse highlighting */
4239#endif 4175#endif
4240 case 1010: /* scroll to bottom on TTY output inhibit */ 4176 case 1010: /* scroll to bottom on TTY output inhibit */
4241 if (!state) 4177 set_option (Opt_scrollTtyOutput, !state);
4242 SET_OPTION (Opt_scrollTtyOutput);
4243 else
4244 CLR_OPTION (Opt_scrollTtyOutput);
4245 break; 4178 break;
4246 case 1011: /* scroll to bottom on key press */ 4179 case 1011: /* scroll to bottom on key press */
4247 if (state) 4180 set_option (Opt_scrollTtyKeypress, state);
4248 SET_OPTION (Opt_scrollTtyKeypress);
4249 else
4250 CLR_OPTION (Opt_scrollTtyKeypress);
4251 break; 4181 break;
4252 case 1047: /* secondary screen w/ clearing last */ 4182 case 1047: /* secondary screen w/ clearing last */
4253 if (OPTION (Opt_secondaryScreen)) 4183 if (OPTION (Opt_secondaryScreen))
4254 if (current_screen != PRIMARY) 4184 if (current_screen != PRIMARY)
4255 scr_erase_screen (2); 4185 scr_erase_screen (2);
… …
4393 scr_color (Color_bg, Color_bg); 4323 scr_color (Color_bg, Color_bg);
4394 break; 4324 break;
4395 4325
4396 //case 50: // not variable spacing 4326 //case 50: // not variable spacing
4397 4327
4398#if ENABLE_FRILLS 4328#if !ENABLE_MINIMAL
4399 case 90: 4329 case 90:
4400 case 91: /* set bright fg color */ 4330 case 91: /* set bright fg color */
4401 case 92: 4331 case 92:
4402 case 93: 4332 case 93:
4403 case 94: 4333 case 94:
… …
4465const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4395const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4466 4396
4467void 4397void
4468rxvt_term::tt_write (const char *data, unsigned int len) 4398rxvt_term::tt_write (const char *data, unsigned int len)
4469{ 4399{
4470 if (pty.pty < 0) 4400 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4471 return; 4401 return;
4472 4402
4403 if (pty->pty < 0)
4404 return;
4405
4473 if (v_buflen == 0) 4406 if (v_buflen == 0)
4474 { 4407 {
4475 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4408 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4476 4409
4477 if ((unsigned int)written == len) 4410 if ((unsigned int)written == len)
4478 return; 4411 return;
4479 4412
4480 data += written; 4413 data += written;
… …
4489 pty_ev.set (EVENT_READ | EVENT_WRITE); 4422 pty_ev.set (EVENT_READ | EVENT_WRITE);
4490} 4423}
4491 4424
4492void rxvt_term::pty_write () 4425void rxvt_term::pty_write ()
4493{ 4426{
4494 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4427 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4495 4428
4496 if (written > 0) 4429 if (written > 0)
4497 { 4430 {
4498 v_buflen -= written; 4431 v_buflen -= written;
4499 4432

Diff Legend

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