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.227 by root, Mon Jan 2 15:35:43 2006 UTC vs.
Revision 1.242 by root, Fri Jan 6 05:37:59 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;
… …
1113 return true; 1156 return true;
1114 } 1157 }
1115 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1158 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1116 { 1159 {
1117#if HAVE_SCHED_YIELD 1160#if HAVE_SCHED_YIELD
1161 if (display->is_local)
1118 event_handler.cw_yield.start (); 1162 event_handler.cw_yield.start ();
1119#endif 1163#endif
1120 } 1164 }
1121 else 1165 else
1122 { 1166 {
1123 pty_ev.stop (); 1167 pty_ev.stop ();
… …
1161 1205
1162#ifdef POINTER_BLANK 1206#ifdef POINTER_BLANK
1163void 1207void
1164rxvt_term::pointer_blank () 1208rxvt_term::pointer_blank ()
1165{ 1209{
1166 if (! OPTION (Opt_pointerBlank)) 1210 if (!OPTION (Opt_pointerBlank))
1167 return; 1211 return;
1168 1212
1169 XDefineCursor (display->display, vt, display->blank_cursor); 1213 XDefineCursor (display->display, vt, display->blank_cursor);
1170 XFlush (display->display); 1214 XFlush (display->display);
1171 1215
… …
1370# endif 1414# endif
1371 else 1415 else
1372 iso14755buf = 0; 1416 iso14755buf = 0;
1373 } 1417 }
1374#endif 1418#endif
1419
1420 if (ev.xany.window == vt && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END)))
1421 break;
1375 1422
1376#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1423#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1377 if (!(ev.xkey.state & ControlMask)) 1424 if (!(ev.xkey.state & ControlMask))
1378 slip_wheel_ev.stop (); 1425 slip_wheel_ev.stop ();
1379 else if (ks == XK_Control_L || ks == XK_Control_R) 1426 else if (ks == XK_Control_L || ks == XK_Control_R)
… …
1594 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1641 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1595 break; 1642 break;
1596 1643
1597 if (ev.xany.window == vt) 1644 if (ev.xany.window == vt)
1598 { 1645 {
1646 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1647 ; // nop
1599 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1648 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1600 { 1649 {
1601 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1650 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1602 ; 1651 ;
1603 1652
1604 XQueryPointer (disp, vt, 1653 XQueryPointer (disp, vt,
… …
1700 if (!focus) 1749 if (!focus)
1701 { 1750 {
1702 focus = 1; 1751 focus = 1;
1703 want_refresh = 1; 1752 want_refresh = 1;
1704 1753
1705 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1754 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1706 1755
1707#if USE_XIM 1756#if USE_XIM
1708 if (Input_Context != NULL) 1757 if (Input_Context != NULL)
1709 { 1758 {
1710 IMSetStatusPosition (); 1759 IMSetStatusPosition ();
… …
1731 if (focus) 1780 if (focus)
1732 { 1781 {
1733 focus = 0; 1782 focus = 0;
1734 want_refresh = 1; 1783 want_refresh = 1;
1735 1784
1736 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1785 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1737 1786
1738#if ENABLE_FRILLS || ISO_14755 1787#if ENABLE_FRILLS || ISO_14755
1739 if (iso14755buf) 1788 if (iso14755buf)
1740 { 1789 {
1741 iso14755buf = 0; 1790 iso14755buf = 0;
… …
1794rxvt_term::button_press (XButtonEvent &ev) 1843rxvt_term::button_press (XButtonEvent &ev)
1795{ 1844{
1796 int reportmode = 0, clickintime; 1845 int reportmode = 0, clickintime;
1797 1846
1798 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1847 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1848
1799 if (!bypass_keystate) 1849 if (!bypass_keystate)
1800 reportmode = !! (priv_modes & PrivMode_mouse_report); 1850 reportmode = !! (priv_modes & PrivMode_mouse_report);
1801 1851
1802 /* 1852 /*
1803 * VT window processing of button press 1853 * VT window processing of button press
… …
1852 else 1902 else
1853 { 1903 {
1854 if (ev.button != MEvent.button) 1904 if (ev.button != MEvent.button)
1855 MEvent.clicks = 0; 1905 MEvent.clicks = 0;
1856 1906
1907 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1857 switch (ev.button) 1908 switch (ev.button)
1858 { 1909 {
1859 case Button1: 1910 case Button1:
1860 /* allow meta + click to select rectangular areas */ 1911 /* allow meta + click to select rectangular areas */
1861 /* should be done in screen.C */ 1912 /* should be done in screen.C */
1862#if ENABLE_FRILLS 1913#if ENABLE_FRILLS
1863 selection.rect = !!(ev.state & ModMetaMask); 1914 selection.rect = !!(ev.state & ModMetaMask);
1864#else 1915#else
1865 selection.rect = false; 1916 selection.rect = false;
1866#endif 1917#endif
1867 1918
1868 /* allow shift+left click to extend selection */ 1919 /* allow shift+left click to extend selection */
1869 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1920 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1870 { 1921 {
1871 if (MEvent.button == Button1 && clickintime) 1922 if (MEvent.button == Button1 && clickintime)
1872 selection_rotate (ev.x, ev.y); 1923 selection_rotate (ev.x, ev.y);
1873 else 1924 else
1874 selection_extend (ev.x, ev.y, 1); 1925 selection_extend (ev.x, ev.y, 1);
1875 } 1926 }
1876 else 1927 else
1877 { 1928 {
1878 if (MEvent.button == Button1 && clickintime) 1929 if (MEvent.button == Button1 && clickintime)
1879 MEvent.clicks++; 1930 MEvent.clicks++;
1880 else 1931 else
1881 MEvent.clicks = 1; 1932 MEvent.clicks = 1;
1882 1933
1883 selection_click (MEvent.clicks, ev.x, ev.y); 1934 selection_click (MEvent.clicks, ev.x, ev.y);
1884 } 1935 }
1885 1936
1886 MEvent.button = Button1; 1937 MEvent.button = Button1;
1887 break; 1938 break;
1888 1939
1889 case Button3: 1940 case Button3:
1890 if (MEvent.button == Button3 && clickintime) 1941 if (MEvent.button == Button3 && clickintime)
1891 selection_rotate (ev.x, ev.y); 1942 selection_rotate (ev.x, ev.y);
1892 else 1943 else
1893 selection_extend (ev.x, ev.y, 1); 1944 selection_extend (ev.x, ev.y, 1);
1894 1945
1895 MEvent.button = Button3; 1946 MEvent.button = Button3;
1896 break; 1947 break;
1897 } 1948 }
1898 } 1949 }
1899 1950
1900 MEvent.time = ev.time; 1951 MEvent.time = ev.time;
1901 return; 1952 return;
1902 } 1953 }
1903 1954
… …
2112 */ 2163 */
2113 if (priv_modes & PrivMode_mouse_report 2164 if (priv_modes & PrivMode_mouse_report
2114 && bypass_keystate 2165 && bypass_keystate
2115 && ev.button == Button1 && MEvent.clicks <= 1) 2166 && ev.button == Button1 && MEvent.clicks <= 1)
2116 selection_extend (ev.x, ev.y, 0); 2167 selection_extend (ev.x, ev.y, 0);
2168
2169 if (!HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2170 return;
2117 2171
2118 switch (ev.button) 2172 switch (ev.button)
2119 { 2173 {
2120 case Button1: 2174 case Button1:
2121 case Button3: 2175 case Button3:
… …
2667bool 2721bool
2668rxvt_term::cmd_parse () 2722rxvt_term::cmd_parse ()
2669{ 2723{
2670 bool flag = false; 2724 bool flag = false;
2671 unicode_t ch = NOCHAR; 2725 unicode_t ch = NOCHAR;
2672 unsigned char *seq_begin; // remember start of esc-sequence here 2726 char *seq_begin; // remember start of esc-sequence here
2673 2727
2674 for (;;) 2728 for (;;)
2675 { 2729 {
2676 if (ch == NOCHAR) 2730 if (ch == NOCHAR)
2677 { 2731 {
2678 seq_begin = cmdbuf_ptr; 2732 seq_begin = cmdbuf_ptr;
2679 ch = next_char (); 2733 ch = next_char ();
2680 }
2681 2734
2682 if (ch == NOCHAR) // TODO: improve 2735 if (ch == NOCHAR)
2683 break; 2736 break;
2737 }
2684 2738
2685 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2739 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2686 { 2740 {
2687 if (!seen_input) 2741 if (!seen_input)
2688 { 2742 {
… …
2729 } 2783 }
2730 2784
2731 // scr_add_lines only works for nlines <= nrow - 1. 2785 // scr_add_lines only works for nlines <= nrow - 1.
2732 if (nlines >= nrow - 1) 2786 if (nlines >= nrow - 1)
2733 { 2787 {
2788 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END)))
2734 scr_add_lines (buf, nlines, str - buf); 2789 scr_add_lines (buf, nlines, str - buf);
2790
2735 nlines = 0; 2791 nlines = 0;
2736 str = buf; 2792 str = buf;
2737 eol = str + min (ncol, UBUFSIZ); 2793 eol = str + min (ncol, UBUFSIZ);
2738 } 2794 }
2739 2795
… …
2752 2808
2753 seq_begin = cmdbuf_ptr; 2809 seq_begin = cmdbuf_ptr;
2754 ch = next_char (); 2810 ch = next_char ();
2755 } 2811 }
2756 2812
2813 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END)))
2757 scr_add_lines (buf, nlines, str - buf); 2814 scr_add_lines (buf, nlines, str - buf);
2758 2815
2759 /* 2816 /*
2760 * If there have been a lot of new lines, then update the screen 2817 * If there have been a lot of new lines, then update the screen
2761 * What the heck I'll cheat and only refresh less than every page-full. 2818 * What the heck I'll cheat and only refresh less than every page-full.
2762 * the number of pages between refreshes is refresh_limit, which 2819 * the number of pages between refreshes is refresh_limit, which
… …
2809rxvt_term::next_char () 2866rxvt_term::next_char ()
2810{ 2867{
2811 while (cmdbuf_ptr < cmdbuf_endp) 2868 while (cmdbuf_ptr < cmdbuf_endp)
2812 { 2869 {
2813 // assume 7-bit to be ascii ALWAYS 2870 // assume 7-bit to be ascii ALWAYS
2814 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2871 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2815 return *cmdbuf_ptr++; 2872 return *cmdbuf_ptr++;
2816 2873
2817 wchar_t wc; 2874 wchar_t wc;
2818 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2875 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2819 2876
2820 if (len == (size_t)-2) 2877 if (len == (size_t)-2)
2821 { 2878 {
2822 // the mbstate stores incomplete sequences. didn't know this :/ 2879 // the mbstate stores incomplete sequences. didn't know this :/
2823 cmdbuf_ptr = cmdbuf_endp; 2880 cmdbuf_ptr = cmdbuf_endp;
… …
2962 case C0_ESC: 3019 case C0_ESC:
2963 process_escape_seq (); 3020 process_escape_seq ();
2964 break; 3021 break;
2965 case C0_ENQ: /* terminal Status */ 3022 case C0_ENQ: /* terminal Status */
2966 if (rs[Rs_answerbackstring]) 3023 if (rs[Rs_answerbackstring])
2967 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3024 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2968 (unsigned int)strlen (rs[Rs_answerbackstring]));
2969 else 3025 else
2970 tt_write ((unsigned char *)VT100_ANS, 3026 tt_write (VT100_ANS, strlen (VT100_ANS));
2971 (unsigned int)strlen (VT100_ANS));
2972 break; 3027 break;
2973 case C0_BEL: /* bell */ 3028 case C0_BEL: /* bell */
2974 scr_bell (); 3029 scr_bell ();
2975 break; 3030 break;
2976 case C0_BS: /* backspace */ 3031 case C0_BS: /* backspace */
… …
3164 process_dcs_seq (); 3219 process_dcs_seq ();
3165 break; 3220 break;
3166 3221
3167 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3222 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3168 case C1_SCI: /* ESC Z */ 3223 case C1_SCI: /* ESC Z */
3169 tt_write ((const unsigned char *)ESCZ_ANSWER, 3224 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3170 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3171 break; /* steal obsolete ESC [ c */ 3225 break; /* steal obsolete ESC [ c */
3172 3226
3173 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3227 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3174 case C1_CSI: /* ESC [ */ 3228 case C1_CSI: /* ESC [ */
3175 process_csi_seq (); 3229 process_csi_seq ();
… …
3419 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3473 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3420 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3474 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3421 break; 3475 break;
3422 3476
3423 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3477 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3424 tt_write ((const unsigned char *)VT100_ANS, 3478 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3425 (unsigned int) (sizeof (VT100_ANS) - 1));
3426 break; 3479 break;
3427 3480
3428 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3481 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3429 process_sgr_mode (nargs, arg); 3482 process_sgr_mode (nargs, arg);
3430 break; 3483 break;
… …
3632/*----------------------------------------------------------------------*/ 3685/*----------------------------------------------------------------------*/
3633/* 3686/*
3634 * get input up until STRING TERMINATOR (or BEL) 3687 * get input up until STRING TERMINATOR (or BEL)
3635 * ends_how is terminator used. returned input must be free()'d 3688 * ends_how is terminator used. returned input must be free()'d
3636 */ 3689 */
3637unsigned char * 3690char *
3638rxvt_term::get_to_st (unicode_t &ends_how) 3691rxvt_term::get_to_st (unicode_t &ends_how)
3639{ 3692{
3640 unicode_t ch; 3693 unicode_t ch;
3641 bool seen_esc = false; 3694 bool seen_esc = false;
3642 unsigned int n = 0; 3695 unsigned int n = 0;
… …
3675 3728
3676 string[n++] = '\0'; 3729 string[n++] = '\0';
3677 3730
3678 ends_how = (ch == 0x5c ? C0_ESC : ch); 3731 ends_how = (ch == 0x5c ? C0_ESC : ch);
3679 3732
3680 return (unsigned char *)rxvt_wcstombs (string); 3733 return rxvt_wcstombs (string);
3681} 3734}
3682 3735
3683/*----------------------------------------------------------------------*/ 3736/*----------------------------------------------------------------------*/
3684/* 3737/*
3685 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3738 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3686 */ 3739 */
3687void 3740void
3688rxvt_term::process_dcs_seq () 3741rxvt_term::process_dcs_seq ()
3689{ 3742{
3690 unsigned char *s; 3743 char *s;
3691 unicode_t eh; 3744 unicode_t eh;
3692 3745
3693 /* 3746 /*
3694 * Not handled yet 3747 * Not handled yet
3695 */ 3748 */
… …
3714 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3767 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3715 arg = arg * 10 + (ch - '0'); 3768 arg = arg * 10 + (ch - '0');
3716 3769
3717 if (ch == ';') 3770 if (ch == ';')
3718 { 3771 {
3719 unsigned char *s = get_to_st (eh); 3772 char *s = get_to_st (eh);
3720 3773
3721 if (s) 3774 if (s)
3722 { 3775 {
3723 process_xterm_seq (arg, (char *)s, eh); 3776 process_xterm_seq (arg, s, eh);
3724 free (s); 3777 free (s);
3725 } 3778 }
3726 } 3779 }
3727} 3780}
3728 3781
3729void 3782void
3730rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3783rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3731{ 3784{
3732 if (str[0] == '?' && !str[1]) 3785 if (str[0] == '?' && !str[1])
3733 { 3786 {
3734 unsigned short r, g, b; 3787 unsigned short r, g, b;
3735 pix_colors_focused[color].get (display, r, g, b); 3788 pix_colors_focused[color].get (display, r, g, b);
… …
3741 3794
3742/* 3795/*
3743 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3796 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3744 */ 3797 */
3745void 3798void
3746rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3799rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3747{ 3800{
3748 int changed = 0; 3801 int changed = 0;
3749 int color; 3802 int color;
3750 char *buf, *name; 3803 char *buf, *name;
3751 bool query = str[0] == '?' && !str[1]; 3804 bool query = str[0] == '?' && !str[1];
… …
3958 } 4011 }
3959 break; 4012 break;
3960 4013
3961 case URxvt_view_up: 4014 case URxvt_view_up:
3962 case URxvt_view_down: 4015 case URxvt_view_down:
4016 {
3963 int lines = atoi (str); 4017 int lines = atoi (str);
3964 4018
3965 if (lines) 4019 if (lines)
3966 scr_page (op == URxvt_view_up ? UP : DN, lines); 4020 scr_page (op == URxvt_view_up ? UP : DN, lines);
3967 else 4021 else
3968 {
3969 scr_erase_savelines (); 4022 scr_erase_savelines ();
3970 } 4023 }
3971 4024
4025 break;
4026#endif
4027
4028#if ENABLE_PERL
4029 case URxvt_perl:
4030 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END)))
4031 ; // no responses yet
3972 break; 4032 break;
3973#endif 4033#endif
3974 } 4034 }
3975} 4035}
3976/*----------------------------------------------------------------------*/ 4036/*----------------------------------------------------------------------*/
… …
4333 scr_color (Color_bg, Color_bg); 4393 scr_color (Color_bg, Color_bg);
4334 break; 4394 break;
4335 4395
4336 //case 50: // not variable spacing 4396 //case 50: // not variable spacing
4337 4397
4338#ifndef NO_BRIGHTCOLOR 4398#if ENABLE_FRILLS
4339 case 90: 4399 case 90:
4340 case 91: /* set bright fg color */ 4400 case 91: /* set bright fg color */
4341 case 92: 4401 case 92:
4342 case 93: 4402 case 93:
4343 case 94: 4403 case 94:
… …
4388 */ 4448 */
4389void 4449void
4390rxvt_term::tt_printf (const char *fmt,...) 4450rxvt_term::tt_printf (const char *fmt,...)
4391{ 4451{
4392 va_list arg_ptr; 4452 va_list arg_ptr;
4393 unsigned char buf[256]; 4453 char buf[256];
4394 4454
4395 va_start (arg_ptr, fmt); 4455 va_start (arg_ptr, fmt);
4396 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4456 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4397 va_end (arg_ptr); 4457 va_end (arg_ptr);
4398 tt_write (buf, strlen (buf)); 4458 tt_write (buf, strlen (buf));
… …
4403 * or generated by us in response to a query ESC sequence. 4463 * or generated by us in response to a query ESC sequence.
4404 */ 4464 */
4405const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4465const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4406 4466
4407void 4467void
4408rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4468rxvt_term::tt_write (const char *data, unsigned int len)
4409{ 4469{
4470 if (pty.pty < 0)
4471 return;
4472
4410 if (v_buflen == 0) 4473 if (v_buflen == 0)
4411 { 4474 {
4412 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4475 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4413 4476
4414 if ((unsigned int)written == len) 4477 if ((unsigned int)written == len)
… …
4416 4479
4417 data += written; 4480 data += written;
4418 len -= written; 4481 len -= written;
4419 } 4482 }
4420 4483
4421 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4484 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4422 4485
4423 memcpy (v_buffer + v_buflen, data, len); 4486 memcpy (v_buffer + v_buflen, data, len);
4424 v_buflen += len; 4487 v_buflen += len;
4425 4488
4426 pty_ev.set (EVENT_READ | EVENT_WRITE); 4489 pty_ev.set (EVENT_READ | EVENT_WRITE);

Diff Legend

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