… | |
… | |
25 | * - extensive modifications |
25 | * - extensive modifications |
26 | * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> |
26 | * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> |
27 | * Copyright (c) 2001 Marius Gedminas |
27 | * Copyright (c) 2001 Marius Gedminas |
28 | * - Ctrl/Mod4+Tab works like Meta+Tab (options) |
28 | * - Ctrl/Mod4+Tab works like Meta+Tab (options) |
29 | * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> |
29 | * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> |
30 | * Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com> |
30 | * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com> |
31 | * |
31 | * |
32 | * This program is free software; you can redistribute it and/or modify |
32 | * This program is free software; you can redistribute it and/or modify |
33 | * it under the terms of the GNU General Public License as published by |
33 | * it under the terms of the GNU General Public License as published by |
34 | * the Free Software Foundation; either version 2 of the License, or |
34 | * the Free Software Foundation; either version 2 of the License, or |
35 | * (at your option) any later version. |
35 | * (at your option) any later version. |
… | |
… | |
43 | * along with this program; if not, write to the Free Software |
43 | * along with this program; if not, write to the Free Software |
44 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
44 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
45 | *----------------------------------------------------------------------*/ |
45 | *----------------------------------------------------------------------*/ |
46 | |
46 | |
47 | /*{{{ includes: */ |
47 | /*{{{ includes: */ |
48 | #include "../config.h" /* NECESSARY */ |
48 | #include "../config.h" |
49 | #include "rxvt.h" /* NECESSARY */ |
49 | #include "rxvt.h" |
|
|
50 | #include "rxvtperl.h" |
50 | #include "version.h" |
51 | #include "version.h" |
51 | #include "command.h" |
52 | #include "command.h" |
52 | |
53 | |
53 | #if HAVE_SCHED_YIELD |
54 | #if HAVE_SCHED_YIELD |
|
|
55 | #undef HAVE_SCHED_YIELD // disabled for the time being |
54 | # include <sched.h> |
56 | //# include <sched.h> |
55 | #endif |
57 | #endif |
56 | |
58 | |
57 | #ifdef KEYSYM_RESOURCE |
59 | #ifdef KEYSYM_RESOURCE |
58 | # include "keyboard.h" |
60 | # include "keyboard.h" |
59 | #endif |
61 | #endif |
… | |
… | |
266 | mb[0] = ch[0]; |
268 | mb[0] = ch[0]; |
267 | len = 1; |
269 | len = 1; |
268 | } |
270 | } |
269 | |
271 | |
270 | if (len > 0) |
272 | if (len > 0) |
271 | tt_write ((unsigned char *)mb, len); |
273 | tt_write (mb, len); |
272 | else |
274 | else |
273 | scr_bell (); |
275 | scr_bell (); |
274 | } |
276 | } |
275 | |
277 | |
276 | iso14755buf = 0; |
278 | iso14755buf = 0; |
… | |
… | |
304 | KeySym keysym; |
306 | KeySym keysym; |
305 | #ifdef DEBUG_CMD |
307 | #ifdef DEBUG_CMD |
306 | static int debug_key = 1; /* accessible by a debugger only */ |
308 | static int debug_key = 1; /* accessible by a debugger only */ |
307 | #endif |
309 | #endif |
308 | int valid_keysym; |
310 | int valid_keysym; |
309 | unsigned char kbuf[KBUFSZ]; |
311 | char kbuf[KBUFSZ]; |
310 | |
312 | |
311 | /* |
313 | /* |
312 | * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an |
314 | * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an |
313 | * escape sequence to toggle the Keypad. |
315 | * escape sequence to toggle the Keypad. |
314 | * |
316 | * |
… | |
… | |
332 | Status status_return; |
334 | Status status_return; |
333 | |
335 | |
334 | #if 0 |
336 | #if 0 |
335 | #ifdef X_HAVE_UTF8_STRING |
337 | #ifdef X_HAVE_UTF8_STRING |
336 | if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful |
338 | if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful |
337 | len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, |
339 | len = Xutf8LookupString (Input_Context, &ev, kbuf, |
338 | KBUFSZ, &keysym, &status_return); |
340 | KBUFSZ, &keysym, &status_return); |
339 | else |
341 | else |
340 | #endif |
342 | #endif |
341 | #endif |
343 | #endif |
342 | { |
344 | { |
… | |
… | |
379 | || status_return == XLookupBoth; |
381 | || status_return == XLookupBoth; |
380 | } |
382 | } |
381 | else |
383 | else |
382 | #endif |
384 | #endif |
383 | { |
385 | { |
384 | len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); |
386 | len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose); |
385 | valid_keysym = keysym != NoSymbol; |
387 | valid_keysym = keysym != NoSymbol; |
386 | } |
388 | } |
387 | |
389 | |
388 | if (valid_keysym) |
390 | if (valid_keysym) |
389 | { |
391 | { |
… | |
… | |
853 | { |
855 | { |
854 | #ifdef META8_OPTION |
856 | #ifdef META8_OPTION |
855 | /* set 8-bit on */ |
857 | /* set 8-bit on */ |
856 | if (meta && (meta_char == 0x80)) |
858 | if (meta && (meta_char == 0x80)) |
857 | { |
859 | { |
858 | unsigned char *ch; |
860 | char *ch; |
859 | |
861 | |
860 | for (ch = kbuf; ch < kbuf + len; ch++) |
862 | for (ch = kbuf; ch < kbuf + len; ch++) |
861 | *ch |= 0x80; |
863 | *ch |= 0x80; |
862 | |
864 | |
863 | meta = 0; |
865 | meta = 0; |
864 | } |
866 | } |
865 | #endif |
867 | #endif |
866 | /* nil */ ; |
868 | /* nil */ ; |
867 | } |
869 | } |
868 | } |
870 | } |
|
|
871 | |
|
|
872 | if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END))) |
|
|
873 | return; |
869 | |
874 | |
870 | if (len <= 0) |
875 | if (len <= 0) |
871 | return; /* not mapped */ |
876 | return; /* not mapped */ |
872 | |
877 | |
873 | if (OPTION (Opt_scrollTtyKeypress)) |
878 | if (OPTION (Opt_scrollTtyKeypress)) |
… | |
… | |
896 | #ifdef META8_OPTION |
901 | #ifdef META8_OPTION |
897 | && meta_char == C0_ESC |
902 | && meta_char == C0_ESC |
898 | #endif |
903 | #endif |
899 | ) |
904 | ) |
900 | { |
905 | { |
901 | const unsigned char ch = C0_ESC; |
906 | const char ch = C0_ESC; |
902 | tt_write (&ch, 1); |
907 | tt_write (&ch, 1); |
903 | } |
908 | } |
904 | |
909 | |
905 | #if defined(DEBUG_CMD) |
910 | #if defined(DEBUG_CMD) |
906 | /* Display keyboard buffer contents */ |
911 | /* Display keyboard buffer contents */ |
… | |
… | |
918 | |
923 | |
919 | #if MENUBAR_MAX || defined (KEYSYM_RESOURCE) |
924 | #if MENUBAR_MAX || defined (KEYSYM_RESOURCE) |
920 | /*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ |
925 | /*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ |
921 | /* attempt to `write' count to the input buffer */ |
926 | /* attempt to `write' count to the input buffer */ |
922 | unsigned int |
927 | unsigned int |
923 | rxvt_term::cmd_write (const unsigned char *str, unsigned int count) |
928 | rxvt_term::cmd_write (const char *str, unsigned int count) |
924 | { |
929 | { |
925 | unsigned int n, s; |
930 | unsigned int n, s; |
926 | |
931 | |
927 | n = cmdbuf_ptr - cmdbuf_base; |
932 | n = cmdbuf_ptr - cmdbuf_base; |
928 | s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; |
933 | s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; |
… | |
… | |
965 | } |
970 | } |
966 | #endif |
971 | #endif |
967 | |
972 | |
968 | if (want_refresh) |
973 | if (want_refresh) |
969 | { |
974 | { |
|
|
975 | if (SHOULD_INVOKE (HOOK_LINE_UPDATE)) |
|
|
976 | { |
|
|
977 | int row = -view_start; |
|
|
978 | int end_row = row + nrow; |
|
|
979 | |
|
|
980 | while (row > -nsaved && ROW (row - 1).is_longer ()) |
|
|
981 | --row; |
|
|
982 | |
|
|
983 | do |
|
|
984 | { |
|
|
985 | int start_row = row; |
|
|
986 | line_t *l; |
|
|
987 | |
|
|
988 | do |
|
|
989 | { |
|
|
990 | l = &ROW (row++); |
|
|
991 | |
|
|
992 | if (!(l->f & LINE_FILTERED)) |
|
|
993 | { |
|
|
994 | // line not filtered, mark it as filtered |
|
|
995 | l->f |= LINE_FILTERED; |
|
|
996 | while (l->is_longer ()) |
|
|
997 | { |
|
|
998 | l = &ROW (row++); |
|
|
999 | l->f |= LINE_FILTERED; |
|
|
1000 | } |
|
|
1001 | |
|
|
1002 | // and filter it |
|
|
1003 | HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END)); |
|
|
1004 | |
|
|
1005 | break; |
|
|
1006 | } |
|
|
1007 | } |
|
|
1008 | while (l->is_longer () && row < end_row); |
|
|
1009 | } |
|
|
1010 | while (row < end_row); |
|
|
1011 | } |
|
|
1012 | |
970 | scr_refresh (refresh_type); |
1013 | scr_refresh (refresh_type); |
971 | scrollbar_show (1); |
1014 | scrollbar_show (1); |
972 | #ifdef USE_XIM |
1015 | #ifdef USE_XIM |
973 | IMSendSpot (); |
1016 | IMSendSpot (); |
974 | #endif |
1017 | #endif |
… | |
… | |
984 | SET_LOCALE (locale); |
1027 | SET_LOCALE (locale); |
985 | |
1028 | |
986 | display->flush (); |
1029 | display->flush (); |
987 | |
1030 | |
988 | if (want_refresh && !flush_ev.active) |
1031 | if (want_refresh && !flush_ev.active) |
989 | flush_ev.start (NOW + 0.01); |
1032 | flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally |
990 | } |
1033 | } |
991 | |
1034 | |
992 | void |
1035 | void |
993 | rxvt_term::flush_cb (time_watcher &w) |
1036 | rxvt_term::flush_cb (time_watcher &w) |
994 | { |
1037 | { |
… | |
… | |
1069 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1112 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1070 | } |
1113 | } |
1071 | } |
1114 | } |
1072 | #endif |
1115 | #endif |
1073 | |
1116 | |
|
|
1117 | #if HAVE_SCHED_YIELD |
|
|
1118 | static struct event_handler |
|
|
1119 | { |
|
|
1120 | check_watcher cw_yield; |
|
|
1121 | |
|
|
1122 | void yield (check_watcher &w) |
|
|
1123 | { |
|
|
1124 | sched_yield (); |
|
|
1125 | w.stop (); |
|
|
1126 | } |
|
|
1127 | |
|
|
1128 | event_handler () |
|
|
1129 | : cw_yield (this, &event_handler::yield) |
|
|
1130 | { |
|
|
1131 | } |
|
|
1132 | } event_handler; |
|
|
1133 | #endif |
|
|
1134 | |
1074 | bool |
1135 | bool |
1075 | rxvt_term::pty_fill () |
1136 | rxvt_term::pty_fill () |
1076 | { |
1137 | { |
1077 | ssize_t n = cmdbuf_endp - cmdbuf_ptr; |
1138 | ssize_t n = cmdbuf_endp - cmdbuf_ptr; |
1078 | |
1139 | |
1079 | if (CBUFSIZ == n) |
1140 | if (CBUFSIZ == n) |
1080 | { |
1141 | { |
1081 | rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); |
1142 | rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n"); |
1082 | n = 0; |
1143 | n = 0; |
1083 | } |
1144 | } |
1084 | |
1145 | |
1085 | memmove (cmdbuf_base, cmdbuf_ptr, n); |
1146 | memmove (cmdbuf_base, cmdbuf_ptr, n); |
1086 | cmdbuf_ptr = cmdbuf_base; |
1147 | cmdbuf_ptr = cmdbuf_base; |
… | |
… | |
1094 | return true; |
1155 | return true; |
1095 | } |
1156 | } |
1096 | else if (r < 0 && (errno == EAGAIN || errno == EINTR)) |
1157 | else if (r < 0 && (errno == EAGAIN || errno == EINTR)) |
1097 | { |
1158 | { |
1098 | #if HAVE_SCHED_YIELD |
1159 | #if HAVE_SCHED_YIELD |
1099 | sched_yield (); |
1160 | if (display->is_local) |
|
|
1161 | event_handler.cw_yield.start (); |
1100 | #endif |
1162 | #endif |
1101 | } |
1163 | } |
1102 | else |
1164 | else |
1103 | { |
1165 | { |
1104 | pty_ev.stop (); |
1166 | pty_ev.stop (); |
… | |
… | |
1142 | |
1204 | |
1143 | #ifdef POINTER_BLANK |
1205 | #ifdef POINTER_BLANK |
1144 | void |
1206 | void |
1145 | rxvt_term::pointer_blank () |
1207 | rxvt_term::pointer_blank () |
1146 | { |
1208 | { |
1147 | if (! OPTION (Opt_pointerBlank)) |
1209 | if (!OPTION (Opt_pointerBlank)) |
1148 | return; |
1210 | return; |
1149 | |
1211 | |
1150 | XDefineCursor (display->display, vt, display->blank_cursor); |
1212 | XDefineCursor (display->display, vt, display->blank_cursor); |
1151 | XFlush (display->display); |
1213 | XFlush (display->display); |
1152 | |
1214 | |
… | |
… | |
1249 | dDisp; |
1311 | dDisp; |
1250 | |
1312 | |
1251 | SET_R (this); |
1313 | SET_R (this); |
1252 | SET_LOCALE (locale); |
1314 | SET_LOCALE (locale); |
1253 | |
1315 | |
1254 | #if defined(CURSOR_BLINK) |
1316 | if (ev.xany.window == vt |
1255 | if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) |
1317 | && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) |
1256 | { |
1318 | return; |
1257 | if (hidden_cursor) |
|
|
1258 | { |
|
|
1259 | hidden_cursor = 0; |
|
|
1260 | want_refresh = 1; |
|
|
1261 | } |
|
|
1262 | |
1319 | |
1263 | cursor_blink_ev.start (NOW + BLINK_INTERVAL); |
1320 | // for XQueryPointer |
1264 | } |
|
|
1265 | #endif |
|
|
1266 | |
|
|
1267 | #if defined(POINTER_BLANK) |
|
|
1268 | if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) |
|
|
1269 | { |
|
|
1270 | if (ev.type == MotionNotify |
|
|
1271 | || ev.type == ButtonPress |
|
|
1272 | || ev.type == ButtonRelease) |
|
|
1273 | if (hidden_pointer) |
|
|
1274 | pointer_unblank (); |
|
|
1275 | |
|
|
1276 | if (ev.type == KeyPress && hidden_pointer == 0) |
|
|
1277 | pointer_blank (); |
|
|
1278 | } |
|
|
1279 | #endif |
|
|
1280 | |
|
|
1281 | Window unused_root, unused_child; |
1321 | Window unused_root, unused_child; |
1282 | int unused_root_x, unused_root_y; |
1322 | int unused_root_x, unused_root_y; |
1283 | unsigned int unused_mask; |
1323 | unsigned int unused_mask; |
1284 | |
1324 | |
1285 | switch (ev.type) |
1325 | switch (ev.type) |
… | |
… | |
1292 | |
1332 | |
1293 | break; |
1333 | break; |
1294 | |
1334 | |
1295 | case KeyRelease: |
1335 | case KeyRelease: |
1296 | { |
1336 | { |
1297 | #if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 |
1337 | #if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL |
1298 | KeySym ks; |
1338 | KeySym keysym; |
1299 | |
1339 | |
1300 | ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ |
1340 | keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ |
1301 | #endif |
1341 | #endif |
1302 | |
1342 | |
1303 | #if ENABLE_FRILLS || ISO_14755 |
1343 | #if ENABLE_FRILLS || ISO_14755 |
1304 | // ISO 14755 support |
1344 | // ISO 14755 support |
1305 | if (iso14755buf) |
1345 | if (iso14755buf) |
… | |
… | |
1310 | # endif |
1350 | # endif |
1311 | # if ISO_14755 |
1351 | # if ISO_14755 |
1312 | // iso14755 part 5.2 handling: release time |
1352 | // iso14755 part 5.2 handling: release time |
1313 | // first: controls |
1353 | // first: controls |
1314 | if ((ev.xkey.state & ControlMask) |
1354 | if ((ev.xkey.state & ControlMask) |
1315 | && ((ks >= 0x40 && ks <= 0x5f) |
1355 | && ((keysym >= 0x40 && keysym <= 0x5f) |
1316 | || (ks >= 0x61 && ks <= 0x7f))) |
1356 | || (keysym >= 0x61 && keysym <= 0x7f))) |
1317 | { |
1357 | { |
1318 | iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); |
1358 | iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f); |
1319 | commit_iso14755 (); |
1359 | commit_iso14755 (); |
1320 | return; // case-break; |
1360 | goto skip_switch; |
1321 | } |
1361 | } |
1322 | |
1362 | |
1323 | for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) |
1363 | for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) |
1324 | if (i[0] == ks) |
1364 | if (i[0] == keysym) |
1325 | { |
1365 | { |
1326 | iso14755buf = ISO_14755_51 | i[1]; |
1366 | iso14755buf = ISO_14755_51 | i[1]; |
1327 | commit_iso14755 (); |
1367 | commit_iso14755 (); |
1328 | return; // case-break; |
1368 | goto skip_switch; |
1329 | } |
1369 | } |
1330 | |
1370 | |
1331 | scr_bell (); |
1371 | scr_bell (); |
1332 | # endif |
1372 | # endif |
1333 | iso14755buf = 0; |
1373 | iso14755buf = 0; |
… | |
… | |
1352 | else |
1392 | else |
1353 | iso14755buf = 0; |
1393 | iso14755buf = 0; |
1354 | } |
1394 | } |
1355 | #endif |
1395 | #endif |
1356 | |
1396 | |
|
|
1397 | if (ev.xany.window == vt |
|
|
1398 | && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END))) |
|
|
1399 | break; |
|
|
1400 | |
1357 | #if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) |
1401 | #if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) |
1358 | if (!(ev.xkey.state & ControlMask)) |
1402 | if (!(ev.xkey.state & ControlMask)) |
1359 | slip_wheel_ev.stop (); |
1403 | slip_wheel_ev.stop (); |
1360 | else if (ks == XK_Control_L || ks == XK_Control_R) |
1404 | else if (keysym == XK_Control_L || keysym == XK_Control_R) |
1361 | mouse_slip_wheel_speed = 0; |
1405 | mouse_slip_wheel_speed = 0; |
1362 | #endif |
1406 | #endif |
1363 | break; |
1407 | break; |
1364 | } |
1408 | } |
1365 | |
1409 | |
… | |
… | |
1495 | |
1539 | |
1496 | case SelectionRequest: |
1540 | case SelectionRequest: |
1497 | selection_send (ev.xselectionrequest); |
1541 | selection_send (ev.xselectionrequest); |
1498 | break; |
1542 | break; |
1499 | |
1543 | |
|
|
1544 | case MapNotify: |
|
|
1545 | mapped = 1; |
|
|
1546 | #ifdef TEXT_BLINK |
|
|
1547 | text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
|
|
1548 | #endif |
|
|
1549 | HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); |
|
|
1550 | break; |
|
|
1551 | |
1500 | case UnmapNotify: |
1552 | case UnmapNotify: |
1501 | mapped = 0; |
1553 | mapped = 0; |
1502 | #ifdef TEXT_BLINK |
1554 | #ifdef TEXT_BLINK |
1503 | text_blink_ev.stop (); |
1555 | text_blink_ev.stop (); |
1504 | #endif |
1556 | #endif |
1505 | break; |
1557 | HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); |
1506 | |
|
|
1507 | case MapNotify: |
|
|
1508 | mapped = 1; |
|
|
1509 | #ifdef TEXT_BLINK |
|
|
1510 | text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
|
|
1511 | #endif |
|
|
1512 | break; |
1558 | break; |
1513 | |
1559 | |
1514 | #ifdef TRANSPARENT |
1560 | #ifdef TRANSPARENT |
1515 | case ReparentNotify: |
1561 | case ReparentNotify: |
1516 | rootwin_cb (ev); |
1562 | rootwin_cb (ev); |
… | |
… | |
1530 | |
1576 | |
1531 | while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) |
1577 | while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) |
1532 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1578 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1533 | ev.xexpose.width, ev.xexpose.height, False); |
1579 | ev.xexpose.width, ev.xexpose.height, False); |
1534 | |
1580 | |
1535 | scr_refresh (refresh_type); |
1581 | want_refresh = 1; |
1536 | } |
1582 | } |
1537 | else |
1583 | else |
1538 | { |
1584 | { |
1539 | XEvent unused_event; |
1585 | XEvent unused_event; |
1540 | |
1586 | |
… | |
… | |
1575 | if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) |
1621 | if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) |
1576 | break; |
1622 | break; |
1577 | |
1623 | |
1578 | if (ev.xany.window == vt) |
1624 | if (ev.xany.window == vt) |
1579 | { |
1625 | { |
|
|
1626 | if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) |
|
|
1627 | ; // nop |
1580 | if (ev.xbutton.state & (Button1Mask | Button3Mask)) |
1628 | else if (ev.xbutton.state & (Button1Mask | Button3Mask)) |
1581 | { |
1629 | { |
1582 | while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) |
1630 | while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) |
1583 | ; |
1631 | ; |
1584 | |
1632 | |
1585 | XQueryPointer (disp, vt, |
1633 | XQueryPointer (disp, vt, |
… | |
… | |
1665 | &unused_root_x, &unused_root_y, |
1713 | &unused_root_x, &unused_root_y, |
1666 | &ev.xbutton.x, &ev.xbutton.y, |
1714 | &ev.xbutton.x, &ev.xbutton.y, |
1667 | &unused_mask); |
1715 | &unused_mask); |
1668 | scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, |
1716 | scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, |
1669 | scrollbar_size ()); |
1717 | scrollbar_size ()); |
1670 | scr_refresh (refresh_type); |
1718 | want_refresh = 1; |
1671 | refresh_limit = 0; |
1719 | refresh_limit = 0; |
1672 | scrollbar_show (1); |
1720 | scrollbar_show (1); |
1673 | } |
1721 | } |
1674 | break; |
1722 | break; |
1675 | } |
1723 | } |
|
|
1724 | |
|
|
1725 | skip_switch: ; |
|
|
1726 | |
|
|
1727 | #if defined(CURSOR_BLINK) |
|
|
1728 | if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) |
|
|
1729 | { |
|
|
1730 | if (hidden_cursor) |
|
|
1731 | { |
|
|
1732 | hidden_cursor = 0; |
|
|
1733 | want_refresh = 1; |
|
|
1734 | } |
|
|
1735 | |
|
|
1736 | cursor_blink_ev.start (NOW + BLINK_INTERVAL); |
|
|
1737 | } |
|
|
1738 | #endif |
|
|
1739 | |
|
|
1740 | #if defined(POINTER_BLANK) |
|
|
1741 | if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) |
|
|
1742 | { |
|
|
1743 | if (ev.type == MotionNotify |
|
|
1744 | || ev.type == ButtonPress |
|
|
1745 | || ev.type == ButtonRelease) |
|
|
1746 | if (hidden_pointer) |
|
|
1747 | pointer_unblank (); |
|
|
1748 | |
|
|
1749 | if (ev.type == KeyPress && hidden_pointer == 0) |
|
|
1750 | pointer_blank (); |
|
|
1751 | } |
|
|
1752 | #endif |
1676 | } |
1753 | } |
1677 | |
1754 | |
1678 | void |
1755 | void |
1679 | rxvt_term::focus_in () |
1756 | rxvt_term::focus_in () |
1680 | { |
1757 | { |
1681 | if (!focus) |
1758 | if (!focus) |
1682 | { |
1759 | { |
1683 | focus = 1; |
1760 | focus = 1; |
1684 | want_refresh = 1; |
1761 | want_refresh = 1; |
|
|
1762 | |
|
|
1763 | HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); |
|
|
1764 | |
1685 | #if USE_XIM |
1765 | #if USE_XIM |
1686 | if (Input_Context != NULL) |
1766 | if (Input_Context != NULL) |
1687 | { |
1767 | { |
1688 | IMSetStatusPosition (); |
1768 | IMSetStatusPosition (); |
1689 | XSetICFocus (Input_Context); |
1769 | XSetICFocus (Input_Context); |
… | |
… | |
1709 | if (focus) |
1789 | if (focus) |
1710 | { |
1790 | { |
1711 | focus = 0; |
1791 | focus = 0; |
1712 | want_refresh = 1; |
1792 | want_refresh = 1; |
1713 | |
1793 | |
|
|
1794 | HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); |
|
|
1795 | |
1714 | #if ENABLE_FRILLS || ISO_14755 |
1796 | #if ENABLE_FRILLS || ISO_14755 |
|
|
1797 | if (iso14755buf) |
|
|
1798 | { |
1715 | iso14755buf = 0; |
1799 | iso14755buf = 0; |
1716 | #endif |
|
|
1717 | #if ENABLE_OVERLAY |
1800 | # if ENABLE_OVERLAY |
1718 | scr_overlay_off (); |
1801 | scr_overlay_off (); |
|
|
1802 | # endif |
|
|
1803 | } |
1719 | #endif |
1804 | #endif |
1720 | #if USE_XIM |
1805 | #if USE_XIM |
1721 | if (Input_Context != NULL) |
1806 | if (Input_Context != NULL) |
1722 | XUnsetICFocus (Input_Context); |
1807 | XUnsetICFocus (Input_Context); |
1723 | #endif |
1808 | #endif |
… | |
… | |
1767 | rxvt_term::button_press (XButtonEvent &ev) |
1852 | rxvt_term::button_press (XButtonEvent &ev) |
1768 | { |
1853 | { |
1769 | int reportmode = 0, clickintime; |
1854 | int reportmode = 0, clickintime; |
1770 | |
1855 | |
1771 | bypass_keystate = ev.state & (ModMetaMask | ShiftMask); |
1856 | bypass_keystate = ev.state & (ModMetaMask | ShiftMask); |
|
|
1857 | |
1772 | if (!bypass_keystate) |
1858 | if (!bypass_keystate) |
1773 | reportmode = !! (priv_modes & PrivMode_mouse_report); |
1859 | reportmode = !! (priv_modes & PrivMode_mouse_report); |
1774 | |
1860 | |
1775 | /* |
1861 | /* |
1776 | * VT window processing of button press |
1862 | * VT window processing of button press |
… | |
… | |
1796 | #ifdef MOUSE_REPORT_DOUBLECLICK |
1882 | #ifdef MOUSE_REPORT_DOUBLECLICK |
1797 | if (ev.button == MEvent.button && clickintime) |
1883 | if (ev.button == MEvent.button && clickintime) |
1798 | { |
1884 | { |
1799 | /* same button, within alloted time */ |
1885 | /* same button, within alloted time */ |
1800 | MEvent.clicks++; |
1886 | MEvent.clicks++; |
|
|
1887 | |
1801 | if (MEvent.clicks > 1) |
1888 | if (MEvent.clicks > 1) |
1802 | { |
1889 | { |
1803 | /* only report double clicks */ |
1890 | /* only report double clicks */ |
1804 | MEvent.clicks = 2; |
1891 | MEvent.clicks = 2; |
1805 | mouse_report (ev); |
1892 | mouse_report (ev); |
… | |
… | |
1825 | else |
1912 | else |
1826 | { |
1913 | { |
1827 | if (ev.button != MEvent.button) |
1914 | if (ev.button != MEvent.button) |
1828 | MEvent.clicks = 0; |
1915 | MEvent.clicks = 0; |
1829 | |
1916 | |
|
|
1917 | if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END))) |
1830 | switch (ev.button) |
1918 | switch (ev.button) |
1831 | { |
1919 | { |
1832 | case Button1: |
1920 | case Button1: |
1833 | /* allow meta + click to select rectangular areas */ |
1921 | /* allow meta + click to select rectangular areas */ |
1834 | /* should be done in screen.C */ |
1922 | /* should be done in screen.C */ |
1835 | #if ENABLE_FRILLS |
1923 | #if ENABLE_FRILLS |
1836 | selection.rect = !!(ev.state & ModMetaMask); |
1924 | selection.rect = !!(ev.state & ModMetaMask); |
1837 | #else |
1925 | #else |
1838 | selection.rect = false; |
1926 | selection.rect = false; |
1839 | #endif |
1927 | #endif |
1840 | |
1928 | |
1841 | /* allow shift+left click to extend selection */ |
1929 | /* allow shift+left click to extend selection */ |
1842 | if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) |
1930 | if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) |
1843 | { |
1931 | { |
1844 | if (MEvent.button == Button1 && clickintime) |
1932 | if (MEvent.button == Button1 && clickintime) |
1845 | selection_rotate (ev.x, ev.y); |
1933 | selection_rotate (ev.x, ev.y); |
1846 | else |
1934 | else |
1847 | selection_extend (ev.x, ev.y, 1); |
1935 | selection_extend (ev.x, ev.y, 1); |
1848 | } |
1936 | } |
1849 | else |
1937 | else |
1850 | { |
1938 | { |
1851 | if (MEvent.button == Button1 && clickintime) |
1939 | if (MEvent.button == Button1 && clickintime) |
1852 | MEvent.clicks++; |
1940 | MEvent.clicks++; |
1853 | else |
1941 | else |
1854 | MEvent.clicks = 1; |
1942 | MEvent.clicks = 1; |
1855 | |
1943 | |
1856 | selection_click (MEvent.clicks, ev.x, ev.y); |
1944 | selection_click (MEvent.clicks, ev.x, ev.y); |
1857 | } |
1945 | } |
1858 | |
1946 | |
1859 | MEvent.button = Button1; |
1947 | MEvent.button = Button1; |
1860 | break; |
1948 | break; |
1861 | |
1949 | |
1862 | case Button3: |
1950 | case Button3: |
1863 | if (MEvent.button == Button3 && clickintime) |
1951 | if (MEvent.button == Button3 && clickintime) |
1864 | selection_rotate (ev.x, ev.y); |
1952 | selection_rotate (ev.x, ev.y); |
1865 | else |
1953 | else |
1866 | selection_extend (ev.x, ev.y, 1); |
1954 | selection_extend (ev.x, ev.y, 1); |
1867 | |
1955 | |
1868 | MEvent.button = Button3; |
1956 | MEvent.button = Button3; |
1869 | break; |
1957 | break; |
1870 | } |
1958 | } |
1871 | } |
1959 | } |
1872 | |
1960 | |
1873 | MEvent.time = ev.time; |
1961 | MEvent.time = ev.time; |
1874 | return; |
1962 | return; |
1875 | } |
1963 | } |
1876 | |
1964 | |
… | |
… | |
2012 | } |
2100 | } |
2013 | |
2101 | |
2014 | break; |
2102 | break; |
2015 | } |
2103 | } |
2016 | } |
2104 | } |
|
|
2105 | |
2017 | return; |
2106 | return; |
2018 | } |
2107 | } |
|
|
2108 | |
2019 | #if MENUBAR |
2109 | #if MENUBAR |
2020 | /* |
2110 | /* |
2021 | * Menubar window processing of button press |
2111 | * Menubar window processing of button press |
2022 | */ |
2112 | */ |
2023 | if (isMenuBarWindow (ev.window)) |
2113 | if (isMenuBarWindow (ev.window)) |
… | |
… | |
2086 | if (priv_modes & PrivMode_mouse_report |
2176 | if (priv_modes & PrivMode_mouse_report |
2087 | && bypass_keystate |
2177 | && bypass_keystate |
2088 | && ev.button == Button1 && MEvent.clicks <= 1) |
2178 | && ev.button == Button1 && MEvent.clicks <= 1) |
2089 | selection_extend (ev.x, ev.y, 0); |
2179 | selection_extend (ev.x, ev.y, 0); |
2090 | |
2180 | |
|
|
2181 | if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) |
|
|
2182 | return; |
|
|
2183 | |
2091 | switch (ev.button) |
2184 | switch (ev.button) |
2092 | { |
2185 | { |
2093 | case Button1: |
2186 | case Button1: |
2094 | case Button3: |
2187 | case Button3: |
2095 | selection_make (ev.time); |
2188 | selection_make (ev.time); |
… | |
… | |
2126 | slip_wheel_ev.start (); |
2219 | slip_wheel_ev.start (); |
2127 | } |
2220 | } |
2128 | else |
2221 | else |
2129 | { |
2222 | { |
2130 | # endif |
2223 | # endif |
2131 | # ifdef JUMP_MOUSE_WHEEL |
|
|
2132 | scr_page (v, i); |
2224 | scr_page (v, i); |
2133 | scr_refresh (SMOOTH_REFRESH); |
|
|
2134 | scrollbar_show (1); |
2225 | scrollbar_show (1); |
2135 | # else |
|
|
2136 | while (i--) |
|
|
2137 | { |
|
|
2138 | scr_page (v, 1); |
|
|
2139 | scr_refresh (SMOOTH_REFRESH); |
|
|
2140 | scrollbar_show (1); |
|
|
2141 | } |
|
|
2142 | # endif |
|
|
2143 | # ifdef MOUSE_SLIP_WHEELING |
2226 | # ifdef MOUSE_SLIP_WHEELING |
2144 | } |
2227 | } |
2145 | #endif |
2228 | # endif |
2146 | } |
2229 | } |
2147 | break; |
2230 | break; |
2148 | #endif |
2231 | #endif |
2149 | } |
2232 | } |
2150 | } |
2233 | } |
… | |
… | |
2639 | |
2722 | |
2640 | bool |
2723 | bool |
2641 | rxvt_term::cmd_parse () |
2724 | rxvt_term::cmd_parse () |
2642 | { |
2725 | { |
2643 | bool flag = false; |
2726 | bool flag = false; |
2644 | unicode_t ch = NOCHAR; |
2727 | wchar_t ch = NOCHAR; |
2645 | unsigned char *seq_begin; // remember start of esc-sequence here |
2728 | char *seq_begin; // remember start of esc-sequence here |
2646 | |
2729 | |
2647 | for (;;) |
2730 | for (;;) |
2648 | { |
2731 | { |
2649 | if (ch == NOCHAR) |
2732 | if (ch == NOCHAR) |
2650 | { |
2733 | { |
2651 | seq_begin = cmdbuf_ptr; |
2734 | seq_begin = cmdbuf_ptr; |
2652 | ch = next_char (); |
2735 | ch = next_char (); |
2653 | } |
|
|
2654 | |
2736 | |
2655 | if (ch == NOCHAR) // TODO: improve |
2737 | if (ch == NOCHAR) |
2656 | break; |
2738 | break; |
|
|
2739 | } |
2657 | |
2740 | |
2658 | if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) |
2741 | if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) |
2659 | { |
2742 | { |
2660 | if (!seen_input) |
2743 | if (!seen_input) |
2661 | { |
2744 | { |
… | |
… | |
2670 | if (seen_resize && cmd_pid) |
2753 | if (seen_resize && cmd_pid) |
2671 | kill (-cmd_pid, SIGWINCH); |
2754 | kill (-cmd_pid, SIGWINCH); |
2672 | } |
2755 | } |
2673 | |
2756 | |
2674 | /* Read a text string from the input buffer */ |
2757 | /* Read a text string from the input buffer */ |
2675 | unicode_t buf[UBUFSIZ]; |
2758 | wchar_t buf[UBUFSIZ]; |
2676 | bool refreshnow = false; |
2759 | bool refreshnow = false; |
2677 | int nlines = 0; |
2760 | int nlines = 0; |
2678 | unicode_t *str = buf; |
2761 | wchar_t *str = buf; |
2679 | unicode_t *eol = str + min (ncol, UBUFSIZ); |
2762 | wchar_t *eol = str + min (ncol, UBUFSIZ); |
2680 | |
2763 | |
2681 | for (;;) |
2764 | for (;;) |
2682 | { |
2765 | { |
2683 | if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) |
2766 | if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) |
2684 | break; |
2767 | break; |
… | |
… | |
2694 | |
2777 | |
2695 | if (!OPTION (Opt_jumpScroll) |
2778 | if (!OPTION (Opt_jumpScroll) |
2696 | || (refresh_count >= refresh_limit * (nrow - 1))) |
2779 | || (refresh_count >= refresh_limit * (nrow - 1))) |
2697 | { |
2780 | { |
2698 | refreshnow = true; |
2781 | refreshnow = true; |
|
|
2782 | refresh_count = 0; |
2699 | ch = NOCHAR; |
2783 | ch = NOCHAR; |
2700 | break; |
2784 | break; |
2701 | } |
2785 | } |
2702 | |
2786 | |
2703 | // scr_add_lines only works for nlines <= nrow - 1. |
2787 | // scr_add_lines only works for nlines <= nrow - 1. |
2704 | if (nlines >= nrow - 1) |
2788 | if (nlines >= nrow - 1) |
2705 | { |
2789 | { |
|
|
2790 | if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) |
2706 | scr_add_lines (buf, nlines, str - buf); |
2791 | scr_add_lines (buf, str - buf, nlines); |
|
|
2792 | |
2707 | nlines = 0; |
2793 | nlines = 0; |
2708 | str = buf; |
2794 | str = buf; |
2709 | eol = str + min (ncol, UBUFSIZ); |
2795 | eol = str + min (ncol, UBUFSIZ); |
2710 | } |
2796 | } |
2711 | |
2797 | |
… | |
… | |
2724 | |
2810 | |
2725 | seq_begin = cmdbuf_ptr; |
2811 | seq_begin = cmdbuf_ptr; |
2726 | ch = next_char (); |
2812 | ch = next_char (); |
2727 | } |
2813 | } |
2728 | |
2814 | |
|
|
2815 | if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) |
2729 | scr_add_lines (buf, nlines, str - buf); |
2816 | scr_add_lines (buf, str - buf, nlines); |
2730 | |
2817 | |
2731 | /* |
2818 | /* |
2732 | * If there have been a lot of new lines, then update the screen |
2819 | * If there have been a lot of new lines, then update the screen |
2733 | * What the heck I'll cheat and only refresh less than every page-full. |
2820 | * What the heck I'll cheat and only refresh less than every page-full. |
2734 | * the number of pages between refreshes is refresh_limit, which |
2821 | * the number of pages between refreshes is refresh_limit, which |
… | |
… | |
2740 | refresh_limit++; |
2827 | refresh_limit++; |
2741 | else |
2828 | else |
2742 | { |
2829 | { |
2743 | flag = true; |
2830 | flag = true; |
2744 | scr_refresh (refresh_type); |
2831 | scr_refresh (refresh_type); |
|
|
2832 | want_refresh = 1; |
2745 | } |
2833 | } |
2746 | } |
2834 | } |
2747 | |
2835 | |
2748 | } |
2836 | } |
2749 | else |
2837 | else |
… | |
… | |
2764 | } |
2852 | } |
2765 | |
2853 | |
2766 | return flag; |
2854 | return flag; |
2767 | } |
2855 | } |
2768 | |
2856 | |
2769 | // read the next octet |
|
|
2770 | unicode_t |
|
|
2771 | rxvt_term::next_octet () |
|
|
2772 | { |
|
|
2773 | return cmdbuf_ptr < cmdbuf_endp |
|
|
2774 | ? *cmdbuf_ptr++ |
|
|
2775 | : NOCHAR; |
|
|
2776 | } |
|
|
2777 | |
|
|
2778 | // read the next character |
2857 | // read the next character |
2779 | unicode_t |
2858 | wchar_t |
2780 | rxvt_term::next_char () |
2859 | rxvt_term::next_char () |
2781 | { |
2860 | { |
2782 | while (cmdbuf_ptr < cmdbuf_endp) |
2861 | while (cmdbuf_ptr < cmdbuf_endp) |
2783 | { |
2862 | { |
2784 | // assume 7-bit to be ascii ALWAYS |
2863 | // assume 7-bit to be ascii ALWAYS |
2785 | if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) |
2864 | if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) |
2786 | return *cmdbuf_ptr++; |
2865 | return *cmdbuf_ptr++; |
2787 | |
2866 | |
2788 | wchar_t wc; |
2867 | wchar_t wc; |
2789 | size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); |
2868 | size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); |
2790 | |
2869 | |
2791 | if (len == (size_t)-2) |
2870 | if (len == (size_t)-2) |
2792 | { |
2871 | { |
2793 | // the mbstate stores incomplete sequences. didn't know this :/ |
2872 | // the mbstate stores incomplete sequences. didn't know this :/ |
2794 | cmdbuf_ptr = cmdbuf_endp; |
2873 | cmdbuf_ptr = cmdbuf_endp; |
2795 | break; |
2874 | break; |
2796 | } |
2875 | } |
2797 | |
2876 | |
2798 | if (len == (size_t)-1) |
2877 | if (len == (size_t)-1) |
2799 | return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through |
2878 | return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through |
2800 | |
2879 | |
2801 | // assume wchar == unicode |
2880 | // assume wchar == unicode |
2802 | cmdbuf_ptr += len; |
2881 | cmdbuf_ptr += len; |
2803 | return wc & UNICODE_MASK; |
2882 | return wc & UNICODE_MASK; |
2804 | } |
2883 | } |
2805 | |
2884 | |
2806 | return NOCHAR; |
2885 | return NOCHAR; |
|
|
2886 | } |
|
|
2887 | |
|
|
2888 | // read the next octet |
|
|
2889 | uint32_t |
|
|
2890 | rxvt_term::next_octet () |
|
|
2891 | { |
|
|
2892 | return cmdbuf_ptr < cmdbuf_endp |
|
|
2893 | ? (unsigned char)*cmdbuf_ptr++ |
|
|
2894 | : NOCHAR; |
2807 | } |
2895 | } |
2808 | |
2896 | |
2809 | /* rxvt_cmd_getc () - Return next input character */ |
2897 | /* rxvt_cmd_getc () - Return next input character */ |
2810 | /* |
2898 | /* |
2811 | * Return the next input character after first passing any keyboard input |
2899 | * Return the next input character after first passing any keyboard input |
2812 | * to the command. |
2900 | * to the command. |
2813 | */ |
2901 | */ |
2814 | unicode_t |
2902 | wchar_t |
2815 | rxvt_term::cmd_getc () |
2903 | rxvt_term::cmd_getc () |
2816 | { |
2904 | { |
2817 | unicode_t c = next_char (); |
2905 | wchar_t c = next_char (); |
2818 | |
2906 | |
2819 | if (c == NOCHAR) |
2907 | if (c == NOCHAR) |
2820 | throw out_of_input; |
2908 | throw out_of_input; |
2821 | |
2909 | |
2822 | return c; |
2910 | return c; |
2823 | } |
2911 | } |
2824 | |
2912 | |
2825 | unicode_t |
2913 | uint32_t |
2826 | rxvt_term::cmd_get8 () |
2914 | rxvt_term::cmd_get8 () |
2827 | { |
2915 | { |
2828 | unicode_t c = next_octet (); |
2916 | uint32_t c = next_octet (); |
2829 | |
2917 | |
2830 | if (c == NOCHAR) |
2918 | if (c == NOCHAR) |
2831 | throw out_of_input; |
2919 | throw out_of_input; |
2832 | |
2920 | |
2833 | return c; |
2921 | return c; |
… | |
… | |
2933 | case C0_ESC: |
3021 | case C0_ESC: |
2934 | process_escape_seq (); |
3022 | process_escape_seq (); |
2935 | break; |
3023 | break; |
2936 | case C0_ENQ: /* terminal Status */ |
3024 | case C0_ENQ: /* terminal Status */ |
2937 | if (rs[Rs_answerbackstring]) |
3025 | if (rs[Rs_answerbackstring]) |
2938 | tt_write ((const unsigned char *)rs[Rs_answerbackstring], |
3026 | tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring])); |
2939 | (unsigned int)strlen (rs[Rs_answerbackstring])); |
|
|
2940 | else |
3027 | else |
2941 | tt_write ((unsigned char *)VT100_ANS, |
3028 | tt_write (VT100_ANS, strlen (VT100_ANS)); |
2942 | (unsigned int)strlen (VT100_ANS)); |
|
|
2943 | break; |
3029 | break; |
2944 | case C0_BEL: /* bell */ |
3030 | case C0_BEL: /* bell */ |
2945 | scr_bell (); |
3031 | scr_bell (); |
2946 | break; |
3032 | break; |
2947 | case C0_BS: /* backspace */ |
3033 | case C0_BS: /* backspace */ |
… | |
… | |
3102 | break; |
3188 | break; |
3103 | |
3189 | |
3104 | /* 8.3.87: NEXT LINE */ |
3190 | /* 8.3.87: NEXT LINE */ |
3105 | case C1_NEL: /* ESC E */ |
3191 | case C1_NEL: /* ESC E */ |
3106 | { |
3192 | { |
3107 | unicode_t nlcr[] = { C0_LF, C0_CR }; |
3193 | wchar_t nlcr[] = { C0_LF, C0_CR }; |
3108 | scr_add_lines (nlcr, 1, 2); |
3194 | scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); |
3109 | } |
3195 | } |
3110 | break; |
3196 | break; |
3111 | |
3197 | |
3112 | /* kidnapped escape sequence: Should be 8.3.48 */ |
3198 | /* kidnapped escape sequence: Should be 8.3.48 */ |
3113 | case C1_ESA: /* ESC G */ |
3199 | case C1_ESA: /* ESC G */ |
… | |
… | |
3135 | process_dcs_seq (); |
3221 | process_dcs_seq (); |
3136 | break; |
3222 | break; |
3137 | |
3223 | |
3138 | /* 8.3.110: SINGLE CHARACTER INTRODUCER */ |
3224 | /* 8.3.110: SINGLE CHARACTER INTRODUCER */ |
3139 | case C1_SCI: /* ESC Z */ |
3225 | case C1_SCI: /* ESC Z */ |
3140 | tt_write ((const unsigned char *)ESCZ_ANSWER, |
3226 | tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); |
3141 | (unsigned int) (sizeof (ESCZ_ANSWER) - 1)); |
|
|
3142 | break; /* steal obsolete ESC [ c */ |
3227 | break; /* steal obsolete ESC [ c */ |
3143 | |
3228 | |
3144 | /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ |
3229 | /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ |
3145 | case C1_CSI: /* ESC [ */ |
3230 | case C1_CSI: /* ESC [ */ |
3146 | process_csi_seq (); |
3231 | process_csi_seq (); |
… | |
… | |
3390 | case CSI_SU: /* 8.3.148: (1) SCROLL UP */ |
3475 | case CSI_SU: /* 8.3.148: (1) SCROLL UP */ |
3391 | scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); |
3476 | scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); |
3392 | break; |
3477 | break; |
3393 | |
3478 | |
3394 | case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ |
3479 | case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ |
3395 | tt_write ((const unsigned char *)VT100_ANS, |
3480 | tt_write (VT100_ANS, sizeof (VT100_ANS) - 1); |
3396 | (unsigned int) (sizeof (VT100_ANS) - 1)); |
|
|
3397 | break; |
3481 | break; |
3398 | |
3482 | |
3399 | case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ |
3483 | case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ |
3400 | process_sgr_mode (nargs, arg); |
3484 | process_sgr_mode (nargs, arg); |
3401 | break; |
3485 | break; |
… | |
… | |
3603 | /*----------------------------------------------------------------------*/ |
3687 | /*----------------------------------------------------------------------*/ |
3604 | /* |
3688 | /* |
3605 | * get input up until STRING TERMINATOR (or BEL) |
3689 | * get input up until STRING TERMINATOR (or BEL) |
3606 | * ends_how is terminator used. returned input must be free()'d |
3690 | * ends_how is terminator used. returned input must be free()'d |
3607 | */ |
3691 | */ |
3608 | unsigned char * |
3692 | char * |
3609 | rxvt_term::get_to_st (unicode_t &ends_how) |
3693 | rxvt_term::get_to_st (unicode_t &ends_how) |
3610 | { |
3694 | { |
3611 | unicode_t ch; |
3695 | unicode_t ch; |
3612 | bool seen_esc = false; |
3696 | bool seen_esc = false; |
3613 | unsigned int n = 0; |
3697 | unsigned int n = 0; |
… | |
… | |
3646 | |
3730 | |
3647 | string[n++] = '\0'; |
3731 | string[n++] = '\0'; |
3648 | |
3732 | |
3649 | ends_how = (ch == 0x5c ? C0_ESC : ch); |
3733 | ends_how = (ch == 0x5c ? C0_ESC : ch); |
3650 | |
3734 | |
3651 | return (unsigned char *)rxvt_wcstombs (string); |
3735 | return rxvt_wcstombs (string); |
3652 | } |
3736 | } |
3653 | |
3737 | |
3654 | /*----------------------------------------------------------------------*/ |
3738 | /*----------------------------------------------------------------------*/ |
3655 | /* |
3739 | /* |
3656 | * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' |
3740 | * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' |
3657 | */ |
3741 | */ |
3658 | void |
3742 | void |
3659 | rxvt_term::process_dcs_seq () |
3743 | rxvt_term::process_dcs_seq () |
3660 | { |
3744 | { |
3661 | unsigned char *s; |
3745 | char *s; |
3662 | unicode_t eh; |
3746 | unicode_t eh; |
3663 | |
3747 | |
3664 | /* |
3748 | /* |
3665 | * Not handled yet |
3749 | * Not handled yet |
3666 | */ |
3750 | */ |
… | |
… | |
3685 | for (arg = 0; isdigit (ch); ch = cmd_getc ()) |
3769 | for (arg = 0; isdigit (ch); ch = cmd_getc ()) |
3686 | arg = arg * 10 + (ch - '0'); |
3770 | arg = arg * 10 + (ch - '0'); |
3687 | |
3771 | |
3688 | if (ch == ';') |
3772 | if (ch == ';') |
3689 | { |
3773 | { |
3690 | unsigned char *s = get_to_st (eh); |
3774 | char *s = get_to_st (eh); |
3691 | |
3775 | |
3692 | if (s) |
3776 | if (s) |
3693 | { |
3777 | { |
3694 | process_xterm_seq (arg, (char *)s, eh); |
3778 | process_xterm_seq (arg, s, eh); |
3695 | free (s); |
3779 | free (s); |
3696 | } |
3780 | } |
3697 | } |
3781 | } |
3698 | } |
3782 | } |
3699 | |
3783 | |
3700 | void |
3784 | void |
3701 | rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) |
3785 | rxvt_term::process_color_seq (int report, int color, const char *str, char resp) |
3702 | { |
3786 | { |
3703 | if (str[0] == '?' && !str[1]) |
3787 | if (str[0] == '?' && !str[1]) |
3704 | { |
3788 | { |
3705 | unsigned short r, g, b; |
3789 | unsigned short r, g, b; |
3706 | pix_colors_focused[color].get (display, r, g, b); |
3790 | pix_colors_focused[color].get (display, r, g, b); |
… | |
… | |
3712 | |
3796 | |
3713 | /* |
3797 | /* |
3714 | * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) |
3798 | * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) |
3715 | */ |
3799 | */ |
3716 | void |
3800 | void |
3717 | rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) |
3801 | rxvt_term::process_xterm_seq (int op, const char *str, char resp) |
3718 | { |
3802 | { |
3719 | int changed = 0; |
3803 | int changed = 0; |
3720 | int color; |
3804 | int color; |
3721 | char *buf, *name; |
3805 | char *buf, *name; |
3722 | bool query = str[0] == '?' && !str[1]; |
3806 | bool query = str[0] == '?' && !str[1]; |
… | |
… | |
3779 | { |
3863 | { |
3780 | if ((name = strchr (buf, ';')) == NULL) |
3864 | if ((name = strchr (buf, ';')) == NULL) |
3781 | break; |
3865 | break; |
3782 | |
3866 | |
3783 | *name++ = '\0'; |
3867 | *name++ = '\0'; |
3784 | color = atoi (buf); |
3868 | color = atoi (buf) + minCOLOR; |
3785 | |
3869 | |
3786 | if (color < 0 || color >= TOTAL_COLORS) |
3870 | if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) |
3787 | break; |
3871 | break; |
3788 | |
3872 | |
3789 | if ((buf = strchr (name, ';')) != NULL) |
3873 | if ((buf = strchr (name, ';')) != NULL) |
3790 | *buf++ = '\0'; |
3874 | *buf++ = '\0'; |
3791 | |
3875 | |
3792 | if (name[0] == '?' && !name[1]) |
3876 | if (name[0] == '?' && !name[1]) |
3793 | { |
3877 | { |
3794 | unsigned short r, g, b; |
3878 | unsigned short r, g, b; |
3795 | pix_colors_focused[color + minCOLOR].get (display, r, g, b); |
3879 | pix_colors_focused[color].get (display, r, g, b); |
3796 | tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); |
3880 | tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); |
3797 | } |
3881 | } |
3798 | else |
3882 | else |
3799 | set_window_color (color + minCOLOR, name); |
3883 | set_window_color (color, name); |
3800 | } |
3884 | } |
3801 | break; |
3885 | break; |
3802 | case XTerm_Color00: |
3886 | case XTerm_Color00: |
3803 | process_color_seq (XTerm_Color00, Color_fg, str, resp); |
3887 | process_color_seq (XTerm_Color00, Color_fg, str, resp); |
3804 | break; |
3888 | break; |
3805 | case XTerm_Color01: |
3889 | case XTerm_Color01: |
3806 | process_color_seq (XTerm_Color00, Color_bg, str, resp); |
3890 | process_color_seq (XTerm_Color01, Color_bg, str, resp); |
3807 | break; |
3891 | break; |
3808 | #ifndef NO_CURSORCOLOR |
3892 | #ifndef NO_CURSORCOLOR |
3809 | case XTerm_Color_cursor: |
3893 | case XTerm_Color_cursor: |
3810 | process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); |
3894 | process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); |
3811 | break; |
3895 | break; |
… | |
… | |
3815 | break; |
3899 | break; |
3816 | case XTerm_Color_pointer_bg: |
3900 | case XTerm_Color_pointer_bg: |
3817 | process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); |
3901 | process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); |
3818 | break; |
3902 | break; |
3819 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
3903 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
3820 | case XTerm_Color_BD: |
|
|
3821 | process_color_seq (XTerm_Color_BD, Color_BD, str, resp); |
|
|
3822 | break; |
|
|
3823 | case XTerm_Color_UL: |
|
|
3824 | process_color_seq (XTerm_Color_UL, Color_UL, str, resp); |
|
|
3825 | break; |
|
|
3826 | case XTerm_Color_RV: |
3904 | case XTerm_Color_RV: |
3827 | process_color_seq (XTerm_Color_RV, Color_RV, str, resp); |
3905 | process_color_seq (XTerm_Color_RV, Color_RV, str, resp); |
|
|
3906 | break; |
|
|
3907 | case Rxvt_Color_BD: |
|
|
3908 | case URxvt_Color_BD: |
|
|
3909 | process_color_seq (op, Color_BD, str, resp); |
|
|
3910 | break; |
|
|
3911 | case Rxvt_Color_UL: |
|
|
3912 | case URxvt_Color_UL: |
|
|
3913 | process_color_seq (op, Color_UL, str, resp); |
3828 | break; |
3914 | break; |
3829 | case URxvt_Color_IT: |
3915 | case URxvt_Color_IT: |
3830 | process_color_seq (URxvt_Color_IT, Color_IT, str, resp); |
3916 | process_color_seq (URxvt_Color_IT, Color_IT, str, resp); |
3831 | break; |
3917 | break; |
3832 | #endif |
3918 | #endif |
… | |
… | |
3837 | if (am_transparent) |
3923 | if (am_transparent) |
3838 | want_full_refresh = want_refresh = 1; |
3924 | want_full_refresh = want_refresh = 1; |
3839 | break; |
3925 | break; |
3840 | #endif |
3926 | #endif |
3841 | |
3927 | |
3842 | case XTerm_Pixmap: |
3928 | case Rxvt_Pixmap: |
3843 | if (*str != ';') |
3929 | if (*str != ';') |
3844 | { |
3930 | { |
3845 | #if XPM_BACKGROUND |
3931 | #if XPM_BACKGROUND |
3846 | scale_pixmap (""); /* reset to default scaling */ |
3932 | scale_pixmap (""); /* reset to default scaling */ |
3847 | set_bgPixmap (str); /* change pixmap */ |
3933 | set_bgPixmap (str); /* change pixmap */ |
3848 | #endif |
|
|
3849 | scr_touch (true); |
3934 | scr_touch (true); |
|
|
3935 | #endif |
3850 | } |
3936 | } |
|
|
3937 | |
3851 | while ((str = strchr (str, ';')) != NULL) |
3938 | while ((str = strchr (str, ';')) != NULL) |
3852 | { |
3939 | { |
3853 | str++; |
3940 | str++; |
3854 | #if XPM_BACKGROUND |
3941 | #if XPM_BACKGROUND |
3855 | changed += scale_pixmap (str); |
3942 | changed += scale_pixmap (str); |
… | |
… | |
3858 | |
3945 | |
3859 | if (changed) |
3946 | if (changed) |
3860 | { |
3947 | { |
3861 | #ifdef XPM_BACKGROUND |
3948 | #ifdef XPM_BACKGROUND |
3862 | resize_pixmap (); |
3949 | resize_pixmap (); |
3863 | #endif |
|
|
3864 | scr_touch (true); |
3950 | scr_touch (true); |
|
|
3951 | #endif |
3865 | } |
3952 | } |
3866 | break; |
3953 | break; |
3867 | |
3954 | |
3868 | case XTerm_restoreFG: |
3955 | case Rxvt_restoreFG: |
3869 | set_window_color (Color_fg, str); |
3956 | set_window_color (Color_fg, str); |
3870 | break; |
3957 | break; |
3871 | case XTerm_restoreBG: |
3958 | case Rxvt_restoreBG: |
3872 | set_window_color (Color_bg, str); |
3959 | set_window_color (Color_bg, str); |
3873 | break; |
3960 | break; |
3874 | |
3961 | |
3875 | case XTerm_logfile: |
3962 | case XTerm_logfile: |
3876 | // TODO, when secure mode? |
3963 | // TODO, when secure mode? |
… | |
… | |
3881 | if (OPTION (Opt_insecure)) |
3968 | if (OPTION (Opt_insecure)) |
3882 | menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked |
3969 | menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked |
3883 | break; |
3970 | break; |
3884 | #endif |
3971 | #endif |
3885 | #if 0 |
3972 | #if 0 |
3886 | case XTerm_dumpscreen: /* no error notices */ |
3973 | case Rxvt_dumpscreen: /* no error notices */ |
3887 | { |
3974 | { |
3888 | int fd; |
3975 | int fd; |
3889 | if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) |
3976 | if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) |
3890 | { |
3977 | { |
3891 | scr_dump (fd); |
3978 | scr_dump (fd); |
… | |
… | |
3929 | } |
4016 | } |
3930 | break; |
4017 | break; |
3931 | |
4018 | |
3932 | case URxvt_view_up: |
4019 | case URxvt_view_up: |
3933 | case URxvt_view_down: |
4020 | case URxvt_view_down: |
|
|
4021 | { |
3934 | int lines = atoi (str); |
4022 | int lines = atoi (str); |
3935 | |
4023 | |
3936 | if (lines) |
4024 | if (lines) |
3937 | scr_page (op == URxvt_view_up ? UP : DN, lines); |
4025 | scr_page (op == URxvt_view_up ? UP : DN, lines); |
3938 | else |
4026 | else |
3939 | { |
|
|
3940 | scr_erase_savelines (); |
4027 | scr_erase_savelines (); |
3941 | } |
4028 | } |
3942 | |
4029 | |
|
|
4030 | break; |
|
|
4031 | #endif |
|
|
4032 | |
|
|
4033 | #if ENABLE_PERL |
|
|
4034 | case URxvt_perl: |
|
|
4035 | if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) |
|
|
4036 | ; // no responses yet |
3943 | break; |
4037 | break; |
3944 | #endif |
4038 | #endif |
3945 | } |
4039 | } |
3946 | } |
4040 | } |
3947 | /*----------------------------------------------------------------------*/ |
4041 | /*----------------------------------------------------------------------*/ |
… | |
… | |
4058 | /* extra handling for values with state unkept */ |
4152 | /* extra handling for values with state unkept */ |
4059 | switch (arg[i]) |
4153 | switch (arg[i]) |
4060 | { |
4154 | { |
4061 | #if ENABLE_STYLES |
4155 | #if ENABLE_STYLES |
4062 | case 1021: |
4156 | case 1021: |
4063 | if (mode) |
4157 | set_option (Opt_intensityStyles, mode); |
4064 | SET_OPTION (Opt_intensityStyles); |
|
|
4065 | else |
|
|
4066 | CLR_OPTION (Opt_intensityStyles); |
|
|
4067 | |
4158 | |
4068 | scr_touch (true); |
4159 | scr_touch (true); |
4069 | break; |
4160 | break; |
4070 | #endif |
4161 | #endif |
4071 | case 1048: /* alternative cursor save */ |
4162 | case 1048: /* alternative cursor save */ |
… | |
… | |
4093 | case 3: /* 80/132 */ |
4184 | case 3: /* 80/132 */ |
4094 | if (priv_modes & PrivMode_132OK) |
4185 | if (priv_modes & PrivMode_132OK) |
4095 | set_widthheight (((state ? 132 : 80) * fwidth), height); |
4186 | set_widthheight (((state ? 132 : 80) * fwidth), height); |
4096 | break; |
4187 | break; |
4097 | case 4: /* smooth scrolling */ |
4188 | case 4: /* smooth scrolling */ |
4098 | if (!state) |
4189 | set_option (Opt_jumpScroll, !state); |
4099 | SET_OPTION (Opt_jumpScroll); |
|
|
4100 | else |
|
|
4101 | CLR_OPTION (Opt_jumpScroll); |
|
|
4102 | break; |
4190 | break; |
4103 | case 5: /* reverse video */ |
4191 | case 5: /* reverse video */ |
4104 | scr_rvideo_mode (state); |
4192 | scr_rvideo_mode (state); |
4105 | break; |
4193 | break; |
4106 | case 6: /* relative/absolute origins */ |
4194 | case 6: /* relative/absolute origins */ |
… | |
… | |
4147 | #if 0 |
4235 | #if 0 |
4148 | case 1001: |
4236 | case 1001: |
4149 | break; /* X11 mouse highlighting */ |
4237 | break; /* X11 mouse highlighting */ |
4150 | #endif |
4238 | #endif |
4151 | case 1010: /* scroll to bottom on TTY output inhibit */ |
4239 | case 1010: /* scroll to bottom on TTY output inhibit */ |
4152 | if (!state) |
4240 | set_option (Opt_scrollTtyOutput, !state); |
4153 | SET_OPTION (Opt_scrollTtyOutput); |
|
|
4154 | else |
|
|
4155 | CLR_OPTION (Opt_scrollTtyOutput); |
|
|
4156 | break; |
4241 | break; |
4157 | case 1011: /* scroll to bottom on key press */ |
4242 | case 1011: /* scroll to bottom on key press */ |
4158 | if (state) |
4243 | set_option (Opt_scrollTtyKeypress, state); |
4159 | SET_OPTION (Opt_scrollTtyKeypress); |
|
|
4160 | else |
|
|
4161 | CLR_OPTION (Opt_scrollTtyKeypress); |
|
|
4162 | break; |
4244 | break; |
4163 | case 1047: /* secondary screen w/ clearing last */ |
4245 | case 1047: /* secondary screen w/ clearing last */ |
4164 | if (OPTION (Opt_secondaryScreen)) |
4246 | if (OPTION (Opt_secondaryScreen)) |
4165 | if (current_screen != PRIMARY) |
4247 | if (current_screen != PRIMARY) |
4166 | scr_erase_screen (2); |
4248 | scr_erase_screen (2); |
… | |
… | |
4304 | scr_color (Color_bg, Color_bg); |
4386 | scr_color (Color_bg, Color_bg); |
4305 | break; |
4387 | break; |
4306 | |
4388 | |
4307 | //case 50: // not variable spacing |
4389 | //case 50: // not variable spacing |
4308 | |
4390 | |
4309 | #ifndef NO_BRIGHTCOLOR |
4391 | #if ENABLE_FRILLS |
4310 | case 90: |
4392 | case 90: |
4311 | case 91: /* set bright fg color */ |
4393 | case 91: /* set bright fg color */ |
4312 | case 92: |
4394 | case 92: |
4313 | case 93: |
4395 | case 93: |
4314 | case 94: |
4396 | case 94: |
… | |
… | |
4359 | */ |
4441 | */ |
4360 | void |
4442 | void |
4361 | rxvt_term::tt_printf (const char *fmt,...) |
4443 | rxvt_term::tt_printf (const char *fmt,...) |
4362 | { |
4444 | { |
4363 | va_list arg_ptr; |
4445 | va_list arg_ptr; |
4364 | unsigned char buf[256]; |
4446 | char buf[256]; |
4365 | |
4447 | |
4366 | va_start (arg_ptr, fmt); |
4448 | va_start (arg_ptr, fmt); |
4367 | vsnprintf ((char *)buf, 256, fmt, arg_ptr); |
4449 | vsnprintf ((char *)buf, 256, fmt, arg_ptr); |
4368 | va_end (arg_ptr); |
4450 | va_end (arg_ptr); |
4369 | tt_write (buf, strlen (buf)); |
4451 | tt_write (buf, strlen (buf)); |
… | |
… | |
4374 | * or generated by us in response to a query ESC sequence. |
4456 | * or generated by us in response to a query ESC sequence. |
4375 | */ |
4457 | */ |
4376 | const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT |
4458 | const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT |
4377 | |
4459 | |
4378 | void |
4460 | void |
4379 | rxvt_term::tt_write (const unsigned char *data, unsigned int len) |
4461 | rxvt_term::tt_write (const char *data, unsigned int len) |
4380 | { |
4462 | { |
|
|
4463 | if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END))) |
|
|
4464 | return; |
|
|
4465 | |
|
|
4466 | if (pty.pty < 0) |
|
|
4467 | return; |
|
|
4468 | |
4381 | if (v_buflen == 0) |
4469 | if (v_buflen == 0) |
4382 | { |
4470 | { |
4383 | ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); |
4471 | ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); |
4384 | |
4472 | |
4385 | if ((unsigned int)written == len) |
4473 | if ((unsigned int)written == len) |
… | |
… | |
4387 | |
4475 | |
4388 | data += written; |
4476 | data += written; |
4389 | len -= written; |
4477 | len -= written; |
4390 | } |
4478 | } |
4391 | |
4479 | |
4392 | v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); |
4480 | v_buffer = (char *)realloc (v_buffer, v_buflen + len); |
4393 | |
4481 | |
4394 | memcpy (v_buffer + v_buflen, data, len); |
4482 | memcpy (v_buffer + v_buflen, data, len); |
4395 | v_buflen += len; |
4483 | v_buflen += len; |
4396 | |
4484 | |
4397 | pty_ev.set (EVENT_READ | EVENT_WRITE); |
4485 | pty_ev.set (EVENT_READ | EVENT_WRITE); |