… | |
… | |
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 | |
|
|
54 | #if HAVE_SCHED_YIELD |
|
|
55 | #undef HAVE_SCHED_YIELD // disabled for the time being |
|
|
56 | //# include <sched.h> |
|
|
57 | #endif |
|
|
58 | |
53 | #ifdef KEYSYM_RESOURCE |
59 | #ifdef KEYSYM_RESOURCE |
54 | # include "keyboard.h" |
60 | # include "keyboard.h" |
55 | #endif |
61 | #endif |
56 | |
62 | |
57 | #include <csignal> |
63 | #include <csignal> |
58 | |
|
|
59 | #define HAVE_SCHED_YIELD 1 //D//TODO//FIXME |
|
|
60 | #if HAVE_SCHED_YIELD |
|
|
61 | # include <sched.h> |
|
|
62 | #endif |
|
|
63 | |
64 | |
64 | /*----------------------------------------------------------------------*/ |
65 | /*----------------------------------------------------------------------*/ |
65 | |
66 | |
66 | #define IS_CONTROL(ch) !((ch) & 0xffffff60UL) |
67 | #define IS_CONTROL(ch) !((ch) & 0xffffff60UL) |
67 | |
68 | |
… | |
… | |
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 | { |
… | |
… | |
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 */ |
… | |
… | |
919 | |
923 | |
920 | #if MENUBAR_MAX || defined (KEYSYM_RESOURCE) |
924 | #if MENUBAR_MAX || defined (KEYSYM_RESOURCE) |
921 | /*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ |
925 | /*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ |
922 | /* attempt to `write' count to the input buffer */ |
926 | /* attempt to `write' count to the input buffer */ |
923 | unsigned int |
927 | unsigned int |
924 | rxvt_term::cmd_write (const unsigned char *str, unsigned int count) |
928 | rxvt_term::cmd_write (const char *str, unsigned int count) |
925 | { |
929 | { |
926 | unsigned int n, s; |
930 | unsigned int n, s; |
927 | |
931 | |
928 | n = cmdbuf_ptr - cmdbuf_base; |
932 | n = cmdbuf_ptr - cmdbuf_base; |
929 | s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; |
933 | s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; |
… | |
… | |
966 | } |
970 | } |
967 | #endif |
971 | #endif |
968 | |
972 | |
969 | if (want_refresh) |
973 | if (want_refresh) |
970 | { |
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 | |
971 | scr_refresh (refresh_type); |
1013 | scr_refresh (refresh_type); |
972 | scrollbar_show (1); |
1014 | scrollbar_show (1); |
973 | #ifdef USE_XIM |
1015 | #ifdef USE_XIM |
974 | IMSendSpot (); |
1016 | IMSendSpot (); |
975 | #endif |
1017 | #endif |
… | |
… | |
985 | SET_LOCALE (locale); |
1027 | SET_LOCALE (locale); |
986 | |
1028 | |
987 | display->flush (); |
1029 | display->flush (); |
988 | |
1030 | |
989 | if (want_refresh && !flush_ev.active) |
1031 | if (want_refresh && !flush_ev.active) |
990 | flush_ev.start (NOW + 0.01); |
1032 | flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally |
991 | } |
1033 | } |
992 | |
1034 | |
993 | void |
1035 | void |
994 | rxvt_term::flush_cb (time_watcher &w) |
1036 | rxvt_term::flush_cb (time_watcher &w) |
995 | { |
1037 | { |
… | |
… | |
1070 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1112 | w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); |
1071 | } |
1113 | } |
1072 | } |
1114 | } |
1073 | #endif |
1115 | #endif |
1074 | |
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 | |
1075 | bool |
1135 | bool |
1076 | rxvt_term::pty_fill () |
1136 | rxvt_term::pty_fill () |
1077 | { |
1137 | { |
1078 | ssize_t n = cmdbuf_endp - cmdbuf_ptr; |
1138 | ssize_t n = cmdbuf_endp - cmdbuf_ptr; |
1079 | |
1139 | |
1080 | if (CBUFSIZ == n) |
1140 | if (CBUFSIZ == n) |
1081 | { |
1141 | { |
1082 | 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"); |
1083 | n = 0; |
1143 | n = 0; |
1084 | } |
1144 | } |
1085 | |
1145 | |
1086 | memmove (cmdbuf_base, cmdbuf_ptr, n); |
1146 | memmove (cmdbuf_base, cmdbuf_ptr, n); |
1087 | cmdbuf_ptr = cmdbuf_base; |
1147 | cmdbuf_ptr = cmdbuf_base; |
… | |
… | |
1095 | return true; |
1155 | return true; |
1096 | } |
1156 | } |
1097 | else if (r < 0 && (errno == EAGAIN || errno == EINTR)) |
1157 | else if (r < 0 && (errno == EAGAIN || errno == EINTR)) |
1098 | { |
1158 | { |
1099 | #if HAVE_SCHED_YIELD |
1159 | #if HAVE_SCHED_YIELD |
1100 | sched_yield (); |
1160 | if (display->is_local) |
|
|
1161 | event_handler.cw_yield.start (); |
1101 | #endif |
1162 | #endif |
1102 | } |
1163 | } |
1103 | else |
1164 | else |
1104 | { |
1165 | { |
1105 | pty_ev.stop (); |
1166 | pty_ev.stop (); |
… | |
… | |
1143 | |
1204 | |
1144 | #ifdef POINTER_BLANK |
1205 | #ifdef POINTER_BLANK |
1145 | void |
1206 | void |
1146 | rxvt_term::pointer_blank () |
1207 | rxvt_term::pointer_blank () |
1147 | { |
1208 | { |
1148 | if (! OPTION (Opt_pointerBlank)) |
1209 | if (!OPTION (Opt_pointerBlank)) |
1149 | return; |
1210 | return; |
1150 | |
1211 | |
1151 | XDefineCursor (display->display, vt, display->blank_cursor); |
1212 | XDefineCursor (display->display, vt, display->blank_cursor); |
1152 | XFlush (display->display); |
1213 | XFlush (display->display); |
1153 | |
1214 | |
… | |
… | |
1250 | dDisp; |
1311 | dDisp; |
1251 | |
1312 | |
1252 | SET_R (this); |
1313 | SET_R (this); |
1253 | SET_LOCALE (locale); |
1314 | SET_LOCALE (locale); |
1254 | |
1315 | |
1255 | #if defined(CURSOR_BLINK) |
1316 | if (ev.xany.window == vt |
1256 | if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) |
1317 | && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END))) |
1257 | { |
1318 | return; |
1258 | if (hidden_cursor) |
|
|
1259 | { |
|
|
1260 | hidden_cursor = 0; |
|
|
1261 | want_refresh = 1; |
|
|
1262 | } |
|
|
1263 | |
|
|
1264 | cursor_blink_ev.start (NOW + BLINK_INTERVAL); |
|
|
1265 | } |
|
|
1266 | #endif |
|
|
1267 | |
|
|
1268 | #if defined(POINTER_BLANK) |
|
|
1269 | if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) |
|
|
1270 | { |
|
|
1271 | if (ev.type == MotionNotify |
|
|
1272 | || ev.type == ButtonPress |
|
|
1273 | || ev.type == ButtonRelease) |
|
|
1274 | if (hidden_pointer) |
|
|
1275 | pointer_unblank (); |
|
|
1276 | |
|
|
1277 | if (ev.type == KeyPress && hidden_pointer == 0) |
|
|
1278 | pointer_blank (); |
|
|
1279 | } |
|
|
1280 | #endif |
|
|
1281 | |
1319 | |
1282 | Window unused_root, unused_child; |
1320 | Window unused_root, unused_child; |
1283 | int unused_root_x, unused_root_y; |
1321 | int unused_root_x, unused_root_y; |
1284 | unsigned int unused_mask; |
1322 | unsigned int unused_mask; |
1285 | |
1323 | |
… | |
… | |
1293 | |
1331 | |
1294 | break; |
1332 | break; |
1295 | |
1333 | |
1296 | case KeyRelease: |
1334 | case KeyRelease: |
1297 | { |
1335 | { |
1298 | #if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 |
1336 | #if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL |
1299 | KeySym ks; |
1337 | KeySym keysym; |
1300 | |
1338 | |
1301 | ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ |
1339 | keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ |
1302 | #endif |
1340 | #endif |
1303 | |
1341 | |
1304 | #if ENABLE_FRILLS || ISO_14755 |
1342 | #if ENABLE_FRILLS || ISO_14755 |
1305 | // ISO 14755 support |
1343 | // ISO 14755 support |
1306 | if (iso14755buf) |
1344 | if (iso14755buf) |
… | |
… | |
1311 | # endif |
1349 | # endif |
1312 | # if ISO_14755 |
1350 | # if ISO_14755 |
1313 | // iso14755 part 5.2 handling: release time |
1351 | // iso14755 part 5.2 handling: release time |
1314 | // first: controls |
1352 | // first: controls |
1315 | if ((ev.xkey.state & ControlMask) |
1353 | if ((ev.xkey.state & ControlMask) |
1316 | && ((ks >= 0x40 && ks <= 0x5f) |
1354 | && ((keysym >= 0x40 && keysym <= 0x5f) |
1317 | || (ks >= 0x61 && ks <= 0x7f))) |
1355 | || (keysym >= 0x61 && keysym <= 0x7f))) |
1318 | { |
1356 | { |
1319 | iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); |
1357 | iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f); |
1320 | commit_iso14755 (); |
1358 | commit_iso14755 (); |
1321 | return; // case-break; |
1359 | goto skip_switch; |
1322 | } |
1360 | } |
1323 | |
1361 | |
1324 | for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) |
1362 | for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) |
1325 | if (i[0] == ks) |
1363 | if (i[0] == keysym) |
1326 | { |
1364 | { |
1327 | iso14755buf = ISO_14755_51 | i[1]; |
1365 | iso14755buf = ISO_14755_51 | i[1]; |
1328 | commit_iso14755 (); |
1366 | commit_iso14755 (); |
1329 | return; // case-break; |
1367 | goto skip_switch; |
1330 | } |
1368 | } |
1331 | |
1369 | |
1332 | scr_bell (); |
1370 | scr_bell (); |
1333 | # endif |
1371 | # endif |
1334 | iso14755buf = 0; |
1372 | iso14755buf = 0; |
… | |
… | |
1353 | else |
1391 | else |
1354 | iso14755buf = 0; |
1392 | iso14755buf = 0; |
1355 | } |
1393 | } |
1356 | #endif |
1394 | #endif |
1357 | |
1395 | |
|
|
1396 | if (ev.xany.window == vt |
|
|
1397 | && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END))) |
|
|
1398 | break; |
|
|
1399 | |
1358 | #if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) |
1400 | #if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) |
1359 | if (!(ev.xkey.state & ControlMask)) |
1401 | if (!(ev.xkey.state & ControlMask)) |
1360 | slip_wheel_ev.stop (); |
1402 | slip_wheel_ev.stop (); |
1361 | else if (ks == XK_Control_L || ks == XK_Control_R) |
1403 | else if (keysym == XK_Control_L || keysym == XK_Control_R) |
1362 | mouse_slip_wheel_speed = 0; |
1404 | mouse_slip_wheel_speed = 0; |
1363 | #endif |
1405 | #endif |
1364 | break; |
1406 | break; |
1365 | } |
1407 | } |
1366 | |
1408 | |
… | |
… | |
1496 | |
1538 | |
1497 | case SelectionRequest: |
1539 | case SelectionRequest: |
1498 | selection_send (ev.xselectionrequest); |
1540 | selection_send (ev.xselectionrequest); |
1499 | break; |
1541 | break; |
1500 | |
1542 | |
|
|
1543 | case MapNotify: |
|
|
1544 | mapped = 1; |
|
|
1545 | #ifdef TEXT_BLINK |
|
|
1546 | text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
|
|
1547 | #endif |
|
|
1548 | HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); |
|
|
1549 | break; |
|
|
1550 | |
1501 | case UnmapNotify: |
1551 | case UnmapNotify: |
1502 | mapped = 0; |
1552 | mapped = 0; |
1503 | #ifdef TEXT_BLINK |
1553 | #ifdef TEXT_BLINK |
1504 | text_blink_ev.stop (); |
1554 | text_blink_ev.stop (); |
1505 | #endif |
1555 | #endif |
1506 | break; |
1556 | HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END)); |
1507 | |
|
|
1508 | case MapNotify: |
|
|
1509 | mapped = 1; |
|
|
1510 | #ifdef TEXT_BLINK |
|
|
1511 | text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
|
|
1512 | #endif |
|
|
1513 | break; |
1557 | break; |
1514 | |
1558 | |
1515 | #ifdef TRANSPARENT |
1559 | #ifdef TRANSPARENT |
1516 | case ReparentNotify: |
1560 | case ReparentNotify: |
1517 | rootwin_cb (ev); |
1561 | rootwin_cb (ev); |
… | |
… | |
1531 | |
1575 | |
1532 | while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) |
1576 | while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) |
1533 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1577 | scr_expose (ev.xexpose.x, ev.xexpose.y, |
1534 | ev.xexpose.width, ev.xexpose.height, False); |
1578 | ev.xexpose.width, ev.xexpose.height, False); |
1535 | |
1579 | |
1536 | scr_refresh (refresh_type); |
1580 | want_refresh = 1; |
1537 | } |
1581 | } |
1538 | else |
1582 | else |
1539 | { |
1583 | { |
1540 | XEvent unused_event; |
1584 | XEvent unused_event; |
1541 | |
1585 | |
… | |
… | |
1560 | #endif |
1604 | #endif |
1561 | } |
1605 | } |
1562 | break; |
1606 | break; |
1563 | |
1607 | |
1564 | case MotionNotify: |
1608 | case MotionNotify: |
|
|
1609 | printf ("motion notify\n");//D |
1565 | #ifdef POINTER_BLANK |
1610 | #ifdef POINTER_BLANK |
1566 | if (hidden_pointer) |
1611 | if (hidden_pointer) |
1567 | pointer_unblank (); |
1612 | pointer_unblank (); |
1568 | #endif |
1613 | #endif |
1569 | #if MENUBAR |
1614 | #if MENUBAR |
… | |
… | |
1576 | if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) |
1621 | if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) |
1577 | break; |
1622 | break; |
1578 | |
1623 | |
1579 | if (ev.xany.window == vt) |
1624 | if (ev.xany.window == vt) |
1580 | { |
1625 | { |
|
|
1626 | if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) |
|
|
1627 | ; // nop |
1581 | if (ev.xbutton.state & (Button1Mask | Button3Mask)) |
1628 | else if (ev.xbutton.state & (Button1Mask | Button3Mask)) |
1582 | { |
1629 | { |
1583 | while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) |
1630 | while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) |
1584 | ; |
1631 | ; |
1585 | |
1632 | |
1586 | XQueryPointer (disp, vt, |
1633 | XQueryPointer (disp, vt, |
… | |
… | |
1666 | &unused_root_x, &unused_root_y, |
1713 | &unused_root_x, &unused_root_y, |
1667 | &ev.xbutton.x, &ev.xbutton.y, |
1714 | &ev.xbutton.x, &ev.xbutton.y, |
1668 | &unused_mask); |
1715 | &unused_mask); |
1669 | scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, |
1716 | scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, |
1670 | scrollbar_size ()); |
1717 | scrollbar_size ()); |
1671 | scr_refresh (refresh_type); |
1718 | want_refresh = 1; |
1672 | refresh_limit = 0; |
1719 | refresh_limit = 0; |
1673 | scrollbar_show (1); |
1720 | scrollbar_show (1); |
1674 | } |
1721 | } |
1675 | break; |
1722 | break; |
1676 | } |
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 |
1677 | } |
1753 | } |
1678 | |
1754 | |
1679 | void |
1755 | void |
1680 | rxvt_term::focus_in () |
1756 | rxvt_term::focus_in () |
1681 | { |
1757 | { |
1682 | if (!focus) |
1758 | if (!focus) |
1683 | { |
1759 | { |
1684 | focus = 1; |
1760 | focus = 1; |
1685 | want_refresh = 1; |
1761 | want_refresh = 1; |
|
|
1762 | |
|
|
1763 | HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); |
|
|
1764 | |
1686 | #if USE_XIM |
1765 | #if USE_XIM |
1687 | if (Input_Context != NULL) |
1766 | if (Input_Context != NULL) |
1688 | { |
1767 | { |
1689 | IMSetStatusPosition (); |
1768 | IMSetStatusPosition (); |
1690 | XSetICFocus (Input_Context); |
1769 | XSetICFocus (Input_Context); |
… | |
… | |
1710 | if (focus) |
1789 | if (focus) |
1711 | { |
1790 | { |
1712 | focus = 0; |
1791 | focus = 0; |
1713 | want_refresh = 1; |
1792 | want_refresh = 1; |
1714 | |
1793 | |
|
|
1794 | HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); |
|
|
1795 | |
1715 | #if ENABLE_FRILLS || ISO_14755 |
1796 | #if ENABLE_FRILLS || ISO_14755 |
|
|
1797 | if (iso14755buf) |
|
|
1798 | { |
1716 | iso14755buf = 0; |
1799 | iso14755buf = 0; |
1717 | #endif |
|
|
1718 | #if ENABLE_OVERLAY |
1800 | # if ENABLE_OVERLAY |
1719 | scr_overlay_off (); |
1801 | scr_overlay_off (); |
|
|
1802 | # endif |
|
|
1803 | } |
1720 | #endif |
1804 | #endif |
1721 | #if USE_XIM |
1805 | #if USE_XIM |
1722 | if (Input_Context != NULL) |
1806 | if (Input_Context != NULL) |
1723 | XUnsetICFocus (Input_Context); |
1807 | XUnsetICFocus (Input_Context); |
1724 | #endif |
1808 | #endif |
… | |
… | |
1768 | rxvt_term::button_press (XButtonEvent &ev) |
1852 | rxvt_term::button_press (XButtonEvent &ev) |
1769 | { |
1853 | { |
1770 | int reportmode = 0, clickintime; |
1854 | int reportmode = 0, clickintime; |
1771 | |
1855 | |
1772 | bypass_keystate = ev.state & (ModMetaMask | ShiftMask); |
1856 | bypass_keystate = ev.state & (ModMetaMask | ShiftMask); |
|
|
1857 | |
1773 | if (!bypass_keystate) |
1858 | if (!bypass_keystate) |
1774 | reportmode = !! (priv_modes & PrivMode_mouse_report); |
1859 | reportmode = !! (priv_modes & PrivMode_mouse_report); |
1775 | |
1860 | |
1776 | /* |
1861 | /* |
1777 | * VT window processing of button press |
1862 | * VT window processing of button press |
… | |
… | |
1797 | #ifdef MOUSE_REPORT_DOUBLECLICK |
1882 | #ifdef MOUSE_REPORT_DOUBLECLICK |
1798 | if (ev.button == MEvent.button && clickintime) |
1883 | if (ev.button == MEvent.button && clickintime) |
1799 | { |
1884 | { |
1800 | /* same button, within alloted time */ |
1885 | /* same button, within alloted time */ |
1801 | MEvent.clicks++; |
1886 | MEvent.clicks++; |
|
|
1887 | |
1802 | if (MEvent.clicks > 1) |
1888 | if (MEvent.clicks > 1) |
1803 | { |
1889 | { |
1804 | /* only report double clicks */ |
1890 | /* only report double clicks */ |
1805 | MEvent.clicks = 2; |
1891 | MEvent.clicks = 2; |
1806 | mouse_report (ev); |
1892 | mouse_report (ev); |
… | |
… | |
1826 | else |
1912 | else |
1827 | { |
1913 | { |
1828 | if (ev.button != MEvent.button) |
1914 | if (ev.button != MEvent.button) |
1829 | MEvent.clicks = 0; |
1915 | MEvent.clicks = 0; |
1830 | |
1916 | |
|
|
1917 | if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END))) |
1831 | switch (ev.button) |
1918 | switch (ev.button) |
1832 | { |
1919 | { |
1833 | case Button1: |
1920 | case Button1: |
1834 | /* allow meta + click to select rectangular areas */ |
1921 | /* allow meta + click to select rectangular areas */ |
1835 | /* should be done in screen.C */ |
1922 | /* should be done in screen.C */ |
1836 | #if ENABLE_FRILLS |
1923 | #if ENABLE_FRILLS |
1837 | selection.rect = !!(ev.state & ModMetaMask); |
1924 | selection.rect = !!(ev.state & ModMetaMask); |
1838 | #else |
1925 | #else |
1839 | selection.rect = false; |
1926 | selection.rect = false; |
1840 | #endif |
1927 | #endif |
1841 | |
1928 | |
1842 | /* allow shift+left click to extend selection */ |
1929 | /* allow shift+left click to extend selection */ |
1843 | if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) |
1930 | if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report)) |
1844 | { |
1931 | { |
1845 | if (MEvent.button == Button1 && clickintime) |
1932 | if (MEvent.button == Button1 && clickintime) |
1846 | selection_rotate (ev.x, ev.y); |
1933 | selection_rotate (ev.x, ev.y); |
1847 | else |
1934 | else |
1848 | selection_extend (ev.x, ev.y, 1); |
1935 | selection_extend (ev.x, ev.y, 1); |
1849 | } |
1936 | } |
1850 | else |
1937 | else |
1851 | { |
1938 | { |
1852 | if (MEvent.button == Button1 && clickintime) |
1939 | if (MEvent.button == Button1 && clickintime) |
1853 | MEvent.clicks++; |
1940 | MEvent.clicks++; |
1854 | else |
1941 | else |
1855 | MEvent.clicks = 1; |
1942 | MEvent.clicks = 1; |
1856 | |
1943 | |
1857 | selection_click (MEvent.clicks, ev.x, ev.y); |
1944 | selection_click (MEvent.clicks, ev.x, ev.y); |
1858 | } |
1945 | } |
1859 | |
1946 | |
1860 | MEvent.button = Button1; |
1947 | MEvent.button = Button1; |
1861 | break; |
1948 | break; |
1862 | |
1949 | |
1863 | case Button3: |
1950 | case Button3: |
1864 | if (MEvent.button == Button3 && clickintime) |
1951 | if (MEvent.button == Button3 && clickintime) |
1865 | selection_rotate (ev.x, ev.y); |
1952 | selection_rotate (ev.x, ev.y); |
1866 | else |
1953 | else |
1867 | selection_extend (ev.x, ev.y, 1); |
1954 | selection_extend (ev.x, ev.y, 1); |
1868 | |
1955 | |
1869 | MEvent.button = Button3; |
1956 | MEvent.button = Button3; |
1870 | break; |
1957 | break; |
1871 | } |
1958 | } |
1872 | } |
1959 | } |
1873 | |
1960 | |
1874 | MEvent.time = ev.time; |
1961 | MEvent.time = ev.time; |
1875 | return; |
1962 | return; |
1876 | } |
1963 | } |
1877 | |
1964 | |
… | |
… | |
2013 | } |
2100 | } |
2014 | |
2101 | |
2015 | break; |
2102 | break; |
2016 | } |
2103 | } |
2017 | } |
2104 | } |
|
|
2105 | |
2018 | return; |
2106 | return; |
2019 | } |
2107 | } |
|
|
2108 | |
2020 | #if MENUBAR |
2109 | #if MENUBAR |
2021 | /* |
2110 | /* |
2022 | * Menubar window processing of button press |
2111 | * Menubar window processing of button press |
2023 | */ |
2112 | */ |
2024 | if (isMenuBarWindow (ev.window)) |
2113 | if (isMenuBarWindow (ev.window)) |
… | |
… | |
2087 | if (priv_modes & PrivMode_mouse_report |
2176 | if (priv_modes & PrivMode_mouse_report |
2088 | && bypass_keystate |
2177 | && bypass_keystate |
2089 | && ev.button == Button1 && MEvent.clicks <= 1) |
2178 | && ev.button == Button1 && MEvent.clicks <= 1) |
2090 | selection_extend (ev.x, ev.y, 0); |
2179 | selection_extend (ev.x, ev.y, 0); |
2091 | |
2180 | |
|
|
2181 | if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) |
|
|
2182 | return; |
|
|
2183 | |
2092 | switch (ev.button) |
2184 | switch (ev.button) |
2093 | { |
2185 | { |
2094 | case Button1: |
2186 | case Button1: |
2095 | case Button3: |
2187 | case Button3: |
2096 | selection_make (ev.time); |
2188 | selection_make (ev.time); |
… | |
… | |
2127 | slip_wheel_ev.start (); |
2219 | slip_wheel_ev.start (); |
2128 | } |
2220 | } |
2129 | else |
2221 | else |
2130 | { |
2222 | { |
2131 | # endif |
2223 | # endif |
2132 | # ifdef JUMP_MOUSE_WHEEL |
|
|
2133 | scr_page (v, i); |
2224 | scr_page (v, i); |
2134 | scr_refresh (SMOOTH_REFRESH); |
|
|
2135 | scrollbar_show (1); |
2225 | scrollbar_show (1); |
2136 | # else |
|
|
2137 | while (i--) |
|
|
2138 | { |
|
|
2139 | scr_page (v, 1); |
|
|
2140 | scr_refresh (SMOOTH_REFRESH); |
|
|
2141 | scrollbar_show (1); |
|
|
2142 | } |
|
|
2143 | # endif |
|
|
2144 | # ifdef MOUSE_SLIP_WHEELING |
2226 | # ifdef MOUSE_SLIP_WHEELING |
2145 | } |
2227 | } |
2146 | #endif |
2228 | # endif |
2147 | } |
2229 | } |
2148 | break; |
2230 | break; |
2149 | #endif |
2231 | #endif |
2150 | } |
2232 | } |
2151 | } |
2233 | } |
… | |
… | |
2640 | |
2722 | |
2641 | bool |
2723 | bool |
2642 | rxvt_term::cmd_parse () |
2724 | rxvt_term::cmd_parse () |
2643 | { |
2725 | { |
2644 | bool flag = false; |
2726 | bool flag = false; |
2645 | unicode_t ch = NOCHAR; |
2727 | wchar_t ch = NOCHAR; |
2646 | unsigned char *seq_begin; // remember start of esc-sequence here |
2728 | char *seq_begin; // remember start of esc-sequence here |
2647 | |
2729 | |
2648 | for (;;) |
2730 | for (;;) |
2649 | { |
2731 | { |
2650 | if (ch == NOCHAR) |
2732 | if (ch == NOCHAR) |
2651 | { |
2733 | { |
2652 | seq_begin = cmdbuf_ptr; |
2734 | seq_begin = cmdbuf_ptr; |
2653 | ch = next_char (); |
2735 | ch = next_char (); |
2654 | } |
|
|
2655 | |
2736 | |
2656 | if (ch == NOCHAR) // TODO: improve |
2737 | if (ch == NOCHAR) |
2657 | break; |
2738 | break; |
|
|
2739 | } |
2658 | |
2740 | |
2659 | 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) |
2660 | { |
2742 | { |
2661 | if (!seen_input) |
2743 | if (!seen_input) |
2662 | { |
2744 | { |
… | |
… | |
2671 | if (seen_resize && cmd_pid) |
2753 | if (seen_resize && cmd_pid) |
2672 | kill (-cmd_pid, SIGWINCH); |
2754 | kill (-cmd_pid, SIGWINCH); |
2673 | } |
2755 | } |
2674 | |
2756 | |
2675 | /* Read a text string from the input buffer */ |
2757 | /* Read a text string from the input buffer */ |
2676 | unicode_t buf[UBUFSIZ]; |
2758 | wchar_t buf[UBUFSIZ]; |
2677 | bool refreshnow = false; |
2759 | bool refreshnow = false; |
2678 | int nlines = 0; |
2760 | int nlines = 0; |
2679 | unicode_t *str = buf; |
2761 | wchar_t *str = buf; |
2680 | unicode_t *eol = str + min (ncol, UBUFSIZ); |
2762 | wchar_t *eol = str + min (ncol, UBUFSIZ); |
2681 | |
2763 | |
2682 | for (;;) |
2764 | for (;;) |
2683 | { |
2765 | { |
2684 | 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)) |
2685 | break; |
2767 | break; |
… | |
… | |
2695 | |
2777 | |
2696 | if (!OPTION (Opt_jumpScroll) |
2778 | if (!OPTION (Opt_jumpScroll) |
2697 | || (refresh_count >= refresh_limit * (nrow - 1))) |
2779 | || (refresh_count >= refresh_limit * (nrow - 1))) |
2698 | { |
2780 | { |
2699 | refreshnow = true; |
2781 | refreshnow = true; |
|
|
2782 | refresh_count = 0; |
2700 | ch = NOCHAR; |
2783 | ch = NOCHAR; |
2701 | break; |
2784 | break; |
2702 | } |
2785 | } |
2703 | |
2786 | |
2704 | // scr_add_lines only works for nlines <= nrow - 1. |
2787 | // scr_add_lines only works for nlines <= nrow - 1. |
2705 | if (nlines >= nrow - 1) |
2788 | if (nlines >= nrow - 1) |
2706 | { |
2789 | { |
|
|
2790 | if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) |
2707 | scr_add_lines (buf, nlines, str - buf); |
2791 | scr_add_lines (buf, str - buf, nlines); |
|
|
2792 | |
2708 | nlines = 0; |
2793 | nlines = 0; |
2709 | str = buf; |
2794 | str = buf; |
2710 | eol = str + min (ncol, UBUFSIZ); |
2795 | eol = str + min (ncol, UBUFSIZ); |
2711 | } |
2796 | } |
2712 | |
2797 | |
… | |
… | |
2725 | |
2810 | |
2726 | seq_begin = cmdbuf_ptr; |
2811 | seq_begin = cmdbuf_ptr; |
2727 | ch = next_char (); |
2812 | ch = next_char (); |
2728 | } |
2813 | } |
2729 | |
2814 | |
|
|
2815 | if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) |
2730 | scr_add_lines (buf, nlines, str - buf); |
2816 | scr_add_lines (buf, str - buf, nlines); |
2731 | |
2817 | |
2732 | /* |
2818 | /* |
2733 | * 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 |
2734 | * 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. |
2735 | * the number of pages between refreshes is refresh_limit, which |
2821 | * the number of pages between refreshes is refresh_limit, which |
… | |
… | |
2741 | refresh_limit++; |
2827 | refresh_limit++; |
2742 | else |
2828 | else |
2743 | { |
2829 | { |
2744 | flag = true; |
2830 | flag = true; |
2745 | scr_refresh (refresh_type); |
2831 | scr_refresh (refresh_type); |
|
|
2832 | want_refresh = 1; |
2746 | } |
2833 | } |
2747 | } |
2834 | } |
2748 | |
2835 | |
2749 | } |
2836 | } |
2750 | else |
2837 | else |
… | |
… | |
2765 | } |
2852 | } |
2766 | |
2853 | |
2767 | return flag; |
2854 | return flag; |
2768 | } |
2855 | } |
2769 | |
2856 | |
2770 | // read the next octet |
|
|
2771 | unicode_t |
|
|
2772 | rxvt_term::next_octet () |
|
|
2773 | { |
|
|
2774 | return cmdbuf_ptr < cmdbuf_endp |
|
|
2775 | ? *cmdbuf_ptr++ |
|
|
2776 | : NOCHAR; |
|
|
2777 | } |
|
|
2778 | |
|
|
2779 | // read the next character |
2857 | // read the next character |
2780 | unicode_t |
2858 | wchar_t |
2781 | rxvt_term::next_char () |
2859 | rxvt_term::next_char () |
2782 | { |
2860 | { |
2783 | while (cmdbuf_ptr < cmdbuf_endp) |
2861 | while (cmdbuf_ptr < cmdbuf_endp) |
2784 | { |
2862 | { |
2785 | // assume 7-bit to be ascii ALWAYS |
2863 | // assume 7-bit to be ascii ALWAYS |
2786 | if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) |
2864 | if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) |
2787 | return *cmdbuf_ptr++; |
2865 | return *cmdbuf_ptr++; |
2788 | |
2866 | |
2789 | wchar_t wc; |
2867 | wchar_t wc; |
2790 | 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); |
2791 | |
2869 | |
2792 | if (len == (size_t)-2) |
2870 | if (len == (size_t)-2) |
2793 | { |
2871 | { |
2794 | // the mbstate stores incomplete sequences. didn't know this :/ |
2872 | // the mbstate stores incomplete sequences. didn't know this :/ |
2795 | cmdbuf_ptr = cmdbuf_endp; |
2873 | cmdbuf_ptr = cmdbuf_endp; |
2796 | break; |
2874 | break; |
2797 | } |
2875 | } |
2798 | |
2876 | |
2799 | if (len == (size_t)-1) |
2877 | if (len == (size_t)-1) |
2800 | 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 |
2801 | |
2879 | |
2802 | // assume wchar == unicode |
2880 | // assume wchar == unicode |
2803 | cmdbuf_ptr += len; |
2881 | cmdbuf_ptr += len; |
2804 | return wc & UNICODE_MASK; |
2882 | return wc & UNICODE_MASK; |
2805 | } |
2883 | } |
2806 | |
2884 | |
2807 | 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; |
2808 | } |
2895 | } |
2809 | |
2896 | |
2810 | /* rxvt_cmd_getc () - Return next input character */ |
2897 | /* rxvt_cmd_getc () - Return next input character */ |
2811 | /* |
2898 | /* |
2812 | * Return the next input character after first passing any keyboard input |
2899 | * Return the next input character after first passing any keyboard input |
2813 | * to the command. |
2900 | * to the command. |
2814 | */ |
2901 | */ |
2815 | unicode_t |
2902 | wchar_t |
2816 | rxvt_term::cmd_getc () |
2903 | rxvt_term::cmd_getc () |
2817 | { |
2904 | { |
2818 | unicode_t c = next_char (); |
2905 | wchar_t c = next_char (); |
2819 | |
2906 | |
2820 | if (c == NOCHAR) |
2907 | if (c == NOCHAR) |
2821 | throw out_of_input; |
2908 | throw out_of_input; |
2822 | |
2909 | |
2823 | return c; |
2910 | return c; |
2824 | } |
2911 | } |
2825 | |
2912 | |
2826 | unicode_t |
2913 | uint32_t |
2827 | rxvt_term::cmd_get8 () |
2914 | rxvt_term::cmd_get8 () |
2828 | { |
2915 | { |
2829 | unicode_t c = next_octet (); |
2916 | uint32_t c = next_octet (); |
2830 | |
2917 | |
2831 | if (c == NOCHAR) |
2918 | if (c == NOCHAR) |
2832 | throw out_of_input; |
2919 | throw out_of_input; |
2833 | |
2920 | |
2834 | return c; |
2921 | return c; |
… | |
… | |
2934 | case C0_ESC: |
3021 | case C0_ESC: |
2935 | process_escape_seq (); |
3022 | process_escape_seq (); |
2936 | break; |
3023 | break; |
2937 | case C0_ENQ: /* terminal Status */ |
3024 | case C0_ENQ: /* terminal Status */ |
2938 | if (rs[Rs_answerbackstring]) |
3025 | if (rs[Rs_answerbackstring]) |
2939 | tt_write ((const unsigned char *)rs[Rs_answerbackstring], |
3026 | tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring])); |
2940 | (unsigned int)strlen (rs[Rs_answerbackstring])); |
|
|
2941 | else |
3027 | else |
2942 | tt_write ((unsigned char *)VT100_ANS, |
3028 | tt_write (VT100_ANS, strlen (VT100_ANS)); |
2943 | (unsigned int)strlen (VT100_ANS)); |
|
|
2944 | break; |
3029 | break; |
2945 | case C0_BEL: /* bell */ |
3030 | case C0_BEL: /* bell */ |
2946 | scr_bell (); |
3031 | scr_bell (); |
2947 | break; |
3032 | break; |
2948 | case C0_BS: /* backspace */ |
3033 | case C0_BS: /* backspace */ |
… | |
… | |
3103 | break; |
3188 | break; |
3104 | |
3189 | |
3105 | /* 8.3.87: NEXT LINE */ |
3190 | /* 8.3.87: NEXT LINE */ |
3106 | case C1_NEL: /* ESC E */ |
3191 | case C1_NEL: /* ESC E */ |
3107 | { |
3192 | { |
3108 | unicode_t nlcr[] = { C0_LF, C0_CR }; |
3193 | wchar_t nlcr[] = { C0_LF, C0_CR }; |
3109 | scr_add_lines (nlcr, 1, 2); |
3194 | scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); |
3110 | } |
3195 | } |
3111 | break; |
3196 | break; |
3112 | |
3197 | |
3113 | /* kidnapped escape sequence: Should be 8.3.48 */ |
3198 | /* kidnapped escape sequence: Should be 8.3.48 */ |
3114 | case C1_ESA: /* ESC G */ |
3199 | case C1_ESA: /* ESC G */ |
… | |
… | |
3136 | process_dcs_seq (); |
3221 | process_dcs_seq (); |
3137 | break; |
3222 | break; |
3138 | |
3223 | |
3139 | /* 8.3.110: SINGLE CHARACTER INTRODUCER */ |
3224 | /* 8.3.110: SINGLE CHARACTER INTRODUCER */ |
3140 | case C1_SCI: /* ESC Z */ |
3225 | case C1_SCI: /* ESC Z */ |
3141 | tt_write ((const unsigned char *)ESCZ_ANSWER, |
3226 | tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); |
3142 | (unsigned int) (sizeof (ESCZ_ANSWER) - 1)); |
|
|
3143 | break; /* steal obsolete ESC [ c */ |
3227 | break; /* steal obsolete ESC [ c */ |
3144 | |
3228 | |
3145 | /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ |
3229 | /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ |
3146 | case C1_CSI: /* ESC [ */ |
3230 | case C1_CSI: /* ESC [ */ |
3147 | process_csi_seq (); |
3231 | process_csi_seq (); |
… | |
… | |
3391 | case CSI_SU: /* 8.3.148: (1) SCROLL UP */ |
3475 | case CSI_SU: /* 8.3.148: (1) SCROLL UP */ |
3392 | scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); |
3476 | scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); |
3393 | break; |
3477 | break; |
3394 | |
3478 | |
3395 | case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ |
3479 | case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ |
3396 | tt_write ((const unsigned char *)VT100_ANS, |
3480 | tt_write (VT100_ANS, sizeof (VT100_ANS) - 1); |
3397 | (unsigned int) (sizeof (VT100_ANS) - 1)); |
|
|
3398 | break; |
3481 | break; |
3399 | |
3482 | |
3400 | case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ |
3483 | case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ |
3401 | process_sgr_mode (nargs, arg); |
3484 | process_sgr_mode (nargs, arg); |
3402 | break; |
3485 | break; |
… | |
… | |
3604 | /*----------------------------------------------------------------------*/ |
3687 | /*----------------------------------------------------------------------*/ |
3605 | /* |
3688 | /* |
3606 | * get input up until STRING TERMINATOR (or BEL) |
3689 | * get input up until STRING TERMINATOR (or BEL) |
3607 | * ends_how is terminator used. returned input must be free()'d |
3690 | * ends_how is terminator used. returned input must be free()'d |
3608 | */ |
3691 | */ |
3609 | unsigned char * |
3692 | char * |
3610 | rxvt_term::get_to_st (unicode_t &ends_how) |
3693 | rxvt_term::get_to_st (unicode_t &ends_how) |
3611 | { |
3694 | { |
3612 | unicode_t ch; |
3695 | unicode_t ch; |
3613 | bool seen_esc = false; |
3696 | bool seen_esc = false; |
3614 | unsigned int n = 0; |
3697 | unsigned int n = 0; |
… | |
… | |
3647 | |
3730 | |
3648 | string[n++] = '\0'; |
3731 | string[n++] = '\0'; |
3649 | |
3732 | |
3650 | ends_how = (ch == 0x5c ? C0_ESC : ch); |
3733 | ends_how = (ch == 0x5c ? C0_ESC : ch); |
3651 | |
3734 | |
3652 | return (unsigned char *)rxvt_wcstombs (string); |
3735 | return rxvt_wcstombs (string); |
3653 | } |
3736 | } |
3654 | |
3737 | |
3655 | /*----------------------------------------------------------------------*/ |
3738 | /*----------------------------------------------------------------------*/ |
3656 | /* |
3739 | /* |
3657 | * 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)' |
3658 | */ |
3741 | */ |
3659 | void |
3742 | void |
3660 | rxvt_term::process_dcs_seq () |
3743 | rxvt_term::process_dcs_seq () |
3661 | { |
3744 | { |
3662 | unsigned char *s; |
3745 | char *s; |
3663 | unicode_t eh; |
3746 | unicode_t eh; |
3664 | |
3747 | |
3665 | /* |
3748 | /* |
3666 | * Not handled yet |
3749 | * Not handled yet |
3667 | */ |
3750 | */ |
… | |
… | |
3686 | for (arg = 0; isdigit (ch); ch = cmd_getc ()) |
3769 | for (arg = 0; isdigit (ch); ch = cmd_getc ()) |
3687 | arg = arg * 10 + (ch - '0'); |
3770 | arg = arg * 10 + (ch - '0'); |
3688 | |
3771 | |
3689 | if (ch == ';') |
3772 | if (ch == ';') |
3690 | { |
3773 | { |
3691 | unsigned char *s = get_to_st (eh); |
3774 | char *s = get_to_st (eh); |
3692 | |
3775 | |
3693 | if (s) |
3776 | if (s) |
3694 | { |
3777 | { |
3695 | process_xterm_seq (arg, (char *)s, eh); |
3778 | process_xterm_seq (arg, s, eh); |
3696 | free (s); |
3779 | free (s); |
3697 | } |
3780 | } |
3698 | } |
3781 | } |
3699 | } |
3782 | } |
3700 | |
3783 | |
3701 | void |
3784 | void |
3702 | 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) |
3703 | { |
3786 | { |
3704 | if (str[0] == '?' && !str[1]) |
3787 | if (str[0] == '?' && !str[1]) |
3705 | { |
3788 | { |
3706 | unsigned short r, g, b; |
3789 | unsigned short r, g, b; |
3707 | pix_colors_focused[color].get (display, r, g, b); |
3790 | pix_colors_focused[color].get (display, r, g, b); |
… | |
… | |
3713 | |
3796 | |
3714 | /* |
3797 | /* |
3715 | * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) |
3798 | * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) |
3716 | */ |
3799 | */ |
3717 | void |
3800 | void |
3718 | 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) |
3719 | { |
3802 | { |
3720 | int changed = 0; |
3803 | int changed = 0; |
3721 | int color; |
3804 | int color; |
3722 | char *buf, *name; |
3805 | char *buf, *name; |
3723 | bool query = str[0] == '?' && !str[1]; |
3806 | bool query = str[0] == '?' && !str[1]; |
… | |
… | |
3780 | { |
3863 | { |
3781 | if ((name = strchr (buf, ';')) == NULL) |
3864 | if ((name = strchr (buf, ';')) == NULL) |
3782 | break; |
3865 | break; |
3783 | |
3866 | |
3784 | *name++ = '\0'; |
3867 | *name++ = '\0'; |
3785 | color = atoi (buf); |
3868 | color = atoi (buf) + minCOLOR; |
3786 | |
3869 | |
3787 | if (color < 0 || color >= TOTAL_COLORS) |
3870 | if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR)) |
3788 | break; |
3871 | break; |
3789 | |
3872 | |
3790 | if ((buf = strchr (name, ';')) != NULL) |
3873 | if ((buf = strchr (name, ';')) != NULL) |
3791 | *buf++ = '\0'; |
3874 | *buf++ = '\0'; |
3792 | |
3875 | |
3793 | if (name[0] == '?' && !name[1]) |
3876 | if (name[0] == '?' && !name[1]) |
3794 | { |
3877 | { |
3795 | unsigned short r, g, b; |
3878 | unsigned short r, g, b; |
3796 | pix_colors_focused[color + minCOLOR].get (display, r, g, b); |
3879 | pix_colors_focused[color].get (display, r, g, b); |
3797 | 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); |
3798 | } |
3881 | } |
3799 | else |
3882 | else |
3800 | set_window_color (color + minCOLOR, name); |
3883 | set_window_color (color, name); |
3801 | } |
3884 | } |
3802 | break; |
3885 | break; |
3803 | case XTerm_Color00: |
3886 | case XTerm_Color00: |
3804 | process_color_seq (XTerm_Color00, Color_fg, str, resp); |
3887 | process_color_seq (XTerm_Color00, Color_fg, str, resp); |
3805 | break; |
3888 | break; |
3806 | case XTerm_Color01: |
3889 | case XTerm_Color01: |
3807 | process_color_seq (XTerm_Color00, Color_bg, str, resp); |
3890 | process_color_seq (XTerm_Color01, Color_bg, str, resp); |
3808 | break; |
3891 | break; |
3809 | #ifndef NO_CURSORCOLOR |
3892 | #ifndef NO_CURSORCOLOR |
3810 | case XTerm_Color_cursor: |
3893 | case XTerm_Color_cursor: |
3811 | process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); |
3894 | process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); |
3812 | break; |
3895 | break; |
… | |
… | |
3816 | break; |
3899 | break; |
3817 | case XTerm_Color_pointer_bg: |
3900 | case XTerm_Color_pointer_bg: |
3818 | 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); |
3819 | break; |
3902 | break; |
3820 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
3903 | #ifndef NO_BOLD_UNDERLINE_REVERSE |
3821 | case XTerm_Color_BD: |
|
|
3822 | process_color_seq (XTerm_Color_BD, Color_BD, str, resp); |
|
|
3823 | break; |
|
|
3824 | case XTerm_Color_UL: |
|
|
3825 | process_color_seq (XTerm_Color_UL, Color_UL, str, resp); |
|
|
3826 | break; |
|
|
3827 | case XTerm_Color_RV: |
3904 | case XTerm_Color_RV: |
3828 | 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); |
3829 | break; |
3914 | break; |
3830 | case URxvt_Color_IT: |
3915 | case URxvt_Color_IT: |
3831 | process_color_seq (URxvt_Color_IT, Color_IT, str, resp); |
3916 | process_color_seq (URxvt_Color_IT, Color_IT, str, resp); |
3832 | break; |
3917 | break; |
3833 | #endif |
3918 | #endif |
… | |
… | |
3838 | if (am_transparent) |
3923 | if (am_transparent) |
3839 | want_full_refresh = want_refresh = 1; |
3924 | want_full_refresh = want_refresh = 1; |
3840 | break; |
3925 | break; |
3841 | #endif |
3926 | #endif |
3842 | |
3927 | |
3843 | case XTerm_Pixmap: |
3928 | case Rxvt_Pixmap: |
3844 | if (*str != ';') |
3929 | if (*str != ';') |
3845 | { |
3930 | { |
3846 | #if XPM_BACKGROUND |
3931 | #if XPM_BACKGROUND |
3847 | scale_pixmap (""); /* reset to default scaling */ |
3932 | scale_pixmap (""); /* reset to default scaling */ |
3848 | set_bgPixmap (str); /* change pixmap */ |
3933 | set_bgPixmap (str); /* change pixmap */ |
3849 | #endif |
|
|
3850 | scr_touch (true); |
3934 | scr_touch (true); |
|
|
3935 | #endif |
3851 | } |
3936 | } |
|
|
3937 | |
3852 | while ((str = strchr (str, ';')) != NULL) |
3938 | while ((str = strchr (str, ';')) != NULL) |
3853 | { |
3939 | { |
3854 | str++; |
3940 | str++; |
3855 | #if XPM_BACKGROUND |
3941 | #if XPM_BACKGROUND |
3856 | changed += scale_pixmap (str); |
3942 | changed += scale_pixmap (str); |
… | |
… | |
3859 | |
3945 | |
3860 | if (changed) |
3946 | if (changed) |
3861 | { |
3947 | { |
3862 | #ifdef XPM_BACKGROUND |
3948 | #ifdef XPM_BACKGROUND |
3863 | resize_pixmap (); |
3949 | resize_pixmap (); |
3864 | #endif |
|
|
3865 | scr_touch (true); |
3950 | scr_touch (true); |
|
|
3951 | #endif |
3866 | } |
3952 | } |
3867 | break; |
3953 | break; |
3868 | |
3954 | |
3869 | case XTerm_restoreFG: |
3955 | case Rxvt_restoreFG: |
3870 | set_window_color (Color_fg, str); |
3956 | set_window_color (Color_fg, str); |
3871 | break; |
3957 | break; |
3872 | case XTerm_restoreBG: |
3958 | case Rxvt_restoreBG: |
3873 | set_window_color (Color_bg, str); |
3959 | set_window_color (Color_bg, str); |
3874 | break; |
3960 | break; |
3875 | |
3961 | |
3876 | case XTerm_logfile: |
3962 | case XTerm_logfile: |
3877 | // TODO, when secure mode? |
3963 | // TODO, when secure mode? |
… | |
… | |
3882 | if (OPTION (Opt_insecure)) |
3968 | if (OPTION (Opt_insecure)) |
3883 | menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked |
3969 | menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked |
3884 | break; |
3970 | break; |
3885 | #endif |
3971 | #endif |
3886 | #if 0 |
3972 | #if 0 |
3887 | case XTerm_dumpscreen: /* no error notices */ |
3973 | case Rxvt_dumpscreen: /* no error notices */ |
3888 | { |
3974 | { |
3889 | int fd; |
3975 | int fd; |
3890 | 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) |
3891 | { |
3977 | { |
3892 | scr_dump (fd); |
3978 | scr_dump (fd); |
… | |
… | |
3930 | } |
4016 | } |
3931 | break; |
4017 | break; |
3932 | |
4018 | |
3933 | case URxvt_view_up: |
4019 | case URxvt_view_up: |
3934 | case URxvt_view_down: |
4020 | case URxvt_view_down: |
|
|
4021 | { |
3935 | int lines = atoi (str); |
4022 | int lines = atoi (str); |
3936 | |
4023 | |
3937 | if (lines) |
4024 | if (lines) |
3938 | scr_page (op == URxvt_view_up ? UP : DN, lines); |
4025 | scr_page (op == URxvt_view_up ? UP : DN, lines); |
3939 | else |
4026 | else |
3940 | { |
|
|
3941 | scr_erase_savelines (); |
4027 | scr_erase_savelines (); |
3942 | } |
4028 | } |
3943 | |
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 |
3944 | break; |
4037 | break; |
3945 | #endif |
4038 | #endif |
3946 | } |
4039 | } |
3947 | } |
4040 | } |
3948 | /*----------------------------------------------------------------------*/ |
4041 | /*----------------------------------------------------------------------*/ |
… | |
… | |
4059 | /* extra handling for values with state unkept */ |
4152 | /* extra handling for values with state unkept */ |
4060 | switch (arg[i]) |
4153 | switch (arg[i]) |
4061 | { |
4154 | { |
4062 | #if ENABLE_STYLES |
4155 | #if ENABLE_STYLES |
4063 | case 1021: |
4156 | case 1021: |
4064 | if (mode) |
4157 | set_option (Opt_intensityStyles, mode); |
4065 | SET_OPTION (Opt_intensityStyles); |
|
|
4066 | else |
|
|
4067 | CLR_OPTION (Opt_intensityStyles); |
|
|
4068 | |
4158 | |
4069 | want_refresh = 1; |
4159 | scr_touch (true); |
4070 | want_full_refresh = 1; |
|
|
4071 | break; |
4160 | break; |
4072 | #endif |
4161 | #endif |
4073 | case 1048: /* alternative cursor save */ |
4162 | case 1048: /* alternative cursor save */ |
4074 | case 1049: |
4163 | case 1049: |
4075 | if (OPTION (Opt_secondaryScreen)) |
4164 | if (OPTION (Opt_secondaryScreen)) |
… | |
… | |
4095 | case 3: /* 80/132 */ |
4184 | case 3: /* 80/132 */ |
4096 | if (priv_modes & PrivMode_132OK) |
4185 | if (priv_modes & PrivMode_132OK) |
4097 | set_widthheight (((state ? 132 : 80) * fwidth), height); |
4186 | set_widthheight (((state ? 132 : 80) * fwidth), height); |
4098 | break; |
4187 | break; |
4099 | case 4: /* smooth scrolling */ |
4188 | case 4: /* smooth scrolling */ |
4100 | if (!state) |
4189 | set_option (Opt_jumpScroll, !state); |
4101 | SET_OPTION (Opt_jumpScroll); |
|
|
4102 | else |
|
|
4103 | CLR_OPTION (Opt_jumpScroll); |
|
|
4104 | break; |
4190 | break; |
4105 | case 5: /* reverse video */ |
4191 | case 5: /* reverse video */ |
4106 | scr_rvideo_mode (state); |
4192 | scr_rvideo_mode (state); |
4107 | break; |
4193 | break; |
4108 | case 6: /* relative/absolute origins */ |
4194 | case 6: /* relative/absolute origins */ |
… | |
… | |
4149 | #if 0 |
4235 | #if 0 |
4150 | case 1001: |
4236 | case 1001: |
4151 | break; /* X11 mouse highlighting */ |
4237 | break; /* X11 mouse highlighting */ |
4152 | #endif |
4238 | #endif |
4153 | case 1010: /* scroll to bottom on TTY output inhibit */ |
4239 | case 1010: /* scroll to bottom on TTY output inhibit */ |
4154 | if (!state) |
4240 | set_option (Opt_scrollTtyOutput, !state); |
4155 | SET_OPTION (Opt_scrollTtyOutput); |
|
|
4156 | else |
|
|
4157 | CLR_OPTION (Opt_scrollTtyOutput); |
|
|
4158 | break; |
4241 | break; |
4159 | case 1011: /* scroll to bottom on key press */ |
4242 | case 1011: /* scroll to bottom on key press */ |
4160 | if (state) |
4243 | set_option (Opt_scrollTtyKeypress, state); |
4161 | SET_OPTION (Opt_scrollTtyKeypress); |
|
|
4162 | else |
|
|
4163 | CLR_OPTION (Opt_scrollTtyKeypress); |
|
|
4164 | break; |
4244 | break; |
4165 | case 1047: /* secondary screen w/ clearing last */ |
4245 | case 1047: /* secondary screen w/ clearing last */ |
4166 | if (OPTION (Opt_secondaryScreen)) |
4246 | if (OPTION (Opt_secondaryScreen)) |
4167 | if (current_screen != PRIMARY) |
4247 | if (current_screen != PRIMARY) |
4168 | scr_erase_screen (2); |
4248 | scr_erase_screen (2); |
… | |
… | |
4306 | scr_color (Color_bg, Color_bg); |
4386 | scr_color (Color_bg, Color_bg); |
4307 | break; |
4387 | break; |
4308 | |
4388 | |
4309 | //case 50: // not variable spacing |
4389 | //case 50: // not variable spacing |
4310 | |
4390 | |
4311 | #ifndef NO_BRIGHTCOLOR |
4391 | #if ENABLE_FRILLS |
4312 | case 90: |
4392 | case 90: |
4313 | case 91: /* set bright fg color */ |
4393 | case 91: /* set bright fg color */ |
4314 | case 92: |
4394 | case 92: |
4315 | case 93: |
4395 | case 93: |
4316 | case 94: |
4396 | case 94: |
… | |
… | |
4361 | */ |
4441 | */ |
4362 | void |
4442 | void |
4363 | rxvt_term::tt_printf (const char *fmt,...) |
4443 | rxvt_term::tt_printf (const char *fmt,...) |
4364 | { |
4444 | { |
4365 | va_list arg_ptr; |
4445 | va_list arg_ptr; |
4366 | unsigned char buf[256]; |
4446 | char buf[256]; |
4367 | |
4447 | |
4368 | va_start (arg_ptr, fmt); |
4448 | va_start (arg_ptr, fmt); |
4369 | vsnprintf ((char *)buf, 256, fmt, arg_ptr); |
4449 | vsnprintf ((char *)buf, 256, fmt, arg_ptr); |
4370 | va_end (arg_ptr); |
4450 | va_end (arg_ptr); |
4371 | tt_write (buf, strlen (buf)); |
4451 | tt_write (buf, strlen (buf)); |
… | |
… | |
4376 | * or generated by us in response to a query ESC sequence. |
4456 | * or generated by us in response to a query ESC sequence. |
4377 | */ |
4457 | */ |
4378 | const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT |
4458 | const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT |
4379 | |
4459 | |
4380 | void |
4460 | void |
4381 | rxvt_term::tt_write (const unsigned char *data, unsigned int len) |
4461 | rxvt_term::tt_write (const char *data, unsigned int len) |
4382 | { |
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 | |
4383 | if (v_buflen == 0) |
4469 | if (v_buflen == 0) |
4384 | { |
4470 | { |
4385 | 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)); |
4386 | |
4472 | |
4387 | if ((unsigned int)written == len) |
4473 | if ((unsigned int)written == len) |
… | |
… | |
4389 | |
4475 | |
4390 | data += written; |
4476 | data += written; |
4391 | len -= written; |
4477 | len -= written; |
4392 | } |
4478 | } |
4393 | |
4479 | |
4394 | v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); |
4480 | v_buffer = (char *)realloc (v_buffer, v_buflen + len); |
4395 | |
4481 | |
4396 | memcpy (v_buffer + v_buflen, data, len); |
4482 | memcpy (v_buffer + v_buflen, data, len); |
4397 | v_buflen += len; |
4483 | v_buflen += len; |
4398 | |
4484 | |
4399 | pty_ev.set (EVENT_READ | EVENT_WRITE); |
4485 | pty_ev.set (EVENT_READ | EVENT_WRITE); |