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

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.223 by root, Sun Jan 1 05:28:28 2006 UTC vs.
Revision 1.260 by root, Fri Jan 13 05:04:33 2006 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
43 * along with this program; if not, write to the Free Software 43 * along with this program; if not, write to the Free Software
44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 44 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
45 *----------------------------------------------------------------------*/ 45 *----------------------------------------------------------------------*/
46 46
47/*{{{ includes: */ 47/*{{{ includes: */
48#include "../config.h" /* NECESSARY */ 48#include "../config.h"
49#include "rxvt.h" /* NECESSARY */ 49#include "rxvt.h"
50#include "rxvtperl.h"
50#include "version.h" 51#include "version.h"
51#include "command.h" 52#include "command.h"
52 53
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
53#ifdef KEYSYM_RESOURCE 59#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 60# include "keyboard.h"
55#endif 61#endif
56 62
57#include <csignal> 63#include <csignal>
58
59#define HAVE_SCHED_YIELD 1 //D//TODO//FIXME
60#if HAVE_SCHED_YIELD
61# include <sched.h>
62#endif
63 64
64/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
65 66
66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
67 68
… …
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 {
… …
854 { 855 {
855#ifdef META8_OPTION 856#ifdef META8_OPTION
856 /* set 8-bit on */ 857 /* set 8-bit on */
857 if (meta && (meta_char == 0x80)) 858 if (meta && (meta_char == 0x80))
858 { 859 {
859 unsigned char *ch; 860 char *ch;
860 861
861 for (ch = kbuf; ch < kbuf + len; ch++) 862 for (ch = kbuf; ch < kbuf + len; ch++)
862 *ch |= 0x80; 863 *ch |= 0x80;
863 864
864 meta = 0; 865 meta = 0;
865 } 866 }
866#endif 867#endif
867 /* nil */ ; 868 /* nil */ ;
868 } 869 }
869 } 870 }
871
872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
873 return;
870 874
871 if (len <= 0) 875 if (len <= 0)
872 return; /* not mapped */ 876 return; /* not mapped */
873 877
874 if (OPTION (Opt_scrollTtyKeypress)) 878 if (OPTION (Opt_scrollTtyKeypress))
… …
897#ifdef META8_OPTION 901#ifdef META8_OPTION
898 && meta_char == C0_ESC 902 && meta_char == C0_ESC
899#endif 903#endif
900 ) 904 )
901 { 905 {
902 const unsigned char ch = C0_ESC; 906 const char ch = C0_ESC;
903 tt_write (&ch, 1); 907 tt_write (&ch, 1);
904 } 908 }
905 909
906#if defined(DEBUG_CMD) 910#if defined(DEBUG_CMD)
907 /* Display keyboard buffer contents */ 911 /* Display keyboard buffer contents */
… …
919 923
920#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
921/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
922/* attempt to `write' count to the input buffer */ 926/* attempt to `write' count to the input buffer */
923unsigned int 927unsigned int
924rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 928rxvt_term::cmd_write (const char *str, unsigned int count)
925{ 929{
926 unsigned int n, s; 930 unsigned int n, s;
927 931
928 n = cmdbuf_ptr - cmdbuf_base; 932 n = cmdbuf_ptr - cmdbuf_base;
929 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 933 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
966 } 970 }
967#endif 971#endif
968 972
969 if (want_refresh) 973 if (want_refresh)
970 { 974 {
975 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
976 {
977 int row = -view_start;
978 int end_row = row + nrow;
979
980 while (row > -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
971 scr_refresh (refresh_type); 1013 scr_refresh (refresh_type);
972 scrollbar_show (1); 1014 scrollbar_show (1);
973#ifdef USE_XIM 1015#ifdef USE_XIM
974 IMSendSpot (); 1016 IMSendSpot ();
975#endif 1017#endif
… …
985 SET_LOCALE (locale); 1027 SET_LOCALE (locale);
986 1028
987 display->flush (); 1029 display->flush ();
988 1030
989 if (want_refresh && !flush_ev.active) 1031 if (want_refresh && !flush_ev.active)
990 flush_ev.start (NOW + 0.01); 1032 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
991} 1033}
992 1034
993void 1035void
994rxvt_term::flush_cb (time_watcher &w) 1036rxvt_term::flush_cb (time_watcher &w)
995{ 1037{
… …
1070 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1112 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1071 } 1113 }
1072} 1114}
1073#endif 1115#endif
1074 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
1075bool 1135bool
1076rxvt_term::pty_fill () 1136rxvt_term::pty_fill ()
1077{ 1137{
1078 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1138 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1079 1139
1080 if (CBUFSIZ == n) 1140 if (CBUFSIZ == n)
1081 { 1141 {
1082 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");
1083 n = 0; 1143 n = 0;
1084 } 1144 }
1085 1145
1086 memmove (cmdbuf_base, cmdbuf_ptr, n); 1146 memmove (cmdbuf_base, cmdbuf_ptr, n);
1087 cmdbuf_ptr = cmdbuf_base; 1147 cmdbuf_ptr = cmdbuf_base;
… …
1095 return true; 1155 return true;
1096 } 1156 }
1097 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1157 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1098 { 1158 {
1099#if HAVE_SCHED_YIELD 1159#if HAVE_SCHED_YIELD
1100 sched_yield (); 1160 if (display->is_local)
1161 event_handler.cw_yield.start ();
1101#endif 1162#endif
1102 } 1163 }
1103 else 1164 else
1104 { 1165 {
1105 pty_ev.stop (); 1166 pty_ev.stop ();
… …
1143 1204
1144#ifdef POINTER_BLANK 1205#ifdef POINTER_BLANK
1145void 1206void
1146rxvt_term::pointer_blank () 1207rxvt_term::pointer_blank ()
1147{ 1208{
1148 if (! OPTION (Opt_pointerBlank)) 1209 if (!OPTION (Opt_pointerBlank))
1149 return; 1210 return;
1150 1211
1151 XDefineCursor (display->display, vt, display->blank_cursor); 1212 XDefineCursor (display->display, vt, display->blank_cursor);
1152 XFlush (display->display); 1213 XFlush (display->display);
1153 1214
… …
1250 dDisp; 1311 dDisp;
1251 1312
1252 SET_R (this); 1313 SET_R (this);
1253 SET_LOCALE (locale); 1314 SET_LOCALE (locale);
1254 1315
1255#if defined(CURSOR_BLINK) 1316 if (ev.xany.window == vt
1256 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1317 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1257 { 1318 return;
1258 if (hidden_cursor)
1259 {
1260 hidden_cursor = 0;
1261 want_refresh = 1;
1262 }
1263 1319
1264 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1320 // for XQueryPointer
1265 }
1266#endif
1267
1268#if defined(POINTER_BLANK)
1269 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1270 {
1271 if (ev.type == MotionNotify
1272 || ev.type == ButtonPress
1273 || ev.type == ButtonRelease)
1274 if (hidden_pointer)
1275 pointer_unblank ();
1276
1277 if (ev.type == KeyPress && hidden_pointer == 0)
1278 pointer_blank ();
1279 }
1280#endif
1281
1282 Window unused_root, unused_child; 1321 Window unused_root, unused_child;
1283 int unused_root_x, unused_root_y; 1322 int unused_root_x, unused_root_y;
1284 unsigned int unused_mask; 1323 unsigned int unused_mask;
1285 1324
1286 switch (ev.type) 1325 switch (ev.type)
… …
1293 1332
1294 break; 1333 break;
1295 1334
1296 case KeyRelease: 1335 case KeyRelease:
1297 { 1336 {
1298#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1337#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1299 KeySym ks; 1338 KeySym keysym;
1300 1339
1301 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1340 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1302#endif 1341#endif
1303 1342
1304#if ENABLE_FRILLS || ISO_14755 1343#if ENABLE_FRILLS || ISO_14755
1305 // ISO 14755 support 1344 // ISO 14755 support
1306 if (iso14755buf) 1345 if (iso14755buf)
… …
1311# endif 1350# endif
1312# if ISO_14755 1351# if ISO_14755
1313 // iso14755 part 5.2 handling: release time 1352 // iso14755 part 5.2 handling: release time
1314 // first: controls 1353 // first: controls
1315 if ((ev.xkey.state & ControlMask) 1354 if ((ev.xkey.state & ControlMask)
1316 && ((ks >= 0x40 && ks <= 0x5f) 1355 && ((keysym >= 0x40 && keysym <= 0x5f)
1317 || (ks >= 0x61 && ks <= 0x7f))) 1356 || (keysym >= 0x61 && keysym <= 0x7f)))
1318 { 1357 {
1319 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1358 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1320 commit_iso14755 (); 1359 commit_iso14755 ();
1321 return; // case-break; 1360 goto skip_switch;
1322 } 1361 }
1323 1362
1324 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1363 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1325 if (i[0] == ks) 1364 if (i[0] == keysym)
1326 { 1365 {
1327 iso14755buf = ISO_14755_51 | i[1]; 1366 iso14755buf = ISO_14755_51 | i[1];
1328 commit_iso14755 (); 1367 commit_iso14755 ();
1329 return; // case-break; 1368 goto skip_switch;
1330 } 1369 }
1331 1370
1332 scr_bell (); 1371 scr_bell ();
1333# endif 1372# endif
1334 iso14755buf = 0; 1373 iso14755buf = 0;
… …
1353 else 1392 else
1354 iso14755buf = 0; 1393 iso14755buf = 0;
1355 } 1394 }
1356#endif 1395#endif
1357 1396
1397 if (ev.xany.window == vt
1398 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1399 break;
1400
1358#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1401#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1359 if (!(ev.xkey.state & ControlMask)) 1402 if (!(ev.xkey.state & ControlMask))
1360 slip_wheel_ev.stop (); 1403 slip_wheel_ev.stop ();
1361 else if (ks == XK_Control_L || ks == XK_Control_R) 1404 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1362 mouse_slip_wheel_speed = 0; 1405 mouse_slip_wheel_speed = 0;
1363#endif 1406#endif
1364 break; 1407 break;
1365 } 1408 }
1366 1409
… …
1496 1539
1497 case SelectionRequest: 1540 case SelectionRequest:
1498 selection_send (ev.xselectionrequest); 1541 selection_send (ev.xselectionrequest);
1499 break; 1542 break;
1500 1543
1544 case MapNotify:
1545 mapped = 1;
1546#ifdef TEXT_BLINK
1547 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1548#endif
1549 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1550 break;
1551
1501 case UnmapNotify: 1552 case UnmapNotify:
1502 mapped = 0; 1553 mapped = 0;
1503#ifdef TEXT_BLINK 1554#ifdef TEXT_BLINK
1504 text_blink_ev.stop (); 1555 text_blink_ev.stop ();
1505#endif 1556#endif
1506 break; 1557 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1507
1508 case MapNotify:
1509 mapped = 1;
1510#ifdef TEXT_BLINK
1511 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1512#endif
1513 break; 1558 break;
1514 1559
1515#ifdef TRANSPARENT 1560#ifdef TRANSPARENT
1516 case ReparentNotify: 1561 case ReparentNotify:
1517 rootwin_cb (ev); 1562 rootwin_cb (ev);
… …
1531 1576
1532 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1577 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1533 scr_expose (ev.xexpose.x, ev.xexpose.y, 1578 scr_expose (ev.xexpose.x, ev.xexpose.y,
1534 ev.xexpose.width, ev.xexpose.height, False); 1579 ev.xexpose.width, ev.xexpose.height, False);
1535 1580
1536 scr_refresh (refresh_type); 1581 want_refresh = 1;
1537 } 1582 }
1538 else 1583 else
1539 { 1584 {
1540 XEvent unused_event; 1585 XEvent unused_event;
1541 1586
… …
1560#endif 1605#endif
1561 } 1606 }
1562 break; 1607 break;
1563 1608
1564 case MotionNotify: 1609 case MotionNotify:
1610 printf ("motion notify\n");//D
1565#ifdef POINTER_BLANK 1611#ifdef POINTER_BLANK
1566 if (hidden_pointer) 1612 if (hidden_pointer)
1567 pointer_unblank (); 1613 pointer_unblank ();
1568#endif 1614#endif
1569#if MENUBAR 1615#if MENUBAR
… …
1576 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1622 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1577 break; 1623 break;
1578 1624
1579 if (ev.xany.window == vt) 1625 if (ev.xany.window == vt)
1580 { 1626 {
1627 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1628 ; // nop
1581 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1629 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1582 { 1630 {
1583 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1631 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1584 ; 1632 ;
1585 1633
1586 XQueryPointer (disp, vt, 1634 XQueryPointer (disp, vt,
… …
1666 &unused_root_x, &unused_root_y, 1714 &unused_root_x, &unused_root_y,
1667 &ev.xbutton.x, &ev.xbutton.y, 1715 &ev.xbutton.x, &ev.xbutton.y,
1668 &unused_mask); 1716 &unused_mask);
1669 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1717 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1670 scrollbar_size ()); 1718 scrollbar_size ());
1671 scr_refresh (refresh_type); 1719 want_refresh = 1;
1672 refresh_limit = 0; 1720 refresh_limit = 0;
1673 scrollbar_show (1); 1721 scrollbar_show (1);
1674 } 1722 }
1675 break; 1723 break;
1676 } 1724 }
1725
1726skip_switch: ;
1727
1728#if defined(CURSOR_BLINK)
1729 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1730 {
1731 if (hidden_cursor)
1732 {
1733 hidden_cursor = 0;
1734 want_refresh = 1;
1735 }
1736
1737 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1738 }
1739#endif
1740
1741#if defined(POINTER_BLANK)
1742 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1743 {
1744 if (ev.type == MotionNotify
1745 || ev.type == ButtonPress
1746 || ev.type == ButtonRelease)
1747 if (hidden_pointer)
1748 pointer_unblank ();
1749
1750 if (ev.type == KeyPress && hidden_pointer == 0)
1751 pointer_blank ();
1752 }
1753#endif
1677} 1754}
1678 1755
1679void 1756void
1680rxvt_term::focus_in () 1757rxvt_term::focus_in ()
1681{ 1758{
1682 if (!focus) 1759 if (!focus)
1683 { 1760 {
1684 focus = 1; 1761 focus = 1;
1685 want_refresh = 1; 1762 want_refresh = 1;
1763
1764 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1765
1686#if USE_XIM 1766#if USE_XIM
1687 if (Input_Context != NULL) 1767 if (Input_Context != NULL)
1688 { 1768 {
1689 IMSetStatusPosition (); 1769 IMSetStatusPosition ();
1690 XSetICFocus (Input_Context); 1770 XSetICFocus (Input_Context);
… …
1710 if (focus) 1790 if (focus)
1711 { 1791 {
1712 focus = 0; 1792 focus = 0;
1713 want_refresh = 1; 1793 want_refresh = 1;
1714 1794
1795 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1796
1715#if ENABLE_FRILLS || ISO_14755 1797#if ENABLE_FRILLS || ISO_14755
1798 if (iso14755buf)
1799 {
1716 iso14755buf = 0; 1800 iso14755buf = 0;
1717#endif
1718#if ENABLE_OVERLAY 1801# if ENABLE_OVERLAY
1719 scr_overlay_off (); 1802 scr_overlay_off ();
1803# endif
1804 }
1720#endif 1805#endif
1721#if USE_XIM 1806#if USE_XIM
1722 if (Input_Context != NULL) 1807 if (Input_Context != NULL)
1723 XUnsetICFocus (Input_Context); 1808 XUnsetICFocus (Input_Context);
1724#endif 1809#endif
… …
1768rxvt_term::button_press (XButtonEvent &ev) 1853rxvt_term::button_press (XButtonEvent &ev)
1769{ 1854{
1770 int reportmode = 0, clickintime; 1855 int reportmode = 0, clickintime;
1771 1856
1772 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1857 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1858
1773 if (!bypass_keystate) 1859 if (!bypass_keystate)
1774 reportmode = !! (priv_modes & PrivMode_mouse_report); 1860 reportmode = !! (priv_modes & PrivMode_mouse_report);
1775 1861
1776 /* 1862 /*
1777 * VT window processing of button press 1863 * VT window processing of button press
… …
1797#ifdef MOUSE_REPORT_DOUBLECLICK 1883#ifdef MOUSE_REPORT_DOUBLECLICK
1798 if (ev.button == MEvent.button && clickintime) 1884 if (ev.button == MEvent.button && clickintime)
1799 { 1885 {
1800 /* same button, within alloted time */ 1886 /* same button, within alloted time */
1801 MEvent.clicks++; 1887 MEvent.clicks++;
1888
1802 if (MEvent.clicks > 1) 1889 if (MEvent.clicks > 1)
1803 { 1890 {
1804 /* only report double clicks */ 1891 /* only report double clicks */
1805 MEvent.clicks = 2; 1892 MEvent.clicks = 2;
1806 mouse_report (ev); 1893 mouse_report (ev);
… …
1826 else 1913 else
1827 { 1914 {
1828 if (ev.button != MEvent.button) 1915 if (ev.button != MEvent.button)
1829 MEvent.clicks = 0; 1916 MEvent.clicks = 0;
1830 1917
1918 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1831 switch (ev.button) 1919 switch (ev.button)
1832 { 1920 {
1833 case Button1: 1921 case Button1:
1834 /* allow meta + click to select rectangular areas */ 1922 /* allow meta + click to select rectangular areas */
1835 /* should be done in screen.C */ 1923 /* should be done in screen.C */
1836#if ENABLE_FRILLS 1924#if ENABLE_FRILLS
1837 selection.rect = !!(ev.state & ModMetaMask); 1925 selection.rect = !!(ev.state & ModMetaMask);
1838#else 1926#else
1839 selection.rect = false; 1927 selection.rect = false;
1840#endif 1928#endif
1841 1929
1842 /* allow shift+left click to extend selection */ 1930 /* allow shift+left click to extend selection */
1843 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1931 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1844 { 1932 {
1845 if (MEvent.button == Button1 && clickintime) 1933 if (MEvent.button == Button1 && clickintime)
1846 selection_rotate (ev.x, ev.y); 1934 selection_rotate (ev.x, ev.y);
1847 else 1935 else
1848 selection_extend (ev.x, ev.y, 1); 1936 selection_extend (ev.x, ev.y, 1);
1849 } 1937 }
1850 else 1938 else
1851 { 1939 {
1852 if (MEvent.button == Button1 && clickintime) 1940 if (MEvent.button == Button1 && clickintime)
1853 MEvent.clicks++; 1941 MEvent.clicks++;
1854 else 1942 else
1855 MEvent.clicks = 1; 1943 MEvent.clicks = 1;
1856 1944
1857 selection_click (MEvent.clicks, ev.x, ev.y); 1945 selection_click (MEvent.clicks, ev.x, ev.y);
1858 } 1946 }
1859 1947
1860 MEvent.button = Button1; 1948 MEvent.button = Button1;
1861 break; 1949 break;
1862 1950
1863 case Button3: 1951 case Button3:
1864 if (MEvent.button == Button3 && clickintime) 1952 if (MEvent.button == Button3 && clickintime)
1865 selection_rotate (ev.x, ev.y); 1953 selection_rotate (ev.x, ev.y);
1866 else 1954 else
1867 selection_extend (ev.x, ev.y, 1); 1955 selection_extend (ev.x, ev.y, 1);
1868 1956
1869 MEvent.button = Button3; 1957 MEvent.button = Button3;
1870 break; 1958 break;
1871 } 1959 }
1872 } 1960 }
1873 1961
1874 MEvent.time = ev.time; 1962 MEvent.time = ev.time;
1875 return; 1963 return;
1876 } 1964 }
1877 1965
… …
2013 } 2101 }
2014 2102
2015 break; 2103 break;
2016 } 2104 }
2017 } 2105 }
2106
2018 return; 2107 return;
2019 } 2108 }
2109
2020#if MENUBAR 2110#if MENUBAR
2021 /* 2111 /*
2022 * Menubar window processing of button press 2112 * Menubar window processing of button press
2023 */ 2113 */
2024 if (isMenuBarWindow (ev.window)) 2114 if (isMenuBarWindow (ev.window))
… …
2087 if (priv_modes & PrivMode_mouse_report 2177 if (priv_modes & PrivMode_mouse_report
2088 && bypass_keystate 2178 && bypass_keystate
2089 && ev.button == Button1 && MEvent.clicks <= 1) 2179 && ev.button == Button1 && MEvent.clicks <= 1)
2090 selection_extend (ev.x, ev.y, 0); 2180 selection_extend (ev.x, ev.y, 0);
2091 2181
2182 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2183 return;
2184
2092 switch (ev.button) 2185 switch (ev.button)
2093 { 2186 {
2094 case Button1: 2187 case Button1:
2095 case Button3: 2188 case Button3:
2096 selection_make (ev.time); 2189 selection_make (ev.time);
… …
2127 slip_wheel_ev.start (); 2220 slip_wheel_ev.start ();
2128 } 2221 }
2129 else 2222 else
2130 { 2223 {
2131# endif 2224# endif
2132# ifdef JUMP_MOUSE_WHEEL
2133 scr_page (v, i); 2225 scr_page (v, i);
2134 scr_refresh (SMOOTH_REFRESH);
2135 scrollbar_show (1); 2226 scrollbar_show (1);
2136# else
2137 while (i--)
2138 {
2139 scr_page (v, 1);
2140 scr_refresh (SMOOTH_REFRESH);
2141 scrollbar_show (1);
2142 }
2143# endif
2144# ifdef MOUSE_SLIP_WHEELING 2227# ifdef MOUSE_SLIP_WHEELING
2145 } 2228 }
2146#endif 2229# endif
2147 } 2230 }
2148 break; 2231 break;
2149#endif 2232#endif
2150 } 2233 }
2151 } 2234 }
… …
2640 2723
2641bool 2724bool
2642rxvt_term::cmd_parse () 2725rxvt_term::cmd_parse ()
2643{ 2726{
2644 bool flag = false; 2727 bool flag = false;
2645 unicode_t ch = NOCHAR; 2728 wchar_t ch = NOCHAR;
2646 unsigned char *seq_begin; // remember start of esc-sequence here 2729 char *seq_begin; // remember start of esc-sequence here
2647 2730
2648 for (;;) 2731 for (;;)
2649 { 2732 {
2650 if (ch == NOCHAR) 2733 if (ch == NOCHAR)
2651 { 2734 {
2652 seq_begin = cmdbuf_ptr; 2735 seq_begin = cmdbuf_ptr;
2653 ch = next_char (); 2736 ch = next_char ();
2654 }
2655 2737
2656 if (ch == NOCHAR) // TODO: improve 2738 if (ch == NOCHAR)
2657 break; 2739 break;
2740 }
2658 2741
2659 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2742 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2660 { 2743 {
2661 if (!seen_input) 2744 if (!seen_input)
2662 { 2745 {
… …
2671 if (seen_resize && cmd_pid) 2754 if (seen_resize && cmd_pid)
2672 kill (-cmd_pid, SIGWINCH); 2755 kill (-cmd_pid, SIGWINCH);
2673 } 2756 }
2674 2757
2675 /* Read a text string from the input buffer */ 2758 /* Read a text string from the input buffer */
2676 unicode_t buf[UBUFSIZ]; 2759 wchar_t buf[UBUFSIZ];
2677 bool refreshnow = false; 2760 bool refreshnow = false;
2678 int nlines = 0; 2761 int nlines = 0;
2679 unicode_t *str = buf; 2762 wchar_t *str = buf;
2680 unicode_t *eol = str + min (ncol, UBUFSIZ); 2763 wchar_t *eol = str + min (ncol, UBUFSIZ);
2681 2764
2682 for (;;) 2765 for (;;)
2683 { 2766 {
2684 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2767 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2685 break; 2768 break;
… …
2695 2778
2696 if (!OPTION (Opt_jumpScroll) 2779 if (!OPTION (Opt_jumpScroll)
2697 || (refresh_count >= refresh_limit * (nrow - 1))) 2780 || (refresh_count >= refresh_limit * (nrow - 1)))
2698 { 2781 {
2699 refreshnow = true; 2782 refreshnow = true;
2783 refresh_count = 0;
2700 ch = NOCHAR; 2784 ch = NOCHAR;
2701 break; 2785 break;
2702 } 2786 }
2703 2787
2704 // scr_add_lines only works for nlines <= nrow - 1. 2788 // scr_add_lines only works for nlines <= nrow - 1.
2705 if (nlines >= nrow - 1) 2789 if (nlines >= nrow - 1)
2706 { 2790 {
2791 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2707 scr_add_lines (buf, nlines, str - buf); 2792 scr_add_lines (buf, str - buf, nlines);
2793
2708 nlines = 0; 2794 nlines = 0;
2709 str = buf; 2795 str = buf;
2710 eol = str + min (ncol, UBUFSIZ); 2796 eol = str + min (ncol, UBUFSIZ);
2711 } 2797 }
2712 2798
… …
2725 2811
2726 seq_begin = cmdbuf_ptr; 2812 seq_begin = cmdbuf_ptr;
2727 ch = next_char (); 2813 ch = next_char ();
2728 } 2814 }
2729 2815
2816 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2730 scr_add_lines (buf, nlines, str - buf); 2817 scr_add_lines (buf, str - buf, nlines);
2731 2818
2732 /* 2819 /*
2733 * If there have been a lot of new lines, then update the screen 2820 * If there have been a lot of new lines, then update the screen
2734 * What the heck I'll cheat and only refresh less than every page-full. 2821 * What the heck I'll cheat and only refresh less than every page-full.
2735 * the number of pages between refreshes is refresh_limit, which 2822 * the number of pages between refreshes is refresh_limit, which
… …
2741 refresh_limit++; 2828 refresh_limit++;
2742 else 2829 else
2743 { 2830 {
2744 flag = true; 2831 flag = true;
2745 scr_refresh (refresh_type); 2832 scr_refresh (refresh_type);
2833 want_refresh = 1;
2746 } 2834 }
2747 } 2835 }
2748 2836
2749 } 2837 }
2750 else 2838 else
… …
2765 } 2853 }
2766 2854
2767 return flag; 2855 return flag;
2768} 2856}
2769 2857
2770// read the next octet
2771unicode_t
2772rxvt_term::next_octet ()
2773{
2774 return cmdbuf_ptr < cmdbuf_endp
2775 ? *cmdbuf_ptr++
2776 : NOCHAR;
2777}
2778
2779// read the next character 2858// read the next character
2780unicode_t 2859wchar_t
2781rxvt_term::next_char () 2860rxvt_term::next_char ()
2782{ 2861{
2783 while (cmdbuf_ptr < cmdbuf_endp) 2862 while (cmdbuf_ptr < cmdbuf_endp)
2784 { 2863 {
2785 // assume 7-bit to be ascii ALWAYS 2864 // assume 7-bit to be ascii ALWAYS
2786 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2865 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2787 return *cmdbuf_ptr++; 2866 return *cmdbuf_ptr++;
2788 2867
2789 wchar_t wc; 2868 wchar_t wc;
2790 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2869 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2791 2870
2792 if (len == (size_t)-2) 2871 if (len == (size_t)-2)
2793 { 2872 {
2794 // the mbstate stores incomplete sequences. didn't know this :/ 2873 // the mbstate stores incomplete sequences. didn't know this :/
2795 cmdbuf_ptr = cmdbuf_endp; 2874 cmdbuf_ptr = cmdbuf_endp;
2796 break; 2875 break;
2797 } 2876 }
2798 2877
2799 if (len == (size_t)-1) 2878 if (len == (size_t)-1)
2800 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2879 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2801 2880
2802 // assume wchar == unicode 2881 // assume wchar == unicode
2803 cmdbuf_ptr += len; 2882 cmdbuf_ptr += len;
2804 return wc & UNICODE_MASK; 2883 return wc & UNICODE_MASK;
2805 } 2884 }
2806 2885
2807 return NOCHAR; 2886 return NOCHAR;
2887}
2888
2889// read the next octet
2890uint32_t
2891rxvt_term::next_octet ()
2892{
2893 return cmdbuf_ptr < cmdbuf_endp
2894 ? (unsigned char)*cmdbuf_ptr++
2895 : NOCHAR;
2808} 2896}
2809 2897
2810/* rxvt_cmd_getc () - Return next input character */ 2898/* rxvt_cmd_getc () - Return next input character */
2811/* 2899/*
2812 * Return the next input character after first passing any keyboard input 2900 * Return the next input character after first passing any keyboard input
2813 * to the command. 2901 * to the command.
2814 */ 2902 */
2815unicode_t 2903wchar_t
2816rxvt_term::cmd_getc () 2904rxvt_term::cmd_getc ()
2817{ 2905{
2818 unicode_t c = next_char (); 2906 wchar_t c = next_char ();
2819 2907
2820 if (c == NOCHAR) 2908 if (c == NOCHAR)
2821 throw out_of_input; 2909 throw out_of_input;
2822 2910
2823 return c; 2911 return c;
2824} 2912}
2825 2913
2826unicode_t 2914uint32_t
2827rxvt_term::cmd_get8 () 2915rxvt_term::cmd_get8 ()
2828{ 2916{
2829 unicode_t c = next_octet (); 2917 uint32_t c = next_octet ();
2830 2918
2831 if (c == NOCHAR) 2919 if (c == NOCHAR)
2832 throw out_of_input; 2920 throw out_of_input;
2833 2921
2834 return c; 2922 return c;
… …
2934 case C0_ESC: 3022 case C0_ESC:
2935 process_escape_seq (); 3023 process_escape_seq ();
2936 break; 3024 break;
2937 case C0_ENQ: /* terminal Status */ 3025 case C0_ENQ: /* terminal Status */
2938 if (rs[Rs_answerbackstring]) 3026 if (rs[Rs_answerbackstring])
2939 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3027 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2940 (unsigned int)strlen (rs[Rs_answerbackstring]));
2941 else 3028 else
2942 tt_write ((unsigned char *)VT100_ANS, 3029 tt_write (VT100_ANS, strlen (VT100_ANS));
2943 (unsigned int)strlen (VT100_ANS));
2944 break; 3030 break;
2945 case C0_BEL: /* bell */ 3031 case C0_BEL: /* bell */
2946 scr_bell (); 3032 scr_bell ();
2947 break; 3033 break;
2948 case C0_BS: /* backspace */ 3034 case C0_BS: /* backspace */
… …
3103 break; 3189 break;
3104 3190
3105 /* 8.3.87: NEXT LINE */ 3191 /* 8.3.87: NEXT LINE */
3106 case C1_NEL: /* ESC E */ 3192 case C1_NEL: /* ESC E */
3107 { 3193 {
3108 unicode_t nlcr[] = { C0_LF, C0_CR }; 3194 wchar_t nlcr[] = { C0_LF, C0_CR };
3109 scr_add_lines (nlcr, 1, 2); 3195 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3110 } 3196 }
3111 break; 3197 break;
3112 3198
3113 /* kidnapped escape sequence: Should be 8.3.48 */ 3199 /* kidnapped escape sequence: Should be 8.3.48 */
3114 case C1_ESA: /* ESC G */ 3200 case C1_ESA: /* ESC G */
… …
3136 process_dcs_seq (); 3222 process_dcs_seq ();
3137 break; 3223 break;
3138 3224
3139 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3225 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3140 case C1_SCI: /* ESC Z */ 3226 case C1_SCI: /* ESC Z */
3141 tt_write ((const unsigned char *)ESCZ_ANSWER, 3227 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3142 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3143 break; /* steal obsolete ESC [ c */ 3228 break; /* steal obsolete ESC [ c */
3144 3229
3145 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3230 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3146 case C1_CSI: /* ESC [ */ 3231 case C1_CSI: /* ESC [ */
3147 process_csi_seq (); 3232 process_csi_seq ();
… …
3391 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3476 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3392 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3477 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3393 break; 3478 break;
3394 3479
3395 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3480 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3396 tt_write ((const unsigned char *)VT100_ANS, 3481 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3397 (unsigned int) (sizeof (VT100_ANS) - 1));
3398 break; 3482 break;
3399 3483
3400 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3484 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3401 process_sgr_mode (nargs, arg); 3485 process_sgr_mode (nargs, arg);
3402 break; 3486 break;
… …
3604/*----------------------------------------------------------------------*/ 3688/*----------------------------------------------------------------------*/
3605/* 3689/*
3606 * get input up until STRING TERMINATOR (or BEL) 3690 * get input up until STRING TERMINATOR (or BEL)
3607 * ends_how is terminator used. returned input must be free()'d 3691 * ends_how is terminator used. returned input must be free()'d
3608 */ 3692 */
3609unsigned char * 3693char *
3610rxvt_term::get_to_st (unicode_t &ends_how) 3694rxvt_term::get_to_st (unicode_t &ends_how)
3611{ 3695{
3612 unicode_t ch; 3696 unicode_t ch;
3613 bool seen_esc = false; 3697 bool seen_esc = false;
3614 unsigned int n = 0; 3698 unsigned int n = 0;
… …
3647 3731
3648 string[n++] = '\0'; 3732 string[n++] = '\0';
3649 3733
3650 ends_how = (ch == 0x5c ? C0_ESC : ch); 3734 ends_how = (ch == 0x5c ? C0_ESC : ch);
3651 3735
3652 return (unsigned char *)rxvt_wcstombs (string); 3736 return rxvt_wcstombs (string);
3653} 3737}
3654 3738
3655/*----------------------------------------------------------------------*/ 3739/*----------------------------------------------------------------------*/
3656/* 3740/*
3657 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3741 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3658 */ 3742 */
3659void 3743void
3660rxvt_term::process_dcs_seq () 3744rxvt_term::process_dcs_seq ()
3661{ 3745{
3662 unsigned char *s; 3746 char *s;
3663 unicode_t eh; 3747 unicode_t eh;
3664 3748
3665 /* 3749 /*
3666 * Not handled yet 3750 * Not handled yet
3667 */ 3751 */
… …
3686 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3770 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3687 arg = arg * 10 + (ch - '0'); 3771 arg = arg * 10 + (ch - '0');
3688 3772
3689 if (ch == ';') 3773 if (ch == ';')
3690 { 3774 {
3691 unsigned char *s = get_to_st (eh); 3775 char *s = get_to_st (eh);
3692 3776
3693 if (s) 3777 if (s)
3694 { 3778 {
3695 process_xterm_seq (arg, (char *)s, eh); 3779 process_xterm_seq (arg, s, eh);
3696 free (s); 3780 free (s);
3697 } 3781 }
3698 } 3782 }
3699} 3783}
3700 3784
3701void 3785void
3702rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3786rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3703{ 3787{
3704 if (str[0] == '?' && !str[1]) 3788 if (str[0] == '?' && !str[1])
3705 { 3789 {
3706 unsigned short r, g, b; 3790 unsigned short r, g, b;
3707 pix_colors_focused[color].get (display, r, g, b); 3791 pix_colors_focused[color].get (display, r, g, b);
… …
3713 3797
3714/* 3798/*
3715 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3799 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3716 */ 3800 */
3717void 3801void
3718rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3802rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3719{ 3803{
3720 int changed = 0; 3804 int changed = 0;
3721 int color; 3805 int color;
3722 char *buf, *name; 3806 char *buf, *name;
3723 bool query = str[0] == '?' && !str[1]; 3807 bool query = str[0] == '?' && !str[1];
… …
3780 { 3864 {
3781 if ((name = strchr (buf, ';')) == NULL) 3865 if ((name = strchr (buf, ';')) == NULL)
3782 break; 3866 break;
3783 3867
3784 *name++ = '\0'; 3868 *name++ = '\0';
3785 color = atoi (buf); 3869 color = atoi (buf) + minCOLOR;
3786 3870
3787 if (color < 0 || color >= TOTAL_COLORS) 3871 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3788 break; 3872 break;
3789 3873
3790 if ((buf = strchr (name, ';')) != NULL) 3874 if ((buf = strchr (name, ';')) != NULL)
3791 *buf++ = '\0'; 3875 *buf++ = '\0';
3792 3876
3793 if (name[0] == '?' && !name[1]) 3877 if (name[0] == '?' && !name[1])
3794 { 3878 {
3795 unsigned short r, g, b; 3879 unsigned short r, g, b;
3796 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3880 pix_colors_focused[color].get (display, r, g, b);
3797 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3881 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3798 } 3882 }
3799 else 3883 else
3800 set_window_color (color + minCOLOR, name); 3884 set_window_color (color, name);
3801 } 3885 }
3802 break; 3886 break;
3803 case XTerm_Color00: 3887 case XTerm_Color00:
3804 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3888 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3805 break; 3889 break;
3806 case XTerm_Color01: 3890 case XTerm_Color01:
3807 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3891 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3808 break; 3892 break;
3809#ifndef NO_CURSORCOLOR 3893#ifndef NO_CURSORCOLOR
3810 case XTerm_Color_cursor: 3894 case XTerm_Color_cursor:
3811 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3895 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3812 break; 3896 break;
… …
3816 break; 3900 break;
3817 case XTerm_Color_pointer_bg: 3901 case XTerm_Color_pointer_bg:
3818 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3902 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3819 break; 3903 break;
3820#ifndef NO_BOLD_UNDERLINE_REVERSE 3904#ifndef NO_BOLD_UNDERLINE_REVERSE
3821 case XTerm_Color_BD:
3822 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3823 break;
3824 case XTerm_Color_UL:
3825 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3826 break;
3827 case XTerm_Color_RV: 3905 case XTerm_Color_RV:
3828 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3906 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3907 break;
3908 case Rxvt_Color_BD:
3909 case URxvt_Color_BD:
3910 process_color_seq (op, Color_BD, str, resp);
3911 break;
3912 case Rxvt_Color_UL:
3913 case URxvt_Color_UL:
3914 process_color_seq (op, Color_UL, str, resp);
3829 break; 3915 break;
3830 case URxvt_Color_IT: 3916 case URxvt_Color_IT:
3831 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3917 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3832 break; 3918 break;
3833#endif 3919#endif
… …
3838 if (am_transparent) 3924 if (am_transparent)
3839 want_full_refresh = want_refresh = 1; 3925 want_full_refresh = want_refresh = 1;
3840 break; 3926 break;
3841#endif 3927#endif
3842 3928
3843 case XTerm_Pixmap: 3929 case Rxvt_Pixmap:
3844 if (*str != ';') 3930 if (*str != ';')
3845 { 3931 {
3846#if XPM_BACKGROUND 3932#if XPM_BACKGROUND
3847 scale_pixmap (""); /* reset to default scaling */ 3933 scale_pixmap (""); /* reset to default scaling */
3848 set_bgPixmap (str); /* change pixmap */ 3934 set_bgPixmap (str); /* change pixmap */
3849#endif
3850 scr_touch (true); 3935 scr_touch (true);
3936#endif
3851 } 3937 }
3938
3852 while ((str = strchr (str, ';')) != NULL) 3939 while ((str = strchr (str, ';')) != NULL)
3853 { 3940 {
3854 str++; 3941 str++;
3855#if XPM_BACKGROUND 3942#if XPM_BACKGROUND
3856 changed += scale_pixmap (str); 3943 changed += scale_pixmap (str);
… …
3859 3946
3860 if (changed) 3947 if (changed)
3861 { 3948 {
3862#ifdef XPM_BACKGROUND 3949#ifdef XPM_BACKGROUND
3863 resize_pixmap (); 3950 resize_pixmap ();
3864#endif
3865 scr_touch (true); 3951 scr_touch (true);
3952#endif
3866 } 3953 }
3867 break; 3954 break;
3868 3955
3869 case XTerm_restoreFG: 3956 case Rxvt_restoreFG:
3870 set_window_color (Color_fg, str); 3957 set_window_color (Color_fg, str);
3871 break; 3958 break;
3872 case XTerm_restoreBG: 3959 case Rxvt_restoreBG:
3873 set_window_color (Color_bg, str); 3960 set_window_color (Color_bg, str);
3874 break; 3961 break;
3875 3962
3876 case XTerm_logfile: 3963 case XTerm_logfile:
3877 // TODO, when secure mode? 3964 // TODO, when secure mode?
… …
3882 if (OPTION (Opt_insecure)) 3969 if (OPTION (Opt_insecure))
3883 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3970 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3884 break; 3971 break;
3885#endif 3972#endif
3886#if 0 3973#if 0
3887 case XTerm_dumpscreen: /* no error notices */ 3974 case Rxvt_dumpscreen: /* no error notices */
3888 { 3975 {
3889 int fd; 3976 int fd;
3890 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3977 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3891 { 3978 {
3892 scr_dump (fd); 3979 scr_dump (fd);
… …
3930 } 4017 }
3931 break; 4018 break;
3932 4019
3933 case URxvt_view_up: 4020 case URxvt_view_up:
3934 case URxvt_view_down: 4021 case URxvt_view_down:
4022 {
3935 int lines = atoi (str); 4023 int lines = atoi (str);
3936 4024
3937 if (lines) 4025 if (lines)
3938 scr_page (op == URxvt_view_up ? UP : DN, lines); 4026 scr_page (op == URxvt_view_up ? UP : DN, lines);
3939 else 4027 else
3940 {
3941 scr_erase_savelines (); 4028 scr_erase_savelines ();
3942 } 4029 }
3943 4030
4031 break;
4032#endif
4033
4034#if ENABLE_PERL
4035 case URxvt_perl:
4036 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
4037 ; // no responses yet
3944 break; 4038 break;
3945#endif 4039#endif
3946 } 4040 }
3947} 4041}
3948/*----------------------------------------------------------------------*/ 4042/*----------------------------------------------------------------------*/
… …
4059 /* extra handling for values with state unkept */ 4153 /* extra handling for values with state unkept */
4060 switch (arg[i]) 4154 switch (arg[i])
4061 { 4155 {
4062#if ENABLE_STYLES 4156#if ENABLE_STYLES
4063 case 1021: 4157 case 1021:
4064 if (mode) 4158 set_option (Opt_intensityStyles, mode);
4065 SET_OPTION (Opt_intensityStyles);
4066 else
4067 CLR_OPTION (Opt_intensityStyles);
4068 4159
4069 want_refresh = 1; 4160 scr_touch (true);
4070 want_full_refresh = 1;
4071 break; 4161 break;
4072#endif 4162#endif
4073 case 1048: /* alternative cursor save */ 4163 case 1048: /* alternative cursor save */
4074 case 1049: 4164 case 1049:
4075 if (OPTION (Opt_secondaryScreen)) 4165 if (OPTION (Opt_secondaryScreen))
… …
4095 case 3: /* 80/132 */ 4185 case 3: /* 80/132 */
4096 if (priv_modes & PrivMode_132OK) 4186 if (priv_modes & PrivMode_132OK)
4097 set_widthheight (((state ? 132 : 80) * fwidth), height); 4187 set_widthheight (((state ? 132 : 80) * fwidth), height);
4098 break; 4188 break;
4099 case 4: /* smooth scrolling */ 4189 case 4: /* smooth scrolling */
4100 if (!state) 4190 set_option (Opt_jumpScroll, !state);
4101 SET_OPTION (Opt_jumpScroll);
4102 else
4103 CLR_OPTION (Opt_jumpScroll);
4104 break; 4191 break;
4105 case 5: /* reverse video */ 4192 case 5: /* reverse video */
4106 scr_rvideo_mode (state); 4193 scr_rvideo_mode (state);
4107 break; 4194 break;
4108 case 6: /* relative/absolute origins */ 4195 case 6: /* relative/absolute origins */
… …
4149#if 0 4236#if 0
4150 case 1001: 4237 case 1001:
4151 break; /* X11 mouse highlighting */ 4238 break; /* X11 mouse highlighting */
4152#endif 4239#endif
4153 case 1010: /* scroll to bottom on TTY output inhibit */ 4240 case 1010: /* scroll to bottom on TTY output inhibit */
4154 if (!state) 4241 set_option (Opt_scrollTtyOutput, !state);
4155 SET_OPTION (Opt_scrollTtyOutput);
4156 else
4157 CLR_OPTION (Opt_scrollTtyOutput);
4158 break; 4242 break;
4159 case 1011: /* scroll to bottom on key press */ 4243 case 1011: /* scroll to bottom on key press */
4160 if (state) 4244 set_option (Opt_scrollTtyKeypress, state);
4161 SET_OPTION (Opt_scrollTtyKeypress);
4162 else
4163 CLR_OPTION (Opt_scrollTtyKeypress);
4164 break; 4245 break;
4165 case 1047: /* secondary screen w/ clearing last */ 4246 case 1047: /* secondary screen w/ clearing last */
4166 if (OPTION (Opt_secondaryScreen)) 4247 if (OPTION (Opt_secondaryScreen))
4167 if (current_screen != PRIMARY) 4248 if (current_screen != PRIMARY)
4168 scr_erase_screen (2); 4249 scr_erase_screen (2);
… …
4306 scr_color (Color_bg, Color_bg); 4387 scr_color (Color_bg, Color_bg);
4307 break; 4388 break;
4308 4389
4309 //case 50: // not variable spacing 4390 //case 50: // not variable spacing
4310 4391
4311#ifndef NO_BRIGHTCOLOR 4392#if ENABLE_FRILLS
4312 case 90: 4393 case 90:
4313 case 91: /* set bright fg color */ 4394 case 91: /* set bright fg color */
4314 case 92: 4395 case 92:
4315 case 93: 4396 case 93:
4316 case 94: 4397 case 94:
… …
4361 */ 4442 */
4362void 4443void
4363rxvt_term::tt_printf (const char *fmt,...) 4444rxvt_term::tt_printf (const char *fmt,...)
4364{ 4445{
4365 va_list arg_ptr; 4446 va_list arg_ptr;
4366 unsigned char buf[256]; 4447 char buf[256];
4367 4448
4368 va_start (arg_ptr, fmt); 4449 va_start (arg_ptr, fmt);
4369 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4450 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4370 va_end (arg_ptr); 4451 va_end (arg_ptr);
4371 tt_write (buf, strlen (buf)); 4452 tt_write (buf, strlen (buf));
… …
4376 * or generated by us in response to a query ESC sequence. 4457 * or generated by us in response to a query ESC sequence.
4377 */ 4458 */
4378const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4459const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4379 4460
4380void 4461void
4381rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4462rxvt_term::tt_write (const char *data, unsigned int len)
4382{ 4463{
4464 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4465 return;
4466
4467 if (pty.pty < 0)
4468 return;
4469
4383 if (v_buflen == 0) 4470 if (v_buflen == 0)
4384 { 4471 {
4385 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4472 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4386 4473
4387 if ((unsigned int)written == len) 4474 if ((unsigned int)written == len)
… …
4389 4476
4390 data += written; 4477 data += written;
4391 len -= written; 4478 len -= written;
4392 } 4479 }
4393 4480
4394 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4481 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4395 4482
4396 memcpy (v_buffer + v_buflen, data, len); 4483 memcpy (v_buffer + v_buflen, data, len);
4397 v_buflen += len; 4484 v_buflen += len;
4398 4485
4399 pty_ev.set (EVENT_READ | EVENT_WRITE); 4486 pty_ev.set (EVENT_READ | EVENT_WRITE);

Diff Legend

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