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.228 by root, Mon Jan 2 16:08:34 2006 UTC vs.
Revision 1.271 by root, Wed Jan 18 17:49:46 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.
… …
50#include "rxvtperl.h" 50#include "rxvtperl.h"
51#include "version.h" 51#include "version.h"
52#include "command.h" 52#include "command.h"
53 53
54#if HAVE_SCHED_YIELD 54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
55# include <sched.h> 56//# include <sched.h>
56#endif 57#endif
57 58
58#ifdef KEYSYM_RESOURCE 59#ifdef KEYSYM_RESOURCE
59# include "keyboard.h" 60# include "keyboard.h"
60#endif 61#endif
… …
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 ();
972 scrollbar_show (1); 1012 scrollbar_show (1);
973#ifdef USE_XIM 1013#ifdef USE_XIM
974 IMSendSpot (); 1014 IMSendSpot ();
975#endif 1015#endif
976 } 1016 }
… …
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 + 1. / 60.); // refresh at max. 60 hz normally 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}
… …
1030rxvt_term::cont_scroll_cb (time_watcher &w) 1068rxvt_term::cont_scroll_cb (time_watcher &w)
1031{ 1069{
1032 if ((scrollbar_isUp() || scrollbar_isDn()) && 1070 if ((scrollbar_isUp() || scrollbar_isDn()) &&
1033 scr_page (scrollbar_isUp() ? UP : DN, 1)) 1071 scr_page (scrollbar_isUp() ? UP : DN, 1))
1034 { 1072 {
1035 refresh_type |= SMOOTH_REFRESH;
1036 want_refresh = 1; 1073 want_refresh = 1;
1037 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1074 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1038 } 1075 }
1039} 1076}
1040#endif 1077#endif
… …
1044rxvt_term::sel_scroll_cb (time_watcher &w) 1081rxvt_term::sel_scroll_cb (time_watcher &w)
1045{ 1082{
1046 if (scr_page (scroll_selection_dir, scroll_selection_lines)) 1083 if (scr_page (scroll_selection_dir, scroll_selection_lines))
1047 { 1084 {
1048 selection_extend (selection_save_x, selection_save_y, selection_save_state); 1085 selection_extend (selection_save_x, selection_save_y, selection_save_state);
1049 refresh_type |= SMOOTH_REFRESH;
1050 want_refresh = 1; 1086 want_refresh = 1;
1051 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1087 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1052 } 1088 }
1053} 1089}
1054#endif 1090#endif
… …
1059{ 1095{
1060 if (mouse_slip_wheel_speed == 0 1096 if (mouse_slip_wheel_speed == 0
1061 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1097 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1062 : scr_page (UP, mouse_slip_wheel_speed)) 1098 : scr_page (UP, mouse_slip_wheel_speed))
1063 { 1099 {
1064 if (view_start == nsaved || 1100 if (view_start == top_row || view_start == 0)
1065 view_start == 0)
1066 mouse_slip_wheel_speed = 0; 1101 mouse_slip_wheel_speed = 0;
1067 1102
1068 refresh_type |= SMOOTH_REFRESH;
1069 want_refresh = 1; 1103 want_refresh = 1;
1070 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1104 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1071 } 1105 }
1072} 1106}
1073#endif 1107#endif
… …
1095{ 1129{
1096 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1130 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1097 1131
1098 if (CBUFSIZ == n) 1132 if (CBUFSIZ == n)
1099 { 1133 {
1100 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1134 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1101 n = 0; 1135 n = 0;
1102 } 1136 }
1103 1137
1104 memmove (cmdbuf_base, cmdbuf_ptr, n); 1138 memmove (cmdbuf_base, cmdbuf_ptr, n);
1105 cmdbuf_ptr = cmdbuf_base; 1139 cmdbuf_ptr = cmdbuf_base;
1106 cmdbuf_endp = cmdbuf_ptr + n; 1140 cmdbuf_endp = cmdbuf_ptr + n;
1107 1141
1108 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1142 ssize_t r = read (pty->pty, cmdbuf_endp, CBUFSIZ - n);
1109 1143
1110 if (r > 0) 1144 if (r > 0)
1111 { 1145 {
1112 cmdbuf_endp += r; 1146 cmdbuf_endp += r;
1113 return true; 1147 return true;
… …
1131} 1165}
1132 1166
1133void 1167void
1134rxvt_term::pty_cb (io_watcher &w, short revents) 1168rxvt_term::pty_cb (io_watcher &w, short revents)
1135{ 1169{
1136 SET_R (this); 1170 make_current ();
1137 SET_LOCALE (locale);
1138 1171
1139 if (revents & EVENT_READ) 1172 if (revents & EVENT_READ)
1140 // loop, but don't allow a single term to monopolize us 1173 // loop, but don't allow a single term to monopolize us
1141 while (pty_fill ()) 1174 while (pty_fill ())
1142 if (cmd_parse ()) 1175 if (cmd_parse ())
… …
1162 1195
1163#ifdef POINTER_BLANK 1196#ifdef POINTER_BLANK
1164void 1197void
1165rxvt_term::pointer_blank () 1198rxvt_term::pointer_blank ()
1166{ 1199{
1167 if (! OPTION (Opt_pointerBlank)) 1200 if (!OPTION (Opt_pointerBlank))
1168 return; 1201 return;
1169 1202
1170 XDefineCursor (display->display, vt, display->blank_cursor); 1203 XDefineCursor (display->display, vt, display->blank_cursor);
1171 XFlush (display->display); 1204 XFlush (display->display);
1172 1205
… …
1174} 1207}
1175 1208
1176void 1209void
1177rxvt_term::pointer_cb (time_watcher &w) 1210rxvt_term::pointer_cb (time_watcher &w)
1178{ 1211{
1179 SET_R (this); 1212 make_current ();
1180 SET_LOCALE (locale);
1181 1213
1182 pointer_blank (); 1214 pointer_blank ();
1183} 1215}
1184#endif 1216#endif
1185 1217
… …
1264 1296
1265/*{{{ process an X event */ 1297/*{{{ process an X event */
1266void 1298void
1267rxvt_term::x_cb (XEvent &ev) 1299rxvt_term::x_cb (XEvent &ev)
1268{ 1300{
1301 make_current ();
1302
1269 dDisp; 1303 dDisp;
1270 1304
1271 SET_R (this); 1305 if (ev.xany.window == vt
1272 SET_LOCALE (locale); 1306 && SHOULD_INVOKE (HOOK_X_EVENT)
1307 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1308 return;
1273 1309
1274#if defined(CURSOR_BLINK) 1310 // for XQueryPointer
1275 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1276 {
1277 if (hidden_cursor)
1278 {
1279 hidden_cursor = 0;
1280 want_refresh = 1;
1281 }
1282
1283 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1284 }
1285#endif
1286
1287#if defined(POINTER_BLANK)
1288 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1289 {
1290 if (ev.type == MotionNotify
1291 || ev.type == ButtonPress
1292 || ev.type == ButtonRelease)
1293 if (hidden_pointer)
1294 pointer_unblank ();
1295
1296 if (ev.type == KeyPress && hidden_pointer == 0)
1297 pointer_blank ();
1298 }
1299#endif
1300
1301 Window unused_root, unused_child; 1311 Window unused_root, unused_child;
1302 int unused_root_x, unused_root_y; 1312 int unused_root_x, unused_root_y;
1303 unsigned int unused_mask; 1313 unsigned int unused_mask;
1304 1314
1305 switch (ev.type) 1315 switch (ev.type)
… …
1312 1322
1313 break; 1323 break;
1314 1324
1315 case KeyRelease: 1325 case KeyRelease:
1316 { 1326 {
1317#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1327#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1318 KeySym ks; 1328 KeySym keysym;
1319 1329
1320 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1330 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1321#endif 1331#endif
1322 1332
1323#if ENABLE_FRILLS || ISO_14755 1333#if ENABLE_FRILLS || ISO_14755
1324 // ISO 14755 support 1334 // ISO 14755 support
1325 if (iso14755buf) 1335 if (iso14755buf)
… …
1330# endif 1340# endif
1331# if ISO_14755 1341# if ISO_14755
1332 // iso14755 part 5.2 handling: release time 1342 // iso14755 part 5.2 handling: release time
1333 // first: controls 1343 // first: controls
1334 if ((ev.xkey.state & ControlMask) 1344 if ((ev.xkey.state & ControlMask)
1335 && ((ks >= 0x40 && ks <= 0x5f) 1345 && ((keysym >= 0x40 && keysym <= 0x5f)
1336 || (ks >= 0x61 && ks <= 0x7f))) 1346 || (keysym >= 0x61 && keysym <= 0x7f)))
1337 { 1347 {
1338 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1348 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1339 commit_iso14755 (); 1349 commit_iso14755 ();
1340 return; // case-break; 1350 goto skip_switch;
1341 } 1351 }
1342 1352
1343 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1353 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1344 if (i[0] == ks) 1354 if (i[0] == keysym)
1345 { 1355 {
1346 iso14755buf = ISO_14755_51 | i[1]; 1356 iso14755buf = ISO_14755_51 | i[1];
1347 commit_iso14755 (); 1357 commit_iso14755 ();
1348 return; // case-break; 1358 goto skip_switch;
1349 } 1359 }
1350 1360
1351 scr_bell (); 1361 scr_bell ();
1352# endif 1362# endif
1353 iso14755buf = 0; 1363 iso14755buf = 0;
… …
1372 else 1382 else
1373 iso14755buf = 0; 1383 iso14755buf = 0;
1374 } 1384 }
1375#endif 1385#endif
1376 1386
1387 if (ev.xany.window == vt
1388 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1389 break;
1390
1377#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1391#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1378 if (!(ev.xkey.state & ControlMask)) 1392 if (!(ev.xkey.state & ControlMask))
1379 slip_wheel_ev.stop (); 1393 slip_wheel_ev.stop ();
1380 else if (ks == XK_Control_L || ks == XK_Control_R) 1394 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1381 mouse_slip_wheel_speed = 0; 1395 mouse_slip_wheel_speed = 0;
1382#endif 1396#endif
1383 break; 1397 break;
1384 } 1398 }
1385 1399
… …
1488 { 1502 {
1489 seen_resize = 1; 1503 seen_resize = 1;
1490 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1); 1504 resize_all_windows (ev.xconfigure.width, ev.xconfigure.height, 1);
1491 } 1505 }
1492 1506
1507 HOOK_INVOKE ((this, HOOK_CONFIGURE_NOTIFY, DT_XEVENT, &ev, DT_END));
1508
1493#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */ 1509#ifdef TRANSPARENT /* XXX: maybe not needed - leave in for now */
1494 if (OPTION (Opt_transparent)) 1510 if (OPTION (Opt_transparent))
1495 check_our_parents (); 1511 check_our_parents ();
1496#endif 1512#endif
1497 } 1513 }
… …
1515 1531
1516 case SelectionRequest: 1532 case SelectionRequest:
1517 selection_send (ev.xselectionrequest); 1533 selection_send (ev.xselectionrequest);
1518 break; 1534 break;
1519 1535
1536 case MapNotify:
1537 mapped = 1;
1538#ifdef TEXT_BLINK
1539 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1540#endif
1541 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1542 break;
1543
1520 case UnmapNotify: 1544 case UnmapNotify:
1521 mapped = 0; 1545 mapped = 0;
1522#ifdef TEXT_BLINK 1546#ifdef TEXT_BLINK
1523 text_blink_ev.stop (); 1547 text_blink_ev.stop ();
1524#endif 1548#endif
1525 break; 1549 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1526
1527 case MapNotify:
1528 mapped = 1;
1529#ifdef TEXT_BLINK
1530 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1531#endif
1532 break; 1550 break;
1533 1551
1534#ifdef TRANSPARENT 1552#ifdef TRANSPARENT
1535 case ReparentNotify: 1553 case ReparentNotify:
1536 rootwin_cb (ev); 1554 rootwin_cb (ev);
… …
1550 1568
1551 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1569 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1552 scr_expose (ev.xexpose.x, ev.xexpose.y, 1570 scr_expose (ev.xexpose.x, ev.xexpose.y,
1553 ev.xexpose.width, ev.xexpose.height, False); 1571 ev.xexpose.width, ev.xexpose.height, False);
1554 1572
1555 scr_refresh (refresh_type); 1573 want_refresh = 1;
1556 } 1574 }
1557 else 1575 else
1558 { 1576 {
1559 XEvent unused_event; 1577 XEvent unused_event;
1560 1578
… …
1566 if (isScrollbarWindow (ev.xany.window)) 1584 if (isScrollbarWindow (ev.xany.window))
1567 { 1585 {
1568 scrollBar.setIdle (); 1586 scrollBar.setIdle ();
1569 scrollbar_show (0); 1587 scrollbar_show (0);
1570 } 1588 }
1571#ifdef MENUBAR
1572 if (menubar_visible () && isMenuBarWindow (ev.xany.window))
1573 menubar_expose ();
1574#endif
1575 1589
1576#ifdef TRANSPARENT 1590#ifdef TRANSPARENT
1577 if (am_transparent && ev.xany.window == parent[0]) 1591 if (am_transparent && ev.xany.window == parent[0])
1578 XClearWindow (disp, ev.xany.window); 1592 XClearWindow (disp, ev.xany.window);
1579#endif 1593#endif
… …
1583 case MotionNotify: 1597 case MotionNotify:
1584#ifdef POINTER_BLANK 1598#ifdef POINTER_BLANK
1585 if (hidden_pointer) 1599 if (hidden_pointer)
1586 pointer_unblank (); 1600 pointer_unblank ();
1587#endif 1601#endif
1588#if MENUBAR
1589 if (isMenuBarWindow (ev.xany.window))
1590 {
1591 menubar_control (ev.xbutton);
1592 break;
1593 }
1594#endif
1595 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1602 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1596 break; 1603 break;
1597 1604
1598 if (ev.xany.window == vt) 1605 if (ev.xany.window == vt)
1599 { 1606 {
1607 if (SHOULD_INVOKE (HOOK_MOTION_NOTIFY)
1608 && HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1609 ; // nop
1600 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1610 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1601 { 1611 {
1602 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1612 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1603 ; 1613 ;
1604 1614
1605 XQueryPointer (disp, vt, 1615 XQueryPointer (disp, vt,
… …
1685 &unused_root_x, &unused_root_y, 1695 &unused_root_x, &unused_root_y,
1686 &ev.xbutton.x, &ev.xbutton.y, 1696 &ev.xbutton.x, &ev.xbutton.y,
1687 &unused_mask); 1697 &unused_mask);
1688 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1698 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1689 scrollbar_size ()); 1699 scrollbar_size ());
1690 scr_refresh (refresh_type); 1700 want_refresh = 1;
1691 refresh_limit = 0; 1701 refresh_limit = 0;
1692 scrollbar_show (1); 1702 scrollbar_show (1);
1693 } 1703 }
1694 break; 1704 break;
1695 } 1705 }
1706
1707skip_switch: ;
1708
1709#if defined(CURSOR_BLINK)
1710 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1711 {
1712 if (hidden_cursor)
1713 {
1714 hidden_cursor = 0;
1715 want_refresh = 1;
1716 }
1717
1718 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1719 }
1720#endif
1721
1722#if defined(POINTER_BLANK)
1723 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1724 {
1725 if (ev.type == MotionNotify
1726 || ev.type == ButtonPress
1727 || ev.type == ButtonRelease)
1728 if (hidden_pointer)
1729 pointer_unblank ();
1730
1731 if (ev.type == KeyPress && hidden_pointer == 0)
1732 pointer_blank ();
1733 }
1734#endif
1696} 1735}
1697 1736
1698void 1737void
1699rxvt_term::focus_in () 1738rxvt_term::focus_in ()
1700{ 1739{
1701 if (!focus) 1740 if (!focus)
1702 { 1741 {
1703 focus = 1; 1742 focus = 1;
1704 want_refresh = 1; 1743 want_refresh = 1;
1705 1744
1706 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1745 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1707 1746
1708#if USE_XIM 1747#if USE_XIM
1709 if (Input_Context != NULL) 1748 if (Input_Context != NULL)
1710 { 1749 {
1711 IMSetStatusPosition (); 1750 IMSetStatusPosition ();
… …
1732 if (focus) 1771 if (focus)
1733 { 1772 {
1734 focus = 0; 1773 focus = 0;
1735 want_refresh = 1; 1774 want_refresh = 1;
1736 1775
1737 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1776 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1738 1777
1739#if ENABLE_FRILLS || ISO_14755 1778#if ENABLE_FRILLS || ISO_14755
1740 if (iso14755buf) 1779 if (iso14755buf)
1741 { 1780 {
1742 iso14755buf = 0; 1781 iso14755buf = 0;
… …
1766 1805
1767#if TRANSPARENT 1806#if TRANSPARENT
1768void 1807void
1769rxvt_term::rootwin_cb (XEvent &ev) 1808rxvt_term::rootwin_cb (XEvent &ev)
1770{ 1809{
1771 SET_R (this); 1810 make_current ();
1772 SET_LOCALE (locale);
1773 1811
1774 switch (ev.type) 1812 switch (ev.type)
1775 { 1813 {
1776 case PropertyNotify: 1814 case PropertyNotify:
1777 /* 1815 /*
… …
1795rxvt_term::button_press (XButtonEvent &ev) 1833rxvt_term::button_press (XButtonEvent &ev)
1796{ 1834{
1797 int reportmode = 0, clickintime; 1835 int reportmode = 0, clickintime;
1798 1836
1799 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1837 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1838
1800 if (!bypass_keystate) 1839 if (!bypass_keystate)
1801 reportmode = !! (priv_modes & PrivMode_mouse_report); 1840 reportmode = !! (priv_modes & PrivMode_mouse_report);
1802 1841
1803 /* 1842 /*
1804 * VT window processing of button press 1843 * VT window processing of button press
… …
1824#ifdef MOUSE_REPORT_DOUBLECLICK 1863#ifdef MOUSE_REPORT_DOUBLECLICK
1825 if (ev.button == MEvent.button && clickintime) 1864 if (ev.button == MEvent.button && clickintime)
1826 { 1865 {
1827 /* same button, within alloted time */ 1866 /* same button, within alloted time */
1828 MEvent.clicks++; 1867 MEvent.clicks++;
1868
1829 if (MEvent.clicks > 1) 1869 if (MEvent.clicks > 1)
1830 { 1870 {
1831 /* only report double clicks */ 1871 /* only report double clicks */
1832 MEvent.clicks = 2; 1872 MEvent.clicks = 2;
1833 mouse_report (ev); 1873 mouse_report (ev);
… …
1853 else 1893 else
1854 { 1894 {
1855 if (ev.button != MEvent.button) 1895 if (ev.button != MEvent.button)
1856 MEvent.clicks = 0; 1896 MEvent.clicks = 0;
1857 1897
1898 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1858 switch (ev.button) 1899 switch (ev.button)
1859 { 1900 {
1860 case Button1: 1901 case Button1:
1861 /* allow meta + click to select rectangular areas */ 1902 /* allow meta + click to select rectangular areas */
1862 /* should be done in screen.C */ 1903 /* should be done in screen.C */
1863#if ENABLE_FRILLS 1904#if ENABLE_FRILLS
1864 selection.rect = !!(ev.state & ModMetaMask); 1905 selection.rect = !!(ev.state & ModMetaMask);
1865#else 1906#else
1866 selection.rect = false; 1907 selection.rect = false;
1867#endif 1908#endif
1868 1909
1869 /* allow shift+left click to extend selection */ 1910 /* allow shift+left click to extend selection */
1870 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1911 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1871 { 1912 {
1872 if (MEvent.button == Button1 && clickintime) 1913 if (MEvent.button == Button1 && clickintime)
1873 selection_rotate (ev.x, ev.y); 1914 selection_rotate (ev.x, ev.y);
1874 else 1915 else
1875 selection_extend (ev.x, ev.y, 1); 1916 selection_extend (ev.x, ev.y, 1);
1876 } 1917 }
1877 else 1918 else
1878 { 1919 {
1879 if (MEvent.button == Button1 && clickintime) 1920 if (MEvent.button == Button1 && clickintime)
1880 MEvent.clicks++; 1921 MEvent.clicks++;
1881 else 1922 else
1882 MEvent.clicks = 1; 1923 MEvent.clicks = 1;
1883 1924
1884 selection_click (MEvent.clicks, ev.x, ev.y); 1925 selection_click (MEvent.clicks, ev.x, ev.y);
1885 } 1926 }
1886 1927
1887 MEvent.button = Button1; 1928 MEvent.button = Button1;
1888 break; 1929 break;
1889 1930
1890 case Button3: 1931 case Button3:
1891 if (MEvent.button == Button3 && clickintime) 1932 if (MEvent.button == Button3 && clickintime)
1892 selection_rotate (ev.x, ev.y); 1933 selection_rotate (ev.x, ev.y);
1893 else 1934 else
1894 selection_extend (ev.x, ev.y, 1); 1935 selection_extend (ev.x, ev.y, 1);
1895 1936
1896 MEvent.button = Button3; 1937 MEvent.button = Button3;
1897 break; 1938 break;
1898 } 1939 }
1899 } 1940 }
1900 1941
1901 MEvent.time = ev.time; 1942 MEvent.time = ev.time;
1902 return; 1943 return;
1903 } 1944 }
1904 1945
… …
2040 } 2081 }
2041 2082
2042 break; 2083 break;
2043 } 2084 }
2044 } 2085 }
2086
2045 return; 2087 return;
2046 } 2088 }
2047#if MENUBAR
2048 /*
2049 * Menubar window processing of button press
2050 */
2051 if (isMenuBarWindow (ev.window))
2052 menubar_control (ev);
2053#endif
2054} 2089}
2055 2090
2056void 2091void
2057rxvt_term::button_release (XButtonEvent &ev) 2092rxvt_term::button_release (XButtonEvent &ev)
2058{ 2093{
… …
2064 2099
2065 if (scrollbar_isUpDn ()) 2100 if (scrollbar_isUpDn ())
2066 { 2101 {
2067 scrollBar.setIdle (); 2102 scrollBar.setIdle ();
2068 scrollbar_show (0); 2103 scrollbar_show (0);
2069#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
2070 refresh_type &= ~SMOOTH_REFRESH;
2071#endif
2072 } 2104 }
2073 2105
2074#ifdef SELECTION_SCROLLING 2106#ifdef SELECTION_SCROLLING
2075 if (sel_scroll_ev.active) 2107 if (sel_scroll_ev.active)
2076 sel_scroll_ev.stop(); 2108 sel_scroll_ev.stop();
… …
2114 if (priv_modes & PrivMode_mouse_report 2146 if (priv_modes & PrivMode_mouse_report
2115 && bypass_keystate 2147 && bypass_keystate
2116 && ev.button == Button1 && MEvent.clicks <= 1) 2148 && ev.button == Button1 && MEvent.clicks <= 1)
2117 selection_extend (ev.x, ev.y, 0); 2149 selection_extend (ev.x, ev.y, 0);
2118 2150
2151 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2152 return;
2153
2119 switch (ev.button) 2154 switch (ev.button)
2120 { 2155 {
2121 case Button1: 2156 case Button1:
2122 case Button3: 2157 case Button3:
2123 selection_make (ev.time); 2158 selection_make (ev.time);
… …
2154 slip_wheel_ev.start (); 2189 slip_wheel_ev.start ();
2155 } 2190 }
2156 else 2191 else
2157 { 2192 {
2158# endif 2193# endif
2159# ifdef JUMP_MOUSE_WHEEL
2160 scr_page (v, i); 2194 scr_page (v, i);
2161 scr_refresh (SMOOTH_REFRESH);
2162 scrollbar_show (1); 2195 scrollbar_show (1);
2163# else
2164 while (i--)
2165 {
2166 scr_page (v, 1);
2167 scr_refresh (SMOOTH_REFRESH);
2168 scrollbar_show (1);
2169 }
2170# endif
2171# ifdef MOUSE_SLIP_WHEELING 2196# ifdef MOUSE_SLIP_WHEELING
2172 } 2197 }
2173#endif 2198# endif
2174 } 2199 }
2175 break; 2200 break;
2176#endif 2201#endif
2177 } 2202 }
2178 } 2203 }
2179#ifdef MENUBAR
2180 else if (isMenuBarWindow (ev.window))
2181 menubar_control (ev);
2182#endif
2183} 2204}
2184 2205
2185#ifdef TRANSPARENT 2206#ifdef TRANSPARENT
2186#if TINTING 2207#if TINTING
2187/* taken from aterm-0.4.2 */ 2208/* taken from aterm-0.4.2 */
… …
2667 2688
2668bool 2689bool
2669rxvt_term::cmd_parse () 2690rxvt_term::cmd_parse ()
2670{ 2691{
2671 bool flag = false; 2692 bool flag = false;
2672 unicode_t ch = NOCHAR; 2693 wchar_t ch = NOCHAR;
2673 unsigned char *seq_begin; // remember start of esc-sequence here 2694 char *seq_begin; // remember start of esc-sequence here
2674 2695
2675 for (;;) 2696 for (;;)
2676 { 2697 {
2677 if (ch == NOCHAR) 2698 if (ch == NOCHAR)
2678 { 2699 {
2679 seq_begin = cmdbuf_ptr; 2700 seq_begin = cmdbuf_ptr;
2680 ch = next_char (); 2701 ch = next_char ();
2681 }
2682 2702
2683 if (ch == NOCHAR) // TODO: improve 2703 if (ch == NOCHAR)
2684 break; 2704 break;
2705 }
2685 2706
2686 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2707 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2687 { 2708 {
2688 if (!seen_input) 2709 if (!seen_input)
2689 { 2710 {
… …
2698 if (seen_resize && cmd_pid) 2719 if (seen_resize && cmd_pid)
2699 kill (-cmd_pid, SIGWINCH); 2720 kill (-cmd_pid, SIGWINCH);
2700 } 2721 }
2701 2722
2702 /* Read a text string from the input buffer */ 2723 /* Read a text string from the input buffer */
2703 unicode_t buf[UBUFSIZ]; 2724 wchar_t buf[UBUFSIZ];
2704 bool refreshnow = false; 2725 bool refreshnow = false;
2705 int nlines = 0; 2726 int nlines = 0;
2706 unicode_t *str = buf; 2727 wchar_t *str = buf;
2707 unicode_t *eol = str + min (ncol, UBUFSIZ); 2728 wchar_t *eol = str + min (ncol, UBUFSIZ);
2708 2729
2709 for (;;) 2730 for (;;)
2710 { 2731 {
2711 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2732 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2712 break; 2733 break;
… …
2730 } 2751 }
2731 2752
2732 // scr_add_lines only works for nlines <= nrow - 1. 2753 // scr_add_lines only works for nlines <= nrow - 1.
2733 if (nlines >= nrow - 1) 2754 if (nlines >= nrow - 1)
2734 { 2755 {
2756 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2757 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2735 scr_add_lines (buf, nlines, str - buf); 2758 scr_add_lines (buf, str - buf, nlines);
2759
2736 nlines = 0; 2760 nlines = 0;
2737 str = buf; 2761 str = buf;
2738 eol = str + min (ncol, UBUFSIZ); 2762 eol = str + min (ncol, UBUFSIZ);
2739 } 2763 }
2740 2764
… …
2753 2777
2754 seq_begin = cmdbuf_ptr; 2778 seq_begin = cmdbuf_ptr;
2755 ch = next_char (); 2779 ch = next_char ();
2756 } 2780 }
2757 2781
2782 if (!(SHOULD_INVOKE (HOOK_ADD_LINES)
2783 && HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))))
2758 scr_add_lines (buf, nlines, str - buf); 2784 scr_add_lines (buf, str - buf, nlines);
2759 2785
2760 /* 2786 /*
2761 * If there have been a lot of new lines, then update the screen 2787 * If there have been a lot of new lines, then update the screen
2762 * What the heck I'll cheat and only refresh less than every page-full. 2788 * What the heck I'll cheat and only refresh less than every page-full.
2763 * the number of pages between refreshes is refresh_limit, which 2789 * the number of pages between refreshes is refresh_limit, which
… …
2768 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD) 2794 if (OPTION (Opt_jumpScroll) && refresh_limit < REFRESH_PERIOD)
2769 refresh_limit++; 2795 refresh_limit++;
2770 else 2796 else
2771 { 2797 {
2772 flag = true; 2798 flag = true;
2773 scr_refresh (refresh_type); 2799 scr_refresh ();
2774 flush_ev.stop (); 2800 want_refresh = 1;
2775 } 2801 }
2776 } 2802 }
2777 2803
2778 } 2804 }
2779 else 2805 else
… …
2794 } 2820 }
2795 2821
2796 return flag; 2822 return flag;
2797} 2823}
2798 2824
2799// read the next octet
2800unicode_t
2801rxvt_term::next_octet ()
2802{
2803 return cmdbuf_ptr < cmdbuf_endp
2804 ? *cmdbuf_ptr++
2805 : NOCHAR;
2806}
2807
2808// read the next character 2825// read the next character
2809unicode_t 2826wchar_t
2810rxvt_term::next_char () 2827rxvt_term::next_char ()
2811{ 2828{
2812 while (cmdbuf_ptr < cmdbuf_endp) 2829 while (cmdbuf_ptr < cmdbuf_endp)
2813 { 2830 {
2814 // assume 7-bit to be ascii ALWAYS 2831 // assume 7-bit to be ascii ALWAYS
2815 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2832 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2816 return *cmdbuf_ptr++; 2833 return *cmdbuf_ptr++;
2817 2834
2818 wchar_t wc; 2835 wchar_t wc;
2819 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2836 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2820 2837
2821 if (len == (size_t)-2) 2838 if (len == (size_t)-2)
2822 { 2839 {
2823 // the mbstate stores incomplete sequences. didn't know this :/ 2840 // the mbstate stores incomplete sequences. didn't know this :/
2824 cmdbuf_ptr = cmdbuf_endp; 2841 cmdbuf_ptr = cmdbuf_endp;
2825 break; 2842 break;
2826 } 2843 }
2827 2844
2828 if (len == (size_t)-1) 2845 if (len == (size_t)-1)
2829 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2846 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2830 2847
2831 // assume wchar == unicode 2848 // assume wchar == unicode
2832 cmdbuf_ptr += len; 2849 cmdbuf_ptr += len;
2833 return wc & UNICODE_MASK; 2850 return wc & UNICODE_MASK;
2834 } 2851 }
2835 2852
2836 return NOCHAR; 2853 return NOCHAR;
2854}
2855
2856// read the next octet
2857uint32_t
2858rxvt_term::next_octet ()
2859{
2860 return cmdbuf_ptr < cmdbuf_endp
2861 ? (unsigned char)*cmdbuf_ptr++
2862 : NOCHAR;
2837} 2863}
2838 2864
2839/* rxvt_cmd_getc () - Return next input character */ 2865/* rxvt_cmd_getc () - Return next input character */
2840/* 2866/*
2841 * Return the next input character after first passing any keyboard input 2867 * Return the next input character after first passing any keyboard input
2842 * to the command. 2868 * to the command.
2843 */ 2869 */
2844unicode_t 2870wchar_t
2845rxvt_term::cmd_getc () 2871rxvt_term::cmd_getc ()
2846{ 2872{
2847 unicode_t c = next_char (); 2873 wchar_t c = next_char ();
2848 2874
2849 if (c == NOCHAR) 2875 if (c == NOCHAR)
2850 throw out_of_input; 2876 throw out_of_input;
2851 2877
2852 return c; 2878 return c;
2853} 2879}
2854 2880
2855unicode_t 2881uint32_t
2856rxvt_term::cmd_get8 () 2882rxvt_term::cmd_get8 ()
2857{ 2883{
2858 unicode_t c = next_octet (); 2884 uint32_t c = next_octet ();
2859 2885
2860 if (c == NOCHAR) 2886 if (c == NOCHAR)
2861 throw out_of_input; 2887 throw out_of_input;
2862 2888
2863 return c; 2889 return c;
… …
2963 case C0_ESC: 2989 case C0_ESC:
2964 process_escape_seq (); 2990 process_escape_seq ();
2965 break; 2991 break;
2966 case C0_ENQ: /* terminal Status */ 2992 case C0_ENQ: /* terminal Status */
2967 if (rs[Rs_answerbackstring]) 2993 if (rs[Rs_answerbackstring])
2968 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2994 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2969 (unsigned int)strlen (rs[Rs_answerbackstring]));
2970 else 2995 else
2971 tt_write ((unsigned char *)VT100_ANS, 2996 tt_write (VT100_ANS, strlen (VT100_ANS));
2972 (unsigned int)strlen (VT100_ANS));
2973 break; 2997 break;
2974 case C0_BEL: /* bell */ 2998 case C0_BEL: /* bell */
2975 scr_bell (); 2999 scr_bell ();
2976 break; 3000 break;
2977 case C0_BS: /* backspace */ 3001 case C0_BS: /* backspace */
… …
3132 break; 3156 break;
3133 3157
3134 /* 8.3.87: NEXT LINE */ 3158 /* 8.3.87: NEXT LINE */
3135 case C1_NEL: /* ESC E */ 3159 case C1_NEL: /* ESC E */
3136 { 3160 {
3137 unicode_t nlcr[] = { C0_LF, C0_CR }; 3161 wchar_t nlcr[] = { C0_LF, C0_CR };
3138 scr_add_lines (nlcr, 1, 2); 3162 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3139 } 3163 }
3140 break; 3164 break;
3141 3165
3142 /* kidnapped escape sequence: Should be 8.3.48 */ 3166 /* kidnapped escape sequence: Should be 8.3.48 */
3143 case C1_ESA: /* ESC G */ 3167 case C1_ESA: /* ESC G */
… …
3165 process_dcs_seq (); 3189 process_dcs_seq ();
3166 break; 3190 break;
3167 3191
3168 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3192 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3169 case C1_SCI: /* ESC Z */ 3193 case C1_SCI: /* ESC Z */
3170 tt_write ((const unsigned char *)ESCZ_ANSWER, 3194 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3171 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3172 break; /* steal obsolete ESC [ c */ 3195 break; /* steal obsolete ESC [ c */
3173 3196
3174 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3197 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3175 case C1_CSI: /* ESC [ */ 3198 case C1_CSI: /* ESC [ */
3176 process_csi_seq (); 3199 process_csi_seq ();
… …
3420 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3443 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3421 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3444 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3422 break; 3445 break;
3423 3446
3424 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3447 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3425 tt_write ((const unsigned char *)VT100_ANS, 3448 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3426 (unsigned int) (sizeof (VT100_ANS) - 1));
3427 break; 3449 break;
3428 3450
3429 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3451 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3430 process_sgr_mode (nargs, arg); 3452 process_sgr_mode (nargs, arg);
3431 break; 3453 break;
… …
3633/*----------------------------------------------------------------------*/ 3655/*----------------------------------------------------------------------*/
3634/* 3656/*
3635 * get input up until STRING TERMINATOR (or BEL) 3657 * get input up until STRING TERMINATOR (or BEL)
3636 * ends_how is terminator used. returned input must be free()'d 3658 * ends_how is terminator used. returned input must be free()'d
3637 */ 3659 */
3638unsigned char * 3660char *
3639rxvt_term::get_to_st (unicode_t &ends_how) 3661rxvt_term::get_to_st (unicode_t &ends_how)
3640{ 3662{
3641 unicode_t ch; 3663 unicode_t ch;
3642 bool seen_esc = false; 3664 bool seen_esc = false;
3643 unsigned int n = 0; 3665 unsigned int n = 0;
… …
3676 3698
3677 string[n++] = '\0'; 3699 string[n++] = '\0';
3678 3700
3679 ends_how = (ch == 0x5c ? C0_ESC : ch); 3701 ends_how = (ch == 0x5c ? C0_ESC : ch);
3680 3702
3681 return (unsigned char *)rxvt_wcstombs (string); 3703 return rxvt_wcstombs (string);
3682} 3704}
3683 3705
3684/*----------------------------------------------------------------------*/ 3706/*----------------------------------------------------------------------*/
3685/* 3707/*
3686 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3708 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3687 */ 3709 */
3688void 3710void
3689rxvt_term::process_dcs_seq () 3711rxvt_term::process_dcs_seq ()
3690{ 3712{
3691 unsigned char *s; 3713 char *s;
3692 unicode_t eh; 3714 unicode_t eh;
3693 3715
3694 /* 3716 /*
3695 * Not handled yet 3717 * Not handled yet
3696 */ 3718 */
… …
3715 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3737 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3716 arg = arg * 10 + (ch - '0'); 3738 arg = arg * 10 + (ch - '0');
3717 3739
3718 if (ch == ';') 3740 if (ch == ';')
3719 { 3741 {
3720 unsigned char *s = get_to_st (eh); 3742 char *s = get_to_st (eh);
3721 3743
3722 if (s) 3744 if (s)
3723 { 3745 {
3724 process_xterm_seq (arg, (char *)s, eh); 3746 process_xterm_seq (arg, s, eh);
3725 free (s); 3747 free (s);
3726 } 3748 }
3727 } 3749 }
3728} 3750}
3729 3751
3730void 3752void
3731rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3753rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3732{ 3754{
3733 if (str[0] == '?' && !str[1]) 3755 if (str[0] == '?' && !str[1])
3734 { 3756 {
3735 unsigned short r, g, b; 3757 unsigned short r, g, b;
3736 pix_colors_focused[color].get (display, r, g, b); 3758 pix_colors_focused[color].get (display, r, g, b);
… …
3742 3764
3743/* 3765/*
3744 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3766 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3745 */ 3767 */
3746void 3768void
3747rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3769rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3748{ 3770{
3749 int changed = 0;
3750 int color; 3771 int color;
3751 char *buf, *name; 3772 char *buf, *name;
3752 bool query = str[0] == '?' && !str[1]; 3773 bool query = str[0] == '?' && !str[1];
3753 int saveop = op; 3774 int saveop = op;
3754 dDisp; 3775 dDisp;
… …
3809 { 3830 {
3810 if ((name = strchr (buf, ';')) == NULL) 3831 if ((name = strchr (buf, ';')) == NULL)
3811 break; 3832 break;
3812 3833
3813 *name++ = '\0'; 3834 *name++ = '\0';
3814 color = atoi (buf); 3835 color = atoi (buf) + minCOLOR;
3815 3836
3816 if (color < 0 || color >= TOTAL_COLORS) 3837 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3817 break; 3838 break;
3818 3839
3819 if ((buf = strchr (name, ';')) != NULL) 3840 if ((buf = strchr (name, ';')) != NULL)
3820 *buf++ = '\0'; 3841 *buf++ = '\0';
3821 3842
3822 if (name[0] == '?' && !name[1]) 3843 if (name[0] == '?' && !name[1])
3823 { 3844 {
3824 unsigned short r, g, b; 3845 unsigned short r, g, b;
3825 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3846 pix_colors_focused[color].get (display, r, g, b);
3826 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3847 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3827 } 3848 }
3828 else 3849 else
3829 set_window_color (color + minCOLOR, name); 3850 set_window_color (color, name);
3830 } 3851 }
3831 break; 3852 break;
3832 case XTerm_Color00: 3853 case XTerm_Color00:
3833 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3854 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3834 break; 3855 break;
3835 case XTerm_Color01: 3856 case XTerm_Color01:
3836 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3857 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3837 break; 3858 break;
3838#ifndef NO_CURSORCOLOR 3859#ifndef NO_CURSORCOLOR
3839 case XTerm_Color_cursor: 3860 case XTerm_Color_cursor:
3840 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3861 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3841 break; 3862 break;
… …
3845 break; 3866 break;
3846 case XTerm_Color_pointer_bg: 3867 case XTerm_Color_pointer_bg:
3847 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3868 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3848 break; 3869 break;
3849#ifndef NO_BOLD_UNDERLINE_REVERSE 3870#ifndef NO_BOLD_UNDERLINE_REVERSE
3850 case XTerm_Color_BD:
3851 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3852 break;
3853 case XTerm_Color_UL:
3854 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3855 break;
3856 case XTerm_Color_RV: 3871 case XTerm_Color_RV:
3857 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3872 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3873 break;
3874 case Rxvt_Color_BD:
3875 case URxvt_Color_BD:
3876 process_color_seq (op, Color_BD, str, resp);
3877 break;
3878 case Rxvt_Color_UL:
3879 case URxvt_Color_UL:
3880 process_color_seq (op, Color_UL, str, resp);
3858 break; 3881 break;
3859 case URxvt_Color_IT: 3882 case URxvt_Color_IT:
3860 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3883 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3861 break; 3884 break;
3862#endif 3885#endif
… …
3867 if (am_transparent) 3890 if (am_transparent)
3868 want_full_refresh = want_refresh = 1; 3891 want_full_refresh = want_refresh = 1;
3869 break; 3892 break;
3870#endif 3893#endif
3871 3894
3872 case XTerm_Pixmap: 3895 case Rxvt_Pixmap:
3896 {
3873 if (*str != ';') 3897 if (*str != ';')
3874 { 3898 {
3875#if XPM_BACKGROUND 3899#if XPM_BACKGROUND
3876 scale_pixmap (""); /* reset to default scaling */ 3900 scale_pixmap (""); /* reset to default scaling */
3877 set_bgPixmap (str); /* change pixmap */ 3901 set_bgPixmap (str); /* change pixmap */
3878#endif
3879 scr_touch (true); 3902 scr_touch (true);
3903#endif
3880 } 3904 }
3905
3906 int changed = 0;
3907
3881 while ((str = strchr (str, ';')) != NULL) 3908 while ((str = strchr (str, ';')) != NULL)
3882 { 3909 {
3883 str++; 3910 str++;
3884#if XPM_BACKGROUND 3911#if XPM_BACKGROUND
3885 changed += scale_pixmap (str); 3912 changed += scale_pixmap (str);
3886#endif 3913#endif
3887 } 3914 }
3888 3915
3889 if (changed) 3916 if (changed)
3890 { 3917 {
3891#ifdef XPM_BACKGROUND 3918#ifdef XPM_BACKGROUND
3892 resize_pixmap (); 3919 resize_pixmap ();
3893#endif
3894 scr_touch (true); 3920 scr_touch (true);
3921#endif
3895 } 3922 }
3923 }
3896 break; 3924 break;
3897 3925
3898 case XTerm_restoreFG: 3926 case Rxvt_restoreFG:
3899 set_window_color (Color_fg, str); 3927 set_window_color (Color_fg, str);
3900 break; 3928 break;
3901 case XTerm_restoreBG: 3929 case Rxvt_restoreBG:
3902 set_window_color (Color_bg, str); 3930 set_window_color (Color_bg, str);
3903 break; 3931 break;
3904 3932
3905 case XTerm_logfile: 3933 case XTerm_logfile:
3906 // TODO, when secure mode? 3934 // TODO, when secure mode?
3907 break; 3935 break;
3908 3936
3909#ifdef MENUBAR
3910 case URxvt_Menu:
3911 if (OPTION (Opt_insecure))
3912 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3913 break;
3914#endif
3915#if 0 3937#if 0
3916 case XTerm_dumpscreen: /* no error notices */ 3938 case Rxvt_dumpscreen: /* no error notices */
3917 { 3939 {
3918 int fd; 3940 int fd;
3919 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3941 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3920 { 3942 {
3921 scr_dump (fd); 3943 scr_dump (fd);
… …
3952 if (query) 3974 if (query)
3953 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp); 3975 tt_printf ("\33]%d;%-.250s%c", URxvt_locale, OPTION (Opt_insecure) ? locale : "", resp);
3954 else 3976 else
3955 { 3977 {
3956 set_locale (str); 3978 set_locale (str);
3957 pty.set_utf8_mode (enc_utf8); 3979 pty->set_utf8_mode (enc_utf8);
3958 init_xlocale (); 3980 init_xlocale ();
3959 } 3981 }
3960 break; 3982 break;
3961 3983
3962 case URxvt_view_up: 3984 case URxvt_view_up:
3963 case URxvt_view_down: 3985 case URxvt_view_down:
3986 {
3964 int lines = atoi (str); 3987 int lines = atoi (str);
3965 3988
3966 if (lines) 3989 if (lines)
3967 scr_page (op == URxvt_view_up ? UP : DN, lines); 3990 scr_page (op == URxvt_view_up ? UP : DN, lines);
3968 else 3991 else
3969 {
3970 scr_erase_savelines (); 3992 scr_erase_savelines ();
3971 } 3993 }
3972 3994
3995 break;
3996#endif
3997
3998#if ENABLE_PERL
3999 case URxvt_perl:
4000 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
4001 ; // no responses yet
3973 break; 4002 break;
3974#endif 4003#endif
3975 } 4004 }
3976} 4005}
3977/*----------------------------------------------------------------------*/ 4006/*----------------------------------------------------------------------*/
… …
4029 { 5, PrivMode_rVideo }, 4058 { 5, PrivMode_rVideo },
4030 { 6, PrivMode_relOrigin }, 4059 { 6, PrivMode_relOrigin },
4031 { 7, PrivMode_Autowrap }, 4060 { 7, PrivMode_Autowrap },
4032 // 8, bi-directional support mode 4061 // 8, bi-directional support mode
4033 { 9, PrivMode_MouseX10 }, 4062 { 9, PrivMode_MouseX10 },
4034#ifdef menuBar_esc
4035 { menuBar_esc, PrivMode_menuBar },
4036#endif
4037 // 18, 19 printing-related 4063 // 18, 19 printing-related
4038 { 25, PrivMode_VisibleCursor }, 4064 { 25, PrivMode_VisibleCursor },
4039#ifdef scrollBar_esc 4065#ifdef scrollBar_esc
4040 { scrollBar_esc, PrivMode_scrollBar }, 4066 { scrollBar_esc, PrivMode_scrollBar },
4041#endif 4067#endif
… …
4088 /* extra handling for values with state unkept */ 4114 /* extra handling for values with state unkept */
4089 switch (arg[i]) 4115 switch (arg[i])
4090 { 4116 {
4091#if ENABLE_STYLES 4117#if ENABLE_STYLES
4092 case 1021: 4118 case 1021:
4093 if (mode) 4119 set_option (Opt_intensityStyles, mode);
4094 SET_OPTION (Opt_intensityStyles);
4095 else
4096 CLR_OPTION (Opt_intensityStyles);
4097 4120
4098 scr_touch (true); 4121 scr_touch (true);
4099 break; 4122 break;
4100#endif 4123#endif
4101 case 1048: /* alternative cursor save */ 4124 case 1048: /* alternative cursor save */
… …
4123 case 3: /* 80/132 */ 4146 case 3: /* 80/132 */
4124 if (priv_modes & PrivMode_132OK) 4147 if (priv_modes & PrivMode_132OK)
4125 set_widthheight (((state ? 132 : 80) * fwidth), height); 4148 set_widthheight (((state ? 132 : 80) * fwidth), height);
4126 break; 4149 break;
4127 case 4: /* smooth scrolling */ 4150 case 4: /* smooth scrolling */
4128 if (!state) 4151 set_option (Opt_jumpScroll, !state);
4129 SET_OPTION (Opt_jumpScroll);
4130 else
4131 CLR_OPTION (Opt_jumpScroll);
4132 break; 4152 break;
4133 case 5: /* reverse video */ 4153 case 5: /* reverse video */
4134 scr_rvideo_mode (state); 4154 scr_rvideo_mode (state);
4135 break; 4155 break;
4136 case 6: /* relative/absolute origins */ 4156 case 6: /* relative/absolute origins */
… …
4142 /* case 8: - auto repeat, can't do on a per window basis */ 4162 /* case 8: - auto repeat, can't do on a per window basis */
4143 case 9: /* X10 mouse reporting */ 4163 case 9: /* X10 mouse reporting */
4144 if (state) /* orthogonal */ 4164 if (state) /* orthogonal */
4145 priv_modes &= ~PrivMode_MouseX11; 4165 priv_modes &= ~PrivMode_MouseX11;
4146 break; 4166 break;
4147#ifdef menuBar_esc
4148 case menuBar_esc:
4149#ifdef MENUBAR
4150 map_menuBar (state);
4151#endif
4152 break;
4153#endif
4154#ifdef scrollBar_esc 4167#ifdef scrollBar_esc
4155 case scrollBar_esc: 4168 case scrollBar_esc:
4156 if (scrollbar_mapping (state)) 4169 if (scrollbar_mapping (state))
4157 { 4170 {
4158 resize_all_windows (0, 0, 0); 4171 resize_all_windows (0, 0, 0);
… …
4177#if 0 4190#if 0
4178 case 1001: 4191 case 1001:
4179 break; /* X11 mouse highlighting */ 4192 break; /* X11 mouse highlighting */
4180#endif 4193#endif
4181 case 1010: /* scroll to bottom on TTY output inhibit */ 4194 case 1010: /* scroll to bottom on TTY output inhibit */
4182 if (!state) 4195 set_option (Opt_scrollTtyOutput, !state);
4183 SET_OPTION (Opt_scrollTtyOutput);
4184 else
4185 CLR_OPTION (Opt_scrollTtyOutput);
4186 break; 4196 break;
4187 case 1011: /* scroll to bottom on key press */ 4197 case 1011: /* scroll to bottom on key press */
4188 if (state) 4198 set_option (Opt_scrollTtyKeypress, state);
4189 SET_OPTION (Opt_scrollTtyKeypress);
4190 else
4191 CLR_OPTION (Opt_scrollTtyKeypress);
4192 break; 4199 break;
4193 case 1047: /* secondary screen w/ clearing last */ 4200 case 1047: /* secondary screen w/ clearing last */
4194 if (OPTION (Opt_secondaryScreen)) 4201 if (OPTION (Opt_secondaryScreen))
4195 if (current_screen != PRIMARY) 4202 if (current_screen != PRIMARY)
4196 scr_erase_screen (2); 4203 scr_erase_screen (2);
… …
4334 scr_color (Color_bg, Color_bg); 4341 scr_color (Color_bg, Color_bg);
4335 break; 4342 break;
4336 4343
4337 //case 50: // not variable spacing 4344 //case 50: // not variable spacing
4338 4345
4339#ifndef NO_BRIGHTCOLOR 4346#if ENABLE_FRILLS
4340 case 90: 4347 case 90:
4341 case 91: /* set bright fg color */ 4348 case 91: /* set bright fg color */
4342 case 92: 4349 case 92:
4343 case 93: 4350 case 93:
4344 case 94: 4351 case 94:
… …
4389 */ 4396 */
4390void 4397void
4391rxvt_term::tt_printf (const char *fmt,...) 4398rxvt_term::tt_printf (const char *fmt,...)
4392{ 4399{
4393 va_list arg_ptr; 4400 va_list arg_ptr;
4394 unsigned char buf[256]; 4401 char buf[256];
4395 4402
4396 va_start (arg_ptr, fmt); 4403 va_start (arg_ptr, fmt);
4397 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4404 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4398 va_end (arg_ptr); 4405 va_end (arg_ptr);
4399 tt_write (buf, strlen (buf)); 4406 tt_write (buf, strlen (buf));
… …
4404 * or generated by us in response to a query ESC sequence. 4411 * or generated by us in response to a query ESC sequence.
4405 */ 4412 */
4406const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4413const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4407 4414
4408void 4415void
4409rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4416rxvt_term::tt_write (const char *data, unsigned int len)
4410{ 4417{
4418 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4419 return;
4420
4421 if (pty->pty < 0)
4422 return;
4423
4411 if (v_buflen == 0) 4424 if (v_buflen == 0)
4412 { 4425 {
4413 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4426 ssize_t written = write (pty->pty, data, min (len, MAX_PTY_WRITE));
4414 4427
4415 if ((unsigned int)written == len) 4428 if ((unsigned int)written == len)
4416 return; 4429 return;
4417 4430
4418 data += written; 4431 data += written;
4419 len -= written; 4432 len -= written;
4420 } 4433 }
4421 4434
4422 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4435 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4423 4436
4424 memcpy (v_buffer + v_buflen, data, len); 4437 memcpy (v_buffer + v_buflen, data, len);
4425 v_buflen += len; 4438 v_buflen += len;
4426 4439
4427 pty_ev.set (EVENT_READ | EVENT_WRITE); 4440 pty_ev.set (EVENT_READ | EVENT_WRITE);
4428} 4441}
4429 4442
4430void rxvt_term::pty_write () 4443void rxvt_term::pty_write ()
4431{ 4444{
4432 int written = write (pty.pty, v_buffer, min (v_buflen, MAX_PTY_WRITE)); 4445 int written = write (pty->pty, v_buffer, min (v_buflen, MAX_PTY_WRITE));
4433 4446
4434 if (written > 0) 4447 if (written > 0)
4435 { 4448 {
4436 v_buflen -= written; 4449 v_buflen -= written;
4437 4450

Diff Legend

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