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.223 by root, Sun Jan 1 05:28:28 2006 UTC vs.
Revision 1.272 by root, Thu Jan 19 16:22:12 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
59#define HAVE_SCHED_YIELD 1 //D//TODO//FIXME
60#if HAVE_SCHED_YIELD
61# include <sched.h>
62#endif
63 64
64/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
65 66
66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
67 68
… …
146 || !IN_RANGE_EXC (y, 0, nrow)) 147 || !IN_RANGE_EXC (y, 0, nrow))
147 return; 148 return;
148 149
149 for (;;) 150 for (;;)
150 { 151 {
151 const line_t &l = ROW(y - view_start); 152 const line_t &l = ROW(y + view_start);
152 153
153 text_t t = l.t[x]; 154 text_t t = l.t[x];
154 155
155 if (t != NOCHAR || !x) 156 if (t != NOCHAR || !x)
156 { 157 {
… …
267 mb[0] = ch[0]; 268 mb[0] = ch[0];
268 len = 1; 269 len = 1;
269 } 270 }
270 271
271 if (len > 0) 272 if (len > 0)
272 tt_write ((unsigned char *)mb, len); 273 tt_write (mb, len);
273 else 274 else
274 scr_bell (); 275 scr_bell ();
275 } 276 }
276 277
277 iso14755buf = 0; 278 iso14755buf = 0;
… …
305 KeySym keysym; 306 KeySym keysym;
306#ifdef DEBUG_CMD 307#ifdef DEBUG_CMD
307 static int debug_key = 1; /* accessible by a debugger only */ 308 static int debug_key = 1; /* accessible by a debugger only */
308#endif 309#endif
309 int valid_keysym; 310 int valid_keysym;
310 unsigned char kbuf[KBUFSZ]; 311 char kbuf[KBUFSZ];
311 312
312 /* 313 /*
313 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
314 * escape sequence to toggle the Keypad. 315 * escape sequence to toggle the Keypad.
315 * 316 *
… …
333 Status status_return; 334 Status status_return;
334 335
335#if 0 336#if 0
336#ifdef X_HAVE_UTF8_STRING 337#ifdef X_HAVE_UTF8_STRING
337 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 338 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
338 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 339 len = Xutf8LookupString (Input_Context, &ev, kbuf,
339 KBUFSZ, &keysym, &status_return); 340 KBUFSZ, &keysym, &status_return);
340 else 341 else
341#endif 342#endif
342#endif 343#endif
343 { 344 {
… …
380 || status_return == XLookupBoth; 381 || status_return == XLookupBoth;
381 } 382 }
382 else 383 else
383#endif 384#endif
384 { 385 {
385 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 386 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
386 valid_keysym = keysym != NoSymbol; 387 valid_keysym = keysym != NoSymbol;
387 } 388 }
388 389
389 if (valid_keysym) 390 if (valid_keysym)
390 { 391 {
… …
442 scr_move_to (0, 1); 443 scr_move_to (0, 1);
443 return; 444 return;
444 } 445 }
445 else if (keysym == XK_End) 446 else if (keysym == XK_End)
446 { 447 {
447 scr_move_to (1, 0); 448 scr_move_to (1, 1);
448 return; 449 return;
449 } 450 }
450 } 451 }
451#endif 452#endif
452 } 453 }
… …
463 { 464 {
464 switch (keysym) 465 switch (keysym)
465 { 466 {
466 /* normal XTerm key bindings */ 467 /* normal XTerm key bindings */
467 case XK_Insert: /* Shift+Insert = paste mouse selection */ 468 case XK_Insert: /* Shift+Insert = paste mouse selection */
468 selection_request (ev.time, 0, 0); 469 selection_request (ev.time);
469 return; 470 return;
470#if TODO 471#if TODO
471 /* rxvt extras */ 472 /* rxvt extras */
472 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 473 case XK_KP_Add: /* Shift+KP_Add = bigger font */
473 change_font (FONT_UP); 474 change_font (FONT_UP);
… …
854 { 855 {
855#ifdef META8_OPTION 856#ifdef META8_OPTION
856 /* set 8-bit on */ 857 /* set 8-bit on */
857 if (meta && (meta_char == 0x80)) 858 if (meta && (meta_char == 0x80))
858 { 859 {
859 unsigned char *ch; 860 char *ch;
860 861
861 for (ch = kbuf; ch < kbuf + len; ch++) 862 for (ch = kbuf; ch < kbuf + len; ch++)
862 *ch |= 0x80; 863 *ch |= 0x80;
863 864
864 meta = 0; 865 meta = 0;
865 } 866 }
866#endif 867#endif
867 /* nil */ ; 868 /* nil */ ;
868 } 869 }
869 } 870 }
871
872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
873 return;
870 874
871 if (len <= 0) 875 if (len <= 0)
872 return; /* not mapped */ 876 return; /* not mapped */
873 877
874 if (OPTION (Opt_scrollTtyKeypress)) 878 if (OPTION (Opt_scrollTtyKeypress))
… …
897#ifdef META8_OPTION 901#ifdef META8_OPTION
898 && meta_char == C0_ESC 902 && meta_char == C0_ESC
899#endif 903#endif
900 ) 904 )
901 { 905 {
902 const unsigned char ch = C0_ESC; 906 const char ch = C0_ESC;
903 tt_write (&ch, 1); 907 tt_write (&ch, 1);
904 } 908 }
905 909
906#if defined(DEBUG_CMD) 910#if defined(DEBUG_CMD)
907 /* Display keyboard buffer contents */ 911 /* Display keyboard buffer contents */
… …
915#endif /* DEBUG_CMD */ 919#endif /* DEBUG_CMD */
916 tt_write (kbuf, (unsigned int)len); 920 tt_write (kbuf, (unsigned int)len);
917} 921}
918/*}}} */ 922/*}}} */
919 923
920#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 924#if defined (KEYSYM_RESOURCE)
921/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
922/* attempt to `write' count to the input buffer */
923unsigned int 925unsigned int
924rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 926rxvt_term::cmd_write (const char *str, unsigned int count)
925{ 927{
926 unsigned int n, s; 928 unsigned int n, s;
927 929
928 n = cmdbuf_ptr - cmdbuf_base; 930 n = cmdbuf_ptr - cmdbuf_base;
929 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 931 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
966 } 968 }
967#endif 969#endif
968 970
969 if (want_refresh) 971 if (want_refresh)
970 { 972 {
973 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
974 {
975 int row = view_start;
976 int end_row = row + nrow;
977
978 while (row > top_row && ROW (row - 1).is_longer ())
979 --row;
980
981 do
982 {
983 int start_row = row;
984 line_t *l;
985
986 do
987 {
988 l = &ROW (row++);
989
990 if (!(l->f & LINE_FILTERED))
991 {
992 // line not filtered, mark it as filtered
993 l->f |= LINE_FILTERED;
994 while (l->is_longer ())
995 {
996 l = &ROW (row++);
997 l->f |= LINE_FILTERED;
998 }
999
1000 // and filter it
1001 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1002
1003 break;
1004 }
1005 }
1006 while (l->is_longer () && row < end_row);
1007 }
1008 while (row < end_row);
1009 }
1010
971 scr_refresh (refresh_type); 1011 scr_refresh ();
972 scrollbar_show (1); 1012 scrollbar_show (1);
973#ifdef USE_XIM 1013#ifdef USE_XIM
974 IMSendSpot (); 1014 IMSendSpot ();
975#endif 1015#endif
976 } 1016 }
… …
979} 1019}
980 1020
981void 1021void
982rxvt_term::check_cb (check_watcher &w) 1022rxvt_term::check_cb (check_watcher &w)
983{ 1023{
984 SET_R (this); 1024 make_current ();
985 SET_LOCALE (locale);
986 1025
987 display->flush (); 1026 display->flush ();
988 1027
989 if (want_refresh && !flush_ev.active) 1028 if (want_refresh && !flush_ev.active)
990 flush_ev.start (NOW + 0.01); 1029 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
991} 1030}
992 1031
993void 1032void
994rxvt_term::flush_cb (time_watcher &w) 1033rxvt_term::flush_cb (time_watcher &w)
995{ 1034{
996 SET_R (this); 1035 make_current ();
997 SET_LOCALE (locale);
998 1036
999 refresh_limit = 1; 1037 refresh_limit = 1;
1000 refresh_count = 0; 1038 refresh_count = 0;
1001 flush (); 1039 flush ();
1002} 1040}
… …
1030rxvt_term::cont_scroll_cb (time_watcher &w) 1068rxvt_term::cont_scroll_cb (time_watcher &w)
1031{ 1069{
1032 if ((scrollbar_isUp() || scrollbar_isDn()) && 1070 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1033 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1071 scr_page (scrollbar_isUp() ? UP : DN, 1))
1034 { 1072 {
1035 refresh_type |= SMOOTH_REFRESH;
1036 want_refresh = 1; 1073 want_refresh = 1;
1037 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1074 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1038 } 1075 }
1039} 1076}
1040#endif 1077#endif
… …
1044rxvt_term::sel_scroll_cb (time_watcher &w) 1081rxvt_term::sel_scroll_cb (time_watcher &w)
1045{ 1082{
1046 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1083 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1047 { 1084 {
1048 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1085 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1049 refresh_type |= SMOOTH_REFRESH;
1050 want_refresh = 1; 1086 want_refresh = 1;
1051 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1087 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1052 } 1088 }
1053} 1089}
1054#endif 1090#endif
… …
1059{ 1095{
1060 if (mouse_slip_wheel_speed == 0 1096 if (mouse_slip_wheel_speed == 0
1061 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1097 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1062 : scr_page (UP, mouse_slip_wheel_speed)) 1098 : scr_page (UP, mouse_slip_wheel_speed))
1063 { 1099 {
1064 if (view_start == nsaved || 1100 if (view_start == top_row || view_start == 0)
1065 view_start == 0)
1066 mouse_slip_wheel_speed = 0; 1101 mouse_slip_wheel_speed = 0;
1067 1102
1068 refresh_type |= SMOOTH_REFRESH;
1069 want_refresh = 1; 1103 want_refresh = 1;
1070 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1104 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1071 } 1105 }
1072} 1106}
1073#endif 1107#endif
1074 1108
1109#if HAVE_SCHED_YIELD
1110static struct event_handler
1111{
1112 check_watcher cw_yield;
1113
1114 void yield (check_watcher &w)
1115 {
1116 sched_yield ();
1117 w.stop ();
1118 }
1119
1120 event_handler ()
1121 : cw_yield (this, &event_handler::yield)
1122 {
1123 }
1124} event_handler;
1125#endif
1126
1075bool 1127bool
1076rxvt_term::pty_fill () 1128rxvt_term::pty_fill ()
1077{ 1129{
1078 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1130 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1079 1131
1080 if (CBUFSIZ == n) 1132 if (CBUFSIZ == n)
1081 { 1133 {
1082 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1134 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1083 n = 0; 1135 n = 0;
1084 } 1136 }
1085 1137
1086 memmove (cmdbuf_base, cmdbuf_ptr, n); 1138 memmove (cmdbuf_base, cmdbuf_ptr, n);
1087 cmdbuf_ptr = cmdbuf_base; 1139 cmdbuf_ptr = cmdbuf_base;
1088 cmdbuf_endp = cmdbuf_ptr + n; 1140 cmdbuf_endp = cmdbuf_ptr + n;
1089 1141
1090 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1142 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1091 1143
1092 if (r > 0) 1144 if (r > 0)
1093 { 1145 {
1094 cmdbuf_endp += r; 1146 cmdbuf_endp += r;
1095 return true; 1147 return true;
1096 } 1148 }
1097 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1149 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1098 { 1150 {
1099#if HAVE_SCHED_YIELD 1151#if HAVE_SCHED_YIELD
1100 sched_yield (); 1152 if (display->is_local)
1153 event_handler.cw_yield.start ();
1101#endif 1154#endif
1102 } 1155 }
1103 else 1156 else
1104 { 1157 {
1105 pty_ev.stop (); 1158 pty_ev.stop ();
… …
1112} 1165}
1113 1166
1114void 1167void
1115rxvt_term::pty_cb (io_watcher &w, short revents) 1168rxvt_term::pty_cb (io_watcher &w, short revents)
1116{ 1169{
1117 SET_R (this); 1170 make_current ();
1118 SET_LOCALE (locale);
1119 1171
1120 if (revents & EVENT_READ) 1172 if (revents & EVENT_READ)
1121 // loop, but don't allow a single term to monopolize us 1173 // loop, but don't allow a single term to monopolize us
1122 while (pty_fill ()) 1174 while (pty_fill ())
1123 if (cmd_parse ()) 1175 if (cmd_parse ())
… …
1143 1195
1144#ifdef POINTER_BLANK 1196#ifdef POINTER_BLANK
1145void 1197void
1146rxvt_term::pointer_blank () 1198rxvt_term::pointer_blank ()
1147{ 1199{
1148 if (! OPTION (Opt_pointerBlank)) 1200 if (!OPTION (Opt_pointerBlank))
1149 return; 1201 return;
1150 1202
1151 XDefineCursor (display->display, vt, display->blank_cursor); 1203 XDefineCursor (display->display, vt, display->blank_cursor);
1152 XFlush (display->display); 1204 XFlush (display->display);
1153 1205
… …
1155} 1207}
1156 1208
1157void 1209void
1158rxvt_term::pointer_cb (time_watcher &w) 1210rxvt_term::pointer_cb (time_watcher &w)
1159{ 1211{
1160 SET_R (this); 1212 make_current ();
1161 SET_LOCALE (locale);
1162 1213
1163 pointer_blank (); 1214 pointer_blank ();
1164} 1215}
1165#endif 1216#endif
1166 1217
… …
1245 1296
1246/*{{{ process an X event */ 1297/*{{{ process an X event */
1247void 1298void
1248rxvt_term::x_cb (XEvent &ev) 1299rxvt_term::x_cb (XEvent &ev)
1249{ 1300{
1301 make_current ();
1302
1250 dDisp; 1303 dDisp;
1251 1304
1252 SET_R (this); 1305 if (ev.xany.window == vt
1253 SET_LOCALE (locale); 1306 && SHOULD_INVOKE (HOOK_X_EVENT)
1307 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1308 return;
1254 1309
1255#if defined(CURSOR_BLINK) 1310 // for XQueryPointer
1256 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1257 {
1258 if (hidden_cursor)
1259 {
1260 hidden_cursor = 0;
1261 want_refresh = 1;
1262 }
1263
1264 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1265 }
1266#endif
1267
1268#if defined(POINTER_BLANK)
1269 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1270 {
1271 if (ev.type == MotionNotify
1272 || ev.type == ButtonPress
1273 || ev.type == ButtonRelease)
1274 if (hidden_pointer)
1275 pointer_unblank ();
1276
1277 if (ev.type == KeyPress && hidden_pointer == 0)
1278 pointer_blank ();
1279 }
1280#endif
1281
1282 Window unused_root, unused_child; 1311 Window unused_root, unused_child;
1283 int unused_root_x, unused_root_y; 1312 int unused_root_x, unused_root_y;
1284 unsigned int unused_mask; 1313 unsigned int unused_mask;
1285 1314
1286 switch (ev.type) 1315 switch (ev.type)
… …
1293 1322
1294 break; 1323 break;
1295 1324
1296 case KeyRelease: 1325 case KeyRelease:
1297 { 1326 {
1298#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1327#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1299 KeySym ks; 1328 KeySym keysym;
1300 1329
1301 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1330 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1302#endif 1331#endif
1303 1332
1304#if ENABLE_FRILLS || ISO_14755 1333#if ENABLE_FRILLS || ISO_14755
1305 // ISO 14755 support 1334 // ISO 14755 support
1306 if (iso14755buf) 1335 if (iso14755buf)
… …
1311# endif 1340# endif
1312# if ISO_14755 1341# if ISO_14755
1313 // iso14755 part 5.2 handling: release time 1342 // iso14755 part 5.2 handling: release time
1314 // first: controls 1343 // first: controls
1315 if ((ev.xkey.state & ControlMask) 1344 if ((ev.xkey.state & ControlMask)
1316 && ((ks >= 0x40 && ks <= 0x5f) 1345 && ((keysym >= 0x40 && keysym <= 0x5f)
1317 || (ks >= 0x61 && ks <= 0x7f))) 1346 || (keysym >= 0x61 && keysym <= 0x7f)))
1318 { 1347 {
1319 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1348 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1320 commit_iso14755 (); 1349 commit_iso14755 ();
1321 return; // case-break; 1350 goto skip_switch;
1322 } 1351 }
1323 1352
1324 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1353 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1325 if (i[0] == ks) 1354 if (i[0] == keysym)
1326 { 1355 {
1327 iso14755buf = ISO_14755_51 | i[1]; 1356 iso14755buf = ISO_14755_51 | i[1];
1328 commit_iso14755 (); 1357 commit_iso14755 ();
1329 return; // case-break; 1358 goto skip_switch;
1330 } 1359 }
1331 1360
1332 scr_bell (); 1361 scr_bell ();
1333# endif 1362# endif
1334 iso14755buf = 0; 1363 iso14755buf = 0;
… …
1353 else 1382 else
1354 iso14755buf = 0; 1383 iso14755buf = 0;
1355 } 1384 }
1356#endif 1385#endif
1357 1386
1387 if (ev.xany.window == vt
1388 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1389 break;
1390
1358#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1391#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1359 if (!(ev.xkey.state & ControlMask)) 1392 if (!(ev.xkey.state & ControlMask))
1360 slip_wheel_ev.stop (); 1393 slip_wheel_ev.stop ();
1361 else if (ks == XK_Control_L || ks == XK_Control_R) 1394 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1362 mouse_slip_wheel_speed = 0; 1395 mouse_slip_wheel_speed = 0;
1363#endif 1396#endif
1364 break; 1397 break;
1365 } 1398 }
1366 1399
… …
1469 { 1502 {
1470 seen_resize = 1; 1503 seen_resize = 1;
1471 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1504 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1472 } 1505 }
1473 1506
1507 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1508
1474#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1509#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1475 if (OPTION (Opt_transparent)) 1510 if (OPTION (Opt_transparent))
1476 check_our_parents (); 1511 check_our_parents ();
1477#endif 1512#endif
1478 } 1513 }
… …
1496 1531
1497 case SelectionRequest: 1532 case SelectionRequest:
1498 selection_send (ev.xselectionrequest); 1533 selection_send (ev.xselectionrequest);
1499 break; 1534 break;
1500 1535
1536 case MapNotify:
1537 mapped = 1;
1538#ifdef TEXT_BLINK
1539 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1540#endif
1541 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1542 break;
1543
1501 case UnmapNotify: 1544 case UnmapNotify:
1502 mapped = 0; 1545 mapped = 0;
1503#ifdef TEXT_BLINK 1546#ifdef TEXT_BLINK
1504 text_blink_ev.stop (); 1547 text_blink_ev.stop ();
1505#endif 1548#endif
1506 break; 1549 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1507
1508 case MapNotify:
1509 mapped = 1;
1510#ifdef TEXT_BLINK
1511 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1512#endif
1513 break; 1550 break;
1514 1551
1515#ifdef TRANSPARENT 1552#ifdef TRANSPARENT
1516 case ReparentNotify: 1553 case ReparentNotify:
1517 rootwin_cb (ev); 1554 rootwin_cb (ev);
… …
1531 1568
1532 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1569 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1533 scr_expose (ev.xexpose.x, ev.xexpose.y, 1570 scr_expose (ev.xexpose.x, ev.xexpose.y,
1534 ev.xexpose.width, ev.xexpose.height, False); 1571 ev.xexpose.width, ev.xexpose.height, False);
1535 1572
1536 scr_refresh (refresh_type); 1573 want_refresh = 1;
1537 } 1574 }
1538 else 1575 else
1539 { 1576 {
1540 XEvent unused_event; 1577 XEvent unused_event;
1541 1578
… …
1547 if (isScrollbarWindow (ev.xany.window)) 1584 if (isScrollbarWindow (ev.xany.window))
1548 { 1585 {
1549 scrollBar.setIdle (); 1586 scrollBar.setIdle ();
1550 scrollbar_show (0); 1587 scrollbar_show (0);
1551 } 1588 }
1552#ifdef MENUBAR
1553 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1554 menubar_expose ();
1555#endif
1556 1589
1557#ifdef TRANSPARENT 1590#ifdef TRANSPARENT
1558 if (am_transparent && ev.xany.window == parent[0]) 1591 if (am_transparent && ev.xany.window == parent[0])
1559 XClearWindow (disp, ev.xany.window); 1592 XClearWindow (disp, ev.xany.window);
1560#endif 1593#endif
… …
1564 case MotionNotify: 1597 case MotionNotify:
1565#ifdef POINTER_BLANK 1598#ifdef POINTER_BLANK
1566 if (hidden_pointer) 1599 if (hidden_pointer)
1567 pointer_unblank (); 1600 pointer_unblank ();
1568#endif 1601#endif
1569#if MENUBAR
1570 if (isMenuBarWindow (ev.xany.window))
1571 {
1572 menubar_control (ev.xbutton);
1573 break;
1574 }
1575#endif
1576 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1602 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1577 break; 1603 break;
1578 1604
1579 if (ev.xany.window == vt) 1605 if (ev.xany.window == vt)
1580 { 1606 {
1607 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1608 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1609 ; // nop
1581 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1610 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1582 { 1611 {
1583 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1612 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1584 ; 1613 ;
1585 1614
1586 XQueryPointer (disp, vt, 1615 XQueryPointer (disp, vt,
… …
1666 &unused_root_x, &unused_root_y, 1695 &unused_root_x, &unused_root_y,
1667 &ev.xbutton.x, &ev.xbutton.y, 1696 &ev.xbutton.x, &ev.xbutton.y,
1668 &unused_mask); 1697 &unused_mask);
1669 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1698 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1670 scrollbar_size ()); 1699 scrollbar_size ());
1671 scr_refresh (refresh_type); 1700 want_refresh = 1;
1672 refresh_limit = 0; 1701 refresh_limit = 0;
1673 scrollbar_show (1); 1702 scrollbar_show (1);
1674 } 1703 }
1675 break; 1704 break;
1676 } 1705 }
1706
1707skip_switch: ;
1708
1709#if defined(CURSOR_BLINK)
1710 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1711 {
1712 if (hidden_cursor)
1713 {
1714 hidden_cursor = 0;
1715 want_refresh = 1;
1716 }
1717
1718 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1719 }
1720#endif
1721
1722#if defined(POINTER_BLANK)
1723 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1724 {
1725 if (ev.type == MotionNotify
1726 || ev.type == ButtonPress
1727 || ev.type == ButtonRelease)
1728 if (hidden_pointer)
1729 pointer_unblank ();
1730
1731 if (ev.type == KeyPress && hidden_pointer == 0)
1732 pointer_blank ();
1733 }
1734#endif
1677} 1735}
1678 1736
1679void 1737void
1680rxvt_term::focus_in () 1738rxvt_term::focus_in ()
1681{ 1739{
1682 if (!focus) 1740 if (!focus)
1683 { 1741 {
1684 focus = 1; 1742 focus = 1;
1685 want_refresh = 1; 1743 want_refresh = 1;
1744
1745 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1746
1686#if USE_XIM 1747#if USE_XIM
1687 if (Input_Context != NULL) 1748 if (Input_Context != NULL)
1688 { 1749 {
1689 IMSetStatusPosition (); 1750 IMSetStatusPosition ();
1690 XSetICFocus (Input_Context); 1751 XSetICFocus (Input_Context);
… …
1710 if (focus) 1771 if (focus)
1711 { 1772 {
1712 focus = 0; 1773 focus = 0;
1713 want_refresh = 1; 1774 want_refresh = 1;
1714 1775
1776 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1777
1715#if ENABLE_FRILLS || ISO_14755 1778#if ENABLE_FRILLS || ISO_14755
1779 if (iso14755buf)
1780 {
1716 iso14755buf = 0; 1781 iso14755buf = 0;
1717#endif
1718#if ENABLE_OVERLAY 1782# if ENABLE_OVERLAY
1719 scr_overlay_off (); 1783 scr_overlay_off ();
1784# endif
1785 }
1720#endif 1786#endif
1721#if USE_XIM 1787#if USE_XIM
1722 if (Input_Context != NULL) 1788 if (Input_Context != NULL)
1723 XUnsetICFocus (Input_Context); 1789 XUnsetICFocus (Input_Context);
1724#endif 1790#endif
… …
1739 1805
1740#if TRANSPARENT 1806#if TRANSPARENT
1741void 1807void
1742rxvt_term::rootwin_cb (XEvent &ev) 1808rxvt_term::rootwin_cb (XEvent &ev)
1743{ 1809{
1744 SET_R (this); 1810 make_current ();
1745 SET_LOCALE (locale);
1746 1811
1747 switch (ev.type) 1812 switch (ev.type)
1748 { 1813 {
1749 case PropertyNotify: 1814 case PropertyNotify:
1750 /* 1815 /*
… …
1768rxvt_term::button_press (XButtonEvent &ev) 1833rxvt_term::button_press (XButtonEvent &ev)
1769{ 1834{
1770 int reportmode = 0, clickintime; 1835 int reportmode = 0, clickintime;
1771 1836
1772 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1837 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1838
1773 if (!bypass_keystate) 1839 if (!bypass_keystate)
1774 reportmode = !! (priv_modes & PrivMode_mouse_report); 1840 reportmode = !! (priv_modes & PrivMode_mouse_report);
1775 1841
1776 /* 1842 /*
1777 * VT window processing of button press 1843 * VT window processing of button press
… …
1797#ifdef MOUSE_REPORT_DOUBLECLICK 1863#ifdef MOUSE_REPORT_DOUBLECLICK
1798 if (ev.button == MEvent.button && clickintime) 1864 if (ev.button == MEvent.button && clickintime)
1799 { 1865 {
1800 /* same button, within alloted time */ 1866 /* same button, within alloted time */
1801 MEvent.clicks++; 1867 MEvent.clicks++;
1868
1802 if (MEvent.clicks > 1) 1869 if (MEvent.clicks > 1)
1803 { 1870 {
1804 /* only report double clicks */ 1871 /* only report double clicks */
1805 MEvent.clicks = 2; 1872 MEvent.clicks = 2;
1806 mouse_report (ev); 1873 mouse_report (ev);
… …
1826 else 1893 else
1827 { 1894 {
1828 if (ev.button != MEvent.button) 1895 if (ev.button != MEvent.button)
1829 MEvent.clicks = 0; 1896 MEvent.clicks = 0;
1830 1897
1898 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1831 switch (ev.button) 1899 switch (ev.button)
1832 { 1900 {
1833 case Button1: 1901 case Button1:
1834 /* allow meta + click to select rectangular areas */ 1902 /* allow meta + click to select rectangular areas */
1835 /* should be done in screen.C */ 1903 /* should be done in screen.C */
1836#if ENABLE_FRILLS 1904#if ENABLE_FRILLS
1837 selection.rect = !!(ev.state & ModMetaMask); 1905 selection.rect = !!(ev.state & ModMetaMask);
1838#else 1906#else
1839 selection.rect = false; 1907 selection.rect = false;
1840#endif 1908#endif
1841 1909
1842 /* allow shift+left click to extend selection */ 1910 /* allow shift+left click to extend selection */
1843 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1911 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1844 { 1912 {
1845 if (MEvent.button == Button1 && clickintime) 1913 if (MEvent.button == Button1 && clickintime)
1846 selection_rotate (ev.x, ev.y); 1914 selection_rotate (ev.x, ev.y);
1847 else 1915 else
1848 selection_extend (ev.x, ev.y, 1); 1916 selection_extend (ev.x, ev.y, 1);
1849 } 1917 }
1850 else 1918 else
1851 { 1919 {
1852 if (MEvent.button == Button1 && clickintime) 1920 if (MEvent.button == Button1 && clickintime)
1853 MEvent.clicks++; 1921 MEvent.clicks++;
1854 else 1922 else
1855 MEvent.clicks = 1; 1923 MEvent.clicks = 1;
1856 1924
1857 selection_click (MEvent.clicks, ev.x, ev.y); 1925 selection_click (MEvent.clicks, ev.x, ev.y);
1858 } 1926 }
1859 1927
1860 MEvent.button = Button1; 1928 MEvent.button = Button1;
1861 break; 1929 break;
1862 1930
1863 case Button3: 1931 case Button3:
1864 if (MEvent.button == Button3 && clickintime) 1932 if (MEvent.button == Button3 && clickintime)
1865 selection_rotate (ev.x, ev.y); 1933 selection_rotate (ev.x, ev.y);
1866 else 1934 else
1867 selection_extend (ev.x, ev.y, 1); 1935 selection_extend (ev.x, ev.y, 1);
1868 1936
1869 MEvent.button = Button3; 1937 MEvent.button = Button3;
1870 break; 1938 break;
1871 } 1939 }
1872 } 1940 }
1873 1941
1874 MEvent.time = ev.time; 1942 MEvent.time = ev.time;
1875 return; 1943 return;
1876 } 1944 }
1877 1945
… …
2013 } 2081 }
2014 2082
2015 break; 2083 break;
2016 } 2084 }
2017 } 2085 }
2086
2018 return; 2087 return;
2019 } 2088 }
2020#if MENUBAR
2021 /*
2022 * Menubar window processing of button press
2023 */
2024 if (isMenuBarWindow (ev.window))
2025 menubar_control (ev);
2026#endif
2027} 2089}
2028 2090
2029void 2091void
2030rxvt_term::button_release (XButtonEvent &ev) 2092rxvt_term::button_release (XButtonEvent &ev)
2031{ 2093{
… …
2037 2099
2038 if (scrollbar_isUpDn ()) 2100 if (scrollbar_isUpDn ())
2039 { 2101 {
2040 scrollBar.setIdle (); 2102 scrollBar.setIdle ();
2041 scrollbar_show (0); 2103 scrollbar_show (0);
2042#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2043 refresh_type &= ~SMOOTH_REFRESH;
2044#endif
2045 } 2104 }
2046 2105
2047#ifdef SELECTION_SCROLLING 2106#ifdef SELECTION_SCROLLING
2048 if (sel_scroll_ev.active) 2107 if (sel_scroll_ev.active)
2049 sel_scroll_ev.stop(); 2108 sel_scroll_ev.stop();
… …
2087 if (priv_modes & PrivMode_mouse_report 2146 if (priv_modes & PrivMode_mouse_report
2088 && bypass_keystate 2147 && bypass_keystate
2089 && ev.button == Button1 && MEvent.clicks <= 1) 2148 && ev.button == Button1 && MEvent.clicks <= 1)
2090 selection_extend (ev.x, ev.y, 0); 2149 selection_extend (ev.x, ev.y, 0);
2091 2150
2151 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2152 return;
2153
2092 switch (ev.button) 2154 switch (ev.button)
2093 { 2155 {
2094 case Button1: 2156 case Button1:
2095 case Button3: 2157 case Button3:
2096 selection_make (ev.time); 2158 selection_make (ev.time);
2097 break; 2159 break;
2160
2098 case Button2: 2161 case Button2:
2162 if (IN_RANGE_EXC (ev.x, 0, width)
2163 && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2099 selection_request (ev.time, ev.x, ev.y); 2164 selection_request (ev.time);
2165
2100 break; 2166 break;
2167
2101#ifdef MOUSE_WHEEL 2168#ifdef MOUSE_WHEEL
2102 case Button4: 2169 case Button4:
2103 case Button5: 2170 case Button5:
2104 { 2171 {
2105 int i; 2172 int i;
… …
2127 slip_wheel_ev.start (); 2194 slip_wheel_ev.start ();
2128 } 2195 }
2129 else 2196 else
2130 { 2197 {
2131# endif 2198# endif
2132# ifdef JUMP_MOUSE_WHEEL
2133 scr_page (v, i); 2199 scr_page (v, i);
2134 scr_refresh (SMOOTH_REFRESH);
2135 scrollbar_show (1); 2200 scrollbar_show (1);
2136# else
2137 while (i--)
2138 {
2139 scr_page (v, 1);
2140 scr_refresh (SMOOTH_REFRESH);
2141 scrollbar_show (1);
2142 }
2143# endif
2144# ifdef MOUSE_SLIP_WHEELING 2201# ifdef MOUSE_SLIP_WHEELING
2145 } 2202 }
2146#endif 2203# endif
2147 } 2204 }
2148 break; 2205 break;
2149#endif 2206#endif
2150 } 2207 }
2151 } 2208 }
2152#ifdef MENUBAR
2153 else if (isMenuBarWindow (ev.window))
2154 menubar_control (ev);
2155#endif
2156} 2209}
2157 2210
2158#ifdef TRANSPARENT 2211#ifdef TRANSPARENT
2159#if TINTING 2212#if TINTING
2160/* taken from aterm-0.4.2 */ 2213/* taken from aterm-0.4.2 */
… …
2640 2693
2641bool 2694bool
2642rxvt_term::cmd_parse () 2695rxvt_term::cmd_parse ()
2643{ 2696{
2644 bool flag = false; 2697 bool flag = false;
2645 unicode_t ch = NOCHAR; 2698 wchar_t ch = NOCHAR;
2646 unsigned char *seq_begin; // remember start of esc-sequence here 2699 char *seq_begin; // remember start of esc-sequence here
2647 2700
2648 for (;;) 2701 for (;;)
2649 { 2702 {
2650 if (ch == NOCHAR) 2703 if (ch == NOCHAR)
2651 { 2704 {
2652 seq_begin = cmdbuf_ptr; 2705 seq_begin = cmdbuf_ptr;
2653 ch = next_char (); 2706 ch = next_char ();
2654 }
2655 2707
2656 if (ch == NOCHAR) // TODO: improve 2708 if (ch == NOCHAR)
2657 break; 2709 break;
2710 }
2658 2711
2659 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2712 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2660 { 2713 {
2661 if (!seen_input) 2714 if (!seen_input)
2662 { 2715 {
… …
2671 if (seen_resize && cmd_pid) 2724 if (seen_resize && cmd_pid)
2672 kill (-cmd_pid, SIGWINCH); 2725 kill (-cmd_pid, SIGWINCH);
2673 } 2726 }
2674 2727
2675 /* Read a text string from the input buffer */ 2728 /* Read a text string from the input buffer */
2676 unicode_t buf[UBUFSIZ]; 2729 wchar_t buf[UBUFSIZ];
2677 bool refreshnow = false; 2730 bool refreshnow = false;
2678 int nlines = 0; 2731 int nlines = 0;
2679 unicode_t *str = buf; 2732 wchar_t *str = buf;
2680 unicode_t *eol = str + min (ncol, UBUFSIZ); 2733 wchar_t *eol = str + min (ncol, UBUFSIZ);
2681 2734
2682 for (;;) 2735 for (;;)
2683 { 2736 {
2684 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2737 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2685 break; 2738 break;
… …
2695 2748
2696 if (!OPTION (Opt_jumpScroll) 2749 if (!OPTION (Opt_jumpScroll)
2697 || (refresh_count >= refresh_limit * (nrow - 1))) 2750 || (refresh_count >= refresh_limit * (nrow - 1)))
2698 { 2751 {
2699 refreshnow = true; 2752 refreshnow = true;
2753 refresh_count = 0;
2700 ch = NOCHAR; 2754 ch = NOCHAR;
2701 break; 2755 break;
2702 } 2756 }
2703 2757
2704 // scr_add_lines only works for nlines <= nrow - 1. 2758 // scr_add_lines only works for nlines <= nrow - 1.
2705 if (nlines >= nrow - 1) 2759 if (nlines >= nrow - 1)
2706 { 2760 {
2761 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2762 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2707 scr_add_lines (buf, nlines, str - buf); 2763 scr_add_lines (buf, str - buf, nlines);
2764
2708 nlines = 0; 2765 nlines = 0;
2709 str = buf; 2766 str = buf;
2710 eol = str + min (ncol, UBUFSIZ); 2767 eol = str + min (ncol, UBUFSIZ);
2711 } 2768 }
2712 2769
… …
2725 2782
2726 seq_begin = cmdbuf_ptr; 2783 seq_begin = cmdbuf_ptr;
2727 ch = next_char (); 2784 ch = next_char ();
2728 } 2785 }
2729 2786
2787 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2788 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2730 scr_add_lines (buf, nlines, str - buf); 2789 scr_add_lines (buf, str - buf, nlines);
2731 2790
2732 /* 2791 /*
2733 * If there have been a lot of new lines, then update the screen 2792 * If there have been a lot of new lines, then update the screen
2734 * What the heck I'll cheat and only refresh less than every page-full. 2793 * What the heck I'll cheat and only refresh less than every page-full.
2735 * the number of pages between refreshes is refresh_limit, which 2794 * the number of pages between refreshes is refresh_limit, which
… …
2740 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2799 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2741 refresh_limit++; 2800 refresh_limit++;
2742 else 2801 else
2743 { 2802 {
2744 flag = true; 2803 flag = true;
2745 scr_refresh (refresh_type); 2804 scr_refresh ();
2805 want_refresh = 1;
2746 } 2806 }
2747 } 2807 }
2748 2808
2749 } 2809 }
2750 else 2810 else
… …
2765 } 2825 }
2766 2826
2767 return flag; 2827 return flag;
2768} 2828}
2769 2829
2770// read the next octet
2771unicode_t
2772rxvt_term::next_octet ()
2773{
2774 return cmdbuf_ptr < cmdbuf_endp
2775 ? *cmdbuf_ptr++
2776 : NOCHAR;
2777}
2778
2779// read the next character 2830// read the next character
2780unicode_t 2831wchar_t
2781rxvt_term::next_char () 2832rxvt_term::next_char ()
2782{ 2833{
2783 while (cmdbuf_ptr < cmdbuf_endp) 2834 while (cmdbuf_ptr < cmdbuf_endp)
2784 { 2835 {
2785 // assume 7-bit to be ascii ALWAYS 2836 // assume 7-bit to be ascii ALWAYS
2786 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2837 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2787 return *cmdbuf_ptr++; 2838 return *cmdbuf_ptr++;
2788 2839
2789 wchar_t wc; 2840 wchar_t wc;
2790 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2841 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2791 2842
2792 if (len == (size_t)-2) 2843 if (len == (size_t)-2)
2793 { 2844 {
2794 // the mbstate stores incomplete sequences. didn't know this :/ 2845 // the mbstate stores incomplete sequences. didn't know this :/
2795 cmdbuf_ptr = cmdbuf_endp; 2846 cmdbuf_ptr = cmdbuf_endp;
2796 break; 2847 break;
2797 } 2848 }
2798 2849
2799 if (len == (size_t)-1) 2850 if (len == (size_t)-1)
2800 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2851 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2801 2852
2802 // assume wchar == unicode 2853 // assume wchar == unicode
2803 cmdbuf_ptr += len; 2854 cmdbuf_ptr += len;
2804 return wc & UNICODE_MASK; 2855 return wc & UNICODE_MASK;
2805 } 2856 }
2806 2857
2807 return NOCHAR; 2858 return NOCHAR;
2859}
2860
2861// read the next octet
2862uint32_t
2863rxvt_term::next_octet ()
2864{
2865 return cmdbuf_ptr < cmdbuf_endp
2866 ? (unsigned char)*cmdbuf_ptr++
2867 : NOCHAR;
2808} 2868}
2809 2869
2810/* rxvt_cmd_getc () - Return next input character */ 2870/* rxvt_cmd_getc () - Return next input character */
2811/* 2871/*
2812 * Return the next input character after first passing any keyboard input 2872 * Return the next input character after first passing any keyboard input
2813 * to the command. 2873 * to the command.
2814 */ 2874 */
2815unicode_t 2875wchar_t
2816rxvt_term::cmd_getc () 2876rxvt_term::cmd_getc ()
2817{ 2877{
2818 unicode_t c = next_char (); 2878 wchar_t c = next_char ();
2819 2879
2820 if (c == NOCHAR) 2880 if (c == NOCHAR)
2821 throw out_of_input; 2881 throw out_of_input;
2822 2882
2823 return c; 2883 return c;
2824} 2884}
2825 2885
2826unicode_t 2886uint32_t
2827rxvt_term::cmd_get8 () 2887rxvt_term::cmd_get8 ()
2828{ 2888{
2829 unicode_t c = next_octet (); 2889 uint32_t c = next_octet ();
2830 2890
2831 if (c == NOCHAR) 2891 if (c == NOCHAR)
2832 throw out_of_input; 2892 throw out_of_input;
2833 2893
2834 return c; 2894 return c;
… …
2934 case C0_ESC: 2994 case C0_ESC:
2935 process_escape_seq (); 2995 process_escape_seq ();
2936 break; 2996 break;
2937 case C0_ENQ: /* terminal Status */ 2997 case C0_ENQ: /* terminal Status */
2938 if (rs[Rs_answerbackstring]) 2998 if (rs[Rs_answerbackstring])
2939 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2999 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2940 (unsigned int)strlen (rs[Rs_answerbackstring]));
2941 else 3000 else
2942 tt_write ((unsigned char *)VT100_ANS, 3001 tt_write (VT100_ANS, strlen (VT100_ANS));
2943 (unsigned int)strlen (VT100_ANS));
2944 break; 3002 break;
2945 case C0_BEL: /* bell */ 3003 case C0_BEL: /* bell */
2946 scr_bell (); 3004 scr_bell ();
2947 break; 3005 break;
2948 case C0_BS: /* backspace */ 3006 case C0_BS: /* backspace */
… …
3103 break; 3161 break;
3104 3162
3105 /* 8.3.87: NEXT LINE */ 3163 /* 8.3.87: NEXT LINE */
3106 case C1_NEL: /* ESC E */ 3164 case C1_NEL: /* ESC E */
3107 { 3165 {
3108 unicode_t nlcr[] = { C0_LF, C0_CR }; 3166 wchar_t nlcr[] = { C0_LF, C0_CR };
3109 scr_add_lines (nlcr, 1, 2); 3167 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3110 } 3168 }
3111 break; 3169 break;
3112 3170
3113 /* kidnapped escape sequence: Should be 8.3.48 */ 3171 /* kidnapped escape sequence: Should be 8.3.48 */
3114 case C1_ESA: /* ESC G */ 3172 case C1_ESA: /* ESC G */
… …
3136 process_dcs_seq (); 3194 process_dcs_seq ();
3137 break; 3195 break;
3138 3196
3139 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3197 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3140 case C1_SCI: /* ESC Z */ 3198 case C1_SCI: /* ESC Z */
3141 tt_write ((const unsigned char *)ESCZ_ANSWER, 3199 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3142 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3143 break; /* steal obsolete ESC [ c */ 3200 break; /* steal obsolete ESC [ c */
3144 3201
3145 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3202 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3146 case C1_CSI: /* ESC [ */ 3203 case C1_CSI: /* ESC [ */
3147 process_csi_seq (); 3204 process_csi_seq ();
… …
3391 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3448 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3392 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3449 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3393 break; 3450 break;
3394 3451
3395 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3452 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3396 tt_write ((const unsigned char *)VT100_ANS, 3453 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3397 (unsigned int) (sizeof (VT100_ANS) - 1));
3398 break; 3454 break;
3399 3455
3400 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3456 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3401 process_sgr_mode (nargs, arg); 3457 process_sgr_mode (nargs, arg);
3402 break; 3458 break;
… …
3604/*----------------------------------------------------------------------*/ 3660/*----------------------------------------------------------------------*/
3605/* 3661/*
3606 * get input up until STRING TERMINATOR (or BEL) 3662 * get input up until STRING TERMINATOR (or BEL)
3607 * ends_how is terminator used. returned input must be free()'d 3663 * ends_how is terminator used. returned input must be free()'d
3608 */ 3664 */
3609unsigned char * 3665char *
3610rxvt_term::get_to_st (unicode_t &ends_how) 3666rxvt_term::get_to_st (unicode_t &ends_how)
3611{ 3667{
3612 unicode_t ch; 3668 unicode_t ch;
3613 bool seen_esc = false; 3669 bool seen_esc = false;
3614 unsigned int n = 0; 3670 unsigned int n = 0;
… …
3647 3703
3648 string[n++] = '\0'; 3704 string[n++] = '\0';
3649 3705
3650 ends_how = (ch == 0x5c ? C0_ESC : ch); 3706 ends_how = (ch == 0x5c ? C0_ESC : ch);
3651 3707
3652 return (unsigned char *)rxvt_wcstombs (string); 3708 return rxvt_wcstombs (string);
3653} 3709}
3654 3710
3655/*----------------------------------------------------------------------*/ 3711/*----------------------------------------------------------------------*/
3656/* 3712/*
3657 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3713 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3658 */ 3714 */
3659void 3715void
3660rxvt_term::process_dcs_seq () 3716rxvt_term::process_dcs_seq ()
3661{ 3717{
3662 unsigned char *s; 3718 char *s;
3663 unicode_t eh; 3719 unicode_t eh;
3664 3720
3665 /* 3721 /*
3666 * Not handled yet 3722 * Not handled yet
3667 */ 3723 */
… …
3686 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3742 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3687 arg = arg * 10 + (ch - '0'); 3743 arg = arg * 10 + (ch - '0');
3688 3744
3689 if (ch == ';') 3745 if (ch == ';')
3690 { 3746 {
3691 unsigned char *s = get_to_st (eh); 3747 char *s = get_to_st (eh);
3692 3748
3693 if (s) 3749 if (s)
3694 { 3750 {
3695 process_xterm_seq (arg, (char *)s, eh); 3751 process_xterm_seq (arg, s, eh);
3696 free (s); 3752 free (s);
3697 } 3753 }
3698 } 3754 }
3699} 3755}
3700 3756
3701void 3757void
3702rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3758rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3703{ 3759{
3704 if (str[0] == '?' && !str[1]) 3760 if (str[0] == '?' && !str[1])
3705 { 3761 {
3706 unsigned short r, g, b; 3762 unsigned short r, g, b;
3707 pix_colors_focused[color].get (display, r, g, b); 3763 pix_colors_focused[color].get (display, r, g, b);
… …
3713 3769
3714/* 3770/*
3715 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3771 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3716 */ 3772 */
3717void 3773void
3718rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3774rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3719{ 3775{
3720 int changed = 0;
3721 int color; 3776 int color;
3722 char *buf, *name; 3777 char *buf, *name;
3723 bool query = str[0] == '?' && !str[1]; 3778 bool query = str[0] == '?' && !str[1];
3724 int saveop = op; 3779 int saveop = op;
3725 dDisp; 3780 dDisp;
… …
3780 { 3835 {
3781 if ((name = strchr (buf, ';')) == NULL) 3836 if ((name = strchr (buf, ';')) == NULL)
3782 break; 3837 break;
3783 3838
3784 *name++ = '\0'; 3839 *name++ = '\0';
3785 color = atoi (buf); 3840 color = atoi (buf) + minCOLOR;
3786 3841
3787 if (color < 0 || color >= TOTAL_COLORS) 3842 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3788 break; 3843 break;
3789 3844
3790 if ((buf = strchr (name, ';')) != NULL) 3845 if ((buf = strchr (name, ';')) != NULL)
3791 *buf++ = '\0'; 3846 *buf++ = '\0';
3792 3847
3793 if (name[0] == '?' && !name[1]) 3848 if (name[0] == '?' && !name[1])
3794 { 3849 {
3795 unsigned short r, g, b; 3850 unsigned short r, g, b;
3796 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3851 pix_colors_focused[color].get (display, r, g, b);
3797 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3852 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3798 } 3853 }
3799 else 3854 else
3800 set_window_color (color + minCOLOR, name); 3855 set_window_color (color, name);
3801 } 3856 }
3802 break; 3857 break;
3803 case XTerm_Color00: 3858 case XTerm_Color00:
3804 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3859 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3805 break; 3860 break;
3806 case XTerm_Color01: 3861 case XTerm_Color01:
3807 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3862 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3808 break; 3863 break;
3809#ifndef NO_CURSORCOLOR 3864#ifndef NO_CURSORCOLOR
3810 case XTerm_Color_cursor: 3865 case XTerm_Color_cursor:
3811 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3866 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3812 break; 3867 break;
… …
3816 break; 3871 break;
3817 case XTerm_Color_pointer_bg: 3872 case XTerm_Color_pointer_bg:
3818 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3873 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3819 break; 3874 break;
3820#ifndef NO_BOLD_UNDERLINE_REVERSE 3875#ifndef NO_BOLD_UNDERLINE_REVERSE
3821 case XTerm_Color_BD:
3822 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3823 break;
3824 case XTerm_Color_UL:
3825 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3826 break;
3827 case XTerm_Color_RV: 3876 case XTerm_Color_RV:
3828 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3877 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3878 break;
3879 case Rxvt_Color_BD:
3880 case URxvt_Color_BD:
3881 process_color_seq (op, Color_BD, str, resp);
3882 break;
3883 case Rxvt_Color_UL:
3884 case URxvt_Color_UL:
3885 process_color_seq (op, Color_UL, str, resp);
3829 break; 3886 break;
3830 case URxvt_Color_IT: 3887 case URxvt_Color_IT:
3831 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3888 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3832 break; 3889 break;
3833#endif 3890#endif
… …
3838 if (am_transparent) 3895 if (am_transparent)
3839 want_full_refresh = want_refresh = 1; 3896 want_full_refresh = want_refresh = 1;
3840 break; 3897 break;
3841#endif 3898#endif
3842 3899
3843 case XTerm_Pixmap: 3900 case Rxvt_Pixmap:
3901 {
3844 if (*str != ';') 3902 if (*str != ';')
3845 { 3903 {
3846#if XPM_BACKGROUND 3904#if XPM_BACKGROUND
3847 scale_pixmap (""); /* reset to default scaling */ 3905 scale_pixmap (""); /* reset to default scaling */
3848 set_bgPixmap (str); /* change pixmap */ 3906 set_bgPixmap (str); /* change pixmap */
3849#endif
3850 scr_touch (true); 3907 scr_touch (true);
3908#endif
3851 } 3909 }
3910
3911 int changed = 0;
3912
3852 while ((str = strchr (str, ';')) != NULL) 3913 while ((str = strchr (str, ';')) != NULL)
3853 { 3914 {
3854 str++; 3915 str++;
3855#if XPM_BACKGROUND 3916#if XPM_BACKGROUND
3856 changed += scale_pixmap (str); 3917 changed += scale_pixmap (str);
3857#endif 3918#endif
3858 } 3919 }
3859 3920
3860 if (changed) 3921 if (changed)
3861 { 3922 {
3862#ifdef XPM_BACKGROUND 3923#ifdef XPM_BACKGROUND
3863 resize_pixmap (); 3924 resize_pixmap ();
3864#endif
3865 scr_touch (true); 3925 scr_touch (true);
3926#endif
3866 } 3927 }
3928 }
3867 break; 3929 break;
3868 3930
3869 case XTerm_restoreFG: 3931 case Rxvt_restoreFG:
3870 set_window_color (Color_fg, str); 3932 set_window_color (Color_fg, str);
3871 break; 3933 break;
3872 case XTerm_restoreBG: 3934 case Rxvt_restoreBG:
3873 set_window_color (Color_bg, str); 3935 set_window_color (Color_bg, str);
3874 break; 3936 break;
3875 3937
3876 case XTerm_logfile: 3938 case XTerm_logfile:
3877 // TODO, when secure mode? 3939 // TODO, when secure mode?
3878 break; 3940 break;
3879 3941
3880#ifdef MENUBAR
3881 case URxvt_Menu:
3882 if (OPTION (Opt_insecure))
3883 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3884 break;
3885#endif
3886#if 0 3942#if 0
3887 case XTerm_dumpscreen: /* no error notices */ 3943 case Rxvt_dumpscreen: /* no error notices */
3888 { 3944 {
3889 int fd; 3945 int fd;
3890 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3946 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3891 { 3947 {
3892 scr_dump (fd); 3948 scr_dump (fd);
… …
3923 if (query) 3979 if (query)
3924 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3980 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3925 else 3981 else
3926 { 3982 {
3927 set_locale (str); 3983 set_locale (str);
3928 pty.set_utf8_mode (enc_utf8); 3984 pty->set_utf8_mode (enc_utf8);
3929 init_xlocale (); 3985 init_xlocale ();
3930 } 3986 }
3931 break; 3987 break;
3932 3988
3933 case URxvt_view_up: 3989 case URxvt_view_up:
3934 case URxvt_view_down: 3990 case URxvt_view_down:
3991 {
3935 int lines = atoi (str); 3992 int lines = atoi (str);
3936 3993
3937 if (lines) 3994 if (lines)
3938 scr_page (op == URxvt_view_up ? UP : DN, lines); 3995 scr_page (op == URxvt_view_up ? UP : DN, lines);
3939 else 3996 else
3940 {
3941 scr_erase_savelines (); 3997 scr_erase_savelines ();
3942 } 3998 }
3943 3999
4000 break;
4001#endif
4002
4003#if ENABLE_PERL
4004 case URxvt_perl:
4005 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
4006 ; // no responses yet
3944 break; 4007 break;
3945#endif 4008#endif
3946 } 4009 }
3947} 4010}
3948/*----------------------------------------------------------------------*/ 4011/*----------------------------------------------------------------------*/
… …
4000 { 5, PrivMode_rVideo }, 4063 { 5, PrivMode_rVideo },
4001 { 6, PrivMode_relOrigin }, 4064 { 6, PrivMode_relOrigin },
4002 { 7, PrivMode_Autowrap }, 4065 { 7, PrivMode_Autowrap },
4003 // 8, bi-directional support mode 4066 // 8, bi-directional support mode
4004 { 9, PrivMode_MouseX10 }, 4067 { 9, PrivMode_MouseX10 },
4005#ifdef menuBar_esc
4006 { menuBar_esc, PrivMode_menuBar },
4007#endif
4008 // 18, 19 printing-related 4068 // 18, 19 printing-related
4009 { 25, PrivMode_VisibleCursor }, 4069 { 25, PrivMode_VisibleCursor },
4010#ifdef scrollBar_esc 4070#ifdef scrollBar_esc
4011 { scrollBar_esc, PrivMode_scrollBar }, 4071 { scrollBar_esc, PrivMode_scrollBar },
4012#endif 4072#endif
… …
4059 /* extra handling for values with state unkept */ 4119 /* extra handling for values with state unkept */
4060 switch (arg[i]) 4120 switch (arg[i])
4061 { 4121 {
4062#if ENABLE_STYLES 4122#if ENABLE_STYLES
4063 case 1021: 4123 case 1021:
4064 if (mode) 4124 set_option (Opt_intensityStyles, mode);
4065 SET_OPTION (Opt_intensityStyles);
4066 else
4067 CLR_OPTION (Opt_intensityStyles);
4068 4125
4069 want_refresh = 1; 4126 scr_touch (true);
4070 want_full_refresh = 1;
4071 break; 4127 break;
4072#endif 4128#endif
4073 case 1048: /* alternative cursor save */ 4129 case 1048: /* alternative cursor save */
4074 case 1049: 4130 case 1049:
4075 if (OPTION (Opt_secondaryScreen)) 4131 if (OPTION (Opt_secondaryScreen))
… …
4095 case 3: /* 80/132 */ 4151 case 3: /* 80/132 */
4096 if (priv_modes & PrivMode_132OK) 4152 if (priv_modes & PrivMode_132OK)
4097 set_widthheight (((state ? 132 : 80) * fwidth), height); 4153 set_widthheight (((state ? 132 : 80) * fwidth), height);
4098 break; 4154 break;
4099 case 4: /* smooth scrolling */ 4155 case 4: /* smooth scrolling */
4100 if (!state) 4156 set_option (Opt_jumpScroll, !state);
4101 SET_OPTION (Opt_jumpScroll);
4102 else
4103 CLR_OPTION (Opt_jumpScroll);
4104 break; 4157 break;
4105 case 5: /* reverse video */ 4158 case 5: /* reverse video */
4106 scr_rvideo_mode (state); 4159 scr_rvideo_mode (state);
4107 break; 4160 break;
4108 case 6: /* relative/absolute origins */ 4161 case 6: /* relative/absolute origins */
… …
4114 /* case 8: - auto repeat, can't do on a per window basis */ 4167 /* case 8: - auto repeat, can't do on a per window basis */
4115 case 9: /* X10 mouse reporting */ 4168 case 9: /* X10 mouse reporting */
4116 if (state) /* orthogonal */ 4169 if (state) /* orthogonal */
4117 priv_modes &= ~PrivMode_MouseX11; 4170 priv_modes &= ~PrivMode_MouseX11;
4118 break; 4171 break;
4119#ifdef menuBar_esc
4120 case menuBar_esc:
4121#ifdef MENUBAR
4122 map_menuBar (state);
4123#endif
4124 break;
4125#endif
4126#ifdef scrollBar_esc 4172#ifdef scrollBar_esc
4127 case scrollBar_esc: 4173 case scrollBar_esc:
4128 if (scrollbar_mapping (state)) 4174 if (scrollbar_mapping (state))
4129 { 4175 {
4130 resize_all_windows (0, 0, 0); 4176 resize_all_windows (0, 0, 0);
… …
4149#if 0 4195#if 0
4150 case 1001: 4196 case 1001:
4151 break; /* X11 mouse highlighting */ 4197 break; /* X11 mouse highlighting */
4152#endif 4198#endif
4153 case 1010: /* scroll to bottom on TTY output inhibit */ 4199 case 1010: /* scroll to bottom on TTY output inhibit */
4154 if (!state) 4200 set_option (Opt_scrollTtyOutput, !state);
4155 SET_OPTION (Opt_scrollTtyOutput);
4156 else
4157 CLR_OPTION (Opt_scrollTtyOutput);
4158 break; 4201 break;
4159 case 1011: /* scroll to bottom on key press */ 4202 case 1011: /* scroll to bottom on key press */
4160 if (state) 4203 set_option (Opt_scrollTtyKeypress, state);
4161 SET_OPTION (Opt_scrollTtyKeypress);
4162 else
4163 CLR_OPTION (Opt_scrollTtyKeypress);
4164 break; 4204 break;
4165 case 1047: /* secondary screen w/ clearing last */ 4205 case 1047: /* secondary screen w/ clearing last */
4166 if (OPTION (Opt_secondaryScreen)) 4206 if (OPTION (Opt_secondaryScreen))
4167 if (current_screen != PRIMARY) 4207 if (current_screen != PRIMARY)
4168 scr_erase_screen (2); 4208 scr_erase_screen (2);
… …
4306 scr_color (Color_bg, Color_bg); 4346 scr_color (Color_bg, Color_bg);
4307 break; 4347 break;
4308 4348
4309 //case 50: // not variable spacing 4349 //case 50: // not variable spacing
4310 4350
4311#ifndef NO_BRIGHTCOLOR 4351#if ENABLE_FRILLS
4312 case 90: 4352 case 90:
4313 case 91: /* set bright fg color */ 4353 case 91: /* set bright fg color */
4314 case 92: 4354 case 92:
4315 case 93: 4355 case 93:
4316 case 94: 4356 case 94:
… …
4361 */ 4401 */
4362void 4402void
4363rxvt_term::tt_printf (const char *fmt,...) 4403rxvt_term::tt_printf (const char *fmt,...)
4364{ 4404{
4365 va_list arg_ptr; 4405 va_list arg_ptr;
4366 unsigned char buf[256]; 4406 char buf[256];
4367 4407
4368 va_start (arg_ptr, fmt); 4408 va_start (arg_ptr, fmt);
4369 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4409 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4370 va_end (arg_ptr); 4410 va_end (arg_ptr);
4371 tt_write (buf, strlen (buf)); 4411 tt_write (buf, strlen (buf));
… …
4376 * or generated by us in response to a query ESC sequence. 4416 * or generated by us in response to a query ESC sequence.
4377 */ 4417 */
4378const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4418const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4379 4419
4380void 4420void
4381rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4421rxvt_term::tt_write (const char *data, unsigned int len)
4382{ 4422{
4423 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4424 return;
4425
4426 if (pty->pty < 0)
4427 return;
4428
4383 if (v_buflen == 0) 4429 if (v_buflen == 0)
4384 { 4430 {
4385 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4431 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4386 4432
4387 if ((unsigned int)written == len) 4433 if ((unsigned int)written == len)
4388 return; 4434 return;
4389 4435
4390 data += written; 4436 data += written;
4391 len -= written; 4437 len -= written;
4392 } 4438 }
4393 4439
4394 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4440 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4395 4441
4396 memcpy (v_buffer + v_buflen, data, len); 4442 memcpy (v_buffer + v_buflen, data, len);
4397 v_buflen += len; 4443 v_buflen += len;
4398 4444
4399 pty_ev.set (EVENT_READ | EVENT_WRITE); 4445 pty_ev.set (EVENT_READ | EVENT_WRITE);
4400} 4446}
4401 4447
4402void rxvt_term::pty_write () 4448void rxvt_term::pty_write ()
4403{ 4449{
4404 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4450 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4405 4451
4406 if (written > 0) 4452 if (written > 0)
4407 { 4453 {
4408 v_buflen -= written; 4454 v_buflen -= written;
4409 4455

Diff Legend

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