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.221 by root, Sat Dec 31 18:27:57 2005 UTC vs.
Revision 1.277 by root, Fri Jan 20 12:16:28 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.
43 * along with this program; if not, write to the Free Software 43 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 45 *----------------------------------------------------------------------*/
46 46
47/*{{{ includes: */ 47/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 48#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h"
50#include "rxvtperl.h"
50#include "version.h" 51#include "version.h"
51#include "command.h" 52#include "command.h"
52 53
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
53#ifdef KEYSYM_RESOURCE 59#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 60# include "keyboard.h"
55#endif 61#endif
56 62
57#include <csignal> 63#include <csignal>
58 64
59/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
60 66
61#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
62
63// exception thrown when the command parser runs out of input data
64class out_of_input { } out_of_input;
65 68
66#if ENABLE_FRILLS || ISO_14755 69#if ENABLE_FRILLS || ISO_14755
67 70
68#define ISO_14755_STARTED 0x80000000UL 71#define ISO_14755_STARTED 0x80000000UL
69#define ISO_14755_51 0x40000000UL // basic (section 5.1) 72#define ISO_14755_51 0x40000000UL // basic (section 5.1)
141 || !IN_RANGE_EXC (y, 0, nrow)) 144 || !IN_RANGE_EXC (y, 0, nrow))
142 return; 145 return;
143 146
144 for (;;) 147 for (;;)
145 { 148 {
146 const line_t &l = ROW(y - view_start); 149 const line_t &l = ROW(y + view_start);
147 150
148 text_t t = l.t[x]; 151 text_t t = l.t[x];
149 152
150 if (t != NOCHAR || !x) 153 if (t != NOCHAR || !x)
151 { 154 {
262 mb[0] = ch[0]; 265 mb[0] = ch[0];
263 len = 1; 266 len = 1;
264 } 267 }
265 268
266 if (len > 0) 269 if (len > 0)
267 tt_write ((unsigned char *)mb, len); 270 tt_write (mb, len);
268 else 271 else
269 scr_bell (); 272 scr_bell ();
270 } 273 }
271 274
272 iso14755buf = 0; 275 iso14755buf = 0;
300 KeySym keysym; 303 KeySym keysym;
301#ifdef DEBUG_CMD 304#ifdef DEBUG_CMD
302 static int debug_key = 1; /* accessible by a debugger only */ 305 static int debug_key = 1; /* accessible by a debugger only */
303#endif 306#endif
304 int valid_keysym; 307 int valid_keysym;
305 unsigned char kbuf[KBUFSZ]; 308 char kbuf[KBUFSZ];
306 309
307 /* 310 /*
308 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 311 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
309 * escape sequence to toggle the Keypad. 312 * escape sequence to toggle the Keypad.
310 * 313 *
328 Status status_return; 331 Status status_return;
329 332
330#if 0 333#if 0
331#ifdef X_HAVE_UTF8_STRING 334#ifdef X_HAVE_UTF8_STRING
332 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 335 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
333 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 336 len = Xutf8LookupString (Input_Context, &ev, kbuf,
334 KBUFSZ, &keysym, &status_return); 337 KBUFSZ, &keysym, &status_return);
335 else 338 else
336#endif 339#endif
337#endif 340#endif
338 { 341 {
375 || status_return == XLookupBoth; 378 || status_return == XLookupBoth;
376 } 379 }
377 else 380 else
378#endif 381#endif
379 { 382 {
380 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 383 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
381 valid_keysym = keysym != NoSymbol; 384 valid_keysym = keysym != NoSymbol;
382 } 385 }
383 386
384 if (valid_keysym) 387 if (valid_keysym)
385 { 388 {
437 scr_move_to (0, 1); 440 scr_move_to (0, 1);
438 return; 441 return;
439 } 442 }
440 else if (keysym == XK_End) 443 else if (keysym == XK_End)
441 { 444 {
442 scr_move_to (1, 0); 445 scr_move_to (1, 1);
443 return; 446 return;
444 } 447 }
445 } 448 }
446#endif 449#endif
447 } 450 }
458 { 461 {
459 switch (keysym) 462 switch (keysym)
460 { 463 {
461 /* normal XTerm key bindings */ 464 /* normal XTerm key bindings */
462 case XK_Insert: /* Shift+Insert = paste mouse selection */ 465 case XK_Insert: /* Shift+Insert = paste mouse selection */
463 selection_request (ev.time, 0, 0); 466 selection_request (ev.time);
464 return; 467 return;
465#if TODO 468#if TODO
466 /* rxvt extras */ 469 /* rxvt extras */
467 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 470 case XK_KP_Add: /* Shift+KP_Add = bigger font */
468 change_font (FONT_UP); 471 change_font (FONT_UP);
849 { 852 {
850#ifdef META8_OPTION 853#ifdef META8_OPTION
851 /* set 8-bit on */ 854 /* set 8-bit on */
852 if (meta && (meta_char == 0x80)) 855 if (meta && (meta_char == 0x80))
853 { 856 {
854 unsigned char *ch; 857 char *ch;
855 858
856 for (ch = kbuf; ch < kbuf + len; ch++) 859 for (ch = kbuf; ch < kbuf + len; ch++)
857 *ch |= 0x80; 860 *ch |= 0x80;
858 861
859 meta = 0; 862 meta = 0;
860 } 863 }
861#endif 864#endif
862 /* nil */ ; 865 /* nil */ ;
863 } 866 }
864 } 867 }
868
869 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
870 return;
865 871
866 if (len <= 0) 872 if (len <= 0)
867 return; /* not mapped */ 873 return; /* not mapped */
868 874
869 if (OPTION (Opt_scrollTtyKeypress)) 875 if (OPTION (Opt_scrollTtyKeypress))
892#ifdef META8_OPTION 898#ifdef META8_OPTION
893 && meta_char == C0_ESC 899 && meta_char == C0_ESC
894#endif 900#endif
895 ) 901 )
896 { 902 {
897 const unsigned char ch = C0_ESC; 903 const char ch = C0_ESC;
898 tt_write (&ch, 1); 904 tt_write (&ch, 1);
899 } 905 }
900 906
901#if defined(DEBUG_CMD) 907#if defined(DEBUG_CMD)
902 /* Display keyboard buffer contents */ 908 /* Display keyboard buffer contents */
910#endif /* DEBUG_CMD */ 916#endif /* DEBUG_CMD */
911 tt_write (kbuf, (unsigned int)len); 917 tt_write (kbuf, (unsigned int)len);
912} 918}
913/*}}} */ 919/*}}} */
914 920
915#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 921#if defined (KEYSYM_RESOURCE)
916/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
917/* attempt to `write' count to the input buffer */
918unsigned int 922unsigned int
919rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 923rxvt_term::cmd_write (const char *str, unsigned int count)
920{ 924{
921 unsigned int n, s; 925 unsigned int n, s;
922 926
923 n = cmdbuf_ptr - cmdbuf_base; 927 n = cmdbuf_ptr - cmdbuf_base;
924 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 928 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
961 } 965 }
962#endif 966#endif
963 967
964 if (want_refresh) 968 if (want_refresh)
965 { 969 {
970 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
971 {
972 int row = view_start;
973 int end_row = row + nrow;
974
975 while (row > top_row && ROW (row - 1).is_longer ())
976 --row;
977
978 do
979 {
980 int start_row = row;
981 line_t *l;
982
983 do
984 {
985 l = &ROW (row++);
986
987 if (!(l->f & LINE_FILTERED))
988 {
989 // line not filtered, mark it as filtered
990 l->f |= LINE_FILTERED;
991 while (l->is_longer ())
992 {
993 l = &ROW (row++);
994 l->f |= LINE_FILTERED;
995 }
996
997 // and filter it
998 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
999
1000 break;
1001 }
1002 }
1003 while (l->is_longer () && row < end_row);
1004 }
1005 while (row < end_row);
1006 }
1007
966 scr_refresh (refresh_type); 1008 scr_refresh ();
967 scrollbar_show (1); 1009 scrollbar_show (1);
968#ifdef USE_XIM 1010#ifdef USE_XIM
969 IMSendSpot (); 1011 IMSendSpot ();
970#endif 1012#endif
971 } 1013 }
974} 1016}
975 1017
976void 1018void
977rxvt_term::check_cb (check_watcher &w) 1019rxvt_term::check_cb (check_watcher &w)
978{ 1020{
979 SET_R (this); 1021 make_current ();
980 SET_LOCALE (locale);
981 1022
982 display->flush (); 1023 display->flush ();
983 1024
984 if (want_refresh && !flush_ev.active) 1025 if (want_refresh && !flush_ev.active)
985 flush_ev.start (NOW + 0.01); 1026 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
986} 1027}
987 1028
988void 1029void
989rxvt_term::flush_cb (time_watcher &w) 1030rxvt_term::flush_cb (time_watcher &w)
990{ 1031{
991 SET_R (this); 1032 make_current ();
992 SET_LOCALE (locale);
993 1033
994 refresh_limit = 1; 1034 refresh_limit = 1;
995 refresh_count = 0; 1035 refresh_count = 0;
996 flush (); 1036 flush ();
997} 1037}
1001rxvt_term::cursor_blink_cb (time_watcher &w) 1041rxvt_term::cursor_blink_cb (time_watcher &w)
1002{ 1042{
1003 hidden_cursor = !hidden_cursor; 1043 hidden_cursor = !hidden_cursor;
1004 want_refresh = 1; 1044 want_refresh = 1;
1005 1045
1006 w.start (w.at + BLINK_INTERVAL); 1046 w.start (w.at + CURSOR_BLINK_INTERVAL);
1007} 1047}
1008#endif 1048#endif
1009 1049
1010#ifdef TEXT_BLINK 1050#ifdef TEXT_BLINK
1011void 1051void
1025rxvt_term::cont_scroll_cb (time_watcher &w) 1065rxvt_term::cont_scroll_cb (time_watcher &w)
1026{ 1066{
1027 if ((scrollbar_isUp() || scrollbar_isDn()) && 1067 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1028 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1068 scr_page (scrollbar_isUp() ? UP : DN, 1))
1029 { 1069 {
1030 refresh_type |= SMOOTH_REFRESH;
1031 want_refresh = 1; 1070 want_refresh = 1;
1032 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1033 } 1072 }
1034} 1073}
1035#endif 1074#endif
1039rxvt_term::sel_scroll_cb (time_watcher &w) 1078rxvt_term::sel_scroll_cb (time_watcher &w)
1040{ 1079{
1041 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1080 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1042 { 1081 {
1043 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1082 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1044 refresh_type |= SMOOTH_REFRESH;
1045 want_refresh = 1; 1083 want_refresh = 1;
1046 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1084 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1047 } 1085 }
1048} 1086}
1049#endif 1087#endif
1054{ 1092{
1055 if (mouse_slip_wheel_speed == 0 1093 if (mouse_slip_wheel_speed == 0
1056 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1094 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1057 : scr_page (UP, mouse_slip_wheel_speed)) 1095 : scr_page (UP, mouse_slip_wheel_speed))
1058 { 1096 {
1059 if (view_start == nsaved || 1097 if (view_start == top_row || view_start == 0)
1060 view_start == 0)
1061 mouse_slip_wheel_speed = 0; 1098 mouse_slip_wheel_speed = 0;
1062 1099
1063 refresh_type |= SMOOTH_REFRESH;
1064 want_refresh = 1; 1100 want_refresh = 1;
1065 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1101 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1066 } 1102 }
1067} 1103}
1068#endif 1104#endif
1069 1105
1106#if HAVE_SCHED_YIELD
1107static struct event_handler
1108{
1109 check_watcher cw_yield;
1110
1111 void yield (check_watcher &w)
1112 {
1113 sched_yield ();
1114 w.stop ();
1115 }
1116
1117 event_handler ()
1118 : cw_yield (this, &event_handler::yield)
1119 {
1120 }
1121} event_handler;
1122#endif
1123
1070bool 1124bool
1071rxvt_term::pty_fill () 1125rxvt_term::pty_fill ()
1072{ 1126{
1073 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1127 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1074 1128
1075 if (CBUFSIZ == n) 1129 if (CBUFSIZ == n)
1076 { 1130 {
1077 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1131 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1078 n = 0; 1132 n = 0;
1079 } 1133 }
1080 1134
1081 memmove (cmdbuf_base, cmdbuf_ptr, n); 1135 memmove (cmdbuf_base, cmdbuf_ptr, n);
1082 cmdbuf_ptr = cmdbuf_base; 1136 cmdbuf_ptr = cmdbuf_base;
1083 cmdbuf_endp = cmdbuf_ptr + n; 1137 cmdbuf_endp = cmdbuf_ptr + n;
1084 1138
1085 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1139 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1086 1140
1087 if (n > 0) 1141 if (r > 0)
1088 { 1142 {
1089 cmdbuf_endp += n; 1143 cmdbuf_endp += r;
1090 return true; 1144 return true;
1091 } 1145 }
1092 else if ((n < 0 && errno != EAGAIN && errno != EINTR) || n == 0) 1146 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1147 {
1148#if HAVE_SCHED_YIELD
1149 if (display->is_local)
1150 event_handler.cw_yield.start ();
1151#endif
1152 }
1153 else
1093 { 1154 {
1094 pty_ev.stop (); 1155 pty_ev.stop ();
1095 1156
1096 if (!OPTION (Opt_hold)) 1157 if (!OPTION (Opt_hold))
1097 destroy (); 1158 destroy ();
1101} 1162}
1102 1163
1103void 1164void
1104rxvt_term::pty_cb (io_watcher &w, short revents) 1165rxvt_term::pty_cb (io_watcher &w, short revents)
1105{ 1166{
1106 SET_R (this); 1167 make_current ();
1107 SET_LOCALE (locale);
1108 1168
1109 if (revents & EVENT_READ) 1169 if (revents & EVENT_READ)
1110 // loop, but don't allow a single term to monopolize us 1170 // loop, but don't allow a single term to monopolize us
1111 while (pty_fill ()) 1171 while (pty_fill ())
1112 if (cmd_parse ()) 1172 if (cmd_parse ())
1132 1192
1133#ifdef POINTER_BLANK 1193#ifdef POINTER_BLANK
1134void 1194void
1135rxvt_term::pointer_blank () 1195rxvt_term::pointer_blank ()
1136{ 1196{
1137 if (! OPTION (Opt_pointerBlank)) 1197 if (!OPTION (Opt_pointerBlank))
1138 return; 1198 return;
1139 1199
1140 XDefineCursor (display->display, vt, display->blank_cursor); 1200 XDefineCursor (display->display, vt, display->blank_cursor);
1141 XFlush (display->display); 1201 XFlush (display->display);
1142 1202
1144} 1204}
1145 1205
1146void 1206void
1147rxvt_term::pointer_cb (time_watcher &w) 1207rxvt_term::pointer_cb (time_watcher &w)
1148{ 1208{
1149 SET_R (this); 1209 make_current ();
1150 SET_LOCALE (locale);
1151 1210
1152 pointer_blank (); 1211 pointer_blank ();
1153} 1212}
1154#endif 1213#endif
1155 1214
1234 1293
1235/*{{{ process an X event */ 1294/*{{{ process an X event */
1236void 1295void
1237rxvt_term::x_cb (XEvent &ev) 1296rxvt_term::x_cb (XEvent &ev)
1238{ 1297{
1298 make_current ();
1299
1239 dDisp; 1300 dDisp;
1240 1301
1241 SET_R (this); 1302 if (ev.xany.window == vt
1242 SET_LOCALE (locale); 1303 && SHOULD_INVOKE (HOOK_X_EVENT)
1304 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1305 return;
1243 1306
1244#if defined(CURSOR_BLINK) 1307 // for XQueryPointer
1245 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1246 {
1247 if (hidden_cursor)
1248 {
1249 hidden_cursor = 0;
1250 want_refresh = 1;
1251 }
1252
1253 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1254 }
1255#endif
1256
1257#if defined(POINTER_BLANK)
1258 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1259 {
1260 if (ev.type == MotionNotify
1261 || ev.type == ButtonPress
1262 || ev.type == ButtonRelease)
1263 if (hidden_pointer)
1264 pointer_unblank ();
1265
1266 if (ev.type == KeyPress && hidden_pointer == 0)
1267 pointer_blank ();
1268 }
1269#endif
1270
1271 Window unused_root, unused_child; 1308 Window unused_root, unused_child;
1272 int unused_root_x, unused_root_y; 1309 int unused_root_x, unused_root_y;
1273 unsigned int unused_mask; 1310 unsigned int unused_mask;
1274 1311
1275 switch (ev.type) 1312 switch (ev.type)
1282 1319
1283 break; 1320 break;
1284 1321
1285 case KeyRelease: 1322 case KeyRelease:
1286 { 1323 {
1287#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1324#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1288 KeySym ks; 1325 KeySym keysym;
1289 1326
1290 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1327 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1291#endif 1328#endif
1292 1329
1293#if ENABLE_FRILLS || ISO_14755 1330#if ENABLE_FRILLS || ISO_14755
1294 // ISO 14755 support 1331 // ISO 14755 support
1295 if (iso14755buf) 1332 if (iso14755buf)
1300# endif 1337# endif
1301# if ISO_14755 1338# if ISO_14755
1302 // iso14755 part 5.2 handling: release time 1339 // iso14755 part 5.2 handling: release time
1303 // first: controls 1340 // first: controls
1304 if ((ev.xkey.state & ControlMask) 1341 if ((ev.xkey.state & ControlMask)
1305 && ((ks >= 0x40 && ks <= 0x5f) 1342 && ((keysym >= 0x40 && keysym <= 0x5f)
1306 || (ks >= 0x61 && ks <= 0x7f))) 1343 || (keysym >= 0x61 && keysym <= 0x7f)))
1307 { 1344 {
1308 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1345 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1309 commit_iso14755 (); 1346 commit_iso14755 ();
1310 return; // case-break; 1347 goto skip_switch;
1311 } 1348 }
1312 1349
1313 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1350 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1314 if (i[0] == ks) 1351 if (i[0] == keysym)
1315 { 1352 {
1316 iso14755buf = ISO_14755_51 | i[1]; 1353 iso14755buf = ISO_14755_51 | i[1];
1317 commit_iso14755 (); 1354 commit_iso14755 ();
1318 return; // case-break; 1355 goto skip_switch;
1319 } 1356 }
1320 1357
1321 scr_bell (); 1358 scr_bell ();
1322# endif 1359# endif
1323 iso14755buf = 0; 1360 iso14755buf = 0;
1342 else 1379 else
1343 iso14755buf = 0; 1380 iso14755buf = 0;
1344 } 1381 }
1345#endif 1382#endif
1346 1383
1384 if (ev.xany.window == vt
1385 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1386 break;
1387
1347#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1388#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1348 if (!(ev.xkey.state & ControlMask)) 1389 if (!(ev.xkey.state & ControlMask))
1349 slip_wheel_ev.stop (); 1390 slip_wheel_ev.stop ();
1350 else if (ks == XK_Control_L || ks == XK_Control_R) 1391 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1351 mouse_slip_wheel_speed = 0; 1392 mouse_slip_wheel_speed = 0;
1352#endif 1393#endif
1353 break; 1394 break;
1354 } 1395 }
1355 1396
1361 button_release (ev.xbutton); 1402 button_release (ev.xbutton);
1362 break; 1403 break;
1363 1404
1364 case ClientMessage: 1405 case ClientMessage:
1365 if (ev.xclient.format == 32 1406 if (ev.xclient.format == 32
1366 && ev.xclient.message_type == xa[XA_WM_PROTOCOLS]) 1407 && !HOOK_INVOKE ((this, HOOK_CLIENT_MESSAGE, DT_XEVENT, &ev, DT_END)))
1367 { 1408 {
1409 if (ev.xclient.message_type == xa[XA_WM_PROTOCOLS])
1410 {
1411 if (!HOOK_INVOKE ((this, HOOK_WM_PROTOCOLS, DT_XEVENT, &ev, DT_END)))
1412 {
1368 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW]) 1413 if (ev.xclient.data.l[0] == xa[XA_WM_DELETE_WINDOW])
1414 {
1415 if (!HOOK_INVOKE ((this, HOOK_WM_DELETE_WINDOW, DT_XEVENT, &ev, DT_END)))
1369 destroy (); 1416 destroy ();
1417 }
1370#if ENABLE_EWMH 1418#if ENABLE_EWMH
1371 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING]) 1419 else if (ev.xclient.data.l[0] == xa[XA_NET_WM_PING])
1372 XSendEvent (disp, ev.xclient.window = display->root, 1420 XSendEvent (disp, ev.xclient.window = display->root,
1373 False, SubstructureRedirectMask | SubstructureNotifyMask, 1421 False, SubstructureRedirectMask | SubstructureNotifyMask,
1374 &ev); 1422 &ev);
1423#endif
1424 }
1425 }
1426#if ENABLE_XEMBED
1427 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1428 {
1429 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1430 focus_in ();
1431 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1432 focus_out ();
1433 }
1375#endif 1434#endif
1376 } 1435 }
1377#if ENABLE_XEMBED
1378 else if (ev.xclient.format == 32 && ev.xclient.message_type == xa[XA_XEMBED])
1379 {
1380 if (ev.xclient.data.l[1] == XEMBED_FOCUS_IN)
1381 focus_in ();
1382 else if (ev.xclient.data.l[1] == XEMBED_FOCUS_OUT)
1383 focus_out ();
1384 }
1385#endif
1386#ifdef OFFIX_DND
1387 /* OffiX Dnd (drag 'n' drop) protocol */
1388 else if (ev.xclient.message_type == xa[XA_DNDPROTOCOL]
1389 && (ev.xclient.data.l[0] == DndFile
1390 || ev.xclient.data.l[0] == DndDir
1391 || ev.xclient.data.l[0] == DndLink))
1392 {
1393 /* Get Dnd data */
1394 Atom ActualType;
1395 int ActualFormat;
1396 unsigned char *data;
1397 unsigned long Size, RemainingBytes;
1398
1399 XGetWindowProperty (disp, display->root,
1400 xa[XA_DNDSELECTION],
1401 0L, 1000000L,
1402 False, AnyPropertyType,
1403 &ActualType, &ActualFormat,
1404 &Size, &RemainingBytes,
1405 &data);
1406 set_string_property (XA_CUT_BUFFER0, data);
1407 XFree (data);
1408 selection_paste (display->root, XA_CUT_BUFFER0, true);
1409 XSetInputFocus (disp, display->root, RevertToNone, CurrentTime);
1410 }
1411#endif /* OFFIX_DND */
1412 break; 1436 break;
1413 1437
1414 case MappingNotify: 1438 case MappingNotify:
1415 XRefreshKeyboardMapping (&ev.xmapping); 1439 XRefreshKeyboardMapping (&ev.xmapping);
1416 break; 1440 break;
1458 { 1482 {
1459 seen_resize = 1; 1483 seen_resize = 1;
1460 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1484 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1461 } 1485 }
1462 1486
1487 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1488
1463#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1489#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1464 if (OPTION (Opt_transparent)) 1490 if (OPTION (Opt_transparent))
1465 check_our_parents (); 1491 check_our_parents ();
1466#endif 1492#endif
1467 } 1493 }
1485 1511
1486 case SelectionRequest: 1512 case SelectionRequest:
1487 selection_send (ev.xselectionrequest); 1513 selection_send (ev.xselectionrequest);
1488 break; 1514 break;
1489 1515
1516 case MapNotify:
1517 mapped = 1;
1518#ifdef TEXT_BLINK
1519 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1520#endif
1521 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1522 break;
1523
1490 case UnmapNotify: 1524 case UnmapNotify:
1491 mapped = 0; 1525 mapped = 0;
1492#ifdef TEXT_BLINK 1526#ifdef TEXT_BLINK
1493 text_blink_ev.stop (); 1527 text_blink_ev.stop ();
1494#endif 1528#endif
1495 break; 1529 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1496
1497 case MapNotify:
1498 mapped = 1;
1499#ifdef TEXT_BLINK
1500 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1501#endif
1502 break; 1530 break;
1503 1531
1504#ifdef TRANSPARENT 1532#ifdef TRANSPARENT
1505 case ReparentNotify: 1533 case ReparentNotify:
1506 rootwin_cb (ev); 1534 rootwin_cb (ev);
1520 1548
1521 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1549 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1522 scr_expose (ev.xexpose.x, ev.xexpose.y, 1550 scr_expose (ev.xexpose.x, ev.xexpose.y,
1523 ev.xexpose.width, ev.xexpose.height, False); 1551 ev.xexpose.width, ev.xexpose.height, False);
1524 1552
1525 scr_refresh (refresh_type); 1553 want_refresh = 1;
1526 } 1554 }
1527 else 1555 else
1528 { 1556 {
1529 XEvent unused_event; 1557 XEvent unused_event;
1530 1558
1536 if (isScrollbarWindow (ev.xany.window)) 1564 if (isScrollbarWindow (ev.xany.window))
1537 { 1565 {
1538 scrollBar.setIdle (); 1566 scrollBar.setIdle ();
1539 scrollbar_show (0); 1567 scrollbar_show (0);
1540 } 1568 }
1541#ifdef MENUBAR
1542 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1543 menubar_expose ();
1544#endif
1545 1569
1546#ifdef TRANSPARENT 1570#ifdef TRANSPARENT
1547 if (am_transparent && ev.xany.window == parent[0]) 1571 if (am_transparent && ev.xany.window == parent[0])
1548 XClearWindow (disp, ev.xany.window); 1572 XClearWindow (disp, ev.xany.window);
1549#endif 1573#endif
1553 case MotionNotify: 1577 case MotionNotify:
1554#ifdef POINTER_BLANK 1578#ifdef POINTER_BLANK
1555 if (hidden_pointer) 1579 if (hidden_pointer)
1556 pointer_unblank (); 1580 pointer_unblank ();
1557#endif 1581#endif
1558#if MENUBAR
1559 if (isMenuBarWindow (ev.xany.window))
1560 {
1561 menubar_control (ev.xbutton);
1562 break;
1563 }
1564#endif
1565 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1582 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1566 break; 1583 break;
1567 1584
1568 if (ev.xany.window == vt) 1585 if (ev.xany.window == vt)
1569 { 1586 {
1587 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1588 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1589 ; // nop
1570 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1590 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1571 { 1591 {
1572 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1592 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1573 ; 1593 ;
1574 1594
1575 XQueryPointer (disp, vt, 1595 XQueryPointer (disp, vt,
1655 &unused_root_x, &unused_root_y, 1675 &unused_root_x, &unused_root_y,
1656 &ev.xbutton.x, &ev.xbutton.y, 1676 &ev.xbutton.x, &ev.xbutton.y,
1657 &unused_mask); 1677 &unused_mask);
1658 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1678 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1659 scrollbar_size ()); 1679 scrollbar_size ());
1660 scr_refresh (refresh_type); 1680 want_refresh = 1;
1661 refresh_limit = 0; 1681 refresh_limit = 0;
1662 scrollbar_show (1); 1682 scrollbar_show (1);
1663 } 1683 }
1664 break; 1684 break;
1665 } 1685 }
1686
1687skip_switch: ;
1688
1689#if defined(CURSOR_BLINK)
1690 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1691 {
1692 if (hidden_cursor)
1693 {
1694 hidden_cursor = 0;
1695 want_refresh = 1;
1696 }
1697
1698 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1699 }
1700#endif
1701
1702#if defined(POINTER_BLANK)
1703 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1704 {
1705 if (ev.type == MotionNotify
1706 || ev.type == ButtonPress
1707 || ev.type == ButtonRelease)
1708 if (hidden_pointer)
1709 pointer_unblank ();
1710
1711 if (ev.type == KeyPress && hidden_pointer == 0)
1712 pointer_blank ();
1713 }
1714#endif
1666} 1715}
1667 1716
1668void 1717void
1669rxvt_term::focus_in () 1718rxvt_term::focus_in ()
1670{ 1719{
1671 if (!focus) 1720 if (!focus)
1672 { 1721 {
1673 focus = 1; 1722 focus = 1;
1674 want_refresh = 1; 1723 want_refresh = 1;
1724
1725 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1726
1675#if USE_XIM 1727#if USE_XIM
1676 if (Input_Context != NULL) 1728 if (Input_Context != NULL)
1677 { 1729 {
1678 IMSetStatusPosition (); 1730 IMSetStatusPosition ();
1679 XSetICFocus (Input_Context); 1731 XSetICFocus (Input_Context);
1680 } 1732 }
1681#endif 1733#endif
1682#if CURSOR_BLINK 1734#if CURSOR_BLINK
1683 if (OPTION (Opt_cursorBlink)) 1735 if (OPTION (Opt_cursorBlink))
1684 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1736 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1685#endif 1737#endif
1686#if OFF_FOCUS_FADING 1738#if OFF_FOCUS_FADING
1687 if (rs[Rs_fade]) 1739 if (rs[Rs_fade])
1688 { 1740 {
1689 pix_colors = pix_colors_focused; 1741 pix_colors = pix_colors_focused;
1699 if (focus) 1751 if (focus)
1700 { 1752 {
1701 focus = 0; 1753 focus = 0;
1702 want_refresh = 1; 1754 want_refresh = 1;
1703 1755
1756 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1757
1704#if ENABLE_FRILLS || ISO_14755 1758#if ENABLE_FRILLS || ISO_14755
1759 if (iso14755buf)
1760 {
1705 iso14755buf = 0; 1761 iso14755buf = 0;
1706#endif
1707#if ENABLE_OVERLAY 1762# if ENABLE_OVERLAY
1708 scr_overlay_off (); 1763 scr_overlay_off ();
1764# endif
1765 }
1709#endif 1766#endif
1710#if USE_XIM 1767#if USE_XIM
1711 if (Input_Context != NULL) 1768 if (Input_Context != NULL)
1712 XUnsetICFocus (Input_Context); 1769 XUnsetICFocus (Input_Context);
1713#endif 1770#endif
1728 1785
1729#if TRANSPARENT 1786#if TRANSPARENT
1730void 1787void
1731rxvt_term::rootwin_cb (XEvent &ev) 1788rxvt_term::rootwin_cb (XEvent &ev)
1732{ 1789{
1733 SET_R (this); 1790 make_current ();
1734 SET_LOCALE (locale);
1735 1791
1736 switch (ev.type) 1792 switch (ev.type)
1737 { 1793 {
1738 case PropertyNotify: 1794 case PropertyNotify:
1739 /* 1795 /*
1757rxvt_term::button_press (XButtonEvent &ev) 1813rxvt_term::button_press (XButtonEvent &ev)
1758{ 1814{
1759 int reportmode = 0, clickintime; 1815 int reportmode = 0, clickintime;
1760 1816
1761 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1817 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1818
1762 if (!bypass_keystate) 1819 if (!bypass_keystate)
1763 reportmode = !! (priv_modes & PrivMode_mouse_report); 1820 reportmode = !! (priv_modes & PrivMode_mouse_report);
1764 1821
1765 /* 1822 /*
1766 * VT window processing of button press 1823 * VT window processing of button press
1786#ifdef MOUSE_REPORT_DOUBLECLICK 1843#ifdef MOUSE_REPORT_DOUBLECLICK
1787 if (ev.button == MEvent.button && clickintime) 1844 if (ev.button == MEvent.button && clickintime)
1788 { 1845 {
1789 /* same button, within alloted time */ 1846 /* same button, within alloted time */
1790 MEvent.clicks++; 1847 MEvent.clicks++;
1848
1791 if (MEvent.clicks > 1) 1849 if (MEvent.clicks > 1)
1792 { 1850 {
1793 /* only report double clicks */ 1851 /* only report double clicks */
1794 MEvent.clicks = 2; 1852 MEvent.clicks = 2;
1795 mouse_report (ev); 1853 mouse_report (ev);
1815 else 1873 else
1816 { 1874 {
1817 if (ev.button != MEvent.button) 1875 if (ev.button != MEvent.button)
1818 MEvent.clicks = 0; 1876 MEvent.clicks = 0;
1819 1877
1878 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1820 switch (ev.button) 1879 switch (ev.button)
1821 { 1880 {
1822 case Button1: 1881 case Button1:
1823 /* allow meta + click to select rectangular areas */ 1882 /* allow meta + click to select rectangular areas */
1824 /* should be done in screen.C */ 1883 /* should be done in screen.C */
1825#if ENABLE_FRILLS 1884#if ENABLE_FRILLS
1826 selection.rect = !!(ev.state & ModMetaMask); 1885 selection.rect = !!(ev.state & ModMetaMask);
1827#else 1886#else
1828 selection.rect = false; 1887 selection.rect = false;
1829#endif 1888#endif
1830 1889
1831 /* allow shift+left click to extend selection */ 1890 /* allow shift+left click to extend selection */
1832 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1891 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1833 { 1892 {
1834 if (MEvent.button == Button1 && clickintime) 1893 if (MEvent.button == Button1 && clickintime)
1835 selection_rotate (ev.x, ev.y); 1894 selection_rotate (ev.x, ev.y);
1836 else 1895 else
1837 selection_extend (ev.x, ev.y, 1); 1896 selection_extend (ev.x, ev.y, 1);
1838 } 1897 }
1839 else 1898 else
1840 { 1899 {
1841 if (MEvent.button == Button1 && clickintime) 1900 if (MEvent.button == Button1 && clickintime)
1842 MEvent.clicks++; 1901 MEvent.clicks++;
1843 else 1902 else
1844 MEvent.clicks = 1; 1903 MEvent.clicks = 1;
1845 1904
1846 selection_click (MEvent.clicks, ev.x, ev.y); 1905 selection_click (MEvent.clicks, ev.x, ev.y);
1847 } 1906 }
1848 1907
1849 MEvent.button = Button1; 1908 MEvent.button = Button1;
1850 break; 1909 break;
1851 1910
1852 case Button3: 1911 case Button3:
1853 if (MEvent.button == Button3 && clickintime) 1912 if (MEvent.button == Button3 && clickintime)
1854 selection_rotate (ev.x, ev.y); 1913 selection_rotate (ev.x, ev.y);
1855 else 1914 else
1856 selection_extend (ev.x, ev.y, 1); 1915 selection_extend (ev.x, ev.y, 1);
1857 1916
1858 MEvent.button = Button3; 1917 MEvent.button = Button3;
1859 break; 1918 break;
1860 } 1919 }
1861 } 1920 }
1862 1921
1863 MEvent.time = ev.time; 1922 MEvent.time = ev.time;
1864 return; 1923 return;
1865 } 1924 }
1866 1925
2002 } 2061 }
2003 2062
2004 break; 2063 break;
2005 } 2064 }
2006 } 2065 }
2066
2007 return; 2067 return;
2008 } 2068 }
2009#if MENUBAR
2010 /*
2011 * Menubar window processing of button press
2012 */
2013 if (isMenuBarWindow (ev.window))
2014 menubar_control (ev);
2015#endif
2016} 2069}
2017 2070
2018void 2071void
2019rxvt_term::button_release (XButtonEvent &ev) 2072rxvt_term::button_release (XButtonEvent &ev)
2020{ 2073{
2026 2079
2027 if (scrollbar_isUpDn ()) 2080 if (scrollbar_isUpDn ())
2028 { 2081 {
2029 scrollBar.setIdle (); 2082 scrollBar.setIdle ();
2030 scrollbar_show (0); 2083 scrollbar_show (0);
2031#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2032 refresh_type &= ~SMOOTH_REFRESH;
2033#endif
2034 } 2084 }
2035 2085
2036#ifdef SELECTION_SCROLLING 2086#ifdef SELECTION_SCROLLING
2037 if (sel_scroll_ev.active) 2087 if (sel_scroll_ev.active)
2038 sel_scroll_ev.stop(); 2088 sel_scroll_ev.stop();
2076 if (priv_modes & PrivMode_mouse_report 2126 if (priv_modes & PrivMode_mouse_report
2077 && bypass_keystate 2127 && bypass_keystate
2078 && ev.button == Button1 && MEvent.clicks <= 1) 2128 && ev.button == Button1 && MEvent.clicks <= 1)
2079 selection_extend (ev.x, ev.y, 0); 2129 selection_extend (ev.x, ev.y, 0);
2080 2130
2131 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2132 return;
2133
2081 switch (ev.button) 2134 switch (ev.button)
2082 { 2135 {
2083 case Button1: 2136 case Button1:
2084 case Button3: 2137 case Button3:
2085 selection_make (ev.time); 2138 selection_make (ev.time);
2086 break; 2139 break;
2140
2087 case Button2: 2141 case Button2:
2088 selection_request (ev.time, ev.x, ev.y); 2142 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2143 selection_request (ev.time, ev.state & ShiftMask ? Sel_Clipboard : Sel_Primary);
2089 break; 2144 break;
2145
2090#ifdef MOUSE_WHEEL 2146#ifdef MOUSE_WHEEL
2091 case Button4: 2147 case Button4:
2092 case Button5: 2148 case Button5:
2093 { 2149 {
2094 int i; 2150 int i;
2116 slip_wheel_ev.start (); 2172 slip_wheel_ev.start ();
2117 } 2173 }
2118 else 2174 else
2119 { 2175 {
2120# endif 2176# endif
2121# ifdef JUMP_MOUSE_WHEEL
2122 scr_page (v, i); 2177 scr_page (v, i);
2123 scr_refresh (SMOOTH_REFRESH);
2124 scrollbar_show (1); 2178 scrollbar_show (1);
2125# else
2126 while (i--)
2127 {
2128 scr_page (v, 1);
2129 scr_refresh (SMOOTH_REFRESH);
2130 scrollbar_show (1);
2131 }
2132# endif
2133# ifdef MOUSE_SLIP_WHEELING 2179# ifdef MOUSE_SLIP_WHEELING
2134 } 2180 }
2135#endif 2181# endif
2136 } 2182 }
2137 break; 2183 break;
2138#endif 2184#endif
2139 } 2185 }
2140 } 2186 }
2141#ifdef MENUBAR
2142 else if (isMenuBarWindow (ev.window))
2143 menubar_control (ev);
2144#endif
2145} 2187}
2146 2188
2147#ifdef TRANSPARENT 2189#ifdef TRANSPARENT
2148#if TINTING 2190#if TINTING
2149/* taken from aterm-0.4.2 */ 2191/* taken from aterm-0.4.2 */
2629 2671
2630bool 2672bool
2631rxvt_term::cmd_parse () 2673rxvt_term::cmd_parse ()
2632{ 2674{
2633 bool flag = false; 2675 bool flag = false;
2634 unicode_t ch = NOCHAR; 2676 wchar_t ch = NOCHAR;
2635 unsigned char *seq_begin; // remember start of esc-sequence here 2677 char *seq_begin; // remember start of esc-sequence here
2636 2678
2637 for (;;) 2679 for (;;)
2638 { 2680 {
2639 if (ch == NOCHAR) 2681 if (ch == NOCHAR)
2640 { 2682 {
2641 seq_begin = cmdbuf_ptr; 2683 seq_begin = cmdbuf_ptr;
2642 ch = next_char (); 2684 ch = next_char ();
2643 }
2644 2685
2645 if (ch == NOCHAR) // TODO: improve 2686 if (ch == NOCHAR)
2646 break; 2687 break;
2688 }
2647 2689
2648 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2690 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2649 { 2691 {
2650 if (!seen_input) 2692 if (!seen_input)
2651 { 2693 {
2660 if (seen_resize && cmd_pid) 2702 if (seen_resize && cmd_pid)
2661 kill (-cmd_pid, SIGWINCH); 2703 kill (-cmd_pid, SIGWINCH);
2662 } 2704 }
2663 2705
2664 /* Read a text string from the input buffer */ 2706 /* Read a text string from the input buffer */
2665 unicode_t buf[UBUFSIZ]; 2707 wchar_t buf[UBUFSIZ];
2666 bool refreshnow = false; 2708 bool refreshnow = false;
2667 int nlines = 0; 2709 int nlines = 0;
2668 unicode_t *str = buf; 2710 wchar_t *str = buf;
2669 unicode_t *eol = str + min (ncol, UBUFSIZ); 2711 wchar_t *eol = str + min (ncol, UBUFSIZ);
2670 2712
2671 for (;;) 2713 for (;;)
2672 { 2714 {
2673 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2715 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2674 break; 2716 break;
2684 2726
2685 if (!OPTION (Opt_jumpScroll) 2727 if (!OPTION (Opt_jumpScroll)
2686 || (refresh_count >= refresh_limit * (nrow - 1))) 2728 || (refresh_count >= refresh_limit * (nrow - 1)))
2687 { 2729 {
2688 refreshnow = true; 2730 refreshnow = true;
2731 refresh_count = 0;
2689 ch = NOCHAR; 2732 ch = NOCHAR;
2690 break; 2733 break;
2691 } 2734 }
2692 2735
2693 // scr_add_lines only works for nlines <= nrow - 1. 2736 // scr_add_lines only works for nlines <= nrow - 1.
2694 if (nlines >= nrow - 1) 2737 if (nlines >= nrow - 1)
2695 { 2738 {
2739 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2740 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2696 scr_add_lines (buf, nlines, str - buf); 2741 scr_add_lines (buf, str - buf, nlines);
2742
2697 nlines = 0; 2743 nlines = 0;
2698 str = buf; 2744 str = buf;
2699 eol = str + min (ncol, UBUFSIZ); 2745 eol = str + min (ncol, UBUFSIZ);
2700 } 2746 }
2701 2747
2714 2760
2715 seq_begin = cmdbuf_ptr; 2761 seq_begin = cmdbuf_ptr;
2716 ch = next_char (); 2762 ch = next_char ();
2717 } 2763 }
2718 2764
2765 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2766 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2719 scr_add_lines (buf, nlines, str - buf); 2767 scr_add_lines (buf, str - buf, nlines);
2720 2768
2721 /* 2769 /*
2722 * If there have been a lot of new lines, then update the screen 2770 * If there have been a lot of new lines, then update the screen
2723 * What the heck I'll cheat and only refresh less than every page-full. 2771 * What the heck I'll cheat and only refresh less than every page-full.
2724 * the number of pages between refreshes is refresh_limit, which 2772 * the number of pages between refreshes is refresh_limit, which
2729 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2777 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2730 refresh_limit++; 2778 refresh_limit++;
2731 else 2779 else
2732 { 2780 {
2733 flag = true; 2781 flag = true;
2734 scr_refresh (refresh_type); 2782 scr_refresh ();
2783 want_refresh = 1;
2735 } 2784 }
2736 } 2785 }
2737 2786
2738 } 2787 }
2739 else 2788 else
2754 } 2803 }
2755 2804
2756 return flag; 2805 return flag;
2757} 2806}
2758 2807
2759// read the next octet
2760unicode_t
2761rxvt_term::next_octet ()
2762{
2763 return cmdbuf_ptr < cmdbuf_endp
2764 ? *cmdbuf_ptr++
2765 : NOCHAR;
2766}
2767
2768// read the next character 2808// read the next character
2769unicode_t 2809wchar_t
2770rxvt_term::next_char () 2810rxvt_term::next_char () NOTHROW
2771{ 2811{
2772 while (cmdbuf_ptr < cmdbuf_endp) 2812 while (cmdbuf_ptr < cmdbuf_endp)
2773 { 2813 {
2774 // assume 7-bit to be ascii ALWAYS 2814 // assume 7-bit to be ascii ALWAYS
2775 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2815 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2776 return *cmdbuf_ptr++; 2816 return *cmdbuf_ptr++;
2777 2817
2778 wchar_t wc; 2818 wchar_t wc;
2779 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2819 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2780 2820
2781 if (len == (size_t)-2) 2821 if (len == (size_t)-2)
2782 { 2822 {
2783 // the mbstate stores incomplete sequences. didn't know this :/ 2823 // the mbstate stores incomplete sequences. didn't know this :/
2784 cmdbuf_ptr = cmdbuf_endp; 2824 cmdbuf_ptr = cmdbuf_endp;
2785 break; 2825 break;
2786 } 2826 }
2787 2827
2788 if (len == (size_t)-1) 2828 if (len == (size_t)-1)
2789 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2829 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2790 2830
2791 // assume wchar == unicode 2831 // assume wchar == unicode
2792 cmdbuf_ptr += len; 2832 cmdbuf_ptr += len;
2793 return wc & UNICODE_MASK; 2833 return wc & UNICODE_MASK;
2794 } 2834 }
2795 2835
2796 return NOCHAR; 2836 return NOCHAR;
2797} 2837}
2838
2839// read the next octet
2840uint32_t
2841rxvt_term::next_octet () NOTHROW
2842{
2843 return cmdbuf_ptr < cmdbuf_endp
2844 ? (unsigned char)*cmdbuf_ptr++
2845 : NOCHAR;
2846}
2847
2848static class out_of_input out_of_input;
2798 2849
2799/* rxvt_cmd_getc () - Return next input character */ 2850/* rxvt_cmd_getc () - Return next input character */
2800/* 2851/*
2801 * Return the next input character after first passing any keyboard input 2852 * Return the next input character after first passing any keyboard input
2802 * to the command. 2853 * to the command.
2803 */ 2854 */
2804unicode_t 2855wchar_t
2805rxvt_term::cmd_getc () 2856rxvt_term::cmd_getc () THROW ((class out_of_input))
2806{ 2857{
2807 unicode_t c = next_char (); 2858 wchar_t c = next_char ();
2808 2859
2809 if (c == NOCHAR) 2860 if (c == NOCHAR)
2810 throw out_of_input; 2861 throw out_of_input;
2811 2862
2812 return c; 2863 return c;
2813} 2864}
2814 2865
2815unicode_t 2866uint32_t
2816rxvt_term::cmd_get8 () 2867rxvt_term::cmd_get8 () THROW ((class out_of_input))
2817{ 2868{
2818 unicode_t c = next_octet (); 2869 uint32_t c = next_octet ();
2819 2870
2820 if (c == NOCHAR) 2871 if (c == NOCHAR)
2821 throw out_of_input; 2872 throw out_of_input;
2822 2873
2823 return c; 2874 return c;
2923 case C0_ESC: 2974 case C0_ESC:
2924 process_escape_seq (); 2975 process_escape_seq ();
2925 break; 2976 break;
2926 case C0_ENQ: /* terminal Status */ 2977 case C0_ENQ: /* terminal Status */
2927 if (rs[Rs_answerbackstring]) 2978 if (rs[Rs_answerbackstring])
2928 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2979 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2929 (unsigned int)strlen (rs[Rs_answerbackstring]));
2930 else 2980 else
2931 tt_write ((unsigned char *)VT100_ANS, 2981 tt_write (VT100_ANS, strlen (VT100_ANS));
2932 (unsigned int)strlen (VT100_ANS));
2933 break; 2982 break;
2934 case C0_BEL: /* bell */ 2983 case C0_BEL: /* bell */
2935 scr_bell (); 2984 scr_bell ();
2936 break; 2985 break;
2937 case C0_BS: /* backspace */ 2986 case C0_BS: /* backspace */
3092 break; 3141 break;
3093 3142
3094 /* 8.3.87: NEXT LINE */ 3143 /* 8.3.87: NEXT LINE */
3095 case C1_NEL: /* ESC E */ 3144 case C1_NEL: /* ESC E */
3096 { 3145 {
3097 unicode_t nlcr[] = { C0_LF, C0_CR }; 3146 wchar_t nlcr[] = { C0_LF, C0_CR };
3098 scr_add_lines (nlcr, 1, 2); 3147 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3099 } 3148 }
3100 break; 3149 break;
3101 3150
3102 /* kidnapped escape sequence: Should be 8.3.48 */ 3151 /* kidnapped escape sequence: Should be 8.3.48 */
3103 case C1_ESA: /* ESC G */ 3152 case C1_ESA: /* ESC G */
3125 process_dcs_seq (); 3174 process_dcs_seq ();
3126 break; 3175 break;
3127 3176
3128 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3177 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3129 case C1_SCI: /* ESC Z */ 3178 case C1_SCI: /* ESC Z */
3130 tt_write ((const unsigned char *)ESCZ_ANSWER, 3179 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3131 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3132 break; /* steal obsolete ESC [ c */ 3180 break; /* steal obsolete ESC [ c */
3133 3181
3134 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3182 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3135 case C1_CSI: /* ESC [ */ 3183 case C1_CSI: /* ESC [ */
3136 process_csi_seq (); 3184 process_csi_seq ();
3380 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3428 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3381 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3429 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3382 break; 3430 break;
3383 3431
3384 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3432 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3385 tt_write ((const unsigned char *)VT100_ANS, 3433 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3386 (unsigned int) (sizeof (VT100_ANS) - 1));
3387 break; 3434 break;
3388 3435
3389 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3436 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3390 process_sgr_mode (nargs, arg); 3437 process_sgr_mode (nargs, arg);
3391 break; 3438 break;
3593/*----------------------------------------------------------------------*/ 3640/*----------------------------------------------------------------------*/
3594/* 3641/*
3595 * get input up until STRING TERMINATOR (or BEL) 3642 * get input up until STRING TERMINATOR (or BEL)
3596 * ends_how is terminator used. returned input must be free()'d 3643 * ends_how is terminator used. returned input must be free()'d
3597 */ 3644 */
3598unsigned char * 3645char *
3599rxvt_term::get_to_st (unicode_t &ends_how) 3646rxvt_term::get_to_st (unicode_t &ends_how)
3600{ 3647{
3601 unicode_t ch; 3648 unicode_t ch;
3602 bool seen_esc = false; 3649 bool seen_esc = false;
3603 unsigned int n = 0; 3650 unsigned int n = 0;
3636 3683
3637 string[n++] = '\0'; 3684 string[n++] = '\0';
3638 3685
3639 ends_how = (ch == 0x5c ? C0_ESC : ch); 3686 ends_how = (ch == 0x5c ? C0_ESC : ch);
3640 3687
3641 return (unsigned char *)rxvt_wcstombs (string); 3688 return rxvt_wcstombs (string);
3642} 3689}
3643 3690
3644/*----------------------------------------------------------------------*/ 3691/*----------------------------------------------------------------------*/
3645/* 3692/*
3646 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3693 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3647 */ 3694 */
3648void 3695void
3649rxvt_term::process_dcs_seq () 3696rxvt_term::process_dcs_seq ()
3650{ 3697{
3651 unsigned char *s; 3698 char *s;
3652 unicode_t eh; 3699 unicode_t eh;
3653 3700
3654 /* 3701 /*
3655 * Not handled yet 3702 * Not handled yet
3656 */ 3703 */
3675 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3722 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3676 arg = arg * 10 + (ch - '0'); 3723 arg = arg * 10 + (ch - '0');
3677 3724
3678 if (ch == ';') 3725 if (ch == ';')
3679 { 3726 {
3680 unsigned char *s = get_to_st (eh); 3727 char *s = get_to_st (eh);
3681 3728
3682 if (s) 3729 if (s)
3683 { 3730 {
3684 process_xterm_seq (arg, (char *)s, eh); 3731 process_xterm_seq (arg, s, eh);
3685 free (s); 3732 free (s);
3686 } 3733 }
3687 } 3734 }
3688} 3735}
3689 3736
3690void 3737void
3691rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3738rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3692{ 3739{
3693 if (str[0] == '?' && !str[1]) 3740 if (str[0] == '?' && !str[1])
3694 { 3741 {
3695 unsigned short r, g, b; 3742 unsigned short r, g, b;
3696 pix_colors_focused[color].get (display, r, g, b); 3743 pix_colors_focused[color].get (display, r, g, b);
3702 3749
3703/* 3750/*
3704 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3751 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3705 */ 3752 */
3706void 3753void
3707rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3754rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3708{ 3755{
3709 int changed = 0;
3710 int color; 3756 int color;
3711 char *buf, *name; 3757 char *buf, *name;
3712 bool query = str[0] == '?' && !str[1]; 3758 bool query = str[0] == '?' && !str[1];
3713 int saveop = op; 3759 int saveop = op;
3714 dDisp; 3760 dDisp;
3769 { 3815 {
3770 if ((name = strchr (buf, ';')) == NULL) 3816 if ((name = strchr (buf, ';')) == NULL)
3771 break; 3817 break;
3772 3818
3773 *name++ = '\0'; 3819 *name++ = '\0';
3774 color = atoi (buf); 3820 color = atoi (buf) + minCOLOR;
3775 3821
3776 if (color < 0 || color >= TOTAL_COLORS) 3822 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3777 break; 3823 break;
3778 3824
3779 if ((buf = strchr (name, ';')) != NULL) 3825 if ((buf = strchr (name, ';')) != NULL)
3780 *buf++ = '\0'; 3826 *buf++ = '\0';
3781 3827
3782 if (name[0] == '?' && !name[1]) 3828 if (name[0] == '?' && !name[1])
3783 { 3829 {
3784 unsigned short r, g, b; 3830 unsigned short r, g, b;
3785 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3831 pix_colors_focused[color].get (display, r, g, b);
3786 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3832 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3787 } 3833 }
3788 else 3834 else
3789 set_window_color (color + minCOLOR, name); 3835 set_window_color (color, name);
3790 } 3836 }
3791 break; 3837 break;
3792 case XTerm_Color00: 3838 case XTerm_Color00:
3793 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3839 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3794 break; 3840 break;
3795 case XTerm_Color01: 3841 case XTerm_Color01:
3796 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3842 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3797 break; 3843 break;
3798#ifndef NO_CURSORCOLOR 3844#ifndef NO_CURSORCOLOR
3799 case XTerm_Color_cursor: 3845 case XTerm_Color_cursor:
3800 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3846 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3801 break; 3847 break;
3805 break; 3851 break;
3806 case XTerm_Color_pointer_bg: 3852 case XTerm_Color_pointer_bg:
3807 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3853 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3808 break; 3854 break;
3809#ifndef NO_BOLD_UNDERLINE_REVERSE 3855#ifndef NO_BOLD_UNDERLINE_REVERSE
3810 case XTerm_Color_BD:
3811 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3812 break;
3813 case XTerm_Color_UL:
3814 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3815 break;
3816 case XTerm_Color_RV: 3856 case XTerm_Color_RV:
3817 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3857 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3858 break;
3859 case Rxvt_Color_BD:
3860 case URxvt_Color_BD:
3861 process_color_seq (op, Color_BD, str, resp);
3862 break;
3863 case Rxvt_Color_UL:
3864 case URxvt_Color_UL:
3865 process_color_seq (op, Color_UL, str, resp);
3818 break; 3866 break;
3819 case URxvt_Color_IT: 3867 case URxvt_Color_IT:
3820 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3868 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3821 break; 3869 break;
3822#endif 3870#endif
3827 if (am_transparent) 3875 if (am_transparent)
3828 want_full_refresh = want_refresh = 1; 3876 want_full_refresh = want_refresh = 1;
3829 break; 3877 break;
3830#endif 3878#endif
3831 3879
3832 case XTerm_Pixmap: 3880 case Rxvt_Pixmap:
3881 {
3833 if (*str != ';') 3882 if (*str != ';')
3834 { 3883 {
3835#if XPM_BACKGROUND 3884#if XPM_BACKGROUND
3836 scale_pixmap (""); /* reset to default scaling */ 3885 scale_pixmap (""); /* reset to default scaling */
3837 set_bgPixmap (str); /* change pixmap */ 3886 set_bgPixmap (str); /* change pixmap */
3838#endif
3839 scr_touch (true); 3887 scr_touch (true);
3888#endif
3840 } 3889 }
3890
3891 int changed = 0;
3892
3841 while ((str = strchr (str, ';')) != NULL) 3893 while ((str = strchr (str, ';')) != NULL)
3842 { 3894 {
3843 str++; 3895 str++;
3844#if XPM_BACKGROUND 3896#if XPM_BACKGROUND
3845 changed += scale_pixmap (str); 3897 changed += scale_pixmap (str);
3846#endif 3898#endif
3847 } 3899 }
3848 3900
3849 if (changed) 3901 if (changed)
3850 { 3902 {
3851#ifdef XPM_BACKGROUND 3903#ifdef XPM_BACKGROUND
3852 resize_pixmap (); 3904 resize_pixmap ();
3853#endif
3854 scr_touch (true); 3905 scr_touch (true);
3906#endif
3855 } 3907 }
3908 }
3856 break; 3909 break;
3857 3910
3858 case XTerm_restoreFG: 3911 case Rxvt_restoreFG:
3859 set_window_color (Color_fg, str); 3912 set_window_color (Color_fg, str);
3860 break; 3913 break;
3861 case XTerm_restoreBG: 3914 case Rxvt_restoreBG:
3862 set_window_color (Color_bg, str); 3915 set_window_color (Color_bg, str);
3863 break; 3916 break;
3864 3917
3865 case XTerm_logfile: 3918 case XTerm_logfile:
3866 // TODO, when secure mode? 3919 // TODO, when secure mode?
3867 break; 3920 break;
3868 3921
3869#ifdef MENUBAR
3870 case URxvt_Menu:
3871 if (OPTION (Opt_insecure))
3872 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3873 break;
3874#endif
3875#if 0 3922#if 0
3876 case XTerm_dumpscreen: /* no error notices */ 3923 case Rxvt_dumpscreen: /* no error notices */
3877 { 3924 {
3878 int fd; 3925 int fd;
3879 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3926 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3880 { 3927 {
3881 scr_dump (fd); 3928 scr_dump (fd);
3912 if (query) 3959 if (query)
3913 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3960 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3914 else 3961 else
3915 { 3962 {
3916 set_locale (str); 3963 set_locale (str);
3917 pty.set_utf8_mode (enc_utf8); 3964 pty->set_utf8_mode (enc_utf8);
3918 init_xlocale (); 3965 init_xlocale ();
3919 } 3966 }
3920 break; 3967 break;
3921 3968
3922 case URxvt_view_up: 3969 case URxvt_view_up:
3923 case URxvt_view_down: 3970 case URxvt_view_down:
3971 {
3924 int lines = atoi (str); 3972 int lines = atoi (str);
3925 3973
3926 if (lines) 3974 if (lines)
3927 scr_page (op == URxvt_view_up ? UP : DN, lines); 3975 scr_page (op == URxvt_view_up ? UP : DN, lines);
3928 else 3976 else
3929 {
3930 scr_erase_savelines (); 3977 scr_erase_savelines ();
3931 } 3978 }
3932 3979
3980 break;
3981#endif
3982
3983#if ENABLE_PERL
3984 case URxvt_perl:
3985 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3986 ; // no responses yet
3933 break; 3987 break;
3934#endif 3988#endif
3935 } 3989 }
3936} 3990}
3937/*----------------------------------------------------------------------*/ 3991/*----------------------------------------------------------------------*/
3968 return state; 4022 return state;
3969} 4023}
3970 4024
3971/* we're not using priv _yet_ */ 4025/* we're not using priv _yet_ */
3972void 4026void
3973rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4027rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
3974{ 4028{
3975 unsigned int i, j; 4029 unsigned int i, j;
3976 int state; 4030 int state;
3977 4031
3978 static const struct 4032 static const struct
3989 { 5, PrivMode_rVideo }, 4043 { 5, PrivMode_rVideo },
3990 { 6, PrivMode_relOrigin }, 4044 { 6, PrivMode_relOrigin },
3991 { 7, PrivMode_Autowrap }, 4045 { 7, PrivMode_Autowrap },
3992 // 8, bi-directional support mode 4046 // 8, bi-directional support mode
3993 { 9, PrivMode_MouseX10 }, 4047 { 9, PrivMode_MouseX10 },
3994#ifdef menuBar_esc
3995 { menuBar_esc, PrivMode_menuBar },
3996#endif
3997 // 18, 19 printing-related 4048 // 18, 19 printing-related
3998 { 25, PrivMode_VisibleCursor }, 4049 { 25, PrivMode_VisibleCursor },
3999#ifdef scrollBar_esc 4050#ifdef scrollBar_esc
4000 { scrollBar_esc, PrivMode_scrollBar }, 4051 { scrollBar_esc, PrivMode_scrollBar },
4001#endif 4052#endif
4048 /* extra handling for values with state unkept */ 4099 /* extra handling for values with state unkept */
4049 switch (arg[i]) 4100 switch (arg[i])
4050 { 4101 {
4051#if ENABLE_STYLES 4102#if ENABLE_STYLES
4052 case 1021: 4103 case 1021:
4053 if (mode) 4104 set_option (Opt_intensityStyles, mode);
4054 SET_OPTION (Opt_intensityStyles); 4105
4106 scr_touch (true);
4055 else 4107 break;
4056 CLR_OPTION (Opt_intensityStyles);
4057#endif 4108#endif
4058 case 1048: /* alternative cursor save */ 4109 case 1048: /* alternative cursor save */
4059 case 1049: 4110 case 1049:
4060 if (OPTION (Opt_secondaryScreen)) 4111 if (OPTION (Opt_secondaryScreen))
4061 if (mode == 0) 4112 if (mode == 0)
4080 case 3: /* 80/132 */ 4131 case 3: /* 80/132 */
4081 if (priv_modes & PrivMode_132OK) 4132 if (priv_modes & PrivMode_132OK)
4082 set_widthheight (((state ? 132 : 80) * fwidth), height); 4133 set_widthheight (((state ? 132 : 80) * fwidth), height);
4083 break; 4134 break;
4084 case 4: /* smooth scrolling */ 4135 case 4: /* smooth scrolling */
4085 if (!state) 4136 set_option (Opt_jumpScroll, !state);
4086 SET_OPTION (Opt_jumpScroll);
4087 else
4088 CLR_OPTION (Opt_jumpScroll);
4089 break; 4137 break;
4090 case 5: /* reverse video */ 4138 case 5: /* reverse video */
4091 scr_rvideo_mode (state); 4139 scr_rvideo_mode (state);
4092 break; 4140 break;
4093 case 6: /* relative/absolute origins */ 4141 case 6: /* relative/absolute origins */
4099 /* case 8: - auto repeat, can't do on a per window basis */ 4147 /* case 8: - auto repeat, can't do on a per window basis */
4100 case 9: /* X10 mouse reporting */ 4148 case 9: /* X10 mouse reporting */
4101 if (state) /* orthogonal */ 4149 if (state) /* orthogonal */
4102 priv_modes &= ~PrivMode_MouseX11; 4150 priv_modes &= ~PrivMode_MouseX11;
4103 break; 4151 break;
4104#ifdef menuBar_esc
4105 case menuBar_esc:
4106#ifdef MENUBAR
4107 map_menuBar (state);
4108#endif
4109 break;
4110#endif
4111#ifdef scrollBar_esc 4152#ifdef scrollBar_esc
4112 case scrollBar_esc: 4153 case scrollBar_esc:
4113 if (scrollbar_mapping (state)) 4154 if (scrollbar_mapping (state))
4114 { 4155 {
4115 resize_all_windows (0, 0, 0); 4156 resize_all_windows (0, 0, 0);
4134#if 0 4175#if 0
4135 case 1001: 4176 case 1001:
4136 break; /* X11 mouse highlighting */ 4177 break; /* X11 mouse highlighting */
4137#endif 4178#endif
4138 case 1010: /* scroll to bottom on TTY output inhibit */ 4179 case 1010: /* scroll to bottom on TTY output inhibit */
4139 if (!state) 4180 set_option (Opt_scrollTtyOutput, !state);
4140 SET_OPTION (Opt_scrollTtyOutput);
4141 else
4142 CLR_OPTION (Opt_scrollTtyOutput);
4143 break; 4181 break;
4144 case 1011: /* scroll to bottom on key press */ 4182 case 1011: /* scroll to bottom on key press */
4145 if (state) 4183 set_option (Opt_scrollTtyKeypress, state);
4146 SET_OPTION (Opt_scrollTtyKeypress);
4147 else
4148 CLR_OPTION (Opt_scrollTtyKeypress);
4149 break; 4184 break;
4150 case 1047: /* secondary screen w/ clearing last */ 4185 case 1047: /* secondary screen w/ clearing last */
4151 if (OPTION (Opt_secondaryScreen)) 4186 if (OPTION (Opt_secondaryScreen))
4152 if (current_screen != PRIMARY) 4187 if (current_screen != PRIMARY)
4153 scr_erase_screen (2); 4188 scr_erase_screen (2);
4291 scr_color (Color_bg, Color_bg); 4326 scr_color (Color_bg, Color_bg);
4292 break; 4327 break;
4293 4328
4294 //case 50: // not variable spacing 4329 //case 50: // not variable spacing
4295 4330
4296#ifndef NO_BRIGHTCOLOR 4331#if ENABLE_FRILLS
4297 case 90: 4332 case 90:
4298 case 91: /* set bright fg color */ 4333 case 91: /* set bright fg color */
4299 case 92: 4334 case 92:
4300 case 93: 4335 case 93:
4301 case 94: 4336 case 94:
4346 */ 4381 */
4347void 4382void
4348rxvt_term::tt_printf (const char *fmt,...) 4383rxvt_term::tt_printf (const char *fmt,...)
4349{ 4384{
4350 va_list arg_ptr; 4385 va_list arg_ptr;
4351 unsigned char buf[256]; 4386 char buf[256];
4352 4387
4353 va_start (arg_ptr, fmt); 4388 va_start (arg_ptr, fmt);
4354 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4389 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4355 va_end (arg_ptr); 4390 va_end (arg_ptr);
4356 tt_write (buf, strlen (buf)); 4391 tt_write (buf, strlen (buf));
4361 * or generated by us in response to a query ESC sequence. 4396 * or generated by us in response to a query ESC sequence.
4362 */ 4397 */
4363const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4398const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4364 4399
4365void 4400void
4366rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4401rxvt_term::tt_write (const char *data, unsigned int len)
4367{ 4402{
4403 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4404 return;
4405
4406 if (pty->pty < 0)
4407 return;
4408
4368 if (v_buflen == 0) 4409 if (v_buflen == 0)
4369 { 4410 {
4370 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4411 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4371 4412
4372 if ((unsigned int)written == len) 4413 if ((unsigned int)written == len)
4373 return; 4414 return;
4374 4415
4375 data += written; 4416 data += written;
4376 len -= written; 4417 len -= written;
4377 } 4418 }
4378 4419
4379 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4420 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4380 4421
4381 memcpy (v_buffer + v_buflen, data, len); 4422 memcpy (v_buffer + v_buflen, data, len);
4382 v_buflen += len; 4423 v_buflen += len;
4383 4424
4384 pty_ev.set (EVENT_READ | EVENT_WRITE); 4425 pty_ev.set (EVENT_READ | EVENT_WRITE);
4385} 4426}
4386 4427
4387void rxvt_term::pty_write () 4428void rxvt_term::pty_write ()
4388{ 4429{
4389 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4430 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4390 4431
4391 if (written > 0) 4432 if (written > 0)
4392 { 4433 {
4393 v_buflen -= written; 4434 v_buflen -= written;
4394 4435

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines