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.228 by root, Mon Jan 2 16:08:34 2006 UTC vs.
Revision 1.243 by root, Fri Jan 6 05:43:36 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_STRING_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
… …
1095{ 1138{
1096 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1139 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1097 1140
1098 if (CBUFSIZ == n) 1141 if (CBUFSIZ == n)
1099 { 1142 {
1100 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");
1101 n = 0; 1144 n = 0;
1102 } 1145 }
1103 1146
1104 memmove (cmdbuf_base, cmdbuf_ptr, n); 1147 memmove (cmdbuf_base, cmdbuf_ptr, n);
1105 cmdbuf_ptr = cmdbuf_base; 1148 cmdbuf_ptr = cmdbuf_base;
… …
1162 1205
1163#ifdef POINTER_BLANK 1206#ifdef POINTER_BLANK
1164void 1207void
1165rxvt_term::pointer_blank () 1208rxvt_term::pointer_blank ()
1166{ 1209{
1167 if (! OPTION (Opt_pointerBlank)) 1210 if (!OPTION (Opt_pointerBlank))
1168 return; 1211 return;
1169 1212
1170 XDefineCursor (display->display, vt, display->blank_cursor); 1213 XDefineCursor (display->display, vt, display->blank_cursor);
1171 XFlush (display->display); 1214 XFlush (display->display);
1172 1215
… …
1371# endif 1414# endif
1372 else 1415 else
1373 iso14755buf = 0; 1416 iso14755buf = 0;
1374 } 1417 }
1375#endif 1418#endif
1419
1420 if (ev.xany.window == vt && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END)))
1421 break;
1376 1422
1377#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1423#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1378 if (!(ev.xkey.state & ControlMask)) 1424 if (!(ev.xkey.state & ControlMask))
1379 slip_wheel_ev.stop (); 1425 slip_wheel_ev.stop ();
1380 else if (ks == XK_Control_L || ks == XK_Control_R) 1426 else if (ks == XK_Control_L || ks == XK_Control_R)
… …
1595 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1641 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1596 break; 1642 break;
1597 1643
1598 if (ev.xany.window == vt) 1644 if (ev.xany.window == vt)
1599 { 1645 {
1646 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1647 ; // nop
1600 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1648 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1601 { 1649 {
1602 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1650 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1603 ; 1651 ;
1604 1652
1605 XQueryPointer (disp, vt, 1653 XQueryPointer (disp, vt,
… …
1701 if (!focus) 1749 if (!focus)
1702 { 1750 {
1703 focus = 1; 1751 focus = 1;
1704 want_refresh = 1; 1752 want_refresh = 1;
1705 1753
1706 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1754 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1707 1755
1708#if USE_XIM 1756#if USE_XIM
1709 if (Input_Context != NULL) 1757 if (Input_Context != NULL)
1710 { 1758 {
1711 IMSetStatusPosition (); 1759 IMSetStatusPosition ();
… …
1732 if (focus) 1780 if (focus)
1733 { 1781 {
1734 focus = 0; 1782 focus = 0;
1735 want_refresh = 1; 1783 want_refresh = 1;
1736 1784
1737 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1785 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1738 1786
1739#if ENABLE_FRILLS || ISO_14755 1787#if ENABLE_FRILLS || ISO_14755
1740 if (iso14755buf) 1788 if (iso14755buf)
1741 { 1789 {
1742 iso14755buf = 0; 1790 iso14755buf = 0;
… …
1795rxvt_term::button_press (XButtonEvent &ev) 1843rxvt_term::button_press (XButtonEvent &ev)
1796{ 1844{
1797 int reportmode = 0, clickintime; 1845 int reportmode = 0, clickintime;
1798 1846
1799 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1847 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1848
1800 if (!bypass_keystate) 1849 if (!bypass_keystate)
1801 reportmode = !! (priv_modes & PrivMode_mouse_report); 1850 reportmode = !! (priv_modes & PrivMode_mouse_report);
1802 1851
1803 /* 1852 /*
1804 * VT window processing of button press 1853 * VT window processing of button press
… …
1824#ifdef MOUSE_REPORT_DOUBLECLICK 1873#ifdef MOUSE_REPORT_DOUBLECLICK
1825 if (ev.button == MEvent.button && clickintime) 1874 if (ev.button == MEvent.button && clickintime)
1826 { 1875 {
1827 /* same button, within alloted time */ 1876 /* same button, within alloted time */
1828 MEvent.clicks++; 1877 MEvent.clicks++;
1878
1829 if (MEvent.clicks > 1) 1879 if (MEvent.clicks > 1)
1830 { 1880 {
1831 /* only report double clicks */ 1881 /* only report double clicks */
1832 MEvent.clicks = 2; 1882 MEvent.clicks = 2;
1833 mouse_report (ev); 1883 mouse_report (ev);
… …
1853 else 1903 else
1854 { 1904 {
1855 if (ev.button != MEvent.button) 1905 if (ev.button != MEvent.button)
1856 MEvent.clicks = 0; 1906 MEvent.clicks = 0;
1857 1907
1908 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1858 switch (ev.button) 1909 switch (ev.button)
1859 { 1910 {
1860 case Button1: 1911 case Button1:
1861 /* allow meta + click to select rectangular areas */ 1912 /* allow meta + click to select rectangular areas */
1862 /* should be done in screen.C */ 1913 /* should be done in screen.C */
1863#if ENABLE_FRILLS 1914#if ENABLE_FRILLS
1864 selection.rect = !!(ev.state & ModMetaMask); 1915 selection.rect = !!(ev.state & ModMetaMask);
1865#else 1916#else
1866 selection.rect = false; 1917 selection.rect = false;
1867#endif 1918#endif
1868 1919
1869 /* allow shift+left click to extend selection */ 1920 /* allow shift+left click to extend selection */
1870 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1921 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1871 { 1922 {
1872 if (MEvent.button == Button1 && clickintime) 1923 if (MEvent.button == Button1 && clickintime)
1873 selection_rotate (ev.x, ev.y); 1924 selection_rotate (ev.x, ev.y);
1874 else 1925 else
1875 selection_extend (ev.x, ev.y, 1); 1926 selection_extend (ev.x, ev.y, 1);
1876 } 1927 }
1877 else 1928 else
1878 { 1929 {
1879 if (MEvent.button == Button1 && clickintime) 1930 if (MEvent.button == Button1 && clickintime)
1880 MEvent.clicks++; 1931 MEvent.clicks++;
1881 else 1932 else
1882 MEvent.clicks = 1; 1933 MEvent.clicks = 1;
1883 1934
1884 selection_click (MEvent.clicks, ev.x, ev.y); 1935 selection_click (MEvent.clicks, ev.x, ev.y);
1885 } 1936 }
1886 1937
1887 MEvent.button = Button1; 1938 MEvent.button = Button1;
1888 break; 1939 break;
1889 1940
1890 case Button3: 1941 case Button3:
1891 if (MEvent.button == Button3 && clickintime) 1942 if (MEvent.button == Button3 && clickintime)
1892 selection_rotate (ev.x, ev.y); 1943 selection_rotate (ev.x, ev.y);
1893 else 1944 else
1894 selection_extend (ev.x, ev.y, 1); 1945 selection_extend (ev.x, ev.y, 1);
1895 1946
1896 MEvent.button = Button3; 1947 MEvent.button = Button3;
1897 break; 1948 break;
1898 } 1949 }
1899 } 1950 }
1900 1951
1901 MEvent.time = ev.time; 1952 MEvent.time = ev.time;
1902 return; 1953 return;
1903 } 1954 }
1904 1955
… …
2040 } 2091 }
2041 2092
2042 break; 2093 break;
2043 } 2094 }
2044 } 2095 }
2096
2045 return; 2097 return;
2046 } 2098 }
2099
2047#if MENUBAR 2100#if MENUBAR
2048 /* 2101 /*
2049 * Menubar window processing of button press 2102 * Menubar window processing of button press
2050 */ 2103 */
2051 if (isMenuBarWindow (ev.window)) 2104 if (isMenuBarWindow (ev.window))
… …
2113 */ 2166 */
2114 if (priv_modes & PrivMode_mouse_report 2167 if (priv_modes & PrivMode_mouse_report
2115 && bypass_keystate 2168 && bypass_keystate
2116 && ev.button == Button1 && MEvent.clicks <= 1) 2169 && ev.button == Button1 && MEvent.clicks <= 1)
2117 selection_extend (ev.x, ev.y, 0); 2170 selection_extend (ev.x, ev.y, 0);
2171
2172 if (!HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2173 return;
2118 2174
2119 switch (ev.button) 2175 switch (ev.button)
2120 { 2176 {
2121 case Button1: 2177 case Button1:
2122 case Button3: 2178 case Button3:
… …
2668bool 2724bool
2669rxvt_term::cmd_parse () 2725rxvt_term::cmd_parse ()
2670{ 2726{
2671 bool flag = false; 2727 bool flag = false;
2672 unicode_t ch = NOCHAR; 2728 unicode_t ch = NOCHAR;
2673 unsigned char *seq_begin; // remember start of esc-sequence here 2729 char *seq_begin; // remember start of esc-sequence here
2674 2730
2675 for (;;) 2731 for (;;)
2676 { 2732 {
2677 if (ch == NOCHAR) 2733 if (ch == NOCHAR)
2678 { 2734 {
2679 seq_begin = cmdbuf_ptr; 2735 seq_begin = cmdbuf_ptr;
2680 ch = next_char (); 2736 ch = next_char ();
2681 }
2682 2737
2683 if (ch == NOCHAR) // TODO: improve 2738 if (ch == NOCHAR)
2684 break; 2739 break;
2740 }
2685 2741
2686 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)
2687 { 2743 {
2688 if (!seen_input) 2744 if (!seen_input)
2689 { 2745 {
… …
2730 } 2786 }
2731 2787
2732 // scr_add_lines only works for nlines <= nrow - 1. 2788 // scr_add_lines only works for nlines <= nrow - 1.
2733 if (nlines >= nrow - 1) 2789 if (nlines >= nrow - 1)
2734 { 2790 {
2791 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END)))
2735 scr_add_lines (buf, nlines, str - buf); 2792 scr_add_lines (buf, nlines, str - buf);
2793
2736 nlines = 0; 2794 nlines = 0;
2737 str = buf; 2795 str = buf;
2738 eol = str + min (ncol, UBUFSIZ); 2796 eol = str + min (ncol, UBUFSIZ);
2739 } 2797 }
2740 2798
… …
2753 2811
2754 seq_begin = cmdbuf_ptr; 2812 seq_begin = cmdbuf_ptr;
2755 ch = next_char (); 2813 ch = next_char ();
2756 } 2814 }
2757 2815
2816 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END)))
2758 scr_add_lines (buf, nlines, str - buf); 2817 scr_add_lines (buf, nlines, str - buf);
2759 2818
2760 /* 2819 /*
2761 * 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
2762 * 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.
2763 * the number of pages between refreshes is refresh_limit, which 2822 * the number of pages between refreshes is refresh_limit, which
… …
2810rxvt_term::next_char () 2869rxvt_term::next_char ()
2811{ 2870{
2812 while (cmdbuf_ptr < cmdbuf_endp) 2871 while (cmdbuf_ptr < cmdbuf_endp)
2813 { 2872 {
2814 // assume 7-bit to be ascii ALWAYS 2873 // assume 7-bit to be ascii ALWAYS
2815 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2874 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2816 return *cmdbuf_ptr++; 2875 return *cmdbuf_ptr++;
2817 2876
2818 wchar_t wc; 2877 wchar_t wc;
2819 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2878 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2820 2879
2821 if (len == (size_t)-2) 2880 if (len == (size_t)-2)
2822 { 2881 {
2823 // the mbstate stores incomplete sequences. didn't know this :/ 2882 // the mbstate stores incomplete sequences. didn't know this :/
2824 cmdbuf_ptr = cmdbuf_endp; 2883 cmdbuf_ptr = cmdbuf_endp;
… …
2963 case C0_ESC: 3022 case C0_ESC:
2964 process_escape_seq (); 3023 process_escape_seq ();
2965 break; 3024 break;
2966 case C0_ENQ: /* terminal Status */ 3025 case C0_ENQ: /* terminal Status */
2967 if (rs[Rs_answerbackstring]) 3026 if (rs[Rs_answerbackstring])
2968 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3027 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2969 (unsigned int)strlen (rs[Rs_answerbackstring]));
2970 else 3028 else
2971 tt_write ((unsigned char *)VT100_ANS, 3029 tt_write (VT100_ANS, strlen (VT100_ANS));
2972 (unsigned int)strlen (VT100_ANS));
2973 break; 3030 break;
2974 case C0_BEL: /* bell */ 3031 case C0_BEL: /* bell */
2975 scr_bell (); 3032 scr_bell ();
2976 break; 3033 break;
2977 case C0_BS: /* backspace */ 3034 case C0_BS: /* backspace */
… …
3165 process_dcs_seq (); 3222 process_dcs_seq ();
3166 break; 3223 break;
3167 3224
3168 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3225 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3169 case C1_SCI: /* ESC Z */ 3226 case C1_SCI: /* ESC Z */
3170 tt_write ((const unsigned char *)ESCZ_ANSWER, 3227 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3171 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3172 break; /* steal obsolete ESC [ c */ 3228 break; /* steal obsolete ESC [ c */
3173 3229
3174 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3230 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3175 case C1_CSI: /* ESC [ */ 3231 case C1_CSI: /* ESC [ */
3176 process_csi_seq (); 3232 process_csi_seq ();
… …
3420 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3476 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3421 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3477 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3422 break; 3478 break;
3423 3479
3424 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3480 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3425 tt_write ((const unsigned char *)VT100_ANS, 3481 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3426 (unsigned int) (sizeof (VT100_ANS) - 1));
3427 break; 3482 break;
3428 3483
3429 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3484 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3430 process_sgr_mode (nargs, arg); 3485 process_sgr_mode (nargs, arg);
3431 break; 3486 break;
… …
3633/*----------------------------------------------------------------------*/ 3688/*----------------------------------------------------------------------*/
3634/* 3689/*
3635 * get input up until STRING TERMINATOR (or BEL) 3690 * get input up until STRING TERMINATOR (or BEL)
3636 * ends_how is terminator used. returned input must be free()'d 3691 * ends_how is terminator used. returned input must be free()'d
3637 */ 3692 */
3638unsigned char * 3693char *
3639rxvt_term::get_to_st (unicode_t &ends_how) 3694rxvt_term::get_to_st (unicode_t &ends_how)
3640{ 3695{
3641 unicode_t ch; 3696 unicode_t ch;
3642 bool seen_esc = false; 3697 bool seen_esc = false;
3643 unsigned int n = 0; 3698 unsigned int n = 0;
… …
3676 3731
3677 string[n++] = '\0'; 3732 string[n++] = '\0';
3678 3733
3679 ends_how = (ch == 0x5c ? C0_ESC : ch); 3734 ends_how = (ch == 0x5c ? C0_ESC : ch);
3680 3735
3681 return (unsigned char *)rxvt_wcstombs (string); 3736 return rxvt_wcstombs (string);
3682} 3737}
3683 3738
3684/*----------------------------------------------------------------------*/ 3739/*----------------------------------------------------------------------*/
3685/* 3740/*
3686 * 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)'
3687 */ 3742 */
3688void 3743void
3689rxvt_term::process_dcs_seq () 3744rxvt_term::process_dcs_seq ()
3690{ 3745{
3691 unsigned char *s; 3746 char *s;
3692 unicode_t eh; 3747 unicode_t eh;
3693 3748
3694 /* 3749 /*
3695 * Not handled yet 3750 * Not handled yet
3696 */ 3751 */
… …
3715 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3770 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3716 arg = arg * 10 + (ch - '0'); 3771 arg = arg * 10 + (ch - '0');
3717 3772
3718 if (ch == ';') 3773 if (ch == ';')
3719 { 3774 {
3720 unsigned char *s = get_to_st (eh); 3775 char *s = get_to_st (eh);
3721 3776
3722 if (s) 3777 if (s)
3723 { 3778 {
3724 process_xterm_seq (arg, (char *)s, eh); 3779 process_xterm_seq (arg, s, eh);
3725 free (s); 3780 free (s);
3726 } 3781 }
3727 } 3782 }
3728} 3783}
3729 3784
3730void 3785void
3731rxvt_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)
3732{ 3787{
3733 if (str[0] == '?' && !str[1]) 3788 if (str[0] == '?' && !str[1])
3734 { 3789 {
3735 unsigned short r, g, b; 3790 unsigned short r, g, b;
3736 pix_colors_focused[color].get (display, r, g, b); 3791 pix_colors_focused[color].get (display, r, g, b);
… …
3742 3797
3743/* 3798/*
3744 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3799 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3745 */ 3800 */
3746void 3801void
3747rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3802rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3748{ 3803{
3749 int changed = 0; 3804 int changed = 0;
3750 int color; 3805 int color;
3751 char *buf, *name; 3806 char *buf, *name;
3752 bool query = str[0] == '?' && !str[1]; 3807 bool query = str[0] == '?' && !str[1];
… …
3959 } 4014 }
3960 break; 4015 break;
3961 4016
3962 case URxvt_view_up: 4017 case URxvt_view_up:
3963 case URxvt_view_down: 4018 case URxvt_view_down:
4019 {
3964 int lines = atoi (str); 4020 int lines = atoi (str);
3965 4021
3966 if (lines) 4022 if (lines)
3967 scr_page (op == URxvt_view_up ? UP : DN, lines); 4023 scr_page (op == URxvt_view_up ? UP : DN, lines);
3968 else 4024 else
3969 {
3970 scr_erase_savelines (); 4025 scr_erase_savelines ();
3971 } 4026 }
3972 4027
4028 break;
4029#endif
4030
4031#if ENABLE_PERL
4032 case URxvt_perl:
4033 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END)))
4034 ; // no responses yet
3973 break; 4035 break;
3974#endif 4036#endif
3975 } 4037 }
3976} 4038}
3977/*----------------------------------------------------------------------*/ 4039/*----------------------------------------------------------------------*/
… …
4334 scr_color (Color_bg, Color_bg); 4396 scr_color (Color_bg, Color_bg);
4335 break; 4397 break;
4336 4398
4337 //case 50: // not variable spacing 4399 //case 50: // not variable spacing
4338 4400
4339#ifndef NO_BRIGHTCOLOR 4401#if ENABLE_FRILLS
4340 case 90: 4402 case 90:
4341 case 91: /* set bright fg color */ 4403 case 91: /* set bright fg color */
4342 case 92: 4404 case 92:
4343 case 93: 4405 case 93:
4344 case 94: 4406 case 94:
… …
4389 */ 4451 */
4390void 4452void
4391rxvt_term::tt_printf (const char *fmt,...) 4453rxvt_term::tt_printf (const char *fmt,...)
4392{ 4454{
4393 va_list arg_ptr; 4455 va_list arg_ptr;
4394 unsigned char buf[256]; 4456 char buf[256];
4395 4457
4396 va_start (arg_ptr, fmt); 4458 va_start (arg_ptr, fmt);
4397 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4459 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4398 va_end (arg_ptr); 4460 va_end (arg_ptr);
4399 tt_write (buf, strlen (buf)); 4461 tt_write (buf, strlen (buf));
… …
4404 * or generated by us in response to a query ESC sequence. 4466 * or generated by us in response to a query ESC sequence.
4405 */ 4467 */
4406const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4468const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4407 4469
4408void 4470void
4409rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4471rxvt_term::tt_write (const char *data, unsigned int len)
4410{ 4472{
4473 if (pty.pty < 0)
4474 return;
4475
4411 if (v_buflen == 0) 4476 if (v_buflen == 0)
4412 { 4477 {
4413 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4478 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4414 4479
4415 if ((unsigned int)written == len) 4480 if ((unsigned int)written == len)
… …
4417 4482
4418 data += written; 4483 data += written;
4419 len -= written; 4484 len -= written;
4420 } 4485 }
4421 4486
4422 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4487 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4423 4488
4424 memcpy (v_buffer + v_buflen, data, len); 4489 memcpy (v_buffer + v_buflen, data, len);
4425 v_buflen += len; 4490 v_buflen += len;
4426 4491
4427 pty_ev.set (EVENT_READ | EVENT_WRITE); 4492 pty_ev.set (EVENT_READ | EVENT_WRITE);

Diff Legend

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