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.247 by root, Sat Jan 7 20:23:52 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_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
979 while (row > -nsaved && ROW (row - 1).is_longer ())
980 --row;
981
982 while (row < -view_start + nrow)
983 {
984 int start_row = row;
985 line_t *l;
986
987 do
988 {
989 l = &ROW (row);
990
991 if (!(l->f & LINE_FILTERED))
992 {
993 // line not filtered, mark it as filtered
994 l->f |= LINE_FILTERED;
995 while (l->is_longer ())
996 {
997 l = &ROW (++row);
998 l->f |= LINE_FILTERED;
999 }
1000
1001 // and filter it
1002 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1003
1004 break;
1005 }
1006 }
1007 while (l->is_longer ());
1008
1009 row++;
1010 }
1011
1012 }
1013
971 scr_refresh (refresh_type); 1014 scr_refresh (refresh_type);
972 scrollbar_show (1); 1015 scrollbar_show (1);
973#ifdef USE_XIM 1016#ifdef USE_XIM
974 IMSendSpot (); 1017 IMSendSpot ();
975#endif 1018#endif
… …
985 SET_LOCALE (locale); 1028 SET_LOCALE (locale);
986 1029
987 display->flush (); 1030 display->flush ();
988 1031
989 if (want_refresh && !flush_ev.active) 1032 if (want_refresh && !flush_ev.active)
990 flush_ev.start (NOW + 0.01); 1033 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
991} 1034}
992 1035
993void 1036void
994rxvt_term::flush_cb (time_watcher &w) 1037rxvt_term::flush_cb (time_watcher &w)
995{ 1038{
… …
1070 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1113 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1071 } 1114 }
1072} 1115}
1073#endif 1116#endif
1074 1117
1118#if HAVE_SCHED_YIELD
1119static struct event_handler
1120{
1121 check_watcher cw_yield;
1122
1123 void yield (check_watcher &w)
1124 {
1125 sched_yield ();
1126 w.stop ();
1127 }
1128
1129 event_handler ()
1130 : cw_yield (this, &event_handler::yield)
1131 {
1132 }
1133} event_handler;
1134#endif
1135
1075bool 1136bool
1076rxvt_term::pty_fill () 1137rxvt_term::pty_fill ()
1077{ 1138{
1078 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1139 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1079 1140
1080 if (CBUFSIZ == n) 1141 if (CBUFSIZ == n)
1081 { 1142 {
1082 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1143 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1083 n = 0; 1144 n = 0;
1084 } 1145 }
1085 1146
1086 memmove (cmdbuf_base, cmdbuf_ptr, n); 1147 memmove (cmdbuf_base, cmdbuf_ptr, n);
1087 cmdbuf_ptr = cmdbuf_base; 1148 cmdbuf_ptr = cmdbuf_base;
… …
1095 return true; 1156 return true;
1096 } 1157 }
1097 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1158 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1098 { 1159 {
1099#if HAVE_SCHED_YIELD 1160#if HAVE_SCHED_YIELD
1100 sched_yield (); 1161 if (display->is_local)
1162 event_handler.cw_yield.start ();
1101#endif 1163#endif
1102 } 1164 }
1103 else 1165 else
1104 { 1166 {
1105 pty_ev.stop (); 1167 pty_ev.stop ();
… …
1143 1205
1144#ifdef POINTER_BLANK 1206#ifdef POINTER_BLANK
1145void 1207void
1146rxvt_term::pointer_blank () 1208rxvt_term::pointer_blank ()
1147{ 1209{
1148 if (! OPTION (Opt_pointerBlank)) 1210 if (!OPTION (Opt_pointerBlank))
1149 return; 1211 return;
1150 1212
1151 XDefineCursor (display->display, vt, display->blank_cursor); 1213 XDefineCursor (display->display, vt, display->blank_cursor);
1152 XFlush (display->display); 1214 XFlush (display->display);
1153 1215
… …
1352# endif 1414# endif
1353 else 1415 else
1354 iso14755buf = 0; 1416 iso14755buf = 0;
1355 } 1417 }
1356#endif 1418#endif
1419
1420 if (ev.xany.window == vt
1421 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END)))
1422 break;
1357 1423
1358#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1424#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1359 if (!(ev.xkey.state & ControlMask)) 1425 if (!(ev.xkey.state & ControlMask))
1360 slip_wheel_ev.stop (); 1426 slip_wheel_ev.stop ();
1361 else if (ks == XK_Control_L || ks == XK_Control_R) 1427 else if (ks == XK_Control_L || ks == XK_Control_R)
… …
1496 1562
1497 case SelectionRequest: 1563 case SelectionRequest:
1498 selection_send (ev.xselectionrequest); 1564 selection_send (ev.xselectionrequest);
1499 break; 1565 break;
1500 1566
1567 case MapNotify:
1568 mapped = 1;
1569#ifdef TEXT_BLINK
1570 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1571#endif
1572 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1573 break;
1574
1501 case UnmapNotify: 1575 case UnmapNotify:
1502 mapped = 0; 1576 mapped = 0;
1503#ifdef TEXT_BLINK 1577#ifdef TEXT_BLINK
1504 text_blink_ev.stop (); 1578 text_blink_ev.stop ();
1505#endif 1579#endif
1506 break; 1580 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; 1581 break;
1514 1582
1515#ifdef TRANSPARENT 1583#ifdef TRANSPARENT
1516 case ReparentNotify: 1584 case ReparentNotify:
1517 rootwin_cb (ev); 1585 rootwin_cb (ev);
… …
1576 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1644 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1577 break; 1645 break;
1578 1646
1579 if (ev.xany.window == vt) 1647 if (ev.xany.window == vt)
1580 { 1648 {
1649 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1650 ; // nop
1581 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1651 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1582 { 1652 {
1583 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1653 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1584 ; 1654 ;
1585 1655
1586 XQueryPointer (disp, vt, 1656 XQueryPointer (disp, vt,
… …
1681{ 1751{
1682 if (!focus) 1752 if (!focus)
1683 { 1753 {
1684 focus = 1; 1754 focus = 1;
1685 want_refresh = 1; 1755 want_refresh = 1;
1756
1757 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1758
1686#if USE_XIM 1759#if USE_XIM
1687 if (Input_Context != NULL) 1760 if (Input_Context != NULL)
1688 { 1761 {
1689 IMSetStatusPosition (); 1762 IMSetStatusPosition ();
1690 XSetICFocus (Input_Context); 1763 XSetICFocus (Input_Context);
… …
1710 if (focus) 1783 if (focus)
1711 { 1784 {
1712 focus = 0; 1785 focus = 0;
1713 want_refresh = 1; 1786 want_refresh = 1;
1714 1787
1788 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1789
1715#if ENABLE_FRILLS || ISO_14755 1790#if ENABLE_FRILLS || ISO_14755
1791 if (iso14755buf)
1792 {
1716 iso14755buf = 0; 1793 iso14755buf = 0;
1717#endif
1718#if ENABLE_OVERLAY 1794# if ENABLE_OVERLAY
1719 scr_overlay_off (); 1795 scr_overlay_off ();
1796# endif
1797 }
1720#endif 1798#endif
1721#if USE_XIM 1799#if USE_XIM
1722 if (Input_Context != NULL) 1800 if (Input_Context != NULL)
1723 XUnsetICFocus (Input_Context); 1801 XUnsetICFocus (Input_Context);
1724#endif 1802#endif
… …
1768rxvt_term::button_press (XButtonEvent &ev) 1846rxvt_term::button_press (XButtonEvent &ev)
1769{ 1847{
1770 int reportmode = 0, clickintime; 1848 int reportmode = 0, clickintime;
1771 1849
1772 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1850 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1851
1773 if (!bypass_keystate) 1852 if (!bypass_keystate)
1774 reportmode = !! (priv_modes & PrivMode_mouse_report); 1853 reportmode = !! (priv_modes & PrivMode_mouse_report);
1775 1854
1776 /* 1855 /*
1777 * VT window processing of button press 1856 * VT window processing of button press
… …
1797#ifdef MOUSE_REPORT_DOUBLECLICK 1876#ifdef MOUSE_REPORT_DOUBLECLICK
1798 if (ev.button == MEvent.button && clickintime) 1877 if (ev.button == MEvent.button && clickintime)
1799 { 1878 {
1800 /* same button, within alloted time */ 1879 /* same button, within alloted time */
1801 MEvent.clicks++; 1880 MEvent.clicks++;
1881
1802 if (MEvent.clicks > 1) 1882 if (MEvent.clicks > 1)
1803 { 1883 {
1804 /* only report double clicks */ 1884 /* only report double clicks */
1805 MEvent.clicks = 2; 1885 MEvent.clicks = 2;
1806 mouse_report (ev); 1886 mouse_report (ev);
… …
1826 else 1906 else
1827 { 1907 {
1828 if (ev.button != MEvent.button) 1908 if (ev.button != MEvent.button)
1829 MEvent.clicks = 0; 1909 MEvent.clicks = 0;
1830 1910
1911 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1831 switch (ev.button) 1912 switch (ev.button)
1832 { 1913 {
1833 case Button1: 1914 case Button1:
1834 /* allow meta + click to select rectangular areas */ 1915 /* allow meta + click to select rectangular areas */
1835 /* should be done in screen.C */ 1916 /* should be done in screen.C */
1836#if ENABLE_FRILLS 1917#if ENABLE_FRILLS
1837 selection.rect = !!(ev.state & ModMetaMask); 1918 selection.rect = !!(ev.state & ModMetaMask);
1838#else 1919#else
1839 selection.rect = false; 1920 selection.rect = false;
1840#endif 1921#endif
1841 1922
1842 /* allow shift+left click to extend selection */ 1923 /* allow shift+left click to extend selection */
1843 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1924 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1844 { 1925 {
1845 if (MEvent.button == Button1 && clickintime) 1926 if (MEvent.button == Button1 && clickintime)
1846 selection_rotate (ev.x, ev.y); 1927 selection_rotate (ev.x, ev.y);
1847 else 1928 else
1848 selection_extend (ev.x, ev.y, 1); 1929 selection_extend (ev.x, ev.y, 1);
1849 } 1930 }
1850 else 1931 else
1851 { 1932 {
1852 if (MEvent.button == Button1 && clickintime) 1933 if (MEvent.button == Button1 && clickintime)
1853 MEvent.clicks++; 1934 MEvent.clicks++;
1854 else 1935 else
1855 MEvent.clicks = 1; 1936 MEvent.clicks = 1;
1856 1937
1857 selection_click (MEvent.clicks, ev.x, ev.y); 1938 selection_click (MEvent.clicks, ev.x, ev.y);
1858 } 1939 }
1859 1940
1860 MEvent.button = Button1; 1941 MEvent.button = Button1;
1861 break; 1942 break;
1862 1943
1863 case Button3: 1944 case Button3:
1864 if (MEvent.button == Button3 && clickintime) 1945 if (MEvent.button == Button3 && clickintime)
1865 selection_rotate (ev.x, ev.y); 1946 selection_rotate (ev.x, ev.y);
1866 else 1947 else
1867 selection_extend (ev.x, ev.y, 1); 1948 selection_extend (ev.x, ev.y, 1);
1868 1949
1869 MEvent.button = Button3; 1950 MEvent.button = Button3;
1870 break; 1951 break;
1871 } 1952 }
1872 } 1953 }
1873 1954
1874 MEvent.time = ev.time; 1955 MEvent.time = ev.time;
1875 return; 1956 return;
1876 } 1957 }
1877 1958
… …
2013 } 2094 }
2014 2095
2015 break; 2096 break;
2016 } 2097 }
2017 } 2098 }
2099
2018 return; 2100 return;
2019 } 2101 }
2102
2020#if MENUBAR 2103#if MENUBAR
2021 /* 2104 /*
2022 * Menubar window processing of button press 2105 * Menubar window processing of button press
2023 */ 2106 */
2024 if (isMenuBarWindow (ev.window)) 2107 if (isMenuBarWindow (ev.window))
… …
2086 */ 2169 */
2087 if (priv_modes & PrivMode_mouse_report 2170 if (priv_modes & PrivMode_mouse_report
2088 && bypass_keystate 2171 && bypass_keystate
2089 && ev.button == Button1 && MEvent.clicks <= 1) 2172 && ev.button == Button1 && MEvent.clicks <= 1)
2090 selection_extend (ev.x, ev.y, 0); 2173 selection_extend (ev.x, ev.y, 0);
2174
2175 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2176 return;
2091 2177
2092 switch (ev.button) 2178 switch (ev.button)
2093 { 2179 {
2094 case Button1: 2180 case Button1:
2095 case Button3: 2181 case Button3:
… …
2640 2726
2641bool 2727bool
2642rxvt_term::cmd_parse () 2728rxvt_term::cmd_parse ()
2643{ 2729{
2644 bool flag = false; 2730 bool flag = false;
2645 unicode_t ch = NOCHAR; 2731 wchar_t ch = NOCHAR;
2646 unsigned char *seq_begin; // remember start of esc-sequence here 2732 char *seq_begin; // remember start of esc-sequence here
2647 2733
2648 for (;;) 2734 for (;;)
2649 { 2735 {
2650 if (ch == NOCHAR) 2736 if (ch == NOCHAR)
2651 { 2737 {
2652 seq_begin = cmdbuf_ptr; 2738 seq_begin = cmdbuf_ptr;
2653 ch = next_char (); 2739 ch = next_char ();
2654 }
2655 2740
2656 if (ch == NOCHAR) // TODO: improve 2741 if (ch == NOCHAR)
2657 break; 2742 break;
2743 }
2658 2744
2659 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2745 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2660 { 2746 {
2661 if (!seen_input) 2747 if (!seen_input)
2662 { 2748 {
… …
2671 if (seen_resize && cmd_pid) 2757 if (seen_resize && cmd_pid)
2672 kill (-cmd_pid, SIGWINCH); 2758 kill (-cmd_pid, SIGWINCH);
2673 } 2759 }
2674 2760
2675 /* Read a text string from the input buffer */ 2761 /* Read a text string from the input buffer */
2676 unicode_t buf[UBUFSIZ]; 2762 wchar_t buf[UBUFSIZ];
2677 bool refreshnow = false; 2763 bool refreshnow = false;
2678 int nlines = 0; 2764 int nlines = 0;
2679 unicode_t *str = buf; 2765 wchar_t *str = buf;
2680 unicode_t *eol = str + min (ncol, UBUFSIZ); 2766 wchar_t *eol = str + min (ncol, UBUFSIZ);
2681 2767
2682 for (;;) 2768 for (;;)
2683 { 2769 {
2684 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2770 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2685 break; 2771 break;
… …
2695 2781
2696 if (!OPTION (Opt_jumpScroll) 2782 if (!OPTION (Opt_jumpScroll)
2697 || (refresh_count >= refresh_limit * (nrow - 1))) 2783 || (refresh_count >= refresh_limit * (nrow - 1)))
2698 { 2784 {
2699 refreshnow = true; 2785 refreshnow = true;
2786 refresh_count = 0;
2700 ch = NOCHAR; 2787 ch = NOCHAR;
2701 break; 2788 break;
2702 } 2789 }
2703 2790
2704 // scr_add_lines only works for nlines <= nrow - 1. 2791 // scr_add_lines only works for nlines <= nrow - 1.
2705 if (nlines >= nrow - 1) 2792 if (nlines >= nrow - 1)
2706 { 2793 {
2794 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2707 scr_add_lines (buf, nlines, str - buf); 2795 scr_add_lines (buf, str - buf, nlines);
2796
2708 nlines = 0; 2797 nlines = 0;
2709 str = buf; 2798 str = buf;
2710 eol = str + min (ncol, UBUFSIZ); 2799 eol = str + min (ncol, UBUFSIZ);
2711 } 2800 }
2712 2801
… …
2725 2814
2726 seq_begin = cmdbuf_ptr; 2815 seq_begin = cmdbuf_ptr;
2727 ch = next_char (); 2816 ch = next_char ();
2728 } 2817 }
2729 2818
2819 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2730 scr_add_lines (buf, nlines, str - buf); 2820 scr_add_lines (buf, str - buf, nlines);
2731 2821
2732 /* 2822 /*
2733 * If there have been a lot of new lines, then update the screen 2823 * 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. 2824 * 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 2825 * the number of pages between refreshes is refresh_limit, which
… …
2741 refresh_limit++; 2831 refresh_limit++;
2742 else 2832 else
2743 { 2833 {
2744 flag = true; 2834 flag = true;
2745 scr_refresh (refresh_type); 2835 scr_refresh (refresh_type);
2836 flush_ev.stop ();
2746 } 2837 }
2747 } 2838 }
2748 2839
2749 } 2840 }
2750 else 2841 else
… …
2765 } 2856 }
2766 2857
2767 return flag; 2858 return flag;
2768} 2859}
2769 2860
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 2861// read the next character
2780unicode_t 2862wchar_t
2781rxvt_term::next_char () 2863rxvt_term::next_char ()
2782{ 2864{
2783 while (cmdbuf_ptr < cmdbuf_endp) 2865 while (cmdbuf_ptr < cmdbuf_endp)
2784 { 2866 {
2785 // assume 7-bit to be ascii ALWAYS 2867 // assume 7-bit to be ascii ALWAYS
2786 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2868 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2787 return *cmdbuf_ptr++; 2869 return *cmdbuf_ptr++;
2788 2870
2789 wchar_t wc; 2871 wchar_t wc;
2790 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2872 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2791 2873
2792 if (len == (size_t)-2) 2874 if (len == (size_t)-2)
2793 { 2875 {
2794 // the mbstate stores incomplete sequences. didn't know this :/ 2876 // the mbstate stores incomplete sequences. didn't know this :/
2795 cmdbuf_ptr = cmdbuf_endp; 2877 cmdbuf_ptr = cmdbuf_endp;
2796 break; 2878 break;
2797 } 2879 }
2798 2880
2799 if (len == (size_t)-1) 2881 if (len == (size_t)-1)
2800 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2882 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2801 2883
2802 // assume wchar == unicode 2884 // assume wchar == unicode
2803 cmdbuf_ptr += len; 2885 cmdbuf_ptr += len;
2804 return wc & UNICODE_MASK; 2886 return wc & UNICODE_MASK;
2805 } 2887 }
2806 2888
2807 return NOCHAR; 2889 return NOCHAR;
2890}
2891
2892// read the next octet
2893uint32_t
2894rxvt_term::next_octet ()
2895{
2896 return cmdbuf_ptr < cmdbuf_endp
2897 ? (unsigned char)*cmdbuf_ptr++
2898 : NOCHAR;
2808} 2899}
2809 2900
2810/* rxvt_cmd_getc () - Return next input character */ 2901/* rxvt_cmd_getc () - Return next input character */
2811/* 2902/*
2812 * Return the next input character after first passing any keyboard input 2903 * Return the next input character after first passing any keyboard input
2813 * to the command. 2904 * to the command.
2814 */ 2905 */
2815unicode_t 2906wchar_t
2816rxvt_term::cmd_getc () 2907rxvt_term::cmd_getc ()
2817{ 2908{
2818 unicode_t c = next_char (); 2909 wchar_t c = next_char ();
2819 2910
2820 if (c == NOCHAR) 2911 if (c == NOCHAR)
2821 throw out_of_input; 2912 throw out_of_input;
2822 2913
2823 return c; 2914 return c;
2824} 2915}
2825 2916
2826unicode_t 2917uint32_t
2827rxvt_term::cmd_get8 () 2918rxvt_term::cmd_get8 ()
2828{ 2919{
2829 unicode_t c = next_octet (); 2920 uint32_t c = next_octet ();
2830 2921
2831 if (c == NOCHAR) 2922 if (c == NOCHAR)
2832 throw out_of_input; 2923 throw out_of_input;
2833 2924
2834 return c; 2925 return c;
… …
2934 case C0_ESC: 3025 case C0_ESC:
2935 process_escape_seq (); 3026 process_escape_seq ();
2936 break; 3027 break;
2937 case C0_ENQ: /* terminal Status */ 3028 case C0_ENQ: /* terminal Status */
2938 if (rs[Rs_answerbackstring]) 3029 if (rs[Rs_answerbackstring])
2939 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3030 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2940 (unsigned int)strlen (rs[Rs_answerbackstring]));
2941 else 3031 else
2942 tt_write ((unsigned char *)VT100_ANS, 3032 tt_write (VT100_ANS, strlen (VT100_ANS));
2943 (unsigned int)strlen (VT100_ANS));
2944 break; 3033 break;
2945 case C0_BEL: /* bell */ 3034 case C0_BEL: /* bell */
2946 scr_bell (); 3035 scr_bell ();
2947 break; 3036 break;
2948 case C0_BS: /* backspace */ 3037 case C0_BS: /* backspace */
… …
3103 break; 3192 break;
3104 3193
3105 /* 8.3.87: NEXT LINE */ 3194 /* 8.3.87: NEXT LINE */
3106 case C1_NEL: /* ESC E */ 3195 case C1_NEL: /* ESC E */
3107 { 3196 {
3108 unicode_t nlcr[] = { C0_LF, C0_CR }; 3197 wchar_t nlcr[] = { C0_LF, C0_CR };
3109 scr_add_lines (nlcr, 1, 2); 3198 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3110 } 3199 }
3111 break; 3200 break;
3112 3201
3113 /* kidnapped escape sequence: Should be 8.3.48 */ 3202 /* kidnapped escape sequence: Should be 8.3.48 */
3114 case C1_ESA: /* ESC G */ 3203 case C1_ESA: /* ESC G */
… …
3136 process_dcs_seq (); 3225 process_dcs_seq ();
3137 break; 3226 break;
3138 3227
3139 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3228 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3140 case C1_SCI: /* ESC Z */ 3229 case C1_SCI: /* ESC Z */
3141 tt_write ((const unsigned char *)ESCZ_ANSWER, 3230 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3142 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3143 break; /* steal obsolete ESC [ c */ 3231 break; /* steal obsolete ESC [ c */
3144 3232
3145 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3233 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3146 case C1_CSI: /* ESC [ */ 3234 case C1_CSI: /* ESC [ */
3147 process_csi_seq (); 3235 process_csi_seq ();
… …
3391 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3479 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3392 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3480 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3393 break; 3481 break;
3394 3482
3395 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3483 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3396 tt_write ((const unsigned char *)VT100_ANS, 3484 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3397 (unsigned int) (sizeof (VT100_ANS) - 1));
3398 break; 3485 break;
3399 3486
3400 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3487 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3401 process_sgr_mode (nargs, arg); 3488 process_sgr_mode (nargs, arg);
3402 break; 3489 break;
… …
3604/*----------------------------------------------------------------------*/ 3691/*----------------------------------------------------------------------*/
3605/* 3692/*
3606 * get input up until STRING TERMINATOR (or BEL) 3693 * get input up until STRING TERMINATOR (or BEL)
3607 * ends_how is terminator used. returned input must be free()'d 3694 * ends_how is terminator used. returned input must be free()'d
3608 */ 3695 */
3609unsigned char * 3696char *
3610rxvt_term::get_to_st (unicode_t &ends_how) 3697rxvt_term::get_to_st (unicode_t &ends_how)
3611{ 3698{
3612 unicode_t ch; 3699 unicode_t ch;
3613 bool seen_esc = false; 3700 bool seen_esc = false;
3614 unsigned int n = 0; 3701 unsigned int n = 0;
… …
3647 3734
3648 string[n++] = '\0'; 3735 string[n++] = '\0';
3649 3736
3650 ends_how = (ch == 0x5c ? C0_ESC : ch); 3737 ends_how = (ch == 0x5c ? C0_ESC : ch);
3651 3738
3652 return (unsigned char *)rxvt_wcstombs (string); 3739 return rxvt_wcstombs (string);
3653} 3740}
3654 3741
3655/*----------------------------------------------------------------------*/ 3742/*----------------------------------------------------------------------*/
3656/* 3743/*
3657 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3744 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3658 */ 3745 */
3659void 3746void
3660rxvt_term::process_dcs_seq () 3747rxvt_term::process_dcs_seq ()
3661{ 3748{
3662 unsigned char *s; 3749 char *s;
3663 unicode_t eh; 3750 unicode_t eh;
3664 3751
3665 /* 3752 /*
3666 * Not handled yet 3753 * Not handled yet
3667 */ 3754 */
… …
3686 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3773 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3687 arg = arg * 10 + (ch - '0'); 3774 arg = arg * 10 + (ch - '0');
3688 3775
3689 if (ch == ';') 3776 if (ch == ';')
3690 { 3777 {
3691 unsigned char *s = get_to_st (eh); 3778 char *s = get_to_st (eh);
3692 3779
3693 if (s) 3780 if (s)
3694 { 3781 {
3695 process_xterm_seq (arg, (char *)s, eh); 3782 process_xterm_seq (arg, s, eh);
3696 free (s); 3783 free (s);
3697 } 3784 }
3698 } 3785 }
3699} 3786}
3700 3787
3701void 3788void
3702rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3789rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3703{ 3790{
3704 if (str[0] == '?' && !str[1]) 3791 if (str[0] == '?' && !str[1])
3705 { 3792 {
3706 unsigned short r, g, b; 3793 unsigned short r, g, b;
3707 pix_colors_focused[color].get (display, r, g, b); 3794 pix_colors_focused[color].get (display, r, g, b);
… …
3713 3800
3714/* 3801/*
3715 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3802 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3716 */ 3803 */
3717void 3804void
3718rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3805rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3719{ 3806{
3720 int changed = 0; 3807 int changed = 0;
3721 int color; 3808 int color;
3722 char *buf, *name; 3809 char *buf, *name;
3723 bool query = str[0] == '?' && !str[1]; 3810 bool query = str[0] == '?' && !str[1];
… …
3930 } 4017 }
3931 break; 4018 break;
3932 4019
3933 case URxvt_view_up: 4020 case URxvt_view_up:
3934 case URxvt_view_down: 4021 case URxvt_view_down:
4022 {
3935 int lines = atoi (str); 4023 int lines = atoi (str);
3936 4024
3937 if (lines) 4025 if (lines)
3938 scr_page (op == URxvt_view_up ? UP : DN, lines); 4026 scr_page (op == URxvt_view_up ? UP : DN, lines);
3939 else 4027 else
3940 {
3941 scr_erase_savelines (); 4028 scr_erase_savelines ();
3942 } 4029 }
3943 4030
4031 break;
4032#endif
4033
4034#if ENABLE_PERL
4035 case URxvt_perl:
4036 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
4037 ; // no responses yet
3944 break; 4038 break;
3945#endif 4039#endif
3946 } 4040 }
3947} 4041}
3948/*----------------------------------------------------------------------*/ 4042/*----------------------------------------------------------------------*/
… …
4064 if (mode) 4158 if (mode)
4065 SET_OPTION (Opt_intensityStyles); 4159 SET_OPTION (Opt_intensityStyles);
4066 else 4160 else
4067 CLR_OPTION (Opt_intensityStyles); 4161 CLR_OPTION (Opt_intensityStyles);
4068 4162
4069 want_refresh = 1; 4163 scr_touch (true);
4070 want_full_refresh = 1;
4071 break; 4164 break;
4072#endif 4165#endif
4073 case 1048: /* alternative cursor save */ 4166 case 1048: /* alternative cursor save */
4074 case 1049: 4167 case 1049:
4075 if (OPTION (Opt_secondaryScreen)) 4168 if (OPTION (Opt_secondaryScreen))
… …
4306 scr_color (Color_bg, Color_bg); 4399 scr_color (Color_bg, Color_bg);
4307 break; 4400 break;
4308 4401
4309 //case 50: // not variable spacing 4402 //case 50: // not variable spacing
4310 4403
4311#ifndef NO_BRIGHTCOLOR 4404#if ENABLE_FRILLS
4312 case 90: 4405 case 90:
4313 case 91: /* set bright fg color */ 4406 case 91: /* set bright fg color */
4314 case 92: 4407 case 92:
4315 case 93: 4408 case 93:
4316 case 94: 4409 case 94:
… …
4361 */ 4454 */
4362void 4455void
4363rxvt_term::tt_printf (const char *fmt,...) 4456rxvt_term::tt_printf (const char *fmt,...)
4364{ 4457{
4365 va_list arg_ptr; 4458 va_list arg_ptr;
4366 unsigned char buf[256]; 4459 char buf[256];
4367 4460
4368 va_start (arg_ptr, fmt); 4461 va_start (arg_ptr, fmt);
4369 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4462 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4370 va_end (arg_ptr); 4463 va_end (arg_ptr);
4371 tt_write (buf, strlen (buf)); 4464 tt_write (buf, strlen (buf));
… …
4376 * or generated by us in response to a query ESC sequence. 4469 * or generated by us in response to a query ESC sequence.
4377 */ 4470 */
4378const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4471const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4379 4472
4380void 4473void
4381rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4474rxvt_term::tt_write (const char *data, unsigned int len)
4382{ 4475{
4476 if (pty.pty < 0)
4477 return;
4478
4383 if (v_buflen == 0) 4479 if (v_buflen == 0)
4384 { 4480 {
4385 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4481 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4386 4482
4387 if ((unsigned int)written == len) 4483 if ((unsigned int)written == len)
… …
4389 4485
4390 data += written; 4486 data += written;
4391 len -= written; 4487 len -= written;
4392 } 4488 }
4393 4489
4394 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4490 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4395 4491
4396 memcpy (v_buffer + v_buflen, data, len); 4492 memcpy (v_buffer + v_buflen, data, len);
4397 v_buflen += len; 4493 v_buflen += len;
4398 4494
4399 pty_ev.set (EVENT_READ | EVENT_WRITE); 4495 pty_ev.set (EVENT_READ | EVENT_WRITE);

Diff Legend

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