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.229 by root, Tue Jan 3 17:34:44 2006 UTC vs.
Revision 1.275 by root, Fri Jan 20 10:35:25 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.
… …
50#include "rxvtperl.h" 50#include "rxvtperl.h"
51#include "version.h" 51#include "version.h"
52#include "command.h" 52#include "command.h"
53 53
54#if HAVE_SCHED_YIELD 54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
55# include <sched.h> 56//# include <sched.h>
56#endif 57#endif
57 58
58#ifdef KEYSYM_RESOURCE 59#ifdef KEYSYM_RESOURCE
59# include "keyboard.h" 60# include "keyboard.h"
60#endif 61#endif
… …
62#include <csignal> 63#include <csignal>
63 64
64/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
65 66
66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
67
68// exception thrown when the command parser runs out of input data
69class out_of_input { } out_of_input;
70 68
71#if ENABLE_FRILLS || ISO_14755 69#if ENABLE_FRILLS || ISO_14755
72 70
73#define ISO_14755_STARTED 0x80000000UL 71#define ISO_14755_STARTED 0x80000000UL
74#define ISO_14755_51 0x40000000UL // basic (section 5.1) 72#define ISO_14755_51 0x40000000UL // basic (section 5.1)
… …
146 || !IN_RANGE_EXC (y, 0, nrow)) 144 || !IN_RANGE_EXC (y, 0, nrow))
147 return; 145 return;
148 146
149 for (;;) 147 for (;;)
150 { 148 {
151 const line_t &l = ROW(y - view_start); 149 const line_t &l = ROW(y + view_start);
152 150
153 text_t t = l.t[x]; 151 text_t t = l.t[x];
154 152
155 if (t != NOCHAR || !x) 153 if (t != NOCHAR || !x)
156 { 154 {
… …
267 mb[0] = ch[0]; 265 mb[0] = ch[0];
268 len = 1; 266 len = 1;
269 } 267 }
270 268
271 if (len > 0) 269 if (len > 0)
272 tt_write ((unsigned char *)mb, len); 270 tt_write (mb, len);
273 else 271 else
274 scr_bell (); 272 scr_bell ();
275 } 273 }
276 274
277 iso14755buf = 0; 275 iso14755buf = 0;
… …
305 KeySym keysym; 303 KeySym keysym;
306#ifdef DEBUG_CMD 304#ifdef DEBUG_CMD
307 static int debug_key = 1; /* accessible by a debugger only */ 305 static int debug_key = 1; /* accessible by a debugger only */
308#endif 306#endif
309 int valid_keysym; 307 int valid_keysym;
310 unsigned char kbuf[KBUFSZ]; 308 char kbuf[KBUFSZ];
311 309
312 /* 310 /*
313 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 311 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
314 * escape sequence to toggle the Keypad. 312 * escape sequence to toggle the Keypad.
315 * 313 *
… …
333 Status status_return; 331 Status status_return;
334 332
335#if 0 333#if 0
336#ifdef X_HAVE_UTF8_STRING 334#ifdef X_HAVE_UTF8_STRING
337 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 335 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
338 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 336 len = Xutf8LookupString (Input_Context, &ev, kbuf,
339 KBUFSZ, &keysym, &status_return); 337 KBUFSZ, &keysym, &status_return);
340 else 338 else
341#endif 339#endif
342#endif 340#endif
343 { 341 {
… …
380 || status_return == XLookupBoth; 378 || status_return == XLookupBoth;
381 } 379 }
382 else 380 else
383#endif 381#endif
384 { 382 {
385 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 383 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
386 valid_keysym = keysym != NoSymbol; 384 valid_keysym = keysym != NoSymbol;
387 } 385 }
388 386
389 if (valid_keysym) 387 if (valid_keysym)
390 { 388 {
… …
442 scr_move_to (0, 1); 440 scr_move_to (0, 1);
443 return; 441 return;
444 } 442 }
445 else if (keysym == XK_End) 443 else if (keysym == XK_End)
446 { 444 {
447 scr_move_to (1, 0); 445 scr_move_to (1, 1);
448 return; 446 return;
449 } 447 }
450 } 448 }
451#endif 449#endif
452 } 450 }
… …
463 { 461 {
464 switch (keysym) 462 switch (keysym)
465 { 463 {
466 /* normal XTerm key bindings */ 464 /* normal XTerm key bindings */
467 case XK_Insert: /* Shift+Insert = paste mouse selection */ 465 case XK_Insert: /* Shift+Insert = paste mouse selection */
468 selection_request (ev.time, 0, 0); 466 selection_request (ev.time);
469 return; 467 return;
470#if TODO 468#if TODO
471 /* rxvt extras */ 469 /* rxvt extras */
472 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 470 case XK_KP_Add: /* Shift+KP_Add = bigger font */
473 change_font (FONT_UP); 471 change_font (FONT_UP);
… …
854 { 852 {
855#ifdef META8_OPTION 853#ifdef META8_OPTION
856 /* set 8-bit on */ 854 /* set 8-bit on */
857 if (meta && (meta_char == 0x80)) 855 if (meta && (meta_char == 0x80))
858 { 856 {
859 unsigned char *ch; 857 char *ch;
860 858
861 for (ch = kbuf; ch < kbuf + len; ch++) 859 for (ch = kbuf; ch < kbuf + len; ch++)
862 *ch |= 0x80; 860 *ch |= 0x80;
863 861
864 meta = 0; 862 meta = 0;
865 } 863 }
866#endif 864#endif
867 /* nil */ ; 865 /* nil */ ;
868 } 866 }
869 } 867 }
868
869 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
870 return;
870 871
871 if (len <= 0) 872 if (len <= 0)
872 return; /* not mapped */ 873 return; /* not mapped */
873 874
874 if (OPTION (Opt_scrollTtyKeypress)) 875 if (OPTION (Opt_scrollTtyKeypress))
… …
897#ifdef META8_OPTION 898#ifdef META8_OPTION
898 && meta_char == C0_ESC 899 && meta_char == C0_ESC
899#endif 900#endif
900 ) 901 )
901 { 902 {
902 const unsigned char ch = C0_ESC; 903 const char ch = C0_ESC;
903 tt_write (&ch, 1); 904 tt_write (&ch, 1);
904 } 905 }
905 906
906#if defined(DEBUG_CMD) 907#if defined(DEBUG_CMD)
907 /* Display keyboard buffer contents */ 908 /* Display keyboard buffer contents */
… …
915#endif /* DEBUG_CMD */ 916#endif /* DEBUG_CMD */
916 tt_write (kbuf, (unsigned int)len); 917 tt_write (kbuf, (unsigned int)len);
917} 918}
918/*}}} */ 919/*}}} */
919 920
920#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 921#if defined (KEYSYM_RESOURCE)
921/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
922/* attempt to `write' count to the input buffer */
923unsigned int 922unsigned int
924rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 923rxvt_term::cmd_write (const char *str, unsigned int count)
925{ 924{
926 unsigned int n, s; 925 unsigned int n, s;
927 926
928 n = cmdbuf_ptr - cmdbuf_base; 927 n = cmdbuf_ptr - cmdbuf_base;
929 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 928 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
966 } 965 }
967#endif 966#endif
968 967
969 if (want_refresh) 968 if (want_refresh)
970 { 969 {
970 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
971 {
972 int row = view_start;
973 int end_row = row + nrow;
974
975 while (row > top_row && ROW (row - 1).is_longer ())
976 --row;
977
978 do
979 {
980 int start_row = row;
981 line_t *l;
982
983 do
984 {
985 l = &ROW (row++);
986
987 if (!(l->f & LINE_FILTERED))
988 {
989 // line not filtered, mark it as filtered
990 l->f |= LINE_FILTERED;
991 while (l->is_longer ())
992 {
993 l = &ROW (row++);
994 l->f |= LINE_FILTERED;
995 }
996
997 // and filter it
998 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
999
1000 break;
1001 }
1002 }
1003 while (l->is_longer () && row < end_row);
1004 }
1005 while (row < end_row);
1006 }
1007
971 scr_refresh (refresh_type); 1008 scr_refresh ();
972 scrollbar_show (1); 1009 scrollbar_show (1);
973#ifdef USE_XIM 1010#ifdef USE_XIM
974 IMSendSpot (); 1011 IMSendSpot ();
975#endif 1012#endif
976 } 1013 }
… …
979} 1016}
980 1017
981void 1018void
982rxvt_term::check_cb (check_watcher &w) 1019rxvt_term::check_cb (check_watcher &w)
983{ 1020{
984 SET_R (this); 1021 make_current ();
985 SET_LOCALE (locale);
986 1022
987 display->flush (); 1023 display->flush ();
988 1024
989 if (want_refresh && !flush_ev.active) 1025 if (want_refresh && !flush_ev.active)
990 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally 1026 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
991} 1027}
992 1028
993void 1029void
994rxvt_term::flush_cb (time_watcher &w) 1030rxvt_term::flush_cb (time_watcher &w)
995{ 1031{
996 SET_R (this); 1032 make_current ();
997 SET_LOCALE (locale);
998 1033
999 refresh_limit = 1; 1034 refresh_limit = 1;
1000 refresh_count = 0; 1035 refresh_count = 0;
1001 flush (); 1036 flush ();
1002} 1037}
… …
1006rxvt_term::cursor_blink_cb (time_watcher &w) 1041rxvt_term::cursor_blink_cb (time_watcher &w)
1007{ 1042{
1008 hidden_cursor = !hidden_cursor; 1043 hidden_cursor = !hidden_cursor;
1009 want_refresh = 1; 1044 want_refresh = 1;
1010 1045
1011 w.start (w.at + BLINK_INTERVAL); 1046 w.start (w.at + CURSOR_BLINK_INTERVAL);
1012} 1047}
1013#endif 1048#endif
1014 1049
1015#ifdef TEXT_BLINK 1050#ifdef TEXT_BLINK
1016void 1051void
… …
1030rxvt_term::cont_scroll_cb (time_watcher &w) 1065rxvt_term::cont_scroll_cb (time_watcher &w)
1031{ 1066{
1032 if ((scrollbar_isUp() || scrollbar_isDn()) && 1067 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1033 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1068 scr_page (scrollbar_isUp() ? UP : DN, 1))
1034 { 1069 {
1035 refresh_type |= SMOOTH_REFRESH;
1036 want_refresh = 1; 1070 want_refresh = 1;
1037 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1038 } 1072 }
1039} 1073}
1040#endif 1074#endif
… …
1044rxvt_term::sel_scroll_cb (time_watcher &w) 1078rxvt_term::sel_scroll_cb (time_watcher &w)
1045{ 1079{
1046 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1080 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1047 { 1081 {
1048 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1082 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1049 refresh_type |= SMOOTH_REFRESH;
1050 want_refresh = 1; 1083 want_refresh = 1;
1051 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1084 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1052 } 1085 }
1053} 1086}
1054#endif 1087#endif
… …
1059{ 1092{
1060 if (mouse_slip_wheel_speed == 0 1093 if (mouse_slip_wheel_speed == 0
1061 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1094 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1062 : scr_page (UP, mouse_slip_wheel_speed)) 1095 : scr_page (UP, mouse_slip_wheel_speed))
1063 { 1096 {
1064 if (view_start == nsaved || 1097 if (view_start == top_row || view_start == 0)
1065 view_start == 0)
1066 mouse_slip_wheel_speed = 0; 1098 mouse_slip_wheel_speed = 0;
1067 1099
1068 refresh_type |= SMOOTH_REFRESH;
1069 want_refresh = 1; 1100 want_refresh = 1;
1070 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1101 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1071 } 1102 }
1072} 1103}
1073#endif 1104#endif
… …
1095{ 1126{
1096 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1127 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1097 1128
1098 if (CBUFSIZ == n) 1129 if (CBUFSIZ == n)
1099 { 1130 {
1100 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1131 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1101 n = 0; 1132 n = 0;
1102 } 1133 }
1103 1134
1104 memmove (cmdbuf_base, cmdbuf_ptr, n); 1135 memmove (cmdbuf_base, cmdbuf_ptr, n);
1105 cmdbuf_ptr = cmdbuf_base; 1136 cmdbuf_ptr = cmdbuf_base;
1106 cmdbuf_endp = cmdbuf_ptr + n; 1137 cmdbuf_endp = cmdbuf_ptr + n;
1107 1138
1108 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1139 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1109 1140
1110 if (r > 0) 1141 if (r > 0)
1111 { 1142 {
1112 cmdbuf_endp += r; 1143 cmdbuf_endp += r;
1113 return true; 1144 return true;
… …
1131} 1162}
1132 1163
1133void 1164void
1134rxvt_term::pty_cb (io_watcher &w, short revents) 1165rxvt_term::pty_cb (io_watcher &w, short revents)
1135{ 1166{
1136 SET_R (this); 1167 make_current ();
1137 SET_LOCALE (locale);
1138 1168
1139 if (revents & EVENT_READ) 1169 if (revents & EVENT_READ)
1140 // loop, but don't allow a single term to monopolize us 1170 // loop, but don't allow a single term to monopolize us
1141 while (pty_fill ()) 1171 while (pty_fill ())
1142 if (cmd_parse ()) 1172 if (cmd_parse ())
… …
1162 1192
1163#ifdef POINTER_BLANK 1193#ifdef POINTER_BLANK
1164void 1194void
1165rxvt_term::pointer_blank () 1195rxvt_term::pointer_blank ()
1166{ 1196{
1167 if (! OPTION (Opt_pointerBlank)) 1197 if (!OPTION (Opt_pointerBlank))
1168 return; 1198 return;
1169 1199
1170 XDefineCursor (display->display, vt, display->blank_cursor); 1200 XDefineCursor (display->display, vt, display->blank_cursor);
1171 XFlush (display->display); 1201 XFlush (display->display);
1172 1202
… …
1174} 1204}
1175 1205
1176void 1206void
1177rxvt_term::pointer_cb (time_watcher &w) 1207rxvt_term::pointer_cb (time_watcher &w)
1178{ 1208{
1179 SET_R (this); 1209 make_current ();
1180 SET_LOCALE (locale);
1181 1210
1182 pointer_blank (); 1211 pointer_blank ();
1183} 1212}
1184#endif 1213#endif
1185 1214
… …
1264 1293
1265/*{{{ process an X event */ 1294/*{{{ process an X event */
1266void 1295void
1267rxvt_term::x_cb (XEvent &ev) 1296rxvt_term::x_cb (XEvent &ev)
1268{ 1297{
1298 make_current ();
1299
1269 dDisp; 1300 dDisp;
1270 1301
1271 SET_R (this); 1302 if (ev.xany.window == vt
1272 SET_LOCALE (locale); 1303 && SHOULD_INVOKE (HOOK_X_EVENT)
1304 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1305 return;
1273 1306
1274#if defined(CURSOR_BLINK) 1307 // for XQueryPointer
1275 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1276 {
1277 if (hidden_cursor)
1278 {
1279 hidden_cursor = 0;
1280 want_refresh = 1;
1281 }
1282
1283 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1284 }
1285#endif
1286
1287#if defined(POINTER_BLANK)
1288 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1289 {
1290 if (ev.type == MotionNotify
1291 || ev.type == ButtonPress
1292 || ev.type == ButtonRelease)
1293 if (hidden_pointer)
1294 pointer_unblank ();
1295
1296 if (ev.type == KeyPress && hidden_pointer == 0)
1297 pointer_blank ();
1298 }
1299#endif
1300
1301 Window unused_root, unused_child; 1308 Window unused_root, unused_child;
1302 int unused_root_x, unused_root_y; 1309 int unused_root_x, unused_root_y;
1303 unsigned int unused_mask; 1310 unsigned int unused_mask;
1304 1311
1305 switch (ev.type) 1312 switch (ev.type)
… …
1312 1319
1313 break; 1320 break;
1314 1321
1315 case KeyRelease: 1322 case KeyRelease:
1316 { 1323 {
1317#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1324#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1318 KeySym ks; 1325 KeySym keysym;
1319 1326
1320 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1327 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1321#endif 1328#endif
1322 1329
1323#if ENABLE_FRILLS || ISO_14755 1330#if ENABLE_FRILLS || ISO_14755
1324 // ISO 14755 support 1331 // ISO 14755 support
1325 if (iso14755buf) 1332 if (iso14755buf)
… …
1330# endif 1337# endif
1331# if ISO_14755 1338# if ISO_14755
1332 // iso14755 part 5.2 handling: release time 1339 // iso14755 part 5.2 handling: release time
1333 // first: controls 1340 // first: controls
1334 if ((ev.xkey.state & ControlMask) 1341 if ((ev.xkey.state & ControlMask)
1335 && ((ks >= 0x40 && ks <= 0x5f) 1342 && ((keysym >= 0x40 && keysym <= 0x5f)
1336 || (ks >= 0x61 && ks <= 0x7f))) 1343 || (keysym >= 0x61 && keysym <= 0x7f)))
1337 { 1344 {
1338 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1345 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1339 commit_iso14755 (); 1346 commit_iso14755 ();
1340 return; // case-break; 1347 goto skip_switch;
1341 } 1348 }
1342 1349
1343 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1350 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1344 if (i[0] == ks) 1351 if (i[0] == keysym)
1345 { 1352 {
1346 iso14755buf = ISO_14755_51 | i[1]; 1353 iso14755buf = ISO_14755_51 | i[1];
1347 commit_iso14755 (); 1354 commit_iso14755 ();
1348 return; // case-break; 1355 goto skip_switch;
1349 } 1356 }
1350 1357
1351 scr_bell (); 1358 scr_bell ();
1352# endif 1359# endif
1353 iso14755buf = 0; 1360 iso14755buf = 0;
… …
1372 else 1379 else
1373 iso14755buf = 0; 1380 iso14755buf = 0;
1374 } 1381 }
1375#endif 1382#endif
1376 1383
1384 if (ev.xany.window == vt
1385 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1386 break;
1387
1377#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1388#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1378 if (!(ev.xkey.state & ControlMask)) 1389 if (!(ev.xkey.state & ControlMask))
1379 slip_wheel_ev.stop (); 1390 slip_wheel_ev.stop ();
1380 else if (ks == XK_Control_L || ks == XK_Control_R) 1391 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1381 mouse_slip_wheel_speed = 0; 1392 mouse_slip_wheel_speed = 0;
1382#endif 1393#endif
1383 break; 1394 break;
1384 } 1395 }
1385 1396
… …
1488 { 1499 {
1489 seen_resize = 1; 1500 seen_resize = 1;
1490 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1501 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1491 } 1502 }
1492 1503
1504 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1505
1493#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1506#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1494 if (OPTION (Opt_transparent)) 1507 if (OPTION (Opt_transparent))
1495 check_our_parents (); 1508 check_our_parents ();
1496#endif 1509#endif
1497 } 1510 }
… …
1515 1528
1516 case SelectionRequest: 1529 case SelectionRequest:
1517 selection_send (ev.xselectionrequest); 1530 selection_send (ev.xselectionrequest);
1518 break; 1531 break;
1519 1532
1533 case MapNotify:
1534 mapped = 1;
1535#ifdef TEXT_BLINK
1536 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1537#endif
1538 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1539 break;
1540
1520 case UnmapNotify: 1541 case UnmapNotify:
1521 mapped = 0; 1542 mapped = 0;
1522#ifdef TEXT_BLINK 1543#ifdef TEXT_BLINK
1523 text_blink_ev.stop (); 1544 text_blink_ev.stop ();
1524#endif 1545#endif
1525 break; 1546 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1526
1527 case MapNotify:
1528 mapped = 1;
1529#ifdef TEXT_BLINK
1530 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1531#endif
1532 break; 1547 break;
1533 1548
1534#ifdef TRANSPARENT 1549#ifdef TRANSPARENT
1535 case ReparentNotify: 1550 case ReparentNotify:
1536 rootwin_cb (ev); 1551 rootwin_cb (ev);
… …
1550 1565
1551 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1566 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1552 scr_expose (ev.xexpose.x, ev.xexpose.y, 1567 scr_expose (ev.xexpose.x, ev.xexpose.y,
1553 ev.xexpose.width, ev.xexpose.height, False); 1568 ev.xexpose.width, ev.xexpose.height, False);
1554 1569
1555 scr_refresh (refresh_type); 1570 want_refresh = 1;
1556 } 1571 }
1557 else 1572 else
1558 { 1573 {
1559 XEvent unused_event; 1574 XEvent unused_event;
1560 1575
… …
1566 if (isScrollbarWindow (ev.xany.window)) 1581 if (isScrollbarWindow (ev.xany.window))
1567 { 1582 {
1568 scrollBar.setIdle (); 1583 scrollBar.setIdle ();
1569 scrollbar_show (0); 1584 scrollbar_show (0);
1570 } 1585 }
1571#ifdef MENUBAR
1572 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1573 menubar_expose ();
1574#endif
1575 1586
1576#ifdef TRANSPARENT 1587#ifdef TRANSPARENT
1577 if (am_transparent && ev.xany.window == parent[0]) 1588 if (am_transparent && ev.xany.window == parent[0])
1578 XClearWindow (disp, ev.xany.window); 1589 XClearWindow (disp, ev.xany.window);
1579#endif 1590#endif
… …
1583 case MotionNotify: 1594 case MotionNotify:
1584#ifdef POINTER_BLANK 1595#ifdef POINTER_BLANK
1585 if (hidden_pointer) 1596 if (hidden_pointer)
1586 pointer_unblank (); 1597 pointer_unblank ();
1587#endif 1598#endif
1588#if MENUBAR
1589 if (isMenuBarWindow (ev.xany.window))
1590 {
1591 menubar_control (ev.xbutton);
1592 break;
1593 }
1594#endif
1595 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1599 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1596 break; 1600 break;
1597 1601
1598 if (ev.xany.window == vt) 1602 if (ev.xany.window == vt)
1599 { 1603 {
1604 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1605 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1606 ; // nop
1600 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1607 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1601 { 1608 {
1602 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1609 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1603 ; 1610 ;
1604 1611
1605 XQueryPointer (disp, vt, 1612 XQueryPointer (disp, vt,
… …
1685 &unused_root_x, &unused_root_y, 1692 &unused_root_x, &unused_root_y,
1686 &ev.xbutton.x, &ev.xbutton.y, 1693 &ev.xbutton.x, &ev.xbutton.y,
1687 &unused_mask); 1694 &unused_mask);
1688 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1695 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1689 scrollbar_size ()); 1696 scrollbar_size ());
1690 scr_refresh (refresh_type); 1697 want_refresh = 1;
1691 refresh_limit = 0; 1698 refresh_limit = 0;
1692 scrollbar_show (1); 1699 scrollbar_show (1);
1693 } 1700 }
1694 break; 1701 break;
1695 } 1702 }
1703
1704skip_switch: ;
1705
1706#if defined(CURSOR_BLINK)
1707 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1708 {
1709 if (hidden_cursor)
1710 {
1711 hidden_cursor = 0;
1712 want_refresh = 1;
1713 }
1714
1715 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1716 }
1717#endif
1718
1719#if defined(POINTER_BLANK)
1720 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1721 {
1722 if (ev.type == MotionNotify
1723 || ev.type == ButtonPress
1724 || ev.type == ButtonRelease)
1725 if (hidden_pointer)
1726 pointer_unblank ();
1727
1728 if (ev.type == KeyPress && hidden_pointer == 0)
1729 pointer_blank ();
1730 }
1731#endif
1696} 1732}
1697 1733
1698void 1734void
1699rxvt_term::focus_in () 1735rxvt_term::focus_in ()
1700{ 1736{
1701 if (!focus) 1737 if (!focus)
1702 { 1738 {
1703 focus = 1; 1739 focus = 1;
1704 want_refresh = 1; 1740 want_refresh = 1;
1705 1741
1706 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1742 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1707 1743
1708#if USE_XIM 1744#if USE_XIM
1709 if (Input_Context != NULL) 1745 if (Input_Context != NULL)
1710 { 1746 {
1711 IMSetStatusPosition (); 1747 IMSetStatusPosition ();
1712 XSetICFocus (Input_Context); 1748 XSetICFocus (Input_Context);
1713 } 1749 }
1714#endif 1750#endif
1715#if CURSOR_BLINK 1751#if CURSOR_BLINK
1716 if (OPTION (Opt_cursorBlink)) 1752 if (OPTION (Opt_cursorBlink))
1717 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1753 cursor_blink_ev.start (NOW + CURSOR_BLINK_INTERVAL);
1718#endif 1754#endif
1719#if OFF_FOCUS_FADING 1755#if OFF_FOCUS_FADING
1720 if (rs[Rs_fade]) 1756 if (rs[Rs_fade])
1721 { 1757 {
1722 pix_colors = pix_colors_focused; 1758 pix_colors = pix_colors_focused;
… …
1732 if (focus) 1768 if (focus)
1733 { 1769 {
1734 focus = 0; 1770 focus = 0;
1735 want_refresh = 1; 1771 want_refresh = 1;
1736 1772
1737 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1773 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1738 1774
1739#if ENABLE_FRILLS || ISO_14755 1775#if ENABLE_FRILLS || ISO_14755
1740 if (iso14755buf) 1776 if (iso14755buf)
1741 { 1777 {
1742 iso14755buf = 0; 1778 iso14755buf = 0;
… …
1766 1802
1767#if TRANSPARENT 1803#if TRANSPARENT
1768void 1804void
1769rxvt_term::rootwin_cb (XEvent &ev) 1805rxvt_term::rootwin_cb (XEvent &ev)
1770{ 1806{
1771 SET_R (this); 1807 make_current ();
1772 SET_LOCALE (locale);
1773 1808
1774 switch (ev.type) 1809 switch (ev.type)
1775 { 1810 {
1776 case PropertyNotify: 1811 case PropertyNotify:
1777 /* 1812 /*
… …
1825#ifdef MOUSE_REPORT_DOUBLECLICK 1860#ifdef MOUSE_REPORT_DOUBLECLICK
1826 if (ev.button == MEvent.button && clickintime) 1861 if (ev.button == MEvent.button && clickintime)
1827 { 1862 {
1828 /* same button, within alloted time */ 1863 /* same button, within alloted time */
1829 MEvent.clicks++; 1864 MEvent.clicks++;
1865
1830 if (MEvent.clicks > 1) 1866 if (MEvent.clicks > 1)
1831 { 1867 {
1832 /* only report double clicks */ 1868 /* only report double clicks */
1833 MEvent.clicks = 2; 1869 MEvent.clicks = 2;
1834 mouse_report (ev); 1870 mouse_report (ev);
… …
1854 else 1890 else
1855 { 1891 {
1856 if (ev.button != MEvent.button) 1892 if (ev.button != MEvent.button)
1857 MEvent.clicks = 0; 1893 MEvent.clicks = 0;
1858 1894
1859 if (!PERL_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END))) 1895 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1860 switch (ev.button) 1896 switch (ev.button)
1861 { 1897 {
1862 case Button1: 1898 case Button1:
1863 /* allow meta + click to select rectangular areas */ 1899 /* allow meta + click to select rectangular areas */
1864 /* should be done in screen.C */ 1900 /* should be done in screen.C */
… …
1867#else 1903#else
1868 selection.rect = false; 1904 selection.rect = false;
1869#endif 1905#endif
1870 1906
1871 /* allow shift+left click to extend selection */ 1907 /* allow shift+left click to extend selection */
1872 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1908 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1873 { 1909 {
1874 if (MEvent.button == Button1 && clickintime) 1910 if (MEvent.button == Button1 && clickintime)
1875 selection_rotate (ev.x, ev.y); 1911 selection_rotate (ev.x, ev.y);
1876 else 1912 else
1877 selection_extend (ev.x, ev.y, 1); 1913 selection_extend (ev.x, ev.y, 1);
… …
2042 } 2078 }
2043 2079
2044 break; 2080 break;
2045 } 2081 }
2046 } 2082 }
2083
2047 return; 2084 return;
2048 } 2085 }
2049#if MENUBAR
2050 /*
2051 * Menubar window processing of button press
2052 */
2053 if (isMenuBarWindow (ev.window))
2054 menubar_control (ev);
2055#endif
2056} 2086}
2057 2087
2058void 2088void
2059rxvt_term::button_release (XButtonEvent &ev) 2089rxvt_term::button_release (XButtonEvent &ev)
2060{ 2090{
… …
2066 2096
2067 if (scrollbar_isUpDn ()) 2097 if (scrollbar_isUpDn ())
2068 { 2098 {
2069 scrollBar.setIdle (); 2099 scrollBar.setIdle ();
2070 scrollbar_show (0); 2100 scrollbar_show (0);
2071#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2072 refresh_type &= ~SMOOTH_REFRESH;
2073#endif
2074 } 2101 }
2075 2102
2076#ifdef SELECTION_SCROLLING 2103#ifdef SELECTION_SCROLLING
2077 if (sel_scroll_ev.active) 2104 if (sel_scroll_ev.active)
2078 sel_scroll_ev.stop(); 2105 sel_scroll_ev.stop();
… …
2116 if (priv_modes & PrivMode_mouse_report 2143 if (priv_modes & PrivMode_mouse_report
2117 && bypass_keystate 2144 && bypass_keystate
2118 && ev.button == Button1 && MEvent.clicks <= 1) 2145 && ev.button == Button1 && MEvent.clicks <= 1)
2119 selection_extend (ev.x, ev.y, 0); 2146 selection_extend (ev.x, ev.y, 0);
2120 2147
2148 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2149 return;
2150
2121 switch (ev.button) 2151 switch (ev.button)
2122 { 2152 {
2123 case Button1: 2153 case Button1:
2124 case Button3: 2154 case Button3:
2125 selection_make (ev.time); 2155 selection_make (ev.time);
2126 break; 2156 break;
2157
2127 case Button2: 2158 case Button2:
2128 selection_request (ev.time, ev.x, ev.y); 2159 if (IN_RANGE_EXC (ev.x, 0, width) && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2160 selection_request (ev.time, ev.state & ShiftMask ? Sel_Clipboard : Sel_Primary);
2129 break; 2161 break;
2162
2130#ifdef MOUSE_WHEEL 2163#ifdef MOUSE_WHEEL
2131 case Button4: 2164 case Button4:
2132 case Button5: 2165 case Button5:
2133 { 2166 {
2134 int i; 2167 int i;
… …
2156 slip_wheel_ev.start (); 2189 slip_wheel_ev.start ();
2157 } 2190 }
2158 else 2191 else
2159 { 2192 {
2160# endif 2193# endif
2161# ifdef JUMP_MOUSE_WHEEL
2162 scr_page (v, i); 2194 scr_page (v, i);
2163 scr_refresh (SMOOTH_REFRESH);
2164 scrollbar_show (1); 2195 scrollbar_show (1);
2165# else
2166 while (i--)
2167 {
2168 scr_page (v, 1);
2169 scr_refresh (SMOOTH_REFRESH);
2170 scrollbar_show (1);
2171 }
2172# endif
2173# ifdef MOUSE_SLIP_WHEELING 2196# ifdef MOUSE_SLIP_WHEELING
2174 } 2197 }
2175#endif 2198# endif
2176 } 2199 }
2177 break; 2200 break;
2178#endif 2201#endif
2179 } 2202 }
2180 } 2203 }
2181#ifdef MENUBAR
2182 else if (isMenuBarWindow (ev.window))
2183 menubar_control (ev);
2184#endif
2185} 2204}
2186 2205
2187#ifdef TRANSPARENT 2206#ifdef TRANSPARENT
2188#if TINTING 2207#if TINTING
2189/* taken from aterm-0.4.2 */ 2208/* taken from aterm-0.4.2 */
… …
2669 2688
2670bool 2689bool
2671rxvt_term::cmd_parse () 2690rxvt_term::cmd_parse ()
2672{ 2691{
2673 bool flag = false; 2692 bool flag = false;
2674 unicode_t ch = NOCHAR; 2693 wchar_t ch = NOCHAR;
2675 unsigned char *seq_begin; // remember start of esc-sequence here 2694 char *seq_begin; // remember start of esc-sequence here
2676 2695
2677 for (;;) 2696 for (;;)
2678 { 2697 {
2679 if (ch == NOCHAR) 2698 if (ch == NOCHAR)
2680 { 2699 {
2681 seq_begin = cmdbuf_ptr; 2700 seq_begin = cmdbuf_ptr;
2682 ch = next_char (); 2701 ch = next_char ();
2683 }
2684 2702
2685 if (ch == NOCHAR) // TODO: improve 2703 if (ch == NOCHAR)
2686 break; 2704 break;
2705 }
2687 2706
2688 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2707 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2689 { 2708 {
2690 if (!seen_input) 2709 if (!seen_input)
2691 { 2710 {
… …
2700 if (seen_resize && cmd_pid) 2719 if (seen_resize && cmd_pid)
2701 kill (-cmd_pid, SIGWINCH); 2720 kill (-cmd_pid, SIGWINCH);
2702 } 2721 }
2703 2722
2704 /* Read a text string from the input buffer */ 2723 /* Read a text string from the input buffer */
2705 unicode_t buf[UBUFSIZ]; 2724 wchar_t buf[UBUFSIZ];
2706 bool refreshnow = false; 2725 bool refreshnow = false;
2707 int nlines = 0; 2726 int nlines = 0;
2708 unicode_t *str = buf; 2727 wchar_t *str = buf;
2709 unicode_t *eol = str + min (ncol, UBUFSIZ); 2728 wchar_t *eol = str + min (ncol, UBUFSIZ);
2710 2729
2711 for (;;) 2730 for (;;)
2712 { 2731 {
2713 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2732 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2714 break; 2733 break;
… …
2732 } 2751 }
2733 2752
2734 // scr_add_lines only works for nlines <= nrow - 1. 2753 // scr_add_lines only works for nlines <= nrow - 1.
2735 if (nlines >= nrow - 1) 2754 if (nlines >= nrow - 1)
2736 { 2755 {
2756 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2757 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2737 scr_add_lines (buf, nlines, str - buf); 2758 scr_add_lines (buf, str - buf, nlines);
2759
2738 nlines = 0; 2760 nlines = 0;
2739 str = buf; 2761 str = buf;
2740 eol = str + min (ncol, UBUFSIZ); 2762 eol = str + min (ncol, UBUFSIZ);
2741 } 2763 }
2742 2764
… …
2755 2777
2756 seq_begin = cmdbuf_ptr; 2778 seq_begin = cmdbuf_ptr;
2757 ch = next_char (); 2779 ch = next_char ();
2758 } 2780 }
2759 2781
2782 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2783 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2760 scr_add_lines (buf, nlines, str - buf); 2784 scr_add_lines (buf, str - buf, nlines);
2761 2785
2762 /* 2786 /*
2763 * If there have been a lot of new lines, then update the screen 2787 * If there have been a lot of new lines, then update the screen
2764 * What the heck I'll cheat and only refresh less than every page-full. 2788 * What the heck I'll cheat and only refresh less than every page-full.
2765 * the number of pages between refreshes is refresh_limit, which 2789 * the number of pages between refreshes is refresh_limit, which
… …
2770 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2794 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2771 refresh_limit++; 2795 refresh_limit++;
2772 else 2796 else
2773 { 2797 {
2774 flag = true; 2798 flag = true;
2775 scr_refresh (refresh_type); 2799 scr_refresh ();
2776 flush_ev.stop (); 2800 want_refresh = 1;
2777 } 2801 }
2778 } 2802 }
2779 2803
2780 } 2804 }
2781 else 2805 else
… …
2796 } 2820 }
2797 2821
2798 return flag; 2822 return flag;
2799} 2823}
2800 2824
2801// read the next octet
2802unicode_t
2803rxvt_term::next_octet ()
2804{
2805 return cmdbuf_ptr < cmdbuf_endp
2806 ? *cmdbuf_ptr++
2807 : NOCHAR;
2808}
2809
2810// read the next character 2825// read the next character
2811unicode_t 2826wchar_t
2812rxvt_term::next_char () 2827rxvt_term::next_char () NOTHROW
2813{ 2828{
2814 while (cmdbuf_ptr < cmdbuf_endp) 2829 while (cmdbuf_ptr < cmdbuf_endp)
2815 { 2830 {
2816 // assume 7-bit to be ascii ALWAYS 2831 // assume 7-bit to be ascii ALWAYS
2817 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2832 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2818 return *cmdbuf_ptr++; 2833 return *cmdbuf_ptr++;
2819 2834
2820 wchar_t wc; 2835 wchar_t wc;
2821 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2836 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2822 2837
2823 if (len == (size_t)-2) 2838 if (len == (size_t)-2)
2824 { 2839 {
2825 // the mbstate stores incomplete sequences. didn't know this :/ 2840 // the mbstate stores incomplete sequences. didn't know this :/
2826 cmdbuf_ptr = cmdbuf_endp; 2841 cmdbuf_ptr = cmdbuf_endp;
2827 break; 2842 break;
2828 } 2843 }
2829 2844
2830 if (len == (size_t)-1) 2845 if (len == (size_t)-1)
2831 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2846 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2832 2847
2833 // assume wchar == unicode 2848 // assume wchar == unicode
2834 cmdbuf_ptr += len; 2849 cmdbuf_ptr += len;
2835 return wc & UNICODE_MASK; 2850 return wc & UNICODE_MASK;
2836 } 2851 }
2837 2852
2838 return NOCHAR; 2853 return NOCHAR;
2839} 2854}
2855
2856// read the next octet
2857uint32_t
2858rxvt_term::next_octet () NOTHROW
2859{
2860 return cmdbuf_ptr < cmdbuf_endp
2861 ? (unsigned char)*cmdbuf_ptr++
2862 : NOCHAR;
2863}
2864
2865static class out_of_input out_of_input;
2840 2866
2841/* rxvt_cmd_getc () - Return next input character */ 2867/* rxvt_cmd_getc () - Return next input character */
2842/* 2868/*
2843 * Return the next input character after first passing any keyboard input 2869 * Return the next input character after first passing any keyboard input
2844 * to the command. 2870 * to the command.
2845 */ 2871 */
2846unicode_t 2872wchar_t
2847rxvt_term::cmd_getc () 2873rxvt_term::cmd_getc () THROW ((class out_of_input))
2848{ 2874{
2849 unicode_t c = next_char (); 2875 wchar_t c = next_char ();
2850 2876
2851 if (c == NOCHAR) 2877 if (c == NOCHAR)
2852 throw out_of_input; 2878 throw out_of_input;
2853 2879
2854 return c; 2880 return c;
2855} 2881}
2856 2882
2857unicode_t 2883uint32_t
2858rxvt_term::cmd_get8 () 2884rxvt_term::cmd_get8 () THROW ((class out_of_input))
2859{ 2885{
2860 unicode_t c = next_octet (); 2886 uint32_t c = next_octet ();
2861 2887
2862 if (c == NOCHAR) 2888 if (c == NOCHAR)
2863 throw out_of_input; 2889 throw out_of_input;
2864 2890
2865 return c; 2891 return c;
… …
2965 case C0_ESC: 2991 case C0_ESC:
2966 process_escape_seq (); 2992 process_escape_seq ();
2967 break; 2993 break;
2968 case C0_ENQ: /* terminal Status */ 2994 case C0_ENQ: /* terminal Status */
2969 if (rs[Rs_answerbackstring]) 2995 if (rs[Rs_answerbackstring])
2970 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2996 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2971 (unsigned int)strlen (rs[Rs_answerbackstring]));
2972 else 2997 else
2973 tt_write ((unsigned char *)VT100_ANS, 2998 tt_write (VT100_ANS, strlen (VT100_ANS));
2974 (unsigned int)strlen (VT100_ANS));
2975 break; 2999 break;
2976 case C0_BEL: /* bell */ 3000 case C0_BEL: /* bell */
2977 scr_bell (); 3001 scr_bell ();
2978 break; 3002 break;
2979 case C0_BS: /* backspace */ 3003 case C0_BS: /* backspace */
… …
3134 break; 3158 break;
3135 3159
3136 /* 8.3.87: NEXT LINE */ 3160 /* 8.3.87: NEXT LINE */
3137 case C1_NEL: /* ESC E */ 3161 case C1_NEL: /* ESC E */
3138 { 3162 {
3139 unicode_t nlcr[] = { C0_LF, C0_CR }; 3163 wchar_t nlcr[] = { C0_LF, C0_CR };
3140 scr_add_lines (nlcr, 1, 2); 3164 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3141 } 3165 }
3142 break; 3166 break;
3143 3167
3144 /* kidnapped escape sequence: Should be 8.3.48 */ 3168 /* kidnapped escape sequence: Should be 8.3.48 */
3145 case C1_ESA: /* ESC G */ 3169 case C1_ESA: /* ESC G */
… …
3167 process_dcs_seq (); 3191 process_dcs_seq ();
3168 break; 3192 break;
3169 3193
3170 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3194 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3171 case C1_SCI: /* ESC Z */ 3195 case C1_SCI: /* ESC Z */
3172 tt_write ((const unsigned char *)ESCZ_ANSWER, 3196 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3173 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3174 break; /* steal obsolete ESC [ c */ 3197 break; /* steal obsolete ESC [ c */
3175 3198
3176 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3199 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3177 case C1_CSI: /* ESC [ */ 3200 case C1_CSI: /* ESC [ */
3178 process_csi_seq (); 3201 process_csi_seq ();
… …
3422 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3445 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3423 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3446 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3424 break; 3447 break;
3425 3448
3426 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3449 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3427 tt_write ((const unsigned char *)VT100_ANS, 3450 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3428 (unsigned int) (sizeof (VT100_ANS) - 1));
3429 break; 3451 break;
3430 3452
3431 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3453 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3432 process_sgr_mode (nargs, arg); 3454 process_sgr_mode (nargs, arg);
3433 break; 3455 break;
… …
3635/*----------------------------------------------------------------------*/ 3657/*----------------------------------------------------------------------*/
3636/* 3658/*
3637 * get input up until STRING TERMINATOR (or BEL) 3659 * get input up until STRING TERMINATOR (or BEL)
3638 * ends_how is terminator used. returned input must be free()'d 3660 * ends_how is terminator used. returned input must be free()'d
3639 */ 3661 */
3640unsigned char * 3662char *
3641rxvt_term::get_to_st (unicode_t &ends_how) 3663rxvt_term::get_to_st (unicode_t &ends_how)
3642{ 3664{
3643 unicode_t ch; 3665 unicode_t ch;
3644 bool seen_esc = false; 3666 bool seen_esc = false;
3645 unsigned int n = 0; 3667 unsigned int n = 0;
… …
3678 3700
3679 string[n++] = '\0'; 3701 string[n++] = '\0';
3680 3702
3681 ends_how = (ch == 0x5c ? C0_ESC : ch); 3703 ends_how = (ch == 0x5c ? C0_ESC : ch);
3682 3704
3683 return (unsigned char *)rxvt_wcstombs (string); 3705 return rxvt_wcstombs (string);
3684} 3706}
3685 3707
3686/*----------------------------------------------------------------------*/ 3708/*----------------------------------------------------------------------*/
3687/* 3709/*
3688 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3710 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3689 */ 3711 */
3690void 3712void
3691rxvt_term::process_dcs_seq () 3713rxvt_term::process_dcs_seq ()
3692{ 3714{
3693 unsigned char *s; 3715 char *s;
3694 unicode_t eh; 3716 unicode_t eh;
3695 3717
3696 /* 3718 /*
3697 * Not handled yet 3719 * Not handled yet
3698 */ 3720 */
… …
3717 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3739 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3718 arg = arg * 10 + (ch - '0'); 3740 arg = arg * 10 + (ch - '0');
3719 3741
3720 if (ch == ';') 3742 if (ch == ';')
3721 { 3743 {
3722 unsigned char *s = get_to_st (eh); 3744 char *s = get_to_st (eh);
3723 3745
3724 if (s) 3746 if (s)
3725 { 3747 {
3726 process_xterm_seq (arg, (char *)s, eh); 3748 process_xterm_seq (arg, s, eh);
3727 free (s); 3749 free (s);
3728 } 3750 }
3729 } 3751 }
3730} 3752}
3731 3753
3732void 3754void
3733rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3755rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3734{ 3756{
3735 if (str[0] == '?' && !str[1]) 3757 if (str[0] == '?' && !str[1])
3736 { 3758 {
3737 unsigned short r, g, b; 3759 unsigned short r, g, b;
3738 pix_colors_focused[color].get (display, r, g, b); 3760 pix_colors_focused[color].get (display, r, g, b);
… …
3744 3766
3745/* 3767/*
3746 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3768 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3747 */ 3769 */
3748void 3770void
3749rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3771rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3750{ 3772{
3751 int changed = 0;
3752 int color; 3773 int color;
3753 char *buf, *name; 3774 char *buf, *name;
3754 bool query = str[0] == '?' && !str[1]; 3775 bool query = str[0] == '?' && !str[1];
3755 int saveop = op; 3776 int saveop = op;
3756 dDisp; 3777 dDisp;
… …
3811 { 3832 {
3812 if ((name = strchr (buf, ';')) == NULL) 3833 if ((name = strchr (buf, ';')) == NULL)
3813 break; 3834 break;
3814 3835
3815 *name++ = '\0'; 3836 *name++ = '\0';
3816 color = atoi (buf); 3837 color = atoi (buf) + minCOLOR;
3817 3838
3818 if (color < 0 || color >= TOTAL_COLORS) 3839 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3819 break; 3840 break;
3820 3841
3821 if ((buf = strchr (name, ';')) != NULL) 3842 if ((buf = strchr (name, ';')) != NULL)
3822 *buf++ = '\0'; 3843 *buf++ = '\0';
3823 3844
3824 if (name[0] == '?' && !name[1]) 3845 if (name[0] == '?' && !name[1])
3825 { 3846 {
3826 unsigned short r, g, b; 3847 unsigned short r, g, b;
3827 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3848 pix_colors_focused[color].get (display, r, g, b);
3828 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3849 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3829 } 3850 }
3830 else 3851 else
3831 set_window_color (color + minCOLOR, name); 3852 set_window_color (color, name);
3832 } 3853 }
3833 break; 3854 break;
3834 case XTerm_Color00: 3855 case XTerm_Color00:
3835 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3856 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3836 break; 3857 break;
3837 case XTerm_Color01: 3858 case XTerm_Color01:
3838 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3859 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3839 break; 3860 break;
3840#ifndef NO_CURSORCOLOR 3861#ifndef NO_CURSORCOLOR
3841 case XTerm_Color_cursor: 3862 case XTerm_Color_cursor:
3842 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3863 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3843 break; 3864 break;
… …
3847 break; 3868 break;
3848 case XTerm_Color_pointer_bg: 3869 case XTerm_Color_pointer_bg:
3849 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3870 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3850 break; 3871 break;
3851#ifndef NO_BOLD_UNDERLINE_REVERSE 3872#ifndef NO_BOLD_UNDERLINE_REVERSE
3852 case XTerm_Color_BD:
3853 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3854 break;
3855 case XTerm_Color_UL:
3856 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3857 break;
3858 case XTerm_Color_RV: 3873 case XTerm_Color_RV:
3859 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3874 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3875 break;
3876 case Rxvt_Color_BD:
3877 case URxvt_Color_BD:
3878 process_color_seq (op, Color_BD, str, resp);
3879 break;
3880 case Rxvt_Color_UL:
3881 case URxvt_Color_UL:
3882 process_color_seq (op, Color_UL, str, resp);
3860 break; 3883 break;
3861 case URxvt_Color_IT: 3884 case URxvt_Color_IT:
3862 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3885 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3863 break; 3886 break;
3864#endif 3887#endif
… …
3869 if (am_transparent) 3892 if (am_transparent)
3870 want_full_refresh = want_refresh = 1; 3893 want_full_refresh = want_refresh = 1;
3871 break; 3894 break;
3872#endif 3895#endif
3873 3896
3874 case XTerm_Pixmap: 3897 case Rxvt_Pixmap:
3898 {
3875 if (*str != ';') 3899 if (*str != ';')
3876 { 3900 {
3877#if XPM_BACKGROUND 3901#if XPM_BACKGROUND
3878 scale_pixmap (""); /* reset to default scaling */ 3902 scale_pixmap (""); /* reset to default scaling */
3879 set_bgPixmap (str); /* change pixmap */ 3903 set_bgPixmap (str); /* change pixmap */
3880#endif
3881 scr_touch (true); 3904 scr_touch (true);
3905#endif
3882 } 3906 }
3907
3908 int changed = 0;
3909
3883 while ((str = strchr (str, ';')) != NULL) 3910 while ((str = strchr (str, ';')) != NULL)
3884 { 3911 {
3885 str++; 3912 str++;
3886#if XPM_BACKGROUND 3913#if XPM_BACKGROUND
3887 changed += scale_pixmap (str); 3914 changed += scale_pixmap (str);
3888#endif 3915#endif
3889 } 3916 }
3890 3917
3891 if (changed) 3918 if (changed)
3892 { 3919 {
3893#ifdef XPM_BACKGROUND 3920#ifdef XPM_BACKGROUND
3894 resize_pixmap (); 3921 resize_pixmap ();
3895#endif
3896 scr_touch (true); 3922 scr_touch (true);
3923#endif
3897 } 3924 }
3925 }
3898 break; 3926 break;
3899 3927
3900 case XTerm_restoreFG: 3928 case Rxvt_restoreFG:
3901 set_window_color (Color_fg, str); 3929 set_window_color (Color_fg, str);
3902 break; 3930 break;
3903 case XTerm_restoreBG: 3931 case Rxvt_restoreBG:
3904 set_window_color (Color_bg, str); 3932 set_window_color (Color_bg, str);
3905 break; 3933 break;
3906 3934
3907 case XTerm_logfile: 3935 case XTerm_logfile:
3908 // TODO, when secure mode? 3936 // TODO, when secure mode?
3909 break; 3937 break;
3910 3938
3911#ifdef MENUBAR
3912 case URxvt_Menu:
3913 if (OPTION (Opt_insecure))
3914 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3915 break;
3916#endif
3917#if 0 3939#if 0
3918 case XTerm_dumpscreen: /* no error notices */ 3940 case Rxvt_dumpscreen: /* no error notices */
3919 { 3941 {
3920 int fd; 3942 int fd;
3921 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3943 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3922 { 3944 {
3923 scr_dump (fd); 3945 scr_dump (fd);
… …
3954 if (query) 3976 if (query)
3955 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3977 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3956 else 3978 else
3957 { 3979 {
3958 set_locale (str); 3980 set_locale (str);
3959 pty.set_utf8_mode (enc_utf8); 3981 pty->set_utf8_mode (enc_utf8);
3960 init_xlocale (); 3982 init_xlocale ();
3961 } 3983 }
3962 break; 3984 break;
3963 3985
3964 case URxvt_view_up: 3986 case URxvt_view_up:
3965 case URxvt_view_down: 3987 case URxvt_view_down:
3988 {
3966 int lines = atoi (str); 3989 int lines = atoi (str);
3967 3990
3968 if (lines) 3991 if (lines)
3969 scr_page (op == URxvt_view_up ? UP : DN, lines); 3992 scr_page (op == URxvt_view_up ? UP : DN, lines);
3970 else 3993 else
3971 {
3972 scr_erase_savelines (); 3994 scr_erase_savelines ();
3973 } 3995 }
3974 3996
3997 break;
3998#endif
3999
4000#if ENABLE_PERL
4001 case URxvt_perl:
4002 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
4003 ; // no responses yet
3975 break; 4004 break;
3976#endif 4005#endif
3977 } 4006 }
3978} 4007}
3979/*----------------------------------------------------------------------*/ 4008/*----------------------------------------------------------------------*/
… …
4010 return state; 4039 return state;
4011} 4040}
4012 4041
4013/* we're not using priv _yet_ */ 4042/* we're not using priv _yet_ */
4014void 4043void
4015rxvt_term::process_terminal_mode (int mode, int priv __attribute__ ((unused)), unsigned int nargs, const int *arg) 4044rxvt_term::process_terminal_mode (int mode, int priv UNUSED, unsigned int nargs, const int *arg)
4016{ 4045{
4017 unsigned int i, j; 4046 unsigned int i, j;
4018 int state; 4047 int state;
4019 4048
4020 static const struct 4049 static const struct
… …
4031 { 5, PrivMode_rVideo }, 4060 { 5, PrivMode_rVideo },
4032 { 6, PrivMode_relOrigin }, 4061 { 6, PrivMode_relOrigin },
4033 { 7, PrivMode_Autowrap }, 4062 { 7, PrivMode_Autowrap },
4034 // 8, bi-directional support mode 4063 // 8, bi-directional support mode
4035 { 9, PrivMode_MouseX10 }, 4064 { 9, PrivMode_MouseX10 },
4036#ifdef menuBar_esc
4037 { menuBar_esc, PrivMode_menuBar },
4038#endif
4039 // 18, 19 printing-related 4065 // 18, 19 printing-related
4040 { 25, PrivMode_VisibleCursor }, 4066 { 25, PrivMode_VisibleCursor },
4041#ifdef scrollBar_esc 4067#ifdef scrollBar_esc
4042 { scrollBar_esc, PrivMode_scrollBar }, 4068 { scrollBar_esc, PrivMode_scrollBar },
4043#endif 4069#endif
… …
4090 /* extra handling for values with state unkept */ 4116 /* extra handling for values with state unkept */
4091 switch (arg[i]) 4117 switch (arg[i])
4092 { 4118 {
4093#if ENABLE_STYLES 4119#if ENABLE_STYLES
4094 case 1021: 4120 case 1021:
4095 if (mode) 4121 set_option (Opt_intensityStyles, mode);
4096 SET_OPTION (Opt_intensityStyles);
4097 else
4098 CLR_OPTION (Opt_intensityStyles);
4099 4122
4100 scr_touch (true); 4123 scr_touch (true);
4101 break; 4124 break;
4102#endif 4125#endif
4103 case 1048: /* alternative cursor save */ 4126 case 1048: /* alternative cursor save */
… …
4125 case 3: /* 80/132 */ 4148 case 3: /* 80/132 */
4126 if (priv_modes & PrivMode_132OK) 4149 if (priv_modes & PrivMode_132OK)
4127 set_widthheight (((state ? 132 : 80) * fwidth), height); 4150 set_widthheight (((state ? 132 : 80) * fwidth), height);
4128 break; 4151 break;
4129 case 4: /* smooth scrolling */ 4152 case 4: /* smooth scrolling */
4130 if (!state) 4153 set_option (Opt_jumpScroll, !state);
4131 SET_OPTION (Opt_jumpScroll);
4132 else
4133 CLR_OPTION (Opt_jumpScroll);
4134 break; 4154 break;
4135 case 5: /* reverse video */ 4155 case 5: /* reverse video */
4136 scr_rvideo_mode (state); 4156 scr_rvideo_mode (state);
4137 break; 4157 break;
4138 case 6: /* relative/absolute origins */ 4158 case 6: /* relative/absolute origins */
… …
4144 /* case 8: - auto repeat, can't do on a per window basis */ 4164 /* case 8: - auto repeat, can't do on a per window basis */
4145 case 9: /* X10 mouse reporting */ 4165 case 9: /* X10 mouse reporting */
4146 if (state) /* orthogonal */ 4166 if (state) /* orthogonal */
4147 priv_modes &= ~PrivMode_MouseX11; 4167 priv_modes &= ~PrivMode_MouseX11;
4148 break; 4168 break;
4149#ifdef menuBar_esc
4150 case menuBar_esc:
4151#ifdef MENUBAR
4152 map_menuBar (state);
4153#endif
4154 break;
4155#endif
4156#ifdef scrollBar_esc 4169#ifdef scrollBar_esc
4157 case scrollBar_esc: 4170 case scrollBar_esc:
4158 if (scrollbar_mapping (state)) 4171 if (scrollbar_mapping (state))
4159 { 4172 {
4160 resize_all_windows (0, 0, 0); 4173 resize_all_windows (0, 0, 0);
… …
4179#if 0 4192#if 0
4180 case 1001: 4193 case 1001:
4181 break; /* X11 mouse highlighting */ 4194 break; /* X11 mouse highlighting */
4182#endif 4195#endif
4183 case 1010: /* scroll to bottom on TTY output inhibit */ 4196 case 1010: /* scroll to bottom on TTY output inhibit */
4184 if (!state) 4197 set_option (Opt_scrollTtyOutput, !state);
4185 SET_OPTION (Opt_scrollTtyOutput);
4186 else
4187 CLR_OPTION (Opt_scrollTtyOutput);
4188 break; 4198 break;
4189 case 1011: /* scroll to bottom on key press */ 4199 case 1011: /* scroll to bottom on key press */
4190 if (state) 4200 set_option (Opt_scrollTtyKeypress, state);
4191 SET_OPTION (Opt_scrollTtyKeypress);
4192 else
4193 CLR_OPTION (Opt_scrollTtyKeypress);
4194 break; 4201 break;
4195 case 1047: /* secondary screen w/ clearing last */ 4202 case 1047: /* secondary screen w/ clearing last */
4196 if (OPTION (Opt_secondaryScreen)) 4203 if (OPTION (Opt_secondaryScreen))
4197 if (current_screen != PRIMARY) 4204 if (current_screen != PRIMARY)
4198 scr_erase_screen (2); 4205 scr_erase_screen (2);
… …
4336 scr_color (Color_bg, Color_bg); 4343 scr_color (Color_bg, Color_bg);
4337 break; 4344 break;
4338 4345
4339 //case 50: // not variable spacing 4346 //case 50: // not variable spacing
4340 4347
4341#ifndef NO_BRIGHTCOLOR 4348#if ENABLE_FRILLS
4342 case 90: 4349 case 90:
4343 case 91: /* set bright fg color */ 4350 case 91: /* set bright fg color */
4344 case 92: 4351 case 92:
4345 case 93: 4352 case 93:
4346 case 94: 4353 case 94:
… …
4391 */ 4398 */
4392void 4399void
4393rxvt_term::tt_printf (const char *fmt,...) 4400rxvt_term::tt_printf (const char *fmt,...)
4394{ 4401{
4395 va_list arg_ptr; 4402 va_list arg_ptr;
4396 unsigned char buf[256]; 4403 char buf[256];
4397 4404
4398 va_start (arg_ptr, fmt); 4405 va_start (arg_ptr, fmt);
4399 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4406 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4400 va_end (arg_ptr); 4407 va_end (arg_ptr);
4401 tt_write (buf, strlen (buf)); 4408 tt_write (buf, strlen (buf));
… …
4406 * or generated by us in response to a query ESC sequence. 4413 * or generated by us in response to a query ESC sequence.
4407 */ 4414 */
4408const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4415const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4409 4416
4410void 4417void
4411rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4418rxvt_term::tt_write (const char *data, unsigned int len)
4412{ 4419{
4420 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4421 return;
4422
4423 if (pty->pty < 0)
4424 return;
4425
4413 if (v_buflen == 0) 4426 if (v_buflen == 0)
4414 { 4427 {
4415 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4428 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4416 4429
4417 if ((unsigned int)written == len) 4430 if ((unsigned int)written == len)
4418 return; 4431 return;
4419 4432
4420 data += written; 4433 data += written;
4421 len -= written; 4434 len -= written;
4422 } 4435 }
4423 4436
4424 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4437 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4425 4438
4426 memcpy (v_buffer + v_buflen, data, len); 4439 memcpy (v_buffer + v_buflen, data, len);
4427 v_buflen += len; 4440 v_buflen += len;
4428 4441
4429 pty_ev.set (EVENT_READ | EVENT_WRITE); 4442 pty_ev.set (EVENT_READ | EVENT_WRITE);
4430} 4443}
4431 4444
4432void rxvt_term::pty_write () 4445void rxvt_term::pty_write ()
4433{ 4446{
4434 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4447 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4435 4448
4436 if (written > 0) 4449 if (written > 0)
4437 { 4450 {
4438 v_buflen -= written; 4451 v_buflen -= written;
4439 4452

Diff Legend

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