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.238 by root, Fri Jan 6 02:58:02 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
868 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
869 return;
870
872 if (len <= 0) 871 if (len <= 0)
873 return; /* not mapped */ 872 return; /* not mapped */
874 873
875 if (OPTION (Opt_scrollTtyKeypress)) 874 if (OPTION (Opt_scrollTtyKeypress))
876 if (view_start) 875 if (view_start)
… …
902 { 901 {
903 const char ch = C0_ESC; 902 const char ch = C0_ESC;
904 tt_write (&ch, 1); 903 tt_write (&ch, 1);
905 } 904 }
906 905
907#if defined(DEBUG_CMD)
908 /* Display keyboard buffer contents */
909 unsigned char *p;
910 int i;
911
912 fprintf (stderr, "key 0x%04X [%d]: `", (unsigned int)keysym, len);
913 for (i = 0, p = kbuf; i < len; i++, p++)
914 fprintf (stderr, (*p >= ' ' && *p < '\177' ? "%c" : "\\%03o"), *p);
915 fprintf (stderr, "'\n");
916#endif /* DEBUG_CMD */
917 tt_write (kbuf, (unsigned int)len); 906 tt_write (kbuf, (unsigned int)len);
918} 907}
919/*}}} */ 908/*}}} */
920 909
921#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 910#if defined (KEYSYM_RESOURCE)
922/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
923/* attempt to `write' count to the input buffer */
924unsigned int 911unsigned int
925rxvt_term::cmd_write (const char *str, unsigned int count) 912rxvt_term::cmd_write (const char *str, unsigned int count)
926{ 913{
927 unsigned int n, s; 914 unsigned int n, s;
928 915
… …
969 956
970 if (want_refresh) 957 if (want_refresh)
971 { 958 {
972 if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) 959 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
973 { 960 {
974 int row = -view_start; 961 int row = view_start;
962 int end_row = row + nrow;
975 963
976 while (row > -nsaved && ROW (row - 1).is_longer ()) 964 while (row > top_row && ROW (row - 1).is_longer ())
977 --row; 965 --row;
978 966
979 while (row < -view_start + nrow) 967 do
980 { 968 {
981 int start_row = row; 969 int start_row = row;
982 line_t *l; 970 line_t *l;
983 971
984 do 972 do
985 { 973 {
986 l = &ROW (row); 974 l = &ROW (row++);
987 975
988 if (!(l->f & LINE_FILTERED)) 976 if (!(l->f & LINE_FILTERED))
989 { 977 {
990 // line not filtered, mark it as filtered 978 // line not filtered, mark it as filtered
991 l->f |= LINE_FILTERED; 979 l->f |= LINE_FILTERED;
992 while (l->is_longer ()) 980 while (l->is_longer ())
993 { 981 {
994 l = &ROW (++row); 982 l = &ROW (row++);
995 l->f |= LINE_FILTERED; 983 l->f |= LINE_FILTERED;
996 } 984 }
997 985
998 // and filter it 986 // and filter it
999 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));
1000 988
1001 break; 989 break;
1002 } 990 }
1003 } 991 }
1004 while (l->is_longer ()); 992 while (l->is_longer () && row < end_row);
1005
1006 row++;
1007 } 993 }
994 while (row < end_row);
1008 995 }
1009 }
1010 996
1011 scr_refresh (refresh_type); 997 scr_refresh ();
1012 scrollbar_show (1); 998 scrollbar_show (1);
1013#ifdef USE_XIM 999#ifdef USE_XIM
1014 IMSendSpot (); 1000 IMSendSpot ();
1015#endif 1001#endif
1016 } 1002 }
… …
1019} 1005}
1020 1006
1021void 1007void
1022rxvt_term::check_cb (check_watcher &w) 1008rxvt_term::check_cb (check_watcher &w)
1023{ 1009{
1024 SET_R (this); 1010 make_current ();
1025 SET_LOCALE (locale);
1026 1011
1027 display->flush (); 1012 display->flush ();
1028 1013
1029 if (want_refresh && !flush_ev.active) 1014 if (want_refresh && !flush_ev.active)
1030 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
1031} 1016}
1032 1017
1033void 1018void
1034rxvt_term::flush_cb (time_watcher &w) 1019rxvt_term::flush_cb (time_watcher &w)
1035{ 1020{
1036 SET_R (this); 1021 make_current ();
1037 SET_LOCALE (locale);
1038 1022
1039 refresh_limit = 1; 1023 refresh_limit = 1;
1040 refresh_count = 0; 1024 refresh_count = 0;
1041 flush (); 1025 flush ();
1042} 1026}
… …
1046rxvt_term::cursor_blink_cb (time_watcher &w) 1030rxvt_term::cursor_blink_cb (time_watcher &w)
1047{ 1031{
1048 hidden_cursor = !hidden_cursor; 1032 hidden_cursor = !hidden_cursor;
1049 want_refresh = 1; 1033 want_refresh = 1;
1050 1034
1051 w.start (w.at + BLINK_INTERVAL); 1035 w.start (w.at + CURSOR_BLINK_INTERVAL);
1052} 1036}
1053#endif 1037#endif
1054 1038
1055#ifdef TEXT_BLINK 1039#ifdef TEXT_BLINK
1056void 1040void
… …
1070rxvt_term::cont_scroll_cb (time_watcher &w) 1054rxvt_term::cont_scroll_cb (time_watcher &w)
1071{ 1055{
1072 if ((scrollbar_isUp() || scrollbar_isDn()) && 1056 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1073 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1057 scr_page (scrollbar_isUp() ? UP : DN, 1))
1074 { 1058 {
1075 refresh_type |= SMOOTH_REFRESH;
1076 want_refresh = 1; 1059 want_refresh = 1;
1077 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1060 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1078 } 1061 }
1079} 1062}
1080#endif 1063#endif
… …
1084rxvt_term::sel_scroll_cb (time_watcher &w) 1067rxvt_term::sel_scroll_cb (time_watcher &w)
1085{ 1068{
1086 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1069 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1087 { 1070 {
1088 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1071 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1089 refresh_type |= SMOOTH_REFRESH;
1090 want_refresh = 1; 1072 want_refresh = 1;
1091 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1073 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1092 } 1074 }
1093} 1075}
1094#endif 1076#endif
… …
1099{ 1081{
1100 if (mouse_slip_wheel_speed == 0 1082 if (mouse_slip_wheel_speed == 0
1101 || 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)
1102 : scr_page (UP, mouse_slip_wheel_speed)) 1084 : scr_page (UP, mouse_slip_wheel_speed))
1103 { 1085 {
1104 if (view_start == nsaved || 1086 if (view_start == top_row || view_start == 0)
1105 view_start == 0)
1106 mouse_slip_wheel_speed = 0; 1087 mouse_slip_wheel_speed = 0;
1107 1088
1108 refresh_type |= SMOOTH_REFRESH;
1109 want_refresh = 1; 1089 want_refresh = 1;
1110 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1090 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1111 } 1091 }
1112} 1092}
1113#endif 1093#endif
1114 1094
1115#if HAVE_SCHED_YIELD 1095#if LINUX_YIELD_HACK
1116static struct event_handler 1096static struct event_handler
1117{ 1097{
1118 check_watcher cw_yield; 1098 check_watcher yield_ev;
1119 1099
1120 void yield (check_watcher &w) 1100 void yield_cb (check_watcher &w)
1121 { 1101 {
1122 sched_yield (); 1102 usleep (0);
1123 w.stop (); 1103 w.stop ();
1124 } 1104 }
1125 1105
1126 event_handler () 1106 event_handler ()
1127 : cw_yield (this, &event_handler::yield) 1107 : yield_ev (this, &event_handler::yield_cb)
1128 { 1108 {
1129 } 1109 }
1130} event_handler; 1110} event_handler;
1131#endif 1111#endif
1132 1112
… …
1143 1123
1144 memmove (cmdbuf_base, cmdbuf_ptr, n); 1124 memmove (cmdbuf_base, cmdbuf_ptr, n);
1145 cmdbuf_ptr = cmdbuf_base; 1125 cmdbuf_ptr = cmdbuf_base;
1146 cmdbuf_endp = cmdbuf_ptr + n; 1126 cmdbuf_endp = cmdbuf_ptr + n;
1147 1127
1148 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1128 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1149 1129
1150 if (r > 0) 1130 if (r > 0)
1151 { 1131 {
1152 cmdbuf_endp += r; 1132 cmdbuf_endp += r;
1153 return true; 1133 return true;
1154 } 1134 }
1155 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1135 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1156 { 1136 {
1157#if HAVE_SCHED_YIELD 1137#if LINUX_YIELD_HACK
1158 if (display->is_local) 1138 if (display->is_local)
1159 event_handler.cw_yield.start (); 1139 event_handler.yield_ev.start ();
1160#endif 1140#endif
1161 } 1141 }
1162 else 1142 else
1163 { 1143 {
1164 pty_ev.stop (); 1144 pty_ev.stop ();
… …
1171} 1151}
1172 1152
1173void 1153void
1174rxvt_term::pty_cb (io_watcher &w, short revents) 1154rxvt_term::pty_cb (io_watcher &w, short revents)
1175{ 1155{
1176 SET_R (this); 1156 make_current ();
1177 SET_LOCALE (locale);
1178 1157
1179 if (revents & EVENT_READ) 1158 if (revents & EVENT_READ)
1180 // loop, but don't allow a single term to monopolize us 1159 // loop, but don't allow a single term to monopolize us
1181 while (pty_fill ()) 1160 while (pty_fill ())
1182 if (cmd_parse ()) 1161 if (cmd_parse ())
… …
1187} 1166}
1188 1167
1189void 1168void
1190rxvt_term::pointer_unblank () 1169rxvt_term::pointer_unblank ()
1191{ 1170{
1192 XDefineCursor (display->display, vt, TermWin_cursor); 1171 XDefineCursor (xdisp, vt, TermWin_cursor);
1193 recolour_cursor (); 1172 recolour_cursor ();
1194 1173
1195#ifdef POINTER_BLANK 1174#ifdef POINTER_BLANK
1196 hidden_pointer = 0; 1175 hidden_pointer = 0;
1197 1176
… …
1202 1181
1203#ifdef POINTER_BLANK 1182#ifdef POINTER_BLANK
1204void 1183void
1205rxvt_term::pointer_blank () 1184rxvt_term::pointer_blank ()
1206{ 1185{
1207 if (! OPTION (Opt_pointerBlank)) 1186 if (!OPTION (Opt_pointerBlank))
1208 return; 1187 return;
1209 1188
1210 XDefineCursor (display->display, vt, display->blank_cursor); 1189 XDefineCursor (xdisp, vt, display->blank_cursor);
1211 XFlush (display->display); 1190 XFlush (xdisp);
1212 1191
1213 hidden_pointer = 1; 1192 hidden_pointer = 1;
1214} 1193}
1215 1194
1216void 1195void
1217rxvt_term::pointer_cb (time_watcher &w) 1196rxvt_term::pointer_cb (time_watcher &w)
1218{ 1197{
1219 SET_R (this); 1198 make_current ();
1220 SET_LOCALE (locale);
1221 1199
1222 pointer_blank (); 1200 pointer_blank ();
1223} 1201}
1224#endif 1202#endif
1225 1203
… …
1290 (32 + button_number + key_state), 1268 (32 + button_number + key_state),
1291 (32 + x + 1), 1269 (32 + x + 1),
1292 (32 + y + 1)); 1270 (32 + y + 1));
1293} 1271}
1294 1272
1295#ifdef USING_W11LIB
1296void
1297rxvt_W11_process_x_event (XEvent *ev)
1298{
1299 rxvt_t *r = rxvt_get_r ();
1300
1301 x_cb (*ev);
1302}
1303#endif
1304
1305/*{{{ process an X event */ 1273/*{{{ process an X event */
1306void 1274void
1307rxvt_term::x_cb (XEvent &ev) 1275rxvt_term::x_cb (XEvent &ev)
1308{ 1276{
1309 dDisp; 1277 make_current ();
1310 1278
1311 SET_R (this); 1279 dLocal (Display *, xdisp);
1312 SET_LOCALE (locale);
1313 1280
1314#if defined(CURSOR_BLINK) 1281 if (ev.xany.window == vt
1315 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1282 && SHOULD_INVOKE (HOOK_X_EVENT)
1316 { 1283 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1317 if (hidden_cursor) 1284 return;
1318 {
1319 hidden_cursor = 0;
1320 want_refresh = 1;
1321 }
1322 1285
1323 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1286 // for XQueryPointer
1324 }
1325#endif
1326
1327#if defined(POINTER_BLANK)
1328 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1329 {
1330 if (ev.type == MotionNotify
1331 || ev.type == ButtonPress
1332 || ev.type == ButtonRelease)
1333 if (hidden_pointer)
1334 pointer_unblank ();
1335
1336 if (ev.type == KeyPress && hidden_pointer == 0)
1337 pointer_blank ();
1338 }
1339#endif
1340
1341 Window unused_root, unused_child; 1287 Window unused_root, unused_child;
1342 int unused_root_x, unused_root_y; 1288 int unused_root_x, unused_root_y;
1343 unsigned int unused_mask; 1289 unsigned int unused_mask;
1344 1290
1345 switch (ev.type) 1291 switch (ev.type)
… …
1352 1298
1353 break; 1299 break;
1354 1300
1355 case KeyRelease: 1301 case KeyRelease:
1356 { 1302 {
1357#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1303#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1358 KeySym ks; 1304 KeySym keysym;
1359 1305
1360 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 :/
1361#endif 1307#endif
1362 1308
1363#if ENABLE_FRILLS || ISO_14755 1309#if ENABLE_FRILLS || ISO_14755
1364 // ISO 14755 support 1310 // ISO 14755 support
1365 if (iso14755buf) 1311 if (iso14755buf)
… …
1370# endif 1316# endif
1371# if ISO_14755 1317# if ISO_14755
1372 // iso14755 part 5.2 handling: release time 1318 // iso14755 part 5.2 handling: release time
1373 // first: controls 1319 // first: controls
1374 if ((ev.xkey.state & ControlMask) 1320 if ((ev.xkey.state & ControlMask)
1375 && ((ks >= 0x40 && ks <= 0x5f) 1321 && ((keysym >= 0x40 && keysym <= 0x5f)
1376 || (ks >= 0x61 && ks <= 0x7f))) 1322 || (keysym >= 0x61 && keysym <= 0x7f)))
1377 { 1323 {
1378 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1324 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1379 commit_iso14755 (); 1325 commit_iso14755 ();
1380 return; // case-break; 1326 goto skip_switch;
1381 } 1327 }
1382 1328
1383 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1329 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1384 if (i[0] == ks) 1330 if (i[0] == keysym)
1385 { 1331 {
1386 iso14755buf = ISO_14755_51 | i[1]; 1332 iso14755buf = ISO_14755_51 | i[1];
1387 commit_iso14755 (); 1333 commit_iso14755 ();
1388 return; // case-break; 1334 goto skip_switch;
1389 } 1335 }
1390 1336
1391 scr_bell (); 1337 scr_bell ();
1392# endif 1338# endif
1393 iso14755buf = 0; 1339 iso14755buf = 0;
… …
1412 else 1358 else
1413 iso14755buf = 0; 1359 iso14755buf = 0;
1414 } 1360 }
1415#endif 1361#endif
1416 1362
1363 if (ev.xany.window == vt
1364 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1365 break;
1366
1417#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1367#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1418 if (!(ev.xkey.state & ControlMask)) 1368 if (!(ev.xkey.state & ControlMask))
1419 slip_wheel_ev.stop (); 1369 slip_wheel_ev.stop ();
1420 else if (ks == XK_Control_L || ks == XK_Control_R) 1370 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1421 mouse_slip_wheel_speed = 0; 1371 mouse_slip_wheel_speed = 0;
1422#endif 1372#endif
1423 break; 1373 break;
1424 } 1374 }
1425 1375
… …
1431 button_release (ev.xbutton); 1381 button_release (ev.xbutton);
1432 break; 1382 break;
1433 1383
1434 case ClientMessage: 1384 case ClientMessage:
1435 if (ev.xclient.format == 32 1385 if (ev.xclient.format == 32
1436 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1386 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1437 { 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 {
1438 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)))
1439 destroy (); 1395 destroy ();
1396 }
1440#if ENABLE_EWMH 1397#if ENABLE_EWMH
1441 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])
1442 XSendEvent (disp, ev.xclient.window = display->root, 1399 XSendEvent (xdisp, ev.xclient.window = display->root,
1443 False, SubstructureRedirectMask | SubstructureNotifyMask, 1400 False, SubstructureRedirectMask | SubstructureNotifyMask,
1444 &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 }
1445#endif 1413#endif
1446 } 1414 }
1447#if ENABLE_XEMBED
1448 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1449 {
1450 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1451 focus_in ();
1452 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1453 focus_out ();
1454 }
1455#endif
1456#ifdef OFFIX_DND
1457 /* OffiX Dnd (drag 'n' drop) protocol */
1458 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1459 && (ev.xclient.data.l[0] == DndFile
1460 || ev.xclient.data.l[0] == DndDir
1461 || ev.xclient.data.l[0] == DndLink))
1462 {
1463 /* Get Dnd data */
1464 Atom ActualType;
1465 int ActualFormat;
1466 unsigned char *data;
1467 unsigned long Size, RemainingBytes;
1468
1469 XGetWindowProperty (disp, display->root,
1470 xa[XA_DNDSELECTION],
1471 0L, 1000000L,
1472 False, AnyPropertyType,
1473 &ActualType, &ActualFormat,
1474 &Size, &RemainingBytes,
1475 &data);
1476 set_string_property (XA_CUT_BUFFER0, data);
1477 XFree (data);
1478 selection_paste (display->root, XA_CUT_BUFFER0, true);
1479 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1480 }
1481#endif /* OFFIX_DND */
1482 break; 1415 break;
1483 1416
1484 case MappingNotify: 1417 case MappingNotify:
1485 XRefreshKeyboardMapping (&ev.xmapping); 1418 XRefreshKeyboardMapping (&ev.xmapping);
1486 break; 1419 break;
… …
1519 break; 1452 break;
1520 1453
1521 case ConfigureNotify: 1454 case ConfigureNotify:
1522 if (ev.xconfigure.window == parent[0]) 1455 if (ev.xconfigure.window == parent[0])
1523 { 1456 {
1524 while (XCheckTypedWindowEvent (disp, ev.xconfigure.window, ConfigureNotify, &ev)) 1457 while (XCheckTypedWindowEvent (xdisp, ev.xconfigure.window, ConfigureNotify, &ev))
1525 ; 1458 ;
1526 1459
1527 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height) 1460 if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
1528 { 1461 {
1529 seen_resize = 1; 1462 seen_resize = 1;
1530 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1463 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1531 } 1464 }
1532 1465
1466 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1467
1533#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1468#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1534 if (OPTION (Opt_transparent)) 1469 if (OPTION (Opt_transparent))
1535 check_our_parents (); 1470 check_our_parents ();
1536#endif 1471#endif
1537 } 1472 }
1538 break; 1473 break;
1539 1474
1540 case PropertyNotify: 1475 case PropertyNotify:
1476 if (!HOOK_INVOKE ((this, HOOK_PROPERTY_NOTIFY, DT_XEVENT, &ev, DT_END)))
1541 if (ev.xproperty.atom == xa[XA_VT_SELECTION] 1477 if (ev.xproperty.atom == xa[XA_VT_SELECTION]
1542 && ev.xproperty.state == PropertyNewValue) 1478 && ev.xproperty.state == PropertyNewValue)
1543 selection_property (ev.xproperty.window, ev.xproperty.atom); 1479 selection_property (ev.xproperty.window, ev.xproperty.atom);
1544 1480
1545 break; 1481 break;
1546 1482
1547 case SelectionClear: 1483 case SelectionClear:
1548 selection_clear (); 1484 selection_clear ();
… …
1553 selection_paste (ev.xselection.requestor, ev.xselection.property, true); 1489 selection_paste (ev.xselection.requestor, ev.xselection.property, true);
1554 break; 1490 break;
1555 1491
1556 case SelectionRequest: 1492 case SelectionRequest:
1557 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));
1558 break; 1502 break;
1559 1503
1560 case UnmapNotify: 1504 case UnmapNotify:
1561 mapped = 0; 1505 mapped = 0;
1562#ifdef TEXT_BLINK 1506#ifdef TEXT_BLINK
1563 text_blink_ev.stop (); 1507 text_blink_ev.stop ();
1564#endif 1508#endif
1565 break; 1509 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1566
1567 case MapNotify:
1568 mapped = 1;
1569#ifdef TEXT_BLINK
1570 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1571#endif
1572 break; 1510 break;
1573 1511
1574#ifdef TRANSPARENT 1512#ifdef TRANSPARENT
1575 case ReparentNotify: 1513 case ReparentNotify:
1576 rootwin_cb (ev); 1514 rootwin_cb (ev);
… …
1582 if (ev.xany.window == vt) 1520 if (ev.xany.window == vt)
1583 { 1521 {
1584 do 1522 do
1585 scr_expose (ev.xexpose.x, ev.xexpose.y, 1523 scr_expose (ev.xexpose.x, ev.xexpose.y,
1586 ev.xexpose.width, ev.xexpose.height, False); 1524 ev.xexpose.width, ev.xexpose.height, False);
1587 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)); 1525 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev));
1588 1526
1589 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose; 1527 ev.xany.type = ev.xany.type == Expose ? GraphicsExpose : Expose;
1590 1528
1591 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1529 while (XCheckTypedWindowEvent (xdisp, vt, ev.xany.type, &ev))
1592 scr_expose (ev.xexpose.x, ev.xexpose.y, 1530 scr_expose (ev.xexpose.x, ev.xexpose.y,
1593 ev.xexpose.width, ev.xexpose.height, False); 1531 ev.xexpose.width, ev.xexpose.height, False);
1594 1532
1595 scr_refresh (refresh_type); 1533 want_refresh = 1;
1596 } 1534 }
1597 else 1535 else
1598 { 1536 {
1599 XEvent unused_event; 1537 XEvent unused_event;
1600 1538
1601 while (XCheckTypedWindowEvent (disp, ev.xany.window, Expose, &unused_event)) 1539 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, Expose, &unused_event))
1602 ; 1540 ;
1603 while (XCheckTypedWindowEvent (disp, ev.xany.window, GraphicsExpose, &unused_event)) 1541 while (XCheckTypedWindowEvent (xdisp, ev.xany.window, GraphicsExpose, &unused_event))
1604 ; 1542 ;
1605 1543
1606 if (isScrollbarWindow (ev.xany.window)) 1544 if (isScrollbarWindow (ev.xany.window))
1607 { 1545 {
1608 scrollBar.setIdle (); 1546 scrollBar.setIdle ();
1609 scrollbar_show (0); 1547 scrollbar_show (0);
1610 } 1548 }
1611#ifdef MENUBAR
1612 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1613 menubar_expose ();
1614#endif
1615 1549
1616#ifdef TRANSPARENT 1550#ifdef TRANSPARENT
1617 if (am_transparent && ev.xany.window == parent[0]) 1551 if (am_transparent && ev.xany.window == parent[0])
1618 XClearWindow (disp, ev.xany.window); 1552 XClearWindow (xdisp, ev.xany.window);
1619#endif 1553#endif
1620 } 1554 }
1621 break; 1555 break;
1622 1556
1623 case MotionNotify: 1557 case MotionNotify:
1624#ifdef POINTER_BLANK 1558#ifdef POINTER_BLANK
1625 if (hidden_pointer) 1559 if (hidden_pointer)
1626 pointer_unblank (); 1560 pointer_unblank ();
1627#endif 1561#endif
1628#if MENUBAR
1629 if (isMenuBarWindow (ev.xany.window))
1630 {
1631 menubar_control (ev.xbutton);
1632 break;
1633 }
1634#endif
1635 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1562 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1636 break; 1563 break;
1637 1564
1638 if (ev.xany.window == vt) 1565 if (ev.xany.window == vt)
1639 { 1566 {
1567 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1568 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1569 ; // nop
1640 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1570 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1641 { 1571 {
1642 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1572 while (XCheckTypedWindowEvent (xdisp, vt, MotionNotify, &ev))
1643 ; 1573 ;
1644 1574
1645 XQueryPointer (disp, vt, 1575 XQueryPointer (xdisp, vt,
1646 &unused_root, &unused_child, 1576 &unused_root, &unused_child,
1647 &unused_root_x, &unused_root_y, 1577 &unused_root_x, &unused_root_y,
1648 &ev.xbutton.x, &ev.xbutton.y, 1578 &ev.xbutton.x, &ev.xbutton.y,
1649 &ev.xbutton.state); 1579 &ev.xbutton.state);
1650#ifdef MOUSE_THRESHOLD 1580#ifdef MOUSE_THRESHOLD
… …
1714#endif 1644#endif
1715 } 1645 }
1716 } 1646 }
1717 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ()) 1647 else if (isScrollbarWindow (ev.xany.window) && scrollbar_isMotion ())
1718 { 1648 {
1719 while (XCheckTypedWindowEvent (disp, scrollBar.win, 1649 while (XCheckTypedWindowEvent (xdisp, scrollBar.win,
1720 MotionNotify, &ev)) 1650 MotionNotify, &ev))
1721 ; 1651 ;
1722 1652
1723 XQueryPointer (disp, scrollBar.win, 1653 XQueryPointer (xdisp, scrollBar.win,
1724 &unused_root, &unused_child, 1654 &unused_root, &unused_child,
1725 &unused_root_x, &unused_root_y, 1655 &unused_root_x, &unused_root_y,
1726 &ev.xbutton.x, &ev.xbutton.y, 1656 &ev.xbutton.x, &ev.xbutton.y,
1727 &unused_mask); 1657 &unused_mask);
1728 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1658 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1729 scrollbar_size ()); 1659 scrollbar_size ());
1730 scr_refresh (refresh_type); 1660 want_refresh = 1;
1731 refresh_limit = 0; 1661 refresh_limit = 0;
1732 scrollbar_show (1); 1662 scrollbar_show (1);
1733 } 1663 }
1734 break; 1664 break;
1735 } 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
1736} 1695}
1737 1696
1738void 1697void
1739rxvt_term::focus_in () 1698rxvt_term::focus_in ()
1740{ 1699{
… …
1752 XSetICFocus (Input_Context); 1711 XSetICFocus (Input_Context);
1753 } 1712 }
1754#endif 1713#endif
1755#if CURSOR_BLINK 1714#if CURSOR_BLINK
1756 if (OPTION (Opt_cursorBlink)) 1715 if (OPTION (Opt_cursorBlink))
1757 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1716 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1758#endif 1717#endif
1759#if OFF_FOCUS_FADING 1718#if OFF_FOCUS_FADING
1760 if (rs[Rs_fade]) 1719 if (rs[Rs_fade])
1761 { 1720 {
1762 pix_colors = pix_colors_focused; 1721 pix_colors = pix_colors_focused;
… …
1806 1765
1807#if TRANSPARENT 1766#if TRANSPARENT
1808void 1767void
1809rxvt_term::rootwin_cb (XEvent &ev) 1768rxvt_term::rootwin_cb (XEvent &ev)
1810{ 1769{
1811 SET_R (this); 1770 make_current ();
1812 SET_LOCALE (locale);
1813 1771
1814 switch (ev.type) 1772 switch (ev.type)
1815 { 1773 {
1816 case PropertyNotify: 1774 case PropertyNotify:
1817 /* 1775 /*
… …
1844 /* 1802 /*
1845 * VT window processing of button press 1803 * VT window processing of button press
1846 */ 1804 */
1847 if (ev.window == vt) 1805 if (ev.window == vt)
1848 { 1806 {
1807 if (HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1808 return;
1809
1849#if ISO_14755 1810#if ISO_14755
1850 // 5.4 1811 // 5.4
1851 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 1812 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
1852 { 1813 {
1853 iso14755_54 (ev.x, ev.y); 1814 iso14755_54 (ev.x, ev.y);
… …
1865#ifdef MOUSE_REPORT_DOUBLECLICK 1826#ifdef MOUSE_REPORT_DOUBLECLICK
1866 if (ev.button == MEvent.button && clickintime) 1827 if (ev.button == MEvent.button && clickintime)
1867 { 1828 {
1868 /* same button, within alloted time */ 1829 /* same button, within alloted time */
1869 MEvent.clicks++; 1830 MEvent.clicks++;
1831
1870 if (MEvent.clicks > 1) 1832 if (MEvent.clicks > 1)
1871 { 1833 {
1872 /* only report double clicks */ 1834 /* only report double clicks */
1873 MEvent.clicks = 2; 1835 MEvent.clicks = 2;
1874 mouse_report (ev); 1836 mouse_report (ev);
… …
1894 else 1856 else
1895 { 1857 {
1896 if (ev.button != MEvent.button) 1858 if (ev.button != MEvent.button)
1897 MEvent.clicks = 0; 1859 MEvent.clicks = 0;
1898 1860
1899 if (!HOOK_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END)))
1900 switch (ev.button) 1861 switch (ev.button)
1901 { 1862 {
1902 case Button1: 1863 case Button1:
1903 /* allow meta + click to select rectangular areas */ 1864 /* allow meta + click to select rectangular areas */
1904 /* should be done in screen.C */ 1865 /* should be done in screen.C */
1905#if ENABLE_FRILLS 1866#if ENABLE_FRILLS
1906 selection.rect = !!(ev.state & ModMetaMask); 1867 selection.rect = !!(ev.state & ModMetaMask);
1907#else 1868#else
1908 selection.rect = false; 1869 selection.rect = false;
1909#endif 1870#endif
1910 1871
1911 /* allow shift+left click to extend selection */ 1872 /* allow shift+left click to extend selection */
1912 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1873 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1913 { 1874 {
1914 if (MEvent.button == Button1 && clickintime) 1875 if (MEvent.button == Button1 && clickintime)
1915 selection_rotate (ev.x, ev.y); 1876 selection_rotate (ev.x, ev.y);
1916 else 1877 else
1917 selection_extend (ev.x, ev.y, 1); 1878 selection_extend (ev.x, ev.y, 1);
1918 } 1879 }
1919 else 1880 else
1920 { 1881 {
1921 if (MEvent.button == Button1 && clickintime) 1882 if (MEvent.button == Button1 && clickintime)
1922 MEvent.clicks++; 1883 MEvent.clicks++;
1923 else 1884 else
1924 MEvent.clicks = 1; 1885 MEvent.clicks = 1;
1925 1886
1926 selection_click (MEvent.clicks, ev.x, ev.y); 1887 selection_click (MEvent.clicks, ev.x, ev.y);
1927 } 1888 }
1928 1889
1929 MEvent.button = Button1; 1890 MEvent.button = Button1;
1930 break; 1891 break;
1931 1892
1932 case Button3: 1893 case Button3:
1933 if (MEvent.button == Button3 && clickintime) 1894 if (MEvent.button == Button3 && clickintime)
1934 selection_rotate (ev.x, ev.y); 1895 selection_rotate (ev.x, ev.y);
1935 else 1896 else
1936 selection_extend (ev.x, ev.y, 1); 1897 selection_extend (ev.x, ev.y, 1);
1937 1898
1938 MEvent.button = Button3; 1899 MEvent.button = Button3;
1939 break; 1900 break;
1940 } 1901 }
1941 } 1902 }
1942 1903
1943 MEvent.time = ev.time; 1904 MEvent.time = ev.time;
1944 return; 1905 return;
1945 } 1906 }
1946 1907
… …
2082 } 2043 }
2083 2044
2084 break; 2045 break;
2085 } 2046 }
2086 } 2047 }
2048
2087 return; 2049 return;
2088 } 2050 }
2089#if MENUBAR
2090 /*
2091 * Menubar window processing of button press
2092 */
2093 if (isMenuBarWindow (ev.window))
2094 menubar_control (ev);
2095#endif
2096} 2051}
2097 2052
2098void 2053void
2099rxvt_term::button_release (XButtonEvent &ev) 2054rxvt_term::button_release (XButtonEvent &ev)
2100{ 2055{
… …
2106 2061
2107 if (scrollbar_isUpDn ()) 2062 if (scrollbar_isUpDn ())
2108 { 2063 {
2109 scrollBar.setIdle (); 2064 scrollBar.setIdle ();
2110 scrollbar_show (0); 2065 scrollbar_show (0);
2111#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2112 refresh_type &= ~SMOOTH_REFRESH;
2113#endif
2114 } 2066 }
2115 2067
2116#ifdef SELECTION_SCROLLING 2068#ifdef SELECTION_SCROLLING
2117 if (sel_scroll_ev.active) 2069 if (sel_scroll_ev.active)
2118 sel_scroll_ev.stop(); 2070 sel_scroll_ev.stop();
2119#endif 2071#endif
2120 2072
2121 if (ev.window == vt) 2073 if (ev.window == vt)
2122 { 2074 {
2075 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2076 return;
2077
2123#if ISO_14755 2078#if ISO_14755
2124 // 5.4 2079 // 5.4
2125 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54)) 2080 if (iso14755buf & (ISO_14755_STARTED | ISO_14755_54))
2126 return; 2081 return;
2127#endif 2082#endif
2083
2128 if (reportmode) 2084 if (reportmode)
2129 { 2085 {
2130 /* mouse report from vt window */ 2086 /* mouse report from vt window */
2131 /* don't report release of wheel "buttons" */ 2087 /* don't report release of wheel "buttons" */
2132 if (ev.button >= 4) 2088 if (ev.button >= 4)
… …
2162 { 2118 {
2163 case Button1: 2119 case Button1:
2164 case Button3: 2120 case Button3:
2165 selection_make (ev.time); 2121 selection_make (ev.time);
2166 break; 2122 break;
2123
2167 case Button2: 2124 case Button2:
2168 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);
2169 break; 2127 break;
2128
2170#ifdef MOUSE_WHEEL 2129#ifdef MOUSE_WHEEL
2171 case Button4: 2130 case Button4:
2172 case Button5: 2131 case Button5:
2173 { 2132 {
2174 int i; 2133 int i;
… …
2196 slip_wheel_ev.start (); 2155 slip_wheel_ev.start ();
2197 } 2156 }
2198 else 2157 else
2199 { 2158 {
2200# endif 2159# endif
2201# ifdef JUMP_MOUSE_WHEEL
2202 scr_page (v, i); 2160 scr_page (v, i);
2203 scr_refresh (SMOOTH_REFRESH);
2204 scrollbar_show (1); 2161 scrollbar_show (1);
2205# else
2206 while (i--)
2207 {
2208 scr_page (v, 1);
2209 scr_refresh (SMOOTH_REFRESH);
2210 scrollbar_show (1);
2211 }
2212# endif
2213# ifdef MOUSE_SLIP_WHEELING 2162# ifdef MOUSE_SLIP_WHEELING
2214 } 2163 }
2215#endif 2164# endif
2216 } 2165 }
2217 break; 2166 break;
2218#endif 2167#endif
2219 } 2168 }
2220 } 2169 }
2221#ifdef MENUBAR
2222 else if (isMenuBarWindow (ev.window))
2223 menubar_control (ev);
2224#endif
2225} 2170}
2226 2171
2227#ifdef TRANSPARENT 2172#ifdef TRANSPARENT
2228#if TINTING 2173#if TINTING
2229/* taken from aterm-0.4.2 */ 2174/* taken from aterm-0.4.2 */
2230 2175
2231typedef uint32_t RUINT32T; 2176typedef uint32_t RUINT32T;
2232 2177
2233void 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)
2234{ 2179{
2235 int sh_r, sh_g, sh_b; 2180 int sh_r, sh_g, sh_b;
2236 RUINT32T mask_r, mask_g, mask_b; 2181 RUINT32T mask_r, mask_g, mask_b;
2237 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 2182 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
2238 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 2183 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
2239 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 2184 unsigned int upper_lim_r, upper_lim_g, upper_lim_b;
2240 int i; 2185 int i;
2241 2186
2242 Visual *visual = display->visual; 2187 Visual *visual = term->visual;
2243 2188
2244 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ; 2189 if( visual->c_class != TrueColor || srcImage->format != ZPixmap ) return ;
2245 2190
2246 /* for convenience */ 2191 /* for convenience */
2247 mask_r = visual->red_mask; 2192 mask_r = visual->red_mask;
… …
2468 Atom atype; 2413 Atom atype;
2469 unsigned char *prop = NULL; 2414 unsigned char *prop = NULL;
2470 Window root, oldp, *list; 2415 Window root, oldp, *list;
2471 Pixmap rootpixmap = None; 2416 Pixmap rootpixmap = None;
2472 XWindowAttributes wattr, wrootattr; 2417 XWindowAttributes wattr, wrootattr;
2473 dDisp;
2474 2418
2475 pchanged = 0; 2419 pchanged = 0;
2476 2420
2477 if (!OPTION (Opt_transparent)) 2421 if (!OPTION (Opt_transparent))
2478 return pchanged; /* Don't try any more */ 2422 return pchanged; /* Don't try any more */
2479 2423
2480 XGetWindowAttributes (disp, display->root, &wrootattr); 2424 XGetWindowAttributes (xdisp, display->root, &wrootattr);
2481 rootdepth = wrootattr.depth; 2425 rootdepth = wrootattr.depth;
2482 2426
2483 XGetWindowAttributes (disp, parent[0], &wattr); 2427 XGetWindowAttributes (xdisp, parent[0], &wattr);
2484 2428
2485 if (rootdepth != wattr.depth) 2429 if (rootdepth != wattr.depth)
2486 { 2430 {
2487 if (am_transparent) 2431 if (am_transparent)
2488 { 2432 {
2489 pchanged = 1; 2433 pchanged = 1;
2490 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2434 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2491 am_transparent = am_pixmap_trans = 0; 2435 am_transparent = am_pixmap_trans = 0;
2492 } 2436 }
2493 2437
2494 return pchanged; /* Don't try any more */ 2438 return pchanged; /* Don't try any more */
2495 } 2439 }
2496 2440
2497 /* 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. */
2498 XSync (disp, False); 2442 XSync (xdisp, False);
2499 2443
2500 /* 2444 /*
2501 * Make the frame window set by the window manager have 2445 * Make the frame window set by the window manager have
2502 * the root background. Some window managers put multiple nested frame 2446 * the root background. Some window managers put multiple nested frame
2503 * 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.
2504 */ 2448 */
2505 i = (xa[XA_XROOTPMAP_ID] 2449 i = (xa[XA_XROOTPMAP_ID]
2506 && XGetWindowProperty (disp, display->root, xa[XA_XROOTPMAP_ID], 2450 && XGetWindowProperty (xdisp, display->root, xa[XA_XROOTPMAP_ID],
2507 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2451 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2508 &nitems, &bytes_after, &prop) == Success); 2452 &nitems, &bytes_after, &prop) == Success);
2509 2453
2510 if (!i || prop == NULL) 2454 if (!i || prop == NULL)
2511 i = (xa[XA_ESETROOT_PMAP_ID] 2455 i = (xa[XA_ESETROOT_PMAP_ID]
2512 && XGetWindowProperty (disp, display->root, xa[XA_ESETROOT_PMAP_ID], 2456 && XGetWindowProperty (xdisp, display->root, xa[XA_ESETROOT_PMAP_ID],
2513 0L, 1L, False, XA_PIXMAP, &atype, &aformat, 2457 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
2514 &nitems, &bytes_after, &prop) == Success); 2458 &nitems, &bytes_after, &prop) == Success);
2515 2459
2516 if (!i || prop == NULL 2460 if (!i || prop == NULL
2517#if TINTING 2461#if TINTING
2518 || !rs[Rs_color + Color_tint] 2462 || !ISSET_PIXCOLOR (Color_tint)
2519#endif 2463#endif
2520 ) 2464 )
2521 have_pixmap = 0; 2465 have_pixmap = 0;
2522 else 2466 else
2523 { 2467 {
… …
2536 Window cr; 2480 Window cr;
2537 XImage *image; 2481 XImage *image;
2538 GC gc; 2482 GC gc;
2539 XGCValues gcvalue; 2483 XGCValues gcvalue;
2540 2484
2541 XTranslateCoordinates (disp, parent[0], display->root, 2485 XTranslateCoordinates (xdisp, parent[0], display->root,
2542 0, 0, &sx, &sy, &cr); 2486 0, 0, &sx, &sy, &cr);
2543 nw = (unsigned int)szHint.width; 2487 nw = (unsigned int)szHint.width;
2544 nh = (unsigned int)szHint.height; 2488 nh = (unsigned int)szHint.height;
2545 nx = ny = 0; 2489 nx = ny = 0;
2546 2490
… …
2559 } 2503 }
2560 2504
2561 min_it (nw, (unsigned int) (wrootattr.width - sx)); 2505 min_it (nw, (unsigned int) (wrootattr.width - sx));
2562 min_it (nh, (unsigned int) (wrootattr.height - sy)); 2506 min_it (nh, (unsigned int) (wrootattr.height - sy));
2563 2507
2564 XSync (disp, False); 2508 XSync (xdisp, False);
2565 allowedxerror = -1; 2509 allowedxerror = -1;
2566 image = XGetImage (disp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap); 2510 image = XGetImage (xdisp, rootpixmap, sx, sy, nw, nh, AllPlanes, ZPixmap);
2567 2511
2568 /* XXX: handle BadMatch - usually because we're outside the pixmap */ 2512 /* XXX: handle BadMatch - usually because we're outside the pixmap */
2569 /* XXX: may need a delay here? */ 2513 /* XXX: may need a delay here? */
2570 allowedxerror = 0; 2514 allowedxerror = 0;
2571 2515
… …
2574 if (am_transparent && am_pixmap_trans) 2518 if (am_transparent && am_pixmap_trans)
2575 { 2519 {
2576 pchanged = 1; 2520 pchanged = 1;
2577 if (pixmap != None) 2521 if (pixmap != None)
2578 { 2522 {
2579 XFreePixmap (disp, pixmap); 2523 XFreePixmap (xdisp, pixmap);
2580 pixmap = None; 2524 pixmap = None;
2581 } 2525 }
2582 } 2526 }
2583 2527
2584 am_pixmap_trans = 0; 2528 am_pixmap_trans = 0;
2585 } 2529 }
2586 else 2530 else
2587 { 2531 {
2588 if (pixmap != None) 2532 if (pixmap != None)
2589 XFreePixmap (disp, pixmap); 2533 XFreePixmap (xdisp, pixmap);
2590 2534
2591#if TINTING 2535#if TINTING
2592 if (ISSET_PIXCOLOR (Color_tint)) 2536 if (ISSET_PIXCOLOR (Color_tint))
2593 { 2537 {
2594 unsigned short rm, gm, bm;
2595 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100; 2538 int shade = rs[Rs_shade] ? atoi (rs[Rs_shade]) : 100;
2596 2539
2540 rgba c;
2597 pix_colors_focused[Color_tint].get (display, rm, gm, bm); 2541 pix_colors_focused [Color_tint].get (c);
2598 2542
2599 ShadeXImage (display, image, shade, rm, gm, bm); 2543 ShadeXImage (this, image, shade, c.r, c.g, c.b);
2600 } 2544 }
2601#endif 2545#endif
2602 2546
2603 pixmap = XCreatePixmap (disp, vt, 2547 pixmap = XCreatePixmap (xdisp, vt, szHint.width, szHint.height, image->depth);
2604 szHint.width, szHint.height, image->depth);
2605 gc = XCreateGC (disp, vt, 0UL, &gcvalue); 2548 gc = XCreateGC (xdisp, vt, 0UL, &gcvalue);
2606 XPutImage (disp, pixmap, gc, image, 0, 0, 2549 XPutImage (xdisp, pixmap, gc, image, 0, 0,
2607 nx, ny, image->width, image->height); 2550 nx, ny, image->width, image->height);
2608 XFreeGC (disp, gc); 2551 XFreeGC (xdisp, gc);
2609 XDestroyImage (image); 2552 XDestroyImage (image);
2610 XSetWindowBackgroundPixmap (disp, parent[0], pixmap); 2553 XSetWindowBackgroundPixmap (xdisp, parent[0], pixmap);
2611 XClearWindow (disp, parent[0]); 2554 XClearWindow (xdisp, parent[0]);
2612 2555
2613 if (!am_transparent || !am_pixmap_trans) 2556 if (!am_transparent || !am_pixmap_trans)
2614 pchanged = 1; 2557 pchanged = 1;
2615 2558
2616 am_transparent = am_pixmap_trans = 1; 2559 am_transparent = am_pixmap_trans = 1;
2617 } 2560 }
2618 } 2561 }
2619 2562
2620 if (am_pixmap_trans) 2563 if (am_pixmap_trans)
2621 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2564 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2622 else 2565 else
2623 { 2566 {
2624 unsigned int n; 2567 unsigned int n;
2625 /* 2568 /*
2626 * InheritPixmap transparency 2569 * InheritPixmap transparency
2627 */ 2570 */
2628 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2571 for (i = 1; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2629 { 2572 {
2630 oldp = parent[i]; 2573 oldp = parent[i];
2631 XQueryTree (disp, parent[i - 1], &root, 2574 XQueryTree (xdisp, parent[i - 1], &root, &parent[i], &list, &n);
2632 &parent[i], &list, &n);
2633 XFree (list); 2575 XFree (list);
2634 2576
2635 if (parent[i] == display->root) 2577 if (parent[i] == display->root)
2636 { 2578 {
2637 if (oldp != None) 2579 if (oldp != None)
… …
2645 } 2587 }
2646 2588
2647 n = 0; 2589 n = 0;
2648 2590
2649 if (pchanged) 2591 if (pchanged)
2650 {
2651 for (; n < (unsigned int)i; n++) 2592 for (; n < (unsigned int)i; n++)
2652 { 2593 {
2653 XGetWindowAttributes (disp, parent[n], &wattr); 2594 XGetWindowAttributes (xdisp, parent[n], &wattr);
2595
2654 if (wattr.depth != rootdepth || wattr.c_class == InputOnly) 2596 if (wattr.depth != rootdepth || wattr.c_class == InputOnly)
2655 { 2597 {
2656 n = (int) (sizeof (parent) / sizeof (Window)) + 1; 2598 n = (int) (sizeof (parent) / sizeof (Window)) + 1;
2657 break; 2599 break;
2658 } 2600 }
2659 } 2601 }
2660 }
2661 2602
2662 if (n > (int) (sizeof (parent) / sizeof (parent[0]))) 2603 if (n > (sizeof (parent) / sizeof (parent[0])))
2663 { 2604 {
2664 XSetWindowBackground (disp, parent[0], pix_colors_focused[Color_border]); 2605 XSetWindowBackground (xdisp, parent[0], pix_colors_focused[Color_border]);
2665 XSetWindowBackground (disp, vt, pix_colors_focused[Color_bg]); 2606 XSetWindowBackground (xdisp, vt, pix_colors_focused[Color_bg]);
2666 am_transparent = 0; 2607 am_transparent = 0;
2667 /* XXX: also turn off Opt_transparent? */ 2608 /* XXX: also turn off Opt_transparent? */
2668 } 2609 }
2669 else 2610 else
2670 { 2611 {
2671#if WAIT_FOR_WM
2672 /* wait (an arbitrary period) for the WM to do its thing
2673 * needed for fvwm2.2.2 (and before?) */
2674 sleep (1);
2675#endif
2676 for (n = 0; n < (unsigned int)i; n++) 2612 for (n = 0; n < (unsigned int)i; n++)
2677 { 2613 {
2678 XSetWindowBackgroundPixmap (disp, parent[n], ParentRelative); 2614 XSetWindowBackgroundPixmap (xdisp, parent[n], ParentRelative);
2679 XClearWindow (disp, parent[n]); 2615 XClearWindow (xdisp, parent[n]);
2680 } 2616 }
2681 2617
2682 XSetWindowBackgroundPixmap (disp, vt, ParentRelative); 2618 XSetWindowBackgroundPixmap (xdisp, vt, ParentRelative);
2683 am_transparent = 1; 2619 am_transparent = 1;
2684 } 2620 }
2685 2621
2686 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++) 2622 for (; i < (int) (sizeof (parent) / sizeof (Window)); i++)
2687 parent[i] = None; 2623 parent[i] = None;
2688 } 2624 }
2689 2625
2690 if (scrollBar.win) 2626 if (scrollBar.win)
2691 { 2627 {
2692 XSetWindowBackgroundPixmap (disp, scrollBar.win, ParentRelative); 2628 XSetWindowBackgroundPixmap (xdisp, scrollBar.win, ParentRelative);
2693 scrollBar.setIdle (); 2629 scrollBar.setIdle ();
2694 scrollbar_show (0); 2630 scrollbar_show (0);
2695 } 2631 }
2696 2632
2697 if (am_transparent) 2633 if (am_transparent)
… …
2709 2645
2710bool 2646bool
2711rxvt_term::cmd_parse () 2647rxvt_term::cmd_parse ()
2712{ 2648{
2713 bool flag = false; 2649 bool flag = false;
2714 unicode_t ch = NOCHAR; 2650 wchar_t ch = NOCHAR;
2715 char *seq_begin; // remember start of esc-sequence here 2651 char *seq_begin; // remember start of esc-sequence here
2716 2652
2717 for (;;) 2653 for (;;)
2718 { 2654 {
2719 if (ch == NOCHAR) 2655 if (ch == NOCHAR)
… …
2740 if (seen_resize && cmd_pid) 2676 if (seen_resize && cmd_pid)
2741 kill (-cmd_pid, SIGWINCH); 2677 kill (-cmd_pid, SIGWINCH);
2742 } 2678 }
2743 2679
2744 /* Read a text string from the input buffer */ 2680 /* Read a text string from the input buffer */
2745 unicode_t buf[UBUFSIZ]; 2681 wchar_t buf[UBUFSIZ];
2746 bool refreshnow = false; 2682 bool refreshnow = false;
2747 int nlines = 0; 2683 int nlines = 0;
2748 unicode_t *str = buf; 2684 wchar_t *str = buf;
2749 unicode_t *eol = str + min (ncol, UBUFSIZ); 2685 wchar_t *eol = str + min (ncol, UBUFSIZ);
2750 2686
2751 for (;;) 2687 for (;;)
2752 { 2688 {
2753 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))
2754 break; 2690 break;
… …
2772 } 2708 }
2773 2709
2774 // scr_add_lines only works for nlines <= nrow - 1. 2710 // scr_add_lines only works for nlines <= nrow - 1.
2775 if (nlines >= nrow - 1) 2711 if (nlines >= nrow - 1)
2776 { 2712 {
2713 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2777 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))))
2778 scr_add_lines (buf, nlines, str - buf); 2715 scr_add_lines (buf, str - buf, nlines);
2779 2716
2780 nlines = 0; 2717 nlines = 0;
2781 str = buf; 2718 str = buf;
2782 eol = str + min (ncol, UBUFSIZ); 2719 eol = str + min (ncol, UBUFSIZ);
2783 } 2720 }
… …
2797 2734
2798 seq_begin = cmdbuf_ptr; 2735 seq_begin = cmdbuf_ptr;
2799 ch = next_char (); 2736 ch = next_char ();
2800 } 2737 }
2801 2738
2739 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2802 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))))
2803 scr_add_lines (buf, nlines, str - buf); 2741 scr_add_lines (buf, str - buf, nlines);
2804 2742
2805 /* 2743 /*
2806 * 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
2807 * 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.
2808 * the number of pages between refreshes is refresh_limit, which 2746 * the number of pages between refreshes is refresh_limit, which
… …
2813 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2751 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2814 refresh_limit++; 2752 refresh_limit++;
2815 else 2753 else
2816 { 2754 {
2817 flag = true; 2755 flag = true;
2818 scr_refresh (refresh_type); 2756 scr_refresh ();
2819 flush_ev.stop (); 2757 want_refresh = 1;
2820 } 2758 }
2821 } 2759 }
2822 2760
2823 } 2761 }
2824 else 2762 else
… …
2839 } 2777 }
2840 2778
2841 return flag; 2779 return flag;
2842} 2780}
2843 2781
2844// read the next octet
2845unicode_t
2846rxvt_term::next_octet ()
2847{
2848 return cmdbuf_ptr < cmdbuf_endp
2849 ? *cmdbuf_ptr++
2850 : NOCHAR;
2851}
2852
2853// read the next character 2782// read the next character
2854unicode_t 2783wchar_t
2855rxvt_term::next_char () 2784rxvt_term::next_char () NOTHROW
2856{ 2785{
2857 while (cmdbuf_ptr < cmdbuf_endp) 2786 while (cmdbuf_ptr < cmdbuf_endp)
2858 { 2787 {
2859 // assume 7-bit to be ascii ALWAYS 2788 // assume 7-bit to be ascii ALWAYS
2860 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2789 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
… …
2869 cmdbuf_ptr = cmdbuf_endp; 2798 cmdbuf_ptr = cmdbuf_endp;
2870 break; 2799 break;
2871 } 2800 }
2872 2801
2873 if (len == (size_t)-1) 2802 if (len == (size_t)-1)
2874 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
2875 2804
2876 // assume wchar == unicode 2805 // assume wchar == unicode
2877 cmdbuf_ptr += len; 2806 cmdbuf_ptr += len;
2878 return wc & UNICODE_MASK; 2807 return wc & UNICODE_MASK;
2879 } 2808 }
2880 2809
2881 return NOCHAR; 2810 return NOCHAR;
2882} 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;
2883 2823
2884/* rxvt_cmd_getc () - Return next input character */ 2824/* rxvt_cmd_getc () - Return next input character */
2885/* 2825/*
2886 * Return the next input character after first passing any keyboard input 2826 * Return the next input character after first passing any keyboard input
2887 * to the command. 2827 * to the command.
2888 */ 2828 */
2889unicode_t 2829wchar_t
2890rxvt_term::cmd_getc () 2830rxvt_term::cmd_getc () THROW ((class out_of_input))
2891{ 2831{
2892 unicode_t c = next_char (); 2832 wchar_t c = next_char ();
2893 2833
2894 if (c == NOCHAR) 2834 if (c == NOCHAR)
2895 throw out_of_input; 2835 throw out_of_input;
2896 2836
2897 return c; 2837 return c;
2898} 2838}
2899 2839
2900unicode_t 2840uint32_t
2901rxvt_term::cmd_get8 () 2841rxvt_term::cmd_get8 () THROW ((class out_of_input))
2902{ 2842{
2903 unicode_t c = next_octet (); 2843 uint32_t c = next_octet ();
2904 2844
2905 if (c == NOCHAR) 2845 if (c == NOCHAR)
2906 throw out_of_input; 2846 throw out_of_input;
2907 2847
2908 return c; 2848 return c;
… …
3144 scr_charset_set (2, (unsigned int)cmd_getc ()); 3084 scr_charset_set (2, (unsigned int)cmd_getc ());
3145 break; 3085 break;
3146 case '+': 3086 case '+':
3147 scr_charset_set (3, (unsigned int)cmd_getc ()); 3087 scr_charset_set (3, (unsigned int)cmd_getc ());
3148 break; 3088 break;
3149#if ENABLE_FRILLS 3089#if !ENABLE_MINIMAL
3150 case '6': 3090 case '6':
3151 scr_backindex (); 3091 scr_backindex ();
3152 break; 3092 break;
3153#endif 3093#endif
3154 case '7': 3094 case '7':
3155 scr_cursor (SAVE); 3095 scr_cursor (SAVE);
3156 break; 3096 break;
3157 case '8': 3097 case '8':
3158 scr_cursor (RESTORE); 3098 scr_cursor (RESTORE);
3159 break; 3099 break;
3160#if ENABLE_FRILLS 3100#if !ENABLE_MINIMAL
3161 case '9': 3101 case '9':
3162 scr_forwardindex (); 3102 scr_forwardindex ();
3163 break; 3103 break;
3164#endif 3104#endif
3165 case '=': 3105 case '=':
… …
3175 break; 3115 break;
3176 3116
3177 /* 8.3.87: NEXT LINE */ 3117 /* 8.3.87: NEXT LINE */
3178 case C1_NEL: /* ESC E */ 3118 case C1_NEL: /* ESC E */
3179 { 3119 {
3180 unicode_t nlcr[] = { C0_LF, C0_CR }; 3120 wchar_t nlcr[] = { C0_LF, C0_CR };
3181 scr_add_lines (nlcr, 1, 2); 3121 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3182 } 3122 }
3183 break; 3123 break;
3184 3124
3185 /* kidnapped escape sequence: Should be 8.3.48 */ 3125 /* kidnapped escape sequence: Should be 8.3.48 */
3186 case C1_ESA: /* ESC G */ 3126 case C1_ESA: /* ESC G */
… …
3327 ndef = get_byte_array_bit (csi_defaults, i); 3267 ndef = get_byte_array_bit (csi_defaults, i);
3328 for (p = 0; p < nargs; p++) 3268 for (p = 0; p < nargs; p++)
3329 if (arg[p] == -1) 3269 if (arg[p] == -1)
3330 arg[p] = ndef; 3270 arg[p] = ndef;
3331 3271
3332#ifdef DEBUG_CMD
3333 fprintf (stderr, "CSI ");
3334 for (p = 0; p < nargs; p++)
3335 fprintf (stderr, "%d%s", arg[p], p < nargs - 1 ? ";" : "");
3336 fprintf (stderr, "%c\n", ch);
3337#endif
3338
3339 /* 3272 /*
3340 * private mode handling 3273 * private mode handling
3341 */ 3274 */
3342 if (priv) 3275 if (priv)
3343 { 3276 {
3344 switch (priv) 3277 switch (priv)
3345 { 3278 {
3346 case '>': 3279 case '>':
3347 if (ch == CSI_DA) /* secondary device attributes */ 3280 if (ch == CSI_DA) /* secondary device attributes */
3348 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 }
3349 break; 3291 break;
3350 case '?': 3292 case '?':
3351 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't') 3293 if (ch == 'h' || ch == 'l' || ch == 'r' || ch == 's' || ch == 't')
3352 process_terminal_mode (ch, priv, nargs, arg); 3294 process_terminal_mode (ch, priv, nargs, arg);
3353 break; 3295 break;
… …
3556 break; 3498 break;
3557 case CSI_75: 3499 case CSI_75:
3558 scr_cursor (RESTORE); 3500 scr_cursor (RESTORE);
3559 break; 3501 break;
3560 3502
3561#if ENABLE_FRILLS 3503#if !ENABLE_MINIMAL
3562 case CSI_74: 3504 case CSI_74:
3563 process_window_ops (arg, nargs); 3505 process_window_ops (arg, nargs);
3564 break; 3506 break;
3565#endif 3507#endif
3566 3508
… …
3573 break; 3515 break;
3574 } 3516 }
3575} 3517}
3576/*}}} */ 3518/*}}} */
3577 3519
3578#if ENABLE_FRILLS 3520#if !ENABLE_MINIMAL
3579/* ARGSUSED */ 3521/* ARGSUSED */
3580void 3522void
3581rxvt_term::process_window_ops (const int *args, unsigned int nargs) 3523rxvt_term::process_window_ops (const int *args, unsigned int nargs)
3582{ 3524{
3583 int x, y; 3525 int x, y;
3584 XWindowAttributes wattr; 3526 XWindowAttributes wattr;
3585 Window wdummy; 3527 Window wdummy;
3586 dDisp; 3528
3529 dLocal (Display *, xdisp);
3587 3530
3588 if (nargs == 0) 3531 if (nargs == 0)
3589 return; 3532 return;
3590 3533
3591 switch (args[0]) 3534 switch (args[0])
3592 { 3535 {
3593 /* 3536 /*
3594 * commands 3537 * commands
3595 */ 3538 */
3596 case 1: /* deiconify window */ 3539 case 1: /* deiconify window */
3597 XMapWindow (disp, parent[0]); 3540 XMapWindow (xdisp, parent[0]);
3598 break; 3541 break;
3599 case 2: /* iconify window */ 3542 case 2: /* iconify window */
3600 XIconifyWindow (disp, parent[0], display->screen); 3543 XIconifyWindow (xdisp, parent[0], display->screen);
3601 break; 3544 break;
3602 case 3: /* set position (pixels) */ 3545 case 3: /* set position (pixels) */
3603 XMoveWindow (disp, parent[0], args[1], args[2]); 3546 XMoveWindow (xdisp, parent[0], args[1], args[2]);
3604 break; 3547 break;
3605 case 4: /* set size (pixels) */ 3548 case 4: /* set size (pixels) */
3606 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]); 3549 set_widthheight ((unsigned int)args[2], (unsigned int)args[1]);
3607 break; 3550 break;
3608 case 5: /* raise window */ 3551 case 5: /* raise window */
3609 XRaiseWindow (disp, parent[0]); 3552 XRaiseWindow (xdisp, parent[0]);
3610 break; 3553 break;
3611 case 6: /* lower window */ 3554 case 6: /* lower window */
3612 XLowerWindow (disp, parent[0]); 3555 XLowerWindow (xdisp, parent[0]);
3613 break; 3556 break;
3614 case 7: /* refresh window */ 3557 case 7: /* refresh window */
3615 scr_touch (true); 3558 scr_touch (true);
3616 break; 3559 break;
3617 case 8: /* set size (chars) */ 3560 case 8: /* set size (chars) */
… …
3624 if (args[0] >= 24) /* set height (chars) */ 3567 if (args[0] >= 24) /* set height (chars) */
3625 set_widthheight ((unsigned int)width, 3568 set_widthheight ((unsigned int)width,
3626 (unsigned int) (args[1] * fheight)); 3569 (unsigned int) (args[1] * fheight));
3627 break; 3570 break;
3628 3571
3629
3630 /* 3572 /*
3631 * reports - some output format copied from XTerm 3573 * reports - some output format copied from XTerm
3632 */ 3574 */
3633 case 11: /* report window state */ 3575 case 11: /* report window state */
3634 XGetWindowAttributes (disp, parent[0], &wattr); 3576 XGetWindowAttributes (xdisp, parent[0], &wattr);
3635 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2); 3577 tt_printf ("\033[%dt", wattr.map_state == IsViewable ? 1 : 2);
3636 break; 3578 break;
3637 case 13: /* report window position */ 3579 case 13: /* report window position */
3638 XGetWindowAttributes (disp, parent[0], &wattr); 3580 XGetWindowAttributes (xdisp, parent[0], &wattr);
3639 XTranslateCoordinates (disp, parent[0], wattr.root, 3581 XTranslateCoordinates (xdisp, parent[0], wattr.root,
3640 -wattr.border_width, -wattr.border_width, 3582 -wattr.border_width, -wattr.border_width,
3641 &x, &y, &wdummy); 3583 &x, &y, &wdummy);
3642 tt_printf ("\033[3;%d;%dt", x, y); 3584 tt_printf ("\033[3;%d;%dt", x, y);
3643 break; 3585 break;
3644 case 14: /* report window size (pixels) */ 3586 case 14: /* report window size (pixels) */
3645 XGetWindowAttributes (disp, parent[0], &wattr); 3587 XGetWindowAttributes (xdisp, parent[0], &wattr);
3646 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width); 3588 tt_printf ("\033[4;%d;%dt", wattr.height, wattr.width);
3647 break; 3589 break;
3648 case 18: /* report text area size (chars) */ 3590 case 18: /* report text area size (chars) */
3649 tt_printf ("\033[8;%d;%dt", nrow, ncol); 3591 tt_printf ("\033[8;%d;%dt", nrow, ncol);
3650 break; 3592 break;
… …
3652 tt_printf ("\033[9;%d;%dt", nrow, ncol); 3594 tt_printf ("\033[9;%d;%dt", nrow, ncol);
3653 break; 3595 break;
3654 case 20: /* report icon label */ 3596 case 20: /* report icon label */
3655 { 3597 {
3656 char *s; 3598 char *s;
3657 XGetIconName (disp, parent[0], &s); 3599 XGetIconName (xdisp, parent[0], &s);
3658 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 */
3659 XFree (s); 3601 XFree (s);
3660 } 3602 }
3661 break; 3603 break;
3662 case 21: /* report window title */ 3604 case 21: /* report window title */
3663 { 3605 {
3664 char *s; 3606 char *s;
3665 XFetchName (disp, parent[0], &s); 3607 XFetchName (xdisp, parent[0], &s);
3666 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 */
3667 XFree (s); 3609 XFree (s);
3668 } 3610 }
3669 break; 3611 break;
3670 } 3612 }
… …
3771void 3713void
3772rxvt_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)
3773{ 3715{
3774 if (str[0] == '?' && !str[1]) 3716 if (str[0] == '?' && !str[1])
3775 { 3717 {
3776 unsigned short r, g, b; 3718 rgba c;
3777 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
3778 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);
3779 } 3727 }
3780 else 3728 else
3781 set_window_color (color, str); 3729 set_window_color (color, str);
3782} 3730}
3783 3731
… …
3785 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3733 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3786 */ 3734 */
3787void 3735void
3788rxvt_term::process_xterm_seq (int op, const char *str, char resp) 3736rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3789{ 3737{
3790 int changed = 0;
3791 int color; 3738 int color;
3792 char *buf, *name; 3739 char *buf, *name;
3793 bool query = str[0] == '?' && !str[1]; 3740 bool query = str[0] == '?' && !str[1];
3794 int saveop = op; 3741 int saveop = op;
3795 dDisp; 3742
3743 dLocal (Display *, xdisp);
3796 3744
3797 assert (str != NULL); 3745 assert (str != NULL);
3798 switch (op) 3746 switch (op)
3799 { 3747 {
3800 case XTerm_name: 3748 case XTerm_name:
… …
3816 unsigned long bytes_after; 3764 unsigned long bytes_after;
3817 unsigned char *value = 0; 3765 unsigned char *value = 0;
3818 const char *str = ""; 3766 const char *str = "";
3819 3767
3820 if (prop 3768 if (prop
3821 && XGetWindowProperty (disp, parent[0], 3769 && XGetWindowProperty (xdisp, parent[0],
3822 prop, 0, 1<<16, 0, AnyPropertyType, 3770 prop, 0, 1<<16, 0, AnyPropertyType,
3823 &actual_type, &actual_format, 3771 &actual_type, &actual_format,
3824 &nitems, &bytes_after, &value) == Success 3772 &nitems, &bytes_after, &value) == Success
3825 && actual_type != None 3773 && actual_type != None
3826 && actual_format == 8) 3774 && actual_format == 8)
3827 str = (const char *)(value); 3775 str = (const char *)(value);
3828 3776
3829 tt_printf ("\033]%d;%s%c", XTerm_property, str, resp); 3777 tt_printf ("\033]%d;%s%c", op, str, resp);
3830 3778
3831 XFree (value); 3779 XFree (value);
3832 } 3780 }
3833 else 3781 else
3834 { 3782 {
… …
3838 { 3786 {
3839 *eq = 0; 3787 *eq = 0;
3840 set_utf8_property (display->atom (str), eq + 1); 3788 set_utf8_property (display->atom (str), eq + 1);
3841 } 3789 }
3842 else 3790 else
3843 XDeleteProperty (disp, parent[0], 3791 XDeleteProperty (xdisp, parent[0],
3844 display->atom (str)); 3792 display->atom (str));
3845 } 3793 }
3846 break; 3794 break;
3847 3795
3848 case XTerm_Color: 3796 case XTerm_Color:
… …
3850 { 3798 {
3851 if ((name = strchr (buf, ';')) == NULL) 3799 if ((name = strchr (buf, ';')) == NULL)
3852 break; 3800 break;
3853 3801
3854 *name++ = '\0'; 3802 *name++ = '\0';
3855 color = atoi (buf); 3803 color = atoi (buf) + minCOLOR;
3856 3804
3857 if (color < 0 || color >= TOTAL_COLORS) 3805 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3858 break; 3806 break;
3859 3807
3860 if ((buf = strchr (name, ';')) != NULL) 3808 if ((buf = strchr (name, ';')) != NULL)
3861 *buf++ = '\0'; 3809 *buf++ = '\0';
3862 3810
3863 if (name[0] == '?' && !name[1]) 3811 process_color_seq (op, color, name, resp);
3864 {
3865 unsigned short r, g, b;
3866 pix_colors_focused[color + minCOLOR].get (display, r, g, b);
3867 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3868 }
3869 else
3870 set_window_color (color + minCOLOR, name);
3871 } 3812 }
3872 break; 3813 break;
3873 case XTerm_Color00: 3814 case XTerm_Color00:
3874 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3815 process_color_seq (op, Color_fg, str, resp);
3875 break; 3816 break;
3876 case XTerm_Color01: 3817 case XTerm_Color01:
3877 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3818 process_color_seq (op, Color_bg, str, resp);
3878 break; 3819 break;
3879#ifndef NO_CURSORCOLOR 3820#ifndef NO_CURSORCOLOR
3880 case XTerm_Color_cursor: 3821 case XTerm_Color_cursor:
3881 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3822 process_color_seq (op, Color_cursor, str, resp);
3882 break; 3823 break;
3883#endif 3824#endif
3884 case XTerm_Color_pointer_fg: 3825 case XTerm_Color_pointer_fg:
3885 process_color_seq (XTerm_Color_pointer_fg, Color_pointer_fg, str, resp); 3826 process_color_seq (op, Color_pointer_fg, str, resp);
3886 break; 3827 break;
3887 case XTerm_Color_pointer_bg: 3828 case XTerm_Color_pointer_bg:
3888 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3829 process_color_seq (op, Color_pointer_bg, str, resp);
3889 break; 3830 break;
3890#ifndef NO_BOLD_UNDERLINE_REVERSE 3831#ifndef NO_BOLD_UNDERLINE_REVERSE
3891 case XTerm_Color_BD:
3892 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3893 break;
3894 case XTerm_Color_UL:
3895 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3896 break;
3897 case XTerm_Color_RV: 3832 case XTerm_Color_RV:
3898 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);
3899 break; 3842 break;
3900 case URxvt_Color_IT: 3843 case URxvt_Color_IT:
3901 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3844 process_color_seq (op, Color_IT, str, resp);
3902 break; 3845 break;
3903#endif 3846#endif
3904#if TRANSPARENT && TINTING 3847#if TRANSPARENT && TINTING
3905 case URxvt_Color_tint: 3848 case URxvt_Color_tint:
3906 process_color_seq (URxvt_Color_tint, Color_tint, str, resp); 3849 process_color_seq (op, Color_tint, str, resp);
3850
3907 check_our_parents (); 3851 check_our_parents ();
3852
3908 if (am_transparent) 3853 if (am_transparent)
3909 want_full_refresh = want_refresh = 1; 3854 want_full_refresh = want_refresh = 1;
3910 break;
3911#endif
3912 3855
3856 break;
3857#endif
3858
3913 case XTerm_Pixmap: 3859 case Rxvt_Pixmap:
3860 {
3914 if (*str != ';') 3861 if (*str != ';')
3915 { 3862 {
3916#if XPM_BACKGROUND 3863#if XPM_BACKGROUND
3917 scale_pixmap (""); /* reset to default scaling */ 3864 scale_pixmap (""); /* reset to default scaling */
3918 set_bgPixmap (str); /* change pixmap */ 3865 set_bgPixmap (str); /* change pixmap */
3919#endif
3920 scr_touch (true); 3866 scr_touch (true);
3867#endif
3921 } 3868 }
3869
3870 int changed = 0;
3871
3922 while ((str = strchr (str, ';')) != NULL) 3872 while ((str = strchr (str, ';')) != NULL)
3923 { 3873 {
3924 str++; 3874 str++;
3925#if XPM_BACKGROUND 3875#if XPM_BACKGROUND
3926 changed += scale_pixmap (str); 3876 changed += scale_pixmap (str);
3927#endif 3877#endif
3928 } 3878 }
3929 3879
3930 if (changed) 3880 if (changed)
3931 { 3881 {
3932#ifdef XPM_BACKGROUND 3882#ifdef XPM_BACKGROUND
3933 resize_pixmap (); 3883 resize_pixmap ();
3934#endif
3935 scr_touch (true); 3884 scr_touch (true);
3885#endif
3936 } 3886 }
3887 }
3937 break; 3888 break;
3938 3889
3939 case XTerm_restoreFG: 3890 case Rxvt_restoreFG:
3940 set_window_color (Color_fg, str); 3891 set_window_color (Color_fg, str);
3941 break; 3892 break;
3942 case XTerm_restoreBG: 3893 case Rxvt_restoreBG:
3943 set_window_color (Color_bg, str); 3894 set_window_color (Color_bg, str);
3944 break; 3895 break;
3945 3896
3946 case XTerm_logfile: 3897 case XTerm_logfile:
3947 // TODO, when secure mode? 3898 // TODO, when secure mode?
3948 break; 3899 break;
3949 3900
3950#ifdef MENUBAR
3951 case URxvt_Menu:
3952 if (OPTION (Opt_insecure))
3953 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3954 break;
3955#endif
3956#if 0 3901#if 0
3957 case XTerm_dumpscreen: /* no error notices */ 3902 case Rxvt_dumpscreen: /* no error notices */
3958 { 3903 {
3959 int fd; 3904 int fd;
3960 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)
3961 { 3906 {
3962 scr_dump (fd); 3907 scr_dump (fd);
… …
3986 allocated.push_back ((void *)res); 3931 allocated.push_back ((void *)res);
3987 set_fonts (); 3932 set_fonts ();
3988 } 3933 }
3989 break; 3934 break;
3990 3935
3991#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
3992 case URxvt_locale: 3945 case URxvt_locale:
3993 if (query) 3946 if (query)
3994 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);
3995 else 3948 else
3996 { 3949 {
3997 set_locale (str); 3950 set_locale (str);
3998 pty.set_utf8_mode (enc_utf8); 3951 pty->set_utf8_mode (enc_utf8);
3999 init_xlocale (); 3952 init_xlocale ();
4000 } 3953 }
4001 break; 3954 break;
4002 3955
4003 case URxvt_view_up: 3956 case URxvt_view_up:
… …
4014 break; 3967 break;
4015#endif 3968#endif
4016 3969
4017#if ENABLE_PERL 3970#if ENABLE_PERL
4018 case URxvt_perl: 3971 case URxvt_perl:
4019 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)))
4020 ; // no responses yet 3973 ; // no responses yet
4021 break; 3974 break;
4022#endif 3975#endif
4023 } 3976 }
4024} 3977}
… …
4056 return state; 4009 return state;
4057} 4010}
4058 4011
4059/* we're not using priv _yet_ */ 4012/* we're not using priv _yet_ */
4060void 4013void
4061rxvt_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)
4062{ 4015{
4063 unsigned int i, j; 4016 unsigned int i, j;
4064 int state; 4017 int state;
4065 4018
4066 static const struct 4019 static const struct
… …
4077 { 5, PrivMode_rVideo }, 4030 { 5, PrivMode_rVideo },
4078 { 6, PrivMode_relOrigin }, 4031 { 6, PrivMode_relOrigin },
4079 { 7, PrivMode_Autowrap }, 4032 { 7, PrivMode_Autowrap },
4080 // 8, bi-directional support mode 4033 // 8, bi-directional support mode
4081 { 9, PrivMode_MouseX10 }, 4034 { 9, PrivMode_MouseX10 },
4082#ifdef menuBar_esc
4083 { menuBar_esc, PrivMode_menuBar },
4084#endif
4085 // 18, 19 printing-related 4035 // 18, 19 printing-related
4086 { 25, PrivMode_VisibleCursor }, 4036 { 25, PrivMode_VisibleCursor },
4087#ifdef scrollBar_esc 4037#ifdef scrollBar_esc
4088 { scrollBar_esc, PrivMode_scrollBar }, 4038 { scrollBar_esc, PrivMode_scrollBar },
4089#endif 4039#endif
… …
4136 /* extra handling for values with state unkept */ 4086 /* extra handling for values with state unkept */
4137 switch (arg[i]) 4087 switch (arg[i])
4138 { 4088 {
4139#if ENABLE_STYLES 4089#if ENABLE_STYLES
4140 case 1021: 4090 case 1021:
4141 if (mode) 4091 set_option (Opt_intensityStyles, mode);
4142 SET_OPTION (Opt_intensityStyles);
4143 else
4144 CLR_OPTION (Opt_intensityStyles);
4145 4092
4146 scr_touch (true); 4093 scr_touch (true);
4147 break; 4094 break;
4148#endif 4095#endif
4149 case 1048: /* alternative cursor save */ 4096 case 1048: /* alternative cursor save */
… …
4171 case 3: /* 80/132 */ 4118 case 3: /* 80/132 */
4172 if (priv_modes & PrivMode_132OK) 4119 if (priv_modes & PrivMode_132OK)
4173 set_widthheight (((state ? 132 : 80) * fwidth), height); 4120 set_widthheight (((state ? 132 : 80) * fwidth), height);
4174 break; 4121 break;
4175 case 4: /* smooth scrolling */ 4122 case 4: /* smooth scrolling */
4176 if (!state) 4123 set_option (Opt_jumpScroll, !state);
4177 SET_OPTION (Opt_jumpScroll);
4178 else
4179 CLR_OPTION (Opt_jumpScroll);
4180 break; 4124 break;
4181 case 5: /* reverse video */ 4125 case 5: /* reverse video */
4182 scr_rvideo_mode (state); 4126 scr_rvideo_mode (state);
4183 break; 4127 break;
4184 case 6: /* relative/absolute origins */ 4128 case 6: /* relative/absolute origins */
… …
4190 /* 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 */
4191 case 9: /* X10 mouse reporting */ 4135 case 9: /* X10 mouse reporting */
4192 if (state) /* orthogonal */ 4136 if (state) /* orthogonal */
4193 priv_modes &= ~PrivMode_MouseX11; 4137 priv_modes &= ~PrivMode_MouseX11;
4194 break; 4138 break;
4195#ifdef menuBar_esc
4196 case menuBar_esc:
4197#ifdef MENUBAR
4198 map_menuBar (state);
4199#endif
4200 break;
4201#endif
4202#ifdef scrollBar_esc 4139#ifdef scrollBar_esc
4203 case scrollBar_esc: 4140 case scrollBar_esc:
4204 if (scrollbar_mapping (state)) 4141 if (scrollbar_mapping (state))
4205 { 4142 {
4206 resize_all_windows (0, 0, 0); 4143 resize_all_windows (0, 0, 0);
… …
4225#if 0 4162#if 0
4226 case 1001: 4163 case 1001:
4227 break; /* X11 mouse highlighting */ 4164 break; /* X11 mouse highlighting */
4228#endif 4165#endif
4229 case 1010: /* scroll to bottom on TTY output inhibit */ 4166 case 1010: /* scroll to bottom on TTY output inhibit */
4230 if (!state) 4167 set_option (Opt_scrollTtyOutput, !state);
4231 SET_OPTION (Opt_scrollTtyOutput);
4232 else
4233 CLR_OPTION (Opt_scrollTtyOutput);
4234 break; 4168 break;
4235 case 1011: /* scroll to bottom on key press */ 4169 case 1011: /* scroll to bottom on key press */
4236 if (state) 4170 set_option (Opt_scrollTtyKeypress, state);
4237 SET_OPTION (Opt_scrollTtyKeypress);
4238 else
4239 CLR_OPTION (Opt_scrollTtyKeypress);
4240 break; 4171 break;
4241 case 1047: /* secondary screen w/ clearing last */ 4172 case 1047: /* secondary screen w/ clearing last */
4242 if (OPTION (Opt_secondaryScreen)) 4173 if (OPTION (Opt_secondaryScreen))
4243 if (current_screen != PRIMARY) 4174 if (current_screen != PRIMARY)
4244 scr_erase_screen (2); 4175 scr_erase_screen (2);
… …
4382 scr_color (Color_bg, Color_bg); 4313 scr_color (Color_bg, Color_bg);
4383 break; 4314 break;
4384 4315
4385 //case 50: // not variable spacing 4316 //case 50: // not variable spacing
4386 4317
4387#if ENABLE_FRILLS 4318#if !ENABLE_MINIMAL
4388 case 90: 4319 case 90:
4389 case 91: /* set bright fg color */ 4320 case 91: /* set bright fg color */
4390 case 92: 4321 case 92:
4391 case 93: 4322 case 93:
4392 case 94: 4323 case 94:
… …
4454const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4385const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4455 4386
4456void 4387void
4457rxvt_term::tt_write (const char *data, unsigned int len) 4388rxvt_term::tt_write (const char *data, unsigned int len)
4458{ 4389{
4390 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4391 return;
4392
4393 if (pty->pty < 0)
4394 return;
4395
4459 if (v_buflen == 0) 4396 if (v_buflen == 0)
4460 { 4397 {
4461 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));
4462 4399
4463 if ((unsigned int)written == len) 4400 if ((unsigned int)written == len)
4464 return; 4401 return;
4465 4402
4466 data += written; 4403 data += written;
… …
4475 pty_ev.set (EVENT_READ | EVENT_WRITE); 4412 pty_ev.set (EVENT_READ | EVENT_WRITE);
4476} 4413}
4477 4414
4478void rxvt_term::pty_write () 4415void rxvt_term::pty_write ()
4479{ 4416{
4480 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));
4481 4418
4482 if (written > 0) 4419 if (written > 0)
4483 { 4420 {
4484 v_buflen -= written; 4421 v_buflen -= written;
4485 4422

Diff Legend

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