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.227 by root, Mon Jan 2 15:35:43 2006 UTC vs.
Revision 1.273 by ayin, Thu Jan 19 23:13:19 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
… …
146 || !IN_RANGE_EXC (y, 0, nrow)) 147 || !IN_RANGE_EXC (y, 0, nrow))
147 return; 148 return;
148 149
149 for (;;) 150 for (;;)
150 { 151 {
151 const line_t &l = ROW(y - view_start); 152 const line_t &l = ROW(y + view_start);
152 153
153 text_t t = l.t[x]; 154 text_t t = l.t[x];
154 155
155 if (t != NOCHAR || !x) 156 if (t != NOCHAR || !x)
156 { 157 {
… …
267 mb[0] = ch[0]; 268 mb[0] = ch[0];
268 len = 1; 269 len = 1;
269 } 270 }
270 271
271 if (len > 0) 272 if (len > 0)
272 tt_write ((unsigned char *)mb, len); 273 tt_write (mb, len);
273 else 274 else
274 scr_bell (); 275 scr_bell ();
275 } 276 }
276 277
277 iso14755buf = 0; 278 iso14755buf = 0;
… …
305 KeySym keysym; 306 KeySym keysym;
306#ifdef DEBUG_CMD 307#ifdef DEBUG_CMD
307 static int debug_key = 1; /* accessible by a debugger only */ 308 static int debug_key = 1; /* accessible by a debugger only */
308#endif 309#endif
309 int valid_keysym; 310 int valid_keysym;
310 unsigned char kbuf[KBUFSZ]; 311 char kbuf[KBUFSZ];
311 312
312 /* 313 /*
313 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
314 * escape sequence to toggle the Keypad. 315 * escape sequence to toggle the Keypad.
315 * 316 *
… …
333 Status status_return; 334 Status status_return;
334 335
335#if 0 336#if 0
336#ifdef X_HAVE_UTF8_STRING 337#ifdef X_HAVE_UTF8_STRING
337 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 338 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
338 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 339 len = Xutf8LookupString (Input_Context, &ev, kbuf,
339 KBUFSZ, &keysym, &status_return); 340 KBUFSZ, &keysym, &status_return);
340 else 341 else
341#endif 342#endif
342#endif 343#endif
343 { 344 {
… …
380 || status_return == XLookupBoth; 381 || status_return == XLookupBoth;
381 } 382 }
382 else 383 else
383#endif 384#endif
384 { 385 {
385 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 386 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
386 valid_keysym = keysym != NoSymbol; 387 valid_keysym = keysym != NoSymbol;
387 } 388 }
388 389
389 if (valid_keysym) 390 if (valid_keysym)
390 { 391 {
… …
442 scr_move_to (0, 1); 443 scr_move_to (0, 1);
443 return; 444 return;
444 } 445 }
445 else if (keysym == XK_End) 446 else if (keysym == XK_End)
446 { 447 {
447 scr_move_to (1, 0); 448 scr_move_to (1, 1);
448 return; 449 return;
449 } 450 }
450 } 451 }
451#endif 452#endif
452 } 453 }
… …
463 { 464 {
464 switch (keysym) 465 switch (keysym)
465 { 466 {
466 /* normal XTerm key bindings */ 467 /* normal XTerm key bindings */
467 case XK_Insert: /* Shift+Insert = paste mouse selection */ 468 case XK_Insert: /* Shift+Insert = paste mouse selection */
468 selection_request (ev.time, 0, 0); 469 selection_request (ev.time, Sel_Primary);
469 return; 470 return;
470#if TODO 471#if TODO
471 /* rxvt extras */ 472 /* rxvt extras */
472 case XK_KP_Add: /* Shift+KP_Add = bigger font */ 473 case XK_KP_Add: /* Shift+KP_Add = bigger font */
473 change_font (FONT_UP); 474 change_font (FONT_UP);
… …
854 { 855 {
855#ifdef META8_OPTION 856#ifdef META8_OPTION
856 /* set 8-bit on */ 857 /* set 8-bit on */
857 if (meta && (meta_char == 0x80)) 858 if (meta && (meta_char == 0x80))
858 { 859 {
859 unsigned char *ch; 860 char *ch;
860 861
861 for (ch = kbuf; ch < kbuf + len; ch++) 862 for (ch = kbuf; ch < kbuf + len; ch++)
862 *ch |= 0x80; 863 *ch |= 0x80;
863 864
864 meta = 0; 865 meta = 0;
865 } 866 }
866#endif 867#endif
867 /* nil */ ; 868 /* nil */ ;
868 } 869 }
869 } 870 }
871
872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
873 return;
870 874
871 if (len <= 0) 875 if (len <= 0)
872 return; /* not mapped */ 876 return; /* not mapped */
873 877
874 if (OPTION (Opt_scrollTtyKeypress)) 878 if (OPTION (Opt_scrollTtyKeypress))
… …
897#ifdef META8_OPTION 901#ifdef META8_OPTION
898 && meta_char == C0_ESC 902 && meta_char == C0_ESC
899#endif 903#endif
900 ) 904 )
901 { 905 {
902 const unsigned char ch = C0_ESC; 906 const char ch = C0_ESC;
903 tt_write (&ch, 1); 907 tt_write (&ch, 1);
904 } 908 }
905 909
906#if defined(DEBUG_CMD) 910#if defined(DEBUG_CMD)
907 /* Display keyboard buffer contents */ 911 /* Display keyboard buffer contents */
… …
915#endif /* DEBUG_CMD */ 919#endif /* DEBUG_CMD */
916 tt_write (kbuf, (unsigned int)len); 920 tt_write (kbuf, (unsigned int)len);
917} 921}
918/*}}} */ 922/*}}} */
919 923
920#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 924#if defined (KEYSYM_RESOURCE)
921/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
922/* attempt to `write' count to the input buffer */
923unsigned int 925unsigned int
924rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 926rxvt_term::cmd_write (const char *str, unsigned int count)
925{ 927{
926 unsigned int n, s; 928 unsigned int n, s;
927 929
928 n = cmdbuf_ptr - cmdbuf_base; 930 n = cmdbuf_ptr - cmdbuf_base;
929 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 931 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
966 } 968 }
967#endif 969#endif
968 970
969 if (want_refresh) 971 if (want_refresh)
970 { 972 {
973 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
974 {
975 int row = view_start;
976 int end_row = row + nrow;
977
978 while (row > top_row && ROW (row - 1).is_longer ())
979 --row;
980
981 do
982 {
983 int start_row = row;
984 line_t *l;
985
986 do
987 {
988 l = &ROW (row++);
989
990 if (!(l->f & LINE_FILTERED))
991 {
992 // line not filtered, mark it as filtered
993 l->f |= LINE_FILTERED;
994 while (l->is_longer ())
995 {
996 l = &ROW (row++);
997 l->f |= LINE_FILTERED;
998 }
999
1000 // and filter it
1001 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1002
1003 break;
1004 }
1005 }
1006 while (l->is_longer () && row < end_row);
1007 }
1008 while (row < end_row);
1009 }
1010
971 scr_refresh (refresh_type); 1011 scr_refresh ();
972 scrollbar_show (1); 1012 scrollbar_show (1);
973#ifdef USE_XIM 1013#ifdef USE_XIM
974 IMSendSpot (); 1014 IMSendSpot ();
975#endif 1015#endif
976 } 1016 }
… …
979} 1019}
980 1020
981void 1021void
982rxvt_term::check_cb (check_watcher &w) 1022rxvt_term::check_cb (check_watcher &w)
983{ 1023{
984 SET_R (this); 1024 make_current ();
985 SET_LOCALE (locale);
986 1025
987 display->flush (); 1026 display->flush ();
988 1027
989 if (want_refresh && !flush_ev.active) 1028 if (want_refresh && !flush_ev.active)
990 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally 1029 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
991} 1030}
992 1031
993void 1032void
994rxvt_term::flush_cb (time_watcher &w) 1033rxvt_term::flush_cb (time_watcher &w)
995{ 1034{
996 SET_R (this); 1035 make_current ();
997 SET_LOCALE (locale);
998 1036
999 refresh_limit = 1; 1037 refresh_limit = 1;
1000 refresh_count = 0; 1038 refresh_count = 0;
1001 flush (); 1039 flush ();
1002} 1040}
… …
1030rxvt_term::cont_scroll_cb (time_watcher &w) 1068rxvt_term::cont_scroll_cb (time_watcher &w)
1031{ 1069{
1032 if ((scrollbar_isUp() || scrollbar_isDn()) && 1070 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1033 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1071 scr_page (scrollbar_isUp() ? UP : DN, 1))
1034 { 1072 {
1035 refresh_type |= SMOOTH_REFRESH;
1036 want_refresh = 1; 1073 want_refresh = 1;
1037 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1074 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1038 } 1075 }
1039} 1076}
1040#endif 1077#endif
… …
1044rxvt_term::sel_scroll_cb (time_watcher &w) 1081rxvt_term::sel_scroll_cb (time_watcher &w)
1045{ 1082{
1046 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1083 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1047 { 1084 {
1048 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1085 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1049 refresh_type |= SMOOTH_REFRESH;
1050 want_refresh = 1; 1086 want_refresh = 1;
1051 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1087 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1052 } 1088 }
1053} 1089}
1054#endif 1090#endif
… …
1059{ 1095{
1060 if (mouse_slip_wheel_speed == 0 1096 if (mouse_slip_wheel_speed == 0
1061 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1097 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1062 : scr_page (UP, mouse_slip_wheel_speed)) 1098 : scr_page (UP, mouse_slip_wheel_speed))
1063 { 1099 {
1064 if (view_start == nsaved || 1100 if (view_start == top_row || view_start == 0)
1065 view_start == 0)
1066 mouse_slip_wheel_speed = 0; 1101 mouse_slip_wheel_speed = 0;
1067 1102
1068 refresh_type |= SMOOTH_REFRESH;
1069 want_refresh = 1; 1103 want_refresh = 1;
1070 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1104 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1071 } 1105 }
1072} 1106}
1073#endif 1107#endif
… …
1095{ 1129{
1096 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1130 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1097 1131
1098 if (CBUFSIZ == n) 1132 if (CBUFSIZ == n)
1099 { 1133 {
1100 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1134 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1101 n = 0; 1135 n = 0;
1102 } 1136 }
1103 1137
1104 memmove (cmdbuf_base, cmdbuf_ptr, n); 1138 memmove (cmdbuf_base, cmdbuf_ptr, n);
1105 cmdbuf_ptr = cmdbuf_base; 1139 cmdbuf_ptr = cmdbuf_base;
1106 cmdbuf_endp = cmdbuf_ptr + n; 1140 cmdbuf_endp = cmdbuf_ptr + n;
1107 1141
1108 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1142 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1109 1143
1110 if (r > 0) 1144 if (r > 0)
1111 { 1145 {
1112 cmdbuf_endp += r; 1146 cmdbuf_endp += r;
1113 return true; 1147 return true;
1114 } 1148 }
1115 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1149 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1116 { 1150 {
1117#if HAVE_SCHED_YIELD 1151#if HAVE_SCHED_YIELD
1152 if (display->is_local)
1118 event_handler.cw_yield.start (); 1153 event_handler.cw_yield.start ();
1119#endif 1154#endif
1120 } 1155 }
1121 else 1156 else
1122 { 1157 {
1123 pty_ev.stop (); 1158 pty_ev.stop ();
… …
1130} 1165}
1131 1166
1132void 1167void
1133rxvt_term::pty_cb (io_watcher &w, short revents) 1168rxvt_term::pty_cb (io_watcher &w, short revents)
1134{ 1169{
1135 SET_R (this); 1170 make_current ();
1136 SET_LOCALE (locale);
1137 1171
1138 if (revents & EVENT_READ) 1172 if (revents & EVENT_READ)
1139 // loop, but don't allow a single term to monopolize us 1173 // loop, but don't allow a single term to monopolize us
1140 while (pty_fill ()) 1174 while (pty_fill ())
1141 if (cmd_parse ()) 1175 if (cmd_parse ())
… …
1161 1195
1162#ifdef POINTER_BLANK 1196#ifdef POINTER_BLANK
1163void 1197void
1164rxvt_term::pointer_blank () 1198rxvt_term::pointer_blank ()
1165{ 1199{
1166 if (! OPTION (Opt_pointerBlank)) 1200 if (!OPTION (Opt_pointerBlank))
1167 return; 1201 return;
1168 1202
1169 XDefineCursor (display->display, vt, display->blank_cursor); 1203 XDefineCursor (display->display, vt, display->blank_cursor);
1170 XFlush (display->display); 1204 XFlush (display->display);
1171 1205
… …
1173} 1207}
1174 1208
1175void 1209void
1176rxvt_term::pointer_cb (time_watcher &w) 1210rxvt_term::pointer_cb (time_watcher &w)
1177{ 1211{
1178 SET_R (this); 1212 make_current ();
1179 SET_LOCALE (locale);
1180 1213
1181 pointer_blank (); 1214 pointer_blank ();
1182} 1215}
1183#endif 1216#endif
1184 1217
… …
1263 1296
1264/*{{{ process an X event */ 1297/*{{{ process an X event */
1265void 1298void
1266rxvt_term::x_cb (XEvent &ev) 1299rxvt_term::x_cb (XEvent &ev)
1267{ 1300{
1301 make_current ();
1302
1268 dDisp; 1303 dDisp;
1269 1304
1270 SET_R (this); 1305 if (ev.xany.window == vt
1271 SET_LOCALE (locale); 1306 && SHOULD_INVOKE (HOOK_X_EVENT)
1307 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1308 return;
1272 1309
1273#if defined(CURSOR_BLINK) 1310 // for XQueryPointer
1274 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1275 {
1276 if (hidden_cursor)
1277 {
1278 hidden_cursor = 0;
1279 want_refresh = 1;
1280 }
1281
1282 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1283 }
1284#endif
1285
1286#if defined(POINTER_BLANK)
1287 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1288 {
1289 if (ev.type == MotionNotify
1290 || ev.type == ButtonPress
1291 || ev.type == ButtonRelease)
1292 if (hidden_pointer)
1293 pointer_unblank ();
1294
1295 if (ev.type == KeyPress && hidden_pointer == 0)
1296 pointer_blank ();
1297 }
1298#endif
1299
1300 Window unused_root, unused_child; 1311 Window unused_root, unused_child;
1301 int unused_root_x, unused_root_y; 1312 int unused_root_x, unused_root_y;
1302 unsigned int unused_mask; 1313 unsigned int unused_mask;
1303 1314
1304 switch (ev.type) 1315 switch (ev.type)
… …
1311 1322
1312 break; 1323 break;
1313 1324
1314 case KeyRelease: 1325 case KeyRelease:
1315 { 1326 {
1316#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1327#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1317 KeySym ks; 1328 KeySym keysym;
1318 1329
1319 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1330 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1320#endif 1331#endif
1321 1332
1322#if ENABLE_FRILLS || ISO_14755 1333#if ENABLE_FRILLS || ISO_14755
1323 // ISO 14755 support 1334 // ISO 14755 support
1324 if (iso14755buf) 1335 if (iso14755buf)
… …
1329# endif 1340# endif
1330# if ISO_14755 1341# if ISO_14755
1331 // iso14755 part 5.2 handling: release time 1342 // iso14755 part 5.2 handling: release time
1332 // first: controls 1343 // first: controls
1333 if ((ev.xkey.state & ControlMask) 1344 if ((ev.xkey.state & ControlMask)
1334 && ((ks >= 0x40 && ks <= 0x5f) 1345 && ((keysym >= 0x40 && keysym <= 0x5f)
1335 || (ks >= 0x61 && ks <= 0x7f))) 1346 || (keysym >= 0x61 && keysym <= 0x7f)))
1336 { 1347 {
1337 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1348 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1338 commit_iso14755 (); 1349 commit_iso14755 ();
1339 return; // case-break; 1350 goto skip_switch;
1340 } 1351 }
1341 1352
1342 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1353 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1343 if (i[0] == ks) 1354 if (i[0] == keysym)
1344 { 1355 {
1345 iso14755buf = ISO_14755_51 | i[1]; 1356 iso14755buf = ISO_14755_51 | i[1];
1346 commit_iso14755 (); 1357 commit_iso14755 ();
1347 return; // case-break; 1358 goto skip_switch;
1348 } 1359 }
1349 1360
1350 scr_bell (); 1361 scr_bell ();
1351# endif 1362# endif
1352 iso14755buf = 0; 1363 iso14755buf = 0;
… …
1371 else 1382 else
1372 iso14755buf = 0; 1383 iso14755buf = 0;
1373 } 1384 }
1374#endif 1385#endif
1375 1386
1387 if (ev.xany.window == vt
1388 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1389 break;
1390
1376#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1391#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1377 if (!(ev.xkey.state & ControlMask)) 1392 if (!(ev.xkey.state & ControlMask))
1378 slip_wheel_ev.stop (); 1393 slip_wheel_ev.stop ();
1379 else if (ks == XK_Control_L || ks == XK_Control_R) 1394 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1380 mouse_slip_wheel_speed = 0; 1395 mouse_slip_wheel_speed = 0;
1381#endif 1396#endif
1382 break; 1397 break;
1383 } 1398 }
1384 1399
… …
1487 { 1502 {
1488 seen_resize = 1; 1503 seen_resize = 1;
1489 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1504 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1490 } 1505 }
1491 1506
1507 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1508
1492#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1509#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1493 if (OPTION (Opt_transparent)) 1510 if (OPTION (Opt_transparent))
1494 check_our_parents (); 1511 check_our_parents ();
1495#endif 1512#endif
1496 } 1513 }
… …
1514 1531
1515 case SelectionRequest: 1532 case SelectionRequest:
1516 selection_send (ev.xselectionrequest); 1533 selection_send (ev.xselectionrequest);
1517 break; 1534 break;
1518 1535
1536 case MapNotify:
1537 mapped = 1;
1538#ifdef TEXT_BLINK
1539 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1540#endif
1541 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1542 break;
1543
1519 case UnmapNotify: 1544 case UnmapNotify:
1520 mapped = 0; 1545 mapped = 0;
1521#ifdef TEXT_BLINK 1546#ifdef TEXT_BLINK
1522 text_blink_ev.stop (); 1547 text_blink_ev.stop ();
1523#endif 1548#endif
1524 break; 1549 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1525
1526 case MapNotify:
1527 mapped = 1;
1528#ifdef TEXT_BLINK
1529 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1530#endif
1531 break; 1550 break;
1532 1551
1533#ifdef TRANSPARENT 1552#ifdef TRANSPARENT
1534 case ReparentNotify: 1553 case ReparentNotify:
1535 rootwin_cb (ev); 1554 rootwin_cb (ev);
… …
1549 1568
1550 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1569 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1551 scr_expose (ev.xexpose.x, ev.xexpose.y, 1570 scr_expose (ev.xexpose.x, ev.xexpose.y,
1552 ev.xexpose.width, ev.xexpose.height, False); 1571 ev.xexpose.width, ev.xexpose.height, False);
1553 1572
1554 scr_refresh (refresh_type); 1573 want_refresh = 1;
1555 } 1574 }
1556 else 1575 else
1557 { 1576 {
1558 XEvent unused_event; 1577 XEvent unused_event;
1559 1578
… …
1565 if (isScrollbarWindow (ev.xany.window)) 1584 if (isScrollbarWindow (ev.xany.window))
1566 { 1585 {
1567 scrollBar.setIdle (); 1586 scrollBar.setIdle ();
1568 scrollbar_show (0); 1587 scrollbar_show (0);
1569 } 1588 }
1570#ifdef MENUBAR
1571 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1572 menubar_expose ();
1573#endif
1574 1589
1575#ifdef TRANSPARENT 1590#ifdef TRANSPARENT
1576 if (am_transparent && ev.xany.window == parent[0]) 1591 if (am_transparent && ev.xany.window == parent[0])
1577 XClearWindow (disp, ev.xany.window); 1592 XClearWindow (disp, ev.xany.window);
1578#endif 1593#endif
… …
1582 case MotionNotify: 1597 case MotionNotify:
1583#ifdef POINTER_BLANK 1598#ifdef POINTER_BLANK
1584 if (hidden_pointer) 1599 if (hidden_pointer)
1585 pointer_unblank (); 1600 pointer_unblank ();
1586#endif 1601#endif
1587#if MENUBAR
1588 if (isMenuBarWindow (ev.xany.window))
1589 {
1590 menubar_control (ev.xbutton);
1591 break;
1592 }
1593#endif
1594 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1602 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1595 break; 1603 break;
1596 1604
1597 if (ev.xany.window == vt) 1605 if (ev.xany.window == vt)
1598 { 1606 {
1607 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1608 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1609 ; // nop
1599 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1610 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1600 { 1611 {
1601 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1612 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1602 ; 1613 ;
1603 1614
1604 XQueryPointer (disp, vt, 1615 XQueryPointer (disp, vt,
… …
1684 &unused_root_x, &unused_root_y, 1695 &unused_root_x, &unused_root_y,
1685 &ev.xbutton.x, &ev.xbutton.y, 1696 &ev.xbutton.x, &ev.xbutton.y,
1686 &unused_mask); 1697 &unused_mask);
1687 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1698 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1688 scrollbar_size ()); 1699 scrollbar_size ());
1689 scr_refresh (refresh_type); 1700 want_refresh = 1;
1690 refresh_limit = 0; 1701 refresh_limit = 0;
1691 scrollbar_show (1); 1702 scrollbar_show (1);
1692 } 1703 }
1693 break; 1704 break;
1694 } 1705 }
1706
1707skip_switch: ;
1708
1709#if defined(CURSOR_BLINK)
1710 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1711 {
1712 if (hidden_cursor)
1713 {
1714 hidden_cursor = 0;
1715 want_refresh = 1;
1716 }
1717
1718 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1719 }
1720#endif
1721
1722#if defined(POINTER_BLANK)
1723 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1724 {
1725 if (ev.type == MotionNotify
1726 || ev.type == ButtonPress
1727 || ev.type == ButtonRelease)
1728 if (hidden_pointer)
1729 pointer_unblank ();
1730
1731 if (ev.type == KeyPress && hidden_pointer == 0)
1732 pointer_blank ();
1733 }
1734#endif
1695} 1735}
1696 1736
1697void 1737void
1698rxvt_term::focus_in () 1738rxvt_term::focus_in ()
1699{ 1739{
1700 if (!focus) 1740 if (!focus)
1701 { 1741 {
1702 focus = 1; 1742 focus = 1;
1703 want_refresh = 1; 1743 want_refresh = 1;
1704 1744
1705 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1745 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1706 1746
1707#if USE_XIM 1747#if USE_XIM
1708 if (Input_Context != NULL) 1748 if (Input_Context != NULL)
1709 { 1749 {
1710 IMSetStatusPosition (); 1750 IMSetStatusPosition ();
… …
1731 if (focus) 1771 if (focus)
1732 { 1772 {
1733 focus = 0; 1773 focus = 0;
1734 want_refresh = 1; 1774 want_refresh = 1;
1735 1775
1736 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1776 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1737 1777
1738#if ENABLE_FRILLS || ISO_14755 1778#if ENABLE_FRILLS || ISO_14755
1739 if (iso14755buf) 1779 if (iso14755buf)
1740 { 1780 {
1741 iso14755buf = 0; 1781 iso14755buf = 0;
… …
1765 1805
1766#if TRANSPARENT 1806#if TRANSPARENT
1767void 1807void
1768rxvt_term::rootwin_cb (XEvent &ev) 1808rxvt_term::rootwin_cb (XEvent &ev)
1769{ 1809{
1770 SET_R (this); 1810 make_current ();
1771 SET_LOCALE (locale);
1772 1811
1773 switch (ev.type) 1812 switch (ev.type)
1774 { 1813 {
1775 case PropertyNotify: 1814 case PropertyNotify:
1776 /* 1815 /*
… …
1794rxvt_term::button_press (XButtonEvent &ev) 1833rxvt_term::button_press (XButtonEvent &ev)
1795{ 1834{
1796 int reportmode = 0, clickintime; 1835 int reportmode = 0, clickintime;
1797 1836
1798 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1837 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1838
1799 if (!bypass_keystate) 1839 if (!bypass_keystate)
1800 reportmode = !! (priv_modes & PrivMode_mouse_report); 1840 reportmode = !! (priv_modes & PrivMode_mouse_report);
1801 1841
1802 /* 1842 /*
1803 * VT window processing of button press 1843 * VT window processing of button press
… …
1823#ifdef MOUSE_REPORT_DOUBLECLICK 1863#ifdef MOUSE_REPORT_DOUBLECLICK
1824 if (ev.button == MEvent.button && clickintime) 1864 if (ev.button == MEvent.button && clickintime)
1825 { 1865 {
1826 /* same button, within alloted time */ 1866 /* same button, within alloted time */
1827 MEvent.clicks++; 1867 MEvent.clicks++;
1868
1828 if (MEvent.clicks > 1) 1869 if (MEvent.clicks > 1)
1829 { 1870 {
1830 /* only report double clicks */ 1871 /* only report double clicks */
1831 MEvent.clicks = 2; 1872 MEvent.clicks = 2;
1832 mouse_report (ev); 1873 mouse_report (ev);
… …
1852 else 1893 else
1853 { 1894 {
1854 if (ev.button != MEvent.button) 1895 if (ev.button != MEvent.button)
1855 MEvent.clicks = 0; 1896 MEvent.clicks = 0;
1856 1897
1898 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1857 switch (ev.button) 1899 switch (ev.button)
1858 { 1900 {
1859 case Button1: 1901 case Button1:
1860 /* allow meta + click to select rectangular areas */ 1902 /* allow meta + click to select rectangular areas */
1861 /* should be done in screen.C */ 1903 /* should be done in screen.C */
1862#if ENABLE_FRILLS 1904#if ENABLE_FRILLS
1863 selection.rect = !!(ev.state & ModMetaMask); 1905 selection.rect = !!(ev.state & ModMetaMask);
1864#else 1906#else
1865 selection.rect = false; 1907 selection.rect = false;
1866#endif 1908#endif
1867 1909
1868 /* allow shift+left click to extend selection */ 1910 /* allow shift+left click to extend selection */
1869 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1911 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1870 { 1912 {
1871 if (MEvent.button == Button1 && clickintime) 1913 if (MEvent.button == Button1 && clickintime)
1872 selection_rotate (ev.x, ev.y); 1914 selection_rotate (ev.x, ev.y);
1873 else 1915 else
1874 selection_extend (ev.x, ev.y, 1); 1916 selection_extend (ev.x, ev.y, 1);
1875 } 1917 }
1876 else 1918 else
1877 { 1919 {
1878 if (MEvent.button == Button1 && clickintime) 1920 if (MEvent.button == Button1 && clickintime)
1879 MEvent.clicks++; 1921 MEvent.clicks++;
1880 else 1922 else
1881 MEvent.clicks = 1; 1923 MEvent.clicks = 1;
1882 1924
1883 selection_click (MEvent.clicks, ev.x, ev.y); 1925 selection_click (MEvent.clicks, ev.x, ev.y);
1884 } 1926 }
1885 1927
1886 MEvent.button = Button1; 1928 MEvent.button = Button1;
1887 break; 1929 break;
1888 1930
1889 case Button3: 1931 case Button3:
1890 if (MEvent.button == Button3 && clickintime) 1932 if (MEvent.button == Button3 && clickintime)
1891 selection_rotate (ev.x, ev.y); 1933 selection_rotate (ev.x, ev.y);
1892 else 1934 else
1893 selection_extend (ev.x, ev.y, 1); 1935 selection_extend (ev.x, ev.y, 1);
1894 1936
1895 MEvent.button = Button3; 1937 MEvent.button = Button3;
1896 break; 1938 break;
1897 } 1939 }
1898 } 1940 }
1899 1941
1900 MEvent.time = ev.time; 1942 MEvent.time = ev.time;
1901 return; 1943 return;
1902 } 1944 }
1903 1945
… …
2039 } 2081 }
2040 2082
2041 break; 2083 break;
2042 } 2084 }
2043 } 2085 }
2086
2044 return; 2087 return;
2045 } 2088 }
2046#if MENUBAR
2047 /*
2048 * Menubar window processing of button press
2049 */
2050 if (isMenuBarWindow (ev.window))
2051 menubar_control (ev);
2052#endif
2053} 2089}
2054 2090
2055void 2091void
2056rxvt_term::button_release (XButtonEvent &ev) 2092rxvt_term::button_release (XButtonEvent &ev)
2057{ 2093{
… …
2063 2099
2064 if (scrollbar_isUpDn ()) 2100 if (scrollbar_isUpDn ())
2065 { 2101 {
2066 scrollBar.setIdle (); 2102 scrollBar.setIdle ();
2067 scrollbar_show (0); 2103 scrollbar_show (0);
2068#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2069 refresh_type &= ~SMOOTH_REFRESH;
2070#endif
2071 } 2104 }
2072 2105
2073#ifdef SELECTION_SCROLLING 2106#ifdef SELECTION_SCROLLING
2074 if (sel_scroll_ev.active) 2107 if (sel_scroll_ev.active)
2075 sel_scroll_ev.stop(); 2108 sel_scroll_ev.stop();
… …
2113 if (priv_modes & PrivMode_mouse_report 2146 if (priv_modes & PrivMode_mouse_report
2114 && bypass_keystate 2147 && bypass_keystate
2115 && ev.button == Button1 && MEvent.clicks <= 1) 2148 && ev.button == Button1 && MEvent.clicks <= 1)
2116 selection_extend (ev.x, ev.y, 0); 2149 selection_extend (ev.x, ev.y, 0);
2117 2150
2151 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2152 return;
2153
2118 switch (ev.button) 2154 switch (ev.button)
2119 { 2155 {
2120 case Button1: 2156 case Button1:
2121 case Button3: 2157 case Button3:
2122 selection_make (ev.time); 2158 selection_make (ev.time);
2123 break; 2159 break;
2160
2124 case Button2: 2161 case Button2:
2125 selection_request (ev.time, ev.x, ev.y); 2162 if (IN_RANGE_EXC (ev.x, 0, width)
2163 && IN_RANGE_EXC (ev.y, 0, height)) // inside window?
2164 {
2165 if (ev.state & ShiftMask)
2166 selection_request (ev.time, Sel_Clipboard);
2167 else
2168 selection_request (ev.time, Sel_Primary);
2169 }
2126 break; 2170 break;
2171
2127#ifdef MOUSE_WHEEL 2172#ifdef MOUSE_WHEEL
2128 case Button4: 2173 case Button4:
2129 case Button5: 2174 case Button5:
2130 { 2175 {
2131 int i; 2176 int i;
… …
2153 slip_wheel_ev.start (); 2198 slip_wheel_ev.start ();
2154 } 2199 }
2155 else 2200 else
2156 { 2201 {
2157# endif 2202# endif
2158# ifdef JUMP_MOUSE_WHEEL
2159 scr_page (v, i); 2203 scr_page (v, i);
2160 scr_refresh (SMOOTH_REFRESH);
2161 scrollbar_show (1); 2204 scrollbar_show (1);
2162# else
2163 while (i--)
2164 {
2165 scr_page (v, 1);
2166 scr_refresh (SMOOTH_REFRESH);
2167 scrollbar_show (1);
2168 }
2169# endif
2170# ifdef MOUSE_SLIP_WHEELING 2205# ifdef MOUSE_SLIP_WHEELING
2171 } 2206 }
2172#endif 2207# endif
2173 } 2208 }
2174 break; 2209 break;
2175#endif 2210#endif
2176 } 2211 }
2177 } 2212 }
2178#ifdef MENUBAR
2179 else if (isMenuBarWindow (ev.window))
2180 menubar_control (ev);
2181#endif
2182} 2213}
2183 2214
2184#ifdef TRANSPARENT 2215#ifdef TRANSPARENT
2185#if TINTING 2216#if TINTING
2186/* taken from aterm-0.4.2 */ 2217/* taken from aterm-0.4.2 */
… …
2666 2697
2667bool 2698bool
2668rxvt_term::cmd_parse () 2699rxvt_term::cmd_parse ()
2669{ 2700{
2670 bool flag = false; 2701 bool flag = false;
2671 unicode_t ch = NOCHAR; 2702 wchar_t ch = NOCHAR;
2672 unsigned char *seq_begin; // remember start of esc-sequence here 2703 char *seq_begin; // remember start of esc-sequence here
2673 2704
2674 for (;;) 2705 for (;;)
2675 { 2706 {
2676 if (ch == NOCHAR) 2707 if (ch == NOCHAR)
2677 { 2708 {
2678 seq_begin = cmdbuf_ptr; 2709 seq_begin = cmdbuf_ptr;
2679 ch = next_char (); 2710 ch = next_char ();
2680 }
2681 2711
2682 if (ch == NOCHAR) // TODO: improve 2712 if (ch == NOCHAR)
2683 break; 2713 break;
2714 }
2684 2715
2685 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2716 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2686 { 2717 {
2687 if (!seen_input) 2718 if (!seen_input)
2688 { 2719 {
… …
2697 if (seen_resize && cmd_pid) 2728 if (seen_resize && cmd_pid)
2698 kill (-cmd_pid, SIGWINCH); 2729 kill (-cmd_pid, SIGWINCH);
2699 } 2730 }
2700 2731
2701 /* Read a text string from the input buffer */ 2732 /* Read a text string from the input buffer */
2702 unicode_t buf[UBUFSIZ]; 2733 wchar_t buf[UBUFSIZ];
2703 bool refreshnow = false; 2734 bool refreshnow = false;
2704 int nlines = 0; 2735 int nlines = 0;
2705 unicode_t *str = buf; 2736 wchar_t *str = buf;
2706 unicode_t *eol = str + min (ncol, UBUFSIZ); 2737 wchar_t *eol = str + min (ncol, UBUFSIZ);
2707 2738
2708 for (;;) 2739 for (;;)
2709 { 2740 {
2710 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2741 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2711 break; 2742 break;
… …
2729 } 2760 }
2730 2761
2731 // scr_add_lines only works for nlines <= nrow - 1. 2762 // scr_add_lines only works for nlines <= nrow - 1.
2732 if (nlines >= nrow - 1) 2763 if (nlines >= nrow - 1)
2733 { 2764 {
2765 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2766 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2734 scr_add_lines (buf, nlines, str - buf); 2767 scr_add_lines (buf, str - buf, nlines);
2768
2735 nlines = 0; 2769 nlines = 0;
2736 str = buf; 2770 str = buf;
2737 eol = str + min (ncol, UBUFSIZ); 2771 eol = str + min (ncol, UBUFSIZ);
2738 } 2772 }
2739 2773
… …
2752 2786
2753 seq_begin = cmdbuf_ptr; 2787 seq_begin = cmdbuf_ptr;
2754 ch = next_char (); 2788 ch = next_char ();
2755 } 2789 }
2756 2790
2791 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2792 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2757 scr_add_lines (buf, nlines, str - buf); 2793 scr_add_lines (buf, str - buf, nlines);
2758 2794
2759 /* 2795 /*
2760 * If there have been a lot of new lines, then update the screen 2796 * If there have been a lot of new lines, then update the screen
2761 * What the heck I'll cheat and only refresh less than every page-full. 2797 * What the heck I'll cheat and only refresh less than every page-full.
2762 * the number of pages between refreshes is refresh_limit, which 2798 * the number of pages between refreshes is refresh_limit, which
… …
2767 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2803 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2768 refresh_limit++; 2804 refresh_limit++;
2769 else 2805 else
2770 { 2806 {
2771 flag = true; 2807 flag = true;
2772 scr_refresh (refresh_type); 2808 scr_refresh ();
2773 flush_ev.stop (); 2809 want_refresh = 1;
2774 } 2810 }
2775 } 2811 }
2776 2812
2777 } 2813 }
2778 else 2814 else
… …
2793 } 2829 }
2794 2830
2795 return flag; 2831 return flag;
2796} 2832}
2797 2833
2798// read the next octet
2799unicode_t
2800rxvt_term::next_octet ()
2801{
2802 return cmdbuf_ptr < cmdbuf_endp
2803 ? *cmdbuf_ptr++
2804 : NOCHAR;
2805}
2806
2807// read the next character 2834// read the next character
2808unicode_t 2835wchar_t
2809rxvt_term::next_char () 2836rxvt_term::next_char ()
2810{ 2837{
2811 while (cmdbuf_ptr < cmdbuf_endp) 2838 while (cmdbuf_ptr < cmdbuf_endp)
2812 { 2839 {
2813 // assume 7-bit to be ascii ALWAYS 2840 // assume 7-bit to be ascii ALWAYS
2814 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2841 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2815 return *cmdbuf_ptr++; 2842 return *cmdbuf_ptr++;
2816 2843
2817 wchar_t wc; 2844 wchar_t wc;
2818 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2845 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2819 2846
2820 if (len == (size_t)-2) 2847 if (len == (size_t)-2)
2821 { 2848 {
2822 // the mbstate stores incomplete sequences. didn't know this :/ 2849 // the mbstate stores incomplete sequences. didn't know this :/
2823 cmdbuf_ptr = cmdbuf_endp; 2850 cmdbuf_ptr = cmdbuf_endp;
2824 break; 2851 break;
2825 } 2852 }
2826 2853
2827 if (len == (size_t)-1) 2854 if (len == (size_t)-1)
2828 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2855 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2829 2856
2830 // assume wchar == unicode 2857 // assume wchar == unicode
2831 cmdbuf_ptr += len; 2858 cmdbuf_ptr += len;
2832 return wc & UNICODE_MASK; 2859 return wc & UNICODE_MASK;
2833 } 2860 }
2834 2861
2835 return NOCHAR; 2862 return NOCHAR;
2863}
2864
2865// read the next octet
2866uint32_t
2867rxvt_term::next_octet ()
2868{
2869 return cmdbuf_ptr < cmdbuf_endp
2870 ? (unsigned char)*cmdbuf_ptr++
2871 : NOCHAR;
2836} 2872}
2837 2873
2838/* rxvt_cmd_getc () - Return next input character */ 2874/* rxvt_cmd_getc () - Return next input character */
2839/* 2875/*
2840 * Return the next input character after first passing any keyboard input 2876 * Return the next input character after first passing any keyboard input
2841 * to the command. 2877 * to the command.
2842 */ 2878 */
2843unicode_t 2879wchar_t
2844rxvt_term::cmd_getc () 2880rxvt_term::cmd_getc ()
2845{ 2881{
2846 unicode_t c = next_char (); 2882 wchar_t c = next_char ();
2847 2883
2848 if (c == NOCHAR) 2884 if (c == NOCHAR)
2849 throw out_of_input; 2885 throw out_of_input;
2850 2886
2851 return c; 2887 return c;
2852} 2888}
2853 2889
2854unicode_t 2890uint32_t
2855rxvt_term::cmd_get8 () 2891rxvt_term::cmd_get8 ()
2856{ 2892{
2857 unicode_t c = next_octet (); 2893 uint32_t c = next_octet ();
2858 2894
2859 if (c == NOCHAR) 2895 if (c == NOCHAR)
2860 throw out_of_input; 2896 throw out_of_input;
2861 2897
2862 return c; 2898 return c;
… …
2962 case C0_ESC: 2998 case C0_ESC:
2963 process_escape_seq (); 2999 process_escape_seq ();
2964 break; 3000 break;
2965 case C0_ENQ: /* terminal Status */ 3001 case C0_ENQ: /* terminal Status */
2966 if (rs[Rs_answerbackstring]) 3002 if (rs[Rs_answerbackstring])
2967 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3003 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2968 (unsigned int)strlen (rs[Rs_answerbackstring]));
2969 else 3004 else
2970 tt_write ((unsigned char *)VT100_ANS, 3005 tt_write (VT100_ANS, strlen (VT100_ANS));
2971 (unsigned int)strlen (VT100_ANS));
2972 break; 3006 break;
2973 case C0_BEL: /* bell */ 3007 case C0_BEL: /* bell */
2974 scr_bell (); 3008 scr_bell ();
2975 break; 3009 break;
2976 case C0_BS: /* backspace */ 3010 case C0_BS: /* backspace */
… …
3131 break; 3165 break;
3132 3166
3133 /* 8.3.87: NEXT LINE */ 3167 /* 8.3.87: NEXT LINE */
3134 case C1_NEL: /* ESC E */ 3168 case C1_NEL: /* ESC E */
3135 { 3169 {
3136 unicode_t nlcr[] = { C0_LF, C0_CR }; 3170 wchar_t nlcr[] = { C0_LF, C0_CR };
3137 scr_add_lines (nlcr, 1, 2); 3171 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3138 } 3172 }
3139 break; 3173 break;
3140 3174
3141 /* kidnapped escape sequence: Should be 8.3.48 */ 3175 /* kidnapped escape sequence: Should be 8.3.48 */
3142 case C1_ESA: /* ESC G */ 3176 case C1_ESA: /* ESC G */
… …
3164 process_dcs_seq (); 3198 process_dcs_seq ();
3165 break; 3199 break;
3166 3200
3167 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3201 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3168 case C1_SCI: /* ESC Z */ 3202 case C1_SCI: /* ESC Z */
3169 tt_write ((const unsigned char *)ESCZ_ANSWER, 3203 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3170 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3171 break; /* steal obsolete ESC [ c */ 3204 break; /* steal obsolete ESC [ c */
3172 3205
3173 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3206 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3174 case C1_CSI: /* ESC [ */ 3207 case C1_CSI: /* ESC [ */
3175 process_csi_seq (); 3208 process_csi_seq ();
… …
3419 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3452 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3420 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3453 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3421 break; 3454 break;
3422 3455
3423 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3456 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3424 tt_write ((const unsigned char *)VT100_ANS, 3457 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3425 (unsigned int) (sizeof (VT100_ANS) - 1));
3426 break; 3458 break;
3427 3459
3428 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3460 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3429 process_sgr_mode (nargs, arg); 3461 process_sgr_mode (nargs, arg);
3430 break; 3462 break;
… …
3632/*----------------------------------------------------------------------*/ 3664/*----------------------------------------------------------------------*/
3633/* 3665/*
3634 * get input up until STRING TERMINATOR (or BEL) 3666 * get input up until STRING TERMINATOR (or BEL)
3635 * ends_how is terminator used. returned input must be free()'d 3667 * ends_how is terminator used. returned input must be free()'d
3636 */ 3668 */
3637unsigned char * 3669char *
3638rxvt_term::get_to_st (unicode_t &ends_how) 3670rxvt_term::get_to_st (unicode_t &ends_how)
3639{ 3671{
3640 unicode_t ch; 3672 unicode_t ch;
3641 bool seen_esc = false; 3673 bool seen_esc = false;
3642 unsigned int n = 0; 3674 unsigned int n = 0;
… …
3675 3707
3676 string[n++] = '\0'; 3708 string[n++] = '\0';
3677 3709
3678 ends_how = (ch == 0x5c ? C0_ESC : ch); 3710 ends_how = (ch == 0x5c ? C0_ESC : ch);
3679 3711
3680 return (unsigned char *)rxvt_wcstombs (string); 3712 return rxvt_wcstombs (string);
3681} 3713}
3682 3714
3683/*----------------------------------------------------------------------*/ 3715/*----------------------------------------------------------------------*/
3684/* 3716/*
3685 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3717 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3686 */ 3718 */
3687void 3719void
3688rxvt_term::process_dcs_seq () 3720rxvt_term::process_dcs_seq ()
3689{ 3721{
3690 unsigned char *s; 3722 char *s;
3691 unicode_t eh; 3723 unicode_t eh;
3692 3724
3693 /* 3725 /*
3694 * Not handled yet 3726 * Not handled yet
3695 */ 3727 */
… …
3714 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3746 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3715 arg = arg * 10 + (ch - '0'); 3747 arg = arg * 10 + (ch - '0');
3716 3748
3717 if (ch == ';') 3749 if (ch == ';')
3718 { 3750 {
3719 unsigned char *s = get_to_st (eh); 3751 char *s = get_to_st (eh);
3720 3752
3721 if (s) 3753 if (s)
3722 { 3754 {
3723 process_xterm_seq (arg, (char *)s, eh); 3755 process_xterm_seq (arg, s, eh);
3724 free (s); 3756 free (s);
3725 } 3757 }
3726 } 3758 }
3727} 3759}
3728 3760
3729void 3761void
3730rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3762rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3731{ 3763{
3732 if (str[0] == '?' && !str[1]) 3764 if (str[0] == '?' && !str[1])
3733 { 3765 {
3734 unsigned short r, g, b; 3766 unsigned short r, g, b;
3735 pix_colors_focused[color].get (display, r, g, b); 3767 pix_colors_focused[color].get (display, r, g, b);
… …
3741 3773
3742/* 3774/*
3743 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3775 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3744 */ 3776 */
3745void 3777void
3746rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3778rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3747{ 3779{
3748 int changed = 0;
3749 int color; 3780 int color;
3750 char *buf, *name; 3781 char *buf, *name;
3751 bool query = str[0] == '?' && !str[1]; 3782 bool query = str[0] == '?' && !str[1];
3752 int saveop = op; 3783 int saveop = op;
3753 dDisp; 3784 dDisp;
… …
3808 { 3839 {
3809 if ((name = strchr (buf, ';')) == NULL) 3840 if ((name = strchr (buf, ';')) == NULL)
3810 break; 3841 break;
3811 3842
3812 *name++ = '\0'; 3843 *name++ = '\0';
3813 color = atoi (buf); 3844 color = atoi (buf) + minCOLOR;
3814 3845
3815 if (color < 0 || color >= TOTAL_COLORS) 3846 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3816 break; 3847 break;
3817 3848
3818 if ((buf = strchr (name, ';')) != NULL) 3849 if ((buf = strchr (name, ';')) != NULL)
3819 *buf++ = '\0'; 3850 *buf++ = '\0';
3820 3851
3821 if (name[0] == '?' && !name[1]) 3852 if (name[0] == '?' && !name[1])
3822 { 3853 {
3823 unsigned short r, g, b; 3854 unsigned short r, g, b;
3824 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3855 pix_colors_focused[color].get (display, r, g, b);
3825 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3856 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3826 } 3857 }
3827 else 3858 else
3828 set_window_color (color + minCOLOR, name); 3859 set_window_color (color, name);
3829 } 3860 }
3830 break; 3861 break;
3831 case XTerm_Color00: 3862 case XTerm_Color00:
3832 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3863 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3833 break; 3864 break;
3834 case XTerm_Color01: 3865 case XTerm_Color01:
3835 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3866 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3836 break; 3867 break;
3837#ifndef NO_CURSORCOLOR 3868#ifndef NO_CURSORCOLOR
3838 case XTerm_Color_cursor: 3869 case XTerm_Color_cursor:
3839 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3870 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3840 break; 3871 break;
… …
3844 break; 3875 break;
3845 case XTerm_Color_pointer_bg: 3876 case XTerm_Color_pointer_bg:
3846 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3877 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3847 break; 3878 break;
3848#ifndef NO_BOLD_UNDERLINE_REVERSE 3879#ifndef NO_BOLD_UNDERLINE_REVERSE
3849 case XTerm_Color_BD:
3850 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3851 break;
3852 case XTerm_Color_UL:
3853 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3854 break;
3855 case XTerm_Color_RV: 3880 case XTerm_Color_RV:
3856 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3881 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3882 break;
3883 case Rxvt_Color_BD:
3884 case URxvt_Color_BD:
3885 process_color_seq (op, Color_BD, str, resp);
3886 break;
3887 case Rxvt_Color_UL:
3888 case URxvt_Color_UL:
3889 process_color_seq (op, Color_UL, str, resp);
3857 break; 3890 break;
3858 case URxvt_Color_IT: 3891 case URxvt_Color_IT:
3859 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3892 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3860 break; 3893 break;
3861#endif 3894#endif
… …
3866 if (am_transparent) 3899 if (am_transparent)
3867 want_full_refresh = want_refresh = 1; 3900 want_full_refresh = want_refresh = 1;
3868 break; 3901 break;
3869#endif 3902#endif
3870 3903
3871 case XTerm_Pixmap: 3904 case Rxvt_Pixmap:
3905 {
3872 if (*str != ';') 3906 if (*str != ';')
3873 { 3907 {
3874#if XPM_BACKGROUND 3908#if XPM_BACKGROUND
3875 scale_pixmap (""); /* reset to default scaling */ 3909 scale_pixmap (""); /* reset to default scaling */
3876 set_bgPixmap (str); /* change pixmap */ 3910 set_bgPixmap (str); /* change pixmap */
3877#endif
3878 scr_touch (true); 3911 scr_touch (true);
3912#endif
3879 } 3913 }
3914
3915 int changed = 0;
3916
3880 while ((str = strchr (str, ';')) != NULL) 3917 while ((str = strchr (str, ';')) != NULL)
3881 { 3918 {
3882 str++; 3919 str++;
3883#if XPM_BACKGROUND 3920#if XPM_BACKGROUND
3884 changed += scale_pixmap (str); 3921 changed += scale_pixmap (str);
3885#endif 3922#endif
3886 } 3923 }
3887 3924
3888 if (changed) 3925 if (changed)
3889 { 3926 {
3890#ifdef XPM_BACKGROUND 3927#ifdef XPM_BACKGROUND
3891 resize_pixmap (); 3928 resize_pixmap ();
3892#endif
3893 scr_touch (true); 3929 scr_touch (true);
3930#endif
3894 } 3931 }
3932 }
3895 break; 3933 break;
3896 3934
3897 case XTerm_restoreFG: 3935 case Rxvt_restoreFG:
3898 set_window_color (Color_fg, str); 3936 set_window_color (Color_fg, str);
3899 break; 3937 break;
3900 case XTerm_restoreBG: 3938 case Rxvt_restoreBG:
3901 set_window_color (Color_bg, str); 3939 set_window_color (Color_bg, str);
3902 break; 3940 break;
3903 3941
3904 case XTerm_logfile: 3942 case XTerm_logfile:
3905 // TODO, when secure mode? 3943 // TODO, when secure mode?
3906 break; 3944 break;
3907 3945
3908#ifdef MENUBAR
3909 case URxvt_Menu:
3910 if (OPTION (Opt_insecure))
3911 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3912 break;
3913#endif
3914#if 0 3946#if 0
3915 case XTerm_dumpscreen: /* no error notices */ 3947 case Rxvt_dumpscreen: /* no error notices */
3916 { 3948 {
3917 int fd; 3949 int fd;
3918 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3950 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3919 { 3951 {
3920 scr_dump (fd); 3952 scr_dump (fd);
… …
3951 if (query) 3983 if (query)
3952 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3984 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3953 else 3985 else
3954 { 3986 {
3955 set_locale (str); 3987 set_locale (str);
3956 pty.set_utf8_mode (enc_utf8); 3988 pty->set_utf8_mode (enc_utf8);
3957 init_xlocale (); 3989 init_xlocale ();
3958 } 3990 }
3959 break; 3991 break;
3960 3992
3961 case URxvt_view_up: 3993 case URxvt_view_up:
3962 case URxvt_view_down: 3994 case URxvt_view_down:
3995 {
3963 int lines = atoi (str); 3996 int lines = atoi (str);
3964 3997
3965 if (lines) 3998 if (lines)
3966 scr_page (op == URxvt_view_up ? UP : DN, lines); 3999 scr_page (op == URxvt_view_up ? UP : DN, lines);
3967 else 4000 else
3968 {
3969 scr_erase_savelines (); 4001 scr_erase_savelines ();
3970 } 4002 }
3971 4003
4004 break;
4005#endif
4006
4007#if ENABLE_PERL
4008 case URxvt_perl:
4009 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
4010 ; // no responses yet
3972 break; 4011 break;
3973#endif 4012#endif
3974 } 4013 }
3975} 4014}
3976/*----------------------------------------------------------------------*/ 4015/*----------------------------------------------------------------------*/
… …
4028 { 5, PrivMode_rVideo }, 4067 { 5, PrivMode_rVideo },
4029 { 6, PrivMode_relOrigin }, 4068 { 6, PrivMode_relOrigin },
4030 { 7, PrivMode_Autowrap }, 4069 { 7, PrivMode_Autowrap },
4031 // 8, bi-directional support mode 4070 // 8, bi-directional support mode
4032 { 9, PrivMode_MouseX10 }, 4071 { 9, PrivMode_MouseX10 },
4033#ifdef menuBar_esc
4034 { menuBar_esc, PrivMode_menuBar },
4035#endif
4036 // 18, 19 printing-related 4072 // 18, 19 printing-related
4037 { 25, PrivMode_VisibleCursor }, 4073 { 25, PrivMode_VisibleCursor },
4038#ifdef scrollBar_esc 4074#ifdef scrollBar_esc
4039 { scrollBar_esc, PrivMode_scrollBar }, 4075 { scrollBar_esc, PrivMode_scrollBar },
4040#endif 4076#endif
… …
4087 /* extra handling for values with state unkept */ 4123 /* extra handling for values with state unkept */
4088 switch (arg[i]) 4124 switch (arg[i])
4089 { 4125 {
4090#if ENABLE_STYLES 4126#if ENABLE_STYLES
4091 case 1021: 4127 case 1021:
4092 if (mode) 4128 set_option (Opt_intensityStyles, mode);
4093 SET_OPTION (Opt_intensityStyles);
4094 else
4095 CLR_OPTION (Opt_intensityStyles);
4096 4129
4097 scr_touch (true); 4130 scr_touch (true);
4098 break; 4131 break;
4099#endif 4132#endif
4100 case 1048: /* alternative cursor save */ 4133 case 1048: /* alternative cursor save */
… …
4122 case 3: /* 80/132 */ 4155 case 3: /* 80/132 */
4123 if (priv_modes & PrivMode_132OK) 4156 if (priv_modes & PrivMode_132OK)
4124 set_widthheight (((state ? 132 : 80) * fwidth), height); 4157 set_widthheight (((state ? 132 : 80) * fwidth), height);
4125 break; 4158 break;
4126 case 4: /* smooth scrolling */ 4159 case 4: /* smooth scrolling */
4127 if (!state) 4160 set_option (Opt_jumpScroll, !state);
4128 SET_OPTION (Opt_jumpScroll);
4129 else
4130 CLR_OPTION (Opt_jumpScroll);
4131 break; 4161 break;
4132 case 5: /* reverse video */ 4162 case 5: /* reverse video */
4133 scr_rvideo_mode (state); 4163 scr_rvideo_mode (state);
4134 break; 4164 break;
4135 case 6: /* relative/absolute origins */ 4165 case 6: /* relative/absolute origins */
… …
4141 /* case 8: - auto repeat, can't do on a per window basis */ 4171 /* case 8: - auto repeat, can't do on a per window basis */
4142 case 9: /* X10 mouse reporting */ 4172 case 9: /* X10 mouse reporting */
4143 if (state) /* orthogonal */ 4173 if (state) /* orthogonal */
4144 priv_modes &= ~PrivMode_MouseX11; 4174 priv_modes &= ~PrivMode_MouseX11;
4145 break; 4175 break;
4146#ifdef menuBar_esc
4147 case menuBar_esc:
4148#ifdef MENUBAR
4149 map_menuBar (state);
4150#endif
4151 break;
4152#endif
4153#ifdef scrollBar_esc 4176#ifdef scrollBar_esc
4154 case scrollBar_esc: 4177 case scrollBar_esc:
4155 if (scrollbar_mapping (state)) 4178 if (scrollbar_mapping (state))
4156 { 4179 {
4157 resize_all_windows (0, 0, 0); 4180 resize_all_windows (0, 0, 0);
… …
4176#if 0 4199#if 0
4177 case 1001: 4200 case 1001:
4178 break; /* X11 mouse highlighting */ 4201 break; /* X11 mouse highlighting */
4179#endif 4202#endif
4180 case 1010: /* scroll to bottom on TTY output inhibit */ 4203 case 1010: /* scroll to bottom on TTY output inhibit */
4181 if (!state) 4204 set_option (Opt_scrollTtyOutput, !state);
4182 SET_OPTION (Opt_scrollTtyOutput);
4183 else
4184 CLR_OPTION (Opt_scrollTtyOutput);
4185 break; 4205 break;
4186 case 1011: /* scroll to bottom on key press */ 4206 case 1011: /* scroll to bottom on key press */
4187 if (state) 4207 set_option (Opt_scrollTtyKeypress, state);
4188 SET_OPTION (Opt_scrollTtyKeypress);
4189 else
4190 CLR_OPTION (Opt_scrollTtyKeypress);
4191 break; 4208 break;
4192 case 1047: /* secondary screen w/ clearing last */ 4209 case 1047: /* secondary screen w/ clearing last */
4193 if (OPTION (Opt_secondaryScreen)) 4210 if (OPTION (Opt_secondaryScreen))
4194 if (current_screen != PRIMARY) 4211 if (current_screen != PRIMARY)
4195 scr_erase_screen (2); 4212 scr_erase_screen (2);
… …
4333 scr_color (Color_bg, Color_bg); 4350 scr_color (Color_bg, Color_bg);
4334 break; 4351 break;
4335 4352
4336 //case 50: // not variable spacing 4353 //case 50: // not variable spacing
4337 4354
4338#ifndef NO_BRIGHTCOLOR 4355#if ENABLE_FRILLS
4339 case 90: 4356 case 90:
4340 case 91: /* set bright fg color */ 4357 case 91: /* set bright fg color */
4341 case 92: 4358 case 92:
4342 case 93: 4359 case 93:
4343 case 94: 4360 case 94:
… …
4388 */ 4405 */
4389void 4406void
4390rxvt_term::tt_printf (const char *fmt,...) 4407rxvt_term::tt_printf (const char *fmt,...)
4391{ 4408{
4392 va_list arg_ptr; 4409 va_list arg_ptr;
4393 unsigned char buf[256]; 4410 char buf[256];
4394 4411
4395 va_start (arg_ptr, fmt); 4412 va_start (arg_ptr, fmt);
4396 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4413 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4397 va_end (arg_ptr); 4414 va_end (arg_ptr);
4398 tt_write (buf, strlen (buf)); 4415 tt_write (buf, strlen (buf));
… …
4403 * or generated by us in response to a query ESC sequence. 4420 * or generated by us in response to a query ESC sequence.
4404 */ 4421 */
4405const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4422const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4406 4423
4407void 4424void
4408rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4425rxvt_term::tt_write (const char *data, unsigned int len)
4409{ 4426{
4427 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4428 return;
4429
4430 if (pty->pty < 0)
4431 return;
4432
4410 if (v_buflen == 0) 4433 if (v_buflen == 0)
4411 { 4434 {
4412 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4435 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4413 4436
4414 if ((unsigned int)written == len) 4437 if ((unsigned int)written == len)
4415 return; 4438 return;
4416 4439
4417 data += written; 4440 data += written;
4418 len -= written; 4441 len -= written;
4419 } 4442 }
4420 4443
4421 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4444 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4422 4445
4423 memcpy (v_buffer + v_buflen, data, len); 4446 memcpy (v_buffer + v_buflen, data, len);
4424 v_buflen += len; 4447 v_buflen += len;
4425 4448
4426 pty_ev.set (EVENT_READ | EVENT_WRITE); 4449 pty_ev.set (EVENT_READ | EVENT_WRITE);
4427} 4450}
4428 4451
4429void rxvt_term::pty_write () 4452void rxvt_term::pty_write ()
4430{ 4453{
4431 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4454 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4432 4455
4433 if (written > 0) 4456 if (written > 0)
4434 { 4457 {
4435 v_buflen -= written; 4458 v_buflen -= written;
4436 4459

Diff Legend

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