ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/command.C
(Generate patch)

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.220 by root, Sat Dec 31 18:19:06 2005 UTC vs.
Revision 1.267 by root, Mon Jan 16 15:00:20 2006 UTC

25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
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"
53
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
52 58
53#ifdef KEYSYM_RESOURCE 59#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 60# include "keyboard.h"
55#endif 61#endif
56 62
141 || !IN_RANGE_EXC (y, 0, nrow)) 147 || !IN_RANGE_EXC (y, 0, nrow))
142 return; 148 return;
143 149
144 for (;;) 150 for (;;)
145 { 151 {
146 const line_t &l = ROW(y - view_start); 152 const line_t &l = ROW(y + view_start);
147 153
148 text_t t = l.t[x]; 154 text_t t = l.t[x];
149 155
150 if (t != NOCHAR || !x) 156 if (t != NOCHAR || !x)
151 { 157 {
262 mb[0] = ch[0]; 268 mb[0] = ch[0];
263 len = 1; 269 len = 1;
264 } 270 }
265 271
266 if (len > 0) 272 if (len > 0)
267 tt_write ((unsigned char *)mb, len); 273 tt_write (mb, len);
268 else 274 else
269 scr_bell (); 275 scr_bell ();
270 } 276 }
271 277
272 iso14755buf = 0; 278 iso14755buf = 0;
300 KeySym keysym; 306 KeySym keysym;
301#ifdef DEBUG_CMD 307#ifdef DEBUG_CMD
302 static int debug_key = 1; /* accessible by a debugger only */ 308 static int debug_key = 1; /* accessible by a debugger only */
303#endif 309#endif
304 int valid_keysym; 310 int valid_keysym;
305 unsigned char kbuf[KBUFSZ]; 311 char kbuf[KBUFSZ];
306 312
307 /* 313 /*
308 * 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
309 * escape sequence to toggle the Keypad. 315 * escape sequence to toggle the Keypad.
310 * 316 *
328 Status status_return; 334 Status status_return;
329 335
330#if 0 336#if 0
331#ifdef X_HAVE_UTF8_STRING 337#ifdef X_HAVE_UTF8_STRING
332 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
333 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 339 len = Xutf8LookupString (Input_Context, &ev, kbuf,
334 KBUFSZ, &keysym, &status_return); 340 KBUFSZ, &keysym, &status_return);
335 else 341 else
336#endif 342#endif
337#endif 343#endif
338 { 344 {
375 || status_return == XLookupBoth; 381 || status_return == XLookupBoth;
376 } 382 }
377 else 383 else
378#endif 384#endif
379 { 385 {
380 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 386 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
381 valid_keysym = keysym != NoSymbol; 387 valid_keysym = keysym != NoSymbol;
382 } 388 }
383 389
384 if (valid_keysym) 390 if (valid_keysym)
385 { 391 {
437 scr_move_to (0, 1); 443 scr_move_to (0, 1);
438 return; 444 return;
439 } 445 }
440 else if (keysym == XK_End) 446 else if (keysym == XK_End)
441 { 447 {
442 scr_move_to (1, 0); 448 scr_move_to (1, 1);
443 return; 449 return;
444 } 450 }
445 } 451 }
446#endif 452#endif
447 } 453 }
849 { 855 {
850#ifdef META8_OPTION 856#ifdef META8_OPTION
851 /* set 8-bit on */ 857 /* set 8-bit on */
852 if (meta && (meta_char == 0x80)) 858 if (meta && (meta_char == 0x80))
853 { 859 {
854 unsigned char *ch; 860 char *ch;
855 861
856 for (ch = kbuf; ch < kbuf + len; ch++) 862 for (ch = kbuf; ch < kbuf + len; ch++)
857 *ch |= 0x80; 863 *ch |= 0x80;
858 864
859 meta = 0; 865 meta = 0;
860 } 866 }
861#endif 867#endif
862 /* nil */ ; 868 /* nil */ ;
863 } 869 }
864 } 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;
865 874
866 if (len <= 0) 875 if (len <= 0)
867 return; /* not mapped */ 876 return; /* not mapped */
868 877
869 if (OPTION (Opt_scrollTtyKeypress)) 878 if (OPTION (Opt_scrollTtyKeypress))
892#ifdef META8_OPTION 901#ifdef META8_OPTION
893 && meta_char == C0_ESC 902 && meta_char == C0_ESC
894#endif 903#endif
895 ) 904 )
896 { 905 {
897 const unsigned char ch = C0_ESC; 906 const char ch = C0_ESC;
898 tt_write (&ch, 1); 907 tt_write (&ch, 1);
899 } 908 }
900 909
901#if defined(DEBUG_CMD) 910#if defined(DEBUG_CMD)
902 /* Display keyboard buffer contents */ 911 /* Display keyboard buffer contents */
910#endif /* DEBUG_CMD */ 919#endif /* DEBUG_CMD */
911 tt_write (kbuf, (unsigned int)len); 920 tt_write (kbuf, (unsigned int)len);
912} 921}
913/*}}} */ 922/*}}} */
914 923
915#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 924#if defined (KEYSYM_RESOURCE)
916/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
917/* attempt to `write' count to the input buffer */
918unsigned int 925unsigned int
919rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 926rxvt_term::cmd_write (const char *str, unsigned int count)
920{ 927{
921 unsigned int n, s; 928 unsigned int n, s;
922 929
923 n = cmdbuf_ptr - cmdbuf_base; 930 n = cmdbuf_ptr - cmdbuf_base;
924 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 931 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
961 } 968 }
962#endif 969#endif
963 970
964 if (want_refresh) 971 if (want_refresh)
965 { 972 {
973 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
974 {
975 int row = view_start;
976 int end_row = row + nrow;
977
978 while (row > top_row && ROW (row - 1).is_longer ())
979 --row;
980
981 do
982 {
983 int start_row = row;
984 line_t *l;
985
986 do
987 {
988 l = &ROW (row++);
989
990 if (!(l->f & LINE_FILTERED))
991 {
992 // line not filtered, mark it as filtered
993 l->f |= LINE_FILTERED;
994 while (l->is_longer ())
995 {
996 l = &ROW (row++);
997 l->f |= LINE_FILTERED;
998 }
999
1000 // and filter it
1001 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1002
1003 break;
1004 }
1005 }
1006 while (l->is_longer () && row < end_row);
1007 }
1008 while (row < end_row);
1009 }
1010
966 scr_refresh (refresh_type); 1011 scr_refresh (refresh_type);
967 scrollbar_show (1); 1012 scrollbar_show (1);
968#ifdef USE_XIM 1013#ifdef USE_XIM
969 IMSendSpot (); 1014 IMSendSpot ();
970#endif 1015#endif
974} 1019}
975 1020
976void 1021void
977rxvt_term::check_cb (check_watcher &w) 1022rxvt_term::check_cb (check_watcher &w)
978{ 1023{
979 SET_R (this); 1024 make_current ();
980 SET_LOCALE (locale);
981 1025
982 display->flush (); 1026 display->flush ();
983 1027
984 if (want_refresh && !flush_ev.active) 1028 if (want_refresh && !flush_ev.active)
985 flush_ev.start (NOW + 0.01); 1029 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
986} 1030}
987 1031
988void 1032void
989rxvt_term::flush_cb (time_watcher &w) 1033rxvt_term::flush_cb (time_watcher &w)
990{ 1034{
991 SET_R (this); 1035 make_current ();
992 SET_LOCALE (locale);
993 1036
994 refresh_limit = 1; 1037 refresh_limit = 1;
995 refresh_count = 0; 1038 refresh_count = 0;
996 flush (); 1039 flush ();
997} 1040}
1054{ 1097{
1055 if (mouse_slip_wheel_speed == 0 1098 if (mouse_slip_wheel_speed == 0
1056 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1099 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1057 : scr_page (UP, mouse_slip_wheel_speed)) 1100 : scr_page (UP, mouse_slip_wheel_speed))
1058 { 1101 {
1059 if (view_start == nsaved || 1102 if (view_start == top_row || view_start == 0)
1060 view_start == 0)
1061 mouse_slip_wheel_speed = 0; 1103 mouse_slip_wheel_speed = 0;
1062 1104
1063 refresh_type |= SMOOTH_REFRESH; 1105 refresh_type |= SMOOTH_REFRESH;
1064 want_refresh = 1; 1106 want_refresh = 1;
1065 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1107 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1066 } 1108 }
1067} 1109}
1068#endif 1110#endif
1069 1111
1112#if HAVE_SCHED_YIELD
1113static struct event_handler
1114{
1115 check_watcher cw_yield;
1116
1117 void yield (check_watcher &w)
1118 {
1119 sched_yield ();
1120 w.stop ();
1121 }
1122
1123 event_handler ()
1124 : cw_yield (this, &event_handler::yield)
1125 {
1126 }
1127} event_handler;
1128#endif
1129
1070bool 1130bool
1071rxvt_term::pty_fill () 1131rxvt_term::pty_fill ()
1072{ 1132{
1073 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1133 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1074 1134
1075 if (CBUFSIZ == n) 1135 if (CBUFSIZ == n)
1076 { 1136 {
1077 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1137 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1078 n = 0; 1138 n = 0;
1079 } 1139 }
1080 1140
1081 memmove (cmdbuf_base, cmdbuf_ptr, n); 1141 memmove (cmdbuf_base, cmdbuf_ptr, n);
1082 cmdbuf_ptr = cmdbuf_base; 1142 cmdbuf_ptr = cmdbuf_base;
1083 cmdbuf_endp = cmdbuf_ptr + n; 1143 cmdbuf_endp = cmdbuf_ptr + n;
1084 1144
1085 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1145 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
1086 1146
1087 if (n > 0) 1147 if (r > 0)
1088 { 1148 {
1089 cmdbuf_endp += n; 1149 cmdbuf_endp += r;
1090 return true; 1150 return true;
1091 } 1151 }
1092 else if ((n < 0 && errno != EAGAIN && errno != EINTR) || n == 0) 1152 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1153 {
1154#if HAVE_SCHED_YIELD
1155 if (display->is_local)
1156 event_handler.cw_yield.start ();
1157#endif
1158 }
1159 else
1093 { 1160 {
1094 pty_ev.stop (); 1161 pty_ev.stop ();
1095 1162
1096 if (!OPTION (Opt_hold)) 1163 if (!OPTION (Opt_hold))
1097 destroy (); 1164 destroy ();
1101} 1168}
1102 1169
1103void 1170void
1104rxvt_term::pty_cb (io_watcher &w, short revents) 1171rxvt_term::pty_cb (io_watcher &w, short revents)
1105{ 1172{
1106 SET_R (this); 1173 make_current ();
1107 SET_LOCALE (locale);
1108 1174
1109 if (revents & EVENT_READ) 1175 if (revents & EVENT_READ)
1110 // loop, but don't allow a single term to monopolize us 1176 // loop, but don't allow a single term to monopolize us
1111 while (pty_fill ()) 1177 while (pty_fill ())
1112 if (cmd_parse ()) 1178 if (cmd_parse ())
1132 1198
1133#ifdef POINTER_BLANK 1199#ifdef POINTER_BLANK
1134void 1200void
1135rxvt_term::pointer_blank () 1201rxvt_term::pointer_blank ()
1136{ 1202{
1137 if (! OPTION (Opt_pointerBlank)) 1203 if (!OPTION (Opt_pointerBlank))
1138 return; 1204 return;
1139 1205
1140 XDefineCursor (display->display, vt, display->blank_cursor); 1206 XDefineCursor (display->display, vt, display->blank_cursor);
1141 XFlush (display->display); 1207 XFlush (display->display);
1142 1208
1144} 1210}
1145 1211
1146void 1212void
1147rxvt_term::pointer_cb (time_watcher &w) 1213rxvt_term::pointer_cb (time_watcher &w)
1148{ 1214{
1149 SET_R (this); 1215 make_current ();
1150 SET_LOCALE (locale);
1151 1216
1152 pointer_blank (); 1217 pointer_blank ();
1153} 1218}
1154#endif 1219#endif
1155 1220
1234 1299
1235/*{{{ process an X event */ 1300/*{{{ process an X event */
1236void 1301void
1237rxvt_term::x_cb (XEvent &ev) 1302rxvt_term::x_cb (XEvent &ev)
1238{ 1303{
1304 make_current ();
1305
1239 dDisp; 1306 dDisp;
1240 1307
1241 SET_R (this); 1308 if (ev.xany.window == vt
1242 SET_LOCALE (locale); 1309 && SHOULD_INVOKE (HOOK_X_EVENT)
1310 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1311 return;
1243 1312
1244#if defined(CURSOR_BLINK) 1313 // for XQueryPointer
1245 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1246 {
1247 if (hidden_cursor)
1248 {
1249 hidden_cursor = 0;
1250 want_refresh = 1;
1251 }
1252
1253 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1254 }
1255#endif
1256
1257#if defined(POINTER_BLANK)
1258 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1259 {
1260 if (ev.type == MotionNotify
1261 || ev.type == ButtonPress
1262 || ev.type == ButtonRelease)
1263 if (hidden_pointer)
1264 pointer_unblank ();
1265
1266 if (ev.type == KeyPress && hidden_pointer == 0)
1267 pointer_blank ();
1268 }
1269#endif
1270
1271 Window unused_root, unused_child; 1314 Window unused_root, unused_child;
1272 int unused_root_x, unused_root_y; 1315 int unused_root_x, unused_root_y;
1273 unsigned int unused_mask; 1316 unsigned int unused_mask;
1274 1317
1275 switch (ev.type) 1318 switch (ev.type)
1282 1325
1283 break; 1326 break;
1284 1327
1285 case KeyRelease: 1328 case KeyRelease:
1286 { 1329 {
1287#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1330#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1288 KeySym ks; 1331 KeySym keysym;
1289 1332
1290 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1333 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1291#endif 1334#endif
1292 1335
1293#if ENABLE_FRILLS || ISO_14755 1336#if ENABLE_FRILLS || ISO_14755
1294 // ISO 14755 support 1337 // ISO 14755 support
1295 if (iso14755buf) 1338 if (iso14755buf)
1300# endif 1343# endif
1301# if ISO_14755 1344# if ISO_14755
1302 // iso14755 part 5.2 handling: release time 1345 // iso14755 part 5.2 handling: release time
1303 // first: controls 1346 // first: controls
1304 if ((ev.xkey.state & ControlMask) 1347 if ((ev.xkey.state & ControlMask)
1305 && ((ks >= 0x40 && ks <= 0x5f) 1348 && ((keysym >= 0x40 && keysym <= 0x5f)
1306 || (ks >= 0x61 && ks <= 0x7f))) 1349 || (keysym >= 0x61 && keysym <= 0x7f)))
1307 { 1350 {
1308 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1351 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1309 commit_iso14755 (); 1352 commit_iso14755 ();
1310 return; // case-break; 1353 goto skip_switch;
1311 } 1354 }
1312 1355
1313 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1356 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1314 if (i[0] == ks) 1357 if (i[0] == keysym)
1315 { 1358 {
1316 iso14755buf = ISO_14755_51 | i[1]; 1359 iso14755buf = ISO_14755_51 | i[1];
1317 commit_iso14755 (); 1360 commit_iso14755 ();
1318 return; // case-break; 1361 goto skip_switch;
1319 } 1362 }
1320 1363
1321 scr_bell (); 1364 scr_bell ();
1322# endif 1365# endif
1323 iso14755buf = 0; 1366 iso14755buf = 0;
1342 else 1385 else
1343 iso14755buf = 0; 1386 iso14755buf = 0;
1344 } 1387 }
1345#endif 1388#endif
1346 1389
1390 if (ev.xany.window == vt
1391 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1392 break;
1393
1347#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1394#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1348 if (!(ev.xkey.state & ControlMask)) 1395 if (!(ev.xkey.state & ControlMask))
1349 slip_wheel_ev.stop (); 1396 slip_wheel_ev.stop ();
1350 else if (ks == XK_Control_L || ks == XK_Control_R) 1397 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1351 mouse_slip_wheel_speed = 0; 1398 mouse_slip_wheel_speed = 0;
1352#endif 1399#endif
1353 break; 1400 break;
1354 } 1401 }
1355 1402
1485 1532
1486 case SelectionRequest: 1533 case SelectionRequest:
1487 selection_send (ev.xselectionrequest); 1534 selection_send (ev.xselectionrequest);
1488 break; 1535 break;
1489 1536
1537 case MapNotify:
1538 mapped = 1;
1539#ifdef TEXT_BLINK
1540 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1541#endif
1542 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1543 break;
1544
1490 case UnmapNotify: 1545 case UnmapNotify:
1491 mapped = 0; 1546 mapped = 0;
1492#ifdef TEXT_BLINK 1547#ifdef TEXT_BLINK
1493 text_blink_ev.stop (); 1548 text_blink_ev.stop ();
1494#endif 1549#endif
1495 break; 1550 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1496
1497 case MapNotify:
1498 mapped = 1;
1499#ifdef TEXT_BLINK
1500 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1501#endif
1502 break; 1551 break;
1503 1552
1504#ifdef TRANSPARENT 1553#ifdef TRANSPARENT
1505 case ReparentNotify: 1554 case ReparentNotify:
1506 rootwin_cb (ev); 1555 rootwin_cb (ev);
1520 1569
1521 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1570 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1522 scr_expose (ev.xexpose.x, ev.xexpose.y, 1571 scr_expose (ev.xexpose.x, ev.xexpose.y,
1523 ev.xexpose.width, ev.xexpose.height, False); 1572 ev.xexpose.width, ev.xexpose.height, False);
1524 1573
1525 scr_refresh (refresh_type); 1574 want_refresh = 1;
1526 } 1575 }
1527 else 1576 else
1528 { 1577 {
1529 XEvent unused_event; 1578 XEvent unused_event;
1530 1579
1536 if (isScrollbarWindow (ev.xany.window)) 1585 if (isScrollbarWindow (ev.xany.window))
1537 { 1586 {
1538 scrollBar.setIdle (); 1587 scrollBar.setIdle ();
1539 scrollbar_show (0); 1588 scrollbar_show (0);
1540 } 1589 }
1541#ifdef MENUBAR
1542 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1543 menubar_expose ();
1544#endif
1545 1590
1546#ifdef TRANSPARENT 1591#ifdef TRANSPARENT
1547 if (am_transparent && ev.xany.window == parent[0]) 1592 if (am_transparent && ev.xany.window == parent[0])
1548 XClearWindow (disp, ev.xany.window); 1593 XClearWindow (disp, ev.xany.window);
1549#endif 1594#endif
1553 case MotionNotify: 1598 case MotionNotify:
1554#ifdef POINTER_BLANK 1599#ifdef POINTER_BLANK
1555 if (hidden_pointer) 1600 if (hidden_pointer)
1556 pointer_unblank (); 1601 pointer_unblank ();
1557#endif 1602#endif
1558#if MENUBAR
1559 if (isMenuBarWindow (ev.xany.window))
1560 {
1561 menubar_control (ev.xbutton);
1562 break;
1563 }
1564#endif
1565 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1603 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1566 break; 1604 break;
1567 1605
1568 if (ev.xany.window == vt) 1606 if (ev.xany.window == vt)
1569 { 1607 {
1608 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1609 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1610 ; // nop
1570 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1611 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1571 { 1612 {
1572 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1613 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1573 ; 1614 ;
1574 1615
1575 XQueryPointer (disp, vt, 1616 XQueryPointer (disp, vt,
1655 &unused_root_x, &unused_root_y, 1696 &unused_root_x, &unused_root_y,
1656 &ev.xbutton.x, &ev.xbutton.y, 1697 &ev.xbutton.x, &ev.xbutton.y,
1657 &unused_mask); 1698 &unused_mask);
1658 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1699 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1659 scrollbar_size ()); 1700 scrollbar_size ());
1660 scr_refresh (refresh_type); 1701 want_refresh = 1;
1661 refresh_limit = 0; 1702 refresh_limit = 0;
1662 scrollbar_show (1); 1703 scrollbar_show (1);
1663 } 1704 }
1664 break; 1705 break;
1665 } 1706 }
1707
1708skip_switch: ;
1709
1710#if defined(CURSOR_BLINK)
1711 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1712 {
1713 if (hidden_cursor)
1714 {
1715 hidden_cursor = 0;
1716 want_refresh = 1;
1717 }
1718
1719 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1720 }
1721#endif
1722
1723#if defined(POINTER_BLANK)
1724 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1725 {
1726 if (ev.type == MotionNotify
1727 || ev.type == ButtonPress
1728 || ev.type == ButtonRelease)
1729 if (hidden_pointer)
1730 pointer_unblank ();
1731
1732 if (ev.type == KeyPress && hidden_pointer == 0)
1733 pointer_blank ();
1734 }
1735#endif
1666} 1736}
1667 1737
1668void 1738void
1669rxvt_term::focus_in () 1739rxvt_term::focus_in ()
1670{ 1740{
1671 if (!focus) 1741 if (!focus)
1672 { 1742 {
1673 focus = 1; 1743 focus = 1;
1674 want_refresh = 1; 1744 want_refresh = 1;
1745
1746 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1747
1675#if USE_XIM 1748#if USE_XIM
1676 if (Input_Context != NULL) 1749 if (Input_Context != NULL)
1677 { 1750 {
1678 IMSetStatusPosition (); 1751 IMSetStatusPosition ();
1679 XSetICFocus (Input_Context); 1752 XSetICFocus (Input_Context);
1699 if (focus) 1772 if (focus)
1700 { 1773 {
1701 focus = 0; 1774 focus = 0;
1702 want_refresh = 1; 1775 want_refresh = 1;
1703 1776
1777 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1778
1704#if ENABLE_FRILLS || ISO_14755 1779#if ENABLE_FRILLS || ISO_14755
1780 if (iso14755buf)
1781 {
1705 iso14755buf = 0; 1782 iso14755buf = 0;
1706#endif
1707#if ENABLE_OVERLAY 1783# if ENABLE_OVERLAY
1708 scr_overlay_off (); 1784 scr_overlay_off ();
1785# endif
1786 }
1709#endif 1787#endif
1710#if USE_XIM 1788#if USE_XIM
1711 if (Input_Context != NULL) 1789 if (Input_Context != NULL)
1712 XUnsetICFocus (Input_Context); 1790 XUnsetICFocus (Input_Context);
1713#endif 1791#endif
1728 1806
1729#if TRANSPARENT 1807#if TRANSPARENT
1730void 1808void
1731rxvt_term::rootwin_cb (XEvent &ev) 1809rxvt_term::rootwin_cb (XEvent &ev)
1732{ 1810{
1733 SET_R (this); 1811 make_current ();
1734 SET_LOCALE (locale);
1735 1812
1736 switch (ev.type) 1813 switch (ev.type)
1737 { 1814 {
1738 case PropertyNotify: 1815 case PropertyNotify:
1739 /* 1816 /*
1757rxvt_term::button_press (XButtonEvent &ev) 1834rxvt_term::button_press (XButtonEvent &ev)
1758{ 1835{
1759 int reportmode = 0, clickintime; 1836 int reportmode = 0, clickintime;
1760 1837
1761 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1838 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1839
1762 if (!bypass_keystate) 1840 if (!bypass_keystate)
1763 reportmode = !! (priv_modes & PrivMode_mouse_report); 1841 reportmode = !! (priv_modes & PrivMode_mouse_report);
1764 1842
1765 /* 1843 /*
1766 * VT window processing of button press 1844 * VT window processing of button press
1786#ifdef MOUSE_REPORT_DOUBLECLICK 1864#ifdef MOUSE_REPORT_DOUBLECLICK
1787 if (ev.button == MEvent.button && clickintime) 1865 if (ev.button == MEvent.button && clickintime)
1788 { 1866 {
1789 /* same button, within alloted time */ 1867 /* same button, within alloted time */
1790 MEvent.clicks++; 1868 MEvent.clicks++;
1869
1791 if (MEvent.clicks > 1) 1870 if (MEvent.clicks > 1)
1792 { 1871 {
1793 /* only report double clicks */ 1872 /* only report double clicks */
1794 MEvent.clicks = 2; 1873 MEvent.clicks = 2;
1795 mouse_report (ev); 1874 mouse_report (ev);
1815 else 1894 else
1816 { 1895 {
1817 if (ev.button != MEvent.button) 1896 if (ev.button != MEvent.button)
1818 MEvent.clicks = 0; 1897 MEvent.clicks = 0;
1819 1898
1899 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1820 switch (ev.button) 1900 switch (ev.button)
1821 { 1901 {
1822 case Button1: 1902 case Button1:
1823 /* allow meta + click to select rectangular areas */ 1903 /* allow meta + click to select rectangular areas */
1824 /* should be done in screen.C */ 1904 /* should be done in screen.C */
1825#if ENABLE_FRILLS 1905#if ENABLE_FRILLS
1826 selection.rect = !!(ev.state & ModMetaMask); 1906 selection.rect = !!(ev.state & ModMetaMask);
1827#else 1907#else
1828 selection.rect = false; 1908 selection.rect = false;
1829#endif 1909#endif
1830 1910
1831 /* allow shift+left click to extend selection */ 1911 /* allow shift+left click to extend selection */
1832 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1912 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1833 { 1913 {
1834 if (MEvent.button == Button1 && clickintime) 1914 if (MEvent.button == Button1 && clickintime)
1835 selection_rotate (ev.x, ev.y); 1915 selection_rotate (ev.x, ev.y);
1836 else 1916 else
1837 selection_extend (ev.x, ev.y, 1); 1917 selection_extend (ev.x, ev.y, 1);
1838 } 1918 }
1839 else 1919 else
1840 { 1920 {
1841 if (MEvent.button == Button1 && clickintime) 1921 if (MEvent.button == Button1 && clickintime)
1842 MEvent.clicks++; 1922 MEvent.clicks++;
1843 else 1923 else
1844 MEvent.clicks = 1; 1924 MEvent.clicks = 1;
1845 1925
1846 selection_click (MEvent.clicks, ev.x, ev.y); 1926 selection_click (MEvent.clicks, ev.x, ev.y);
1847 } 1927 }
1848 1928
1849 MEvent.button = Button1; 1929 MEvent.button = Button1;
1850 break; 1930 break;
1851 1931
1852 case Button3: 1932 case Button3:
1853 if (MEvent.button == Button3 && clickintime) 1933 if (MEvent.button == Button3 && clickintime)
1854 selection_rotate (ev.x, ev.y); 1934 selection_rotate (ev.x, ev.y);
1855 else 1935 else
1856 selection_extend (ev.x, ev.y, 1); 1936 selection_extend (ev.x, ev.y, 1);
1857 1937
1858 MEvent.button = Button3; 1938 MEvent.button = Button3;
1859 break; 1939 break;
1860 } 1940 }
1861 } 1941 }
1862 1942
1863 MEvent.time = ev.time; 1943 MEvent.time = ev.time;
1864 return; 1944 return;
1865 } 1945 }
1866 1946
2002 } 2082 }
2003 2083
2004 break; 2084 break;
2005 } 2085 }
2006 } 2086 }
2087
2007 return; 2088 return;
2008 } 2089 }
2009#if MENUBAR
2010 /*
2011 * Menubar window processing of button press
2012 */
2013 if (isMenuBarWindow (ev.window))
2014 menubar_control (ev);
2015#endif
2016} 2090}
2017 2091
2018void 2092void
2019rxvt_term::button_release (XButtonEvent &ev) 2093rxvt_term::button_release (XButtonEvent &ev)
2020{ 2094{
2076 if (priv_modes & PrivMode_mouse_report 2150 if (priv_modes & PrivMode_mouse_report
2077 && bypass_keystate 2151 && bypass_keystate
2078 && ev.button == Button1 && MEvent.clicks <= 1) 2152 && ev.button == Button1 && MEvent.clicks <= 1)
2079 selection_extend (ev.x, ev.y, 0); 2153 selection_extend (ev.x, ev.y, 0);
2080 2154
2155 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2156 return;
2157
2081 switch (ev.button) 2158 switch (ev.button)
2082 { 2159 {
2083 case Button1: 2160 case Button1:
2084 case Button3: 2161 case Button3:
2085 selection_make (ev.time); 2162 selection_make (ev.time);
2116 slip_wheel_ev.start (); 2193 slip_wheel_ev.start ();
2117 } 2194 }
2118 else 2195 else
2119 { 2196 {
2120# endif 2197# endif
2121# ifdef JUMP_MOUSE_WHEEL
2122 scr_page (v, i); 2198 scr_page (v, i);
2123 scr_refresh (SMOOTH_REFRESH);
2124 scrollbar_show (1); 2199 scrollbar_show (1);
2125# else
2126 while (i--)
2127 {
2128 scr_page (v, 1);
2129 scr_refresh (SMOOTH_REFRESH);
2130 scrollbar_show (1);
2131 }
2132# endif
2133# ifdef MOUSE_SLIP_WHEELING 2200# ifdef MOUSE_SLIP_WHEELING
2134 } 2201 }
2135#endif 2202# endif
2136 } 2203 }
2137 break; 2204 break;
2138#endif 2205#endif
2139 } 2206 }
2140 } 2207 }
2141#ifdef MENUBAR
2142 else if (isMenuBarWindow (ev.window))
2143 menubar_control (ev);
2144#endif
2145} 2208}
2146 2209
2147#ifdef TRANSPARENT 2210#ifdef TRANSPARENT
2148#if TINTING 2211#if TINTING
2149/* taken from aterm-0.4.2 */ 2212/* taken from aterm-0.4.2 */
2629 2692
2630bool 2693bool
2631rxvt_term::cmd_parse () 2694rxvt_term::cmd_parse ()
2632{ 2695{
2633 bool flag = false; 2696 bool flag = false;
2634 unicode_t ch = NOCHAR; 2697 wchar_t ch = NOCHAR;
2635 unsigned char *seq_begin; // remember start of esc-sequence here 2698 char *seq_begin; // remember start of esc-sequence here
2636 2699
2637 for (;;) 2700 for (;;)
2638 { 2701 {
2639 if (ch == NOCHAR) 2702 if (ch == NOCHAR)
2640 { 2703 {
2641 seq_begin = cmdbuf_ptr; 2704 seq_begin = cmdbuf_ptr;
2642 ch = next_char (); 2705 ch = next_char ();
2643 }
2644 2706
2645 if (ch == NOCHAR) // TODO: improve 2707 if (ch == NOCHAR)
2646 break; 2708 break;
2709 }
2647 2710
2648 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2711 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2649 { 2712 {
2650 if (!seen_input) 2713 if (!seen_input)
2651 { 2714 {
2660 if (seen_resize && cmd_pid) 2723 if (seen_resize && cmd_pid)
2661 kill (-cmd_pid, SIGWINCH); 2724 kill (-cmd_pid, SIGWINCH);
2662 } 2725 }
2663 2726
2664 /* Read a text string from the input buffer */ 2727 /* Read a text string from the input buffer */
2665 unicode_t buf[UBUFSIZ]; 2728 wchar_t buf[UBUFSIZ];
2666 bool refreshnow = false; 2729 bool refreshnow = false;
2667 int nlines = 0; 2730 int nlines = 0;
2668 unicode_t *str = buf; 2731 wchar_t *str = buf;
2669 unicode_t *eol = str + min (ncol, UBUFSIZ); 2732 wchar_t *eol = str + min (ncol, UBUFSIZ);
2670 2733
2671 for (;;) 2734 for (;;)
2672 { 2735 {
2673 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2736 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2674 break; 2737 break;
2684 2747
2685 if (!OPTION (Opt_jumpScroll) 2748 if (!OPTION (Opt_jumpScroll)
2686 || (refresh_count >= refresh_limit * (nrow - 1))) 2749 || (refresh_count >= refresh_limit * (nrow - 1)))
2687 { 2750 {
2688 refreshnow = true; 2751 refreshnow = true;
2752 refresh_count = 0;
2689 ch = NOCHAR; 2753 ch = NOCHAR;
2690 break; 2754 break;
2691 } 2755 }
2692 2756
2693 // scr_add_lines only works for nlines <= nrow - 1. 2757 // scr_add_lines only works for nlines <= nrow - 1.
2694 if (nlines >= nrow - 1) 2758 if (nlines >= nrow - 1)
2695 { 2759 {
2760 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2761 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2696 scr_add_lines (buf, nlines, str - buf); 2762 scr_add_lines (buf, str - buf, nlines);
2763
2697 nlines = 0; 2764 nlines = 0;
2698 str = buf; 2765 str = buf;
2699 eol = str + min (ncol, UBUFSIZ); 2766 eol = str + min (ncol, UBUFSIZ);
2700 } 2767 }
2701 2768
2714 2781
2715 seq_begin = cmdbuf_ptr; 2782 seq_begin = cmdbuf_ptr;
2716 ch = next_char (); 2783 ch = next_char ();
2717 } 2784 }
2718 2785
2786 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2787 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2719 scr_add_lines (buf, nlines, str - buf); 2788 scr_add_lines (buf, str - buf, nlines);
2720 2789
2721 /* 2790 /*
2722 * If there have been a lot of new lines, then update the screen 2791 * If there have been a lot of new lines, then update the screen
2723 * What the heck I'll cheat and only refresh less than every page-full. 2792 * What the heck I'll cheat and only refresh less than every page-full.
2724 * the number of pages between refreshes is refresh_limit, which 2793 * the number of pages between refreshes is refresh_limit, which
2730 refresh_limit++; 2799 refresh_limit++;
2731 else 2800 else
2732 { 2801 {
2733 flag = true; 2802 flag = true;
2734 scr_refresh (refresh_type); 2803 scr_refresh (refresh_type);
2804 want_refresh = 1;
2735 } 2805 }
2736 } 2806 }
2737 2807
2738 } 2808 }
2739 else 2809 else
2754 } 2824 }
2755 2825
2756 return flag; 2826 return flag;
2757} 2827}
2758 2828
2759// read the next octet
2760unicode_t
2761rxvt_term::next_octet ()
2762{
2763 return cmdbuf_ptr < cmdbuf_endp
2764 ? *cmdbuf_ptr++
2765 : NOCHAR;
2766}
2767
2768// read the next character 2829// read the next character
2769unicode_t 2830wchar_t
2770rxvt_term::next_char () 2831rxvt_term::next_char ()
2771{ 2832{
2772 while (cmdbuf_ptr < cmdbuf_endp) 2833 while (cmdbuf_ptr < cmdbuf_endp)
2773 { 2834 {
2774 // assume 7-bit to be ascii ALWAYS 2835 // assume 7-bit to be ascii ALWAYS
2775 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2836 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2776 return *cmdbuf_ptr++; 2837 return *cmdbuf_ptr++;
2777 2838
2778 wchar_t wc; 2839 wchar_t wc;
2779 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2840 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2780 2841
2781 if (len == (size_t)-2) 2842 if (len == (size_t)-2)
2782 { 2843 {
2783 // the mbstate stores incomplete sequences. didn't know this :/ 2844 // the mbstate stores incomplete sequences. didn't know this :/
2784 cmdbuf_ptr = cmdbuf_endp; 2845 cmdbuf_ptr = cmdbuf_endp;
2785 break; 2846 break;
2786 } 2847 }
2787 2848
2788 if (len == (size_t)-1) 2849 if (len == (size_t)-1)
2789 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2850 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2790 2851
2791 // assume wchar == unicode 2852 // assume wchar == unicode
2792 cmdbuf_ptr += len; 2853 cmdbuf_ptr += len;
2793 return wc & UNICODE_MASK; 2854 return wc & UNICODE_MASK;
2794 } 2855 }
2795 2856
2796 return NOCHAR; 2857 return NOCHAR;
2858}
2859
2860// read the next octet
2861uint32_t
2862rxvt_term::next_octet ()
2863{
2864 return cmdbuf_ptr < cmdbuf_endp
2865 ? (unsigned char)*cmdbuf_ptr++
2866 : NOCHAR;
2797} 2867}
2798 2868
2799/* rxvt_cmd_getc () - Return next input character */ 2869/* rxvt_cmd_getc () - Return next input character */
2800/* 2870/*
2801 * Return the next input character after first passing any keyboard input 2871 * Return the next input character after first passing any keyboard input
2802 * to the command. 2872 * to the command.
2803 */ 2873 */
2804unicode_t 2874wchar_t
2805rxvt_term::cmd_getc () 2875rxvt_term::cmd_getc ()
2806{ 2876{
2807 unicode_t c = next_char (); 2877 wchar_t c = next_char ();
2808 2878
2809 if (c == NOCHAR) 2879 if (c == NOCHAR)
2810 throw out_of_input; 2880 throw out_of_input;
2811 2881
2812 return c; 2882 return c;
2813} 2883}
2814 2884
2815unicode_t 2885uint32_t
2816rxvt_term::cmd_get8 () 2886rxvt_term::cmd_get8 ()
2817{ 2887{
2818 unicode_t c = next_octet (); 2888 uint32_t c = next_octet ();
2819 2889
2820 if (c == NOCHAR) 2890 if (c == NOCHAR)
2821 throw out_of_input; 2891 throw out_of_input;
2822 2892
2823 return c; 2893 return c;
2923 case C0_ESC: 2993 case C0_ESC:
2924 process_escape_seq (); 2994 process_escape_seq ();
2925 break; 2995 break;
2926 case C0_ENQ: /* terminal Status */ 2996 case C0_ENQ: /* terminal Status */
2927 if (rs[Rs_answerbackstring]) 2997 if (rs[Rs_answerbackstring])
2928 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2998 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2929 (unsigned int)strlen (rs[Rs_answerbackstring]));
2930 else 2999 else
2931 tt_write ((unsigned char *)VT100_ANS, 3000 tt_write (VT100_ANS, strlen (VT100_ANS));
2932 (unsigned int)strlen (VT100_ANS));
2933 break; 3001 break;
2934 case C0_BEL: /* bell */ 3002 case C0_BEL: /* bell */
2935 scr_bell (); 3003 scr_bell ();
2936 break; 3004 break;
2937 case C0_BS: /* backspace */ 3005 case C0_BS: /* backspace */
3092 break; 3160 break;
3093 3161
3094 /* 8.3.87: NEXT LINE */ 3162 /* 8.3.87: NEXT LINE */
3095 case C1_NEL: /* ESC E */ 3163 case C1_NEL: /* ESC E */
3096 { 3164 {
3097 unicode_t nlcr[] = { C0_LF, C0_CR }; 3165 wchar_t nlcr[] = { C0_LF, C0_CR };
3098 scr_add_lines (nlcr, 1, 2); 3166 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3099 } 3167 }
3100 break; 3168 break;
3101 3169
3102 /* kidnapped escape sequence: Should be 8.3.48 */ 3170 /* kidnapped escape sequence: Should be 8.3.48 */
3103 case C1_ESA: /* ESC G */ 3171 case C1_ESA: /* ESC G */
3125 process_dcs_seq (); 3193 process_dcs_seq ();
3126 break; 3194 break;
3127 3195
3128 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3196 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3129 case C1_SCI: /* ESC Z */ 3197 case C1_SCI: /* ESC Z */
3130 tt_write ((const unsigned char *)ESCZ_ANSWER, 3198 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3131 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3132 break; /* steal obsolete ESC [ c */ 3199 break; /* steal obsolete ESC [ c */
3133 3200
3134 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3201 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3135 case C1_CSI: /* ESC [ */ 3202 case C1_CSI: /* ESC [ */
3136 process_csi_seq (); 3203 process_csi_seq ();
3380 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3447 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3381 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3448 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3382 break; 3449 break;
3383 3450
3384 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3451 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3385 tt_write ((const unsigned char *)VT100_ANS, 3452 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3386 (unsigned int) (sizeof (VT100_ANS) - 1));
3387 break; 3453 break;
3388 3454
3389 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3455 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3390 process_sgr_mode (nargs, arg); 3456 process_sgr_mode (nargs, arg);
3391 break; 3457 break;
3593/*----------------------------------------------------------------------*/ 3659/*----------------------------------------------------------------------*/
3594/* 3660/*
3595 * get input up until STRING TERMINATOR (or BEL) 3661 * get input up until STRING TERMINATOR (or BEL)
3596 * ends_how is terminator used. returned input must be free()'d 3662 * ends_how is terminator used. returned input must be free()'d
3597 */ 3663 */
3598unsigned char * 3664char *
3599rxvt_term::get_to_st (unicode_t &ends_how) 3665rxvt_term::get_to_st (unicode_t &ends_how)
3600{ 3666{
3601 unicode_t ch; 3667 unicode_t ch;
3602 bool seen_esc = false; 3668 bool seen_esc = false;
3603 unsigned int n = 0; 3669 unsigned int n = 0;
3636 3702
3637 string[n++] = '\0'; 3703 string[n++] = '\0';
3638 3704
3639 ends_how = (ch == 0x5c ? C0_ESC : ch); 3705 ends_how = (ch == 0x5c ? C0_ESC : ch);
3640 3706
3641 return (unsigned char *)rxvt_wcstombs (string); 3707 return rxvt_wcstombs (string);
3642} 3708}
3643 3709
3644/*----------------------------------------------------------------------*/ 3710/*----------------------------------------------------------------------*/
3645/* 3711/*
3646 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3712 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3647 */ 3713 */
3648void 3714void
3649rxvt_term::process_dcs_seq () 3715rxvt_term::process_dcs_seq ()
3650{ 3716{
3651 unsigned char *s; 3717 char *s;
3652 unicode_t eh; 3718 unicode_t eh;
3653 3719
3654 /* 3720 /*
3655 * Not handled yet 3721 * Not handled yet
3656 */ 3722 */
3675 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3741 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3676 arg = arg * 10 + (ch - '0'); 3742 arg = arg * 10 + (ch - '0');
3677 3743
3678 if (ch == ';') 3744 if (ch == ';')
3679 { 3745 {
3680 unsigned char *s = get_to_st (eh); 3746 char *s = get_to_st (eh);
3681 3747
3682 if (s) 3748 if (s)
3683 { 3749 {
3684 process_xterm_seq (arg, (char *)s, eh); 3750 process_xterm_seq (arg, s, eh);
3685 free (s); 3751 free (s);
3686 } 3752 }
3687 } 3753 }
3688} 3754}
3689 3755
3690void 3756void
3691rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3757rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3692{ 3758{
3693 if (str[0] == '?' && !str[1]) 3759 if (str[0] == '?' && !str[1])
3694 { 3760 {
3695 unsigned short r, g, b; 3761 unsigned short r, g, b;
3696 pix_colors_focused[color].get (display, r, g, b); 3762 pix_colors_focused[color].get (display, r, g, b);
3702 3768
3703/* 3769/*
3704 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3770 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3705 */ 3771 */
3706void 3772void
3707rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3773rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3708{ 3774{
3709 int changed = 0; 3775 int changed = 0;
3710 int color; 3776 int color;
3711 char *buf, *name; 3777 char *buf, *name;
3712 bool query = str[0] == '?' && !str[1]; 3778 bool query = str[0] == '?' && !str[1];
3769 { 3835 {
3770 if ((name = strchr (buf, ';')) == NULL) 3836 if ((name = strchr (buf, ';')) == NULL)
3771 break; 3837 break;
3772 3838
3773 *name++ = '\0'; 3839 *name++ = '\0';
3774 color = atoi (buf); 3840 color = atoi (buf) + minCOLOR;
3775 3841
3776 if (color < 0 || color >= TOTAL_COLORS) 3842 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3777 break; 3843 break;
3778 3844
3779 if ((buf = strchr (name, ';')) != NULL) 3845 if ((buf = strchr (name, ';')) != NULL)
3780 *buf++ = '\0'; 3846 *buf++ = '\0';
3781 3847
3782 if (name[0] == '?' && !name[1]) 3848 if (name[0] == '?' && !name[1])
3783 { 3849 {
3784 unsigned short r, g, b; 3850 unsigned short r, g, b;
3785 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3851 pix_colors_focused[color].get (display, r, g, b);
3786 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3852 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3787 } 3853 }
3788 else 3854 else
3789 set_window_color (color + minCOLOR, name); 3855 set_window_color (color, name);
3790 } 3856 }
3791 break; 3857 break;
3792 case XTerm_Color00: 3858 case XTerm_Color00:
3793 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3859 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3794 break; 3860 break;
3795 case XTerm_Color01: 3861 case XTerm_Color01:
3796 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3862 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3797 break; 3863 break;
3798#ifndef NO_CURSORCOLOR 3864#ifndef NO_CURSORCOLOR
3799 case XTerm_Color_cursor: 3865 case XTerm_Color_cursor:
3800 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3866 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3801 break; 3867 break;
3805 break; 3871 break;
3806 case XTerm_Color_pointer_bg: 3872 case XTerm_Color_pointer_bg:
3807 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3873 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3808 break; 3874 break;
3809#ifndef NO_BOLD_UNDERLINE_REVERSE 3875#ifndef NO_BOLD_UNDERLINE_REVERSE
3810 case XTerm_Color_BD:
3811 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3812 break;
3813 case XTerm_Color_UL:
3814 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3815 break;
3816 case XTerm_Color_RV: 3876 case XTerm_Color_RV:
3817 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3877 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3878 break;
3879 case Rxvt_Color_BD:
3880 case URxvt_Color_BD:
3881 process_color_seq (op, Color_BD, str, resp);
3882 break;
3883 case Rxvt_Color_UL:
3884 case URxvt_Color_UL:
3885 process_color_seq (op, Color_UL, str, resp);
3818 break; 3886 break;
3819 case URxvt_Color_IT: 3887 case URxvt_Color_IT:
3820 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3888 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3821 break; 3889 break;
3822#endif 3890#endif
3827 if (am_transparent) 3895 if (am_transparent)
3828 want_full_refresh = want_refresh = 1; 3896 want_full_refresh = want_refresh = 1;
3829 break; 3897 break;
3830#endif 3898#endif
3831 3899
3832 case XTerm_Pixmap: 3900 case Rxvt_Pixmap:
3833 if (*str != ';') 3901 if (*str != ';')
3834 { 3902 {
3835#if XPM_BACKGROUND 3903#if XPM_BACKGROUND
3836 scale_pixmap (""); /* reset to default scaling */ 3904 scale_pixmap (""); /* reset to default scaling */
3837 set_bgPixmap (str); /* change pixmap */ 3905 set_bgPixmap (str); /* change pixmap */
3838#endif
3839 scr_touch (true); 3906 scr_touch (true);
3907#endif
3840 } 3908 }
3909
3841 while ((str = strchr (str, ';')) != NULL) 3910 while ((str = strchr (str, ';')) != NULL)
3842 { 3911 {
3843 str++; 3912 str++;
3844#if XPM_BACKGROUND 3913#if XPM_BACKGROUND
3845 changed += scale_pixmap (str); 3914 changed += scale_pixmap (str);
3848 3917
3849 if (changed) 3918 if (changed)
3850 { 3919 {
3851#ifdef XPM_BACKGROUND 3920#ifdef XPM_BACKGROUND
3852 resize_pixmap (); 3921 resize_pixmap ();
3853#endif
3854 scr_touch (true); 3922 scr_touch (true);
3923#endif
3855 } 3924 }
3856 break; 3925 break;
3857 3926
3858 case XTerm_restoreFG: 3927 case Rxvt_restoreFG:
3859 set_window_color (Color_fg, str); 3928 set_window_color (Color_fg, str);
3860 break; 3929 break;
3861 case XTerm_restoreBG: 3930 case Rxvt_restoreBG:
3862 set_window_color (Color_bg, str); 3931 set_window_color (Color_bg, str);
3863 break; 3932 break;
3864 3933
3865 case XTerm_logfile: 3934 case XTerm_logfile:
3866 // TODO, when secure mode? 3935 // TODO, when secure mode?
3867 break; 3936 break;
3868 3937
3869#ifdef MENUBAR
3870 case URxvt_Menu:
3871 if (OPTION (Opt_insecure))
3872 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3873 break;
3874#endif
3875#if 0 3938#if 0
3876 case XTerm_dumpscreen: /* no error notices */ 3939 case Rxvt_dumpscreen: /* no error notices */
3877 { 3940 {
3878 int fd; 3941 int fd;
3879 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3942 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3880 { 3943 {
3881 scr_dump (fd); 3944 scr_dump (fd);
3919 } 3982 }
3920 break; 3983 break;
3921 3984
3922 case URxvt_view_up: 3985 case URxvt_view_up:
3923 case URxvt_view_down: 3986 case URxvt_view_down:
3987 {
3924 int lines = atoi (str); 3988 int lines = atoi (str);
3925 3989
3926 if (lines) 3990 if (lines)
3927 scr_page (op == URxvt_view_up ? UP : DN, lines); 3991 scr_page (op == URxvt_view_up ? UP : DN, lines);
3928 else 3992 else
3929 {
3930 scr_erase_savelines (); 3993 scr_erase_savelines ();
3931 } 3994 }
3932 3995
3996 break;
3997#endif
3998
3999#if ENABLE_PERL
4000 case URxvt_perl:
4001 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
4002 ; // no responses yet
3933 break; 4003 break;
3934#endif 4004#endif
3935 } 4005 }
3936} 4006}
3937/*----------------------------------------------------------------------*/ 4007/*----------------------------------------------------------------------*/
3989 { 5, PrivMode_rVideo }, 4059 { 5, PrivMode_rVideo },
3990 { 6, PrivMode_relOrigin }, 4060 { 6, PrivMode_relOrigin },
3991 { 7, PrivMode_Autowrap }, 4061 { 7, PrivMode_Autowrap },
3992 // 8, bi-directional support mode 4062 // 8, bi-directional support mode
3993 { 9, PrivMode_MouseX10 }, 4063 { 9, PrivMode_MouseX10 },
3994#ifdef menuBar_esc
3995 { menuBar_esc, PrivMode_menuBar },
3996#endif
3997 // 18, 19 printing-related 4064 // 18, 19 printing-related
3998 { 25, PrivMode_VisibleCursor }, 4065 { 25, PrivMode_VisibleCursor },
3999#ifdef scrollBar_esc 4066#ifdef scrollBar_esc
4000 { scrollBar_esc, PrivMode_scrollBar }, 4067 { scrollBar_esc, PrivMode_scrollBar },
4001#endif 4068#endif
4048 /* extra handling for values with state unkept */ 4115 /* extra handling for values with state unkept */
4049 switch (arg[i]) 4116 switch (arg[i])
4050 { 4117 {
4051#if ENABLE_STYLES 4118#if ENABLE_STYLES
4052 case 1021: 4119 case 1021:
4053 if (mode) 4120 set_option (Opt_intensityStyles, mode);
4054 SET_OPTION (Opt_intensityStyles); 4121
4122 scr_touch (true);
4055 else 4123 break;
4056 CLR_OPTION (Opt_intensityStyles);
4057#endif 4124#endif
4058 case 1048: /* alternative cursor save */ 4125 case 1048: /* alternative cursor save */
4059 case 1049: 4126 case 1049:
4060 if (OPTION (Opt_secondaryScreen)) 4127 if (OPTION (Opt_secondaryScreen))
4061 if (mode == 0) 4128 if (mode == 0)
4080 case 3: /* 80/132 */ 4147 case 3: /* 80/132 */
4081 if (priv_modes & PrivMode_132OK) 4148 if (priv_modes & PrivMode_132OK)
4082 set_widthheight (((state ? 132 : 80) * fwidth), height); 4149 set_widthheight (((state ? 132 : 80) * fwidth), height);
4083 break; 4150 break;
4084 case 4: /* smooth scrolling */ 4151 case 4: /* smooth scrolling */
4085 if (!state) 4152 set_option (Opt_jumpScroll, !state);
4086 SET_OPTION (Opt_jumpScroll);
4087 else
4088 CLR_OPTION (Opt_jumpScroll);
4089 break; 4153 break;
4090 case 5: /* reverse video */ 4154 case 5: /* reverse video */
4091 scr_rvideo_mode (state); 4155 scr_rvideo_mode (state);
4092 break; 4156 break;
4093 case 6: /* relative/absolute origins */ 4157 case 6: /* relative/absolute origins */
4099 /* case 8: - auto repeat, can't do on a per window basis */ 4163 /* case 8: - auto repeat, can't do on a per window basis */
4100 case 9: /* X10 mouse reporting */ 4164 case 9: /* X10 mouse reporting */
4101 if (state) /* orthogonal */ 4165 if (state) /* orthogonal */
4102 priv_modes &= ~PrivMode_MouseX11; 4166 priv_modes &= ~PrivMode_MouseX11;
4103 break; 4167 break;
4104#ifdef menuBar_esc
4105 case menuBar_esc:
4106#ifdef MENUBAR
4107 map_menuBar (state);
4108#endif
4109 break;
4110#endif
4111#ifdef scrollBar_esc 4168#ifdef scrollBar_esc
4112 case scrollBar_esc: 4169 case scrollBar_esc:
4113 if (scrollbar_mapping (state)) 4170 if (scrollbar_mapping (state))
4114 { 4171 {
4115 resize_all_windows (0, 0, 0); 4172 resize_all_windows (0, 0, 0);
4134#if 0 4191#if 0
4135 case 1001: 4192 case 1001:
4136 break; /* X11 mouse highlighting */ 4193 break; /* X11 mouse highlighting */
4137#endif 4194#endif
4138 case 1010: /* scroll to bottom on TTY output inhibit */ 4195 case 1010: /* scroll to bottom on TTY output inhibit */
4139 if (!state) 4196 set_option (Opt_scrollTtyOutput, !state);
4140 SET_OPTION (Opt_scrollTtyOutput);
4141 else
4142 CLR_OPTION (Opt_scrollTtyOutput);
4143 break; 4197 break;
4144 case 1011: /* scroll to bottom on key press */ 4198 case 1011: /* scroll to bottom on key press */
4145 if (state) 4199 set_option (Opt_scrollTtyKeypress, state);
4146 SET_OPTION (Opt_scrollTtyKeypress);
4147 else
4148 CLR_OPTION (Opt_scrollTtyKeypress);
4149 break; 4200 break;
4150 case 1047: /* secondary screen w/ clearing last */ 4201 case 1047: /* secondary screen w/ clearing last */
4151 if (OPTION (Opt_secondaryScreen)) 4202 if (OPTION (Opt_secondaryScreen))
4152 if (current_screen != PRIMARY) 4203 if (current_screen != PRIMARY)
4153 scr_erase_screen (2); 4204 scr_erase_screen (2);
4291 scr_color (Color_bg, Color_bg); 4342 scr_color (Color_bg, Color_bg);
4292 break; 4343 break;
4293 4344
4294 //case 50: // not variable spacing 4345 //case 50: // not variable spacing
4295 4346
4296#ifndef NO_BRIGHTCOLOR 4347#if ENABLE_FRILLS
4297 case 90: 4348 case 90:
4298 case 91: /* set bright fg color */ 4349 case 91: /* set bright fg color */
4299 case 92: 4350 case 92:
4300 case 93: 4351 case 93:
4301 case 94: 4352 case 94:
4313 case 106: 4364 case 106:
4314 case 107: 4365 case 107:
4315 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4366 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4316 break; 4367 break;
4317#endif 4368#endif
4318
4319 } 4369 }
4320 } 4370 }
4321} 4371}
4322/*}}} */ 4372/*}}} */
4323 4373
4347 */ 4397 */
4348void 4398void
4349rxvt_term::tt_printf (const char *fmt,...) 4399rxvt_term::tt_printf (const char *fmt,...)
4350{ 4400{
4351 va_list arg_ptr; 4401 va_list arg_ptr;
4352 unsigned char buf[256]; 4402 char buf[256];
4353 4403
4354 va_start (arg_ptr, fmt); 4404 va_start (arg_ptr, fmt);
4355 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4405 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4356 va_end (arg_ptr); 4406 va_end (arg_ptr);
4357 tt_write (buf, strlen (buf)); 4407 tt_write (buf, strlen (buf));
4362 * or generated by us in response to a query ESC sequence. 4412 * or generated by us in response to a query ESC sequence.
4363 */ 4413 */
4364const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4414const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4365 4415
4366void 4416void
4367rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4417rxvt_term::tt_write (const char *data, unsigned int len)
4368{ 4418{
4419 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4420 return;
4421
4422 if (pty.pty < 0)
4423 return;
4424
4369 if (v_buflen == 0) 4425 if (v_buflen == 0)
4370 { 4426 {
4371 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4427 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4372 4428
4373 if ((unsigned int)written == len) 4429 if ((unsigned int)written == len)
4375 4431
4376 data += written; 4432 data += written;
4377 len -= written; 4433 len -= written;
4378 } 4434 }
4379 4435
4380 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4436 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4381 4437
4382 memcpy (v_buffer + v_buflen, data, len); 4438 memcpy (v_buffer + v_buflen, data, len);
4383 v_buflen += len; 4439 v_buflen += len;
4384 4440
4385 pty_ev.set (EVENT_READ | EVENT_WRITE); 4441 pty_ev.set (EVENT_READ | EVENT_WRITE);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines