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.258 by root, Thu Jan 12 03:32:56 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)
1256 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1257 {
1258 if (hidden_cursor)
1259 {
1260 hidden_cursor = 0;
1261 want_refresh = 1;
1262 }
1263
1264 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1265 }
1266#endif
1267
1268#if defined(POINTER_BLANK)
1269 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1270 {
1271 if (ev.type == MotionNotify
1272 || ev.type == ButtonPress
1273 || ev.type == ButtonRelease)
1274 if (hidden_pointer)
1275 pointer_unblank ();
1276
1277 if (ev.type == KeyPress && hidden_pointer == 0)
1278 pointer_blank ();
1279 }
1280#endif
1281
1282 Window unused_root, unused_child; 1316 Window unused_root, unused_child;
1283 int unused_root_x, unused_root_y; 1317 int unused_root_x, unused_root_y;
1284 unsigned int unused_mask; 1318 unsigned int unused_mask;
1285 1319
1286 switch (ev.type) 1320 switch (ev.type)
… …
1293 1327
1294 break; 1328 break;
1295 1329
1296 case KeyRelease: 1330 case KeyRelease:
1297 { 1331 {
1298#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1332#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1299 KeySym ks; 1333 KeySym keysym;
1300 1334
1301 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1335 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1302#endif 1336#endif
1303 1337
1304#if ENABLE_FRILLS || ISO_14755 1338#if ENABLE_FRILLS || ISO_14755
1305 // ISO 14755 support 1339 // ISO 14755 support
1306 if (iso14755buf) 1340 if (iso14755buf)
… …
1311# endif 1345# endif
1312# if ISO_14755 1346# if ISO_14755
1313 // iso14755 part 5.2 handling: release time 1347 // iso14755 part 5.2 handling: release time
1314 // first: controls 1348 // first: controls
1315 if ((ev.xkey.state & ControlMask) 1349 if ((ev.xkey.state & ControlMask)
1316 && ((ks >= 0x40 && ks <= 0x5f) 1350 && ((keysym >= 0x40 && keysym <= 0x5f)
1317 || (ks >= 0x61 && ks <= 0x7f))) 1351 || (keysym >= 0x61 && keysym <= 0x7f)))
1318 { 1352 {
1319 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1353 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1320 commit_iso14755 (); 1354 commit_iso14755 ();
1321 return; // case-break; 1355 goto skip_switch;
1322 } 1356 }
1323 1357
1324 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1358 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1325 if (i[0] == ks) 1359 if (i[0] == keysym)
1326 { 1360 {
1327 iso14755buf = ISO_14755_51 | i[1]; 1361 iso14755buf = ISO_14755_51 | i[1];
1328 commit_iso14755 (); 1362 commit_iso14755 ();
1329 return; // case-break; 1363 goto skip_switch;
1330 } 1364 }
1331 1365
1332 scr_bell (); 1366 scr_bell ();
1333# endif 1367# endif
1334 iso14755buf = 0; 1368 iso14755buf = 0;
… …
1353 else 1387 else
1354 iso14755buf = 0; 1388 iso14755buf = 0;
1355 } 1389 }
1356#endif 1390#endif
1357 1391
1392 if (ev.xany.window == vt
1393 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1394 break;
1395
1358#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1396#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1359 if (!(ev.xkey.state & ControlMask)) 1397 if (!(ev.xkey.state & ControlMask))
1360 slip_wheel_ev.stop (); 1398 slip_wheel_ev.stop ();
1361 else if (ks == XK_Control_L || ks == XK_Control_R) 1399 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1362 mouse_slip_wheel_speed = 0; 1400 mouse_slip_wheel_speed = 0;
1363#endif 1401#endif
1364 break; 1402 break;
1365 } 1403 }
1366 1404
… …
1496 1534
1497 case SelectionRequest: 1535 case SelectionRequest:
1498 selection_send (ev.xselectionrequest); 1536 selection_send (ev.xselectionrequest);
1499 break; 1537 break;
1500 1538
1539 case MapNotify:
1540 mapped = 1;
1541#ifdef TEXT_BLINK
1542 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1543#endif
1544 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1545 break;
1546
1501 case UnmapNotify: 1547 case UnmapNotify:
1502 mapped = 0; 1548 mapped = 0;
1503#ifdef TEXT_BLINK 1549#ifdef TEXT_BLINK
1504 text_blink_ev.stop (); 1550 text_blink_ev.stop ();
1505#endif 1551#endif
1506 break; 1552 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; 1553 break;
1514 1554
1515#ifdef TRANSPARENT 1555#ifdef TRANSPARENT
1516 case ReparentNotify: 1556 case ReparentNotify:
1517 rootwin_cb (ev); 1557 rootwin_cb (ev);
… …
1531 1571
1532 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1572 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1533 scr_expose (ev.xexpose.x, ev.xexpose.y, 1573 scr_expose (ev.xexpose.x, ev.xexpose.y,
1534 ev.xexpose.width, ev.xexpose.height, False); 1574 ev.xexpose.width, ev.xexpose.height, False);
1535 1575
1536 scr_refresh (refresh_type); 1576 want_refresh = 1;
1537 } 1577 }
1538 else 1578 else
1539 { 1579 {
1540 XEvent unused_event; 1580 XEvent unused_event;
1541 1581
… …
1576 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1616 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1577 break; 1617 break;
1578 1618
1579 if (ev.xany.window == vt) 1619 if (ev.xany.window == vt)
1580 { 1620 {
1621 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1622 ; // nop
1581 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1623 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1582 { 1624 {
1583 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1625 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1584 ; 1626 ;
1585 1627
1586 XQueryPointer (disp, vt, 1628 XQueryPointer (disp, vt,
… …
1666 &unused_root_x, &unused_root_y, 1708 &unused_root_x, &unused_root_y,
1667 &ev.xbutton.x, &ev.xbutton.y, 1709 &ev.xbutton.x, &ev.xbutton.y,
1668 &unused_mask); 1710 &unused_mask);
1669 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1711 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1670 scrollbar_size ()); 1712 scrollbar_size ());
1671 scr_refresh (refresh_type); 1713 want_refresh = 1;
1672 refresh_limit = 0; 1714 refresh_limit = 0;
1673 scrollbar_show (1); 1715 scrollbar_show (1);
1674 } 1716 }
1675 break; 1717 break;
1676 } 1718 }
1719
1720skip_switch: ;
1721
1722#if defined(CURSOR_BLINK)
1723 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1724 {
1725 if (hidden_cursor)
1726 {
1727 hidden_cursor = 0;
1728 want_refresh = 1;
1729 }
1730
1731 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1732 }
1733#endif
1734
1735#if defined(POINTER_BLANK)
1736 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1737 {
1738 if (ev.type == MotionNotify
1739 || ev.type == ButtonPress
1740 || ev.type == ButtonRelease)
1741 if (hidden_pointer)
1742 pointer_unblank ();
1743
1744 if (ev.type == KeyPress && hidden_pointer == 0)
1745 pointer_blank ();
1746 }
1747#endif
1677} 1748}
1678 1749
1679void 1750void
1680rxvt_term::focus_in () 1751rxvt_term::focus_in ()
1681{ 1752{
1682 if (!focus) 1753 if (!focus)
1683 { 1754 {
1684 focus = 1; 1755 focus = 1;
1685 want_refresh = 1; 1756 want_refresh = 1;
1757
1758 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1759
1686#if USE_XIM 1760#if USE_XIM
1687 if (Input_Context != NULL) 1761 if (Input_Context != NULL)
1688 { 1762 {
1689 IMSetStatusPosition (); 1763 IMSetStatusPosition ();
1690 XSetICFocus (Input_Context); 1764 XSetICFocus (Input_Context);
… …
1710 if (focus) 1784 if (focus)
1711 { 1785 {
1712 focus = 0; 1786 focus = 0;
1713 want_refresh = 1; 1787 want_refresh = 1;
1714 1788
1789 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1790
1715#if ENABLE_FRILLS || ISO_14755 1791#if ENABLE_FRILLS || ISO_14755
1792 if (iso14755buf)
1793 {
1716 iso14755buf = 0; 1794 iso14755buf = 0;
1717#endif
1718#if ENABLE_OVERLAY 1795# if ENABLE_OVERLAY
1719 scr_overlay_off (); 1796 scr_overlay_off ();
1797# endif
1798 }
1720#endif 1799#endif
1721#if USE_XIM 1800#if USE_XIM
1722 if (Input_Context != NULL) 1801 if (Input_Context != NULL)
1723 XUnsetICFocus (Input_Context); 1802 XUnsetICFocus (Input_Context);
1724#endif 1803#endif
… …
1768rxvt_term::button_press (XButtonEvent &ev) 1847rxvt_term::button_press (XButtonEvent &ev)
1769{ 1848{
1770 int reportmode = 0, clickintime; 1849 int reportmode = 0, clickintime;
1771 1850
1772 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1851 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1852
1773 if (!bypass_keystate) 1853 if (!bypass_keystate)
1774 reportmode = !! (priv_modes & PrivMode_mouse_report); 1854 reportmode = !! (priv_modes & PrivMode_mouse_report);
1775 1855
1776 /* 1856 /*
1777 * VT window processing of button press 1857 * VT window processing of button press
… …
1797#ifdef MOUSE_REPORT_DOUBLECLICK 1877#ifdef MOUSE_REPORT_DOUBLECLICK
1798 if (ev.button == MEvent.button && clickintime) 1878 if (ev.button == MEvent.button && clickintime)
1799 { 1879 {
1800 /* same button, within alloted time */ 1880 /* same button, within alloted time */
1801 MEvent.clicks++; 1881 MEvent.clicks++;
1882
1802 if (MEvent.clicks > 1) 1883 if (MEvent.clicks > 1)
1803 { 1884 {
1804 /* only report double clicks */ 1885 /* only report double clicks */
1805 MEvent.clicks = 2; 1886 MEvent.clicks = 2;
1806 mouse_report (ev); 1887 mouse_report (ev);
… …
1826 else 1907 else
1827 { 1908 {
1828 if (ev.button != MEvent.button) 1909 if (ev.button != MEvent.button)
1829 MEvent.clicks = 0; 1910 MEvent.clicks = 0;
1830 1911
1912 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1831 switch (ev.button) 1913 switch (ev.button)
1832 { 1914 {
1833 case Button1: 1915 case Button1:
1834 /* allow meta + click to select rectangular areas */ 1916 /* allow meta + click to select rectangular areas */
1835 /* should be done in screen.C */ 1917 /* should be done in screen.C */
1836#if ENABLE_FRILLS 1918#if ENABLE_FRILLS
1837 selection.rect = !!(ev.state & ModMetaMask); 1919 selection.rect = !!(ev.state & ModMetaMask);
1838#else 1920#else
1839 selection.rect = false; 1921 selection.rect = false;
1840#endif 1922#endif
1841 1923
1842 /* allow shift+left click to extend selection */ 1924 /* allow shift+left click to extend selection */
1843 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1925 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1844 { 1926 {
1845 if (MEvent.button == Button1 && clickintime) 1927 if (MEvent.button == Button1 && clickintime)
1846 selection_rotate (ev.x, ev.y); 1928 selection_rotate (ev.x, ev.y);
1847 else 1929 else
1848 selection_extend (ev.x, ev.y, 1); 1930 selection_extend (ev.x, ev.y, 1);
1849 } 1931 }
1850 else 1932 else
1851 { 1933 {
1852 if (MEvent.button == Button1 && clickintime) 1934 if (MEvent.button == Button1 && clickintime)
1853 MEvent.clicks++; 1935 MEvent.clicks++;
1854 else 1936 else
1855 MEvent.clicks = 1; 1937 MEvent.clicks = 1;
1856 1938
1857 selection_click (MEvent.clicks, ev.x, ev.y); 1939 selection_click (MEvent.clicks, ev.x, ev.y);
1858 } 1940 }
1859 1941
1860 MEvent.button = Button1; 1942 MEvent.button = Button1;
1861 break; 1943 break;
1862 1944
1863 case Button3: 1945 case Button3:
1864 if (MEvent.button == Button3 && clickintime) 1946 if (MEvent.button == Button3 && clickintime)
1865 selection_rotate (ev.x, ev.y); 1947 selection_rotate (ev.x, ev.y);
1866 else 1948 else
1867 selection_extend (ev.x, ev.y, 1); 1949 selection_extend (ev.x, ev.y, 1);
1868 1950
1869 MEvent.button = Button3; 1951 MEvent.button = Button3;
1870 break; 1952 break;
1871 } 1953 }
1872 } 1954 }
1873 1955
1874 MEvent.time = ev.time; 1956 MEvent.time = ev.time;
1875 return; 1957 return;
1876 } 1958 }
1877 1959
… …
2013 } 2095 }
2014 2096
2015 break; 2097 break;
2016 } 2098 }
2017 } 2099 }
2100
2018 return; 2101 return;
2019 } 2102 }
2103
2020#if MENUBAR 2104#if MENUBAR
2021 /* 2105 /*
2022 * Menubar window processing of button press 2106 * Menubar window processing of button press
2023 */ 2107 */
2024 if (isMenuBarWindow (ev.window)) 2108 if (isMenuBarWindow (ev.window))
… …
2087 if (priv_modes & PrivMode_mouse_report 2171 if (priv_modes & PrivMode_mouse_report
2088 && bypass_keystate 2172 && bypass_keystate
2089 && ev.button == Button1 && MEvent.clicks <= 1) 2173 && ev.button == Button1 && MEvent.clicks <= 1)
2090 selection_extend (ev.x, ev.y, 0); 2174 selection_extend (ev.x, ev.y, 0);
2091 2175
2176 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2177 return;
2178
2092 switch (ev.button) 2179 switch (ev.button)
2093 { 2180 {
2094 case Button1: 2181 case Button1:
2095 case Button3: 2182 case Button3:
2096 selection_make (ev.time); 2183 selection_make (ev.time);
… …
2127 slip_wheel_ev.start (); 2214 slip_wheel_ev.start ();
2128 } 2215 }
2129 else 2216 else
2130 { 2217 {
2131# endif 2218# endif
2132# ifdef JUMP_MOUSE_WHEEL
2133 scr_page (v, i); 2219 scr_page (v, i);
2134 scr_refresh (SMOOTH_REFRESH);
2135 scrollbar_show (1); 2220 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 2221# ifdef MOUSE_SLIP_WHEELING
2145 } 2222 }
2146#endif 2223# endif
2147 } 2224 }
2148 break; 2225 break;
2149#endif 2226#endif
2150 } 2227 }
2151 } 2228 }
… …
2640 2717
2641bool 2718bool
2642rxvt_term::cmd_parse () 2719rxvt_term::cmd_parse ()
2643{ 2720{
2644 bool flag = false; 2721 bool flag = false;
2645 unicode_t ch = NOCHAR; 2722 wchar_t ch = NOCHAR;
2646 unsigned char *seq_begin; // remember start of esc-sequence here 2723 char *seq_begin; // remember start of esc-sequence here
2647 2724
2648 for (;;) 2725 for (;;)
2649 { 2726 {
2650 if (ch == NOCHAR) 2727 if (ch == NOCHAR)
2651 { 2728 {
2652 seq_begin = cmdbuf_ptr; 2729 seq_begin = cmdbuf_ptr;
2653 ch = next_char (); 2730 ch = next_char ();
2654 }
2655 2731
2656 if (ch == NOCHAR) // TODO: improve 2732 if (ch == NOCHAR)
2657 break; 2733 break;
2734 }
2658 2735
2659 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2736 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2660 { 2737 {
2661 if (!seen_input) 2738 if (!seen_input)
2662 { 2739 {
… …
2671 if (seen_resize && cmd_pid) 2748 if (seen_resize && cmd_pid)
2672 kill (-cmd_pid, SIGWINCH); 2749 kill (-cmd_pid, SIGWINCH);
2673 } 2750 }
2674 2751
2675 /* Read a text string from the input buffer */ 2752 /* Read a text string from the input buffer */
2676 unicode_t buf[UBUFSIZ]; 2753 wchar_t buf[UBUFSIZ];
2677 bool refreshnow = false; 2754 bool refreshnow = false;
2678 int nlines = 0; 2755 int nlines = 0;
2679 unicode_t *str = buf; 2756 wchar_t *str = buf;
2680 unicode_t *eol = str + min (ncol, UBUFSIZ); 2757 wchar_t *eol = str + min (ncol, UBUFSIZ);
2681 2758
2682 for (;;) 2759 for (;;)
2683 { 2760 {
2684 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2761 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2685 break; 2762 break;
… …
2695 2772
2696 if (!OPTION (Opt_jumpScroll) 2773 if (!OPTION (Opt_jumpScroll)
2697 || (refresh_count >= refresh_limit * (nrow - 1))) 2774 || (refresh_count >= refresh_limit * (nrow - 1)))
2698 { 2775 {
2699 refreshnow = true; 2776 refreshnow = true;
2777 refresh_count = 0;
2700 ch = NOCHAR; 2778 ch = NOCHAR;
2701 break; 2779 break;
2702 } 2780 }
2703 2781
2704 // scr_add_lines only works for nlines <= nrow - 1. 2782 // scr_add_lines only works for nlines <= nrow - 1.
2705 if (nlines >= nrow - 1) 2783 if (nlines >= nrow - 1)
2706 { 2784 {
2785 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2707 scr_add_lines (buf, nlines, str - buf); 2786 scr_add_lines (buf, str - buf, nlines);
2787
2708 nlines = 0; 2788 nlines = 0;
2709 str = buf; 2789 str = buf;
2710 eol = str + min (ncol, UBUFSIZ); 2790 eol = str + min (ncol, UBUFSIZ);
2711 } 2791 }
2712 2792
… …
2725 2805
2726 seq_begin = cmdbuf_ptr; 2806 seq_begin = cmdbuf_ptr;
2727 ch = next_char (); 2807 ch = next_char ();
2728 } 2808 }
2729 2809
2810 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2730 scr_add_lines (buf, nlines, str - buf); 2811 scr_add_lines (buf, str - buf, nlines);
2731 2812
2732 /* 2813 /*
2733 * If there have been a lot of new lines, then update the screen 2814 * 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. 2815 * 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 2816 * the number of pages between refreshes is refresh_limit, which
… …
2741 refresh_limit++; 2822 refresh_limit++;
2742 else 2823 else
2743 { 2824 {
2744 flag = true; 2825 flag = true;
2745 scr_refresh (refresh_type); 2826 scr_refresh (refresh_type);
2827 want_refresh = 1;
2746 } 2828 }
2747 } 2829 }
2748 2830
2749 } 2831 }
2750 else 2832 else
… …
2765 } 2847 }
2766 2848
2767 return flag; 2849 return flag;
2768} 2850}
2769 2851
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 2852// read the next character
2780unicode_t 2853wchar_t
2781rxvt_term::next_char () 2854rxvt_term::next_char ()
2782{ 2855{
2783 while (cmdbuf_ptr < cmdbuf_endp) 2856 while (cmdbuf_ptr < cmdbuf_endp)
2784 { 2857 {
2785 // assume 7-bit to be ascii ALWAYS 2858 // assume 7-bit to be ascii ALWAYS
2786 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2859 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2787 return *cmdbuf_ptr++; 2860 return *cmdbuf_ptr++;
2788 2861
2789 wchar_t wc; 2862 wchar_t wc;
2790 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2863 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2791 2864
2792 if (len == (size_t)-2) 2865 if (len == (size_t)-2)
2793 { 2866 {
2794 // the mbstate stores incomplete sequences. didn't know this :/ 2867 // the mbstate stores incomplete sequences. didn't know this :/
2795 cmdbuf_ptr = cmdbuf_endp; 2868 cmdbuf_ptr = cmdbuf_endp;
2796 break; 2869 break;
2797 } 2870 }
2798 2871
2799 if (len == (size_t)-1) 2872 if (len == (size_t)-1)
2800 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2873 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2801 2874
2802 // assume wchar == unicode 2875 // assume wchar == unicode
2803 cmdbuf_ptr += len; 2876 cmdbuf_ptr += len;
2804 return wc & UNICODE_MASK; 2877 return wc & UNICODE_MASK;
2805 } 2878 }
2806 2879
2807 return NOCHAR; 2880 return NOCHAR;
2881}
2882
2883// read the next octet
2884uint32_t
2885rxvt_term::next_octet ()
2886{
2887 return cmdbuf_ptr < cmdbuf_endp
2888 ? (unsigned char)*cmdbuf_ptr++
2889 : NOCHAR;
2808} 2890}
2809 2891
2810/* rxvt_cmd_getc () - Return next input character */ 2892/* rxvt_cmd_getc () - Return next input character */
2811/* 2893/*
2812 * Return the next input character after first passing any keyboard input 2894 * Return the next input character after first passing any keyboard input
2813 * to the command. 2895 * to the command.
2814 */ 2896 */
2815unicode_t 2897wchar_t
2816rxvt_term::cmd_getc () 2898rxvt_term::cmd_getc ()
2817{ 2899{
2818 unicode_t c = next_char (); 2900 wchar_t c = next_char ();
2819 2901
2820 if (c == NOCHAR) 2902 if (c == NOCHAR)
2821 throw out_of_input; 2903 throw out_of_input;
2822 2904
2823 return c; 2905 return c;
2824} 2906}
2825 2907
2826unicode_t 2908uint32_t
2827rxvt_term::cmd_get8 () 2909rxvt_term::cmd_get8 ()
2828{ 2910{
2829 unicode_t c = next_octet (); 2911 uint32_t c = next_octet ();
2830 2912
2831 if (c == NOCHAR) 2913 if (c == NOCHAR)
2832 throw out_of_input; 2914 throw out_of_input;
2833 2915
2834 return c; 2916 return c;
… …
2934 case C0_ESC: 3016 case C0_ESC:
2935 process_escape_seq (); 3017 process_escape_seq ();
2936 break; 3018 break;
2937 case C0_ENQ: /* terminal Status */ 3019 case C0_ENQ: /* terminal Status */
2938 if (rs[Rs_answerbackstring]) 3020 if (rs[Rs_answerbackstring])
2939 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3021 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2940 (unsigned int)strlen (rs[Rs_answerbackstring]));
2941 else 3022 else
2942 tt_write ((unsigned char *)VT100_ANS, 3023 tt_write (VT100_ANS, strlen (VT100_ANS));
2943 (unsigned int)strlen (VT100_ANS));
2944 break; 3024 break;
2945 case C0_BEL: /* bell */ 3025 case C0_BEL: /* bell */
2946 scr_bell (); 3026 scr_bell ();
2947 break; 3027 break;
2948 case C0_BS: /* backspace */ 3028 case C0_BS: /* backspace */
… …
3103 break; 3183 break;
3104 3184
3105 /* 8.3.87: NEXT LINE */ 3185 /* 8.3.87: NEXT LINE */
3106 case C1_NEL: /* ESC E */ 3186 case C1_NEL: /* ESC E */
3107 { 3187 {
3108 unicode_t nlcr[] = { C0_LF, C0_CR }; 3188 wchar_t nlcr[] = { C0_LF, C0_CR };
3109 scr_add_lines (nlcr, 1, 2); 3189 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3110 } 3190 }
3111 break; 3191 break;
3112 3192
3113 /* kidnapped escape sequence: Should be 8.3.48 */ 3193 /* kidnapped escape sequence: Should be 8.3.48 */
3114 case C1_ESA: /* ESC G */ 3194 case C1_ESA: /* ESC G */
… …
3136 process_dcs_seq (); 3216 process_dcs_seq ();
3137 break; 3217 break;
3138 3218
3139 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3219 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3140 case C1_SCI: /* ESC Z */ 3220 case C1_SCI: /* ESC Z */
3141 tt_write ((const unsigned char *)ESCZ_ANSWER, 3221 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3142 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3143 break; /* steal obsolete ESC [ c */ 3222 break; /* steal obsolete ESC [ c */
3144 3223
3145 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3224 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3146 case C1_CSI: /* ESC [ */ 3225 case C1_CSI: /* ESC [ */
3147 process_csi_seq (); 3226 process_csi_seq ();
… …
3391 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3470 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3392 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3471 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3393 break; 3472 break;
3394 3473
3395 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3474 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3396 tt_write ((const unsigned char *)VT100_ANS, 3475 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3397 (unsigned int) (sizeof (VT100_ANS) - 1));
3398 break; 3476 break;
3399 3477
3400 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3478 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3401 process_sgr_mode (nargs, arg); 3479 process_sgr_mode (nargs, arg);
3402 break; 3480 break;
… …
3604/*----------------------------------------------------------------------*/ 3682/*----------------------------------------------------------------------*/
3605/* 3683/*
3606 * get input up until STRING TERMINATOR (or BEL) 3684 * get input up until STRING TERMINATOR (or BEL)
3607 * ends_how is terminator used. returned input must be free()'d 3685 * ends_how is terminator used. returned input must be free()'d
3608 */ 3686 */
3609unsigned char * 3687char *
3610rxvt_term::get_to_st (unicode_t &ends_how) 3688rxvt_term::get_to_st (unicode_t &ends_how)
3611{ 3689{
3612 unicode_t ch; 3690 unicode_t ch;
3613 bool seen_esc = false; 3691 bool seen_esc = false;
3614 unsigned int n = 0; 3692 unsigned int n = 0;
… …
3647 3725
3648 string[n++] = '\0'; 3726 string[n++] = '\0';
3649 3727
3650 ends_how = (ch == 0x5c ? C0_ESC : ch); 3728 ends_how = (ch == 0x5c ? C0_ESC : ch);
3651 3729
3652 return (unsigned char *)rxvt_wcstombs (string); 3730 return rxvt_wcstombs (string);
3653} 3731}
3654 3732
3655/*----------------------------------------------------------------------*/ 3733/*----------------------------------------------------------------------*/
3656/* 3734/*
3657 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3735 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3658 */ 3736 */
3659void 3737void
3660rxvt_term::process_dcs_seq () 3738rxvt_term::process_dcs_seq ()
3661{ 3739{
3662 unsigned char *s; 3740 char *s;
3663 unicode_t eh; 3741 unicode_t eh;
3664 3742
3665 /* 3743 /*
3666 * Not handled yet 3744 * Not handled yet
3667 */ 3745 */
… …
3686 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3764 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3687 arg = arg * 10 + (ch - '0'); 3765 arg = arg * 10 + (ch - '0');
3688 3766
3689 if (ch == ';') 3767 if (ch == ';')
3690 { 3768 {
3691 unsigned char *s = get_to_st (eh); 3769 char *s = get_to_st (eh);
3692 3770
3693 if (s) 3771 if (s)
3694 { 3772 {
3695 process_xterm_seq (arg, (char *)s, eh); 3773 process_xterm_seq (arg, s, eh);
3696 free (s); 3774 free (s);
3697 } 3775 }
3698 } 3776 }
3699} 3777}
3700 3778
3701void 3779void
3702rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3780rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3703{ 3781{
3704 if (str[0] == '?' && !str[1]) 3782 if (str[0] == '?' && !str[1])
3705 { 3783 {
3706 unsigned short r, g, b; 3784 unsigned short r, g, b;
3707 pix_colors_focused[color].get (display, r, g, b); 3785 pix_colors_focused[color].get (display, r, g, b);
… …
3713 3791
3714/* 3792/*
3715 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3793 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3716 */ 3794 */
3717void 3795void
3718rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3796rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3719{ 3797{
3720 int changed = 0; 3798 int changed = 0;
3721 int color; 3799 int color;
3722 char *buf, *name; 3800 char *buf, *name;
3723 bool query = str[0] == '?' && !str[1]; 3801 bool query = str[0] == '?' && !str[1];
… …
3780 { 3858 {
3781 if ((name = strchr (buf, ';')) == NULL) 3859 if ((name = strchr (buf, ';')) == NULL)
3782 break; 3860 break;
3783 3861
3784 *name++ = '\0'; 3862 *name++ = '\0';
3785 color = atoi (buf); 3863 color = atoi (buf) + minCOLOR;
3786 3864
3787 if (color < 0 || color >= TOTAL_COLORS) 3865 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3788 break; 3866 break;
3789 3867
3790 if ((buf = strchr (name, ';')) != NULL) 3868 if ((buf = strchr (name, ';')) != NULL)
3791 *buf++ = '\0'; 3869 *buf++ = '\0';
3792 3870
3793 if (name[0] == '?' && !name[1]) 3871 if (name[0] == '?' && !name[1])
3794 { 3872 {
3795 unsigned short r, g, b; 3873 unsigned short r, g, b;
3796 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3874 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); 3875 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3798 } 3876 }
3799 else 3877 else
3800 set_window_color (color + minCOLOR, name); 3878 set_window_color (color, name);
3801 } 3879 }
3802 break; 3880 break;
3803 case XTerm_Color00: 3881 case XTerm_Color00:
3804 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3882 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3805 break; 3883 break;
3806 case XTerm_Color01: 3884 case XTerm_Color01:
3807 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3885 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3808 break; 3886 break;
3809#ifndef NO_CURSORCOLOR 3887#ifndef NO_CURSORCOLOR
3810 case XTerm_Color_cursor: 3888 case XTerm_Color_cursor:
3811 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3889 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3812 break; 3890 break;
… …
3816 break; 3894 break;
3817 case XTerm_Color_pointer_bg: 3895 case XTerm_Color_pointer_bg:
3818 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3896 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3819 break; 3897 break;
3820#ifndef NO_BOLD_UNDERLINE_REVERSE 3898#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: 3899 case XTerm_Color_RV:
3828 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3900 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3901 break;
3902 case Rxvt_Color_BD:
3903 case URxvt_Color_BD:
3904 process_color_seq (op, Color_BD, str, resp);
3905 break;
3906 case Rxvt_Color_UL:
3907 case URxvt_Color_UL:
3908 process_color_seq (op, Color_UL, str, resp);
3829 break; 3909 break;
3830 case URxvt_Color_IT: 3910 case URxvt_Color_IT:
3831 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3911 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3832 break; 3912 break;
3833#endif 3913#endif
… …
3838 if (am_transparent) 3918 if (am_transparent)
3839 want_full_refresh = want_refresh = 1; 3919 want_full_refresh = want_refresh = 1;
3840 break; 3920 break;
3841#endif 3921#endif
3842 3922
3843 case XTerm_Pixmap: 3923 case Rxvt_Pixmap:
3844 if (*str != ';') 3924 if (*str != ';')
3845 { 3925 {
3846#if XPM_BACKGROUND 3926#if XPM_BACKGROUND
3847 scale_pixmap (""); /* reset to default scaling */ 3927 scale_pixmap (""); /* reset to default scaling */
3848 set_bgPixmap (str); /* change pixmap */ 3928 set_bgPixmap (str); /* change pixmap */
3849#endif
3850 scr_touch (true); 3929 scr_touch (true);
3930#endif
3851 } 3931 }
3932
3852 while ((str = strchr (str, ';')) != NULL) 3933 while ((str = strchr (str, ';')) != NULL)
3853 { 3934 {
3854 str++; 3935 str++;
3855#if XPM_BACKGROUND 3936#if XPM_BACKGROUND
3856 changed += scale_pixmap (str); 3937 changed += scale_pixmap (str);
… …
3859 3940
3860 if (changed) 3941 if (changed)
3861 { 3942 {
3862#ifdef XPM_BACKGROUND 3943#ifdef XPM_BACKGROUND
3863 resize_pixmap (); 3944 resize_pixmap ();
3864#endif
3865 scr_touch (true); 3945 scr_touch (true);
3946#endif
3866 } 3947 }
3867 break; 3948 break;
3868 3949
3869 case XTerm_restoreFG: 3950 case Rxvt_restoreFG:
3870 set_window_color (Color_fg, str); 3951 set_window_color (Color_fg, str);
3871 break; 3952 break;
3872 case XTerm_restoreBG: 3953 case Rxvt_restoreBG:
3873 set_window_color (Color_bg, str); 3954 set_window_color (Color_bg, str);
3874 break; 3955 break;
3875 3956
3876 case XTerm_logfile: 3957 case XTerm_logfile:
3877 // TODO, when secure mode? 3958 // TODO, when secure mode?
… …
3882 if (OPTION (Opt_insecure)) 3963 if (OPTION (Opt_insecure))
3883 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3964 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3884 break; 3965 break;
3885#endif 3966#endif
3886#if 0 3967#if 0
3887 case XTerm_dumpscreen: /* no error notices */ 3968 case Rxvt_dumpscreen: /* no error notices */
3888 { 3969 {
3889 int fd; 3970 int fd;
3890 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3971 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3891 { 3972 {
3892 scr_dump (fd); 3973 scr_dump (fd);
… …
3930 } 4011 }
3931 break; 4012 break;
3932 4013
3933 case URxvt_view_up: 4014 case URxvt_view_up:
3934 case URxvt_view_down: 4015 case URxvt_view_down:
4016 {
3935 int lines = atoi (str); 4017 int lines = atoi (str);
3936 4018
3937 if (lines) 4019 if (lines)
3938 scr_page (op == URxvt_view_up ? UP : DN, lines); 4020 scr_page (op == URxvt_view_up ? UP : DN, lines);
3939 else 4021 else
3940 {
3941 scr_erase_savelines (); 4022 scr_erase_savelines ();
3942 } 4023 }
3943 4024
4025 break;
4026#endif
4027
4028#if ENABLE_PERL
4029 case URxvt_perl:
4030 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
4031 ; // no responses yet
3944 break; 4032 break;
3945#endif 4033#endif
3946 } 4034 }
3947} 4035}
3948/*----------------------------------------------------------------------*/ 4036/*----------------------------------------------------------------------*/
… …
4059 /* extra handling for values with state unkept */ 4147 /* extra handling for values with state unkept */
4060 switch (arg[i]) 4148 switch (arg[i])
4061 { 4149 {
4062#if ENABLE_STYLES 4150#if ENABLE_STYLES
4063 case 1021: 4151 case 1021:
4064 if (mode) 4152 set_option (Opt_intensityStyles, mode);
4065 SET_OPTION (Opt_intensityStyles);
4066 else
4067 CLR_OPTION (Opt_intensityStyles);
4068 4153
4069 want_refresh = 1; 4154 scr_touch (true);
4070 want_full_refresh = 1;
4071 break; 4155 break;
4072#endif 4156#endif
4073 case 1048: /* alternative cursor save */ 4157 case 1048: /* alternative cursor save */
4074 case 1049: 4158 case 1049:
4075 if (OPTION (Opt_secondaryScreen)) 4159 if (OPTION (Opt_secondaryScreen))
… …
4095 case 3: /* 80/132 */ 4179 case 3: /* 80/132 */
4096 if (priv_modes & PrivMode_132OK) 4180 if (priv_modes & PrivMode_132OK)
4097 set_widthheight (((state ? 132 : 80) * fwidth), height); 4181 set_widthheight (((state ? 132 : 80) * fwidth), height);
4098 break; 4182 break;
4099 case 4: /* smooth scrolling */ 4183 case 4: /* smooth scrolling */
4100 if (!state) 4184 set_option (Opt_jumpScroll, !state);
4101 SET_OPTION (Opt_jumpScroll);
4102 else
4103 CLR_OPTION (Opt_jumpScroll);
4104 break; 4185 break;
4105 case 5: /* reverse video */ 4186 case 5: /* reverse video */
4106 scr_rvideo_mode (state); 4187 scr_rvideo_mode (state);
4107 break; 4188 break;
4108 case 6: /* relative/absolute origins */ 4189 case 6: /* relative/absolute origins */
… …
4149#if 0 4230#if 0
4150 case 1001: 4231 case 1001:
4151 break; /* X11 mouse highlighting */ 4232 break; /* X11 mouse highlighting */
4152#endif 4233#endif
4153 case 1010: /* scroll to bottom on TTY output inhibit */ 4234 case 1010: /* scroll to bottom on TTY output inhibit */
4154 if (!state) 4235 set_option (Opt_scrollTtyOutput, !state);
4155 SET_OPTION (Opt_scrollTtyOutput);
4156 else
4157 CLR_OPTION (Opt_scrollTtyOutput);
4158 break; 4236 break;
4159 case 1011: /* scroll to bottom on key press */ 4237 case 1011: /* scroll to bottom on key press */
4160 if (state) 4238 set_option (Opt_scrollTtyKeypress, state);
4161 SET_OPTION (Opt_scrollTtyKeypress);
4162 else
4163 CLR_OPTION (Opt_scrollTtyKeypress);
4164 break; 4239 break;
4165 case 1047: /* secondary screen w/ clearing last */ 4240 case 1047: /* secondary screen w/ clearing last */
4166 if (OPTION (Opt_secondaryScreen)) 4241 if (OPTION (Opt_secondaryScreen))
4167 if (current_screen != PRIMARY) 4242 if (current_screen != PRIMARY)
4168 scr_erase_screen (2); 4243 scr_erase_screen (2);
… …
4306 scr_color (Color_bg, Color_bg); 4381 scr_color (Color_bg, Color_bg);
4307 break; 4382 break;
4308 4383
4309 //case 50: // not variable spacing 4384 //case 50: // not variable spacing
4310 4385
4311#ifndef NO_BRIGHTCOLOR 4386#if ENABLE_FRILLS
4312 case 90: 4387 case 90:
4313 case 91: /* set bright fg color */ 4388 case 91: /* set bright fg color */
4314 case 92: 4389 case 92:
4315 case 93: 4390 case 93:
4316 case 94: 4391 case 94:
… …
4361 */ 4436 */
4362void 4437void
4363rxvt_term::tt_printf (const char *fmt,...) 4438rxvt_term::tt_printf (const char *fmt,...)
4364{ 4439{
4365 va_list arg_ptr; 4440 va_list arg_ptr;
4366 unsigned char buf[256]; 4441 char buf[256];
4367 4442
4368 va_start (arg_ptr, fmt); 4443 va_start (arg_ptr, fmt);
4369 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4444 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4370 va_end (arg_ptr); 4445 va_end (arg_ptr);
4371 tt_write (buf, strlen (buf)); 4446 tt_write (buf, strlen (buf));
… …
4376 * or generated by us in response to a query ESC sequence. 4451 * or generated by us in response to a query ESC sequence.
4377 */ 4452 */
4378const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4453const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4379 4454
4380void 4455void
4381rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4456rxvt_term::tt_write (const char *data, unsigned int len)
4382{ 4457{
4458 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4459 return;
4460
4461 if (pty.pty < 0)
4462 return;
4463
4383 if (v_buflen == 0) 4464 if (v_buflen == 0)
4384 { 4465 {
4385 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4466 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4386 4467
4387 if ((unsigned int)written == len) 4468 if ((unsigned int)written == len)
… …
4389 4470
4390 data += written; 4471 data += written;
4391 len -= written; 4472 len -= written;
4392 } 4473 }
4393 4474
4394 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4475 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4395 4476
4396 memcpy (v_buffer + v_buflen, data, len); 4477 memcpy (v_buffer + v_buflen, data, len);
4397 v_buflen += len; 4478 v_buflen += len;
4398 4479
4399 pty_ev.set (EVENT_READ | EVENT_WRITE); 4480 pty_ev.set (EVENT_READ | EVENT_WRITE);

Diff Legend

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