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

Diff Legend

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