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.223 by root, Sun Jan 1 05:28:28 2006 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"
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
… …
146 || !IN_RANGE_EXC (y, 0, nrow)) 147 || !IN_RANGE_EXC (y, 0, nrow))
147 return; 148 return;
148 149
149 for (;;) 150 for (;;)
150 { 151 {
151 const line_t &l = ROW(y - view_start); 152 const line_t &l = ROW(y + view_start);
152 153
153 text_t t = l.t[x]; 154 text_t t = l.t[x];
154 155
155 if (t != NOCHAR || !x) 156 if (t != NOCHAR || !x)
156 { 157 {
… …
267 mb[0] = ch[0]; 268 mb[0] = ch[0];
268 len = 1; 269 len = 1;
269 } 270 }
270 271
271 if (len > 0) 272 if (len > 0)
272 tt_write ((unsigned char *)mb, len); 273 tt_write (mb, len);
273 else 274 else
274 scr_bell (); 275 scr_bell ();
275 } 276 }
276 277
277 iso14755buf = 0; 278 iso14755buf = 0;
… …
305 KeySym keysym; 306 KeySym keysym;
306#ifdef DEBUG_CMD 307#ifdef DEBUG_CMD
307 static int debug_key = 1; /* accessible by a debugger only */ 308 static int debug_key = 1; /* accessible by a debugger only */
308#endif 309#endif
309 int valid_keysym; 310 int valid_keysym;
310 unsigned char kbuf[KBUFSZ]; 311 char kbuf[KBUFSZ];
311 312
312 /* 313 /*
313 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
314 * escape sequence to toggle the Keypad. 315 * escape sequence to toggle the Keypad.
315 * 316 *
… …
333 Status status_return; 334 Status status_return;
334 335
335#if 0 336#if 0
336#ifdef X_HAVE_UTF8_STRING 337#ifdef X_HAVE_UTF8_STRING
337 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 338 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
338 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 339 len = Xutf8LookupString (Input_Context, &ev, kbuf,
339 KBUFSZ, &keysym, &status_return); 340 KBUFSZ, &keysym, &status_return);
340 else 341 else
341#endif 342#endif
342#endif 343#endif
343 { 344 {
… …
380 || status_return == XLookupBoth; 381 || status_return == XLookupBoth;
381 } 382 }
382 else 383 else
383#endif 384#endif
384 { 385 {
385 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 386 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
386 valid_keysym = keysym != NoSymbol; 387 valid_keysym = keysym != NoSymbol;
387 } 388 }
388 389
389 if (valid_keysym) 390 if (valid_keysym)
390 { 391 {
… …
442 scr_move_to (0, 1); 443 scr_move_to (0, 1);
443 return; 444 return;
444 } 445 }
445 else if (keysym == XK_End) 446 else if (keysym == XK_End)
446 { 447 {
447 scr_move_to (1, 0); 448 scr_move_to (1, 1);
448 return; 449 return;
449 } 450 }
450 } 451 }
451#endif 452#endif
452 } 453 }
… …
854 { 855 {
855#ifdef META8_OPTION 856#ifdef META8_OPTION
856 /* set 8-bit on */ 857 /* set 8-bit on */
857 if (meta && (meta_char == 0x80)) 858 if (meta && (meta_char == 0x80))
858 { 859 {
859 unsigned char *ch; 860 char *ch;
860 861
861 for (ch = kbuf; ch < kbuf + len; ch++) 862 for (ch = kbuf; ch < kbuf + len; ch++)
862 *ch |= 0x80; 863 *ch |= 0x80;
863 864
864 meta = 0; 865 meta = 0;
865 } 866 }
866#endif 867#endif
867 /* nil */ ; 868 /* nil */ ;
868 } 869 }
869 } 870 }
871
872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
873 return;
870 874
871 if (len <= 0) 875 if (len <= 0)
872 return; /* not mapped */ 876 return; /* not mapped */
873 877
874 if (OPTION (Opt_scrollTtyKeypress)) 878 if (OPTION (Opt_scrollTtyKeypress))
… …
897#ifdef META8_OPTION 901#ifdef META8_OPTION
898 && meta_char == C0_ESC 902 && meta_char == C0_ESC
899#endif 903#endif
900 ) 904 )
901 { 905 {
902 const unsigned char ch = C0_ESC; 906 const char ch = C0_ESC;
903 tt_write (&ch, 1); 907 tt_write (&ch, 1);
904 } 908 }
905 909
906#if defined(DEBUG_CMD) 910#if defined(DEBUG_CMD)
907 /* Display keyboard buffer contents */ 911 /* Display keyboard buffer contents */
… …
915#endif /* DEBUG_CMD */ 919#endif /* DEBUG_CMD */
916 tt_write (kbuf, (unsigned int)len); 920 tt_write (kbuf, (unsigned int)len);
917} 921}
918/*}}} */ 922/*}}} */
919 923
920#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 924#if defined (KEYSYM_RESOURCE)
921/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
922/* attempt to `write' count to the input buffer */
923unsigned int 925unsigned int
924rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 926rxvt_term::cmd_write (const char *str, unsigned int count)
925{ 927{
926 unsigned int n, s; 928 unsigned int n, s;
927 929
928 n = cmdbuf_ptr - cmdbuf_base; 930 n = cmdbuf_ptr - cmdbuf_base;
929 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 931 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
966 } 968 }
967#endif 969#endif
968 970
969 if (want_refresh) 971 if (want_refresh)
970 { 972 {
973 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
974 {
975 int row = view_start;
976 int end_row = row + nrow;
977
978 while (row > top_row && ROW (row - 1).is_longer ())
979 --row;
980
981 do
982 {
983 int start_row = row;
984 line_t *l;
985
986 do
987 {
988 l = &ROW (row++);
989
990 if (!(l->f & LINE_FILTERED))
991 {
992 // line not filtered, mark it as filtered
993 l->f |= LINE_FILTERED;
994 while (l->is_longer ())
995 {
996 l = &ROW (row++);
997 l->f |= LINE_FILTERED;
998 }
999
1000 // and filter it
1001 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1002
1003 break;
1004 }
1005 }
1006 while (l->is_longer () && row < end_row);
1007 }
1008 while (row < end_row);
1009 }
1010
971 scr_refresh (refresh_type); 1011 scr_refresh (refresh_type);
972 scrollbar_show (1); 1012 scrollbar_show (1);
973#ifdef USE_XIM 1013#ifdef USE_XIM
974 IMSendSpot (); 1014 IMSendSpot ();
975#endif 1015#endif
… …
979} 1019}
980 1020
981void 1021void
982rxvt_term::check_cb (check_watcher &w) 1022rxvt_term::check_cb (check_watcher &w)
983{ 1023{
984 SET_R (this); 1024 make_current ();
985 SET_LOCALE (locale);
986 1025
987 display->flush (); 1026 display->flush ();
988 1027
989 if (want_refresh && !flush_ev.active) 1028 if (want_refresh && !flush_ev.active)
990 flush_ev.start (NOW + 0.01); 1029 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
991} 1030}
992 1031
993void 1032void
994rxvt_term::flush_cb (time_watcher &w) 1033rxvt_term::flush_cb (time_watcher &w)
995{ 1034{
996 SET_R (this); 1035 make_current ();
997 SET_LOCALE (locale);
998 1036
999 refresh_limit = 1; 1037 refresh_limit = 1;
1000 refresh_count = 0; 1038 refresh_count = 0;
1001 flush (); 1039 flush ();
1002} 1040}
… …
1059{ 1097{
1060 if (mouse_slip_wheel_speed == 0 1098 if (mouse_slip_wheel_speed == 0
1061 || 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)
1062 : scr_page (UP, mouse_slip_wheel_speed)) 1100 : scr_page (UP, mouse_slip_wheel_speed))
1063 { 1101 {
1064 if (view_start == nsaved || 1102 if (view_start == top_row || view_start == 0)
1065 view_start == 0)
1066 mouse_slip_wheel_speed = 0; 1103 mouse_slip_wheel_speed = 0;
1067 1104
1068 refresh_type |= SMOOTH_REFRESH; 1105 refresh_type |= SMOOTH_REFRESH;
1069 want_refresh = 1; 1106 want_refresh = 1;
1070 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1107 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1071 } 1108 }
1072} 1109}
1073#endif 1110#endif
1074 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
1075bool 1130bool
1076rxvt_term::pty_fill () 1131rxvt_term::pty_fill ()
1077{ 1132{
1078 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1133 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1079 1134
1080 if (CBUFSIZ == n) 1135 if (CBUFSIZ == n)
1081 { 1136 {
1082 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");
1083 n = 0; 1138 n = 0;
1084 } 1139 }
1085 1140
1086 memmove (cmdbuf_base, cmdbuf_ptr, n); 1141 memmove (cmdbuf_base, cmdbuf_ptr, n);
1087 cmdbuf_ptr = cmdbuf_base; 1142 cmdbuf_ptr = cmdbuf_base;
… …
1095 return true; 1150 return true;
1096 } 1151 }
1097 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1152 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1098 { 1153 {
1099#if HAVE_SCHED_YIELD 1154#if HAVE_SCHED_YIELD
1100 sched_yield (); 1155 if (display->is_local)
1156 event_handler.cw_yield.start ();
1101#endif 1157#endif
1102 } 1158 }
1103 else 1159 else
1104 { 1160 {
1105 pty_ev.stop (); 1161 pty_ev.stop ();
… …
1112} 1168}
1113 1169
1114void 1170void
1115rxvt_term::pty_cb (io_watcher &w, short revents) 1171rxvt_term::pty_cb (io_watcher &w, short revents)
1116{ 1172{
1117 SET_R (this); 1173 make_current ();
1118 SET_LOCALE (locale);
1119 1174
1120 if (revents & EVENT_READ) 1175 if (revents & EVENT_READ)
1121 // loop, but don't allow a single term to monopolize us 1176 // loop, but don't allow a single term to monopolize us
1122 while (pty_fill ()) 1177 while (pty_fill ())
1123 if (cmd_parse ()) 1178 if (cmd_parse ())
… …
1143 1198
1144#ifdef POINTER_BLANK 1199#ifdef POINTER_BLANK
1145void 1200void
1146rxvt_term::pointer_blank () 1201rxvt_term::pointer_blank ()
1147{ 1202{
1148 if (! OPTION (Opt_pointerBlank)) 1203 if (!OPTION (Opt_pointerBlank))
1149 return; 1204 return;
1150 1205
1151 XDefineCursor (display->display, vt, display->blank_cursor); 1206 XDefineCursor (display->display, vt, display->blank_cursor);
1152 XFlush (display->display); 1207 XFlush (display->display);
1153 1208
… …
1155} 1210}
1156 1211
1157void 1212void
1158rxvt_term::pointer_cb (time_watcher &w) 1213rxvt_term::pointer_cb (time_watcher &w)
1159{ 1214{
1160 SET_R (this); 1215 make_current ();
1161 SET_LOCALE (locale);
1162 1216
1163 pointer_blank (); 1217 pointer_blank ();
1164} 1218}
1165#endif 1219#endif
1166 1220
… …
1245 1299
1246/*{{{ process an X event */ 1300/*{{{ process an X event */
1247void 1301void
1248rxvt_term::x_cb (XEvent &ev) 1302rxvt_term::x_cb (XEvent &ev)
1249{ 1303{
1304 make_current ();
1305
1250 dDisp; 1306 dDisp;
1251 1307
1252 SET_R (this); 1308 if (ev.xany.window == vt
1253 SET_LOCALE (locale); 1309 && SHOULD_INVOKE (HOOK_X_EVENT)
1310 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1311 return;
1254 1312
1255#if defined(CURSOR_BLINK) 1313 // for XQueryPointer
1256 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1257 {
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
1282 Window unused_root, unused_child; 1314 Window unused_root, unused_child;
1283 int unused_root_x, unused_root_y; 1315 int unused_root_x, unused_root_y;
1284 unsigned int unused_mask; 1316 unsigned int unused_mask;
1285 1317
1286 switch (ev.type) 1318 switch (ev.type)
… …
1293 1325
1294 break; 1326 break;
1295 1327
1296 case KeyRelease: 1328 case KeyRelease:
1297 { 1329 {
1298#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1330#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1299 KeySym ks; 1331 KeySym keysym;
1300 1332
1301 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 :/
1302#endif 1334#endif
1303 1335
1304#if ENABLE_FRILLS || ISO_14755 1336#if ENABLE_FRILLS || ISO_14755
1305 // ISO 14755 support 1337 // ISO 14755 support
1306 if (iso14755buf) 1338 if (iso14755buf)
… …
1311# endif 1343# endif
1312# if ISO_14755 1344# if ISO_14755
1313 // iso14755 part 5.2 handling: release time 1345 // iso14755 part 5.2 handling: release time
1314 // first: controls 1346 // first: controls
1315 if ((ev.xkey.state & ControlMask) 1347 if ((ev.xkey.state & ControlMask)
1316 && ((ks >= 0x40 && ks <= 0x5f) 1348 && ((keysym >= 0x40 && keysym <= 0x5f)
1317 || (ks >= 0x61 && ks <= 0x7f))) 1349 || (keysym >= 0x61 && keysym <= 0x7f)))
1318 { 1350 {
1319 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1351 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1320 commit_iso14755 (); 1352 commit_iso14755 ();
1321 return; // case-break; 1353 goto skip_switch;
1322 } 1354 }
1323 1355
1324 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1356 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1325 if (i[0] == ks) 1357 if (i[0] == keysym)
1326 { 1358 {
1327 iso14755buf = ISO_14755_51 | i[1]; 1359 iso14755buf = ISO_14755_51 | i[1];
1328 commit_iso14755 (); 1360 commit_iso14755 ();
1329 return; // case-break; 1361 goto skip_switch;
1330 } 1362 }
1331 1363
1332 scr_bell (); 1364 scr_bell ();
1333# endif 1365# endif
1334 iso14755buf = 0; 1366 iso14755buf = 0;
… …
1353 else 1385 else
1354 iso14755buf = 0; 1386 iso14755buf = 0;
1355 } 1387 }
1356#endif 1388#endif
1357 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
1358#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1394#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1359 if (!(ev.xkey.state & ControlMask)) 1395 if (!(ev.xkey.state & ControlMask))
1360 slip_wheel_ev.stop (); 1396 slip_wheel_ev.stop ();
1361 else if (ks == XK_Control_L || ks == XK_Control_R) 1397 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1362 mouse_slip_wheel_speed = 0; 1398 mouse_slip_wheel_speed = 0;
1363#endif 1399#endif
1364 break; 1400 break;
1365 } 1401 }
1366 1402
… …
1496 1532
1497 case SelectionRequest: 1533 case SelectionRequest:
1498 selection_send (ev.xselectionrequest); 1534 selection_send (ev.xselectionrequest);
1499 break; 1535 break;
1500 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
1501 case UnmapNotify: 1545 case UnmapNotify:
1502 mapped = 0; 1546 mapped = 0;
1503#ifdef TEXT_BLINK 1547#ifdef TEXT_BLINK
1504 text_blink_ev.stop (); 1548 text_blink_ev.stop ();
1505#endif 1549#endif
1506 break; 1550 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; 1551 break;
1514 1552
1515#ifdef TRANSPARENT 1553#ifdef TRANSPARENT
1516 case ReparentNotify: 1554 case ReparentNotify:
1517 rootwin_cb (ev); 1555 rootwin_cb (ev);
… …
1531 1569
1532 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1570 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1533 scr_expose (ev.xexpose.x, ev.xexpose.y, 1571 scr_expose (ev.xexpose.x, ev.xexpose.y,
1534 ev.xexpose.width, ev.xexpose.height, False); 1572 ev.xexpose.width, ev.xexpose.height, False);
1535 1573
1536 scr_refresh (refresh_type); 1574 want_refresh = 1;
1537 } 1575 }
1538 else 1576 else
1539 { 1577 {
1540 XEvent unused_event; 1578 XEvent unused_event;
1541 1579
… …
1547 if (isScrollbarWindow (ev.xany.window)) 1585 if (isScrollbarWindow (ev.xany.window))
1548 { 1586 {
1549 scrollBar.setIdle (); 1587 scrollBar.setIdle ();
1550 scrollbar_show (0); 1588 scrollbar_show (0);
1551 } 1589 }
1552#ifdef MENUBAR
1553 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1554 menubar_expose ();
1555#endif
1556 1590
1557#ifdef TRANSPARENT 1591#ifdef TRANSPARENT
1558 if (am_transparent && ev.xany.window == parent[0]) 1592 if (am_transparent && ev.xany.window == parent[0])
1559 XClearWindow (disp, ev.xany.window); 1593 XClearWindow (disp, ev.xany.window);
1560#endif 1594#endif
… …
1564 case MotionNotify: 1598 case MotionNotify:
1565#ifdef POINTER_BLANK 1599#ifdef POINTER_BLANK
1566 if (hidden_pointer) 1600 if (hidden_pointer)
1567 pointer_unblank (); 1601 pointer_unblank ();
1568#endif 1602#endif
1569#if MENUBAR
1570 if (isMenuBarWindow (ev.xany.window))
1571 {
1572 menubar_control (ev.xbutton);
1573 break;
1574 }
1575#endif
1576 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1603 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1577 break; 1604 break;
1578 1605
1579 if (ev.xany.window == vt) 1606 if (ev.xany.window == vt)
1580 { 1607 {
1608 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1609 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1610 ; // nop
1581 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1611 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1582 { 1612 {
1583 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1613 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1584 ; 1614 ;
1585 1615
1586 XQueryPointer (disp, vt, 1616 XQueryPointer (disp, vt,
… …
1666 &unused_root_x, &unused_root_y, 1696 &unused_root_x, &unused_root_y,
1667 &ev.xbutton.x, &ev.xbutton.y, 1697 &ev.xbutton.x, &ev.xbutton.y,
1668 &unused_mask); 1698 &unused_mask);
1669 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1699 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1670 scrollbar_size ()); 1700 scrollbar_size ());
1671 scr_refresh (refresh_type); 1701 want_refresh = 1;
1672 refresh_limit = 0; 1702 refresh_limit = 0;
1673 scrollbar_show (1); 1703 scrollbar_show (1);
1674 } 1704 }
1675 break; 1705 break;
1676 } 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
1677} 1736}
1678 1737
1679void 1738void
1680rxvt_term::focus_in () 1739rxvt_term::focus_in ()
1681{ 1740{
1682 if (!focus) 1741 if (!focus)
1683 { 1742 {
1684 focus = 1; 1743 focus = 1;
1685 want_refresh = 1; 1744 want_refresh = 1;
1745
1746 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1747
1686#if USE_XIM 1748#if USE_XIM
1687 if (Input_Context != NULL) 1749 if (Input_Context != NULL)
1688 { 1750 {
1689 IMSetStatusPosition (); 1751 IMSetStatusPosition ();
1690 XSetICFocus (Input_Context); 1752 XSetICFocus (Input_Context);
… …
1710 if (focus) 1772 if (focus)
1711 { 1773 {
1712 focus = 0; 1774 focus = 0;
1713 want_refresh = 1; 1775 want_refresh = 1;
1714 1776
1777 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1778
1715#if ENABLE_FRILLS || ISO_14755 1779#if ENABLE_FRILLS || ISO_14755
1780 if (iso14755buf)
1781 {
1716 iso14755buf = 0; 1782 iso14755buf = 0;
1717#endif
1718#if ENABLE_OVERLAY 1783# if ENABLE_OVERLAY
1719 scr_overlay_off (); 1784 scr_overlay_off ();
1785# endif
1786 }
1720#endif 1787#endif
1721#if USE_XIM 1788#if USE_XIM
1722 if (Input_Context != NULL) 1789 if (Input_Context != NULL)
1723 XUnsetICFocus (Input_Context); 1790 XUnsetICFocus (Input_Context);
1724#endif 1791#endif
… …
1739 1806
1740#if TRANSPARENT 1807#if TRANSPARENT
1741void 1808void
1742rxvt_term::rootwin_cb (XEvent &ev) 1809rxvt_term::rootwin_cb (XEvent &ev)
1743{ 1810{
1744 SET_R (this); 1811 make_current ();
1745 SET_LOCALE (locale);
1746 1812
1747 switch (ev.type) 1813 switch (ev.type)
1748 { 1814 {
1749 case PropertyNotify: 1815 case PropertyNotify:
1750 /* 1816 /*
… …
1768rxvt_term::button_press (XButtonEvent &ev) 1834rxvt_term::button_press (XButtonEvent &ev)
1769{ 1835{
1770 int reportmode = 0, clickintime; 1836 int reportmode = 0, clickintime;
1771 1837
1772 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1838 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1839
1773 if (!bypass_keystate) 1840 if (!bypass_keystate)
1774 reportmode = !! (priv_modes & PrivMode_mouse_report); 1841 reportmode = !! (priv_modes & PrivMode_mouse_report);
1775 1842
1776 /* 1843 /*
1777 * VT window processing of button press 1844 * VT window processing of button press
… …
1797#ifdef MOUSE_REPORT_DOUBLECLICK 1864#ifdef MOUSE_REPORT_DOUBLECLICK
1798 if (ev.button == MEvent.button && clickintime) 1865 if (ev.button == MEvent.button && clickintime)
1799 { 1866 {
1800 /* same button, within alloted time */ 1867 /* same button, within alloted time */
1801 MEvent.clicks++; 1868 MEvent.clicks++;
1869
1802 if (MEvent.clicks > 1) 1870 if (MEvent.clicks > 1)
1803 { 1871 {
1804 /* only report double clicks */ 1872 /* only report double clicks */
1805 MEvent.clicks = 2; 1873 MEvent.clicks = 2;
1806 mouse_report (ev); 1874 mouse_report (ev);
… …
1826 else 1894 else
1827 { 1895 {
1828 if (ev.button != MEvent.button) 1896 if (ev.button != MEvent.button)
1829 MEvent.clicks = 0; 1897 MEvent.clicks = 0;
1830 1898
1899 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1831 switch (ev.button) 1900 switch (ev.button)
1832 { 1901 {
1833 case Button1: 1902 case Button1:
1834 /* allow meta + click to select rectangular areas */ 1903 /* allow meta + click to select rectangular areas */
1835 /* should be done in screen.C */ 1904 /* should be done in screen.C */
1836#if ENABLE_FRILLS 1905#if ENABLE_FRILLS
1837 selection.rect = !!(ev.state & ModMetaMask); 1906 selection.rect = !!(ev.state & ModMetaMask);
1838#else 1907#else
1839 selection.rect = false; 1908 selection.rect = false;
1840#endif 1909#endif
1841 1910
1842 /* allow shift+left click to extend selection */ 1911 /* allow shift+left click to extend selection */
1843 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1912 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1844 { 1913 {
1845 if (MEvent.button == Button1 && clickintime) 1914 if (MEvent.button == Button1 && clickintime)
1846 selection_rotate (ev.x, ev.y); 1915 selection_rotate (ev.x, ev.y);
1847 else 1916 else
1848 selection_extend (ev.x, ev.y, 1); 1917 selection_extend (ev.x, ev.y, 1);
1849 } 1918 }
1850 else 1919 else
1851 { 1920 {
1852 if (MEvent.button == Button1 && clickintime) 1921 if (MEvent.button == Button1 && clickintime)
1853 MEvent.clicks++; 1922 MEvent.clicks++;
1854 else 1923 else
1855 MEvent.clicks = 1; 1924 MEvent.clicks = 1;
1856 1925
1857 selection_click (MEvent.clicks, ev.x, ev.y); 1926 selection_click (MEvent.clicks, ev.x, ev.y);
1858 } 1927 }
1859 1928
1860 MEvent.button = Button1; 1929 MEvent.button = Button1;
1861 break; 1930 break;
1862 1931
1863 case Button3: 1932 case Button3:
1864 if (MEvent.button == Button3 && clickintime) 1933 if (MEvent.button == Button3 && clickintime)
1865 selection_rotate (ev.x, ev.y); 1934 selection_rotate (ev.x, ev.y);
1866 else 1935 else
1867 selection_extend (ev.x, ev.y, 1); 1936 selection_extend (ev.x, ev.y, 1);
1868 1937
1869 MEvent.button = Button3; 1938 MEvent.button = Button3;
1870 break; 1939 break;
1871 } 1940 }
1872 } 1941 }
1873 1942
1874 MEvent.time = ev.time; 1943 MEvent.time = ev.time;
1875 return; 1944 return;
1876 } 1945 }
1877 1946
… …
2013 } 2082 }
2014 2083
2015 break; 2084 break;
2016 } 2085 }
2017 } 2086 }
2087
2018 return; 2088 return;
2019 } 2089 }
2020#if MENUBAR
2021 /*
2022 * Menubar window processing of button press
2023 */
2024 if (isMenuBarWindow (ev.window))
2025 menubar_control (ev);
2026#endif
2027} 2090}
2028 2091
2029void 2092void
2030rxvt_term::button_release (XButtonEvent &ev) 2093rxvt_term::button_release (XButtonEvent &ev)
2031{ 2094{
… …
2087 if (priv_modes & PrivMode_mouse_report 2150 if (priv_modes & PrivMode_mouse_report
2088 && bypass_keystate 2151 && bypass_keystate
2089 && ev.button == Button1 && MEvent.clicks <= 1) 2152 && ev.button == Button1 && MEvent.clicks <= 1)
2090 selection_extend (ev.x, ev.y, 0); 2153 selection_extend (ev.x, ev.y, 0);
2091 2154
2155 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2156 return;
2157
2092 switch (ev.button) 2158 switch (ev.button)
2093 { 2159 {
2094 case Button1: 2160 case Button1:
2095 case Button3: 2161 case Button3:
2096 selection_make (ev.time); 2162 selection_make (ev.time);
… …
2127 slip_wheel_ev.start (); 2193 slip_wheel_ev.start ();
2128 } 2194 }
2129 else 2195 else
2130 { 2196 {
2131# endif 2197# endif
2132# ifdef JUMP_MOUSE_WHEEL
2133 scr_page (v, i); 2198 scr_page (v, i);
2134 scr_refresh (SMOOTH_REFRESH);
2135 scrollbar_show (1); 2199 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 2200# ifdef MOUSE_SLIP_WHEELING
2145 } 2201 }
2146#endif 2202# endif
2147 } 2203 }
2148 break; 2204 break;
2149#endif 2205#endif
2150 } 2206 }
2151 } 2207 }
2152#ifdef MENUBAR
2153 else if (isMenuBarWindow (ev.window))
2154 menubar_control (ev);
2155#endif
2156} 2208}
2157 2209
2158#ifdef TRANSPARENT 2210#ifdef TRANSPARENT
2159#if TINTING 2211#if TINTING
2160/* taken from aterm-0.4.2 */ 2212/* taken from aterm-0.4.2 */
… …
2640 2692
2641bool 2693bool
2642rxvt_term::cmd_parse () 2694rxvt_term::cmd_parse ()
2643{ 2695{
2644 bool flag = false; 2696 bool flag = false;
2645 unicode_t ch = NOCHAR; 2697 wchar_t ch = NOCHAR;
2646 unsigned char *seq_begin; // remember start of esc-sequence here 2698 char *seq_begin; // remember start of esc-sequence here
2647 2699
2648 for (;;) 2700 for (;;)
2649 { 2701 {
2650 if (ch == NOCHAR) 2702 if (ch == NOCHAR)
2651 { 2703 {
2652 seq_begin = cmdbuf_ptr; 2704 seq_begin = cmdbuf_ptr;
2653 ch = next_char (); 2705 ch = next_char ();
2654 }
2655 2706
2656 if (ch == NOCHAR) // TODO: improve 2707 if (ch == NOCHAR)
2657 break; 2708 break;
2709 }
2658 2710
2659 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)
2660 { 2712 {
2661 if (!seen_input) 2713 if (!seen_input)
2662 { 2714 {
… …
2671 if (seen_resize && cmd_pid) 2723 if (seen_resize && cmd_pid)
2672 kill (-cmd_pid, SIGWINCH); 2724 kill (-cmd_pid, SIGWINCH);
2673 } 2725 }
2674 2726
2675 /* Read a text string from the input buffer */ 2727 /* Read a text string from the input buffer */
2676 unicode_t buf[UBUFSIZ]; 2728 wchar_t buf[UBUFSIZ];
2677 bool refreshnow = false; 2729 bool refreshnow = false;
2678 int nlines = 0; 2730 int nlines = 0;
2679 unicode_t *str = buf; 2731 wchar_t *str = buf;
2680 unicode_t *eol = str + min (ncol, UBUFSIZ); 2732 wchar_t *eol = str + min (ncol, UBUFSIZ);
2681 2733
2682 for (;;) 2734 for (;;)
2683 { 2735 {
2684 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))
2685 break; 2737 break;
… …
2695 2747
2696 if (!OPTION (Opt_jumpScroll) 2748 if (!OPTION (Opt_jumpScroll)
2697 || (refresh_count >= refresh_limit * (nrow - 1))) 2749 || (refresh_count >= refresh_limit * (nrow - 1)))
2698 { 2750 {
2699 refreshnow = true; 2751 refreshnow = true;
2752 refresh_count = 0;
2700 ch = NOCHAR; 2753 ch = NOCHAR;
2701 break; 2754 break;
2702 } 2755 }
2703 2756
2704 // scr_add_lines only works for nlines <= nrow - 1. 2757 // scr_add_lines only works for nlines <= nrow - 1.
2705 if (nlines >= nrow - 1) 2758 if (nlines >= nrow - 1)
2706 { 2759 {
2760 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2761 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2707 scr_add_lines (buf, nlines, str - buf); 2762 scr_add_lines (buf, str - buf, nlines);
2763
2708 nlines = 0; 2764 nlines = 0;
2709 str = buf; 2765 str = buf;
2710 eol = str + min (ncol, UBUFSIZ); 2766 eol = str + min (ncol, UBUFSIZ);
2711 } 2767 }
2712 2768
… …
2725 2781
2726 seq_begin = cmdbuf_ptr; 2782 seq_begin = cmdbuf_ptr;
2727 ch = next_char (); 2783 ch = next_char ();
2728 } 2784 }
2729 2785
2786 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2787 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2730 scr_add_lines (buf, nlines, str - buf); 2788 scr_add_lines (buf, str - buf, nlines);
2731 2789
2732 /* 2790 /*
2733 * 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
2734 * 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.
2735 * the number of pages between refreshes is refresh_limit, which 2793 * the number of pages between refreshes is refresh_limit, which
… …
2741 refresh_limit++; 2799 refresh_limit++;
2742 else 2800 else
2743 { 2801 {
2744 flag = true; 2802 flag = true;
2745 scr_refresh (refresh_type); 2803 scr_refresh (refresh_type);
2804 want_refresh = 1;
2746 } 2805 }
2747 } 2806 }
2748 2807
2749 } 2808 }
2750 else 2809 else
… …
2765 } 2824 }
2766 2825
2767 return flag; 2826 return flag;
2768} 2827}
2769 2828
2770// read the next octet
2771unicode_t
2772rxvt_term::next_octet ()
2773{
2774 return cmdbuf_ptr < cmdbuf_endp
2775 ? *cmdbuf_ptr++
2776 : NOCHAR;
2777}
2778
2779// read the next character 2829// read the next character
2780unicode_t 2830wchar_t
2781rxvt_term::next_char () 2831rxvt_term::next_char ()
2782{ 2832{
2783 while (cmdbuf_ptr < cmdbuf_endp) 2833 while (cmdbuf_ptr < cmdbuf_endp)
2784 { 2834 {
2785 // assume 7-bit to be ascii ALWAYS 2835 // assume 7-bit to be ascii ALWAYS
2786 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2836 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2787 return *cmdbuf_ptr++; 2837 return *cmdbuf_ptr++;
2788 2838
2789 wchar_t wc; 2839 wchar_t wc;
2790 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);
2791 2841
2792 if (len == (size_t)-2) 2842 if (len == (size_t)-2)
2793 { 2843 {
2794 // the mbstate stores incomplete sequences. didn't know this :/ 2844 // the mbstate stores incomplete sequences. didn't know this :/
2795 cmdbuf_ptr = cmdbuf_endp; 2845 cmdbuf_ptr = cmdbuf_endp;
2796 break; 2846 break;
2797 } 2847 }
2798 2848
2799 if (len == (size_t)-1) 2849 if (len == (size_t)-1)
2800 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
2801 2851
2802 // assume wchar == unicode 2852 // assume wchar == unicode
2803 cmdbuf_ptr += len; 2853 cmdbuf_ptr += len;
2804 return wc & UNICODE_MASK; 2854 return wc & UNICODE_MASK;
2805 } 2855 }
2806 2856
2807 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;
2808} 2867}
2809 2868
2810/* rxvt_cmd_getc () - Return next input character */ 2869/* rxvt_cmd_getc () - Return next input character */
2811/* 2870/*
2812 * Return the next input character after first passing any keyboard input 2871 * Return the next input character after first passing any keyboard input
2813 * to the command. 2872 * to the command.
2814 */ 2873 */
2815unicode_t 2874wchar_t
2816rxvt_term::cmd_getc () 2875rxvt_term::cmd_getc ()
2817{ 2876{
2818 unicode_t c = next_char (); 2877 wchar_t c = next_char ();
2819 2878
2820 if (c == NOCHAR) 2879 if (c == NOCHAR)
2821 throw out_of_input; 2880 throw out_of_input;
2822 2881
2823 return c; 2882 return c;
2824} 2883}
2825 2884
2826unicode_t 2885uint32_t
2827rxvt_term::cmd_get8 () 2886rxvt_term::cmd_get8 ()
2828{ 2887{
2829 unicode_t c = next_octet (); 2888 uint32_t c = next_octet ();
2830 2889
2831 if (c == NOCHAR) 2890 if (c == NOCHAR)
2832 throw out_of_input; 2891 throw out_of_input;
2833 2892
2834 return c; 2893 return c;
… …
2934 case C0_ESC: 2993 case C0_ESC:
2935 process_escape_seq (); 2994 process_escape_seq ();
2936 break; 2995 break;
2937 case C0_ENQ: /* terminal Status */ 2996 case C0_ENQ: /* terminal Status */
2938 if (rs[Rs_answerbackstring]) 2997 if (rs[Rs_answerbackstring])
2939 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2998 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2940 (unsigned int)strlen (rs[Rs_answerbackstring]));
2941 else 2999 else
2942 tt_write ((unsigned char *)VT100_ANS, 3000 tt_write (VT100_ANS, strlen (VT100_ANS));
2943 (unsigned int)strlen (VT100_ANS));
2944 break; 3001 break;
2945 case C0_BEL: /* bell */ 3002 case C0_BEL: /* bell */
2946 scr_bell (); 3003 scr_bell ();
2947 break; 3004 break;
2948 case C0_BS: /* backspace */ 3005 case C0_BS: /* backspace */
… …
3103 break; 3160 break;
3104 3161
3105 /* 8.3.87: NEXT LINE */ 3162 /* 8.3.87: NEXT LINE */
3106 case C1_NEL: /* ESC E */ 3163 case C1_NEL: /* ESC E */
3107 { 3164 {
3108 unicode_t nlcr[] = { C0_LF, C0_CR }; 3165 wchar_t nlcr[] = { C0_LF, C0_CR };
3109 scr_add_lines (nlcr, 1, 2); 3166 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3110 } 3167 }
3111 break; 3168 break;
3112 3169
3113 /* kidnapped escape sequence: Should be 8.3.48 */ 3170 /* kidnapped escape sequence: Should be 8.3.48 */
3114 case C1_ESA: /* ESC G */ 3171 case C1_ESA: /* ESC G */
… …
3136 process_dcs_seq (); 3193 process_dcs_seq ();
3137 break; 3194 break;
3138 3195
3139 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3196 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3140 case C1_SCI: /* ESC Z */ 3197 case C1_SCI: /* ESC Z */
3141 tt_write ((const unsigned char *)ESCZ_ANSWER, 3198 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3142 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3143 break; /* steal obsolete ESC [ c */ 3199 break; /* steal obsolete ESC [ c */
3144 3200
3145 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3201 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3146 case C1_CSI: /* ESC [ */ 3202 case C1_CSI: /* ESC [ */
3147 process_csi_seq (); 3203 process_csi_seq ();
… …
3391 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3447 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3392 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3448 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3393 break; 3449 break;
3394 3450
3395 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3451 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3396 tt_write ((const unsigned char *)VT100_ANS, 3452 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3397 (unsigned int) (sizeof (VT100_ANS) - 1));
3398 break; 3453 break;
3399 3454
3400 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3455 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3401 process_sgr_mode (nargs, arg); 3456 process_sgr_mode (nargs, arg);
3402 break; 3457 break;
… …
3604/*----------------------------------------------------------------------*/ 3659/*----------------------------------------------------------------------*/
3605/* 3660/*
3606 * get input up until STRING TERMINATOR (or BEL) 3661 * get input up until STRING TERMINATOR (or BEL)
3607 * ends_how is terminator used. returned input must be free()'d 3662 * ends_how is terminator used. returned input must be free()'d
3608 */ 3663 */
3609unsigned char * 3664char *
3610rxvt_term::get_to_st (unicode_t &ends_how) 3665rxvt_term::get_to_st (unicode_t &ends_how)
3611{ 3666{
3612 unicode_t ch; 3667 unicode_t ch;
3613 bool seen_esc = false; 3668 bool seen_esc = false;
3614 unsigned int n = 0; 3669 unsigned int n = 0;
… …
3647 3702
3648 string[n++] = '\0'; 3703 string[n++] = '\0';
3649 3704
3650 ends_how = (ch == 0x5c ? C0_ESC : ch); 3705 ends_how = (ch == 0x5c ? C0_ESC : ch);
3651 3706
3652 return (unsigned char *)rxvt_wcstombs (string); 3707 return rxvt_wcstombs (string);
3653} 3708}
3654 3709
3655/*----------------------------------------------------------------------*/ 3710/*----------------------------------------------------------------------*/
3656/* 3711/*
3657 * 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)'
3658 */ 3713 */
3659void 3714void
3660rxvt_term::process_dcs_seq () 3715rxvt_term::process_dcs_seq ()
3661{ 3716{
3662 unsigned char *s; 3717 char *s;
3663 unicode_t eh; 3718 unicode_t eh;
3664 3719
3665 /* 3720 /*
3666 * Not handled yet 3721 * Not handled yet
3667 */ 3722 */
… …
3686 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3741 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3687 arg = arg * 10 + (ch - '0'); 3742 arg = arg * 10 + (ch - '0');
3688 3743
3689 if (ch == ';') 3744 if (ch == ';')
3690 { 3745 {
3691 unsigned char *s = get_to_st (eh); 3746 char *s = get_to_st (eh);
3692 3747
3693 if (s) 3748 if (s)
3694 { 3749 {
3695 process_xterm_seq (arg, (char *)s, eh); 3750 process_xterm_seq (arg, s, eh);
3696 free (s); 3751 free (s);
3697 } 3752 }
3698 } 3753 }
3699} 3754}
3700 3755
3701void 3756void
3702rxvt_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)
3703{ 3758{
3704 if (str[0] == '?' && !str[1]) 3759 if (str[0] == '?' && !str[1])
3705 { 3760 {
3706 unsigned short r, g, b; 3761 unsigned short r, g, b;
3707 pix_colors_focused[color].get (display, r, g, b); 3762 pix_colors_focused[color].get (display, r, g, b);
… …
3713 3768
3714/* 3769/*
3715 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3770 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3716 */ 3771 */
3717void 3772void
3718rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3773rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3719{ 3774{
3720 int changed = 0; 3775 int changed = 0;
3721 int color; 3776 int color;
3722 char *buf, *name; 3777 char *buf, *name;
3723 bool query = str[0] == '?' && !str[1]; 3778 bool query = str[0] == '?' && !str[1];
… …
3780 { 3835 {
3781 if ((name = strchr (buf, ';')) == NULL) 3836 if ((name = strchr (buf, ';')) == NULL)
3782 break; 3837 break;
3783 3838
3784 *name++ = '\0'; 3839 *name++ = '\0';
3785 color = atoi (buf); 3840 color = atoi (buf) + minCOLOR;
3786 3841
3787 if (color < 0 || color >= TOTAL_COLORS) 3842 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3788 break; 3843 break;
3789 3844
3790 if ((buf = strchr (name, ';')) != NULL) 3845 if ((buf = strchr (name, ';')) != NULL)
3791 *buf++ = '\0'; 3846 *buf++ = '\0';
3792 3847
3793 if (name[0] == '?' && !name[1]) 3848 if (name[0] == '?' && !name[1])
3794 { 3849 {
3795 unsigned short r, g, b; 3850 unsigned short r, g, b;
3796 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3851 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); 3852 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3798 } 3853 }
3799 else 3854 else
3800 set_window_color (color + minCOLOR, name); 3855 set_window_color (color, name);
3801 } 3856 }
3802 break; 3857 break;
3803 case XTerm_Color00: 3858 case XTerm_Color00:
3804 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3859 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3805 break; 3860 break;
3806 case XTerm_Color01: 3861 case XTerm_Color01:
3807 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3862 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3808 break; 3863 break;
3809#ifndef NO_CURSORCOLOR 3864#ifndef NO_CURSORCOLOR
3810 case XTerm_Color_cursor: 3865 case XTerm_Color_cursor:
3811 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3866 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3812 break; 3867 break;
… …
3816 break; 3871 break;
3817 case XTerm_Color_pointer_bg: 3872 case XTerm_Color_pointer_bg:
3818 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);
3819 break; 3874 break;
3820#ifndef NO_BOLD_UNDERLINE_REVERSE 3875#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: 3876 case XTerm_Color_RV:
3828 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);
3829 break; 3886 break;
3830 case URxvt_Color_IT: 3887 case URxvt_Color_IT:
3831 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3888 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3832 break; 3889 break;
3833#endif 3890#endif
… …
3838 if (am_transparent) 3895 if (am_transparent)
3839 want_full_refresh = want_refresh = 1; 3896 want_full_refresh = want_refresh = 1;
3840 break; 3897 break;
3841#endif 3898#endif
3842 3899
3843 case XTerm_Pixmap: 3900 case Rxvt_Pixmap:
3844 if (*str != ';') 3901 if (*str != ';')
3845 { 3902 {
3846#if XPM_BACKGROUND 3903#if XPM_BACKGROUND
3847 scale_pixmap (""); /* reset to default scaling */ 3904 scale_pixmap (""); /* reset to default scaling */
3848 set_bgPixmap (str); /* change pixmap */ 3905 set_bgPixmap (str); /* change pixmap */
3849#endif
3850 scr_touch (true); 3906 scr_touch (true);
3907#endif
3851 } 3908 }
3909
3852 while ((str = strchr (str, ';')) != NULL) 3910 while ((str = strchr (str, ';')) != NULL)
3853 { 3911 {
3854 str++; 3912 str++;
3855#if XPM_BACKGROUND 3913#if XPM_BACKGROUND
3856 changed += scale_pixmap (str); 3914 changed += scale_pixmap (str);
… …
3859 3917
3860 if (changed) 3918 if (changed)
3861 { 3919 {
3862#ifdef XPM_BACKGROUND 3920#ifdef XPM_BACKGROUND
3863 resize_pixmap (); 3921 resize_pixmap ();
3864#endif
3865 scr_touch (true); 3922 scr_touch (true);
3923#endif
3866 } 3924 }
3867 break; 3925 break;
3868 3926
3869 case XTerm_restoreFG: 3927 case Rxvt_restoreFG:
3870 set_window_color (Color_fg, str); 3928 set_window_color (Color_fg, str);
3871 break; 3929 break;
3872 case XTerm_restoreBG: 3930 case Rxvt_restoreBG:
3873 set_window_color (Color_bg, str); 3931 set_window_color (Color_bg, str);
3874 break; 3932 break;
3875 3933
3876 case XTerm_logfile: 3934 case XTerm_logfile:
3877 // TODO, when secure mode? 3935 // TODO, when secure mode?
3878 break; 3936 break;
3879 3937
3880#ifdef MENUBAR
3881 case URxvt_Menu:
3882 if (OPTION (Opt_insecure))
3883 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3884 break;
3885#endif
3886#if 0 3938#if 0
3887 case XTerm_dumpscreen: /* no error notices */ 3939 case Rxvt_dumpscreen: /* no error notices */
3888 { 3940 {
3889 int fd; 3941 int fd;
3890 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)
3891 { 3943 {
3892 scr_dump (fd); 3944 scr_dump (fd);
… …
3930 } 3982 }
3931 break; 3983 break;
3932 3984
3933 case URxvt_view_up: 3985 case URxvt_view_up:
3934 case URxvt_view_down: 3986 case URxvt_view_down:
3987 {
3935 int lines = atoi (str); 3988 int lines = atoi (str);
3936 3989
3937 if (lines) 3990 if (lines)
3938 scr_page (op == URxvt_view_up ? UP : DN, lines); 3991 scr_page (op == URxvt_view_up ? UP : DN, lines);
3939 else 3992 else
3940 {
3941 scr_erase_savelines (); 3993 scr_erase_savelines ();
3942 } 3994 }
3943 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
3944 break; 4003 break;
3945#endif 4004#endif
3946 } 4005 }
3947} 4006}
3948/*----------------------------------------------------------------------*/ 4007/*----------------------------------------------------------------------*/
… …
4000 { 5, PrivMode_rVideo }, 4059 { 5, PrivMode_rVideo },
4001 { 6, PrivMode_relOrigin }, 4060 { 6, PrivMode_relOrigin },
4002 { 7, PrivMode_Autowrap }, 4061 { 7, PrivMode_Autowrap },
4003 // 8, bi-directional support mode 4062 // 8, bi-directional support mode
4004 { 9, PrivMode_MouseX10 }, 4063 { 9, PrivMode_MouseX10 },
4005#ifdef menuBar_esc
4006 { menuBar_esc, PrivMode_menuBar },
4007#endif
4008 // 18, 19 printing-related 4064 // 18, 19 printing-related
4009 { 25, PrivMode_VisibleCursor }, 4065 { 25, PrivMode_VisibleCursor },
4010#ifdef scrollBar_esc 4066#ifdef scrollBar_esc
4011 { scrollBar_esc, PrivMode_scrollBar }, 4067 { scrollBar_esc, PrivMode_scrollBar },
4012#endif 4068#endif
… …
4059 /* extra handling for values with state unkept */ 4115 /* extra handling for values with state unkept */
4060 switch (arg[i]) 4116 switch (arg[i])
4061 { 4117 {
4062#if ENABLE_STYLES 4118#if ENABLE_STYLES
4063 case 1021: 4119 case 1021:
4064 if (mode) 4120 set_option (Opt_intensityStyles, mode);
4065 SET_OPTION (Opt_intensityStyles);
4066 else
4067 CLR_OPTION (Opt_intensityStyles);
4068 4121
4069 want_refresh = 1; 4122 scr_touch (true);
4070 want_full_refresh = 1;
4071 break; 4123 break;
4072#endif 4124#endif
4073 case 1048: /* alternative cursor save */ 4125 case 1048: /* alternative cursor save */
4074 case 1049: 4126 case 1049:
4075 if (OPTION (Opt_secondaryScreen)) 4127 if (OPTION (Opt_secondaryScreen))
… …
4095 case 3: /* 80/132 */ 4147 case 3: /* 80/132 */
4096 if (priv_modes & PrivMode_132OK) 4148 if (priv_modes & PrivMode_132OK)
4097 set_widthheight (((state ? 132 : 80) * fwidth), height); 4149 set_widthheight (((state ? 132 : 80) * fwidth), height);
4098 break; 4150 break;
4099 case 4: /* smooth scrolling */ 4151 case 4: /* smooth scrolling */
4100 if (!state) 4152 set_option (Opt_jumpScroll, !state);
4101 SET_OPTION (Opt_jumpScroll);
4102 else
4103 CLR_OPTION (Opt_jumpScroll);
4104 break; 4153 break;
4105 case 5: /* reverse video */ 4154 case 5: /* reverse video */
4106 scr_rvideo_mode (state); 4155 scr_rvideo_mode (state);
4107 break; 4156 break;
4108 case 6: /* relative/absolute origins */ 4157 case 6: /* relative/absolute origins */
… …
4114 /* 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 */
4115 case 9: /* X10 mouse reporting */ 4164 case 9: /* X10 mouse reporting */
4116 if (state) /* orthogonal */ 4165 if (state) /* orthogonal */
4117 priv_modes &= ~PrivMode_MouseX11; 4166 priv_modes &= ~PrivMode_MouseX11;
4118 break; 4167 break;
4119#ifdef menuBar_esc
4120 case menuBar_esc:
4121#ifdef MENUBAR
4122 map_menuBar (state);
4123#endif
4124 break;
4125#endif
4126#ifdef scrollBar_esc 4168#ifdef scrollBar_esc
4127 case scrollBar_esc: 4169 case scrollBar_esc:
4128 if (scrollbar_mapping (state)) 4170 if (scrollbar_mapping (state))
4129 { 4171 {
4130 resize_all_windows (0, 0, 0); 4172 resize_all_windows (0, 0, 0);
… …
4149#if 0 4191#if 0
4150 case 1001: 4192 case 1001:
4151 break; /* X11 mouse highlighting */ 4193 break; /* X11 mouse highlighting */
4152#endif 4194#endif
4153 case 1010: /* scroll to bottom on TTY output inhibit */ 4195 case 1010: /* scroll to bottom on TTY output inhibit */
4154 if (!state) 4196 set_option (Opt_scrollTtyOutput, !state);
4155 SET_OPTION (Opt_scrollTtyOutput);
4156 else
4157 CLR_OPTION (Opt_scrollTtyOutput);
4158 break; 4197 break;
4159 case 1011: /* scroll to bottom on key press */ 4198 case 1011: /* scroll to bottom on key press */
4160 if (state) 4199 set_option (Opt_scrollTtyKeypress, state);
4161 SET_OPTION (Opt_scrollTtyKeypress);
4162 else
4163 CLR_OPTION (Opt_scrollTtyKeypress);
4164 break; 4200 break;
4165 case 1047: /* secondary screen w/ clearing last */ 4201 case 1047: /* secondary screen w/ clearing last */
4166 if (OPTION (Opt_secondaryScreen)) 4202 if (OPTION (Opt_secondaryScreen))
4167 if (current_screen != PRIMARY) 4203 if (current_screen != PRIMARY)
4168 scr_erase_screen (2); 4204 scr_erase_screen (2);
… …
4306 scr_color (Color_bg, Color_bg); 4342 scr_color (Color_bg, Color_bg);
4307 break; 4343 break;
4308 4344
4309 //case 50: // not variable spacing 4345 //case 50: // not variable spacing
4310 4346
4311#ifndef NO_BRIGHTCOLOR 4347#if ENABLE_FRILLS
4312 case 90: 4348 case 90:
4313 case 91: /* set bright fg color */ 4349 case 91: /* set bright fg color */
4314 case 92: 4350 case 92:
4315 case 93: 4351 case 93:
4316 case 94: 4352 case 94:
… …
4361 */ 4397 */
4362void 4398void
4363rxvt_term::tt_printf (const char *fmt,...) 4399rxvt_term::tt_printf (const char *fmt,...)
4364{ 4400{
4365 va_list arg_ptr; 4401 va_list arg_ptr;
4366 unsigned char buf[256]; 4402 char buf[256];
4367 4403
4368 va_start (arg_ptr, fmt); 4404 va_start (arg_ptr, fmt);
4369 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4405 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4370 va_end (arg_ptr); 4406 va_end (arg_ptr);
4371 tt_write (buf, strlen (buf)); 4407 tt_write (buf, strlen (buf));
… …
4376 * or generated by us in response to a query ESC sequence. 4412 * or generated by us in response to a query ESC sequence.
4377 */ 4413 */
4378const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4414const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4379 4415
4380void 4416void
4381rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4417rxvt_term::tt_write (const char *data, unsigned int len)
4382{ 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
4383 if (v_buflen == 0) 4425 if (v_buflen == 0)
4384 { 4426 {
4385 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));
4386 4428
4387 if ((unsigned int)written == len) 4429 if ((unsigned int)written == len)
… …
4389 4431
4390 data += written; 4432 data += written;
4391 len -= written; 4433 len -= written;
4392 } 4434 }
4393 4435
4394 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4436 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4395 4437
4396 memcpy (v_buffer + v_buflen, data, len); 4438 memcpy (v_buffer + v_buflen, data, len);
4397 v_buflen += len; 4439 v_buflen += len;
4398 4440
4399 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