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.222 by root, Sat Dec 31 19:35:56 2005 UTC vs.
Revision 1.259 by root, Fri Jan 13 04:59:04 2006 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
43 * along with this program; if not, write to the Free Software 43 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 45 *----------------------------------------------------------------------*/
46 46
47/*{{{ includes: */ 47/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 48#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h"
50#include "rxvtperl.h"
50#include "version.h" 51#include "version.h"
51#include "command.h" 52#include "command.h"
53
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
52 58
53#ifdef KEYSYM_RESOURCE 59#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 60# include "keyboard.h"
55#endif 61#endif
56 62
… …
262 mb[0] = ch[0]; 268 mb[0] = ch[0];
263 len = 1; 269 len = 1;
264 } 270 }
265 271
266 if (len > 0) 272 if (len > 0)
267 tt_write ((unsigned char *)mb, len); 273 tt_write (mb, len);
268 else 274 else
269 scr_bell (); 275 scr_bell ();
270 } 276 }
271 277
272 iso14755buf = 0; 278 iso14755buf = 0;
… …
300 KeySym keysym; 306 KeySym keysym;
301#ifdef DEBUG_CMD 307#ifdef DEBUG_CMD
302 static int debug_key = 1; /* accessible by a debugger only */ 308 static int debug_key = 1; /* accessible by a debugger only */
303#endif 309#endif
304 int valid_keysym; 310 int valid_keysym;
305 unsigned char kbuf[KBUFSZ]; 311 char kbuf[KBUFSZ];
306 312
307 /* 313 /*
308 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an 314 * use Num_Lock to toggle Keypad on/off. If Num_Lock is off, allow an
309 * escape sequence to toggle the Keypad. 315 * escape sequence to toggle the Keypad.
310 * 316 *
… …
328 Status status_return; 334 Status status_return;
329 335
330#if 0 336#if 0
331#ifdef X_HAVE_UTF8_STRING 337#ifdef X_HAVE_UTF8_STRING
332 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful 338 if (enc_utf8 && 0) // currently disabled, doesn't seem to work, nor is useful
333 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 339 len = Xutf8LookupString (Input_Context, &ev, kbuf,
334 KBUFSZ, &keysym, &status_return); 340 KBUFSZ, &keysym, &status_return);
335 else 341 else
336#endif 342#endif
337#endif 343#endif
338 { 344 {
… …
375 || status_return == XLookupBoth; 381 || status_return == XLookupBoth;
376 } 382 }
377 else 383 else
378#endif 384#endif
379 { 385 {
380 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 386 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
381 valid_keysym = keysym != NoSymbol; 387 valid_keysym = keysym != NoSymbol;
382 } 388 }
383 389
384 if (valid_keysym) 390 if (valid_keysym)
385 { 391 {
… …
849 { 855 {
850#ifdef META8_OPTION 856#ifdef META8_OPTION
851 /* set 8-bit on */ 857 /* set 8-bit on */
852 if (meta && (meta_char == 0x80)) 858 if (meta && (meta_char == 0x80))
853 { 859 {
854 unsigned char *ch; 860 char *ch;
855 861
856 for (ch = kbuf; ch < kbuf + len; ch++) 862 for (ch = kbuf; ch < kbuf + len; ch++)
857 *ch |= 0x80; 863 *ch |= 0x80;
858 864
859 meta = 0; 865 meta = 0;
860 } 866 }
861#endif 867#endif
862 /* nil */ ; 868 /* nil */ ;
863 } 869 }
864 } 870 }
871
872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
873 return;
865 874
866 if (len <= 0) 875 if (len <= 0)
867 return; /* not mapped */ 876 return; /* not mapped */
868 877
869 if (OPTION (Opt_scrollTtyKeypress)) 878 if (OPTION (Opt_scrollTtyKeypress))
… …
892#ifdef META8_OPTION 901#ifdef META8_OPTION
893 && meta_char == C0_ESC 902 && meta_char == C0_ESC
894#endif 903#endif
895 ) 904 )
896 { 905 {
897 const unsigned char ch = C0_ESC; 906 const char ch = C0_ESC;
898 tt_write (&ch, 1); 907 tt_write (&ch, 1);
899 } 908 }
900 909
901#if defined(DEBUG_CMD) 910#if defined(DEBUG_CMD)
902 /* Display keyboard buffer contents */ 911 /* Display keyboard buffer contents */
… …
914 923
915#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
916/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
917/* attempt to `write' count to the input buffer */ 926/* attempt to `write' count to the input buffer */
918unsigned int 927unsigned int
919rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 928rxvt_term::cmd_write (const char *str, unsigned int count)
920{ 929{
921 unsigned int n, s; 930 unsigned int n, s;
922 931
923 n = cmdbuf_ptr - cmdbuf_base; 932 n = cmdbuf_ptr - cmdbuf_base;
924 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 933 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
961 } 970 }
962#endif 971#endif
963 972
964 if (want_refresh) 973 if (want_refresh)
965 { 974 {
975 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976 {
977 int row = -view_start;
978 int end_row = row + nrow;
979
980 while (row > -nsaved && ROW (row - 1).is_longer ())
981 --row;
982
983 do
984 {
985 int start_row = row;
986 line_t *l;
987
988 do
989 {
990 l = &ROW (row++);
991
992 if (!(l->f & LINE_FILTERED))
993 {
994 // line not filtered, mark it as filtered
995 l->f |= LINE_FILTERED;
996 while (l->is_longer ())
997 {
998 l = &ROW (row++);
999 l->f |= LINE_FILTERED;
1000 }
1001
1002 // and filter it
1003 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1004
1005 break;
1006 }
1007 }
1008 while (l->is_longer () && row < end_row);
1009 }
1010 while (row < end_row);
1011 }
1012
966 scr_refresh (refresh_type); 1013 scr_refresh (refresh_type);
967 scrollbar_show (1); 1014 scrollbar_show (1);
968#ifdef USE_XIM 1015#ifdef USE_XIM
969 IMSendSpot (); 1016 IMSendSpot ();
970#endif 1017#endif
… …
980 SET_LOCALE (locale); 1027 SET_LOCALE (locale);
981 1028
982 display->flush (); 1029 display->flush ();
983 1030
984 if (want_refresh && !flush_ev.active) 1031 if (want_refresh && !flush_ev.active)
985 flush_ev.start (NOW + 0.01); 1032 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
986} 1033}
987 1034
988void 1035void
989rxvt_term::flush_cb (time_watcher &w) 1036rxvt_term::flush_cb (time_watcher &w)
990{ 1037{
… …
1065 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1112 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1066 } 1113 }
1067} 1114}
1068#endif 1115#endif
1069 1116
1117#if HAVE_SCHED_YIELD
1118static struct event_handler
1119{
1120 check_watcher cw_yield;
1121
1122 void yield (check_watcher &w)
1123 {
1124 sched_yield ();
1125 w.stop ();
1126 }
1127
1128 event_handler ()
1129 : cw_yield (this, &event_handler::yield)
1130 {
1131 }
1132} event_handler;
1133#endif
1134
1070bool 1135bool
1071rxvt_term::pty_fill () 1136rxvt_term::pty_fill ()
1072{ 1137{
1073 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1138 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1074 1139
1075 if (CBUFSIZ == n) 1140 if (CBUFSIZ == n)
1076 { 1141 {
1077 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1142 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1078 n = 0; 1143 n = 0;
1079 } 1144 }
1080 1145
1081 memmove (cmdbuf_base, cmdbuf_ptr, n); 1146 memmove (cmdbuf_base, cmdbuf_ptr, n);
1082 cmdbuf_ptr = cmdbuf_base; 1147 cmdbuf_ptr = cmdbuf_base;
1083 cmdbuf_endp = cmdbuf_ptr + n; 1148 cmdbuf_endp = cmdbuf_ptr + n;
1084 1149
1085 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1150 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
1086 1151
1087 if (n > 0) 1152 if (r > 0)
1088 { 1153 {
1089 cmdbuf_endp += n; 1154 cmdbuf_endp += r;
1090 return true; 1155 return true;
1091 } 1156 }
1092 else if ((n < 0 && errno != EAGAIN && errno != EINTR) || n == 0) 1157 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1158 {
1159#if HAVE_SCHED_YIELD
1160 if (display->is_local)
1161 event_handler.cw_yield.start ();
1162#endif
1163 }
1164 else
1093 { 1165 {
1094 pty_ev.stop (); 1166 pty_ev.stop ();
1095 1167
1096 if (!OPTION (Opt_hold)) 1168 if (!OPTION (Opt_hold))
1097 destroy (); 1169 destroy ();
… …
1132 1204
1133#ifdef POINTER_BLANK 1205#ifdef POINTER_BLANK
1134void 1206void
1135rxvt_term::pointer_blank () 1207rxvt_term::pointer_blank ()
1136{ 1208{
1137 if (! OPTION (Opt_pointerBlank)) 1209 if (!OPTION (Opt_pointerBlank))
1138 return; 1210 return;
1139 1211
1140 XDefineCursor (display->display, vt, display->blank_cursor); 1212 XDefineCursor (display->display, vt, display->blank_cursor);
1141 XFlush (display->display); 1213 XFlush (display->display);
1142 1214
… …
1239 dDisp; 1311 dDisp;
1240 1312
1241 SET_R (this); 1313 SET_R (this);
1242 SET_LOCALE (locale); 1314 SET_LOCALE (locale);
1243 1315
1244#if defined(CURSOR_BLINK) 1316 if (ev.xany.window == vt
1245 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1317 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1246 { 1318 return;
1247 if (hidden_cursor)
1248 {
1249 hidden_cursor = 0;
1250 want_refresh = 1;
1251 }
1252
1253 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1254 }
1255#endif
1256
1257#if defined(POINTER_BLANK)
1258 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1259 {
1260 if (ev.type == MotionNotify
1261 || ev.type == ButtonPress
1262 || ev.type == ButtonRelease)
1263 if (hidden_pointer)
1264 pointer_unblank ();
1265
1266 if (ev.type == KeyPress && hidden_pointer == 0)
1267 pointer_blank ();
1268 }
1269#endif
1270 1319
1271 Window unused_root, unused_child; 1320 Window unused_root, unused_child;
1272 int unused_root_x, unused_root_y; 1321 int unused_root_x, unused_root_y;
1273 unsigned int unused_mask; 1322 unsigned int unused_mask;
1274 1323
… …
1282 1331
1283 break; 1332 break;
1284 1333
1285 case KeyRelease: 1334 case KeyRelease:
1286 { 1335 {
1287#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1336#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1288 KeySym ks; 1337 KeySym keysym;
1289 1338
1290 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1339 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1291#endif 1340#endif
1292 1341
1293#if ENABLE_FRILLS || ISO_14755 1342#if ENABLE_FRILLS || ISO_14755
1294 // ISO 14755 support 1343 // ISO 14755 support
1295 if (iso14755buf) 1344 if (iso14755buf)
… …
1300# endif 1349# endif
1301# if ISO_14755 1350# if ISO_14755
1302 // iso14755 part 5.2 handling: release time 1351 // iso14755 part 5.2 handling: release time
1303 // first: controls 1352 // first: controls
1304 if ((ev.xkey.state & ControlMask) 1353 if ((ev.xkey.state & ControlMask)
1305 && ((ks >= 0x40 && ks <= 0x5f) 1354 && ((keysym >= 0x40 && keysym <= 0x5f)
1306 || (ks >= 0x61 && ks <= 0x7f))) 1355 || (keysym >= 0x61 && keysym <= 0x7f)))
1307 { 1356 {
1308 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1357 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1309 commit_iso14755 (); 1358 commit_iso14755 ();
1310 return; // case-break; 1359 goto skip_switch;
1311 } 1360 }
1312 1361
1313 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1362 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1314 if (i[0] == ks) 1363 if (i[0] == keysym)
1315 { 1364 {
1316 iso14755buf = ISO_14755_51 | i[1]; 1365 iso14755buf = ISO_14755_51 | i[1];
1317 commit_iso14755 (); 1366 commit_iso14755 ();
1318 return; // case-break; 1367 goto skip_switch;
1319 } 1368 }
1320 1369
1321 scr_bell (); 1370 scr_bell ();
1322# endif 1371# endif
1323 iso14755buf = 0; 1372 iso14755buf = 0;
… …
1342 else 1391 else
1343 iso14755buf = 0; 1392 iso14755buf = 0;
1344 } 1393 }
1345#endif 1394#endif
1346 1395
1396 if (ev.xany.window == vt
1397 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1398 break;
1399
1347#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1400#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1348 if (!(ev.xkey.state & ControlMask)) 1401 if (!(ev.xkey.state & ControlMask))
1349 slip_wheel_ev.stop (); 1402 slip_wheel_ev.stop ();
1350 else if (ks == XK_Control_L || ks == XK_Control_R) 1403 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1351 mouse_slip_wheel_speed = 0; 1404 mouse_slip_wheel_speed = 0;
1352#endif 1405#endif
1353 break; 1406 break;
1354 } 1407 }
1355 1408
… …
1485 1538
1486 case SelectionRequest: 1539 case SelectionRequest:
1487 selection_send (ev.xselectionrequest); 1540 selection_send (ev.xselectionrequest);
1488 break; 1541 break;
1489 1542
1543 case MapNotify:
1544 mapped = 1;
1545#ifdef TEXT_BLINK
1546 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1547#endif
1548 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1549 break;
1550
1490 case UnmapNotify: 1551 case UnmapNotify:
1491 mapped = 0; 1552 mapped = 0;
1492#ifdef TEXT_BLINK 1553#ifdef TEXT_BLINK
1493 text_blink_ev.stop (); 1554 text_blink_ev.stop ();
1494#endif 1555#endif
1495 break; 1556 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1496
1497 case MapNotify:
1498 mapped = 1;
1499#ifdef TEXT_BLINK
1500 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1501#endif
1502 break; 1557 break;
1503 1558
1504#ifdef TRANSPARENT 1559#ifdef TRANSPARENT
1505 case ReparentNotify: 1560 case ReparentNotify:
1506 rootwin_cb (ev); 1561 rootwin_cb (ev);
… …
1520 1575
1521 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1576 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1522 scr_expose (ev.xexpose.x, ev.xexpose.y, 1577 scr_expose (ev.xexpose.x, ev.xexpose.y,
1523 ev.xexpose.width, ev.xexpose.height, False); 1578 ev.xexpose.width, ev.xexpose.height, False);
1524 1579
1525 scr_refresh (refresh_type); 1580 want_refresh = 1;
1526 } 1581 }
1527 else 1582 else
1528 { 1583 {
1529 XEvent unused_event; 1584 XEvent unused_event;
1530 1585
… …
1549#endif 1604#endif
1550 } 1605 }
1551 break; 1606 break;
1552 1607
1553 case MotionNotify: 1608 case MotionNotify:
1609 printf ("motion notify\n");//D
1554#ifdef POINTER_BLANK 1610#ifdef POINTER_BLANK
1555 if (hidden_pointer) 1611 if (hidden_pointer)
1556 pointer_unblank (); 1612 pointer_unblank ();
1557#endif 1613#endif
1558#if MENUBAR 1614#if MENUBAR
… …
1565 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1621 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1566 break; 1622 break;
1567 1623
1568 if (ev.xany.window == vt) 1624 if (ev.xany.window == vt)
1569 { 1625 {
1626 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1627 ; // nop
1570 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1628 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1571 { 1629 {
1572 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1630 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1573 ; 1631 ;
1574 1632
1575 XQueryPointer (disp, vt, 1633 XQueryPointer (disp, vt,
… …
1655 &unused_root_x, &unused_root_y, 1713 &unused_root_x, &unused_root_y,
1656 &ev.xbutton.x, &ev.xbutton.y, 1714 &ev.xbutton.x, &ev.xbutton.y,
1657 &unused_mask); 1715 &unused_mask);
1658 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1716 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1659 scrollbar_size ()); 1717 scrollbar_size ());
1660 scr_refresh (refresh_type); 1718 want_refresh = 1;
1661 refresh_limit = 0; 1719 refresh_limit = 0;
1662 scrollbar_show (1); 1720 scrollbar_show (1);
1663 } 1721 }
1664 break; 1722 break;
1665 } 1723 }
1724
1725skip_switch: ;
1726
1727#if defined(CURSOR_BLINK)
1728 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1729 {
1730 if (hidden_cursor)
1731 {
1732 hidden_cursor = 0;
1733 want_refresh = 1;
1734 }
1735
1736 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1737 }
1738#endif
1739
1740#if defined(POINTER_BLANK)
1741 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1742 {
1743 if (ev.type == MotionNotify
1744 || ev.type == ButtonPress
1745 || ev.type == ButtonRelease)
1746 if (hidden_pointer)
1747 pointer_unblank ();
1748
1749 if (ev.type == KeyPress && hidden_pointer == 0)
1750 pointer_blank ();
1751 }
1752#endif
1666} 1753}
1667 1754
1668void 1755void
1669rxvt_term::focus_in () 1756rxvt_term::focus_in ()
1670{ 1757{
1671 if (!focus) 1758 if (!focus)
1672 { 1759 {
1673 focus = 1; 1760 focus = 1;
1674 want_refresh = 1; 1761 want_refresh = 1;
1762
1763 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1764
1675#if USE_XIM 1765#if USE_XIM
1676 if (Input_Context != NULL) 1766 if (Input_Context != NULL)
1677 { 1767 {
1678 IMSetStatusPosition (); 1768 IMSetStatusPosition ();
1679 XSetICFocus (Input_Context); 1769 XSetICFocus (Input_Context);
… …
1699 if (focus) 1789 if (focus)
1700 { 1790 {
1701 focus = 0; 1791 focus = 0;
1702 want_refresh = 1; 1792 want_refresh = 1;
1703 1793
1794 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1795
1704#if ENABLE_FRILLS || ISO_14755 1796#if ENABLE_FRILLS || ISO_14755
1797 if (iso14755buf)
1798 {
1705 iso14755buf = 0; 1799 iso14755buf = 0;
1706#endif
1707#if ENABLE_OVERLAY 1800# if ENABLE_OVERLAY
1708 scr_overlay_off (); 1801 scr_overlay_off ();
1802# endif
1803 }
1709#endif 1804#endif
1710#if USE_XIM 1805#if USE_XIM
1711 if (Input_Context != NULL) 1806 if (Input_Context != NULL)
1712 XUnsetICFocus (Input_Context); 1807 XUnsetICFocus (Input_Context);
1713#endif 1808#endif
… …
1757rxvt_term::button_press (XButtonEvent &ev) 1852rxvt_term::button_press (XButtonEvent &ev)
1758{ 1853{
1759 int reportmode = 0, clickintime; 1854 int reportmode = 0, clickintime;
1760 1855
1761 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1856 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1857
1762 if (!bypass_keystate) 1858 if (!bypass_keystate)
1763 reportmode = !! (priv_modes & PrivMode_mouse_report); 1859 reportmode = !! (priv_modes & PrivMode_mouse_report);
1764 1860
1765 /* 1861 /*
1766 * VT window processing of button press 1862 * VT window processing of button press
… …
1786#ifdef MOUSE_REPORT_DOUBLECLICK 1882#ifdef MOUSE_REPORT_DOUBLECLICK
1787 if (ev.button == MEvent.button && clickintime) 1883 if (ev.button == MEvent.button && clickintime)
1788 { 1884 {
1789 /* same button, within alloted time */ 1885 /* same button, within alloted time */
1790 MEvent.clicks++; 1886 MEvent.clicks++;
1887
1791 if (MEvent.clicks > 1) 1888 if (MEvent.clicks > 1)
1792 { 1889 {
1793 /* only report double clicks */ 1890 /* only report double clicks */
1794 MEvent.clicks = 2; 1891 MEvent.clicks = 2;
1795 mouse_report (ev); 1892 mouse_report (ev);
… …
1815 else 1912 else
1816 { 1913 {
1817 if (ev.button != MEvent.button) 1914 if (ev.button != MEvent.button)
1818 MEvent.clicks = 0; 1915 MEvent.clicks = 0;
1819 1916
1917 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1820 switch (ev.button) 1918 switch (ev.button)
1821 { 1919 {
1822 case Button1: 1920 case Button1:
1823 /* allow meta + click to select rectangular areas */ 1921 /* allow meta + click to select rectangular areas */
1824 /* should be done in screen.C */ 1922 /* should be done in screen.C */
1825#if ENABLE_FRILLS 1923#if ENABLE_FRILLS
1826 selection.rect = !!(ev.state & ModMetaMask); 1924 selection.rect = !!(ev.state & ModMetaMask);
1827#else 1925#else
1828 selection.rect = false; 1926 selection.rect = false;
1829#endif 1927#endif
1830 1928
1831 /* allow shift+left click to extend selection */ 1929 /* allow shift+left click to extend selection */
1832 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1930 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1833 { 1931 {
1834 if (MEvent.button == Button1 && clickintime) 1932 if (MEvent.button == Button1 && clickintime)
1835 selection_rotate (ev.x, ev.y); 1933 selection_rotate (ev.x, ev.y);
1836 else 1934 else
1837 selection_extend (ev.x, ev.y, 1); 1935 selection_extend (ev.x, ev.y, 1);
1838 } 1936 }
1839 else 1937 else
1840 { 1938 {
1841 if (MEvent.button == Button1 && clickintime) 1939 if (MEvent.button == Button1 && clickintime)
1842 MEvent.clicks++; 1940 MEvent.clicks++;
1843 else 1941 else
1844 MEvent.clicks = 1; 1942 MEvent.clicks = 1;
1845 1943
1846 selection_click (MEvent.clicks, ev.x, ev.y); 1944 selection_click (MEvent.clicks, ev.x, ev.y);
1847 } 1945 }
1848 1946
1849 MEvent.button = Button1; 1947 MEvent.button = Button1;
1850 break; 1948 break;
1851 1949
1852 case Button3: 1950 case Button3:
1853 if (MEvent.button == Button3 && clickintime) 1951 if (MEvent.button == Button3 && clickintime)
1854 selection_rotate (ev.x, ev.y); 1952 selection_rotate (ev.x, ev.y);
1855 else 1953 else
1856 selection_extend (ev.x, ev.y, 1); 1954 selection_extend (ev.x, ev.y, 1);
1857 1955
1858 MEvent.button = Button3; 1956 MEvent.button = Button3;
1859 break; 1957 break;
1860 } 1958 }
1861 } 1959 }
1862 1960
1863 MEvent.time = ev.time; 1961 MEvent.time = ev.time;
1864 return; 1962 return;
1865 } 1963 }
1866 1964
… …
2002 } 2100 }
2003 2101
2004 break; 2102 break;
2005 } 2103 }
2006 } 2104 }
2105
2007 return; 2106 return;
2008 } 2107 }
2108
2009#if MENUBAR 2109#if MENUBAR
2010 /* 2110 /*
2011 * Menubar window processing of button press 2111 * Menubar window processing of button press
2012 */ 2112 */
2013 if (isMenuBarWindow (ev.window)) 2113 if (isMenuBarWindow (ev.window))
… …
2076 if (priv_modes & PrivMode_mouse_report 2176 if (priv_modes & PrivMode_mouse_report
2077 && bypass_keystate 2177 && bypass_keystate
2078 && ev.button == Button1 && MEvent.clicks <= 1) 2178 && ev.button == Button1 && MEvent.clicks <= 1)
2079 selection_extend (ev.x, ev.y, 0); 2179 selection_extend (ev.x, ev.y, 0);
2080 2180
2181 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2182 return;
2183
2081 switch (ev.button) 2184 switch (ev.button)
2082 { 2185 {
2083 case Button1: 2186 case Button1:
2084 case Button3: 2187 case Button3:
2085 selection_make (ev.time); 2188 selection_make (ev.time);
… …
2116 slip_wheel_ev.start (); 2219 slip_wheel_ev.start ();
2117 } 2220 }
2118 else 2221 else
2119 { 2222 {
2120# endif 2223# endif
2121# ifdef JUMP_MOUSE_WHEEL
2122 scr_page (v, i); 2224 scr_page (v, i);
2123 scr_refresh (SMOOTH_REFRESH);
2124 scrollbar_show (1); 2225 scrollbar_show (1);
2125# else
2126 while (i--)
2127 {
2128 scr_page (v, 1);
2129 scr_refresh (SMOOTH_REFRESH);
2130 scrollbar_show (1);
2131 }
2132# endif
2133# ifdef MOUSE_SLIP_WHEELING 2226# ifdef MOUSE_SLIP_WHEELING
2134 } 2227 }
2135#endif 2228# endif
2136 } 2229 }
2137 break; 2230 break;
2138#endif 2231#endif
2139 } 2232 }
2140 } 2233 }
… …
2629 2722
2630bool 2723bool
2631rxvt_term::cmd_parse () 2724rxvt_term::cmd_parse ()
2632{ 2725{
2633 bool flag = false; 2726 bool flag = false;
2634 unicode_t ch = NOCHAR; 2727 wchar_t ch = NOCHAR;
2635 unsigned char *seq_begin; // remember start of esc-sequence here 2728 char *seq_begin; // remember start of esc-sequence here
2636 2729
2637 for (;;) 2730 for (;;)
2638 { 2731 {
2639 if (ch == NOCHAR) 2732 if (ch == NOCHAR)
2640 { 2733 {
2641 seq_begin = cmdbuf_ptr; 2734 seq_begin = cmdbuf_ptr;
2642 ch = next_char (); 2735 ch = next_char ();
2643 }
2644 2736
2645 if (ch == NOCHAR) // TODO: improve 2737 if (ch == NOCHAR)
2646 break; 2738 break;
2739 }
2647 2740
2648 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2741 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2649 { 2742 {
2650 if (!seen_input) 2743 if (!seen_input)
2651 { 2744 {
… …
2660 if (seen_resize && cmd_pid) 2753 if (seen_resize && cmd_pid)
2661 kill (-cmd_pid, SIGWINCH); 2754 kill (-cmd_pid, SIGWINCH);
2662 } 2755 }
2663 2756
2664 /* Read a text string from the input buffer */ 2757 /* Read a text string from the input buffer */
2665 unicode_t buf[UBUFSIZ]; 2758 wchar_t buf[UBUFSIZ];
2666 bool refreshnow = false; 2759 bool refreshnow = false;
2667 int nlines = 0; 2760 int nlines = 0;
2668 unicode_t *str = buf; 2761 wchar_t *str = buf;
2669 unicode_t *eol = str + min (ncol, UBUFSIZ); 2762 wchar_t *eol = str + min (ncol, UBUFSIZ);
2670 2763
2671 for (;;) 2764 for (;;)
2672 { 2765 {
2673 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2766 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2674 break; 2767 break;
… …
2684 2777
2685 if (!OPTION (Opt_jumpScroll) 2778 if (!OPTION (Opt_jumpScroll)
2686 || (refresh_count >= refresh_limit * (nrow - 1))) 2779 || (refresh_count >= refresh_limit * (nrow - 1)))
2687 { 2780 {
2688 refreshnow = true; 2781 refreshnow = true;
2782 refresh_count = 0;
2689 ch = NOCHAR; 2783 ch = NOCHAR;
2690 break; 2784 break;
2691 } 2785 }
2692 2786
2693 // scr_add_lines only works for nlines <= nrow - 1. 2787 // scr_add_lines only works for nlines <= nrow - 1.
2694 if (nlines >= nrow - 1) 2788 if (nlines >= nrow - 1)
2695 { 2789 {
2790 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2696 scr_add_lines (buf, nlines, str - buf); 2791 scr_add_lines (buf, str - buf, nlines);
2792
2697 nlines = 0; 2793 nlines = 0;
2698 str = buf; 2794 str = buf;
2699 eol = str + min (ncol, UBUFSIZ); 2795 eol = str + min (ncol, UBUFSIZ);
2700 } 2796 }
2701 2797
… …
2714 2810
2715 seq_begin = cmdbuf_ptr; 2811 seq_begin = cmdbuf_ptr;
2716 ch = next_char (); 2812 ch = next_char ();
2717 } 2813 }
2718 2814
2815 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2719 scr_add_lines (buf, nlines, str - buf); 2816 scr_add_lines (buf, str - buf, nlines);
2720 2817
2721 /* 2818 /*
2722 * If there have been a lot of new lines, then update the screen 2819 * If there have been a lot of new lines, then update the screen
2723 * What the heck I'll cheat and only refresh less than every page-full. 2820 * What the heck I'll cheat and only refresh less than every page-full.
2724 * the number of pages between refreshes is refresh_limit, which 2821 * the number of pages between refreshes is refresh_limit, which
… …
2730 refresh_limit++; 2827 refresh_limit++;
2731 else 2828 else
2732 { 2829 {
2733 flag = true; 2830 flag = true;
2734 scr_refresh (refresh_type); 2831 scr_refresh (refresh_type);
2832 want_refresh = 1;
2735 } 2833 }
2736 } 2834 }
2737 2835
2738 } 2836 }
2739 else 2837 else
… …
2754 } 2852 }
2755 2853
2756 return flag; 2854 return flag;
2757} 2855}
2758 2856
2759// read the next octet
2760unicode_t
2761rxvt_term::next_octet ()
2762{
2763 return cmdbuf_ptr < cmdbuf_endp
2764 ? *cmdbuf_ptr++
2765 : NOCHAR;
2766}
2767
2768// read the next character 2857// read the next character
2769unicode_t 2858wchar_t
2770rxvt_term::next_char () 2859rxvt_term::next_char ()
2771{ 2860{
2772 while (cmdbuf_ptr < cmdbuf_endp) 2861 while (cmdbuf_ptr < cmdbuf_endp)
2773 { 2862 {
2774 // assume 7-bit to be ascii ALWAYS 2863 // assume 7-bit to be ascii ALWAYS
2775 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2864 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2776 return *cmdbuf_ptr++; 2865 return *cmdbuf_ptr++;
2777 2866
2778 wchar_t wc; 2867 wchar_t wc;
2779 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2868 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2780 2869
2781 if (len == (size_t)-2) 2870 if (len == (size_t)-2)
2782 { 2871 {
2783 // the mbstate stores incomplete sequences. didn't know this :/ 2872 // the mbstate stores incomplete sequences. didn't know this :/
2784 cmdbuf_ptr = cmdbuf_endp; 2873 cmdbuf_ptr = cmdbuf_endp;
2785 break; 2874 break;
2786 } 2875 }
2787 2876
2788 if (len == (size_t)-1) 2877 if (len == (size_t)-1)
2789 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2878 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2790 2879
2791 // assume wchar == unicode 2880 // assume wchar == unicode
2792 cmdbuf_ptr += len; 2881 cmdbuf_ptr += len;
2793 return wc & UNICODE_MASK; 2882 return wc & UNICODE_MASK;
2794 } 2883 }
2795 2884
2796 return NOCHAR; 2885 return NOCHAR;
2886}
2887
2888// read the next octet
2889uint32_t
2890rxvt_term::next_octet ()
2891{
2892 return cmdbuf_ptr < cmdbuf_endp
2893 ? (unsigned char)*cmdbuf_ptr++
2894 : NOCHAR;
2797} 2895}
2798 2896
2799/* rxvt_cmd_getc () - Return next input character */ 2897/* rxvt_cmd_getc () - Return next input character */
2800/* 2898/*
2801 * Return the next input character after first passing any keyboard input 2899 * Return the next input character after first passing any keyboard input
2802 * to the command. 2900 * to the command.
2803 */ 2901 */
2804unicode_t 2902wchar_t
2805rxvt_term::cmd_getc () 2903rxvt_term::cmd_getc ()
2806{ 2904{
2807 unicode_t c = next_char (); 2905 wchar_t c = next_char ();
2808 2906
2809 if (c == NOCHAR) 2907 if (c == NOCHAR)
2810 throw out_of_input; 2908 throw out_of_input;
2811 2909
2812 return c; 2910 return c;
2813} 2911}
2814 2912
2815unicode_t 2913uint32_t
2816rxvt_term::cmd_get8 () 2914rxvt_term::cmd_get8 ()
2817{ 2915{
2818 unicode_t c = next_octet (); 2916 uint32_t c = next_octet ();
2819 2917
2820 if (c == NOCHAR) 2918 if (c == NOCHAR)
2821 throw out_of_input; 2919 throw out_of_input;
2822 2920
2823 return c; 2921 return c;
… …
2923 case C0_ESC: 3021 case C0_ESC:
2924 process_escape_seq (); 3022 process_escape_seq ();
2925 break; 3023 break;
2926 case C0_ENQ: /* terminal Status */ 3024 case C0_ENQ: /* terminal Status */
2927 if (rs[Rs_answerbackstring]) 3025 if (rs[Rs_answerbackstring])
2928 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3026 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2929 (unsigned int)strlen (rs[Rs_answerbackstring]));
2930 else 3027 else
2931 tt_write ((unsigned char *)VT100_ANS, 3028 tt_write (VT100_ANS, strlen (VT100_ANS));
2932 (unsigned int)strlen (VT100_ANS));
2933 break; 3029 break;
2934 case C0_BEL: /* bell */ 3030 case C0_BEL: /* bell */
2935 scr_bell (); 3031 scr_bell ();
2936 break; 3032 break;
2937 case C0_BS: /* backspace */ 3033 case C0_BS: /* backspace */
… …
3092 break; 3188 break;
3093 3189
3094 /* 8.3.87: NEXT LINE */ 3190 /* 8.3.87: NEXT LINE */
3095 case C1_NEL: /* ESC E */ 3191 case C1_NEL: /* ESC E */
3096 { 3192 {
3097 unicode_t nlcr[] = { C0_LF, C0_CR }; 3193 wchar_t nlcr[] = { C0_LF, C0_CR };
3098 scr_add_lines (nlcr, 1, 2); 3194 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3099 } 3195 }
3100 break; 3196 break;
3101 3197
3102 /* kidnapped escape sequence: Should be 8.3.48 */ 3198 /* kidnapped escape sequence: Should be 8.3.48 */
3103 case C1_ESA: /* ESC G */ 3199 case C1_ESA: /* ESC G */
… …
3125 process_dcs_seq (); 3221 process_dcs_seq ();
3126 break; 3222 break;
3127 3223
3128 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3224 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3129 case C1_SCI: /* ESC Z */ 3225 case C1_SCI: /* ESC Z */
3130 tt_write ((const unsigned char *)ESCZ_ANSWER, 3226 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3131 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3132 break; /* steal obsolete ESC [ c */ 3227 break; /* steal obsolete ESC [ c */
3133 3228
3134 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3229 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3135 case C1_CSI: /* ESC [ */ 3230 case C1_CSI: /* ESC [ */
3136 process_csi_seq (); 3231 process_csi_seq ();
… …
3380 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3475 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3381 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3476 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3382 break; 3477 break;
3383 3478
3384 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3479 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3385 tt_write ((const unsigned char *)VT100_ANS, 3480 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3386 (unsigned int) (sizeof (VT100_ANS) - 1));
3387 break; 3481 break;
3388 3482
3389 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3483 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3390 process_sgr_mode (nargs, arg); 3484 process_sgr_mode (nargs, arg);
3391 break; 3485 break;
… …
3593/*----------------------------------------------------------------------*/ 3687/*----------------------------------------------------------------------*/
3594/* 3688/*
3595 * get input up until STRING TERMINATOR (or BEL) 3689 * get input up until STRING TERMINATOR (or BEL)
3596 * ends_how is terminator used. returned input must be free()'d 3690 * ends_how is terminator used. returned input must be free()'d
3597 */ 3691 */
3598unsigned char * 3692char *
3599rxvt_term::get_to_st (unicode_t &ends_how) 3693rxvt_term::get_to_st (unicode_t &ends_how)
3600{ 3694{
3601 unicode_t ch; 3695 unicode_t ch;
3602 bool seen_esc = false; 3696 bool seen_esc = false;
3603 unsigned int n = 0; 3697 unsigned int n = 0;
… …
3636 3730
3637 string[n++] = '\0'; 3731 string[n++] = '\0';
3638 3732
3639 ends_how = (ch == 0x5c ? C0_ESC : ch); 3733 ends_how = (ch == 0x5c ? C0_ESC : ch);
3640 3734
3641 return (unsigned char *)rxvt_wcstombs (string); 3735 return rxvt_wcstombs (string);
3642} 3736}
3643 3737
3644/*----------------------------------------------------------------------*/ 3738/*----------------------------------------------------------------------*/
3645/* 3739/*
3646 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3740 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3647 */ 3741 */
3648void 3742void
3649rxvt_term::process_dcs_seq () 3743rxvt_term::process_dcs_seq ()
3650{ 3744{
3651 unsigned char *s; 3745 char *s;
3652 unicode_t eh; 3746 unicode_t eh;
3653 3747
3654 /* 3748 /*
3655 * Not handled yet 3749 * Not handled yet
3656 */ 3750 */
… …
3675 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3769 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3676 arg = arg * 10 + (ch - '0'); 3770 arg = arg * 10 + (ch - '0');
3677 3771
3678 if (ch == ';') 3772 if (ch == ';')
3679 { 3773 {
3680 unsigned char *s = get_to_st (eh); 3774 char *s = get_to_st (eh);
3681 3775
3682 if (s) 3776 if (s)
3683 { 3777 {
3684 process_xterm_seq (arg, (char *)s, eh); 3778 process_xterm_seq (arg, s, eh);
3685 free (s); 3779 free (s);
3686 } 3780 }
3687 } 3781 }
3688} 3782}
3689 3783
3690void 3784void
3691rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3785rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3692{ 3786{
3693 if (str[0] == '?' && !str[1]) 3787 if (str[0] == '?' && !str[1])
3694 { 3788 {
3695 unsigned short r, g, b; 3789 unsigned short r, g, b;
3696 pix_colors_focused[color].get (display, r, g, b); 3790 pix_colors_focused[color].get (display, r, g, b);
… …
3702 3796
3703/* 3797/*
3704 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3798 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3705 */ 3799 */
3706void 3800void
3707rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3801rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3708{ 3802{
3709 int changed = 0; 3803 int changed = 0;
3710 int color; 3804 int color;
3711 char *buf, *name; 3805 char *buf, *name;
3712 bool query = str[0] == '?' && !str[1]; 3806 bool query = str[0] == '?' && !str[1];
… …
3769 { 3863 {
3770 if ((name = strchr (buf, ';')) == NULL) 3864 if ((name = strchr (buf, ';')) == NULL)
3771 break; 3865 break;
3772 3866
3773 *name++ = '\0'; 3867 *name++ = '\0';
3774 color = atoi (buf); 3868 color = atoi (buf) + minCOLOR;
3775 3869
3776 if (color < 0 || color >= TOTAL_COLORS) 3870 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3777 break; 3871 break;
3778 3872
3779 if ((buf = strchr (name, ';')) != NULL) 3873 if ((buf = strchr (name, ';')) != NULL)
3780 *buf++ = '\0'; 3874 *buf++ = '\0';
3781 3875
3782 if (name[0] == '?' && !name[1]) 3876 if (name[0] == '?' && !name[1])
3783 { 3877 {
3784 unsigned short r, g, b; 3878 unsigned short r, g, b;
3785 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3879 pix_colors_focused[color].get (display, r, g, b);
3786 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3880 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3787 } 3881 }
3788 else 3882 else
3789 set_window_color (color + minCOLOR, name); 3883 set_window_color (color, name);
3790 } 3884 }
3791 break; 3885 break;
3792 case XTerm_Color00: 3886 case XTerm_Color00:
3793 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3887 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3794 break; 3888 break;
3795 case XTerm_Color01: 3889 case XTerm_Color01:
3796 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3890 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3797 break; 3891 break;
3798#ifndef NO_CURSORCOLOR 3892#ifndef NO_CURSORCOLOR
3799 case XTerm_Color_cursor: 3893 case XTerm_Color_cursor:
3800 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3894 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3801 break; 3895 break;
… …
3805 break; 3899 break;
3806 case XTerm_Color_pointer_bg: 3900 case XTerm_Color_pointer_bg:
3807 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3901 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3808 break; 3902 break;
3809#ifndef NO_BOLD_UNDERLINE_REVERSE 3903#ifndef NO_BOLD_UNDERLINE_REVERSE
3810 case XTerm_Color_BD:
3811 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3812 break;
3813 case XTerm_Color_UL:
3814 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3815 break;
3816 case XTerm_Color_RV: 3904 case XTerm_Color_RV:
3817 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3905 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3906 break;
3907 case Rxvt_Color_BD:
3908 case URxvt_Color_BD:
3909 process_color_seq (op, Color_BD, str, resp);
3910 break;
3911 case Rxvt_Color_UL:
3912 case URxvt_Color_UL:
3913 process_color_seq (op, Color_UL, str, resp);
3818 break; 3914 break;
3819 case URxvt_Color_IT: 3915 case URxvt_Color_IT:
3820 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3916 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3821 break; 3917 break;
3822#endif 3918#endif
… …
3827 if (am_transparent) 3923 if (am_transparent)
3828 want_full_refresh = want_refresh = 1; 3924 want_full_refresh = want_refresh = 1;
3829 break; 3925 break;
3830#endif 3926#endif
3831 3927
3832 case XTerm_Pixmap: 3928 case Rxvt_Pixmap:
3833 if (*str != ';') 3929 if (*str != ';')
3834 { 3930 {
3835#if XPM_BACKGROUND 3931#if XPM_BACKGROUND
3836 scale_pixmap (""); /* reset to default scaling */ 3932 scale_pixmap (""); /* reset to default scaling */
3837 set_bgPixmap (str); /* change pixmap */ 3933 set_bgPixmap (str); /* change pixmap */
3838#endif
3839 scr_touch (true); 3934 scr_touch (true);
3935#endif
3840 } 3936 }
3937
3841 while ((str = strchr (str, ';')) != NULL) 3938 while ((str = strchr (str, ';')) != NULL)
3842 { 3939 {
3843 str++; 3940 str++;
3844#if XPM_BACKGROUND 3941#if XPM_BACKGROUND
3845 changed += scale_pixmap (str); 3942 changed += scale_pixmap (str);
… …
3848 3945
3849 if (changed) 3946 if (changed)
3850 { 3947 {
3851#ifdef XPM_BACKGROUND 3948#ifdef XPM_BACKGROUND
3852 resize_pixmap (); 3949 resize_pixmap ();
3853#endif
3854 scr_touch (true); 3950 scr_touch (true);
3951#endif
3855 } 3952 }
3856 break; 3953 break;
3857 3954
3858 case XTerm_restoreFG: 3955 case Rxvt_restoreFG:
3859 set_window_color (Color_fg, str); 3956 set_window_color (Color_fg, str);
3860 break; 3957 break;
3861 case XTerm_restoreBG: 3958 case Rxvt_restoreBG:
3862 set_window_color (Color_bg, str); 3959 set_window_color (Color_bg, str);
3863 break; 3960 break;
3864 3961
3865 case XTerm_logfile: 3962 case XTerm_logfile:
3866 // TODO, when secure mode? 3963 // TODO, when secure mode?
… …
3871 if (OPTION (Opt_insecure)) 3968 if (OPTION (Opt_insecure))
3872 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3969 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3873 break; 3970 break;
3874#endif 3971#endif
3875#if 0 3972#if 0
3876 case XTerm_dumpscreen: /* no error notices */ 3973 case Rxvt_dumpscreen: /* no error notices */
3877 { 3974 {
3878 int fd; 3975 int fd;
3879 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3976 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3880 { 3977 {
3881 scr_dump (fd); 3978 scr_dump (fd);
… …
3919 } 4016 }
3920 break; 4017 break;
3921 4018
3922 case URxvt_view_up: 4019 case URxvt_view_up:
3923 case URxvt_view_down: 4020 case URxvt_view_down:
4021 {
3924 int lines = atoi (str); 4022 int lines = atoi (str);
3925 4023
3926 if (lines) 4024 if (lines)
3927 scr_page (op == URxvt_view_up ? UP : DN, lines); 4025 scr_page (op == URxvt_view_up ? UP : DN, lines);
3928 else 4026 else
3929 {
3930 scr_erase_savelines (); 4027 scr_erase_savelines ();
3931 } 4028 }
3932 4029
4030 break;
4031#endif
4032
4033#if ENABLE_PERL
4034 case URxvt_perl:
4035 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
4036 ; // no responses yet
3933 break; 4037 break;
3934#endif 4038#endif
3935 } 4039 }
3936} 4040}
3937/*----------------------------------------------------------------------*/ 4041/*----------------------------------------------------------------------*/
… …
4048 /* extra handling for values with state unkept */ 4152 /* extra handling for values with state unkept */
4049 switch (arg[i]) 4153 switch (arg[i])
4050 { 4154 {
4051#if ENABLE_STYLES 4155#if ENABLE_STYLES
4052 case 1021: 4156 case 1021:
4053 if (mode) 4157 set_option (Opt_intensityStyles, mode);
4054 SET_OPTION (Opt_intensityStyles);
4055 else
4056 CLR_OPTION (Opt_intensityStyles);
4057 4158
4058 want_refresh = 1; 4159 scr_touch (true);
4059 want_full_refresh = 1;
4060 break; 4160 break;
4061#endif 4161#endif
4062 case 1048: /* alternative cursor save */ 4162 case 1048: /* alternative cursor save */
4063 case 1049: 4163 case 1049:
4064 if (OPTION (Opt_secondaryScreen)) 4164 if (OPTION (Opt_secondaryScreen))
… …
4084 case 3: /* 80/132 */ 4184 case 3: /* 80/132 */
4085 if (priv_modes & PrivMode_132OK) 4185 if (priv_modes & PrivMode_132OK)
4086 set_widthheight (((state ? 132 : 80) * fwidth), height); 4186 set_widthheight (((state ? 132 : 80) * fwidth), height);
4087 break; 4187 break;
4088 case 4: /* smooth scrolling */ 4188 case 4: /* smooth scrolling */
4089 if (!state) 4189 set_option (Opt_jumpScroll, !state);
4090 SET_OPTION (Opt_jumpScroll);
4091 else
4092 CLR_OPTION (Opt_jumpScroll);
4093 break; 4190 break;
4094 case 5: /* reverse video */ 4191 case 5: /* reverse video */
4095 scr_rvideo_mode (state); 4192 scr_rvideo_mode (state);
4096 break; 4193 break;
4097 case 6: /* relative/absolute origins */ 4194 case 6: /* relative/absolute origins */
… …
4138#if 0 4235#if 0
4139 case 1001: 4236 case 1001:
4140 break; /* X11 mouse highlighting */ 4237 break; /* X11 mouse highlighting */
4141#endif 4238#endif
4142 case 1010: /* scroll to bottom on TTY output inhibit */ 4239 case 1010: /* scroll to bottom on TTY output inhibit */
4143 if (!state) 4240 set_option (Opt_scrollTtyOutput, !state);
4144 SET_OPTION (Opt_scrollTtyOutput);
4145 else
4146 CLR_OPTION (Opt_scrollTtyOutput);
4147 break; 4241 break;
4148 case 1011: /* scroll to bottom on key press */ 4242 case 1011: /* scroll to bottom on key press */
4149 if (state) 4243 set_option (Opt_scrollTtyKeypress, state);
4150 SET_OPTION (Opt_scrollTtyKeypress);
4151 else
4152 CLR_OPTION (Opt_scrollTtyKeypress);
4153 break; 4244 break;
4154 case 1047: /* secondary screen w/ clearing last */ 4245 case 1047: /* secondary screen w/ clearing last */
4155 if (OPTION (Opt_secondaryScreen)) 4246 if (OPTION (Opt_secondaryScreen))
4156 if (current_screen != PRIMARY) 4247 if (current_screen != PRIMARY)
4157 scr_erase_screen (2); 4248 scr_erase_screen (2);
… …
4295 scr_color (Color_bg, Color_bg); 4386 scr_color (Color_bg, Color_bg);
4296 break; 4387 break;
4297 4388
4298 //case 50: // not variable spacing 4389 //case 50: // not variable spacing
4299 4390
4300#ifndef NO_BRIGHTCOLOR 4391#if ENABLE_FRILLS
4301 case 90: 4392 case 90:
4302 case 91: /* set bright fg color */ 4393 case 91: /* set bright fg color */
4303 case 92: 4394 case 92:
4304 case 93: 4395 case 93:
4305 case 94: 4396 case 94:
… …
4350 */ 4441 */
4351void 4442void
4352rxvt_term::tt_printf (const char *fmt,...) 4443rxvt_term::tt_printf (const char *fmt,...)
4353{ 4444{
4354 va_list arg_ptr; 4445 va_list arg_ptr;
4355 unsigned char buf[256]; 4446 char buf[256];
4356 4447
4357 va_start (arg_ptr, fmt); 4448 va_start (arg_ptr, fmt);
4358 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4449 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4359 va_end (arg_ptr); 4450 va_end (arg_ptr);
4360 tt_write (buf, strlen (buf)); 4451 tt_write (buf, strlen (buf));
… …
4365 * or generated by us in response to a query ESC sequence. 4456 * or generated by us in response to a query ESC sequence.
4366 */ 4457 */
4367const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4458const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4368 4459
4369void 4460void
4370rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4461rxvt_term::tt_write (const char *data, unsigned int len)
4371{ 4462{
4463 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4464 return;
4465
4466 if (pty.pty < 0)
4467 return;
4468
4372 if (v_buflen == 0) 4469 if (v_buflen == 0)
4373 { 4470 {
4374 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4471 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4375 4472
4376 if ((unsigned int)written == len) 4473 if ((unsigned int)written == len)
… …
4378 4475
4379 data += written; 4476 data += written;
4380 len -= written; 4477 len -= written;
4381 } 4478 }
4382 4479
4383 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4480 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4384 4481
4385 memcpy (v_buffer + v_buflen, data, len); 4482 memcpy (v_buffer + v_buflen, data, len);
4386 v_buflen += len; 4483 v_buflen += len;
4387 4484
4388 pty_ev.set (EVENT_READ | EVENT_WRITE); 4485 pty_ev.set (EVENT_READ | EVENT_WRITE);

Diff Legend

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