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

Diff Legend

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