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.245 by root, Fri Jan 6 18:33:30 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_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
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
970 scr_refresh (refresh_type); 1014 scr_refresh (refresh_type);
971 scrollbar_show (1); 1015 scrollbar_show (1);
972#ifdef USE_XIM 1016#ifdef USE_XIM
973 IMSendSpot (); 1017 IMSendSpot ();
974#endif 1018#endif
… …
1069 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1113 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1070 } 1114 }
1071} 1115}
1072#endif 1116#endif
1073 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
1074bool 1136bool
1075rxvt_term::pty_fill () 1137rxvt_term::pty_fill ()
1076{ 1138{
1077 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1139 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1078 1140
1079 if (CBUFSIZ == n) 1141 if (CBUFSIZ == n)
1080 { 1142 {
1081 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");
1082 n = 0; 1144 n = 0;
1083 } 1145 }
1084 1146
1085 memmove (cmdbuf_base, cmdbuf_ptr, n); 1147 memmove (cmdbuf_base, cmdbuf_ptr, n);
1086 cmdbuf_ptr = cmdbuf_base; 1148 cmdbuf_ptr = cmdbuf_base;
… …
1094 return true; 1156 return true;
1095 } 1157 }
1096 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1158 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1097 { 1159 {
1098#if HAVE_SCHED_YIELD 1160#if HAVE_SCHED_YIELD
1099 sched_yield (); 1161 if (display->is_local)
1162 event_handler.cw_yield.start ();
1100#endif 1163#endif
1101 } 1164 }
1102 else 1165 else
1103 { 1166 {
1104 pty_ev.stop (); 1167 pty_ev.stop ();
… …
1142 1205
1143#ifdef POINTER_BLANK 1206#ifdef POINTER_BLANK
1144void 1207void
1145rxvt_term::pointer_blank () 1208rxvt_term::pointer_blank ()
1146{ 1209{
1147 if (! OPTION (Opt_pointerBlank)) 1210 if (!OPTION (Opt_pointerBlank))
1148 return; 1211 return;
1149 1212
1150 XDefineCursor (display->display, vt, display->blank_cursor); 1213 XDefineCursor (display->display, vt, display->blank_cursor);
1151 XFlush (display->display); 1214 XFlush (display->display);
1152 1215
… …
1351# endif 1414# endif
1352 else 1415 else
1353 iso14755buf = 0; 1416 iso14755buf = 0;
1354 } 1417 }
1355#endif 1418#endif
1419
1420 if (ev.xany.window == vt
1421 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END)))
1422 break;
1356 1423
1357#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1424#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1358 if (!(ev.xkey.state & ControlMask)) 1425 if (!(ev.xkey.state & ControlMask))
1359 slip_wheel_ev.stop (); 1426 slip_wheel_ev.stop ();
1360 else if (ks == XK_Control_L || ks == XK_Control_R) 1427 else if (ks == XK_Control_L || ks == XK_Control_R)
… …
1575 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1642 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1576 break; 1643 break;
1577 1644
1578 if (ev.xany.window == vt) 1645 if (ev.xany.window == vt)
1579 { 1646 {
1647 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1648 ; // nop
1580 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1649 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1581 { 1650 {
1582 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1651 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1583 ; 1652 ;
1584 1653
1585 XQueryPointer (disp, vt, 1654 XQueryPointer (disp, vt,
… …
1680{ 1749{
1681 if (!focus) 1750 if (!focus)
1682 { 1751 {
1683 focus = 1; 1752 focus = 1;
1684 want_refresh = 1; 1753 want_refresh = 1;
1754
1755 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1756
1685#if USE_XIM 1757#if USE_XIM
1686 if (Input_Context != NULL) 1758 if (Input_Context != NULL)
1687 { 1759 {
1688 IMSetStatusPosition (); 1760 IMSetStatusPosition ();
1689 XSetICFocus (Input_Context); 1761 XSetICFocus (Input_Context);
… …
1709 if (focus) 1781 if (focus)
1710 { 1782 {
1711 focus = 0; 1783 focus = 0;
1712 want_refresh = 1; 1784 want_refresh = 1;
1713 1785
1786 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1787
1714#if ENABLE_FRILLS || ISO_14755 1788#if ENABLE_FRILLS || ISO_14755
1789 if (iso14755buf)
1790 {
1715 iso14755buf = 0; 1791 iso14755buf = 0;
1716#endif
1717#if ENABLE_OVERLAY 1792# if ENABLE_OVERLAY
1718 scr_overlay_off (); 1793 scr_overlay_off ();
1794# endif
1795 }
1719#endif 1796#endif
1720#if USE_XIM 1797#if USE_XIM
1721 if (Input_Context != NULL) 1798 if (Input_Context != NULL)
1722 XUnsetICFocus (Input_Context); 1799 XUnsetICFocus (Input_Context);
1723#endif 1800#endif
… …
1767rxvt_term::button_press (XButtonEvent &ev) 1844rxvt_term::button_press (XButtonEvent &ev)
1768{ 1845{
1769 int reportmode = 0, clickintime; 1846 int reportmode = 0, clickintime;
1770 1847
1771 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1848 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1849
1772 if (!bypass_keystate) 1850 if (!bypass_keystate)
1773 reportmode = !! (priv_modes & PrivMode_mouse_report); 1851 reportmode = !! (priv_modes & PrivMode_mouse_report);
1774 1852
1775 /* 1853 /*
1776 * VT window processing of button press 1854 * VT window processing of button press
… …
1796#ifdef MOUSE_REPORT_DOUBLECLICK 1874#ifdef MOUSE_REPORT_DOUBLECLICK
1797 if (ev.button == MEvent.button && clickintime) 1875 if (ev.button == MEvent.button && clickintime)
1798 { 1876 {
1799 /* same button, within alloted time */ 1877 /* same button, within alloted time */
1800 MEvent.clicks++; 1878 MEvent.clicks++;
1879
1801 if (MEvent.clicks > 1) 1880 if (MEvent.clicks > 1)
1802 { 1881 {
1803 /* only report double clicks */ 1882 /* only report double clicks */
1804 MEvent.clicks = 2; 1883 MEvent.clicks = 2;
1805 mouse_report (ev); 1884 mouse_report (ev);
… …
1825 else 1904 else
1826 { 1905 {
1827 if (ev.button != MEvent.button) 1906 if (ev.button != MEvent.button)
1828 MEvent.clicks = 0; 1907 MEvent.clicks = 0;
1829 1908
1909 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1830 switch (ev.button) 1910 switch (ev.button)
1831 { 1911 {
1832 case Button1: 1912 case Button1:
1833 /* allow meta + click to select rectangular areas */ 1913 /* allow meta + click to select rectangular areas */
1834 /* should be done in screen.C */ 1914 /* should be done in screen.C */
1835#if ENABLE_FRILLS 1915#if ENABLE_FRILLS
1836 selection.rect = !!(ev.state & ModMetaMask); 1916 selection.rect = !!(ev.state & ModMetaMask);
1837#else 1917#else
1838 selection.rect = false; 1918 selection.rect = false;
1839#endif 1919#endif
1840 1920
1841 /* allow shift+left click to extend selection */ 1921 /* allow shift+left click to extend selection */
1842 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1922 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1843 { 1923 {
1844 if (MEvent.button == Button1 && clickintime) 1924 if (MEvent.button == Button1 && clickintime)
1845 selection_rotate (ev.x, ev.y); 1925 selection_rotate (ev.x, ev.y);
1846 else 1926 else
1847 selection_extend (ev.x, ev.y, 1); 1927 selection_extend (ev.x, ev.y, 1);
1848 } 1928 }
1849 else 1929 else
1850 { 1930 {
1851 if (MEvent.button == Button1 && clickintime) 1931 if (MEvent.button == Button1 && clickintime)
1852 MEvent.clicks++; 1932 MEvent.clicks++;
1853 else 1933 else
1854 MEvent.clicks = 1; 1934 MEvent.clicks = 1;
1855 1935
1856 selection_click (MEvent.clicks, ev.x, ev.y); 1936 selection_click (MEvent.clicks, ev.x, ev.y);
1857 } 1937 }
1858 1938
1859 MEvent.button = Button1; 1939 MEvent.button = Button1;
1860 break; 1940 break;
1861 1941
1862 case Button3: 1942 case Button3:
1863 if (MEvent.button == Button3 && clickintime) 1943 if (MEvent.button == Button3 && clickintime)
1864 selection_rotate (ev.x, ev.y); 1944 selection_rotate (ev.x, ev.y);
1865 else 1945 else
1866 selection_extend (ev.x, ev.y, 1); 1946 selection_extend (ev.x, ev.y, 1);
1867 1947
1868 MEvent.button = Button3; 1948 MEvent.button = Button3;
1869 break; 1949 break;
1870 } 1950 }
1871 } 1951 }
1872 1952
1873 MEvent.time = ev.time; 1953 MEvent.time = ev.time;
1874 return; 1954 return;
1875 } 1955 }
1876 1956
… …
2012 } 2092 }
2013 2093
2014 break; 2094 break;
2015 } 2095 }
2016 } 2096 }
2097
2017 return; 2098 return;
2018 } 2099 }
2100
2019#if MENUBAR 2101#if MENUBAR
2020 /* 2102 /*
2021 * Menubar window processing of button press 2103 * Menubar window processing of button press
2022 */ 2104 */
2023 if (isMenuBarWindow (ev.window)) 2105 if (isMenuBarWindow (ev.window))
… …
2085 */ 2167 */
2086 if (priv_modes & PrivMode_mouse_report 2168 if (priv_modes & PrivMode_mouse_report
2087 && bypass_keystate 2169 && bypass_keystate
2088 && ev.button == Button1 && MEvent.clicks <= 1) 2170 && ev.button == Button1 && MEvent.clicks <= 1)
2089 selection_extend (ev.x, ev.y, 0); 2171 selection_extend (ev.x, ev.y, 0);
2172
2173 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2174 return;
2090 2175
2091 switch (ev.button) 2176 switch (ev.button)
2092 { 2177 {
2093 case Button1: 2178 case Button1:
2094 case Button3: 2179 case Button3:
… …
2639 2724
2640bool 2725bool
2641rxvt_term::cmd_parse () 2726rxvt_term::cmd_parse ()
2642{ 2727{
2643 bool flag = false; 2728 bool flag = false;
2644 unicode_t ch = NOCHAR; 2729 wchar_t ch = NOCHAR;
2645 unsigned char *seq_begin; // remember start of esc-sequence here 2730 char *seq_begin; // remember start of esc-sequence here
2646 2731
2647 for (;;) 2732 for (;;)
2648 { 2733 {
2649 if (ch == NOCHAR) 2734 if (ch == NOCHAR)
2650 { 2735 {
2651 seq_begin = cmdbuf_ptr; 2736 seq_begin = cmdbuf_ptr;
2652 ch = next_char (); 2737 ch = next_char ();
2653 }
2654 2738
2655 if (ch == NOCHAR) // TODO: improve 2739 if (ch == NOCHAR)
2656 break; 2740 break;
2741 }
2657 2742
2658 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2743 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2659 { 2744 {
2660 if (!seen_input) 2745 if (!seen_input)
2661 { 2746 {
… …
2670 if (seen_resize && cmd_pid) 2755 if (seen_resize && cmd_pid)
2671 kill (-cmd_pid, SIGWINCH); 2756 kill (-cmd_pid, SIGWINCH);
2672 } 2757 }
2673 2758
2674 /* Read a text string from the input buffer */ 2759 /* Read a text string from the input buffer */
2675 unicode_t buf[UBUFSIZ]; 2760 wchar_t buf[UBUFSIZ];
2676 bool refreshnow = false; 2761 bool refreshnow = false;
2677 int nlines = 0; 2762 int nlines = 0;
2678 unicode_t *str = buf; 2763 wchar_t *str = buf;
2679 unicode_t *eol = str + min (ncol, UBUFSIZ); 2764 wchar_t *eol = str + min (ncol, UBUFSIZ);
2680 2765
2681 for (;;) 2766 for (;;)
2682 { 2767 {
2683 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2768 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2684 break; 2769 break;
… …
2702 } 2787 }
2703 2788
2704 // scr_add_lines only works for nlines <= nrow - 1. 2789 // scr_add_lines only works for nlines <= nrow - 1.
2705 if (nlines >= nrow - 1) 2790 if (nlines >= nrow - 1)
2706 { 2791 {
2792 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2707 scr_add_lines (buf, nlines, str - buf); 2793 scr_add_lines (buf, str - buf, nlines);
2794
2708 nlines = 0; 2795 nlines = 0;
2709 str = buf; 2796 str = buf;
2710 eol = str + min (ncol, UBUFSIZ); 2797 eol = str + min (ncol, UBUFSIZ);
2711 } 2798 }
2712 2799
… …
2725 2812
2726 seq_begin = cmdbuf_ptr; 2813 seq_begin = cmdbuf_ptr;
2727 ch = next_char (); 2814 ch = next_char ();
2728 } 2815 }
2729 2816
2817 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2730 scr_add_lines (buf, nlines, str - buf); 2818 scr_add_lines (buf, str - buf, nlines);
2731 2819
2732 /* 2820 /*
2733 * If there have been a lot of new lines, then update the screen 2821 * 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. 2822 * 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 2823 * the number of pages between refreshes is refresh_limit, which
… …
2766 } 2854 }
2767 2855
2768 return flag; 2856 return flag;
2769} 2857}
2770 2858
2859// read the next character
2860wchar_t
2861rxvt_term::next_char ()
2862{
2863 while (cmdbuf_ptr < cmdbuf_endp)
2864 {
2865 // assume 7-bit to be ascii ALWAYS
2866 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2867 return *cmdbuf_ptr++;
2868
2869 wchar_t wc;
2870 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2871
2872 if (len == (size_t)-2)
2873 {
2874 // the mbstate stores incomplete sequences. didn't know this :/
2875 cmdbuf_ptr = cmdbuf_endp;
2876 break;
2877 }
2878
2879 if (len == (size_t)-1)
2880 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2881
2882 // assume wchar == unicode
2883 cmdbuf_ptr += len;
2884 return wc & UNICODE_MASK;
2885 }
2886
2887 return NOCHAR;
2888}
2889
2771// read the next octet 2890// read the next octet
2772unicode_t 2891uint32_t
2773rxvt_term::next_octet () 2892rxvt_term::next_octet ()
2774{ 2893{
2775 return cmdbuf_ptr < cmdbuf_endp 2894 return cmdbuf_ptr < cmdbuf_endp
2776 ? *cmdbuf_ptr++ 2895 ? *cmdbuf_ptr++
2777 : NOCHAR; 2896 : NOCHAR;
2778}
2779
2780// read the next character
2781unicode_t
2782rxvt_term::next_char ()
2783{
2784 while (cmdbuf_ptr < cmdbuf_endp)
2785 {
2786 // assume 7-bit to be ascii ALWAYS
2787 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2788 return *cmdbuf_ptr++;
2789
2790 wchar_t wc;
2791 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2792
2793 if (len == (size_t)-2)
2794 {
2795 // the mbstate stores incomplete sequences. didn't know this :/
2796 cmdbuf_ptr = cmdbuf_endp;
2797 break;
2798 }
2799
2800 if (len == (size_t)-1)
2801 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2802
2803 // assume wchar == unicode
2804 cmdbuf_ptr += len;
2805 return wc & UNICODE_MASK;
2806 }
2807
2808 return NOCHAR;
2809} 2897}
2810 2898
2811/* rxvt_cmd_getc () - Return next input character */ 2899/* rxvt_cmd_getc () - Return next input character */
2812/* 2900/*
2813 * Return the next input character after first passing any keyboard input 2901 * Return the next input character after first passing any keyboard input
2814 * to the command. 2902 * to the command.
2815 */ 2903 */
2816unicode_t 2904wchar_t
2817rxvt_term::cmd_getc () 2905rxvt_term::cmd_getc ()
2818{ 2906{
2819 unicode_t c = next_char (); 2907 wchar_t c = next_char ();
2820 2908
2821 if (c == NOCHAR) 2909 if (c == NOCHAR)
2822 throw out_of_input; 2910 throw out_of_input;
2823 2911
2824 return c; 2912 return c;
2825} 2913}
2826 2914
2827unicode_t 2915uint32_t
2828rxvt_term::cmd_get8 () 2916rxvt_term::cmd_get8 ()
2829{ 2917{
2830 unicode_t c = next_octet (); 2918 uint32_t c = next_octet ();
2831 2919
2832 if (c == NOCHAR) 2920 if (c == NOCHAR)
2833 throw out_of_input; 2921 throw out_of_input;
2834 2922
2835 return c; 2923 return c;
… …
2935 case C0_ESC: 3023 case C0_ESC:
2936 process_escape_seq (); 3024 process_escape_seq ();
2937 break; 3025 break;
2938 case C0_ENQ: /* terminal Status */ 3026 case C0_ENQ: /* terminal Status */
2939 if (rs[Rs_answerbackstring]) 3027 if (rs[Rs_answerbackstring])
2940 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3028 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2941 (unsigned int)strlen (rs[Rs_answerbackstring]));
2942 else 3029 else
2943 tt_write ((unsigned char *)VT100_ANS, 3030 tt_write (VT100_ANS, strlen (VT100_ANS));
2944 (unsigned int)strlen (VT100_ANS));
2945 break; 3031 break;
2946 case C0_BEL: /* bell */ 3032 case C0_BEL: /* bell */
2947 scr_bell (); 3033 scr_bell ();
2948 break; 3034 break;
2949 case C0_BS: /* backspace */ 3035 case C0_BS: /* backspace */
… …
3104 break; 3190 break;
3105 3191
3106 /* 8.3.87: NEXT LINE */ 3192 /* 8.3.87: NEXT LINE */
3107 case C1_NEL: /* ESC E */ 3193 case C1_NEL: /* ESC E */
3108 { 3194 {
3109 unicode_t nlcr[] = { C0_LF, C0_CR }; 3195 wchar_t nlcr[] = { C0_LF, C0_CR };
3110 scr_add_lines (nlcr, 1, 2); 3196 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3111 } 3197 }
3112 break; 3198 break;
3113 3199
3114 /* kidnapped escape sequence: Should be 8.3.48 */ 3200 /* kidnapped escape sequence: Should be 8.3.48 */
3115 case C1_ESA: /* ESC G */ 3201 case C1_ESA: /* ESC G */
… …
3137 process_dcs_seq (); 3223 process_dcs_seq ();
3138 break; 3224 break;
3139 3225
3140 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3226 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3141 case C1_SCI: /* ESC Z */ 3227 case C1_SCI: /* ESC Z */
3142 tt_write ((const unsigned char *)ESCZ_ANSWER, 3228 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3143 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3144 break; /* steal obsolete ESC [ c */ 3229 break; /* steal obsolete ESC [ c */
3145 3230
3146 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3231 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3147 case C1_CSI: /* ESC [ */ 3232 case C1_CSI: /* ESC [ */
3148 process_csi_seq (); 3233 process_csi_seq ();
… …
3392 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3477 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3393 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3478 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3394 break; 3479 break;
3395 3480
3396 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3481 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3397 tt_write ((const unsigned char *)VT100_ANS, 3482 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3398 (unsigned int) (sizeof (VT100_ANS) - 1));
3399 break; 3483 break;
3400 3484
3401 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3485 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3402 process_sgr_mode (nargs, arg); 3486 process_sgr_mode (nargs, arg);
3403 break; 3487 break;
… …
3605/*----------------------------------------------------------------------*/ 3689/*----------------------------------------------------------------------*/
3606/* 3690/*
3607 * get input up until STRING TERMINATOR (or BEL) 3691 * get input up until STRING TERMINATOR (or BEL)
3608 * ends_how is terminator used. returned input must be free()'d 3692 * ends_how is terminator used. returned input must be free()'d
3609 */ 3693 */
3610unsigned char * 3694char *
3611rxvt_term::get_to_st (unicode_t &ends_how) 3695rxvt_term::get_to_st (unicode_t &ends_how)
3612{ 3696{
3613 unicode_t ch; 3697 unicode_t ch;
3614 bool seen_esc = false; 3698 bool seen_esc = false;
3615 unsigned int n = 0; 3699 unsigned int n = 0;
… …
3648 3732
3649 string[n++] = '\0'; 3733 string[n++] = '\0';
3650 3734
3651 ends_how = (ch == 0x5c ? C0_ESC : ch); 3735 ends_how = (ch == 0x5c ? C0_ESC : ch);
3652 3736
3653 return (unsigned char *)rxvt_wcstombs (string); 3737 return rxvt_wcstombs (string);
3654} 3738}
3655 3739
3656/*----------------------------------------------------------------------*/ 3740/*----------------------------------------------------------------------*/
3657/* 3741/*
3658 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3742 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3659 */ 3743 */
3660void 3744void
3661rxvt_term::process_dcs_seq () 3745rxvt_term::process_dcs_seq ()
3662{ 3746{
3663 unsigned char *s; 3747 char *s;
3664 unicode_t eh; 3748 unicode_t eh;
3665 3749
3666 /* 3750 /*
3667 * Not handled yet 3751 * Not handled yet
3668 */ 3752 */
… …
3687 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3771 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3688 arg = arg * 10 + (ch - '0'); 3772 arg = arg * 10 + (ch - '0');
3689 3773
3690 if (ch == ';') 3774 if (ch == ';')
3691 { 3775 {
3692 unsigned char *s = get_to_st (eh); 3776 char *s = get_to_st (eh);
3693 3777
3694 if (s) 3778 if (s)
3695 { 3779 {
3696 process_xterm_seq (arg, (char *)s, eh); 3780 process_xterm_seq (arg, s, eh);
3697 free (s); 3781 free (s);
3698 } 3782 }
3699 } 3783 }
3700} 3784}
3701 3785
3702void 3786void
3703rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3787rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3704{ 3788{
3705 if (str[0] == '?' && !str[1]) 3789 if (str[0] == '?' && !str[1])
3706 { 3790 {
3707 unsigned short r, g, b; 3791 unsigned short r, g, b;
3708 pix_colors_focused[color].get (display, r, g, b); 3792 pix_colors_focused[color].get (display, r, g, b);
… …
3714 3798
3715/* 3799/*
3716 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3800 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3717 */ 3801 */
3718void 3802void
3719rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3803rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3720{ 3804{
3721 int changed = 0; 3805 int changed = 0;
3722 int color; 3806 int color;
3723 char *buf, *name; 3807 char *buf, *name;
3724 bool query = str[0] == '?' && !str[1]; 3808 bool query = str[0] == '?' && !str[1];
… …
3931 } 4015 }
3932 break; 4016 break;
3933 4017
3934 case URxvt_view_up: 4018 case URxvt_view_up:
3935 case URxvt_view_down: 4019 case URxvt_view_down:
4020 {
3936 int lines = atoi (str); 4021 int lines = atoi (str);
3937 4022
3938 if (lines) 4023 if (lines)
3939 scr_page (op == URxvt_view_up ? UP : DN, lines); 4024 scr_page (op == URxvt_view_up ? UP : DN, lines);
3940 else 4025 else
3941 {
3942 scr_erase_savelines (); 4026 scr_erase_savelines ();
3943 } 4027 }
3944 4028
4029 break;
4030#endif
4031
4032#if ENABLE_PERL
4033 case URxvt_perl:
4034 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
4035 ; // no responses yet
3945 break; 4036 break;
3946#endif 4037#endif
3947 } 4038 }
3948} 4039}
3949/*----------------------------------------------------------------------*/ 4040/*----------------------------------------------------------------------*/
… …
4306 scr_color (Color_bg, Color_bg); 4397 scr_color (Color_bg, Color_bg);
4307 break; 4398 break;
4308 4399
4309 //case 50: // not variable spacing 4400 //case 50: // not variable spacing
4310 4401
4311#ifndef NO_BRIGHTCOLOR 4402#if ENABLE_FRILLS
4312 case 90: 4403 case 90:
4313 case 91: /* set bright fg color */ 4404 case 91: /* set bright fg color */
4314 case 92: 4405 case 92:
4315 case 93: 4406 case 93:
4316 case 94: 4407 case 94:
… …
4361 */ 4452 */
4362void 4453void
4363rxvt_term::tt_printf (const char *fmt,...) 4454rxvt_term::tt_printf (const char *fmt,...)
4364{ 4455{
4365 va_list arg_ptr; 4456 va_list arg_ptr;
4366 unsigned char buf[256]; 4457 char buf[256];
4367 4458
4368 va_start (arg_ptr, fmt); 4459 va_start (arg_ptr, fmt);
4369 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4460 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4370 va_end (arg_ptr); 4461 va_end (arg_ptr);
4371 tt_write (buf, strlen (buf)); 4462 tt_write (buf, strlen (buf));
… …
4376 * or generated by us in response to a query ESC sequence. 4467 * or generated by us in response to a query ESC sequence.
4377 */ 4468 */
4378const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4469const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4379 4470
4380void 4471void
4381rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4472rxvt_term::tt_write (const char *data, unsigned int len)
4382{ 4473{
4474 if (pty.pty < 0)
4475 return;
4476
4383 if (v_buflen == 0) 4477 if (v_buflen == 0)
4384 { 4478 {
4385 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4479 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4386 4480
4387 if ((unsigned int)written == len) 4481 if ((unsigned int)written == len)
… …
4389 4483
4390 data += written; 4484 data += written;
4391 len -= written; 4485 len -= written;
4392 } 4486 }
4393 4487
4394 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4488 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4395 4489
4396 memcpy (v_buffer + v_buflen, data, len); 4490 memcpy (v_buffer + v_buflen, data, len);
4397 v_buflen += len; 4491 v_buflen += len;
4398 4492
4399 pty_ev.set (EVENT_READ | EVENT_WRITE); 4493 pty_ev.set (EVENT_READ | EVENT_WRITE);

Diff Legend

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