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.230 by root, Wed Jan 4 00:09:12 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.
… …
50#include "rxvtperl.h" 50#include "rxvtperl.h"
51#include "version.h" 51#include "version.h"
52#include "command.h" 52#include "command.h"
53 53
54#if HAVE_SCHED_YIELD 54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
55# include <sched.h> 56//# include <sched.h>
56#endif 57#endif
57 58
58#ifdef KEYSYM_RESOURCE 59#ifdef KEYSYM_RESOURCE
59# include "keyboard.h" 60# include "keyboard.h"
60#endif 61#endif
… …
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
… …
1095{ 1137{
1096 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1138 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1097 1139
1098 if (CBUFSIZ == n) 1140 if (CBUFSIZ == n)
1099 { 1141 {
1100 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");
1101 n = 0; 1143 n = 0;
1102 } 1144 }
1103 1145
1104 memmove (cmdbuf_base, cmdbuf_ptr, n); 1146 memmove (cmdbuf_base, cmdbuf_ptr, n);
1105 cmdbuf_ptr = cmdbuf_base; 1147 cmdbuf_ptr = cmdbuf_base;
… …
1162 1204
1163#ifdef POINTER_BLANK 1205#ifdef POINTER_BLANK
1164void 1206void
1165rxvt_term::pointer_blank () 1207rxvt_term::pointer_blank ()
1166{ 1208{
1167 if (! OPTION (Opt_pointerBlank)) 1209 if (!OPTION (Opt_pointerBlank))
1168 return; 1210 return;
1169 1211
1170 XDefineCursor (display->display, vt, display->blank_cursor); 1212 XDefineCursor (display->display, vt, display->blank_cursor);
1171 XFlush (display->display); 1213 XFlush (display->display);
1172 1214
… …
1269 dDisp; 1311 dDisp;
1270 1312
1271 SET_R (this); 1313 SET_R (this);
1272 SET_LOCALE (locale); 1314 SET_LOCALE (locale);
1273 1315
1274#if defined(CURSOR_BLINK) 1316 if (ev.xany.window == vt
1275 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1317 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1276 { 1318 return;
1277 if (hidden_cursor)
1278 {
1279 hidden_cursor = 0;
1280 want_refresh = 1;
1281 }
1282 1319
1283 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1320 // for XQueryPointer
1284 }
1285#endif
1286
1287#if defined(POINTER_BLANK)
1288 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1289 {
1290 if (ev.type == MotionNotify
1291 || ev.type == ButtonPress
1292 || ev.type == ButtonRelease)
1293 if (hidden_pointer)
1294 pointer_unblank ();
1295
1296 if (ev.type == KeyPress && hidden_pointer == 0)
1297 pointer_blank ();
1298 }
1299#endif
1300
1301 Window unused_root, unused_child; 1321 Window unused_root, unused_child;
1302 int unused_root_x, unused_root_y; 1322 int unused_root_x, unused_root_y;
1303 unsigned int unused_mask; 1323 unsigned int unused_mask;
1304 1324
1305 switch (ev.type) 1325 switch (ev.type)
… …
1312 1332
1313 break; 1333 break;
1314 1334
1315 case KeyRelease: 1335 case KeyRelease:
1316 { 1336 {
1317#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1337#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1318 KeySym ks; 1338 KeySym keysym;
1319 1339
1320 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 :/
1321#endif 1341#endif
1322 1342
1323#if ENABLE_FRILLS || ISO_14755 1343#if ENABLE_FRILLS || ISO_14755
1324 // ISO 14755 support 1344 // ISO 14755 support
1325 if (iso14755buf) 1345 if (iso14755buf)
… …
1330# endif 1350# endif
1331# if ISO_14755 1351# if ISO_14755
1332 // iso14755 part 5.2 handling: release time 1352 // iso14755 part 5.2 handling: release time
1333 // first: controls 1353 // first: controls
1334 if ((ev.xkey.state & ControlMask) 1354 if ((ev.xkey.state & ControlMask)
1335 && ((ks >= 0x40 && ks <= 0x5f) 1355 && ((keysym >= 0x40 && keysym <= 0x5f)
1336 || (ks >= 0x61 && ks <= 0x7f))) 1356 || (keysym >= 0x61 && keysym <= 0x7f)))
1337 { 1357 {
1338 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1358 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1339 commit_iso14755 (); 1359 commit_iso14755 ();
1340 return; // case-break; 1360 goto skip_switch;
1341 } 1361 }
1342 1362
1343 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1363 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1344 if (i[0] == ks) 1364 if (i[0] == keysym)
1345 { 1365 {
1346 iso14755buf = ISO_14755_51 | i[1]; 1366 iso14755buf = ISO_14755_51 | i[1];
1347 commit_iso14755 (); 1367 commit_iso14755 ();
1348 return; // case-break; 1368 goto skip_switch;
1349 } 1369 }
1350 1370
1351 scr_bell (); 1371 scr_bell ();
1352# endif 1372# endif
1353 iso14755buf = 0; 1373 iso14755buf = 0;
… …
1372 else 1392 else
1373 iso14755buf = 0; 1393 iso14755buf = 0;
1374 } 1394 }
1375#endif 1395#endif
1376 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
1377#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1401#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1378 if (!(ev.xkey.state & ControlMask)) 1402 if (!(ev.xkey.state & ControlMask))
1379 slip_wheel_ev.stop (); 1403 slip_wheel_ev.stop ();
1380 else if (ks == XK_Control_L || ks == XK_Control_R) 1404 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1381 mouse_slip_wheel_speed = 0; 1405 mouse_slip_wheel_speed = 0;
1382#endif 1406#endif
1383 break; 1407 break;
1384 } 1408 }
1385 1409
… …
1515 1539
1516 case SelectionRequest: 1540 case SelectionRequest:
1517 selection_send (ev.xselectionrequest); 1541 selection_send (ev.xselectionrequest);
1518 break; 1542 break;
1519 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
1520 case UnmapNotify: 1552 case UnmapNotify:
1521 mapped = 0; 1553 mapped = 0;
1522#ifdef TEXT_BLINK 1554#ifdef TEXT_BLINK
1523 text_blink_ev.stop (); 1555 text_blink_ev.stop ();
1524#endif 1556#endif
1525 break; 1557 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1526
1527 case MapNotify:
1528 mapped = 1;
1529#ifdef TEXT_BLINK
1530 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1531#endif
1532 break; 1558 break;
1533 1559
1534#ifdef TRANSPARENT 1560#ifdef TRANSPARENT
1535 case ReparentNotify: 1561 case ReparentNotify:
1536 rootwin_cb (ev); 1562 rootwin_cb (ev);
… …
1550 1576
1551 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1577 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1552 scr_expose (ev.xexpose.x, ev.xexpose.y, 1578 scr_expose (ev.xexpose.x, ev.xexpose.y,
1553 ev.xexpose.width, ev.xexpose.height, False); 1579 ev.xexpose.width, ev.xexpose.height, False);
1554 1580
1555 scr_refresh (refresh_type); 1581 want_refresh = 1;
1556 } 1582 }
1557 else 1583 else
1558 { 1584 {
1559 XEvent unused_event; 1585 XEvent unused_event;
1560 1586
… …
1579#endif 1605#endif
1580 } 1606 }
1581 break; 1607 break;
1582 1608
1583 case MotionNotify: 1609 case MotionNotify:
1610 printf ("motion notify\n");//D
1584#ifdef POINTER_BLANK 1611#ifdef POINTER_BLANK
1585 if (hidden_pointer) 1612 if (hidden_pointer)
1586 pointer_unblank (); 1613 pointer_unblank ();
1587#endif 1614#endif
1588#if MENUBAR 1615#if MENUBAR
… …
1595 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1622 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1596 break; 1623 break;
1597 1624
1598 if (ev.xany.window == vt) 1625 if (ev.xany.window == vt)
1599 { 1626 {
1627 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1628 ; // nop
1600 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1629 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1601 { 1630 {
1602 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1631 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1603 ; 1632 ;
1604 1633
1605 XQueryPointer (disp, vt, 1634 XQueryPointer (disp, vt,
… …
1685 &unused_root_x, &unused_root_y, 1714 &unused_root_x, &unused_root_y,
1686 &ev.xbutton.x, &ev.xbutton.y, 1715 &ev.xbutton.x, &ev.xbutton.y,
1687 &unused_mask); 1716 &unused_mask);
1688 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1717 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1689 scrollbar_size ()); 1718 scrollbar_size ());
1690 scr_refresh (refresh_type); 1719 want_refresh = 1;
1691 refresh_limit = 0; 1720 refresh_limit = 0;
1692 scrollbar_show (1); 1721 scrollbar_show (1);
1693 } 1722 }
1694 break; 1723 break;
1695 } 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
1696} 1754}
1697 1755
1698void 1756void
1699rxvt_term::focus_in () 1757rxvt_term::focus_in ()
1700{ 1758{
1701 if (!focus) 1759 if (!focus)
1702 { 1760 {
1703 focus = 1; 1761 focus = 1;
1704 want_refresh = 1; 1762 want_refresh = 1;
1705 1763
1706 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1764 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1707 1765
1708#if USE_XIM 1766#if USE_XIM
1709 if (Input_Context != NULL) 1767 if (Input_Context != NULL)
1710 { 1768 {
1711 IMSetStatusPosition (); 1769 IMSetStatusPosition ();
… …
1732 if (focus) 1790 if (focus)
1733 { 1791 {
1734 focus = 0; 1792 focus = 0;
1735 want_refresh = 1; 1793 want_refresh = 1;
1736 1794
1737 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1795 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1738 1796
1739#if ENABLE_FRILLS || ISO_14755 1797#if ENABLE_FRILLS || ISO_14755
1740 if (iso14755buf) 1798 if (iso14755buf)
1741 { 1799 {
1742 iso14755buf = 0; 1800 iso14755buf = 0;
… …
1825#ifdef MOUSE_REPORT_DOUBLECLICK 1883#ifdef MOUSE_REPORT_DOUBLECLICK
1826 if (ev.button == MEvent.button && clickintime) 1884 if (ev.button == MEvent.button && clickintime)
1827 { 1885 {
1828 /* same button, within alloted time */ 1886 /* same button, within alloted time */
1829 MEvent.clicks++; 1887 MEvent.clicks++;
1888
1830 if (MEvent.clicks > 1) 1889 if (MEvent.clicks > 1)
1831 { 1890 {
1832 /* only report double clicks */ 1891 /* only report double clicks */
1833 MEvent.clicks = 2; 1892 MEvent.clicks = 2;
1834 mouse_report (ev); 1893 mouse_report (ev);
… …
1854 else 1913 else
1855 { 1914 {
1856 if (ev.button != MEvent.button) 1915 if (ev.button != MEvent.button)
1857 MEvent.clicks = 0; 1916 MEvent.clicks = 0;
1858 1917
1859 if (!PERL_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END))) 1918 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1860 switch (ev.button) 1919 switch (ev.button)
1861 { 1920 {
1862 case Button1: 1921 case Button1:
1863 /* allow meta + click to select rectangular areas */ 1922 /* allow meta + click to select rectangular areas */
1864 /* should be done in screen.C */ 1923 /* should be done in screen.C */
… …
1867#else 1926#else
1868 selection.rect = false; 1927 selection.rect = false;
1869#endif 1928#endif
1870 1929
1871 /* allow shift+left click to extend selection */ 1930 /* allow shift+left click to extend selection */
1872 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1931 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1873 { 1932 {
1874 if (MEvent.button == Button1 && clickintime) 1933 if (MEvent.button == Button1 && clickintime)
1875 selection_rotate (ev.x, ev.y); 1934 selection_rotate (ev.x, ev.y);
1876 else 1935 else
1877 selection_extend (ev.x, ev.y, 1); 1936 selection_extend (ev.x, ev.y, 1);
… …
2042 } 2101 }
2043 2102
2044 break; 2103 break;
2045 } 2104 }
2046 } 2105 }
2106
2047 return; 2107 return;
2048 } 2108 }
2109
2049#if MENUBAR 2110#if MENUBAR
2050 /* 2111 /*
2051 * Menubar window processing of button press 2112 * Menubar window processing of button press
2052 */ 2113 */
2053 if (isMenuBarWindow (ev.window)) 2114 if (isMenuBarWindow (ev.window))
… …
2116 if (priv_modes & PrivMode_mouse_report 2177 if (priv_modes & PrivMode_mouse_report
2117 && bypass_keystate 2178 && bypass_keystate
2118 && ev.button == Button1 && MEvent.clicks <= 1) 2179 && ev.button == Button1 && MEvent.clicks <= 1)
2119 selection_extend (ev.x, ev.y, 0); 2180 selection_extend (ev.x, ev.y, 0);
2120 2181
2182 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2183 return;
2184
2121 switch (ev.button) 2185 switch (ev.button)
2122 { 2186 {
2123 case Button1: 2187 case Button1:
2124 case Button3: 2188 case Button3:
2125 selection_make (ev.time); 2189 selection_make (ev.time);
… …
2156 slip_wheel_ev.start (); 2220 slip_wheel_ev.start ();
2157 } 2221 }
2158 else 2222 else
2159 { 2223 {
2160# endif 2224# endif
2161# ifdef JUMP_MOUSE_WHEEL
2162 scr_page (v, i); 2225 scr_page (v, i);
2163 scr_refresh (SMOOTH_REFRESH);
2164 scrollbar_show (1); 2226 scrollbar_show (1);
2165# else
2166 while (i--)
2167 {
2168 scr_page (v, 1);
2169 scr_refresh (SMOOTH_REFRESH);
2170 scrollbar_show (1);
2171 }
2172# endif
2173# ifdef MOUSE_SLIP_WHEELING 2227# ifdef MOUSE_SLIP_WHEELING
2174 } 2228 }
2175#endif 2229# endif
2176 } 2230 }
2177 break; 2231 break;
2178#endif 2232#endif
2179 } 2233 }
2180 } 2234 }
… …
2669 2723
2670bool 2724bool
2671rxvt_term::cmd_parse () 2725rxvt_term::cmd_parse ()
2672{ 2726{
2673 bool flag = false; 2727 bool flag = false;
2674 unicode_t ch = NOCHAR; 2728 wchar_t ch = NOCHAR;
2675 unsigned char *seq_begin; // remember start of esc-sequence here 2729 char *seq_begin; // remember start of esc-sequence here
2676 2730
2677 for (;;) 2731 for (;;)
2678 { 2732 {
2679 if (ch == NOCHAR) 2733 if (ch == NOCHAR)
2680 { 2734 {
2681 seq_begin = cmdbuf_ptr; 2735 seq_begin = cmdbuf_ptr;
2682 ch = next_char (); 2736 ch = next_char ();
2683 }
2684 2737
2685 if (ch == NOCHAR) // TODO: improve 2738 if (ch == NOCHAR)
2686 break; 2739 break;
2740 }
2687 2741
2688 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)
2689 { 2743 {
2690 if (!seen_input) 2744 if (!seen_input)
2691 { 2745 {
… …
2700 if (seen_resize && cmd_pid) 2754 if (seen_resize && cmd_pid)
2701 kill (-cmd_pid, SIGWINCH); 2755 kill (-cmd_pid, SIGWINCH);
2702 } 2756 }
2703 2757
2704 /* Read a text string from the input buffer */ 2758 /* Read a text string from the input buffer */
2705 unicode_t buf[UBUFSIZ]; 2759 wchar_t buf[UBUFSIZ];
2706 bool refreshnow = false; 2760 bool refreshnow = false;
2707 int nlines = 0; 2761 int nlines = 0;
2708 unicode_t *str = buf; 2762 wchar_t *str = buf;
2709 unicode_t *eol = str + min (ncol, UBUFSIZ); 2763 wchar_t *eol = str + min (ncol, UBUFSIZ);
2710 2764
2711 for (;;) 2765 for (;;)
2712 { 2766 {
2713 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))
2714 break; 2768 break;
… …
2732 } 2786 }
2733 2787
2734 // scr_add_lines only works for nlines <= nrow - 1. 2788 // scr_add_lines only works for nlines <= nrow - 1.
2735 if (nlines >= nrow - 1) 2789 if (nlines >= nrow - 1)
2736 { 2790 {
2791 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2737 scr_add_lines (buf, nlines, str - buf); 2792 scr_add_lines (buf, str - buf, nlines);
2793
2738 nlines = 0; 2794 nlines = 0;
2739 str = buf; 2795 str = buf;
2740 eol = str + min (ncol, UBUFSIZ); 2796 eol = str + min (ncol, UBUFSIZ);
2741 } 2797 }
2742 2798
… …
2755 2811
2756 seq_begin = cmdbuf_ptr; 2812 seq_begin = cmdbuf_ptr;
2757 ch = next_char (); 2813 ch = next_char ();
2758 } 2814 }
2759 2815
2816 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2760 scr_add_lines (buf, nlines, str - buf); 2817 scr_add_lines (buf, str - buf, nlines);
2761 2818
2762 /* 2819 /*
2763 * 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
2764 * 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.
2765 * the number of pages between refreshes is refresh_limit, which 2822 * the number of pages between refreshes is refresh_limit, which
… …
2771 refresh_limit++; 2828 refresh_limit++;
2772 else 2829 else
2773 { 2830 {
2774 flag = true; 2831 flag = true;
2775 scr_refresh (refresh_type); 2832 scr_refresh (refresh_type);
2776 flush_ev.stop (); 2833 want_refresh = 1;
2777 } 2834 }
2778 } 2835 }
2779 2836
2780 } 2837 }
2781 else 2838 else
… …
2796 } 2853 }
2797 2854
2798 return flag; 2855 return flag;
2799} 2856}
2800 2857
2801// read the next octet
2802unicode_t
2803rxvt_term::next_octet ()
2804{
2805 return cmdbuf_ptr < cmdbuf_endp
2806 ? *cmdbuf_ptr++
2807 : NOCHAR;
2808}
2809
2810// read the next character 2858// read the next character
2811unicode_t 2859wchar_t
2812rxvt_term::next_char () 2860rxvt_term::next_char ()
2813{ 2861{
2814 while (cmdbuf_ptr < cmdbuf_endp) 2862 while (cmdbuf_ptr < cmdbuf_endp)
2815 { 2863 {
2816 // assume 7-bit to be ascii ALWAYS 2864 // assume 7-bit to be ascii ALWAYS
2817 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2865 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2818 return *cmdbuf_ptr++; 2866 return *cmdbuf_ptr++;
2819 2867
2820 wchar_t wc; 2868 wchar_t wc;
2821 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);
2822 2870
2823 if (len == (size_t)-2) 2871 if (len == (size_t)-2)
2824 { 2872 {
2825 // the mbstate stores incomplete sequences. didn't know this :/ 2873 // the mbstate stores incomplete sequences. didn't know this :/
2826 cmdbuf_ptr = cmdbuf_endp; 2874 cmdbuf_ptr = cmdbuf_endp;
2827 break; 2875 break;
2828 } 2876 }
2829 2877
2830 if (len == (size_t)-1) 2878 if (len == (size_t)-1)
2831 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
2832 2880
2833 // assume wchar == unicode 2881 // assume wchar == unicode
2834 cmdbuf_ptr += len; 2882 cmdbuf_ptr += len;
2835 return wc & UNICODE_MASK; 2883 return wc & UNICODE_MASK;
2836 } 2884 }
2837 2885
2838 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;
2839} 2896}
2840 2897
2841/* rxvt_cmd_getc () - Return next input character */ 2898/* rxvt_cmd_getc () - Return next input character */
2842/* 2899/*
2843 * Return the next input character after first passing any keyboard input 2900 * Return the next input character after first passing any keyboard input
2844 * to the command. 2901 * to the command.
2845 */ 2902 */
2846unicode_t 2903wchar_t
2847rxvt_term::cmd_getc () 2904rxvt_term::cmd_getc ()
2848{ 2905{
2849 unicode_t c = next_char (); 2906 wchar_t c = next_char ();
2850 2907
2851 if (c == NOCHAR) 2908 if (c == NOCHAR)
2852 throw out_of_input; 2909 throw out_of_input;
2853 2910
2854 return c; 2911 return c;
2855} 2912}
2856 2913
2857unicode_t 2914uint32_t
2858rxvt_term::cmd_get8 () 2915rxvt_term::cmd_get8 ()
2859{ 2916{
2860 unicode_t c = next_octet (); 2917 uint32_t c = next_octet ();
2861 2918
2862 if (c == NOCHAR) 2919 if (c == NOCHAR)
2863 throw out_of_input; 2920 throw out_of_input;
2864 2921
2865 return c; 2922 return c;
… …
2965 case C0_ESC: 3022 case C0_ESC:
2966 process_escape_seq (); 3023 process_escape_seq ();
2967 break; 3024 break;
2968 case C0_ENQ: /* terminal Status */ 3025 case C0_ENQ: /* terminal Status */
2969 if (rs[Rs_answerbackstring]) 3026 if (rs[Rs_answerbackstring])
2970 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3027 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2971 (unsigned int)strlen (rs[Rs_answerbackstring]));
2972 else 3028 else
2973 tt_write ((unsigned char *)VT100_ANS, 3029 tt_write (VT100_ANS, strlen (VT100_ANS));
2974 (unsigned int)strlen (VT100_ANS));
2975 break; 3030 break;
2976 case C0_BEL: /* bell */ 3031 case C0_BEL: /* bell */
2977 scr_bell (); 3032 scr_bell ();
2978 break; 3033 break;
2979 case C0_BS: /* backspace */ 3034 case C0_BS: /* backspace */
… …
3134 break; 3189 break;
3135 3190
3136 /* 8.3.87: NEXT LINE */ 3191 /* 8.3.87: NEXT LINE */
3137 case C1_NEL: /* ESC E */ 3192 case C1_NEL: /* ESC E */
3138 { 3193 {
3139 unicode_t nlcr[] = { C0_LF, C0_CR }; 3194 wchar_t nlcr[] = { C0_LF, C0_CR };
3140 scr_add_lines (nlcr, 1, 2); 3195 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3141 } 3196 }
3142 break; 3197 break;
3143 3198
3144 /* kidnapped escape sequence: Should be 8.3.48 */ 3199 /* kidnapped escape sequence: Should be 8.3.48 */
3145 case C1_ESA: /* ESC G */ 3200 case C1_ESA: /* ESC G */
… …
3167 process_dcs_seq (); 3222 process_dcs_seq ();
3168 break; 3223 break;
3169 3224
3170 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3225 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3171 case C1_SCI: /* ESC Z */ 3226 case C1_SCI: /* ESC Z */
3172 tt_write ((const unsigned char *)ESCZ_ANSWER, 3227 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3173 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3174 break; /* steal obsolete ESC [ c */ 3228 break; /* steal obsolete ESC [ c */
3175 3229
3176 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3230 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3177 case C1_CSI: /* ESC [ */ 3231 case C1_CSI: /* ESC [ */
3178 process_csi_seq (); 3232 process_csi_seq ();
… …
3422 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3476 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3423 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3477 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3424 break; 3478 break;
3425 3479
3426 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3480 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3427 tt_write ((const unsigned char *)VT100_ANS, 3481 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3428 (unsigned int) (sizeof (VT100_ANS) - 1));
3429 break; 3482 break;
3430 3483
3431 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3484 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3432 process_sgr_mode (nargs, arg); 3485 process_sgr_mode (nargs, arg);
3433 break; 3486 break;
… …
3635/*----------------------------------------------------------------------*/ 3688/*----------------------------------------------------------------------*/
3636/* 3689/*
3637 * get input up until STRING TERMINATOR (or BEL) 3690 * get input up until STRING TERMINATOR (or BEL)
3638 * ends_how is terminator used. returned input must be free()'d 3691 * ends_how is terminator used. returned input must be free()'d
3639 */ 3692 */
3640unsigned char * 3693char *
3641rxvt_term::get_to_st (unicode_t &ends_how) 3694rxvt_term::get_to_st (unicode_t &ends_how)
3642{ 3695{
3643 unicode_t ch; 3696 unicode_t ch;
3644 bool seen_esc = false; 3697 bool seen_esc = false;
3645 unsigned int n = 0; 3698 unsigned int n = 0;
… …
3678 3731
3679 string[n++] = '\0'; 3732 string[n++] = '\0';
3680 3733
3681 ends_how = (ch == 0x5c ? C0_ESC : ch); 3734 ends_how = (ch == 0x5c ? C0_ESC : ch);
3682 3735
3683 return (unsigned char *)rxvt_wcstombs (string); 3736 return rxvt_wcstombs (string);
3684} 3737}
3685 3738
3686/*----------------------------------------------------------------------*/ 3739/*----------------------------------------------------------------------*/
3687/* 3740/*
3688 * 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)'
3689 */ 3742 */
3690void 3743void
3691rxvt_term::process_dcs_seq () 3744rxvt_term::process_dcs_seq ()
3692{ 3745{
3693 unsigned char *s; 3746 char *s;
3694 unicode_t eh; 3747 unicode_t eh;
3695 3748
3696 /* 3749 /*
3697 * Not handled yet 3750 * Not handled yet
3698 */ 3751 */
… …
3717 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3770 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3718 arg = arg * 10 + (ch - '0'); 3771 arg = arg * 10 + (ch - '0');
3719 3772
3720 if (ch == ';') 3773 if (ch == ';')
3721 { 3774 {
3722 unsigned char *s = get_to_st (eh); 3775 char *s = get_to_st (eh);
3723 3776
3724 if (s) 3777 if (s)
3725 { 3778 {
3726 process_xterm_seq (arg, (char *)s, eh); 3779 process_xterm_seq (arg, s, eh);
3727 free (s); 3780 free (s);
3728 } 3781 }
3729 } 3782 }
3730} 3783}
3731 3784
3732void 3785void
3733rxvt_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)
3734{ 3787{
3735 if (str[0] == '?' && !str[1]) 3788 if (str[0] == '?' && !str[1])
3736 { 3789 {
3737 unsigned short r, g, b; 3790 unsigned short r, g, b;
3738 pix_colors_focused[color].get (display, r, g, b); 3791 pix_colors_focused[color].get (display, r, g, b);
… …
3744 3797
3745/* 3798/*
3746 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3799 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3747 */ 3800 */
3748void 3801void
3749rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3802rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3750{ 3803{
3751 int changed = 0; 3804 int changed = 0;
3752 int color; 3805 int color;
3753 char *buf, *name; 3806 char *buf, *name;
3754 bool query = str[0] == '?' && !str[1]; 3807 bool query = str[0] == '?' && !str[1];
… …
3811 { 3864 {
3812 if ((name = strchr (buf, ';')) == NULL) 3865 if ((name = strchr (buf, ';')) == NULL)
3813 break; 3866 break;
3814 3867
3815 *name++ = '\0'; 3868 *name++ = '\0';
3816 color = atoi (buf); 3869 color = atoi (buf) + minCOLOR;
3817 3870
3818 if (color < 0 || color >= TOTAL_COLORS) 3871 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3819 break; 3872 break;
3820 3873
3821 if ((buf = strchr (name, ';')) != NULL) 3874 if ((buf = strchr (name, ';')) != NULL)
3822 *buf++ = '\0'; 3875 *buf++ = '\0';
3823 3876
3824 if (name[0] == '?' && !name[1]) 3877 if (name[0] == '?' && !name[1])
3825 { 3878 {
3826 unsigned short r, g, b; 3879 unsigned short r, g, b;
3827 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3880 pix_colors_focused[color].get (display, r, g, b);
3828 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);
3829 } 3882 }
3830 else 3883 else
3831 set_window_color (color + minCOLOR, name); 3884 set_window_color (color, name);
3832 } 3885 }
3833 break; 3886 break;
3834 case XTerm_Color00: 3887 case XTerm_Color00:
3835 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3888 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3836 break; 3889 break;
3837 case XTerm_Color01: 3890 case XTerm_Color01:
3838 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3891 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3839 break; 3892 break;
3840#ifndef NO_CURSORCOLOR 3893#ifndef NO_CURSORCOLOR
3841 case XTerm_Color_cursor: 3894 case XTerm_Color_cursor:
3842 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3895 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3843 break; 3896 break;
… …
3847 break; 3900 break;
3848 case XTerm_Color_pointer_bg: 3901 case XTerm_Color_pointer_bg:
3849 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);
3850 break; 3903 break;
3851#ifndef NO_BOLD_UNDERLINE_REVERSE 3904#ifndef NO_BOLD_UNDERLINE_REVERSE
3852 case XTerm_Color_BD:
3853 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3854 break;
3855 case XTerm_Color_UL:
3856 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3857 break;
3858 case XTerm_Color_RV: 3905 case XTerm_Color_RV:
3859 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);
3860 break; 3915 break;
3861 case URxvt_Color_IT: 3916 case URxvt_Color_IT:
3862 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3917 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3863 break; 3918 break;
3864#endif 3919#endif
… …
3869 if (am_transparent) 3924 if (am_transparent)
3870 want_full_refresh = want_refresh = 1; 3925 want_full_refresh = want_refresh = 1;
3871 break; 3926 break;
3872#endif 3927#endif
3873 3928
3874 case XTerm_Pixmap: 3929 case Rxvt_Pixmap:
3875 if (*str != ';') 3930 if (*str != ';')
3876 { 3931 {
3877#if XPM_BACKGROUND 3932#if XPM_BACKGROUND
3878 scale_pixmap (""); /* reset to default scaling */ 3933 scale_pixmap (""); /* reset to default scaling */
3879 set_bgPixmap (str); /* change pixmap */ 3934 set_bgPixmap (str); /* change pixmap */
3880#endif
3881 scr_touch (true); 3935 scr_touch (true);
3936#endif
3882 } 3937 }
3938
3883 while ((str = strchr (str, ';')) != NULL) 3939 while ((str = strchr (str, ';')) != NULL)
3884 { 3940 {
3885 str++; 3941 str++;
3886#if XPM_BACKGROUND 3942#if XPM_BACKGROUND
3887 changed += scale_pixmap (str); 3943 changed += scale_pixmap (str);
… …
3890 3946
3891 if (changed) 3947 if (changed)
3892 { 3948 {
3893#ifdef XPM_BACKGROUND 3949#ifdef XPM_BACKGROUND
3894 resize_pixmap (); 3950 resize_pixmap ();
3895#endif
3896 scr_touch (true); 3951 scr_touch (true);
3952#endif
3897 } 3953 }
3898 break; 3954 break;
3899 3955
3900 case XTerm_restoreFG: 3956 case Rxvt_restoreFG:
3901 set_window_color (Color_fg, str); 3957 set_window_color (Color_fg, str);
3902 break; 3958 break;
3903 case XTerm_restoreBG: 3959 case Rxvt_restoreBG:
3904 set_window_color (Color_bg, str); 3960 set_window_color (Color_bg, str);
3905 break; 3961 break;
3906 3962
3907 case XTerm_logfile: 3963 case XTerm_logfile:
3908 // TODO, when secure mode? 3964 // TODO, when secure mode?
… …
3913 if (OPTION (Opt_insecure)) 3969 if (OPTION (Opt_insecure))
3914 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3970 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3915 break; 3971 break;
3916#endif 3972#endif
3917#if 0 3973#if 0
3918 case XTerm_dumpscreen: /* no error notices */ 3974 case Rxvt_dumpscreen: /* no error notices */
3919 { 3975 {
3920 int fd; 3976 int fd;
3921 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)
3922 { 3978 {
3923 scr_dump (fd); 3979 scr_dump (fd);
… …
3961 } 4017 }
3962 break; 4018 break;
3963 4019
3964 case URxvt_view_up: 4020 case URxvt_view_up:
3965 case URxvt_view_down: 4021 case URxvt_view_down:
4022 {
3966 int lines = atoi (str); 4023 int lines = atoi (str);
3967 4024
3968 if (lines) 4025 if (lines)
3969 scr_page (op == URxvt_view_up ? UP : DN, lines); 4026 scr_page (op == URxvt_view_up ? UP : DN, lines);
3970 else 4027 else
3971 scr_erase_savelines (); 4028 scr_erase_savelines ();
4029 }
3972 4030
3973 break; 4031 break;
3974#endif 4032#endif
3975 4033
3976#if ENABLE_PERL 4034#if ENABLE_PERL
3977 case URxvt_perl: 4035 case URxvt_perl:
3978 if (PERL_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END))) 4036 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3979 ; // no responses yet 4037 ; // no responses yet
3980 break; 4038 break;
3981
3982#endif 4039#endif
3983
3984 } 4040 }
3985} 4041}
3986/*----------------------------------------------------------------------*/ 4042/*----------------------------------------------------------------------*/
3987 4043
3988/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 4044/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
4097 /* extra handling for values with state unkept */ 4153 /* extra handling for values with state unkept */
4098 switch (arg[i]) 4154 switch (arg[i])
4099 { 4155 {
4100#if ENABLE_STYLES 4156#if ENABLE_STYLES
4101 case 1021: 4157 case 1021:
4102 if (mode) 4158 set_option (Opt_intensityStyles, mode);
4103 SET_OPTION (Opt_intensityStyles);
4104 else
4105 CLR_OPTION (Opt_intensityStyles);
4106 4159
4107 scr_touch (true); 4160 scr_touch (true);
4108 break; 4161 break;
4109#endif 4162#endif
4110 case 1048: /* alternative cursor save */ 4163 case 1048: /* alternative cursor save */
… …
4132 case 3: /* 80/132 */ 4185 case 3: /* 80/132 */
4133 if (priv_modes & PrivMode_132OK) 4186 if (priv_modes & PrivMode_132OK)
4134 set_widthheight (((state ? 132 : 80) * fwidth), height); 4187 set_widthheight (((state ? 132 : 80) * fwidth), height);
4135 break; 4188 break;
4136 case 4: /* smooth scrolling */ 4189 case 4: /* smooth scrolling */
4137 if (!state) 4190 set_option (Opt_jumpScroll, !state);
4138 SET_OPTION (Opt_jumpScroll);
4139 else
4140 CLR_OPTION (Opt_jumpScroll);
4141 break; 4191 break;
4142 case 5: /* reverse video */ 4192 case 5: /* reverse video */
4143 scr_rvideo_mode (state); 4193 scr_rvideo_mode (state);
4144 break; 4194 break;
4145 case 6: /* relative/absolute origins */ 4195 case 6: /* relative/absolute origins */
… …
4186#if 0 4236#if 0
4187 case 1001: 4237 case 1001:
4188 break; /* X11 mouse highlighting */ 4238 break; /* X11 mouse highlighting */
4189#endif 4239#endif
4190 case 1010: /* scroll to bottom on TTY output inhibit */ 4240 case 1010: /* scroll to bottom on TTY output inhibit */
4191 if (!state) 4241 set_option (Opt_scrollTtyOutput, !state);
4192 SET_OPTION (Opt_scrollTtyOutput);
4193 else
4194 CLR_OPTION (Opt_scrollTtyOutput);
4195 break; 4242 break;
4196 case 1011: /* scroll to bottom on key press */ 4243 case 1011: /* scroll to bottom on key press */
4197 if (state) 4244 set_option (Opt_scrollTtyKeypress, state);
4198 SET_OPTION (Opt_scrollTtyKeypress);
4199 else
4200 CLR_OPTION (Opt_scrollTtyKeypress);
4201 break; 4245 break;
4202 case 1047: /* secondary screen w/ clearing last */ 4246 case 1047: /* secondary screen w/ clearing last */
4203 if (OPTION (Opt_secondaryScreen)) 4247 if (OPTION (Opt_secondaryScreen))
4204 if (current_screen != PRIMARY) 4248 if (current_screen != PRIMARY)
4205 scr_erase_screen (2); 4249 scr_erase_screen (2);
… …
4343 scr_color (Color_bg, Color_bg); 4387 scr_color (Color_bg, Color_bg);
4344 break; 4388 break;
4345 4389
4346 //case 50: // not variable spacing 4390 //case 50: // not variable spacing
4347 4391
4348#ifndef NO_BRIGHTCOLOR 4392#if ENABLE_FRILLS
4349 case 90: 4393 case 90:
4350 case 91: /* set bright fg color */ 4394 case 91: /* set bright fg color */
4351 case 92: 4395 case 92:
4352 case 93: 4396 case 93:
4353 case 94: 4397 case 94:
… …
4398 */ 4442 */
4399void 4443void
4400rxvt_term::tt_printf (const char *fmt,...) 4444rxvt_term::tt_printf (const char *fmt,...)
4401{ 4445{
4402 va_list arg_ptr; 4446 va_list arg_ptr;
4403 unsigned char buf[256]; 4447 char buf[256];
4404 4448
4405 va_start (arg_ptr, fmt); 4449 va_start (arg_ptr, fmt);
4406 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4450 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4407 va_end (arg_ptr); 4451 va_end (arg_ptr);
4408 tt_write (buf, strlen (buf)); 4452 tt_write (buf, strlen (buf));
… …
4413 * or generated by us in response to a query ESC sequence. 4457 * or generated by us in response to a query ESC sequence.
4414 */ 4458 */
4415const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4459const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4416 4460
4417void 4461void
4418rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4462rxvt_term::tt_write (const char *data, unsigned int len)
4419{ 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
4420 if (v_buflen == 0) 4470 if (v_buflen == 0)
4421 { 4471 {
4422 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));
4423 4473
4424 if ((unsigned int)written == len) 4474 if ((unsigned int)written == len)
… …
4426 4476
4427 data += written; 4477 data += written;
4428 len -= written; 4478 len -= written;
4429 } 4479 }
4430 4480
4431 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4481 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4432 4482
4433 memcpy (v_buffer + v_buflen, data, len); 4483 memcpy (v_buffer + v_buflen, data, len);
4434 v_buflen += len; 4484 v_buflen += len;
4435 4485
4436 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