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.302 by root, Tue Jan 31 21:35:39 2006 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
49#include "rxvt.h" 49#include "rxvt.h"
50#include "rxvtperl.h" 50#include "rxvtperl.h"
51#include "version.h" 51#include "version.h"
52#include "command.h" 52#include "command.h"
53 53
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
59#ifdef KEYSYM_RESOURCE 54#ifdef KEYSYM_RESOURCE
60# include "keyboard.h" 55# include "keyboard.h"
61#endif 56#endif
62 57
63#include <csignal> 58#include <csignal>
64 59
65/*----------------------------------------------------------------------*/ 60/*----------------------------------------------------------------------*/
66 61
67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 62#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
68
69// exception thrown when the command parser runs out of input data
70class out_of_input { } out_of_input;
71 63
72#if ENABLE_FRILLS || ISO_14755 64#if ENABLE_FRILLS || ISO_14755
73 65
74#define ISO_14755_STARTED 0x80000000UL 66#define ISO_14755_STARTED 0x80000000UL
75#define ISO_14755_51 0x40000000UL // basic (section 5.1) 67#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
147 || !IN_RANGE_EXC (y, 0, nrow)) 139 || !IN_RANGE_EXC (y, 0, nrow))
148 return; 140 return;
149 141
150 for (;;) 142 for (;;)
151 { 143 {
152 const line_t &l = ROW(y - view_start); 144 const line_t &l = ROW(y + view_start);
153 145
154 text_t t = l.t[x]; 146 text_t t = l.t[x];
155 147
156 if (t != NOCHAR || !x) 148 if (t != NOCHAR || !x)
157 { 149 {
… …
230# if !UNICODE3 222# if !UNICODE3
231 if (ch >= 0x10000) 223 if (ch >= 0x10000)
232 ch = 0xfffd; 224 ch = 0xfffd;
233# endif 225# endif
234 scr_overlay_set (11, y, ch, r); 226 scr_overlay_set (11, y, ch, r);
227
228 if (WCWIDTH (ch) >= 2)
235 scr_overlay_set (12, y, NOCHAR, r); 229 scr_overlay_set (12, y, NOCHAR, r);
236 } 230 }
237 231
232// {
233// char buf[4+4+3+1];
234// snprintf (buf, sizeof (buf), "(%.4d|%.4d)", x, y);
235// scr_overlay_set (0, 0, buf);
236// }
238 scr_overlay_set (0, len , attr); 237 scr_overlay_set (0, len , attr);
239 scr_overlay_set (0, len + 1, fname); 238 scr_overlay_set (0, len + 1, fname);
240 239
241 free (fname); 240 free (fname);
242 241
… …
302rxvt_term::lookup_key (XKeyEvent &ev) 301rxvt_term::lookup_key (XKeyEvent &ev)
303{ 302{
304 int ctrl, meta, shft, len; 303 int ctrl, meta, shft, len;
305 unsigned int newlen; 304 unsigned int newlen;
306 KeySym keysym; 305 KeySym keysym;
307#ifdef DEBUG_CMD
308 static int debug_key = 1; /* accessible by a debugger only */
309#endif
310 int valid_keysym; 306 int valid_keysym;
311 char kbuf[KBUFSZ]; 307 char kbuf[KBUFSZ];
312 308
313 /* 309 /*
314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 310 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
… …
443 scr_move_to (0, 1); 439 scr_move_to (0, 1);
444 return; 440 return;
445 } 441 }
446 else if (keysym == XK_End) 442 else if (keysym == XK_End)
447 { 443 {
448 scr_move_to (1, 0); 444 scr_move_to (1, 1);
449 return; 445 return;
450 } 446 }
451 } 447 }
452#endif 448#endif
453 } 449 }
… …
464 { 460 {
465 switch (keysym) 461 switch (keysym)
466 { 462 {
467 /* normal XTerm key bindings */ 463 /* normal XTerm key bindings */
468 case XK_Insert: /* Shift+Insert = paste mouse selection */ 464 case XK_Insert: /* Shift+Insert = paste mouse selection */
469 selection_request (ev.time, 0, 0); 465 selection_request (ev.time);
470 return; 466 return;
471#if TODO 467#if TODO
472 /* rxvt extras */ 468 /* rxvt extras */
473 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 469 case XK_KP_Add: /* Shift+KP_Add = bigger font */
474 change_font (FONT_UP); 470 change_font (FONT_UP);
… …
867#endif 863#endif
868 /* nil */ ; 864 /* nil */ ;
869 } 865 }
870 } 866 }
871 867
872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_STRING_LEN, kbuf, len, DT_END))) 868 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
873 return; 869 return;
874 870
875 if (len <= 0) 871 if (len <= 0)
876 return; /* not mapped */ 872 return; /* not mapped */
877 873
… …
905 { 901 {
906 const char ch = C0_ESC; 902 const char ch = C0_ESC;
907 tt_write (&ch, 1); 903 tt_write (&ch, 1);
908 } 904 }
909 905
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); 906 tt_write (kbuf, (unsigned int)len);
921} 907}
922/*}}} */ 908/*}}} */
923 909
924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 910#if defined (KEYSYM_RESOURCE)
925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
926/* attempt to `write' count to the input buffer */
927unsigned int 911unsigned int
928rxvt_term::cmd_write (const char *str, unsigned int count) 912rxvt_term::cmd_write (const char *str, unsigned int count)
929{ 913{
930 unsigned int n, s; 914 unsigned int n, s;
931 915
… …
972 956
973 if (want_refresh) 957 if (want_refresh)
974 { 958 {
975 if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) 959 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976 { 960 {
977 int row = -view_start; 961 int row = view_start;
962 int end_row = row + nrow;
978 963
979 while (row > -nsaved && ROW (row - 1).is_longer ()) 964 while (row > top_row && ROW (row - 1).is_longer ())
980 --row; 965 --row;
981 966
982 while (row < -view_start + nrow) 967 do
983 { 968 {
984 int start_row = row; 969 int start_row = row;
985 line_t *l; 970 line_t *l;
986 971
987 do 972 do
988 { 973 {
989 l = &ROW (row); 974 l = &ROW (row++);
990 975
991 if (!(l->f & LINE_FILTERED)) 976 if (!(l->f & LINE_FILTERED))
992 { 977 {
993 // line not filtered, mark it as filtered 978 // line not filtered, mark it as filtered
994 l->f |= LINE_FILTERED; 979 l->f |= LINE_FILTERED;
995 while (l->is_longer ()) 980 while (l->is_longer ())
996 { 981 {
997 l = &ROW (++row); 982 l = &ROW (row++);
998 l->f |= LINE_FILTERED; 983 l->f |= LINE_FILTERED;
999 } 984 }
1000 985
1001 // and filter it 986 // and filter it
1002 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END)); 987 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1003 988
1004 break; 989 break;
1005 } 990 }
1006 } 991 }
1007 while (l->is_longer ()); 992 while (l->is_longer () && row < end_row);
1008
1009 row++;
1010 } 993 }
994 while (row < end_row);
1011 995 }
1012 }
1013 996
1014 scr_refresh (refresh_type); 997 scr_refresh ();
1015 scrollbar_show (1); 998 scrollbar_show (1);
1016#ifdef USE_XIM 999#ifdef USE_XIM
1017 IMSendSpot (); 1000 IMSendSpot ();
1018#endif 1001#endif
1019 } 1002 }
… …
1022} 1005}
1023 1006
1024void 1007void
1025rxvt_term::check_cb (check_watcher &w) 1008rxvt_term::check_cb (check_watcher &w)
1026{ 1009{
1027 SET_R (this); 1010 make_current ();
1028 SET_LOCALE (locale);
1029 1011
1030 display->flush (); 1012 display->flush ();
1031 1013
1032 if (want_refresh && !flush_ev.active) 1014 if (want_refresh && !flush_ev.active)
1033 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally 1015 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
1034} 1016}
1035 1017
1036void 1018void
1037rxvt_term::flush_cb (time_watcher &w) 1019rxvt_term::flush_cb (time_watcher &w)
1038{ 1020{
1039 SET_R (this); 1021 make_current ();
1040 SET_LOCALE (locale);
1041 1022
1042 refresh_limit = 1; 1023 refresh_limit = 1;
1043 refresh_count = 0; 1024 refresh_count = 0;
1044 flush (); 1025 flush ();
1045} 1026}
… …
1049rxvt_term::cursor_blink_cb (time_watcher &w) 1030rxvt_term::cursor_blink_cb (time_watcher &w)
1050{ 1031{
1051 hidden_cursor = !hidden_cursor; 1032 hidden_cursor = !hidden_cursor;
1052 want_refresh = 1; 1033 want_refresh = 1;
1053 1034
1054 w.start (w.at + BLINK_INTERVAL); 1035 w.start (w.at + CURSOR_BLINK_INTERVAL);
1055} 1036}
1056#endif 1037#endif
1057 1038
1058#ifdef TEXT_BLINK 1039#ifdef TEXT_BLINK
1059void 1040void
… …
1073rxvt_term::cont_scroll_cb (time_watcher &w) 1054rxvt_term::cont_scroll_cb (time_watcher &w)
1074{ 1055{
1075 if ((scrollbar_isUp() || scrollbar_isDn()) && 1056 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1076 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1057 scr_page (scrollbar_isUp() ? UP : DN, 1))
1077 { 1058 {
1078 refresh_type |= SMOOTH_REFRESH;
1079 want_refresh = 1; 1059 want_refresh = 1;
1080 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1060 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1081 } 1061 }
1082} 1062}
1083#endif 1063#endif
… …
1087rxvt_term::sel_scroll_cb (time_watcher &w) 1067rxvt_term::sel_scroll_cb (time_watcher &w)
1088{ 1068{
1089 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1069 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1090 { 1070 {
1091 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1071 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1092 refresh_type |= SMOOTH_REFRESH;
1093 want_refresh = 1; 1072 want_refresh = 1;
1094 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1073 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1095 } 1074 }
1096} 1075}
1097#endif 1076#endif
… …
1102{ 1081{
1103 if (mouse_slip_wheel_speed == 0 1082 if (mouse_slip_wheel_speed == 0
1104 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1083 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1105 : scr_page (UP, mouse_slip_wheel_speed)) 1084 : scr_page (UP, mouse_slip_wheel_speed))
1106 { 1085 {
1107 if (view_start == nsaved || 1086 if (view_start == top_row || view_start == 0)
1108 view_start == 0)
1109 mouse_slip_wheel_speed = 0; 1087 mouse_slip_wheel_speed = 0;
1110 1088
1111 refresh_type |= SMOOTH_REFRESH;
1112 want_refresh = 1; 1089 want_refresh = 1;
1113 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1090 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1114 } 1091 }
1115} 1092}
1116#endif 1093#endif
1117 1094
1118#if HAVE_SCHED_YIELD 1095#if LINUX_YIELD_HACK
1119static struct event_handler 1096static struct event_handler
1120{ 1097{
1121 check_watcher cw_yield; 1098 check_watcher yield_ev;
1122 1099
1123 void yield (check_watcher &w) 1100 void yield_cb (check_watcher &w)
1124 { 1101 {
1125 sched_yield (); 1102 usleep (0);
1126 w.stop (); 1103 w.stop ();
1127 } 1104 }
1128 1105
1129 event_handler () 1106 event_handler ()
1130 : cw_yield (this, &event_handler::yield) 1107 : yield_ev (this, &event_handler::yield_cb)
1131 { 1108 {
1132 } 1109 }
1133} event_handler; 1110} event_handler;
1134#endif 1111#endif
1135 1112
… …
1146 1123
1147 memmove (cmdbuf_base, cmdbuf_ptr, n); 1124 memmove (cmdbuf_base, cmdbuf_ptr, n);
1148 cmdbuf_ptr = cmdbuf_base; 1125 cmdbuf_ptr = cmdbuf_base;
1149 cmdbuf_endp = cmdbuf_ptr + n; 1126 cmdbuf_endp = cmdbuf_ptr + n;
1150 1127
1151 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1128 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1152 1129
1153 if (r > 0) 1130 if (r > 0)
1154 { 1131 {
1155 cmdbuf_endp += r; 1132 cmdbuf_endp += r;
1156 return true; 1133 return true;
1157 } 1134 }
1158 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1135 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1159 { 1136 {
1160#if HAVE_SCHED_YIELD 1137#if LINUX_YIELD_HACK
1161 if (display->is_local) 1138 if (display->is_local)
1162 event_handler.cw_yield.start (); 1139 event_handler.yield_ev.start ();
1163#endif 1140#endif
1164 } 1141 }
1165 else 1142 else
1166 { 1143 {
1167 pty_ev.stop (); 1144 pty_ev.stop ();
… …
1174} 1151}
1175 1152
1176void 1153void
1177rxvt_term::pty_cb (io_watcher &w, short revents) 1154rxvt_term::pty_cb (io_watcher &w, short revents)
1178{ 1155{
1179 SET_R (this); 1156 make_current ();
1180 SET_LOCALE (locale);
1181 1157
1182 if (revents & EVENT_READ) 1158 if (revents & EVENT_READ)
1183 // loop, but don't allow a single term to monopolize us 1159 // loop, but don't allow a single term to monopolize us
1184 while (pty_fill ()) 1160 while (pty_fill ())
1185 if (cmd_parse ()) 1161 if (cmd_parse ())
… …
1190} 1166}
1191 1167
1192void 1168void
1193rxvt_term::pointer_unblank () 1169rxvt_term::pointer_unblank ()
1194{ 1170{
1195 XDefineCursor (display->display, vt, TermWin_cursor); 1171 XDefineCursor (xdisp, vt, TermWin_cursor);
1196 recolour_cursor (); 1172 recolour_cursor ();
1197 1173
1198#ifdef POINTER_BLANK 1174#ifdef POINTER_BLANK
1199 hidden_pointer = 0; 1175 hidden_pointer = 0;
1200 1176
… …
1208rxvt_term::pointer_blank () 1184rxvt_term::pointer_blank ()
1209{ 1185{
1210 if (!OPTION (Opt_pointerBlank)) 1186 if (!OPTION (Opt_pointerBlank))
1211 return; 1187 return;
1212 1188
1213 XDefineCursor (display->display, vt, display->blank_cursor); 1189 XDefineCursor (xdisp, vt, display->blank_cursor);
1214 XFlush (display->display); 1190 XFlush (xdisp);
1215 1191
1216 hidden_pointer = 1; 1192 hidden_pointer = 1;
1217} 1193}
1218 1194
1219void 1195void
1220rxvt_term::pointer_cb (time_watcher &w) 1196rxvt_term::pointer_cb (time_watcher &w)
1221{ 1197{
1222 SET_R (this); 1198 make_current ();
1223 SET_LOCALE (locale);
1224 1199
1225 pointer_blank (); 1200 pointer_blank ();
1226} 1201}
1227#endif 1202#endif
1228 1203
… …
1293 (32 + button_number + key_state), 1268 (32 + button_number + key_state),
1294 (32 + x + 1), 1269 (32 + x + 1),
1295 (32 + y + 1)); 1270 (32 + y + 1));
1296} 1271}
1297 1272
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 */ 1273/*{{{ process an X event */
1309void 1274void
1310rxvt_term::x_cb (XEvent &ev) 1275rxvt_term::x_cb (XEvent &ev)
1311{ 1276{
1312 dDisp; 1277 make_current ();
1313 1278
1314 SET_R (this); 1279 dLocal (Display *, xdisp);
1315 SET_LOCALE (locale);
1316 1280
1317#if defined(CURSOR_BLINK) 1281 if (ev.xany.window == vt
1318 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1282 && SHOULD_INVOKE (HOOK_X_EVENT)
1319 { 1283 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1320 if (hidden_cursor) 1284 return;
1321 {
1322 hidden_cursor = 0;
1323 want_refresh = 1;
1324 }
1325 1285
1326 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1286 // 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; 1287 Window unused_root, unused_child;
1345 int unused_root_x, unused_root_y; 1288 int unused_root_x, unused_root_y;
1346 unsigned int unused_mask; 1289 unsigned int unused_mask;
1347 1290
1348 switch (ev.type) 1291 switch (ev.type)
… …
1355 1298
1356 break; 1299 break;
1357 1300
1358 case KeyRelease: 1301 case KeyRelease:
1359 { 1302 {
1360#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1303#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1361 KeySym ks; 1304 KeySym keysym;
1362 1305
1363 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1306 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1364#endif 1307#endif
1365 1308
1366#if ENABLE_FRILLS || ISO_14755 1309#if ENABLE_FRILLS || ISO_14755
1367 // ISO 14755 support 1310 // ISO 14755 support
1368 if (iso14755buf) 1311 if (iso14755buf)
… …
1373# endif 1316# endif
1374# if ISO_14755 1317# if ISO_14755
1375 // iso14755 part 5.2 handling: release time 1318 // iso14755 part 5.2 handling: release time
1376 // first: controls 1319 // first: controls
1377 if ((ev.xkey.state & ControlMask) 1320 if ((ev.xkey.state & ControlMask)
1378 && ((ks >= 0x40 && ks <= 0x5f) 1321 && ((keysym >= 0x40 && keysym <= 0x5f)
1379 || (ks >= 0x61 && ks <= 0x7f))) 1322 || (keysym >= 0x61 && keysym <= 0x7f)))
1380 { 1323 {
1381 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1324 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1382 commit_iso14755 (); 1325 commit_iso14755 ();
1383 return; // case-break; 1326 goto skip_switch;
1384 } 1327 }
1385 1328
1386 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1329 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1387 if (i[0] == ks) 1330 if (i[0] == keysym)
1388 { 1331 {
1389 iso14755buf = ISO_14755_51 | i[1]; 1332 iso14755buf = ISO_14755_51 | i[1];
1390 commit_iso14755 (); 1333 commit_iso14755 ();
1391 return; // case-break; 1334 goto skip_switch;
1392 } 1335 }
1393 1336
1394 scr_bell (); 1337 scr_bell ();
1395# endif 1338# endif
1396 iso14755buf = 0; 1339 iso14755buf = 0;
… …
1415 else 1358 else
1416 iso14755buf = 0; 1359 iso14755buf = 0;
1417 } 1360 }
1418#endif 1361#endif
1419 1362
1363 if (ev.xany.window == vt
1420 if (ev.xany.window == vt && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END))) 1364 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1421 break; 1365 break;
1422 1366
1423#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1367#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1424 if (!(ev.xkey.state & ControlMask)) 1368 if (!(ev.xkey.state & ControlMask))
1425 slip_wheel_ev.stop (); 1369 slip_wheel_ev.stop ();
1426 else if (ks == XK_Control_L || ks == XK_Control_R) 1370 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1427 mouse_slip_wheel_speed = 0; 1371 mouse_slip_wheel_speed = 0;
1428#endif 1372#endif
1429 break; 1373 break;
1430 } 1374 }
1431 1375
… …
1437 button_release (ev.xbutton); 1381 button_release (ev.xbutton);
1438 break; 1382 break;
1439 1383
1440 case ClientMessage: 1384 case ClientMessage:
1441 if (ev.xclient.format == 32 1385 if (ev.xclient.format == 32
1442 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1386 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1443 { 1387 {
1388 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1389 {
1390 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1391 {
1444 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1392 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1393 {
1394 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1445 destroy (); 1395 destroy ();
1396 }
1446#if ENABLE_EWMH 1397#if ENABLE_EWMH
1447 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1398 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1448 XSendEvent (disp, ev.xclient.window = display->root, 1399 XSendEvent (xdisp, ev.xclient.window = display->root,
1449 False, SubstructureRedirectMask | SubstructureNotifyMask, 1400 False, SubstructureRedirectMask | SubstructureNotifyMask,
1450 &ev); 1401 &ev);
1402#endif
1403 }
1404 }
1405#if ENABLE_XEMBED
1406 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1407 {
1408 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1409 focus_in ();
1410 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1411 focus_out ();
1412 }
1451#endif 1413#endif
1452 } 1414 }
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; 1415 break;
1489 1416
1490 case MappingNotify: 1417 case MappingNotify:
1491 XRefreshKeyboardMapping (&ev.xmapping); 1418 XRefreshKeyboardMapping (&ev.xmapping);
1492 break; 1419 break;
… …
1525 break; 1452 break;
1526 1453
1527 case ConfigureNotify: 1454 case ConfigureNotify:
1528 if (ev.xconfigure.window == parent[0]) 1455 if (ev.xconfigure.window == parent[0])
1529 { 1456 {
1530 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1457 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1531 ; 1458 ;
1532 1459
1533 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1460 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1534 { 1461 {
1535 seen_resize = 1; 1462 seen_resize = 1;
1536 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1463 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1537 } 1464 }
1538 1465
1466 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1467
1539#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1468#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1540 if (OPTION (Opt_transparent)) 1469 if (OPTION (Opt_transparent))
1541 check_our_parents (); 1470 check_our_parents ();
1542#endif 1471#endif
1543 } 1472 }
1544 break; 1473 break;
1545 1474
1546 case PropertyNotify: 1475 case PropertyNotify:
1476 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1547 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1477 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1548 && ev.xproperty.state == PropertyNewValue) 1478 && ev.xproperty.state == PropertyNewValue)
1549 selection_property (ev.xproperty.window, ev.xproperty.atom); 1479 selection_property (ev.xproperty.window, ev.xproperty.atom);
1550 1480
1551 break; 1481 break;
1552 1482
1553 case SelectionClear: 1483 case SelectionClear:
1554 selection_clear (); 1484 selection_clear ();
… …
1559 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1489 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1560 break; 1490 break;
1561 1491
1562 case SelectionRequest: 1492 case SelectionRequest:
1563 selection_send (ev.xselectionrequest); 1493 selection_send (ev.xselectionrequest);
1494 break;
1495
1496 case MapNotify:
1497 mapped = 1;
1498#ifdef TEXT_BLINK
1499 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1500#endif
1501 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1564 break; 1502 break;
1565 1503
1566 case UnmapNotify: 1504 case UnmapNotify:
1567 mapped = 0; 1505 mapped = 0;
1568#ifdef TEXT_BLINK 1506#ifdef TEXT_BLINK
1569 text_blink_ev.stop (); 1507 text_blink_ev.stop ();
1570#endif 1508#endif
1571 break; 1509 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; 1510 break;
1579 1511
1580#ifdef TRANSPARENT 1512#ifdef TRANSPARENT
1581 case ReparentNotify: 1513 case ReparentNotify:
1582 rootwin_cb (ev); 1514 rootwin_cb (ev);
… …
1588 if (ev.xany.window == vt) 1520 if (ev.xany.window == vt)
1589 { 1521 {
1590 do 1522 do
1591 scr_expose (ev.xexpose.x, ev.xexpose.y, 1523 scr_expose (ev.xexpose.x, ev.xexpose.y,
1592 ev.xexpose.width, ev.xexpose.height, False); 1524 ev.xexpose.width, ev.xexpose.height, False);
1593 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1525 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1594 1526
1595 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1527 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1596 1528
1597 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1529 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1598 scr_expose (ev.xexpose.x, ev.xexpose.y, 1530 scr_expose (ev.xexpose.x, ev.xexpose.y,
1599 ev.xexpose.width, ev.xexpose.height, False); 1531 ev.xexpose.width, ev.xexpose.height, False);
1600 1532
1601 scr_refresh (refresh_type); 1533 want_refresh = 1;
1602 } 1534 }
1603 else 1535 else
1604 { 1536 {
1605 XEvent unused_event; 1537 XEvent unused_event;
1606 1538
1607 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1539 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1608 ; 1540 ;
1609 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1541 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1610 ; 1542 ;
1611 1543
1612 if (isScrollbarWindow (ev.xany.window)) 1544 if (isScrollbarWindow (ev.xany.window))
1613 { 1545 {
1614 scrollBar.setIdle (); 1546 scrollBar.setIdle ();
1615 scrollbar_show (0); 1547 scrollbar_show (0);
1616 } 1548 }
1617#ifdef MENUBAR
1618 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1619 menubar_expose ();
1620#endif
1621 1549
1622#ifdef TRANSPARENT 1550#ifdef TRANSPARENT
1623 if (am_transparent && ev.xany.window == parent[0]) 1551 if (am_transparent && ev.xany.window == parent[0])
1624 XClearWindow (disp, ev.xany.window); 1552 XClearWindow (xdisp, ev.xany.window);
1625#endif 1553#endif
1626 } 1554 }
1627 break; 1555 break;
1628 1556
1629 case MotionNotify: 1557 case MotionNotify:
1630#ifdef POINTER_BLANK 1558#ifdef POINTER_BLANK
1631 if (hidden_pointer) 1559 if (hidden_pointer)
1632 pointer_unblank (); 1560 pointer_unblank ();
1633#endif 1561#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) 1562 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1642 break; 1563 break;
1643 1564
1644 if (ev.xany.window == vt) 1565 if (ev.xany.window == vt)
1645 { 1566 {
1567 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1646 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) 1568 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1647 ; // nop 1569 ; // nop
1648 else if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1570 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1649 { 1571 {
1650 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1572 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1651 ; 1573 ;
1652 1574
1653 XQueryPointer (disp, vt, 1575 XQueryPointer (xdisp, vt,
1654 &unused_root, &unused_child, 1576 &unused_root, &unused_child,
1655 &unused_root_x, &unused_root_y, 1577 &unused_root_x, &unused_root_y,
1656 &ev.xbutton.x, &ev.xbutton.y, 1578 &ev.xbutton.x, &ev.xbutton.y,
1657 &ev.xbutton.state); 1579 &ev.xbutton.state);
1658#ifdef MOUSE_THRESHOLD 1580#ifdef MOUSE_THRESHOLD
… …
1722#endif 1644#endif
1723 } 1645 }
1724 } 1646 }
1725 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1647 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1726 { 1648 {
1727 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1649 while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1728 MotionNotify, &ev)) 1650 MotionNotify, &ev))
1729 ; 1651 ;
1730 1652
1731 XQueryPointer (disp, scrollBar.win, 1653 XQueryPointer (xdisp, scrollBar.win,
1732 &unused_root, &unused_child, 1654 &unused_root, &unused_child,
1733 &unused_root_x, &unused_root_y, 1655 &unused_root_x, &unused_root_y,
1734 &ev.xbutton.x, &ev.xbutton.y, 1656 &ev.xbutton.x, &ev.xbutton.y,
1735 &unused_mask); 1657 &unused_mask);
1736 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1658 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1737 scrollbar_size ()); 1659 scrollbar_size ());
1738 scr_refresh (refresh_type); 1660 want_refresh = 1;
1739 refresh_limit = 0; 1661 refresh_limit = 0;
1740 scrollbar_show (1); 1662 scrollbar_show (1);
1741 } 1663 }
1742 break; 1664 break;
1743 } 1665 }
1666
1667skip_switch: ;
1668
1669#if defined(CURSOR_BLINK)
1670 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1671 {
1672 if (hidden_cursor)
1673 {
1674 hidden_cursor = 0;
1675 want_refresh = 1;
1676 }
1677
1678 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1679 }
1680#endif
1681
1682#if defined(POINTER_BLANK)
1683 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1684 {
1685 if (ev.type == MotionNotify
1686 || ev.type == ButtonPress
1687 || ev.type == ButtonRelease)
1688 if (hidden_pointer)
1689 pointer_unblank ();
1690
1691 if (ev.type == KeyPress && hidden_pointer == 0)
1692 pointer_blank ();
1693 }
1694#endif
1744} 1695}
1745 1696
1746void 1697void
1747rxvt_term::focus_in () 1698rxvt_term::focus_in ()
1748{ 1699{
… …
1760 XSetICFocus (Input_Context); 1711 XSetICFocus (Input_Context);
1761 } 1712 }
1762#endif 1713#endif
1763#if CURSOR_BLINK 1714#if CURSOR_BLINK
1764 if (OPTION (Opt_cursorBlink)) 1715 if (OPTION (Opt_cursorBlink))
1765 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1716 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1766#endif 1717#endif
1767#if OFF_FOCUS_FADING 1718#if OFF_FOCUS_FADING
1768 if (rs[Rs_fade]) 1719 if (rs[Rs_fade])
1769 { 1720 {
1770 pix_colors = pix_colors_focused; 1721 pix_colors = pix_colors_focused;
… …
1814 1765
1815#if TRANSPARENT 1766#if TRANSPARENT
1816void 1767void
1817rxvt_term::rootwin_cb (XEvent &ev) 1768rxvt_term::rootwin_cb (XEvent &ev)
1818{ 1769{
1819 SET_R (this); 1770 make_current ();
1820 SET_LOCALE (locale);
1821 1771
1822 switch (ev.type) 1772 switch (ev.type)
1823 { 1773 {
1824 case PropertyNotify: 1774 case PropertyNotify:
1825 /* 1775 /*
… …
1852 /* 1802 /*
1853 * VT window processing of button press 1803 * VT window processing of button press
1854 */ 1804 */
1855 if (ev.window == vt) 1805 if (ev.window == vt)
1856 { 1806 {
1807 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1808 return;
1809
1857#if ISO_14755 1810#if ISO_14755
1858 // 5.4 1811 // 5.4
1859 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1812 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1860 { 1813 {
1861 iso14755_54 (ev.x, ev.y); 1814 iso14755_54 (ev.x, ev.y);
… …
1873#ifdef MOUSE_REPORT_DOUBLECLICK 1826#ifdef MOUSE_REPORT_DOUBLECLICK
1874 if (ev.button == MEvent.button && clickintime) 1827 if (ev.button == MEvent.button && clickintime)
1875 { 1828 {
1876 /* same button, within alloted time */ 1829 /* same button, within alloted time */
1877 MEvent.clicks++; 1830 MEvent.clicks++;
1831
1878 if (MEvent.clicks > 1) 1832 if (MEvent.clicks > 1)
1879 { 1833 {
1880 /* only report double clicks */ 1834 /* only report double clicks */
1881 MEvent.clicks = 2; 1835 MEvent.clicks = 2;
1882 mouse_report (ev); 1836 mouse_report (ev);
… …
1902 else 1856 else
1903 { 1857 {
1904 if (ev.button != MEvent.button) 1858 if (ev.button != MEvent.button)
1905 MEvent.clicks = 0; 1859 MEvent.clicks = 0;
1906 1860
1907 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1908 switch (ev.button) 1861 switch (ev.button)
1909 { 1862 {
1910 case Button1: 1863 case Button1:
1911 /* allow meta + click to select rectangular areas */ 1864 /* allow meta + click to select rectangular areas */
1912 /* should be done in screen.C */ 1865 /* should be done in screen.C */
1913#if ENABLE_FRILLS 1866#if ENABLE_FRILLS
1914 selection.rect = !!(ev.state & ModMetaMask); 1867 selection.rect = !!(ev.state & ModMetaMask);
1915#else 1868#else
1916 selection.rect = false; 1869 selection.rect = false;
1917#endif 1870#endif
1918 1871
1919 /* allow shift+left click to extend selection */ 1872 /* allow shift+left click to extend selection */
1920 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1873 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1921 { 1874 {
1922 if (MEvent.button == Button1 && clickintime) 1875 if (MEvent.button == Button1 && clickintime)
1923 selection_rotate (ev.x, ev.y); 1876 selection_rotate (ev.x, ev.y);
1924 else 1877 else
1925 selection_extend (ev.x, ev.y, 1); 1878 selection_extend (ev.x, ev.y, 1);
1926 } 1879 }
1927 else 1880 else
1928 { 1881 {
1929 if (MEvent.button == Button1 && clickintime) 1882 if (MEvent.button == Button1 && clickintime)
1930 MEvent.clicks++; 1883 MEvent.clicks++;
1931 else 1884 else
1932 MEvent.clicks = 1; 1885 MEvent.clicks = 1;
1933 1886
1934 selection_click (MEvent.clicks, ev.x, ev.y); 1887 selection_click (MEvent.clicks, ev.x, ev.y);
1935 } 1888 }
1936 1889
1937 MEvent.button = Button1; 1890 MEvent.button = Button1;
1938 break; 1891 break;
1939 1892
1940 case Button3: 1893 case Button3:
1941 if (MEvent.button == Button3 && clickintime) 1894 if (MEvent.button == Button3 && clickintime)
1942 selection_rotate (ev.x, ev.y); 1895 selection_rotate (ev.x, ev.y);
1943 else 1896 else
1944 selection_extend (ev.x, ev.y, 1); 1897 selection_extend (ev.x, ev.y, 1);
1945 1898
1946 MEvent.button = Button3; 1899 MEvent.button = Button3;
1947 break; 1900 break;
1948 } 1901 }
1949 } 1902 }
1950 1903
1951 MEvent.time = ev.time; 1904 MEvent.time = ev.time;
1952 return; 1905 return;
1953 } 1906 }
1954 1907
… …
2090 } 2043 }
2091 2044
2092 break; 2045 break;
2093 } 2046 }
2094 } 2047 }
2048
2095 return; 2049 return;
2096 } 2050 }
2097#if MENUBAR
2098 /*
2099 * Menubar window processing of button press
2100 */
2101 if (isMenuBarWindow (ev.window))
2102 menubar_control (ev);
2103#endif
2104} 2051}
2105 2052
2106void 2053void
2107rxvt_term::button_release (XButtonEvent &ev) 2054rxvt_term::button_release (XButtonEvent &ev)
2108{ 2055{
… …
2114 2061
2115 if (scrollbar_isUpDn ()) 2062 if (scrollbar_isUpDn ())
2116 { 2063 {
2117 scrollBar.setIdle (); 2064 scrollBar.setIdle ();
2118 scrollbar_show (0); 2065 scrollbar_show (0);
2119#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2120 refresh_type &= ~SMOOTH_REFRESH;
2121#endif
2122 } 2066 }
2123 2067
2124#ifdef SELECTION_SCROLLING 2068#ifdef SELECTION_SCROLLING
2125 if (sel_scroll_ev.active) 2069 if (sel_scroll_ev.active)
2126 sel_scroll_ev.stop(); 2070 sel_scroll_ev.stop();
2127#endif 2071#endif
2128 2072
2129 if (ev.window == vt) 2073 if (ev.window == vt)
2130 { 2074 {
2075 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2076 return;
2077
2131#if ISO_14755 2078#if ISO_14755
2132 // 5.4 2079 // 5.4
2133 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2080 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2134 return; 2081 return;
2135#endif 2082#endif
2083
2136 if (reportmode) 2084 if (reportmode)
2137 { 2085 {
2138 /* mouse report from vt window */ 2086 /* mouse report from vt window */
2139 /* don't report release of wheel "buttons" */ 2087 /* don't report release of wheel "buttons" */
2140 if (ev.button >= 4) 2088 if (ev.button >= 4)
… …
2164 if (priv_modes & PrivMode_mouse_report 2112 if (priv_modes & PrivMode_mouse_report
2165 && bypass_keystate 2113 && bypass_keystate
2166 && ev.button == Button1 && MEvent.clicks <= 1) 2114 && ev.button == Button1 && MEvent.clicks <= 1)
2167 selection_extend (ev.x, ev.y, 0); 2115 selection_extend (ev.x, ev.y, 0);
2168 2116
2169 if (!HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2170 return;
2171
2172 switch (ev.button) 2117 switch (ev.button)
2173 { 2118 {
2174 case Button1: 2119 case Button1:
2175 case Button3: 2120 case Button3:
2176 selection_make (ev.time); 2121 selection_make (ev.time);
2177 break; 2122 break;
2123
2178 case Button2: 2124 case Button2:
2179 selection_request (ev.time, ev.x, ev.y); 2125 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2126 selection_request (ev.time, ev.state & ModMetaMask ? Sel_Primary : Sel_Primary);
2180 break; 2127 break;
2128
2181#ifdef MOUSE_WHEEL 2129#ifdef MOUSE_WHEEL
2182 case Button4: 2130 case Button4:
2183 case Button5: 2131 case Button5:
2184 { 2132 {
2185 int i; 2133 int i;
… …
2207 slip_wheel_ev.start (); 2155 slip_wheel_ev.start ();
2208 } 2156 }
2209 else 2157 else
2210 { 2158 {
2211# endif 2159# endif
2212# ifdef JUMP_MOUSE_WHEEL
2213 scr_page (v, i); 2160 scr_page (v, i);
2214 scr_refresh (SMOOTH_REFRESH);
2215 scrollbar_show (1); 2161 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 2162# ifdef MOUSE_SLIP_WHEELING
2225 } 2163 }
2226#endif 2164# endif
2227 } 2165 }
2228 break; 2166 break;
2229#endif 2167#endif
2230 } 2168 }
2231 } 2169 }
2232#ifdef MENUBAR
2233 else if (isMenuBarWindow (ev.window))
2234 menubar_control (ev);
2235#endif
2236} 2170}
2237 2171
2238#ifdef TRANSPARENT 2172#ifdef TRANSPARENT
2239#if TINTING 2173#if TINTING
2240/* taken from aterm-0.4.2 */ 2174/* taken from aterm-0.4.2 */
2241 2175
2242typedef uint32_t RUINT32T; 2176typedef uint32_t RUINT32T;
2243 2177
2244void ShadeXImage(rxvt_display *display, XImage* srcImage, int shade, int rm, int gm, int bm) 2178void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm)
2245{ 2179{
2246 int sh_r, sh_g, sh_b; 2180 int sh_r, sh_g, sh_b;
2247 RUINT32T mask_r, mask_g, mask_b; 2181 RUINT32T mask_r, mask_g, mask_b;
2248 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2182 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2249 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2183 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2250 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2184 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2251 int i; 2185 int i;
2252 2186
2253 Visual *visual = display->visual; 2187 Visual *visual = term->visual;
2254 2188
2255 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2189 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2256 2190
2257 /* for convenience */ 2191 /* for convenience */
2258 mask_r = visual->red_mask; 2192 mask_r = visual->red_mask;
… …
2479 Atom atype; 2413 Atom atype;
2480 unsigned char *prop = NULL; 2414 unsigned char *prop = NULL;
2481 Window root, oldp, *list; 2415 Window root, oldp, *list;
2482 Pixmap rootpixmap = None; 2416 Pixmap rootpixmap = None;
2483 XWindowAttributes wattr, wrootattr; 2417 XWindowAttributes wattr, wrootattr;
2484 dDisp;
2485 2418
2486 pchanged = 0; 2419 pchanged = 0;
2487 2420
2488 if (!OPTION (Opt_transparent)) 2421 if (!OPTION (Opt_transparent))
2489 return pchanged; /* Don't try any more */ 2422 return pchanged; /* Don't try any more */
2490 2423
2491 XGetWindowAttributes (disp, display->root, &wrootattr); 2424 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2492 rootdepth = wrootattr.depth; 2425 rootdepth = wrootattr.depth;
2493 2426
2494 XGetWindowAttributes (disp, parent[0], &wattr); 2427 XGetWindowAttributes (xdisp, parent[0], &wattr);
2495 2428
2496 if (rootdepth != wattr.depth) 2429 if (rootdepth != wattr.depth)
2497 { 2430 {
2498 if (am_transparent) 2431 if (am_transparent)
2499 { 2432 {
2500 pchanged = 1; 2433 pchanged = 1;
2501 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2434 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2502 am_transparent = am_pixmap_trans = 0; 2435 am_transparent = am_pixmap_trans = 0;
2503 } 2436 }
2504 2437
2505 return pchanged; /* Don't try any more */ 2438 return pchanged; /* Don't try any more */
2506 } 2439 }
2507 2440
2508 /* Get all X ops out of the queue so that our information is up-to-date. */ 2441 /* Get all X ops out of the queue so that our information is up-to-date. */
2509 XSync (disp, False); 2442 XSync (xdisp, False);
2510 2443
2511 /* 2444 /*
2512 * Make the frame window set by the window manager have 2445 * Make the frame window set by the window manager have
2513 * the root background. Some window managers put multiple nested frame 2446 * the root background. Some window managers put multiple nested frame
2514 * windows for each client, so we have to take care about that. 2447 * windows for each client, so we have to take care about that.
2515 */ 2448 */
2516 i = (xa[XA_XROOTPMAP_ID] 2449 i = (xa[XA_XROOTPMAP_ID]
2517 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2450 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2518 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2451 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2519 &nitems, &bytes_after, &prop) == Success); 2452 &nitems, &bytes_after, &prop) == Success);
2520 2453
2521 if (!i || prop == NULL) 2454 if (!i || prop == NULL)
2522 i = (xa[XA_ESETROOT_PMAP_ID] 2455 i = (xa[XA_ESETROOT_PMAP_ID]
2523 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2456 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2524 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2457 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2525 &nitems, &bytes_after, &prop) == Success); 2458 &nitems, &bytes_after, &prop) == Success);
2526 2459
2527 if (!i || prop == NULL 2460 if (!i || prop == NULL
2528#if TINTING 2461#if TINTING
2529 || !rs[Rs_color + Color_tint] 2462 || !ISSET_PIXCOLOR (Color_tint)
2530#endif 2463#endif
2531 ) 2464 )
2532 have_pixmap = 0; 2465 have_pixmap = 0;
2533 else 2466 else
2534 { 2467 {
… …
2547 Window cr; 2480 Window cr;
2548 XImage *image; 2481 XImage *image;
2549 GC gc; 2482 GC gc;
2550 XGCValues gcvalue; 2483 XGCValues gcvalue;
2551 2484
2552 XTranslateCoordinates (disp, parent[0], display->root, 2485 XTranslateCoordinates (xdisp, parent[0], display->root,
2553 0, 0, &sx, &sy, &cr); 2486 0, 0, &sx, &sy, &cr);
2554 nw = (unsigned int)szHint.width; 2487 nw = (unsigned int)szHint.width;
2555 nh = (unsigned int)szHint.height; 2488 nh = (unsigned int)szHint.height;
2556 nx = ny = 0; 2489 nx = ny = 0;
2557 2490
… …
2570 } 2503 }
2571 2504
2572 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2505 min_it (nw, (unsigned int) (wrootattr.width - sx));
2573 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2506 min_it (nh, (unsigned int) (wrootattr.height - sy));
2574 2507
2575 XSync (disp, False); 2508 XSync (xdisp, False);
2576 allowedxerror = -1; 2509 allowedxerror = -1;
2577 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2510 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2578 2511
2579 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2512 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2580 /* XXX: may need a delay here? */ 2513 /* XXX: may need a delay here? */
2581 allowedxerror = 0; 2514 allowedxerror = 0;
2582 2515
… …
2585 if (am_transparent && am_pixmap_trans) 2518 if (am_transparent && am_pixmap_trans)
2586 { 2519 {
2587 pchanged = 1; 2520 pchanged = 1;
2588 if (pixmap != None) 2521 if (pixmap != None)
2589 { 2522 {
2590 XFreePixmap (disp, pixmap); 2523 XFreePixmap (xdisp, pixmap);
2591 pixmap = None; 2524 pixmap = None;
2592 } 2525 }
2593 } 2526 }
2594 2527
2595 am_pixmap_trans = 0; 2528 am_pixmap_trans = 0;
2596 } 2529 }
2597 else 2530 else
2598 { 2531 {
2599 if (pixmap != None) 2532 if (pixmap != None)
2600 XFreePixmap (disp, pixmap); 2533 XFreePixmap (xdisp, pixmap);
2601 2534
2602#if TINTING 2535#if TINTING
2603 if (ISSET_PIXCOLOR (Color_tint)) 2536 if (ISSET_PIXCOLOR (Color_tint))
2604 { 2537 {
2605 unsigned short rm, gm, bm;
2606 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2538 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2607 2539
2540 rgba c;
2608 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2541 pix_colors_focused [Color_tint].get (c);
2609 2542
2610 ShadeXImage (display, image, shade, rm, gm, bm); 2543 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2611 } 2544 }
2612#endif 2545#endif
2613 2546
2614 pixmap = XCreatePixmap (disp, vt, 2547 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2615 szHint.width, szHint.height, image->depth);
2616 gc = XCreateGC (disp, vt, 0UL, &gcvalue); 2548 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2617 XPutImage (disp, pixmap, gc, image, 0, 0, 2549 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2618 nx, ny, image->width, image->height); 2550 nx, ny, image->width, image->height);
2619 XFreeGC (disp, gc); 2551 XFreeGC (xdisp, gc);
2620 XDestroyImage (image); 2552 XDestroyImage (image);
2621 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2553 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2622 XClearWindow (disp, parent[0]); 2554 XClearWindow (xdisp, parent[0]);
2623 2555
2624 if (!am_transparent || !am_pixmap_trans) 2556 if (!am_transparent || !am_pixmap_trans)
2625 pchanged = 1; 2557 pchanged = 1;
2626 2558
2627 am_transparent = am_pixmap_trans = 1; 2559 am_transparent = am_pixmap_trans = 1;
2628 } 2560 }
2629 } 2561 }
2630 2562
2631 if (am_pixmap_trans) 2563 if (am_pixmap_trans)
2632 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2564 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2633 else 2565 else
2634 { 2566 {
2635 unsigned int n; 2567 unsigned int n;
2636 /* 2568 /*
2637 * InheritPixmap transparency 2569 * InheritPixmap transparency
2638 */ 2570 */
2639 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2571 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2640 { 2572 {
2641 oldp = parent[i]; 2573 oldp = parent[i];
2642 XQueryTree (disp, parent[i - 1], &root, 2574 XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2643 &parent[i], &list, &n);
2644 XFree (list); 2575 XFree (list);
2645 2576
2646 if (parent[i] == display->root) 2577 if (parent[i] == display->root)
2647 { 2578 {
2648 if (oldp != None) 2579 if (oldp != None)
… …
2656 } 2587 }
2657 2588
2658 n = 0; 2589 n = 0;
2659 2590
2660 if (pchanged) 2591 if (pchanged)
2661 {
2662 for (; n < (unsigned int)i; n++) 2592 for (; n < (unsigned int)i; n++)
2663 { 2593 {
2664 XGetWindowAttributes (disp, parent[n], &wattr); 2594 XGetWindowAttributes (xdisp, parent[n], &wattr);
2595
2665 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2596 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2666 { 2597 {
2667 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2598 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2668 break; 2599 break;
2669 } 2600 }
2670 } 2601 }
2671 }
2672 2602
2673 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2603 if (n > (sizeof (parent) / sizeof (parent[0])))
2674 { 2604 {
2675 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2605 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2676 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2606 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2677 am_transparent = 0; 2607 am_transparent = 0;
2678 /* XXX: also turn off Opt_transparent? */ 2608 /* XXX: also turn off Opt_transparent? */
2679 } 2609 }
2680 else 2610 else
2681 { 2611 {
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++) 2612 for (n = 0; n < (unsigned int)i; n++)
2688 { 2613 {
2689 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2614 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2690 XClearWindow (disp, parent[n]); 2615 XClearWindow (xdisp, parent[n]);
2691 } 2616 }
2692 2617
2693 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2618 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2694 am_transparent = 1; 2619 am_transparent = 1;
2695 } 2620 }
2696 2621
2697 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2622 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2698 parent[i] = None; 2623 parent[i] = None;
2699 } 2624 }
2700 2625
2701 if (scrollBar.win) 2626 if (scrollBar.win)
2702 { 2627 {
2703 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2628 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2704 scrollBar.setIdle (); 2629 scrollBar.setIdle ();
2705 scrollbar_show (0); 2630 scrollbar_show (0);
2706 } 2631 }
2707 2632
2708 if (am_transparent) 2633 if (am_transparent)
… …
2720 2645
2721bool 2646bool
2722rxvt_term::cmd_parse () 2647rxvt_term::cmd_parse ()
2723{ 2648{
2724 bool flag = false; 2649 bool flag = false;
2725 unicode_t ch = NOCHAR; 2650 wchar_t ch = NOCHAR;
2726 char *seq_begin; // remember start of esc-sequence here 2651 char *seq_begin; // remember start of esc-sequence here
2727 2652
2728 for (;;) 2653 for (;;)
2729 { 2654 {
2730 if (ch == NOCHAR) 2655 if (ch == NOCHAR)
… …
2751 if (seen_resize && cmd_pid) 2676 if (seen_resize && cmd_pid)
2752 kill (-cmd_pid, SIGWINCH); 2677 kill (-cmd_pid, SIGWINCH);
2753 } 2678 }
2754 2679
2755 /* Read a text string from the input buffer */ 2680 /* Read a text string from the input buffer */
2756 unicode_t buf[UBUFSIZ]; 2681 wchar_t buf[UBUFSIZ];
2757 bool refreshnow = false; 2682 bool refreshnow = false;
2758 int nlines = 0; 2683 int nlines = 0;
2759 unicode_t *str = buf; 2684 wchar_t *str = buf;
2760 unicode_t *eol = str + min (ncol, UBUFSIZ); 2685 wchar_t *eol = str + min (ncol, UBUFSIZ);
2761 2686
2762 for (;;) 2687 for (;;)
2763 { 2688 {
2764 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2689 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2765 break; 2690 break;
… …
2783 } 2708 }
2784 2709
2785 // scr_add_lines only works for nlines <= nrow - 1. 2710 // scr_add_lines only works for nlines <= nrow - 1.
2786 if (nlines >= nrow - 1) 2711 if (nlines >= nrow - 1)
2787 { 2712 {
2713 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2788 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END))) 2714 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2789 scr_add_lines (buf, nlines, str - buf); 2715 scr_add_lines (buf, str - buf, nlines);
2790 2716
2791 nlines = 0; 2717 nlines = 0;
2792 str = buf; 2718 str = buf;
2793 eol = str + min (ncol, UBUFSIZ); 2719 eol = str + min (ncol, UBUFSIZ);
2794 } 2720 }
… …
2808 2734
2809 seq_begin = cmdbuf_ptr; 2735 seq_begin = cmdbuf_ptr;
2810 ch = next_char (); 2736 ch = next_char ();
2811 } 2737 }
2812 2738
2739 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2813 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END))) 2740 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2814 scr_add_lines (buf, nlines, str - buf); 2741 scr_add_lines (buf, str - buf, nlines);
2815 2742
2816 /* 2743 /*
2817 * If there have been a lot of new lines, then update the screen 2744 * 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. 2745 * 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 2746 * the number of pages between refreshes is refresh_limit, which
… …
2824 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2751 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2825 refresh_limit++; 2752 refresh_limit++;
2826 else 2753 else
2827 { 2754 {
2828 flag = true; 2755 flag = true;
2829 scr_refresh (refresh_type); 2756 scr_refresh ();
2830 flush_ev.stop (); 2757 want_refresh = 1;
2831 } 2758 }
2832 } 2759 }
2833 2760
2834 } 2761 }
2835 else 2762 else
… …
2850 } 2777 }
2851 2778
2852 return flag; 2779 return flag;
2853} 2780}
2854 2781
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 2782// read the next character
2865unicode_t 2783wchar_t
2866rxvt_term::next_char () 2784rxvt_term::next_char () NOTHROW
2867{ 2785{
2868 while (cmdbuf_ptr < cmdbuf_endp) 2786 while (cmdbuf_ptr < cmdbuf_endp)
2869 { 2787 {
2870 // assume 7-bit to be ascii ALWAYS 2788 // assume 7-bit to be ascii ALWAYS
2871 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2789 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2880 cmdbuf_ptr = cmdbuf_endp; 2798 cmdbuf_ptr = cmdbuf_endp;
2881 break; 2799 break;
2882 } 2800 }
2883 2801
2884 if (len == (size_t)-1) 2802 if (len == (size_t)-1)
2885 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2803 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2886 2804
2887 // assume wchar == unicode 2805 // assume wchar == unicode
2888 cmdbuf_ptr += len; 2806 cmdbuf_ptr += len;
2889 return wc & UNICODE_MASK; 2807 return wc & UNICODE_MASK;
2890 } 2808 }
2891 2809
2892 return NOCHAR; 2810 return NOCHAR;
2893} 2811}
2812
2813// read the next octet
2814uint32_t
2815rxvt_term::next_octet () NOTHROW
2816{
2817 return cmdbuf_ptr < cmdbuf_endp
2818 ? (unsigned char)*cmdbuf_ptr++
2819 : NOCHAR;
2820}
2821
2822static class out_of_input out_of_input;
2894 2823
2895/* rxvt_cmd_getc () - Return next input character */ 2824/* rxvt_cmd_getc () - Return next input character */
2896/* 2825/*
2897 * Return the next input character after first passing any keyboard input 2826 * Return the next input character after first passing any keyboard input
2898 * to the command. 2827 * to the command.
2899 */ 2828 */
2900unicode_t 2829wchar_t
2901rxvt_term::cmd_getc () 2830rxvt_term::cmd_getc () THROW ((class out_of_input))
2902{ 2831{
2903 unicode_t c = next_char (); 2832 wchar_t c = next_char ();
2904 2833
2905 if (c == NOCHAR) 2834 if (c == NOCHAR)
2906 throw out_of_input; 2835 throw out_of_input;
2907 2836
2908 return c; 2837 return c;
2909} 2838}
2910 2839
2911unicode_t 2840uint32_t
2912rxvt_term::cmd_get8 () 2841rxvt_term::cmd_get8 () THROW ((class out_of_input))
2913{ 2842{
2914 unicode_t c = next_octet (); 2843 uint32_t c = next_octet ();
2915 2844
2916 if (c == NOCHAR) 2845 if (c == NOCHAR)
2917 throw out_of_input; 2846 throw out_of_input;
2918 2847
2919 return c; 2848 return c;
… …
3155 scr_charset_set (2, (unsigned int)cmd_getc ()); 3084 scr_charset_set (2, (unsigned int)cmd_getc ());
3156 break; 3085 break;
3157 case '+': 3086 case '+':
3158 scr_charset_set (3, (unsigned int)cmd_getc ()); 3087 scr_charset_set (3, (unsigned int)cmd_getc ());
3159 break; 3088 break;
3160#if ENABLE_FRILLS 3089#if !ENABLE_MINIMAL
3161 case '6': 3090 case '6':
3162 scr_backindex (); 3091 scr_backindex ();
3163 break; 3092 break;
3164#endif 3093#endif
3165 case '7': 3094 case '7':
3166 scr_cursor (SAVE); 3095 scr_cursor (SAVE);
3167 break; 3096 break;
3168 case '8': 3097 case '8':
3169 scr_cursor (RESTORE); 3098 scr_cursor (RESTORE);
3170 break; 3099 break;
3171#if ENABLE_FRILLS 3100#if !ENABLE_MINIMAL
3172 case '9': 3101 case '9':
3173 scr_forwardindex (); 3102 scr_forwardindex ();
3174 break; 3103 break;
3175#endif 3104#endif
3176 case '=': 3105 case '=':
… …
3186 break; 3115 break;
3187 3116
3188 /* 8.3.87: NEXT LINE */ 3117 /* 8.3.87: NEXT LINE */
3189 case C1_NEL: /* ESC E */ 3118 case C1_NEL: /* ESC E */
3190 { 3119 {
3191 unicode_t nlcr[] = { C0_LF, C0_CR }; 3120 wchar_t nlcr[] = { C0_LF, C0_CR };
3192 scr_add_lines (nlcr, 1, 2); 3121 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3193 } 3122 }
3194 break; 3123 break;
3195 3124
3196 /* kidnapped escape sequence: Should be 8.3.48 */ 3125 /* kidnapped escape sequence: Should be 8.3.48 */
3197 case C1_ESA: /* ESC G */ 3126 case C1_ESA: /* ESC G */
… …
3338 ndef = get_byte_array_bit (csi_defaults, i); 3267 ndef = get_byte_array_bit (csi_defaults, i);
3339 for (p = 0; p < nargs; p++) 3268 for (p = 0; p < nargs; p++)
3340 if (arg[p] == -1) 3269 if (arg[p] == -1)
3341 arg[p] = ndef; 3270 arg[p] = ndef;
3342 3271
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 /* 3272 /*
3351 * private mode handling 3273 * private mode handling
3352 */ 3274 */
3353 if (priv) 3275 if (priv)
3354 { 3276 {
3355 switch (priv) 3277 switch (priv)
3356 { 3278 {
3357 case '>': 3279 case '>':
3358 if (ch == CSI_DA) /* secondary device attributes */ 3280 if (ch == CSI_DA) /* secondary device attributes */
3359 tt_printf ("\033[>%d;%c%c;0c", 'U', VERSION[0], VERSION[2]); 3281 {
3282 // first parameter is normally 0 for vt100, 1 for some newer vtxxx, 'R' for rxvt,
3283 // 'U' for rxvt-unicode != 7.[34] (where it was broken).
3284 //
3285 // second parameter is xterm patch level for xterm, MMmmpp (e.g. 20703) for rxvt
3286 // and Mm (e.g. 72 for 7.2) for urxvt <= 7.2, and 94 for later versions, to signify
3287 // that we do not support xterm mouse reporting (should be 95 when we do).
3288 //
3289 tt_printf ("\033[>%d;94;0c", 'U');
3290 }
3360 break; 3291 break;
3361 case '?': 3292 case '?':
3362 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3293 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3363 process_terminal_mode (ch, priv, nargs, arg); 3294 process_terminal_mode (ch, priv, nargs, arg);
3364 break; 3295 break;
… …
3567 break; 3498 break;
3568 case CSI_75: 3499 case CSI_75:
3569 scr_cursor (RESTORE); 3500 scr_cursor (RESTORE);
3570 break; 3501 break;
3571 3502
3572#if ENABLE_FRILLS 3503#if !ENABLE_MINIMAL
3573 case CSI_74: 3504 case CSI_74:
3574 process_window_ops (arg, nargs); 3505 process_window_ops (arg, nargs);
3575 break; 3506 break;
3576#endif 3507#endif
3577 3508
… …
3584 break; 3515 break;
3585 } 3516 }
3586} 3517}
3587/*}}} */ 3518/*}}} */
3588 3519
3589#if ENABLE_FRILLS 3520#if !ENABLE_MINIMAL
3590/* ARGSUSED */ 3521/* ARGSUSED */
3591void 3522void
3592rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3523rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3593{ 3524{
3594 int x, y; 3525 int x, y;
3595 XWindowAttributes wattr; 3526 XWindowAttributes wattr;
3596 Window wdummy; 3527 Window wdummy;
3597 dDisp; 3528
3529 dLocal (Display *, xdisp);
3598 3530
3599 if (nargs == 0) 3531 if (nargs == 0)
3600 return; 3532 return;
3601 3533
3602 switch (args[0]) 3534 switch (args[0])
3603 { 3535 {
3604 /* 3536 /*
3605 * commands 3537 * commands
3606 */ 3538 */
3607 case 1: /* deiconify window */ 3539 case 1: /* deiconify window */
3608 XMapWindow (disp, parent[0]); 3540 XMapWindow (xdisp, parent[0]);
3609 break; 3541 break;
3610 case 2: /* iconify window */ 3542 case 2: /* iconify window */
3611 XIconifyWindow (disp, parent[0], display->screen); 3543 XIconifyWindow (xdisp, parent[0], display->screen);
3612 break; 3544 break;
3613 case 3: /* set position (pixels) */ 3545 case 3: /* set position (pixels) */
3614 XMoveWindow (disp, parent[0], args[1], args[2]); 3546 XMoveWindow (xdisp, parent[0], args[1], args[2]);
3615 break; 3547 break;
3616 case 4: /* set size (pixels) */ 3548 case 4: /* set size (pixels) */
3617 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3549 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3618 break; 3550 break;
3619 case 5: /* raise window */ 3551 case 5: /* raise window */
3620 XRaiseWindow (disp, parent[0]); 3552 XRaiseWindow (xdisp, parent[0]);
3621 break; 3553 break;
3622 case 6: /* lower window */ 3554 case 6: /* lower window */
3623 XLowerWindow (disp, parent[0]); 3555 XLowerWindow (xdisp, parent[0]);
3624 break; 3556 break;
3625 case 7: /* refresh window */ 3557 case 7: /* refresh window */
3626 scr_touch (true); 3558 scr_touch (true);
3627 break; 3559 break;
3628 case 8: /* set size (chars) */ 3560 case 8: /* set size (chars) */
… …
3635 if (args[0] >= 24) /* set height (chars) */ 3567 if (args[0] >= 24) /* set height (chars) */
3636 set_widthheight ((unsigned int)width, 3568 set_widthheight ((unsigned int)width,
3637 (unsigned int) (args[1] * fheight)); 3569 (unsigned int) (args[1] * fheight));
3638 break; 3570 break;
3639 3571
3640
3641 /* 3572 /*
3642 * reports - some output format copied from XTerm 3573 * reports - some output format copied from XTerm
3643 */ 3574 */
3644 case 11: /* report window state */ 3575 case 11: /* report window state */
3645 XGetWindowAttributes (disp, parent[0], &wattr); 3576 XGetWindowAttributes (xdisp, parent[0], &wattr);
3646 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3577 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3647 break; 3578 break;
3648 case 13: /* report window position */ 3579 case 13: /* report window position */
3649 XGetWindowAttributes (disp, parent[0], &wattr); 3580 XGetWindowAttributes (xdisp, parent[0], &wattr);
3650 XTranslateCoordinates (disp, parent[0], wattr.root, 3581 XTranslateCoordinates (xdisp, parent[0], wattr.root,
3651 -wattr.border_width, -wattr.border_width, 3582 -wattr.border_width, -wattr.border_width,
3652 &x, &y, &wdummy); 3583 &x, &y, &wdummy);
3653 tt_printf ("\033[3;%d;%dt", x, y); 3584 tt_printf ("\033[3;%d;%dt", x, y);
3654 break; 3585 break;
3655 case 14: /* report window size (pixels) */ 3586 case 14: /* report window size (pixels) */
3656 XGetWindowAttributes (disp, parent[0], &wattr); 3587 XGetWindowAttributes (xdisp, parent[0], &wattr);
3657 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3588 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3658 break; 3589 break;
3659 case 18: /* report text area size (chars) */ 3590 case 18: /* report text area size (chars) */
3660 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3591 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3661 break; 3592 break;
… …
3663 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3594 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3664 break; 3595 break;
3665 case 20: /* report icon label */ 3596 case 20: /* report icon label */
3666 { 3597 {
3667 char *s; 3598 char *s;
3668 XGetIconName (disp, parent[0], &s); 3599 XGetIconName (xdisp, parent[0], &s);
3669 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3600 tt_printf ("\033]L%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3670 XFree (s); 3601 XFree (s);
3671 } 3602 }
3672 break; 3603 break;
3673 case 21: /* report window title */ 3604 case 21: /* report window title */
3674 { 3605 {
3675 char *s; 3606 char *s;
3676 XFetchName (disp, parent[0], &s); 3607 XFetchName (xdisp, parent[0], &s);
3677 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */ 3608 tt_printf ("\033]l%-.250s\234", OPTION (Opt_insecure) && s ? s : ""); /* 8bit ST */
3678 XFree (s); 3609 XFree (s);
3679 } 3610 }
3680 break; 3611 break;
3681 } 3612 }
… …
3782void 3713void
3783rxvt_term::process_color_seq (int report, int color, const char *str, char resp) 3714rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3784{ 3715{
3785 if (str[0] == '?' && !str[1]) 3716 if (str[0] == '?' && !str[1])
3786 { 3717 {
3787 unsigned short r, g, b; 3718 rgba c;
3788 pix_colors_focused[color].get (display, r, g, b); 3719 pix_colors_focused[color].get (c);
3720
3721#if XFT
3722 if (c.a != rgba::MAX_CC)
3723 tt_printf ("\033]%d;rgba:%04x/%04x/%04x/%04x%c", report, c.a, c.r, c.g, c.b, resp);
3724 else
3725#endif
3789 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, r, g, b, resp); 3726 tt_printf ("\033]%d;rgb:%04x/%04x/%04x%c", report, c.r, c.g, c.b, resp);
3790 } 3727 }
3791 else 3728 else
3792 set_window_color (color, str); 3729 set_window_color (color, str);
3793} 3730}
3794 3731
… …
3796 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3733 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3797 */ 3734 */
3798void 3735void
3799rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3736rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3800{ 3737{
3801 int changed = 0;
3802 int color; 3738 int color;
3803 char *buf, *name; 3739 char *buf, *name;
3804 bool query = str[0] == '?' && !str[1]; 3740 bool query = str[0] == '?' && !str[1];
3805 int saveop = op; 3741 int saveop = op;
3806 dDisp; 3742
3743 dLocal (Display *, xdisp);
3807 3744
3808 assert (str != NULL); 3745 assert (str != NULL);
3809 switch (op) 3746 switch (op)
3810 { 3747 {
3811 case XTerm_name: 3748 case XTerm_name:
… …
3827 unsigned long bytes_after; 3764 unsigned long bytes_after;
3828 unsigned char *value = 0; 3765 unsigned char *value = 0;
3829 const char *str = ""; 3766 const char *str = "";
3830 3767
3831 if (prop 3768 if (prop
3832 && XGetWindowProperty (disp, parent[0], 3769 && XGetWindowProperty (xdisp, parent[0],
3833 prop, 0, 1<<16, 0, AnyPropertyType, 3770 prop, 0, 1<<16, 0, AnyPropertyType,
3834 &actual_type, &actual_format, 3771 &actual_type, &actual_format,
3835 &nitems, &bytes_after, &value) == Success 3772 &nitems, &bytes_after, &value) == Success
3836 && actual_type != None 3773 && actual_type != None
3837 && actual_format == 8) 3774 && actual_format == 8)
3838 str = (const char *)(value); 3775 str = (const char *)(value);
3839 3776
3840 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3777 tt_printf ("\033]%d;%s%c", op, str, resp);
3841 3778
3842 XFree (value); 3779 XFree (value);
3843 } 3780 }
3844 else 3781 else
3845 { 3782 {
… …
3849 { 3786 {
3850 *eq = 0; 3787 *eq = 0;
3851 set_utf8_property (display->atom (str), eq + 1); 3788 set_utf8_property (display->atom (str), eq + 1);
3852 } 3789 }
3853 else 3790 else
3854 XDeleteProperty (disp, parent[0], 3791 XDeleteProperty (xdisp, parent[0],
3855 display->atom (str)); 3792 display->atom (str));
3856 } 3793 }
3857 break; 3794 break;
3858 3795
3859 case XTerm_Color: 3796 case XTerm_Color:
… …
3861 { 3798 {
3862 if ((name = strchr (buf, ';')) == NULL) 3799 if ((name = strchr (buf, ';')) == NULL)
3863 break; 3800 break;
3864 3801
3865 *name++ = '\0'; 3802 *name++ = '\0';
3866 color = atoi (buf); 3803 color = atoi (buf) + minCOLOR;
3867 3804
3868 if (color < 0 || color >= TOTAL_COLORS) 3805 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3869 break; 3806 break;
3870 3807
3871 if ((buf = strchr (name, ';')) != NULL) 3808 if ((buf = strchr (name, ';')) != NULL)
3872 *buf++ = '\0'; 3809 *buf++ = '\0';
3873 3810
3874 if (name[0] == '?' && !name[1]) 3811 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 } 3812 }
3883 break; 3813 break;
3884 case XTerm_Color00: 3814 case XTerm_Color00:
3885 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3815 process_color_seq (op, Color_fg, str, resp);
3886 break; 3816 break;
3887 case XTerm_Color01: 3817 case XTerm_Color01:
3888 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3818 process_color_seq (op, Color_bg, str, resp);
3889 break; 3819 break;
3890#ifndef NO_CURSORCOLOR 3820#ifndef NO_CURSORCOLOR
3891 case XTerm_Color_cursor: 3821 case XTerm_Color_cursor:
3892 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3822 process_color_seq (op, Color_cursor, str, resp);
3893 break; 3823 break;
3894#endif 3824#endif
3895 case XTerm_Color_pointer_fg: 3825 case XTerm_Color_pointer_fg:
3896 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3826 process_color_seq (op, Color_pointer_fg, str, resp);
3897 break; 3827 break;
3898 case XTerm_Color_pointer_bg: 3828 case XTerm_Color_pointer_bg:
3899 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3829 process_color_seq (op, Color_pointer_bg, str, resp);
3900 break; 3830 break;
3901#ifndef NO_BOLD_UNDERLINE_REVERSE 3831#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: 3832 case XTerm_Color_RV:
3909 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3833 process_color_seq (op, Color_RV, str, resp);
3834 break;
3835 case Rxvt_Color_BD:
3836 case URxvt_Color_BD:
3837 process_color_seq (op, Color_BD, str, resp);
3838 break;
3839 case Rxvt_Color_UL:
3840 case URxvt_Color_UL:
3841 process_color_seq (op, Color_UL, str, resp);
3910 break; 3842 break;
3911 case URxvt_Color_IT: 3843 case URxvt_Color_IT:
3912 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3844 process_color_seq (op, Color_IT, str, resp);
3913 break; 3845 break;
3914#endif 3846#endif
3915#if TRANSPARENT && TINTING 3847#if TRANSPARENT && TINTING
3916 case URxvt_Color_tint: 3848 case URxvt_Color_tint:
3917 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3849 process_color_seq (op, Color_tint, str, resp);
3850
3918 check_our_parents (); 3851 check_our_parents ();
3852
3919 if (am_transparent) 3853 if (am_transparent)
3920 want_full_refresh = want_refresh = 1; 3854 want_full_refresh = want_refresh = 1;
3921 break;
3922#endif
3923 3855
3856 break;
3857#endif
3858
3924 case XTerm_Pixmap: 3859 case Rxvt_Pixmap:
3860 {
3925 if (*str != ';') 3861 if (*str != ';')
3926 { 3862 {
3927#if XPM_BACKGROUND 3863#if XPM_BACKGROUND
3928 scale_pixmap (""); /* reset to default scaling */ 3864 scale_pixmap (""); /* reset to default scaling */
3929 set_bgPixmap (str); /* change pixmap */ 3865 set_bgPixmap (str); /* change pixmap */
3930#endif
3931 scr_touch (true); 3866 scr_touch (true);
3867#endif
3932 } 3868 }
3869
3870 int changed = 0;
3871
3933 while ((str = strchr (str, ';')) != NULL) 3872 while ((str = strchr (str, ';')) != NULL)
3934 { 3873 {
3935 str++; 3874 str++;
3936#if XPM_BACKGROUND 3875#if XPM_BACKGROUND
3937 changed += scale_pixmap (str); 3876 changed += scale_pixmap (str);
3938#endif 3877#endif
3939 } 3878 }
3940 3879
3941 if (changed) 3880 if (changed)
3942 { 3881 {
3943#ifdef XPM_BACKGROUND 3882#ifdef XPM_BACKGROUND
3944 resize_pixmap (); 3883 resize_pixmap ();
3945#endif
3946 scr_touch (true); 3884 scr_touch (true);
3885#endif
3947 } 3886 }
3887 }
3948 break; 3888 break;
3949 3889
3950 case XTerm_restoreFG: 3890 case Rxvt_restoreFG:
3951 set_window_color (Color_fg, str); 3891 set_window_color (Color_fg, str);
3952 break; 3892 break;
3953 case XTerm_restoreBG: 3893 case Rxvt_restoreBG:
3954 set_window_color (Color_bg, str); 3894 set_window_color (Color_bg, str);
3955 break; 3895 break;
3956 3896
3957 case XTerm_logfile: 3897 case XTerm_logfile:
3958 // TODO, when secure mode? 3898 // TODO, when secure mode?
3959 break; 3899 break;
3960 3900
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 3901#if 0
3968 case XTerm_dumpscreen: /* no error notices */ 3902 case Rxvt_dumpscreen: /* no error notices */
3969 { 3903 {
3970 int fd; 3904 int fd;
3971 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3905 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3972 { 3906 {
3973 scr_dump (fd); 3907 scr_dump (fd);
… …
3997 allocated.push_back ((void *)res); 3931 allocated.push_back ((void *)res);
3998 set_fonts (); 3932 set_fonts ();
3999 } 3933 }
4000 break; 3934 break;
4001 3935
4002#if ENABLE_FRILLS 3936 case URxvt_version:
3937 if (query)
3938 tt_printf ("\33]%d;rxvt-unicode;%-.20s;%c;%c%c",
3939 op,
3940 rs[Rs_name], VERSION[0], VERSION[2],
3941 resp);
3942 break;
3943
3944#if !ENABLE_MINIMAL
4003 case URxvt_locale: 3945 case URxvt_locale:
4004 if (query) 3946 if (query)
4005 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3947 tt_printf ("\33]%d;%-.250s%c", op, OPTION (Opt_insecure) ? locale : "", resp);
4006 else 3948 else
4007 { 3949 {
4008 set_locale (str); 3950 set_locale (str);
4009 pty.set_utf8_mode (enc_utf8); 3951 pty->set_utf8_mode (enc_utf8);
4010 init_xlocale (); 3952 init_xlocale ();
4011 } 3953 }
4012 break; 3954 break;
4013 3955
4014 case URxvt_view_up: 3956 case URxvt_view_up:
… …
4025 break; 3967 break;
4026#endif 3968#endif
4027 3969
4028#if ENABLE_PERL 3970#if ENABLE_PERL
4029 case URxvt_perl: 3971 case URxvt_perl:
4030 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END))) 3972 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
4031 ; // no responses yet 3973 ; // no responses yet
4032 break; 3974 break;
4033#endif 3975#endif
4034 } 3976 }
4035} 3977}
… …
4067 return state; 4009 return state;
4068} 4010}
4069 4011
4070/* we're not using priv _yet_ */ 4012/* we're not using priv _yet_ */
4071void 4013void
4072rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4014rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4073{ 4015{
4074 unsigned int i, j; 4016 unsigned int i, j;
4075 int state; 4017 int state;
4076 4018
4077 static const struct 4019 static const struct
… …
4088 { 5, PrivMode_rVideo }, 4030 { 5, PrivMode_rVideo },
4089 { 6, PrivMode_relOrigin }, 4031 { 6, PrivMode_relOrigin },
4090 { 7, PrivMode_Autowrap }, 4032 { 7, PrivMode_Autowrap },
4091 // 8, bi-directional support mode 4033 // 8, bi-directional support mode
4092 { 9, PrivMode_MouseX10 }, 4034 { 9, PrivMode_MouseX10 },
4093#ifdef menuBar_esc
4094 { menuBar_esc, PrivMode_menuBar },
4095#endif
4096 // 18, 19 printing-related 4035 // 18, 19 printing-related
4097 { 25, PrivMode_VisibleCursor }, 4036 { 25, PrivMode_VisibleCursor },
4098#ifdef scrollBar_esc 4037#ifdef scrollBar_esc
4099 { scrollBar_esc, PrivMode_scrollBar }, 4038 { scrollBar_esc, PrivMode_scrollBar },
4100#endif 4039#endif
… …
4147 /* extra handling for values with state unkept */ 4086 /* extra handling for values with state unkept */
4148 switch (arg[i]) 4087 switch (arg[i])
4149 { 4088 {
4150#if ENABLE_STYLES 4089#if ENABLE_STYLES
4151 case 1021: 4090 case 1021:
4152 if (mode) 4091 set_option (Opt_intensityStyles, mode);
4153 SET_OPTION (Opt_intensityStyles);
4154 else
4155 CLR_OPTION (Opt_intensityStyles);
4156 4092
4157 scr_touch (true); 4093 scr_touch (true);
4158 break; 4094 break;
4159#endif 4095#endif
4160 case 1048: /* alternative cursor save */ 4096 case 1048: /* alternative cursor save */
… …
4182 case 3: /* 80/132 */ 4118 case 3: /* 80/132 */
4183 if (priv_modes & PrivMode_132OK) 4119 if (priv_modes & PrivMode_132OK)
4184 set_widthheight (((state ? 132 : 80) * fwidth), height); 4120 set_widthheight (((state ? 132 : 80) * fwidth), height);
4185 break; 4121 break;
4186 case 4: /* smooth scrolling */ 4122 case 4: /* smooth scrolling */
4187 if (!state) 4123 set_option (Opt_jumpScroll, !state);
4188 SET_OPTION (Opt_jumpScroll);
4189 else
4190 CLR_OPTION (Opt_jumpScroll);
4191 break; 4124 break;
4192 case 5: /* reverse video */ 4125 case 5: /* reverse video */
4193 scr_rvideo_mode (state); 4126 scr_rvideo_mode (state);
4194 break; 4127 break;
4195 case 6: /* relative/absolute origins */ 4128 case 6: /* relative/absolute origins */
… …
4201 /* case 8: - auto repeat, can't do on a per window basis */ 4134 /* case 8: - auto repeat, can't do on a per window basis */
4202 case 9: /* X10 mouse reporting */ 4135 case 9: /* X10 mouse reporting */
4203 if (state) /* orthogonal */ 4136 if (state) /* orthogonal */
4204 priv_modes &= ~PrivMode_MouseX11; 4137 priv_modes &= ~PrivMode_MouseX11;
4205 break; 4138 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 4139#ifdef scrollBar_esc
4214 case scrollBar_esc: 4140 case scrollBar_esc:
4215 if (scrollbar_mapping (state)) 4141 if (scrollbar_mapping (state))
4216 { 4142 {
4217 resize_all_windows (0, 0, 0); 4143 resize_all_windows (0, 0, 0);
… …
4236#if 0 4162#if 0
4237 case 1001: 4163 case 1001:
4238 break; /* X11 mouse highlighting */ 4164 break; /* X11 mouse highlighting */
4239#endif 4165#endif
4240 case 1010: /* scroll to bottom on TTY output inhibit */ 4166 case 1010: /* scroll to bottom on TTY output inhibit */
4241 if (!state) 4167 set_option (Opt_scrollTtyOutput, !state);
4242 SET_OPTION (Opt_scrollTtyOutput);
4243 else
4244 CLR_OPTION (Opt_scrollTtyOutput);
4245 break; 4168 break;
4246 case 1011: /* scroll to bottom on key press */ 4169 case 1011: /* scroll to bottom on key press */
4247 if (state) 4170 set_option (Opt_scrollTtyKeypress, state);
4248 SET_OPTION (Opt_scrollTtyKeypress);
4249 else
4250 CLR_OPTION (Opt_scrollTtyKeypress);
4251 break; 4171 break;
4252 case 1047: /* secondary screen w/ clearing last */ 4172 case 1047: /* secondary screen w/ clearing last */
4253 if (OPTION (Opt_secondaryScreen)) 4173 if (OPTION (Opt_secondaryScreen))
4254 if (current_screen != PRIMARY) 4174 if (current_screen != PRIMARY)
4255 scr_erase_screen (2); 4175 scr_erase_screen (2);
… …
4393 scr_color (Color_bg, Color_bg); 4313 scr_color (Color_bg, Color_bg);
4394 break; 4314 break;
4395 4315
4396 //case 50: // not variable spacing 4316 //case 50: // not variable spacing
4397 4317
4398#if ENABLE_FRILLS 4318#if !ENABLE_MINIMAL
4399 case 90: 4319 case 90:
4400 case 91: /* set bright fg color */ 4320 case 91: /* set bright fg color */
4401 case 92: 4321 case 92:
4402 case 93: 4322 case 93:
4403 case 94: 4323 case 94:
… …
4465const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4385const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4466 4386
4467void 4387void
4468rxvt_term::tt_write (const char *data, unsigned int len) 4388rxvt_term::tt_write (const char *data, unsigned int len)
4469{ 4389{
4470 if (pty.pty < 0) 4390 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4471 return; 4391 return;
4472 4392
4393 if (pty->pty < 0)
4394 return;
4395
4473 if (v_buflen == 0) 4396 if (v_buflen == 0)
4474 { 4397 {
4475 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4398 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4476 4399
4477 if ((unsigned int)written == len) 4400 if ((unsigned int)written == len)
4478 return; 4401 return;
4479 4402
4480 data += written; 4403 data += written;
… …
4489 pty_ev.set (EVENT_READ | EVENT_WRITE); 4412 pty_ev.set (EVENT_READ | EVENT_WRITE);
4490} 4413}
4491 4414
4492void rxvt_term::pty_write () 4415void rxvt_term::pty_write ()
4493{ 4416{
4494 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4417 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4495 4418
4496 if (written > 0) 4419 if (written > 0)
4497 { 4420 {
4498 v_buflen -= written; 4421 v_buflen -= written;
4499 4422

Diff Legend

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