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.264 by root, Mon Jan 16 06:37:51 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 */
… …
919 923
920#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
921/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
922/* attempt to `write' count to the input buffer */ 926/* attempt to `write' count to the input buffer */
923unsigned int 927unsigned int
924rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 928rxvt_term::cmd_write (const char *str, unsigned int count)
925{ 929{
926 unsigned int n, s; 930 unsigned int n, s;
927 931
928 n = cmdbuf_ptr - cmdbuf_base; 932 n = cmdbuf_ptr - cmdbuf_base;
929 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 933 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
966 } 970 }
967#endif 971#endif
968 972
969 if (want_refresh) 973 if (want_refresh)
970 { 974 {
975 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976 {
977 int row = view_start;
978 int end_row = row + nrow;
979
980 while (row > top_row && ROW (row - 1).is_longer ())
981 --row;
982
983 do
984 {
985 int start_row = row;
986 line_t *l;
987
988 do
989 {
990 l = &ROW (row++);
991
992 if (!(l->f & LINE_FILTERED))
993 {
994 // line not filtered, mark it as filtered
995 l->f |= LINE_FILTERED;
996 while (l->is_longer ())
997 {
998 l = &ROW (row++);
999 l->f |= LINE_FILTERED;
1000 }
1001
1002 // and filter it
1003 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1004
1005 break;
1006 }
1007 }
1008 while (l->is_longer () && row < end_row);
1009 }
1010 while (row < end_row);
1011 }
1012
971 scr_refresh (refresh_type); 1013 scr_refresh (refresh_type);
972 scrollbar_show (1); 1014 scrollbar_show (1);
973#ifdef USE_XIM 1015#ifdef USE_XIM
974 IMSendSpot (); 1016 IMSendSpot ();
975#endif 1017#endif
… …
979} 1021}
980 1022
981void 1023void
982rxvt_term::check_cb (check_watcher &w) 1024rxvt_term::check_cb (check_watcher &w)
983{ 1025{
984 SET_R (this); 1026 make_current ();
985 SET_LOCALE (locale);
986 1027
987 display->flush (); 1028 display->flush ();
988 1029
989 if (want_refresh && !flush_ev.active) 1030 if (want_refresh && !flush_ev.active)
990 flush_ev.start (NOW + 0.01); 1031 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
991} 1032}
992 1033
993void 1034void
994rxvt_term::flush_cb (time_watcher &w) 1035rxvt_term::flush_cb (time_watcher &w)
995{ 1036{
996 SET_R (this); 1037 make_current ();
997 SET_LOCALE (locale);
998 1038
999 refresh_limit = 1; 1039 refresh_limit = 1;
1000 refresh_count = 0; 1040 refresh_count = 0;
1001 flush (); 1041 flush ();
1002} 1042}
… …
1059{ 1099{
1060 if (mouse_slip_wheel_speed == 0 1100 if (mouse_slip_wheel_speed == 0
1061 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1101 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1062 : scr_page (UP, mouse_slip_wheel_speed)) 1102 : scr_page (UP, mouse_slip_wheel_speed))
1063 { 1103 {
1064 if (view_start == nsaved || 1104 if (view_start == top_row || view_start == 0)
1065 view_start == 0)
1066 mouse_slip_wheel_speed = 0; 1105 mouse_slip_wheel_speed = 0;
1067 1106
1068 refresh_type |= SMOOTH_REFRESH; 1107 refresh_type |= SMOOTH_REFRESH;
1069 want_refresh = 1; 1108 want_refresh = 1;
1070 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1109 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1071 } 1110 }
1072} 1111}
1073#endif 1112#endif
1074 1113
1114#if HAVE_SCHED_YIELD
1115static struct event_handler
1116{
1117 check_watcher cw_yield;
1118
1119 void yield (check_watcher &w)
1120 {
1121 sched_yield ();
1122 w.stop ();
1123 }
1124
1125 event_handler ()
1126 : cw_yield (this, &event_handler::yield)
1127 {
1128 }
1129} event_handler;
1130#endif
1131
1075bool 1132bool
1076rxvt_term::pty_fill () 1133rxvt_term::pty_fill ()
1077{ 1134{
1078 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1135 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1079 1136
1080 if (CBUFSIZ == n) 1137 if (CBUFSIZ == n)
1081 { 1138 {
1082 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1139 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1083 n = 0; 1140 n = 0;
1084 } 1141 }
1085 1142
1086 memmove (cmdbuf_base, cmdbuf_ptr, n); 1143 memmove (cmdbuf_base, cmdbuf_ptr, n);
1087 cmdbuf_ptr = cmdbuf_base; 1144 cmdbuf_ptr = cmdbuf_base;
… …
1095 return true; 1152 return true;
1096 } 1153 }
1097 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1154 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1098 { 1155 {
1099#if HAVE_SCHED_YIELD 1156#if HAVE_SCHED_YIELD
1100 sched_yield (); 1157 if (display->is_local)
1158 event_handler.cw_yield.start ();
1101#endif 1159#endif
1102 } 1160 }
1103 else 1161 else
1104 { 1162 {
1105 pty_ev.stop (); 1163 pty_ev.stop ();
… …
1112} 1170}
1113 1171
1114void 1172void
1115rxvt_term::pty_cb (io_watcher &w, short revents) 1173rxvt_term::pty_cb (io_watcher &w, short revents)
1116{ 1174{
1117 SET_R (this); 1175 make_current ();
1118 SET_LOCALE (locale);
1119 1176
1120 if (revents & EVENT_READ) 1177 if (revents & EVENT_READ)
1121 // loop, but don't allow a single term to monopolize us 1178 // loop, but don't allow a single term to monopolize us
1122 while (pty_fill ()) 1179 while (pty_fill ())
1123 if (cmd_parse ()) 1180 if (cmd_parse ())
… …
1143 1200
1144#ifdef POINTER_BLANK 1201#ifdef POINTER_BLANK
1145void 1202void
1146rxvt_term::pointer_blank () 1203rxvt_term::pointer_blank ()
1147{ 1204{
1148 if (! OPTION (Opt_pointerBlank)) 1205 if (!OPTION (Opt_pointerBlank))
1149 return; 1206 return;
1150 1207
1151 XDefineCursor (display->display, vt, display->blank_cursor); 1208 XDefineCursor (display->display, vt, display->blank_cursor);
1152 XFlush (display->display); 1209 XFlush (display->display);
1153 1210
… …
1155} 1212}
1156 1213
1157void 1214void
1158rxvt_term::pointer_cb (time_watcher &w) 1215rxvt_term::pointer_cb (time_watcher &w)
1159{ 1216{
1160 SET_R (this); 1217 make_current ();
1161 SET_LOCALE (locale);
1162 1218
1163 pointer_blank (); 1219 pointer_blank ();
1164} 1220}
1165#endif 1221#endif
1166 1222
… …
1245 1301
1246/*{{{ process an X event */ 1302/*{{{ process an X event */
1247void 1303void
1248rxvt_term::x_cb (XEvent &ev) 1304rxvt_term::x_cb (XEvent &ev)
1249{ 1305{
1306 make_current ();
1307
1250 dDisp; 1308 dDisp;
1251 1309
1252 SET_R (this); 1310 if (ev.xany.window == vt
1253 SET_LOCALE (locale); 1311 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1312 return;
1254 1313
1255#if defined(CURSOR_BLINK) 1314 // 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; 1315 Window unused_root, unused_child;
1283 int unused_root_x, unused_root_y; 1316 int unused_root_x, unused_root_y;
1284 unsigned int unused_mask; 1317 unsigned int unused_mask;
1285 1318
1286 switch (ev.type) 1319 switch (ev.type)
… …
1293 1326
1294 break; 1327 break;
1295 1328
1296 case KeyRelease: 1329 case KeyRelease:
1297 { 1330 {
1298#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1331#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1299 KeySym ks; 1332 KeySym keysym;
1300 1333
1301 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1334 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1302#endif 1335#endif
1303 1336
1304#if ENABLE_FRILLS || ISO_14755 1337#if ENABLE_FRILLS || ISO_14755
1305 // ISO 14755 support 1338 // ISO 14755 support
1306 if (iso14755buf) 1339 if (iso14755buf)
… …
1311# endif 1344# endif
1312# if ISO_14755 1345# if ISO_14755
1313 // iso14755 part 5.2 handling: release time 1346 // iso14755 part 5.2 handling: release time
1314 // first: controls 1347 // first: controls
1315 if ((ev.xkey.state & ControlMask) 1348 if ((ev.xkey.state & ControlMask)
1316 && ((ks >= 0x40 && ks <= 0x5f) 1349 && ((keysym >= 0x40 && keysym <= 0x5f)
1317 || (ks >= 0x61 && ks <= 0x7f))) 1350 || (keysym >= 0x61 && keysym <= 0x7f)))
1318 { 1351 {
1319 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1352 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1320 commit_iso14755 (); 1353 commit_iso14755 ();
1321 return; // case-break; 1354 goto skip_switch;
1322 } 1355 }
1323 1356
1324 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1357 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1325 if (i[0] == ks) 1358 if (i[0] == keysym)
1326 { 1359 {
1327 iso14755buf = ISO_14755_51 | i[1]; 1360 iso14755buf = ISO_14755_51 | i[1];
1328 commit_iso14755 (); 1361 commit_iso14755 ();
1329 return; // case-break; 1362 goto skip_switch;
1330 } 1363 }
1331 1364
1332 scr_bell (); 1365 scr_bell ();
1333# endif 1366# endif
1334 iso14755buf = 0; 1367 iso14755buf = 0;
… …
1353 else 1386 else
1354 iso14755buf = 0; 1387 iso14755buf = 0;
1355 } 1388 }
1356#endif 1389#endif
1357 1390
1391 if (ev.xany.window == vt
1392 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1393 break;
1394
1358#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1395#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1359 if (!(ev.xkey.state & ControlMask)) 1396 if (!(ev.xkey.state & ControlMask))
1360 slip_wheel_ev.stop (); 1397 slip_wheel_ev.stop ();
1361 else if (ks == XK_Control_L || ks == XK_Control_R) 1398 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1362 mouse_slip_wheel_speed = 0; 1399 mouse_slip_wheel_speed = 0;
1363#endif 1400#endif
1364 break; 1401 break;
1365 } 1402 }
1366 1403
… …
1496 1533
1497 case SelectionRequest: 1534 case SelectionRequest:
1498 selection_send (ev.xselectionrequest); 1535 selection_send (ev.xselectionrequest);
1499 break; 1536 break;
1500 1537
1538 case MapNotify:
1539 mapped = 1;
1540#ifdef TEXT_BLINK
1541 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1542#endif
1543 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1544 break;
1545
1501 case UnmapNotify: 1546 case UnmapNotify:
1502 mapped = 0; 1547 mapped = 0;
1503#ifdef TEXT_BLINK 1548#ifdef TEXT_BLINK
1504 text_blink_ev.stop (); 1549 text_blink_ev.stop ();
1505#endif 1550#endif
1506 break; 1551 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; 1552 break;
1514 1553
1515#ifdef TRANSPARENT 1554#ifdef TRANSPARENT
1516 case ReparentNotify: 1555 case ReparentNotify:
1517 rootwin_cb (ev); 1556 rootwin_cb (ev);
… …
1531 1570
1532 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1571 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1533 scr_expose (ev.xexpose.x, ev.xexpose.y, 1572 scr_expose (ev.xexpose.x, ev.xexpose.y,
1534 ev.xexpose.width, ev.xexpose.height, False); 1573 ev.xexpose.width, ev.xexpose.height, False);
1535 1574
1536 scr_refresh (refresh_type); 1575 want_refresh = 1;
1537 } 1576 }
1538 else 1577 else
1539 { 1578 {
1540 XEvent unused_event; 1579 XEvent unused_event;
1541 1580
… …
1576 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1615 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1577 break; 1616 break;
1578 1617
1579 if (ev.xany.window == vt) 1618 if (ev.xany.window == vt)
1580 { 1619 {
1620 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1621 ; // nop
1581 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1622 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1582 { 1623 {
1583 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1624 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1584 ; 1625 ;
1585 1626
1586 XQueryPointer (disp, vt, 1627 XQueryPointer (disp, vt,
… …
1666 &unused_root_x, &unused_root_y, 1707 &unused_root_x, &unused_root_y,
1667 &ev.xbutton.x, &ev.xbutton.y, 1708 &ev.xbutton.x, &ev.xbutton.y,
1668 &unused_mask); 1709 &unused_mask);
1669 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1710 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1670 scrollbar_size ()); 1711 scrollbar_size ());
1671 scr_refresh (refresh_type); 1712 want_refresh = 1;
1672 refresh_limit = 0; 1713 refresh_limit = 0;
1673 scrollbar_show (1); 1714 scrollbar_show (1);
1674 } 1715 }
1675 break; 1716 break;
1676 } 1717 }
1718
1719skip_switch: ;
1720
1721#if defined(CURSOR_BLINK)
1722 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1723 {
1724 if (hidden_cursor)
1725 {
1726 hidden_cursor = 0;
1727 want_refresh = 1;
1728 }
1729
1730 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1731 }
1732#endif
1733
1734#if defined(POINTER_BLANK)
1735 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1736 {
1737 if (ev.type == MotionNotify
1738 || ev.type == ButtonPress
1739 || ev.type == ButtonRelease)
1740 if (hidden_pointer)
1741 pointer_unblank ();
1742
1743 if (ev.type == KeyPress && hidden_pointer == 0)
1744 pointer_blank ();
1745 }
1746#endif
1677} 1747}
1678 1748
1679void 1749void
1680rxvt_term::focus_in () 1750rxvt_term::focus_in ()
1681{ 1751{
1682 if (!focus) 1752 if (!focus)
1683 { 1753 {
1684 focus = 1; 1754 focus = 1;
1685 want_refresh = 1; 1755 want_refresh = 1;
1756
1757 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1758
1686#if USE_XIM 1759#if USE_XIM
1687 if (Input_Context != NULL) 1760 if (Input_Context != NULL)
1688 { 1761 {
1689 IMSetStatusPosition (); 1762 IMSetStatusPosition ();
1690 XSetICFocus (Input_Context); 1763 XSetICFocus (Input_Context);
… …
1710 if (focus) 1783 if (focus)
1711 { 1784 {
1712 focus = 0; 1785 focus = 0;
1713 want_refresh = 1; 1786 want_refresh = 1;
1714 1787
1788 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1789
1715#if ENABLE_FRILLS || ISO_14755 1790#if ENABLE_FRILLS || ISO_14755
1791 if (iso14755buf)
1792 {
1716 iso14755buf = 0; 1793 iso14755buf = 0;
1717#endif
1718#if ENABLE_OVERLAY 1794# if ENABLE_OVERLAY
1719 scr_overlay_off (); 1795 scr_overlay_off ();
1796# endif
1797 }
1720#endif 1798#endif
1721#if USE_XIM 1799#if USE_XIM
1722 if (Input_Context != NULL) 1800 if (Input_Context != NULL)
1723 XUnsetICFocus (Input_Context); 1801 XUnsetICFocus (Input_Context);
1724#endif 1802#endif
… …
1739 1817
1740#if TRANSPARENT 1818#if TRANSPARENT
1741void 1819void
1742rxvt_term::rootwin_cb (XEvent &ev) 1820rxvt_term::rootwin_cb (XEvent &ev)
1743{ 1821{
1744 SET_R (this); 1822 make_current ();
1745 SET_LOCALE (locale);
1746 1823
1747 switch (ev.type) 1824 switch (ev.type)
1748 { 1825 {
1749 case PropertyNotify: 1826 case PropertyNotify:
1750 /* 1827 /*
… …
1768rxvt_term::button_press (XButtonEvent &ev) 1845rxvt_term::button_press (XButtonEvent &ev)
1769{ 1846{
1770 int reportmode = 0, clickintime; 1847 int reportmode = 0, clickintime;
1771 1848
1772 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1849 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1850
1773 if (!bypass_keystate) 1851 if (!bypass_keystate)
1774 reportmode = !! (priv_modes & PrivMode_mouse_report); 1852 reportmode = !! (priv_modes & PrivMode_mouse_report);
1775 1853
1776 /* 1854 /*
1777 * VT window processing of button press 1855 * VT window processing of button press
… …
1797#ifdef MOUSE_REPORT_DOUBLECLICK 1875#ifdef MOUSE_REPORT_DOUBLECLICK
1798 if (ev.button == MEvent.button && clickintime) 1876 if (ev.button == MEvent.button && clickintime)
1799 { 1877 {
1800 /* same button, within alloted time */ 1878 /* same button, within alloted time */
1801 MEvent.clicks++; 1879 MEvent.clicks++;
1880
1802 if (MEvent.clicks > 1) 1881 if (MEvent.clicks > 1)
1803 { 1882 {
1804 /* only report double clicks */ 1883 /* only report double clicks */
1805 MEvent.clicks = 2; 1884 MEvent.clicks = 2;
1806 mouse_report (ev); 1885 mouse_report (ev);
… …
1826 else 1905 else
1827 { 1906 {
1828 if (ev.button != MEvent.button) 1907 if (ev.button != MEvent.button)
1829 MEvent.clicks = 0; 1908 MEvent.clicks = 0;
1830 1909
1910 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1831 switch (ev.button) 1911 switch (ev.button)
1832 { 1912 {
1833 case Button1: 1913 case Button1:
1834 /* allow meta + click to select rectangular areas */ 1914 /* allow meta + click to select rectangular areas */
1835 /* should be done in screen.C */ 1915 /* should be done in screen.C */
1836#if ENABLE_FRILLS 1916#if ENABLE_FRILLS
1837 selection.rect = !!(ev.state & ModMetaMask); 1917 selection.rect = !!(ev.state & ModMetaMask);
1838#else 1918#else
1839 selection.rect = false; 1919 selection.rect = false;
1840#endif 1920#endif
1841 1921
1842 /* allow shift+left click to extend selection */ 1922 /* allow shift+left click to extend selection */
1843 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1923 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1844 { 1924 {
1845 if (MEvent.button == Button1 && clickintime) 1925 if (MEvent.button == Button1 && clickintime)
1846 selection_rotate (ev.x, ev.y); 1926 selection_rotate (ev.x, ev.y);
1847 else 1927 else
1848 selection_extend (ev.x, ev.y, 1); 1928 selection_extend (ev.x, ev.y, 1);
1849 } 1929 }
1850 else 1930 else
1851 { 1931 {
1852 if (MEvent.button == Button1 && clickintime) 1932 if (MEvent.button == Button1 && clickintime)
1853 MEvent.clicks++; 1933 MEvent.clicks++;
1854 else 1934 else
1855 MEvent.clicks = 1; 1935 MEvent.clicks = 1;
1856 1936
1857 selection_click (MEvent.clicks, ev.x, ev.y); 1937 selection_click (MEvent.clicks, ev.x, ev.y);
1858 } 1938 }
1859 1939
1860 MEvent.button = Button1; 1940 MEvent.button = Button1;
1861 break; 1941 break;
1862 1942
1863 case Button3: 1943 case Button3:
1864 if (MEvent.button == Button3 && clickintime) 1944 if (MEvent.button == Button3 && clickintime)
1865 selection_rotate (ev.x, ev.y); 1945 selection_rotate (ev.x, ev.y);
1866 else 1946 else
1867 selection_extend (ev.x, ev.y, 1); 1947 selection_extend (ev.x, ev.y, 1);
1868 1948
1869 MEvent.button = Button3; 1949 MEvent.button = Button3;
1870 break; 1950 break;
1871 } 1951 }
1872 } 1952 }
1873 1953
1874 MEvent.time = ev.time; 1954 MEvent.time = ev.time;
1875 return; 1955 return;
1876 } 1956 }
1877 1957
… …
2013 } 2093 }
2014 2094
2015 break; 2095 break;
2016 } 2096 }
2017 } 2097 }
2098
2018 return; 2099 return;
2019 } 2100 }
2101
2020#if MENUBAR 2102#if MENUBAR
2021 /* 2103 /*
2022 * Menubar window processing of button press 2104 * Menubar window processing of button press
2023 */ 2105 */
2024 if (isMenuBarWindow (ev.window)) 2106 if (isMenuBarWindow (ev.window))
… …
2087 if (priv_modes & PrivMode_mouse_report 2169 if (priv_modes & PrivMode_mouse_report
2088 && bypass_keystate 2170 && bypass_keystate
2089 && ev.button == Button1 && MEvent.clicks <= 1) 2171 && ev.button == Button1 && MEvent.clicks <= 1)
2090 selection_extend (ev.x, ev.y, 0); 2172 selection_extend (ev.x, ev.y, 0);
2091 2173
2174 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2175 return;
2176
2092 switch (ev.button) 2177 switch (ev.button)
2093 { 2178 {
2094 case Button1: 2179 case Button1:
2095 case Button3: 2180 case Button3:
2096 selection_make (ev.time); 2181 selection_make (ev.time);
… …
2127 slip_wheel_ev.start (); 2212 slip_wheel_ev.start ();
2128 } 2213 }
2129 else 2214 else
2130 { 2215 {
2131# endif 2216# endif
2132# ifdef JUMP_MOUSE_WHEEL
2133 scr_page (v, i); 2217 scr_page (v, i);
2134 scr_refresh (SMOOTH_REFRESH);
2135 scrollbar_show (1); 2218 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 2219# ifdef MOUSE_SLIP_WHEELING
2145 } 2220 }
2146#endif 2221# endif
2147 } 2222 }
2148 break; 2223 break;
2149#endif 2224#endif
2150 } 2225 }
2151 } 2226 }
… …
2640 2715
2641bool 2716bool
2642rxvt_term::cmd_parse () 2717rxvt_term::cmd_parse ()
2643{ 2718{
2644 bool flag = false; 2719 bool flag = false;
2645 unicode_t ch = NOCHAR; 2720 wchar_t ch = NOCHAR;
2646 unsigned char *seq_begin; // remember start of esc-sequence here 2721 char *seq_begin; // remember start of esc-sequence here
2647 2722
2648 for (;;) 2723 for (;;)
2649 { 2724 {
2650 if (ch == NOCHAR) 2725 if (ch == NOCHAR)
2651 { 2726 {
2652 seq_begin = cmdbuf_ptr; 2727 seq_begin = cmdbuf_ptr;
2653 ch = next_char (); 2728 ch = next_char ();
2654 }
2655 2729
2656 if (ch == NOCHAR) // TODO: improve 2730 if (ch == NOCHAR)
2657 break; 2731 break;
2732 }
2658 2733
2659 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2734 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2660 { 2735 {
2661 if (!seen_input) 2736 if (!seen_input)
2662 { 2737 {
… …
2671 if (seen_resize && cmd_pid) 2746 if (seen_resize && cmd_pid)
2672 kill (-cmd_pid, SIGWINCH); 2747 kill (-cmd_pid, SIGWINCH);
2673 } 2748 }
2674 2749
2675 /* Read a text string from the input buffer */ 2750 /* Read a text string from the input buffer */
2676 unicode_t buf[UBUFSIZ]; 2751 wchar_t buf[UBUFSIZ];
2677 bool refreshnow = false; 2752 bool refreshnow = false;
2678 int nlines = 0; 2753 int nlines = 0;
2679 unicode_t *str = buf; 2754 wchar_t *str = buf;
2680 unicode_t *eol = str + min (ncol, UBUFSIZ); 2755 wchar_t *eol = str + min (ncol, UBUFSIZ);
2681 2756
2682 for (;;) 2757 for (;;)
2683 { 2758 {
2684 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2759 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2685 break; 2760 break;
… …
2695 2770
2696 if (!OPTION (Opt_jumpScroll) 2771 if (!OPTION (Opt_jumpScroll)
2697 || (refresh_count >= refresh_limit * (nrow - 1))) 2772 || (refresh_count >= refresh_limit * (nrow - 1)))
2698 { 2773 {
2699 refreshnow = true; 2774 refreshnow = true;
2775 refresh_count = 0;
2700 ch = NOCHAR; 2776 ch = NOCHAR;
2701 break; 2777 break;
2702 } 2778 }
2703 2779
2704 // scr_add_lines only works for nlines <= nrow - 1. 2780 // scr_add_lines only works for nlines <= nrow - 1.
2705 if (nlines >= nrow - 1) 2781 if (nlines >= nrow - 1)
2706 { 2782 {
2783 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2707 scr_add_lines (buf, nlines, str - buf); 2784 scr_add_lines (buf, str - buf, nlines);
2785
2708 nlines = 0; 2786 nlines = 0;
2709 str = buf; 2787 str = buf;
2710 eol = str + min (ncol, UBUFSIZ); 2788 eol = str + min (ncol, UBUFSIZ);
2711 } 2789 }
2712 2790
… …
2725 2803
2726 seq_begin = cmdbuf_ptr; 2804 seq_begin = cmdbuf_ptr;
2727 ch = next_char (); 2805 ch = next_char ();
2728 } 2806 }
2729 2807
2808 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2730 scr_add_lines (buf, nlines, str - buf); 2809 scr_add_lines (buf, str - buf, nlines);
2731 2810
2732 /* 2811 /*
2733 * If there have been a lot of new lines, then update the screen 2812 * 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. 2813 * 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 2814 * the number of pages between refreshes is refresh_limit, which
… …
2741 refresh_limit++; 2820 refresh_limit++;
2742 else 2821 else
2743 { 2822 {
2744 flag = true; 2823 flag = true;
2745 scr_refresh (refresh_type); 2824 scr_refresh (refresh_type);
2825 want_refresh = 1;
2746 } 2826 }
2747 } 2827 }
2748 2828
2749 } 2829 }
2750 else 2830 else
… …
2765 } 2845 }
2766 2846
2767 return flag; 2847 return flag;
2768} 2848}
2769 2849
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 2850// read the next character
2780unicode_t 2851wchar_t
2781rxvt_term::next_char () 2852rxvt_term::next_char ()
2782{ 2853{
2783 while (cmdbuf_ptr < cmdbuf_endp) 2854 while (cmdbuf_ptr < cmdbuf_endp)
2784 { 2855 {
2785 // assume 7-bit to be ascii ALWAYS 2856 // assume 7-bit to be ascii ALWAYS
2786 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2857 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2787 return *cmdbuf_ptr++; 2858 return *cmdbuf_ptr++;
2788 2859
2789 wchar_t wc; 2860 wchar_t wc;
2790 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2861 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2791 2862
2792 if (len == (size_t)-2) 2863 if (len == (size_t)-2)
2793 { 2864 {
2794 // the mbstate stores incomplete sequences. didn't know this :/ 2865 // the mbstate stores incomplete sequences. didn't know this :/
2795 cmdbuf_ptr = cmdbuf_endp; 2866 cmdbuf_ptr = cmdbuf_endp;
2796 break; 2867 break;
2797 } 2868 }
2798 2869
2799 if (len == (size_t)-1) 2870 if (len == (size_t)-1)
2800 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2871 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2801 2872
2802 // assume wchar == unicode 2873 // assume wchar == unicode
2803 cmdbuf_ptr += len; 2874 cmdbuf_ptr += len;
2804 return wc & UNICODE_MASK; 2875 return wc & UNICODE_MASK;
2805 } 2876 }
2806 2877
2807 return NOCHAR; 2878 return NOCHAR;
2879}
2880
2881// read the next octet
2882uint32_t
2883rxvt_term::next_octet ()
2884{
2885 return cmdbuf_ptr < cmdbuf_endp
2886 ? (unsigned char)*cmdbuf_ptr++
2887 : NOCHAR;
2808} 2888}
2809 2889
2810/* rxvt_cmd_getc () - Return next input character */ 2890/* rxvt_cmd_getc () - Return next input character */
2811/* 2891/*
2812 * Return the next input character after first passing any keyboard input 2892 * Return the next input character after first passing any keyboard input
2813 * to the command. 2893 * to the command.
2814 */ 2894 */
2815unicode_t 2895wchar_t
2816rxvt_term::cmd_getc () 2896rxvt_term::cmd_getc ()
2817{ 2897{
2818 unicode_t c = next_char (); 2898 wchar_t c = next_char ();
2819 2899
2820 if (c == NOCHAR) 2900 if (c == NOCHAR)
2821 throw out_of_input; 2901 throw out_of_input;
2822 2902
2823 return c; 2903 return c;
2824} 2904}
2825 2905
2826unicode_t 2906uint32_t
2827rxvt_term::cmd_get8 () 2907rxvt_term::cmd_get8 ()
2828{ 2908{
2829 unicode_t c = next_octet (); 2909 uint32_t c = next_octet ();
2830 2910
2831 if (c == NOCHAR) 2911 if (c == NOCHAR)
2832 throw out_of_input; 2912 throw out_of_input;
2833 2913
2834 return c; 2914 return c;
… …
2934 case C0_ESC: 3014 case C0_ESC:
2935 process_escape_seq (); 3015 process_escape_seq ();
2936 break; 3016 break;
2937 case C0_ENQ: /* terminal Status */ 3017 case C0_ENQ: /* terminal Status */
2938 if (rs[Rs_answerbackstring]) 3018 if (rs[Rs_answerbackstring])
2939 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3019 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2940 (unsigned int)strlen (rs[Rs_answerbackstring]));
2941 else 3020 else
2942 tt_write ((unsigned char *)VT100_ANS, 3021 tt_write (VT100_ANS, strlen (VT100_ANS));
2943 (unsigned int)strlen (VT100_ANS));
2944 break; 3022 break;
2945 case C0_BEL: /* bell */ 3023 case C0_BEL: /* bell */
2946 scr_bell (); 3024 scr_bell ();
2947 break; 3025 break;
2948 case C0_BS: /* backspace */ 3026 case C0_BS: /* backspace */
… …
3103 break; 3181 break;
3104 3182
3105 /* 8.3.87: NEXT LINE */ 3183 /* 8.3.87: NEXT LINE */
3106 case C1_NEL: /* ESC E */ 3184 case C1_NEL: /* ESC E */
3107 { 3185 {
3108 unicode_t nlcr[] = { C0_LF, C0_CR }; 3186 wchar_t nlcr[] = { C0_LF, C0_CR };
3109 scr_add_lines (nlcr, 1, 2); 3187 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3110 } 3188 }
3111 break; 3189 break;
3112 3190
3113 /* kidnapped escape sequence: Should be 8.3.48 */ 3191 /* kidnapped escape sequence: Should be 8.3.48 */
3114 case C1_ESA: /* ESC G */ 3192 case C1_ESA: /* ESC G */
… …
3136 process_dcs_seq (); 3214 process_dcs_seq ();
3137 break; 3215 break;
3138 3216
3139 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3217 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3140 case C1_SCI: /* ESC Z */ 3218 case C1_SCI: /* ESC Z */
3141 tt_write ((const unsigned char *)ESCZ_ANSWER, 3219 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3142 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3143 break; /* steal obsolete ESC [ c */ 3220 break; /* steal obsolete ESC [ c */
3144 3221
3145 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3222 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3146 case C1_CSI: /* ESC [ */ 3223 case C1_CSI: /* ESC [ */
3147 process_csi_seq (); 3224 process_csi_seq ();
… …
3391 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3468 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3392 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3469 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3393 break; 3470 break;
3394 3471
3395 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3472 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3396 tt_write ((const unsigned char *)VT100_ANS, 3473 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3397 (unsigned int) (sizeof (VT100_ANS) - 1));
3398 break; 3474 break;
3399 3475
3400 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3476 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3401 process_sgr_mode (nargs, arg); 3477 process_sgr_mode (nargs, arg);
3402 break; 3478 break;
… …
3604/*----------------------------------------------------------------------*/ 3680/*----------------------------------------------------------------------*/
3605/* 3681/*
3606 * get input up until STRING TERMINATOR (or BEL) 3682 * get input up until STRING TERMINATOR (or BEL)
3607 * ends_how is terminator used. returned input must be free()'d 3683 * ends_how is terminator used. returned input must be free()'d
3608 */ 3684 */
3609unsigned char * 3685char *
3610rxvt_term::get_to_st (unicode_t &ends_how) 3686rxvt_term::get_to_st (unicode_t &ends_how)
3611{ 3687{
3612 unicode_t ch; 3688 unicode_t ch;
3613 bool seen_esc = false; 3689 bool seen_esc = false;
3614 unsigned int n = 0; 3690 unsigned int n = 0;
… …
3647 3723
3648 string[n++] = '\0'; 3724 string[n++] = '\0';
3649 3725
3650 ends_how = (ch == 0x5c ? C0_ESC : ch); 3726 ends_how = (ch == 0x5c ? C0_ESC : ch);
3651 3727
3652 return (unsigned char *)rxvt_wcstombs (string); 3728 return rxvt_wcstombs (string);
3653} 3729}
3654 3730
3655/*----------------------------------------------------------------------*/ 3731/*----------------------------------------------------------------------*/
3656/* 3732/*
3657 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3733 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3658 */ 3734 */
3659void 3735void
3660rxvt_term::process_dcs_seq () 3736rxvt_term::process_dcs_seq ()
3661{ 3737{
3662 unsigned char *s; 3738 char *s;
3663 unicode_t eh; 3739 unicode_t eh;
3664 3740
3665 /* 3741 /*
3666 * Not handled yet 3742 * Not handled yet
3667 */ 3743 */
… …
3686 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3762 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3687 arg = arg * 10 + (ch - '0'); 3763 arg = arg * 10 + (ch - '0');
3688 3764
3689 if (ch == ';') 3765 if (ch == ';')
3690 { 3766 {
3691 unsigned char *s = get_to_st (eh); 3767 char *s = get_to_st (eh);
3692 3768
3693 if (s) 3769 if (s)
3694 { 3770 {
3695 process_xterm_seq (arg, (char *)s, eh); 3771 process_xterm_seq (arg, s, eh);
3696 free (s); 3772 free (s);
3697 } 3773 }
3698 } 3774 }
3699} 3775}
3700 3776
3701void 3777void
3702rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3778rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3703{ 3779{
3704 if (str[0] == '?' && !str[1]) 3780 if (str[0] == '?' && !str[1])
3705 { 3781 {
3706 unsigned short r, g, b; 3782 unsigned short r, g, b;
3707 pix_colors_focused[color].get (display, r, g, b); 3783 pix_colors_focused[color].get (display, r, g, b);
… …
3713 3789
3714/* 3790/*
3715 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3791 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3716 */ 3792 */
3717void 3793void
3718rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3794rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3719{ 3795{
3720 int changed = 0; 3796 int changed = 0;
3721 int color; 3797 int color;
3722 char *buf, *name; 3798 char *buf, *name;
3723 bool query = str[0] == '?' && !str[1]; 3799 bool query = str[0] == '?' && !str[1];
… …
3780 { 3856 {
3781 if ((name = strchr (buf, ';')) == NULL) 3857 if ((name = strchr (buf, ';')) == NULL)
3782 break; 3858 break;
3783 3859
3784 *name++ = '\0'; 3860 *name++ = '\0';
3785 color = atoi (buf); 3861 color = atoi (buf) + minCOLOR;
3786 3862
3787 if (color < 0 || color >= TOTAL_COLORS) 3863 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3788 break; 3864 break;
3789 3865
3790 if ((buf = strchr (name, ';')) != NULL) 3866 if ((buf = strchr (name, ';')) != NULL)
3791 *buf++ = '\0'; 3867 *buf++ = '\0';
3792 3868
3793 if (name[0] == '?' && !name[1]) 3869 if (name[0] == '?' && !name[1])
3794 { 3870 {
3795 unsigned short r, g, b; 3871 unsigned short r, g, b;
3796 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3872 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); 3873 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3798 } 3874 }
3799 else 3875 else
3800 set_window_color (color + minCOLOR, name); 3876 set_window_color (color, name);
3801 } 3877 }
3802 break; 3878 break;
3803 case XTerm_Color00: 3879 case XTerm_Color00:
3804 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3880 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3805 break; 3881 break;
3806 case XTerm_Color01: 3882 case XTerm_Color01:
3807 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3883 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3808 break; 3884 break;
3809#ifndef NO_CURSORCOLOR 3885#ifndef NO_CURSORCOLOR
3810 case XTerm_Color_cursor: 3886 case XTerm_Color_cursor:
3811 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3887 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3812 break; 3888 break;
… …
3816 break; 3892 break;
3817 case XTerm_Color_pointer_bg: 3893 case XTerm_Color_pointer_bg:
3818 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3894 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3819 break; 3895 break;
3820#ifndef NO_BOLD_UNDERLINE_REVERSE 3896#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: 3897 case XTerm_Color_RV:
3828 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3898 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3899 break;
3900 case Rxvt_Color_BD:
3901 case URxvt_Color_BD:
3902 process_color_seq (op, Color_BD, str, resp);
3903 break;
3904 case Rxvt_Color_UL:
3905 case URxvt_Color_UL:
3906 process_color_seq (op, Color_UL, str, resp);
3829 break; 3907 break;
3830 case URxvt_Color_IT: 3908 case URxvt_Color_IT:
3831 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3909 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3832 break; 3910 break;
3833#endif 3911#endif
… …
3838 if (am_transparent) 3916 if (am_transparent)
3839 want_full_refresh = want_refresh = 1; 3917 want_full_refresh = want_refresh = 1;
3840 break; 3918 break;
3841#endif 3919#endif
3842 3920
3843 case XTerm_Pixmap: 3921 case Rxvt_Pixmap:
3844 if (*str != ';') 3922 if (*str != ';')
3845 { 3923 {
3846#if XPM_BACKGROUND 3924#if XPM_BACKGROUND
3847 scale_pixmap (""); /* reset to default scaling */ 3925 scale_pixmap (""); /* reset to default scaling */
3848 set_bgPixmap (str); /* change pixmap */ 3926 set_bgPixmap (str); /* change pixmap */
3849#endif
3850 scr_touch (true); 3927 scr_touch (true);
3928#endif
3851 } 3929 }
3930
3852 while ((str = strchr (str, ';')) != NULL) 3931 while ((str = strchr (str, ';')) != NULL)
3853 { 3932 {
3854 str++; 3933 str++;
3855#if XPM_BACKGROUND 3934#if XPM_BACKGROUND
3856 changed += scale_pixmap (str); 3935 changed += scale_pixmap (str);
… …
3859 3938
3860 if (changed) 3939 if (changed)
3861 { 3940 {
3862#ifdef XPM_BACKGROUND 3941#ifdef XPM_BACKGROUND
3863 resize_pixmap (); 3942 resize_pixmap ();
3864#endif
3865 scr_touch (true); 3943 scr_touch (true);
3944#endif
3866 } 3945 }
3867 break; 3946 break;
3868 3947
3869 case XTerm_restoreFG: 3948 case Rxvt_restoreFG:
3870 set_window_color (Color_fg, str); 3949 set_window_color (Color_fg, str);
3871 break; 3950 break;
3872 case XTerm_restoreBG: 3951 case Rxvt_restoreBG:
3873 set_window_color (Color_bg, str); 3952 set_window_color (Color_bg, str);
3874 break; 3953 break;
3875 3954
3876 case XTerm_logfile: 3955 case XTerm_logfile:
3877 // TODO, when secure mode? 3956 // TODO, when secure mode?
… …
3882 if (OPTION (Opt_insecure)) 3961 if (OPTION (Opt_insecure))
3883 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3962 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3884 break; 3963 break;
3885#endif 3964#endif
3886#if 0 3965#if 0
3887 case XTerm_dumpscreen: /* no error notices */ 3966 case Rxvt_dumpscreen: /* no error notices */
3888 { 3967 {
3889 int fd; 3968 int fd;
3890 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3969 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3891 { 3970 {
3892 scr_dump (fd); 3971 scr_dump (fd);
… …
3930 } 4009 }
3931 break; 4010 break;
3932 4011
3933 case URxvt_view_up: 4012 case URxvt_view_up:
3934 case URxvt_view_down: 4013 case URxvt_view_down:
4014 {
3935 int lines = atoi (str); 4015 int lines = atoi (str);
3936 4016
3937 if (lines) 4017 if (lines)
3938 scr_page (op == URxvt_view_up ? UP : DN, lines); 4018 scr_page (op == URxvt_view_up ? UP : DN, lines);
3939 else 4019 else
3940 {
3941 scr_erase_savelines (); 4020 scr_erase_savelines ();
3942 } 4021 }
3943 4022
4023 break;
4024#endif
4025
4026#if ENABLE_PERL
4027 case URxvt_perl:
4028 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
4029 ; // no responses yet
3944 break; 4030 break;
3945#endif 4031#endif
3946 } 4032 }
3947} 4033}
3948/*----------------------------------------------------------------------*/ 4034/*----------------------------------------------------------------------*/
… …
4059 /* extra handling for values with state unkept */ 4145 /* extra handling for values with state unkept */
4060 switch (arg[i]) 4146 switch (arg[i])
4061 { 4147 {
4062#if ENABLE_STYLES 4148#if ENABLE_STYLES
4063 case 1021: 4149 case 1021:
4064 if (mode) 4150 set_option (Opt_intensityStyles, mode);
4065 SET_OPTION (Opt_intensityStyles);
4066 else
4067 CLR_OPTION (Opt_intensityStyles);
4068 4151
4069 want_refresh = 1; 4152 scr_touch (true);
4070 want_full_refresh = 1;
4071 break; 4153 break;
4072#endif 4154#endif
4073 case 1048: /* alternative cursor save */ 4155 case 1048: /* alternative cursor save */
4074 case 1049: 4156 case 1049:
4075 if (OPTION (Opt_secondaryScreen)) 4157 if (OPTION (Opt_secondaryScreen))
… …
4095 case 3: /* 80/132 */ 4177 case 3: /* 80/132 */
4096 if (priv_modes & PrivMode_132OK) 4178 if (priv_modes & PrivMode_132OK)
4097 set_widthheight (((state ? 132 : 80) * fwidth), height); 4179 set_widthheight (((state ? 132 : 80) * fwidth), height);
4098 break; 4180 break;
4099 case 4: /* smooth scrolling */ 4181 case 4: /* smooth scrolling */
4100 if (!state) 4182 set_option (Opt_jumpScroll, !state);
4101 SET_OPTION (Opt_jumpScroll);
4102 else
4103 CLR_OPTION (Opt_jumpScroll);
4104 break; 4183 break;
4105 case 5: /* reverse video */ 4184 case 5: /* reverse video */
4106 scr_rvideo_mode (state); 4185 scr_rvideo_mode (state);
4107 break; 4186 break;
4108 case 6: /* relative/absolute origins */ 4187 case 6: /* relative/absolute origins */
… …
4149#if 0 4228#if 0
4150 case 1001: 4229 case 1001:
4151 break; /* X11 mouse highlighting */ 4230 break; /* X11 mouse highlighting */
4152#endif 4231#endif
4153 case 1010: /* scroll to bottom on TTY output inhibit */ 4232 case 1010: /* scroll to bottom on TTY output inhibit */
4154 if (!state) 4233 set_option (Opt_scrollTtyOutput, !state);
4155 SET_OPTION (Opt_scrollTtyOutput);
4156 else
4157 CLR_OPTION (Opt_scrollTtyOutput);
4158 break; 4234 break;
4159 case 1011: /* scroll to bottom on key press */ 4235 case 1011: /* scroll to bottom on key press */
4160 if (state) 4236 set_option (Opt_scrollTtyKeypress, state);
4161 SET_OPTION (Opt_scrollTtyKeypress);
4162 else
4163 CLR_OPTION (Opt_scrollTtyKeypress);
4164 break; 4237 break;
4165 case 1047: /* secondary screen w/ clearing last */ 4238 case 1047: /* secondary screen w/ clearing last */
4166 if (OPTION (Opt_secondaryScreen)) 4239 if (OPTION (Opt_secondaryScreen))
4167 if (current_screen != PRIMARY) 4240 if (current_screen != PRIMARY)
4168 scr_erase_screen (2); 4241 scr_erase_screen (2);
… …
4306 scr_color (Color_bg, Color_bg); 4379 scr_color (Color_bg, Color_bg);
4307 break; 4380 break;
4308 4381
4309 //case 50: // not variable spacing 4382 //case 50: // not variable spacing
4310 4383
4311#ifndef NO_BRIGHTCOLOR 4384#if ENABLE_FRILLS
4312 case 90: 4385 case 90:
4313 case 91: /* set bright fg color */ 4386 case 91: /* set bright fg color */
4314 case 92: 4387 case 92:
4315 case 93: 4388 case 93:
4316 case 94: 4389 case 94:
… …
4361 */ 4434 */
4362void 4435void
4363rxvt_term::tt_printf (const char *fmt,...) 4436rxvt_term::tt_printf (const char *fmt,...)
4364{ 4437{
4365 va_list arg_ptr; 4438 va_list arg_ptr;
4366 unsigned char buf[256]; 4439 char buf[256];
4367 4440
4368 va_start (arg_ptr, fmt); 4441 va_start (arg_ptr, fmt);
4369 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4442 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4370 va_end (arg_ptr); 4443 va_end (arg_ptr);
4371 tt_write (buf, strlen (buf)); 4444 tt_write (buf, strlen (buf));
… …
4376 * or generated by us in response to a query ESC sequence. 4449 * or generated by us in response to a query ESC sequence.
4377 */ 4450 */
4378const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4451const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4379 4452
4380void 4453void
4381rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4454rxvt_term::tt_write (const char *data, unsigned int len)
4382{ 4455{
4456 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4457 return;
4458
4459 if (pty.pty < 0)
4460 return;
4461
4383 if (v_buflen == 0) 4462 if (v_buflen == 0)
4384 { 4463 {
4385 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4464 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4386 4465
4387 if ((unsigned int)written == len) 4466 if ((unsigned int)written == len)
… …
4389 4468
4390 data += written; 4469 data += written;
4391 len -= written; 4470 len -= written;
4392 } 4471 }
4393 4472
4394 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4473 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4395 4474
4396 memcpy (v_buffer + v_buflen, data, len); 4475 memcpy (v_buffer + v_buflen, data, len);
4397 v_buflen += len; 4476 v_buflen += len;
4398 4477
4399 pty_ev.set (EVENT_READ | EVENT_WRITE); 4478 pty_ev.set (EVENT_READ | EVENT_WRITE);

Diff Legend

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