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.226 by root, Sun Jan 1 15:03:49 2006 UTC vs.
Revision 1.254 by root, Wed Jan 11 02:13: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
53#if HAVE_SCHED_YIELD 54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
54# include <sched.h> 56//# include <sched.h>
55#endif 57#endif
56 58
57#ifdef KEYSYM_RESOURCE 59#ifdef KEYSYM_RESOURCE
58# include "keyboard.h" 60# include "keyboard.h"
59#endif 61#endif
… …
266 mb[0] = ch[0]; 268 mb[0] = ch[0];
267 len = 1; 269 len = 1;
268 } 270 }
269 271
270 if (len > 0) 272 if (len > 0)
271 tt_write ((unsigned char *)mb, len); 273 tt_write (mb, len);
272 else 274 else
273 scr_bell (); 275 scr_bell ();
274 } 276 }
275 277
276 iso14755buf = 0; 278 iso14755buf = 0;
… …
304 KeySym keysym; 306 KeySym keysym;
305#ifdef DEBUG_CMD 307#ifdef DEBUG_CMD
306 static int debug_key = 1; /* accessible by a debugger only */ 308 static int debug_key = 1; /* accessible by a debugger only */
307#endif 309#endif
308 int valid_keysym; 310 int valid_keysym;
309 unsigned char kbuf[KBUFSZ]; 311 char kbuf[KBUFSZ];
310 312
311 /* 313 /*
312 * 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
313 * escape sequence to toggle the Keypad. 315 * escape sequence to toggle the Keypad.
314 * 316 *
… …
332 Status status_return; 334 Status status_return;
333 335
334#if 0 336#if 0
335#ifdef X_HAVE_UTF8_STRING 337#ifdef X_HAVE_UTF8_STRING
336 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
337 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 339 len = Xutf8LookupString (Input_Context, &ev, kbuf,
338 KBUFSZ, &keysym, &status_return); 340 KBUFSZ, &keysym, &status_return);
339 else 341 else
340#endif 342#endif
341#endif 343#endif
342 { 344 {
… …
379 || status_return == XLookupBoth; 381 || status_return == XLookupBoth;
380 } 382 }
381 else 383 else
382#endif 384#endif
383 { 385 {
384 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 386 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
385 valid_keysym = keysym != NoSymbol; 387 valid_keysym = keysym != NoSymbol;
386 } 388 }
387 389
388 if (valid_keysym) 390 if (valid_keysym)
389 { 391 {
… …
853 { 855 {
854#ifdef META8_OPTION 856#ifdef META8_OPTION
855 /* set 8-bit on */ 857 /* set 8-bit on */
856 if (meta && (meta_char == 0x80)) 858 if (meta && (meta_char == 0x80))
857 { 859 {
858 unsigned char *ch; 860 char *ch;
859 861
860 for (ch = kbuf; ch < kbuf + len; ch++) 862 for (ch = kbuf; ch < kbuf + len; ch++)
861 *ch |= 0x80; 863 *ch |= 0x80;
862 864
863 meta = 0; 865 meta = 0;
864 } 866 }
865#endif 867#endif
866 /* nil */ ; 868 /* nil */ ;
867 } 869 }
868 } 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;
869 874
870 if (len <= 0) 875 if (len <= 0)
871 return; /* not mapped */ 876 return; /* not mapped */
872 877
873 if (OPTION (Opt_scrollTtyKeypress)) 878 if (OPTION (Opt_scrollTtyKeypress))
… …
896#ifdef META8_OPTION 901#ifdef META8_OPTION
897 && meta_char == C0_ESC 902 && meta_char == C0_ESC
898#endif 903#endif
899 ) 904 )
900 { 905 {
901 const unsigned char ch = C0_ESC; 906 const char ch = C0_ESC;
902 tt_write (&ch, 1); 907 tt_write (&ch, 1);
903 } 908 }
904 909
905#if defined(DEBUG_CMD) 910#if defined(DEBUG_CMD)
906 /* Display keyboard buffer contents */ 911 /* Display keyboard buffer contents */
… …
918 923
919#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
920/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
921/* attempt to `write' count to the input buffer */ 926/* attempt to `write' count to the input buffer */
922unsigned int 927unsigned int
923rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 928rxvt_term::cmd_write (const char *str, unsigned int count)
924{ 929{
925 unsigned int n, s; 930 unsigned int n, s;
926 931
927 n = cmdbuf_ptr - cmdbuf_base; 932 n = cmdbuf_ptr - cmdbuf_base;
928 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 933 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
965 } 970 }
966#endif 971#endif
967 972
968 if (want_refresh) 973 if (want_refresh)
969 { 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 row++;
994 else
995 {
996 // line not filtered, mark it as filtered
997 l->f |= LINE_FILTERED;
998 while (l->is_longer ())
999 {
1000 l = &ROW (++row);
1001 l->f |= LINE_FILTERED;
1002 }
1003
1004 // and filter it
1005 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1006
1007 break;
1008 }
1009 }
1010 while (l->is_longer () && row < end_row);
1011 }
1012 while (++row < end_row);
1013 }
1014
970 scr_refresh (refresh_type); 1015 scr_refresh (refresh_type);
971 scrollbar_show (1); 1016 scrollbar_show (1);
972#ifdef USE_XIM 1017#ifdef USE_XIM
973 IMSendSpot (); 1018 IMSendSpot ();
974#endif 1019#endif
… …
1069 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1114 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1070 } 1115 }
1071} 1116}
1072#endif 1117#endif
1073 1118
1119#if HAVE_SCHED_YIELD
1120static struct event_handler
1121{
1122 check_watcher cw_yield;
1123
1124 void yield (check_watcher &w)
1125 {
1126 sched_yield ();
1127 w.stop ();
1128 }
1129
1130 event_handler ()
1131 : cw_yield (this, &event_handler::yield)
1132 {
1133 }
1134} event_handler;
1135#endif
1136
1074bool 1137bool
1075rxvt_term::pty_fill () 1138rxvt_term::pty_fill ()
1076{ 1139{
1077 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1140 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1078 1141
1079 if (CBUFSIZ == n) 1142 if (CBUFSIZ == n)
1080 { 1143 {
1081 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1144 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1082 n = 0; 1145 n = 0;
1083 } 1146 }
1084 1147
1085 memmove (cmdbuf_base, cmdbuf_ptr, n); 1148 memmove (cmdbuf_base, cmdbuf_ptr, n);
1086 cmdbuf_ptr = cmdbuf_base; 1149 cmdbuf_ptr = cmdbuf_base;
… …
1094 return true; 1157 return true;
1095 } 1158 }
1096 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1159 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1097 { 1160 {
1098#if HAVE_SCHED_YIELD 1161#if HAVE_SCHED_YIELD
1099 sched_yield (); 1162 if (display->is_local)
1163 event_handler.cw_yield.start ();
1100#endif 1164#endif
1101 } 1165 }
1102 else 1166 else
1103 { 1167 {
1104 pty_ev.stop (); 1168 pty_ev.stop ();
… …
1142 1206
1143#ifdef POINTER_BLANK 1207#ifdef POINTER_BLANK
1144void 1208void
1145rxvt_term::pointer_blank () 1209rxvt_term::pointer_blank ()
1146{ 1210{
1147 if (! OPTION (Opt_pointerBlank)) 1211 if (!OPTION (Opt_pointerBlank))
1148 return; 1212 return;
1149 1213
1150 XDefineCursor (display->display, vt, display->blank_cursor); 1214 XDefineCursor (display->display, vt, display->blank_cursor);
1151 XFlush (display->display); 1215 XFlush (display->display);
1152 1216
… …
1249 dDisp; 1313 dDisp;
1250 1314
1251 SET_R (this); 1315 SET_R (this);
1252 SET_LOCALE (locale); 1316 SET_LOCALE (locale);
1253 1317
1254#if defined(CURSOR_BLINK)
1255 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1256 {
1257 if (hidden_cursor)
1258 {
1259 hidden_cursor = 0;
1260 want_refresh = 1;
1261 }
1262
1263 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1264 }
1265#endif
1266
1267#if defined(POINTER_BLANK)
1268 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1269 {
1270 if (ev.type == MotionNotify
1271 || ev.type == ButtonPress
1272 || ev.type == ButtonRelease)
1273 if (hidden_pointer)
1274 pointer_unblank ();
1275
1276 if (ev.type == KeyPress && hidden_pointer == 0)
1277 pointer_blank ();
1278 }
1279#endif
1280
1281 Window unused_root, unused_child; 1318 Window unused_root, unused_child;
1282 int unused_root_x, unused_root_y; 1319 int unused_root_x, unused_root_y;
1283 unsigned int unused_mask; 1320 unsigned int unused_mask;
1284 1321
1285 switch (ev.type) 1322 switch (ev.type)
… …
1292 1329
1293 break; 1330 break;
1294 1331
1295 case KeyRelease: 1332 case KeyRelease:
1296 { 1333 {
1297#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1334#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1298 KeySym ks; 1335 KeySym keysym;
1299 1336
1300 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1337 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1301#endif 1338#endif
1302 1339
1303#if ENABLE_FRILLS || ISO_14755 1340#if ENABLE_FRILLS || ISO_14755
1304 // ISO 14755 support 1341 // ISO 14755 support
1305 if (iso14755buf) 1342 if (iso14755buf)
… …
1310# endif 1347# endif
1311# if ISO_14755 1348# if ISO_14755
1312 // iso14755 part 5.2 handling: release time 1349 // iso14755 part 5.2 handling: release time
1313 // first: controls 1350 // first: controls
1314 if ((ev.xkey.state & ControlMask) 1351 if ((ev.xkey.state & ControlMask)
1315 && ((ks >= 0x40 && ks <= 0x5f) 1352 && ((keysym >= 0x40 && keysym <= 0x5f)
1316 || (ks >= 0x61 && ks <= 0x7f))) 1353 || (keysym >= 0x61 && keysym <= 0x7f)))
1317 { 1354 {
1318 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1355 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1319 commit_iso14755 (); 1356 commit_iso14755 ();
1320 return; // case-break; 1357 goto skip_switch;
1321 } 1358 }
1322 1359
1323 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1360 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1324 if (i[0] == ks) 1361 if (i[0] == keysym)
1325 { 1362 {
1326 iso14755buf = ISO_14755_51 | i[1]; 1363 iso14755buf = ISO_14755_51 | i[1];
1327 commit_iso14755 (); 1364 commit_iso14755 ();
1328 return; // case-break; 1365 goto skip_switch;
1329 } 1366 }
1330 1367
1331 scr_bell (); 1368 scr_bell ();
1332# endif 1369# endif
1333 iso14755buf = 0; 1370 iso14755buf = 0;
… …
1352 else 1389 else
1353 iso14755buf = 0; 1390 iso14755buf = 0;
1354 } 1391 }
1355#endif 1392#endif
1356 1393
1394 if (ev.xany.window == vt
1395 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1396 break;
1397
1357#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1398#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1358 if (!(ev.xkey.state & ControlMask)) 1399 if (!(ev.xkey.state & ControlMask))
1359 slip_wheel_ev.stop (); 1400 slip_wheel_ev.stop ();
1360 else if (ks == XK_Control_L || ks == XK_Control_R) 1401 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1361 mouse_slip_wheel_speed = 0; 1402 mouse_slip_wheel_speed = 0;
1362#endif 1403#endif
1363 break; 1404 break;
1364 } 1405 }
1365 1406
… …
1495 1536
1496 case SelectionRequest: 1537 case SelectionRequest:
1497 selection_send (ev.xselectionrequest); 1538 selection_send (ev.xselectionrequest);
1498 break; 1539 break;
1499 1540
1541 case MapNotify:
1542 mapped = 1;
1543#ifdef TEXT_BLINK
1544 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1545#endif
1546 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1547 break;
1548
1500 case UnmapNotify: 1549 case UnmapNotify:
1501 mapped = 0; 1550 mapped = 0;
1502#ifdef TEXT_BLINK 1551#ifdef TEXT_BLINK
1503 text_blink_ev.stop (); 1552 text_blink_ev.stop ();
1504#endif 1553#endif
1505 break; 1554 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1506
1507 case MapNotify:
1508 mapped = 1;
1509#ifdef TEXT_BLINK
1510 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1511#endif
1512 break; 1555 break;
1513 1556
1514#ifdef TRANSPARENT 1557#ifdef TRANSPARENT
1515 case ReparentNotify: 1558 case ReparentNotify:
1516 rootwin_cb (ev); 1559 rootwin_cb (ev);
… …
1530 1573
1531 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1574 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1532 scr_expose (ev.xexpose.x, ev.xexpose.y, 1575 scr_expose (ev.xexpose.x, ev.xexpose.y,
1533 ev.xexpose.width, ev.xexpose.height, False); 1576 ev.xexpose.width, ev.xexpose.height, False);
1534 1577
1535 scr_refresh (refresh_type); 1578 want_refresh = 1;
1536 } 1579 }
1537 else 1580 else
1538 { 1581 {
1539 XEvent unused_event; 1582 XEvent unused_event;
1540 1583
… …
1575 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1618 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1576 break; 1619 break;
1577 1620
1578 if (ev.xany.window == vt) 1621 if (ev.xany.window == vt)
1579 { 1622 {
1623 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1624 ; // nop
1580 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1625 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1581 { 1626 {
1582 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1627 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1583 ; 1628 ;
1584 1629
1585 XQueryPointer (disp, vt, 1630 XQueryPointer (disp, vt,
… …
1665 &unused_root_x, &unused_root_y, 1710 &unused_root_x, &unused_root_y,
1666 &ev.xbutton.x, &ev.xbutton.y, 1711 &ev.xbutton.x, &ev.xbutton.y,
1667 &unused_mask); 1712 &unused_mask);
1668 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1713 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1669 scrollbar_size ()); 1714 scrollbar_size ());
1670 scr_refresh (refresh_type); 1715 want_refresh = 1;
1671 refresh_limit = 0; 1716 refresh_limit = 0;
1672 scrollbar_show (1); 1717 scrollbar_show (1);
1673 } 1718 }
1674 break; 1719 break;
1675 } 1720 }
1721
1722skip_switch: ;
1723
1724#if defined(CURSOR_BLINK)
1725 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1726 {
1727 if (hidden_cursor)
1728 {
1729 hidden_cursor = 0;
1730 want_refresh = 1;
1731 }
1732
1733 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1734 }
1735#endif
1736
1737#if defined(POINTER_BLANK)
1738 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1739 {
1740 if (ev.type == MotionNotify
1741 || ev.type == ButtonPress
1742 || ev.type == ButtonRelease)
1743 if (hidden_pointer)
1744 pointer_unblank ();
1745
1746 if (ev.type == KeyPress && hidden_pointer == 0)
1747 pointer_blank ();
1748 }
1749#endif
1676} 1750}
1677 1751
1678void 1752void
1679rxvt_term::focus_in () 1753rxvt_term::focus_in ()
1680{ 1754{
1681 if (!focus) 1755 if (!focus)
1682 { 1756 {
1683 focus = 1; 1757 focus = 1;
1684 want_refresh = 1; 1758 want_refresh = 1;
1759
1760 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1761
1685#if USE_XIM 1762#if USE_XIM
1686 if (Input_Context != NULL) 1763 if (Input_Context != NULL)
1687 { 1764 {
1688 IMSetStatusPosition (); 1765 IMSetStatusPosition ();
1689 XSetICFocus (Input_Context); 1766 XSetICFocus (Input_Context);
… …
1709 if (focus) 1786 if (focus)
1710 { 1787 {
1711 focus = 0; 1788 focus = 0;
1712 want_refresh = 1; 1789 want_refresh = 1;
1713 1790
1791 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1792
1714#if ENABLE_FRILLS || ISO_14755 1793#if ENABLE_FRILLS || ISO_14755
1794 if (iso14755buf)
1795 {
1715 iso14755buf = 0; 1796 iso14755buf = 0;
1716#endif
1717#if ENABLE_OVERLAY 1797# if ENABLE_OVERLAY
1718 scr_overlay_off (); 1798 scr_overlay_off ();
1799# endif
1800 }
1719#endif 1801#endif
1720#if USE_XIM 1802#if USE_XIM
1721 if (Input_Context != NULL) 1803 if (Input_Context != NULL)
1722 XUnsetICFocus (Input_Context); 1804 XUnsetICFocus (Input_Context);
1723#endif 1805#endif
… …
1767rxvt_term::button_press (XButtonEvent &ev) 1849rxvt_term::button_press (XButtonEvent &ev)
1768{ 1850{
1769 int reportmode = 0, clickintime; 1851 int reportmode = 0, clickintime;
1770 1852
1771 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1853 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1854
1772 if (!bypass_keystate) 1855 if (!bypass_keystate)
1773 reportmode = !! (priv_modes & PrivMode_mouse_report); 1856 reportmode = !! (priv_modes & PrivMode_mouse_report);
1774 1857
1775 /* 1858 /*
1776 * VT window processing of button press 1859 * VT window processing of button press
… …
1796#ifdef MOUSE_REPORT_DOUBLECLICK 1879#ifdef MOUSE_REPORT_DOUBLECLICK
1797 if (ev.button == MEvent.button && clickintime) 1880 if (ev.button == MEvent.button && clickintime)
1798 { 1881 {
1799 /* same button, within alloted time */ 1882 /* same button, within alloted time */
1800 MEvent.clicks++; 1883 MEvent.clicks++;
1884
1801 if (MEvent.clicks > 1) 1885 if (MEvent.clicks > 1)
1802 { 1886 {
1803 /* only report double clicks */ 1887 /* only report double clicks */
1804 MEvent.clicks = 2; 1888 MEvent.clicks = 2;
1805 mouse_report (ev); 1889 mouse_report (ev);
… …
1825 else 1909 else
1826 { 1910 {
1827 if (ev.button != MEvent.button) 1911 if (ev.button != MEvent.button)
1828 MEvent.clicks = 0; 1912 MEvent.clicks = 0;
1829 1913
1914 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1830 switch (ev.button) 1915 switch (ev.button)
1831 { 1916 {
1832 case Button1: 1917 case Button1:
1833 /* allow meta + click to select rectangular areas */ 1918 /* allow meta + click to select rectangular areas */
1834 /* should be done in screen.C */ 1919 /* should be done in screen.C */
1835#if ENABLE_FRILLS 1920#if ENABLE_FRILLS
1836 selection.rect = !!(ev.state & ModMetaMask); 1921 selection.rect = !!(ev.state & ModMetaMask);
1837#else 1922#else
1838 selection.rect = false; 1923 selection.rect = false;
1839#endif 1924#endif
1840 1925
1841 /* allow shift+left click to extend selection */ 1926 /* allow shift+left click to extend selection */
1842 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1927 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1843 { 1928 {
1844 if (MEvent.button == Button1 && clickintime) 1929 if (MEvent.button == Button1 && clickintime)
1845 selection_rotate (ev.x, ev.y); 1930 selection_rotate (ev.x, ev.y);
1846 else 1931 else
1847 selection_extend (ev.x, ev.y, 1); 1932 selection_extend (ev.x, ev.y, 1);
1848 } 1933 }
1849 else 1934 else
1850 { 1935 {
1851 if (MEvent.button == Button1 && clickintime) 1936 if (MEvent.button == Button1 && clickintime)
1852 MEvent.clicks++; 1937 MEvent.clicks++;
1853 else 1938 else
1854 MEvent.clicks = 1; 1939 MEvent.clicks = 1;
1855 1940
1856 selection_click (MEvent.clicks, ev.x, ev.y); 1941 selection_click (MEvent.clicks, ev.x, ev.y);
1857 } 1942 }
1858 1943
1859 MEvent.button = Button1; 1944 MEvent.button = Button1;
1860 break; 1945 break;
1861 1946
1862 case Button3: 1947 case Button3:
1863 if (MEvent.button == Button3 && clickintime) 1948 if (MEvent.button == Button3 && clickintime)
1864 selection_rotate (ev.x, ev.y); 1949 selection_rotate (ev.x, ev.y);
1865 else 1950 else
1866 selection_extend (ev.x, ev.y, 1); 1951 selection_extend (ev.x, ev.y, 1);
1867 1952
1868 MEvent.button = Button3; 1953 MEvent.button = Button3;
1869 break; 1954 break;
1870 } 1955 }
1871 } 1956 }
1872 1957
1873 MEvent.time = ev.time; 1958 MEvent.time = ev.time;
1874 return; 1959 return;
1875 } 1960 }
1876 1961
… …
2012 } 2097 }
2013 2098
2014 break; 2099 break;
2015 } 2100 }
2016 } 2101 }
2102
2017 return; 2103 return;
2018 } 2104 }
2105
2019#if MENUBAR 2106#if MENUBAR
2020 /* 2107 /*
2021 * Menubar window processing of button press 2108 * Menubar window processing of button press
2022 */ 2109 */
2023 if (isMenuBarWindow (ev.window)) 2110 if (isMenuBarWindow (ev.window))
… …
2086 if (priv_modes & PrivMode_mouse_report 2173 if (priv_modes & PrivMode_mouse_report
2087 && bypass_keystate 2174 && bypass_keystate
2088 && ev.button == Button1 && MEvent.clicks <= 1) 2175 && ev.button == Button1 && MEvent.clicks <= 1)
2089 selection_extend (ev.x, ev.y, 0); 2176 selection_extend (ev.x, ev.y, 0);
2090 2177
2178 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2179 return;
2180
2091 switch (ev.button) 2181 switch (ev.button)
2092 { 2182 {
2093 case Button1: 2183 case Button1:
2094 case Button3: 2184 case Button3:
2095 selection_make (ev.time); 2185 selection_make (ev.time);
… …
2126 slip_wheel_ev.start (); 2216 slip_wheel_ev.start ();
2127 } 2217 }
2128 else 2218 else
2129 { 2219 {
2130# endif 2220# endif
2131# ifdef JUMP_MOUSE_WHEEL
2132 scr_page (v, i); 2221 scr_page (v, i);
2133 scr_refresh (SMOOTH_REFRESH);
2134 scrollbar_show (1); 2222 scrollbar_show (1);
2135# else
2136 while (i--)
2137 {
2138 scr_page (v, 1);
2139 scr_refresh (SMOOTH_REFRESH);
2140 scrollbar_show (1);
2141 }
2142# endif
2143# ifdef MOUSE_SLIP_WHEELING 2223# ifdef MOUSE_SLIP_WHEELING
2144 } 2224 }
2145#endif 2225# endif
2146 } 2226 }
2147 break; 2227 break;
2148#endif 2228#endif
2149 } 2229 }
2150 } 2230 }
… …
2639 2719
2640bool 2720bool
2641rxvt_term::cmd_parse () 2721rxvt_term::cmd_parse ()
2642{ 2722{
2643 bool flag = false; 2723 bool flag = false;
2644 unicode_t ch = NOCHAR; 2724 wchar_t ch = NOCHAR;
2645 unsigned char *seq_begin; // remember start of esc-sequence here 2725 char *seq_begin; // remember start of esc-sequence here
2646 2726
2647 for (;;) 2727 for (;;)
2648 { 2728 {
2649 if (ch == NOCHAR) 2729 if (ch == NOCHAR)
2650 { 2730 {
2651 seq_begin = cmdbuf_ptr; 2731 seq_begin = cmdbuf_ptr;
2652 ch = next_char (); 2732 ch = next_char ();
2653 }
2654 2733
2655 if (ch == NOCHAR) // TODO: improve 2734 if (ch == NOCHAR)
2656 break; 2735 break;
2736 }
2657 2737
2658 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2738 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2659 { 2739 {
2660 if (!seen_input) 2740 if (!seen_input)
2661 { 2741 {
… …
2670 if (seen_resize && cmd_pid) 2750 if (seen_resize && cmd_pid)
2671 kill (-cmd_pid, SIGWINCH); 2751 kill (-cmd_pid, SIGWINCH);
2672 } 2752 }
2673 2753
2674 /* Read a text string from the input buffer */ 2754 /* Read a text string from the input buffer */
2675 unicode_t buf[UBUFSIZ]; 2755 wchar_t buf[UBUFSIZ];
2676 bool refreshnow = false; 2756 bool refreshnow = false;
2677 int nlines = 0; 2757 int nlines = 0;
2678 unicode_t *str = buf; 2758 wchar_t *str = buf;
2679 unicode_t *eol = str + min (ncol, UBUFSIZ); 2759 wchar_t *eol = str + min (ncol, UBUFSIZ);
2680 2760
2681 for (;;) 2761 for (;;)
2682 { 2762 {
2683 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2763 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2684 break; 2764 break;
… …
2702 } 2782 }
2703 2783
2704 // scr_add_lines only works for nlines <= nrow - 1. 2784 // scr_add_lines only works for nlines <= nrow - 1.
2705 if (nlines >= nrow - 1) 2785 if (nlines >= nrow - 1)
2706 { 2786 {
2787 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2707 scr_add_lines (buf, nlines, str - buf); 2788 scr_add_lines (buf, str - buf, nlines);
2789
2708 nlines = 0; 2790 nlines = 0;
2709 str = buf; 2791 str = buf;
2710 eol = str + min (ncol, UBUFSIZ); 2792 eol = str + min (ncol, UBUFSIZ);
2711 } 2793 }
2712 2794
… …
2725 2807
2726 seq_begin = cmdbuf_ptr; 2808 seq_begin = cmdbuf_ptr;
2727 ch = next_char (); 2809 ch = next_char ();
2728 } 2810 }
2729 2811
2812 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2730 scr_add_lines (buf, nlines, str - buf); 2813 scr_add_lines (buf, str - buf, nlines);
2731 2814
2732 /* 2815 /*
2733 * If there have been a lot of new lines, then update the screen 2816 * 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. 2817 * 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 2818 * the number of pages between refreshes is refresh_limit, which
… …
2741 refresh_limit++; 2824 refresh_limit++;
2742 else 2825 else
2743 { 2826 {
2744 flag = true; 2827 flag = true;
2745 scr_refresh (refresh_type); 2828 scr_refresh (refresh_type);
2746 flush_ev.stop (); 2829 want_refresh = 1;
2747 } 2830 }
2748 } 2831 }
2749 2832
2750 } 2833 }
2751 else 2834 else
… …
2766 } 2849 }
2767 2850
2768 return flag; 2851 return flag;
2769} 2852}
2770 2853
2771// read the next octet
2772unicode_t
2773rxvt_term::next_octet ()
2774{
2775 return cmdbuf_ptr < cmdbuf_endp
2776 ? *cmdbuf_ptr++
2777 : NOCHAR;
2778}
2779
2780// read the next character 2854// read the next character
2781unicode_t 2855wchar_t
2782rxvt_term::next_char () 2856rxvt_term::next_char ()
2783{ 2857{
2784 while (cmdbuf_ptr < cmdbuf_endp) 2858 while (cmdbuf_ptr < cmdbuf_endp)
2785 { 2859 {
2786 // assume 7-bit to be ascii ALWAYS 2860 // assume 7-bit to be ascii ALWAYS
2787 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2861 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2788 return *cmdbuf_ptr++; 2862 return *cmdbuf_ptr++;
2789 2863
2790 wchar_t wc; 2864 wchar_t wc;
2791 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2865 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2792 2866
2793 if (len == (size_t)-2) 2867 if (len == (size_t)-2)
2794 { 2868 {
2795 // the mbstate stores incomplete sequences. didn't know this :/ 2869 // the mbstate stores incomplete sequences. didn't know this :/
2796 cmdbuf_ptr = cmdbuf_endp; 2870 cmdbuf_ptr = cmdbuf_endp;
2797 break; 2871 break;
2798 } 2872 }
2799 2873
2800 if (len == (size_t)-1) 2874 if (len == (size_t)-1)
2801 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2875 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2802 2876
2803 // assume wchar == unicode 2877 // assume wchar == unicode
2804 cmdbuf_ptr += len; 2878 cmdbuf_ptr += len;
2805 return wc & UNICODE_MASK; 2879 return wc & UNICODE_MASK;
2806 } 2880 }
2807 2881
2808 return NOCHAR; 2882 return NOCHAR;
2883}
2884
2885// read the next octet
2886uint32_t
2887rxvt_term::next_octet ()
2888{
2889 return cmdbuf_ptr < cmdbuf_endp
2890 ? (unsigned char)*cmdbuf_ptr++
2891 : NOCHAR;
2809} 2892}
2810 2893
2811/* rxvt_cmd_getc () - Return next input character */ 2894/* rxvt_cmd_getc () - Return next input character */
2812/* 2895/*
2813 * Return the next input character after first passing any keyboard input 2896 * Return the next input character after first passing any keyboard input
2814 * to the command. 2897 * to the command.
2815 */ 2898 */
2816unicode_t 2899wchar_t
2817rxvt_term::cmd_getc () 2900rxvt_term::cmd_getc ()
2818{ 2901{
2819 unicode_t c = next_char (); 2902 wchar_t c = next_char ();
2820 2903
2821 if (c == NOCHAR) 2904 if (c == NOCHAR)
2822 throw out_of_input; 2905 throw out_of_input;
2823 2906
2824 return c; 2907 return c;
2825} 2908}
2826 2909
2827unicode_t 2910uint32_t
2828rxvt_term::cmd_get8 () 2911rxvt_term::cmd_get8 ()
2829{ 2912{
2830 unicode_t c = next_octet (); 2913 uint32_t c = next_octet ();
2831 2914
2832 if (c == NOCHAR) 2915 if (c == NOCHAR)
2833 throw out_of_input; 2916 throw out_of_input;
2834 2917
2835 return c; 2918 return c;
… …
2935 case C0_ESC: 3018 case C0_ESC:
2936 process_escape_seq (); 3019 process_escape_seq ();
2937 break; 3020 break;
2938 case C0_ENQ: /* terminal Status */ 3021 case C0_ENQ: /* terminal Status */
2939 if (rs[Rs_answerbackstring]) 3022 if (rs[Rs_answerbackstring])
2940 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3023 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2941 (unsigned int)strlen (rs[Rs_answerbackstring]));
2942 else 3024 else
2943 tt_write ((unsigned char *)VT100_ANS, 3025 tt_write (VT100_ANS, strlen (VT100_ANS));
2944 (unsigned int)strlen (VT100_ANS));
2945 break; 3026 break;
2946 case C0_BEL: /* bell */ 3027 case C0_BEL: /* bell */
2947 scr_bell (); 3028 scr_bell ();
2948 break; 3029 break;
2949 case C0_BS: /* backspace */ 3030 case C0_BS: /* backspace */
… …
3104 break; 3185 break;
3105 3186
3106 /* 8.3.87: NEXT LINE */ 3187 /* 8.3.87: NEXT LINE */
3107 case C1_NEL: /* ESC E */ 3188 case C1_NEL: /* ESC E */
3108 { 3189 {
3109 unicode_t nlcr[] = { C0_LF, C0_CR }; 3190 wchar_t nlcr[] = { C0_LF, C0_CR };
3110 scr_add_lines (nlcr, 1, 2); 3191 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3111 } 3192 }
3112 break; 3193 break;
3113 3194
3114 /* kidnapped escape sequence: Should be 8.3.48 */ 3195 /* kidnapped escape sequence: Should be 8.3.48 */
3115 case C1_ESA: /* ESC G */ 3196 case C1_ESA: /* ESC G */
… …
3137 process_dcs_seq (); 3218 process_dcs_seq ();
3138 break; 3219 break;
3139 3220
3140 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3221 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3141 case C1_SCI: /* ESC Z */ 3222 case C1_SCI: /* ESC Z */
3142 tt_write ((const unsigned char *)ESCZ_ANSWER, 3223 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3143 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3144 break; /* steal obsolete ESC [ c */ 3224 break; /* steal obsolete ESC [ c */
3145 3225
3146 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3226 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3147 case C1_CSI: /* ESC [ */ 3227 case C1_CSI: /* ESC [ */
3148 process_csi_seq (); 3228 process_csi_seq ();
… …
3392 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3472 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3393 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3473 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3394 break; 3474 break;
3395 3475
3396 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3476 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3397 tt_write ((const unsigned char *)VT100_ANS, 3477 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3398 (unsigned int) (sizeof (VT100_ANS) - 1));
3399 break; 3478 break;
3400 3479
3401 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3480 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3402 process_sgr_mode (nargs, arg); 3481 process_sgr_mode (nargs, arg);
3403 break; 3482 break;
… …
3605/*----------------------------------------------------------------------*/ 3684/*----------------------------------------------------------------------*/
3606/* 3685/*
3607 * get input up until STRING TERMINATOR (or BEL) 3686 * get input up until STRING TERMINATOR (or BEL)
3608 * ends_how is terminator used. returned input must be free()'d 3687 * ends_how is terminator used. returned input must be free()'d
3609 */ 3688 */
3610unsigned char * 3689char *
3611rxvt_term::get_to_st (unicode_t &ends_how) 3690rxvt_term::get_to_st (unicode_t &ends_how)
3612{ 3691{
3613 unicode_t ch; 3692 unicode_t ch;
3614 bool seen_esc = false; 3693 bool seen_esc = false;
3615 unsigned int n = 0; 3694 unsigned int n = 0;
… …
3648 3727
3649 string[n++] = '\0'; 3728 string[n++] = '\0';
3650 3729
3651 ends_how = (ch == 0x5c ? C0_ESC : ch); 3730 ends_how = (ch == 0x5c ? C0_ESC : ch);
3652 3731
3653 return (unsigned char *)rxvt_wcstombs (string); 3732 return rxvt_wcstombs (string);
3654} 3733}
3655 3734
3656/*----------------------------------------------------------------------*/ 3735/*----------------------------------------------------------------------*/
3657/* 3736/*
3658 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3737 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3659 */ 3738 */
3660void 3739void
3661rxvt_term::process_dcs_seq () 3740rxvt_term::process_dcs_seq ()
3662{ 3741{
3663 unsigned char *s; 3742 char *s;
3664 unicode_t eh; 3743 unicode_t eh;
3665 3744
3666 /* 3745 /*
3667 * Not handled yet 3746 * Not handled yet
3668 */ 3747 */
… …
3687 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3766 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3688 arg = arg * 10 + (ch - '0'); 3767 arg = arg * 10 + (ch - '0');
3689 3768
3690 if (ch == ';') 3769 if (ch == ';')
3691 { 3770 {
3692 unsigned char *s = get_to_st (eh); 3771 char *s = get_to_st (eh);
3693 3772
3694 if (s) 3773 if (s)
3695 { 3774 {
3696 process_xterm_seq (arg, (char *)s, eh); 3775 process_xterm_seq (arg, s, eh);
3697 free (s); 3776 free (s);
3698 } 3777 }
3699 } 3778 }
3700} 3779}
3701 3780
3702void 3781void
3703rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3782rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3704{ 3783{
3705 if (str[0] == '?' && !str[1]) 3784 if (str[0] == '?' && !str[1])
3706 { 3785 {
3707 unsigned short r, g, b; 3786 unsigned short r, g, b;
3708 pix_colors_focused[color].get (display, r, g, b); 3787 pix_colors_focused[color].get (display, r, g, b);
… …
3714 3793
3715/* 3794/*
3716 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3795 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3717 */ 3796 */
3718void 3797void
3719rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3798rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3720{ 3799{
3721 int changed = 0; 3800 int changed = 0;
3722 int color; 3801 int color;
3723 char *buf, *name; 3802 char *buf, *name;
3724 bool query = str[0] == '?' && !str[1]; 3803 bool query = str[0] == '?' && !str[1];
… …
3931 } 4010 }
3932 break; 4011 break;
3933 4012
3934 case URxvt_view_up: 4013 case URxvt_view_up:
3935 case URxvt_view_down: 4014 case URxvt_view_down:
4015 {
3936 int lines = atoi (str); 4016 int lines = atoi (str);
3937 4017
3938 if (lines) 4018 if (lines)
3939 scr_page (op == URxvt_view_up ? UP : DN, lines); 4019 scr_page (op == URxvt_view_up ? UP : DN, lines);
3940 else 4020 else
3941 {
3942 scr_erase_savelines (); 4021 scr_erase_savelines ();
3943 } 4022 }
3944 4023
4024 break;
4025#endif
4026
4027#if ENABLE_PERL
4028 case URxvt_perl:
4029 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
4030 ; // no responses yet
3945 break; 4031 break;
3946#endif 4032#endif
3947 } 4033 }
3948} 4034}
3949/*----------------------------------------------------------------------*/ 4035/*----------------------------------------------------------------------*/
… …
4060 /* extra handling for values with state unkept */ 4146 /* extra handling for values with state unkept */
4061 switch (arg[i]) 4147 switch (arg[i])
4062 { 4148 {
4063#if ENABLE_STYLES 4149#if ENABLE_STYLES
4064 case 1021: 4150 case 1021:
4065 if (mode) 4151 set_option (Opt_intensityStyles, mode);
4066 SET_OPTION (Opt_intensityStyles);
4067 else
4068 CLR_OPTION (Opt_intensityStyles);
4069 4152
4070 scr_touch (true); 4153 scr_touch (true);
4071 break; 4154 break;
4072#endif 4155#endif
4073 case 1048: /* alternative cursor save */ 4156 case 1048: /* alternative cursor save */
… …
4095 case 3: /* 80/132 */ 4178 case 3: /* 80/132 */
4096 if (priv_modes & PrivMode_132OK) 4179 if (priv_modes & PrivMode_132OK)
4097 set_widthheight (((state ? 132 : 80) * fwidth), height); 4180 set_widthheight (((state ? 132 : 80) * fwidth), height);
4098 break; 4181 break;
4099 case 4: /* smooth scrolling */ 4182 case 4: /* smooth scrolling */
4100 if (!state) 4183 set_option (Opt_jumpScroll, !state);
4101 SET_OPTION (Opt_jumpScroll);
4102 else
4103 CLR_OPTION (Opt_jumpScroll);
4104 break; 4184 break;
4105 case 5: /* reverse video */ 4185 case 5: /* reverse video */
4106 scr_rvideo_mode (state); 4186 scr_rvideo_mode (state);
4107 break; 4187 break;
4108 case 6: /* relative/absolute origins */ 4188 case 6: /* relative/absolute origins */
… …
4149#if 0 4229#if 0
4150 case 1001: 4230 case 1001:
4151 break; /* X11 mouse highlighting */ 4231 break; /* X11 mouse highlighting */
4152#endif 4232#endif
4153 case 1010: /* scroll to bottom on TTY output inhibit */ 4233 case 1010: /* scroll to bottom on TTY output inhibit */
4154 if (!state) 4234 set_option (Opt_scrollTtyOutput, !state);
4155 SET_OPTION (Opt_scrollTtyOutput);
4156 else
4157 CLR_OPTION (Opt_scrollTtyOutput);
4158 break; 4235 break;
4159 case 1011: /* scroll to bottom on key press */ 4236 case 1011: /* scroll to bottom on key press */
4160 if (state) 4237 set_option (Opt_scrollTtyKeypress, state);
4161 SET_OPTION (Opt_scrollTtyKeypress);
4162 else
4163 CLR_OPTION (Opt_scrollTtyKeypress);
4164 break; 4238 break;
4165 case 1047: /* secondary screen w/ clearing last */ 4239 case 1047: /* secondary screen w/ clearing last */
4166 if (OPTION (Opt_secondaryScreen)) 4240 if (OPTION (Opt_secondaryScreen))
4167 if (current_screen != PRIMARY) 4241 if (current_screen != PRIMARY)
4168 scr_erase_screen (2); 4242 scr_erase_screen (2);
… …
4306 scr_color (Color_bg, Color_bg); 4380 scr_color (Color_bg, Color_bg);
4307 break; 4381 break;
4308 4382
4309 //case 50: // not variable spacing 4383 //case 50: // not variable spacing
4310 4384
4311#ifndef NO_BRIGHTCOLOR 4385#if ENABLE_FRILLS
4312 case 90: 4386 case 90:
4313 case 91: /* set bright fg color */ 4387 case 91: /* set bright fg color */
4314 case 92: 4388 case 92:
4315 case 93: 4389 case 93:
4316 case 94: 4390 case 94:
… …
4361 */ 4435 */
4362void 4436void
4363rxvt_term::tt_printf (const char *fmt,...) 4437rxvt_term::tt_printf (const char *fmt,...)
4364{ 4438{
4365 va_list arg_ptr; 4439 va_list arg_ptr;
4366 unsigned char buf[256]; 4440 char buf[256];
4367 4441
4368 va_start (arg_ptr, fmt); 4442 va_start (arg_ptr, fmt);
4369 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4443 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4370 va_end (arg_ptr); 4444 va_end (arg_ptr);
4371 tt_write (buf, strlen (buf)); 4445 tt_write (buf, strlen (buf));
… …
4376 * or generated by us in response to a query ESC sequence. 4450 * or generated by us in response to a query ESC sequence.
4377 */ 4451 */
4378const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4452const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4379 4453
4380void 4454void
4381rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4455rxvt_term::tt_write (const char *data, unsigned int len)
4382{ 4456{
4457 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4458 return;
4459
4460 if (pty.pty < 0)
4461 return;
4462
4383 if (v_buflen == 0) 4463 if (v_buflen == 0)
4384 { 4464 {
4385 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4465 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4386 4466
4387 if ((unsigned int)written == len) 4467 if ((unsigned int)written == len)
… …
4389 4469
4390 data += written; 4470 data += written;
4391 len -= written; 4471 len -= written;
4392 } 4472 }
4393 4473
4394 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4474 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4395 4475
4396 memcpy (v_buffer + v_buflen, data, len); 4476 memcpy (v_buffer + v_buflen, data, len);
4397 v_buflen += len; 4477 v_buflen += len;
4398 4478
4399 pty_ev.set (EVENT_READ | EVENT_WRITE); 4479 pty_ev.set (EVENT_READ | EVENT_WRITE);

Diff Legend

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