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.224 by root, Sun Jan 1 06:18:20 2006 UTC vs.
Revision 1.240 by root, Fri Jan 6 03:40:19 2006 UTC

… …
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_STRING_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
… …
984 SET_LOCALE (locale); 1028 SET_LOCALE (locale);
985 1029
986 display->flush (); 1030 display->flush ();
987 1031
988 if (want_refresh && !flush_ev.active) 1032 if (want_refresh && !flush_ev.active)
989 flush_ev.start (NOW + 0.01); 1033 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
990} 1034}
991 1035
992void 1036void
993rxvt_term::flush_cb (time_watcher &w) 1037rxvt_term::flush_cb (time_watcher &w)
994{ 1038{
… …
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 ();
… …
1575 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1638 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1576 break; 1639 break;
1577 1640
1578 if (ev.xany.window == vt) 1641 if (ev.xany.window == vt)
1579 { 1642 {
1643 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1644 ; // nop
1580 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1645 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1581 { 1646 {
1582 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1647 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1583 ; 1648 ;
1584 1649
1585 XQueryPointer (disp, vt, 1650 XQueryPointer (disp, vt,
… …
1680{ 1745{
1681 if (!focus) 1746 if (!focus)
1682 { 1747 {
1683 focus = 1; 1748 focus = 1;
1684 want_refresh = 1; 1749 want_refresh = 1;
1750
1751 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1752
1685#if USE_XIM 1753#if USE_XIM
1686 if (Input_Context != NULL) 1754 if (Input_Context != NULL)
1687 { 1755 {
1688 IMSetStatusPosition (); 1756 IMSetStatusPosition ();
1689 XSetICFocus (Input_Context); 1757 XSetICFocus (Input_Context);
… …
1709 if (focus) 1777 if (focus)
1710 { 1778 {
1711 focus = 0; 1779 focus = 0;
1712 want_refresh = 1; 1780 want_refresh = 1;
1713 1781
1782 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1783
1714#if ENABLE_FRILLS || ISO_14755 1784#if ENABLE_FRILLS || ISO_14755
1785 if (iso14755buf)
1786 {
1715 iso14755buf = 0; 1787 iso14755buf = 0;
1716#endif
1717#if ENABLE_OVERLAY 1788# if ENABLE_OVERLAY
1718 scr_overlay_off (); 1789 scr_overlay_off ();
1790# endif
1791 }
1719#endif 1792#endif
1720#if USE_XIM 1793#if USE_XIM
1721 if (Input_Context != NULL) 1794 if (Input_Context != NULL)
1722 XUnsetICFocus (Input_Context); 1795 XUnsetICFocus (Input_Context);
1723#endif 1796#endif
… …
1767rxvt_term::button_press (XButtonEvent &ev) 1840rxvt_term::button_press (XButtonEvent &ev)
1768{ 1841{
1769 int reportmode = 0, clickintime; 1842 int reportmode = 0, clickintime;
1770 1843
1771 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1844 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1845
1772 if (!bypass_keystate) 1846 if (!bypass_keystate)
1773 reportmode = !! (priv_modes & PrivMode_mouse_report); 1847 reportmode = !! (priv_modes & PrivMode_mouse_report);
1774 1848
1775 /* 1849 /*
1776 * VT window processing of button press 1850 * VT window processing of button press
… …
1825 else 1899 else
1826 { 1900 {
1827 if (ev.button != MEvent.button) 1901 if (ev.button != MEvent.button)
1828 MEvent.clicks = 0; 1902 MEvent.clicks = 0;
1829 1903
1904 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1830 switch (ev.button) 1905 switch (ev.button)
1831 { 1906 {
1832 case Button1: 1907 case Button1:
1833 /* allow meta + click to select rectangular areas */ 1908 /* allow meta + click to select rectangular areas */
1834 /* should be done in screen.C */ 1909 /* should be done in screen.C */
1835#if ENABLE_FRILLS 1910#if ENABLE_FRILLS
1836 selection.rect = !!(ev.state & ModMetaMask); 1911 selection.rect = !!(ev.state & ModMetaMask);
1837#else 1912#else
1838 selection.rect = false; 1913 selection.rect = false;
1839#endif 1914#endif
1840 1915
1841 /* allow shift+left click to extend selection */ 1916 /* allow shift+left click to extend selection */
1842 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1917 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1843 { 1918 {
1844 if (MEvent.button == Button1 && clickintime) 1919 if (MEvent.button == Button1 && clickintime)
1845 selection_rotate (ev.x, ev.y); 1920 selection_rotate (ev.x, ev.y);
1846 else 1921 else
1847 selection_extend (ev.x, ev.y, 1); 1922 selection_extend (ev.x, ev.y, 1);
1848 } 1923 }
1849 else 1924 else
1850 { 1925 {
1851 if (MEvent.button == Button1 && clickintime) 1926 if (MEvent.button == Button1 && clickintime)
1852 MEvent.clicks++; 1927 MEvent.clicks++;
1853 else 1928 else
1854 MEvent.clicks = 1; 1929 MEvent.clicks = 1;
1855 1930
1856 selection_click (MEvent.clicks, ev.x, ev.y); 1931 selection_click (MEvent.clicks, ev.x, ev.y);
1857 } 1932 }
1858 1933
1859 MEvent.button = Button1; 1934 MEvent.button = Button1;
1860 break; 1935 break;
1861 1936
1862 case Button3: 1937 case Button3:
1863 if (MEvent.button == Button3 && clickintime) 1938 if (MEvent.button == Button3 && clickintime)
1864 selection_rotate (ev.x, ev.y); 1939 selection_rotate (ev.x, ev.y);
1865 else 1940 else
1866 selection_extend (ev.x, ev.y, 1); 1941 selection_extend (ev.x, ev.y, 1);
1867 1942
1868 MEvent.button = Button3; 1943 MEvent.button = Button3;
1869 break; 1944 break;
1870 } 1945 }
1871 } 1946 }
1872 1947
1873 MEvent.time = ev.time; 1948 MEvent.time = ev.time;
1874 return; 1949 return;
1875 } 1950 }
1876 1951
… …
2085 */ 2160 */
2086 if (priv_modes & PrivMode_mouse_report 2161 if (priv_modes & PrivMode_mouse_report
2087 && bypass_keystate 2162 && bypass_keystate
2088 && ev.button == Button1 && MEvent.clicks <= 1) 2163 && ev.button == Button1 && MEvent.clicks <= 1)
2089 selection_extend (ev.x, ev.y, 0); 2164 selection_extend (ev.x, ev.y, 0);
2165
2166 if (!HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2167 return;
2090 2168
2091 switch (ev.button) 2169 switch (ev.button)
2092 { 2170 {
2093 case Button1: 2171 case Button1:
2094 case Button3: 2172 case Button3:
… …
2640bool 2718bool
2641rxvt_term::cmd_parse () 2719rxvt_term::cmd_parse ()
2642{ 2720{
2643 bool flag = false; 2721 bool flag = false;
2644 unicode_t ch = NOCHAR; 2722 unicode_t ch = NOCHAR;
2645 unsigned char *seq_begin; // remember start of esc-sequence here 2723 char *seq_begin; // remember start of esc-sequence here
2646 2724
2647 for (;;) 2725 for (;;)
2648 { 2726 {
2649 if (ch == NOCHAR) 2727 if (ch == NOCHAR)
2650 { 2728 {
2651 seq_begin = cmdbuf_ptr; 2729 seq_begin = cmdbuf_ptr;
2652 ch = next_char (); 2730 ch = next_char ();
2653 }
2654 2731
2655 if (ch == NOCHAR) // TODO: improve 2732 if (ch == NOCHAR)
2656 break; 2733 break;
2734 }
2657 2735
2658 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2736 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2659 { 2737 {
2660 if (!seen_input) 2738 if (!seen_input)
2661 { 2739 {
… …
2694 2772
2695 if (!OPTION (Opt_jumpScroll) 2773 if (!OPTION (Opt_jumpScroll)
2696 || (refresh_count >= refresh_limit * (nrow - 1))) 2774 || (refresh_count >= refresh_limit * (nrow - 1)))
2697 { 2775 {
2698 refreshnow = true; 2776 refreshnow = true;
2777 refresh_count = 0;
2699 ch = NOCHAR; 2778 ch = NOCHAR;
2700 break; 2779 break;
2701 } 2780 }
2702 2781
2703 // scr_add_lines only works for nlines <= nrow - 1. 2782 // scr_add_lines only works for nlines <= nrow - 1.
2704 if (nlines >= nrow - 1) 2783 if (nlines >= nrow - 1)
2705 { 2784 {
2785 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END)))
2706 scr_add_lines (buf, nlines, str - buf); 2786 scr_add_lines (buf, nlines, str - buf);
2787
2707 nlines = 0; 2788 nlines = 0;
2708 str = buf; 2789 str = buf;
2709 eol = str + min (ncol, UBUFSIZ); 2790 eol = str + min (ncol, UBUFSIZ);
2710 } 2791 }
2711 2792
… …
2724 2805
2725 seq_begin = cmdbuf_ptr; 2806 seq_begin = cmdbuf_ptr;
2726 ch = next_char (); 2807 ch = next_char ();
2727 } 2808 }
2728 2809
2810 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END)))
2729 scr_add_lines (buf, nlines, str - buf); 2811 scr_add_lines (buf, nlines, str - buf);
2730 2812
2731 /* 2813 /*
2732 * If there have been a lot of new lines, then update the screen 2814 * If there have been a lot of new lines, then update the screen
2733 * What the heck I'll cheat and only refresh less than every page-full. 2815 * What the heck I'll cheat and only refresh less than every page-full.
2734 * the number of pages between refreshes is refresh_limit, which 2816 * the number of pages between refreshes is refresh_limit, which
… …
2740 refresh_limit++; 2822 refresh_limit++;
2741 else 2823 else
2742 { 2824 {
2743 flag = true; 2825 flag = true;
2744 scr_refresh (refresh_type); 2826 scr_refresh (refresh_type);
2827 flush_ev.stop ();
2745 } 2828 }
2746 } 2829 }
2747 2830
2748 } 2831 }
2749 else 2832 else
… …
2780rxvt_term::next_char () 2863rxvt_term::next_char ()
2781{ 2864{
2782 while (cmdbuf_ptr < cmdbuf_endp) 2865 while (cmdbuf_ptr < cmdbuf_endp)
2783 { 2866 {
2784 // assume 7-bit to be ascii ALWAYS 2867 // assume 7-bit to be ascii ALWAYS
2785 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2868 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2786 return *cmdbuf_ptr++; 2869 return *cmdbuf_ptr++;
2787 2870
2788 wchar_t wc; 2871 wchar_t wc;
2789 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);
2790 2873
2791 if (len == (size_t)-2) 2874 if (len == (size_t)-2)
2792 { 2875 {
2793 // the mbstate stores incomplete sequences. didn't know this :/ 2876 // the mbstate stores incomplete sequences. didn't know this :/
2794 cmdbuf_ptr = cmdbuf_endp; 2877 cmdbuf_ptr = cmdbuf_endp;
… …
2933 case C0_ESC: 3016 case C0_ESC:
2934 process_escape_seq (); 3017 process_escape_seq ();
2935 break; 3018 break;
2936 case C0_ENQ: /* terminal Status */ 3019 case C0_ENQ: /* terminal Status */
2937 if (rs[Rs_answerbackstring]) 3020 if (rs[Rs_answerbackstring])
2938 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3021 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2939 (unsigned int)strlen (rs[Rs_answerbackstring]));
2940 else 3022 else
2941 tt_write ((unsigned char *)VT100_ANS, 3023 tt_write (VT100_ANS, strlen (VT100_ANS));
2942 (unsigned int)strlen (VT100_ANS));
2943 break; 3024 break;
2944 case C0_BEL: /* bell */ 3025 case C0_BEL: /* bell */
2945 scr_bell (); 3026 scr_bell ();
2946 break; 3027 break;
2947 case C0_BS: /* backspace */ 3028 case C0_BS: /* backspace */
… …
3135 process_dcs_seq (); 3216 process_dcs_seq ();
3136 break; 3217 break;
3137 3218
3138 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3219 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3139 case C1_SCI: /* ESC Z */ 3220 case C1_SCI: /* ESC Z */
3140 tt_write ((const unsigned char *)ESCZ_ANSWER, 3221 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3141 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3142 break; /* steal obsolete ESC [ c */ 3222 break; /* steal obsolete ESC [ c */
3143 3223
3144 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3224 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3145 case C1_CSI: /* ESC [ */ 3225 case C1_CSI: /* ESC [ */
3146 process_csi_seq (); 3226 process_csi_seq ();
… …
3390 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3470 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3391 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3471 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3392 break; 3472 break;
3393 3473
3394 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3474 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3395 tt_write ((const unsigned char *)VT100_ANS, 3475 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3396 (unsigned int) (sizeof (VT100_ANS) - 1));
3397 break; 3476 break;
3398 3477
3399 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3478 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3400 process_sgr_mode (nargs, arg); 3479 process_sgr_mode (nargs, arg);
3401 break; 3480 break;
… …
3603/*----------------------------------------------------------------------*/ 3682/*----------------------------------------------------------------------*/
3604/* 3683/*
3605 * get input up until STRING TERMINATOR (or BEL) 3684 * get input up until STRING TERMINATOR (or BEL)
3606 * ends_how is terminator used. returned input must be free()'d 3685 * ends_how is terminator used. returned input must be free()'d
3607 */ 3686 */
3608unsigned char * 3687char *
3609rxvt_term::get_to_st (unicode_t &ends_how) 3688rxvt_term::get_to_st (unicode_t &ends_how)
3610{ 3689{
3611 unicode_t ch; 3690 unicode_t ch;
3612 bool seen_esc = false; 3691 bool seen_esc = false;
3613 unsigned int n = 0; 3692 unsigned int n = 0;
… …
3646 3725
3647 string[n++] = '\0'; 3726 string[n++] = '\0';
3648 3727
3649 ends_how = (ch == 0x5c ? C0_ESC : ch); 3728 ends_how = (ch == 0x5c ? C0_ESC : ch);
3650 3729
3651 return (unsigned char *)rxvt_wcstombs (string); 3730 return rxvt_wcstombs (string);
3652} 3731}
3653 3732
3654/*----------------------------------------------------------------------*/ 3733/*----------------------------------------------------------------------*/
3655/* 3734/*
3656 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3735 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3657 */ 3736 */
3658void 3737void
3659rxvt_term::process_dcs_seq () 3738rxvt_term::process_dcs_seq ()
3660{ 3739{
3661 unsigned char *s; 3740 char *s;
3662 unicode_t eh; 3741 unicode_t eh;
3663 3742
3664 /* 3743 /*
3665 * Not handled yet 3744 * Not handled yet
3666 */ 3745 */
… …
3685 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3764 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3686 arg = arg * 10 + (ch - '0'); 3765 arg = arg * 10 + (ch - '0');
3687 3766
3688 if (ch == ';') 3767 if (ch == ';')
3689 { 3768 {
3690 unsigned char *s = get_to_st (eh); 3769 char *s = get_to_st (eh);
3691 3770
3692 if (s) 3771 if (s)
3693 { 3772 {
3694 process_xterm_seq (arg, (char *)s, eh); 3773 process_xterm_seq (arg, s, eh);
3695 free (s); 3774 free (s);
3696 } 3775 }
3697 } 3776 }
3698} 3777}
3699 3778
3700void 3779void
3701rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3780rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3702{ 3781{
3703 if (str[0] == '?' && !str[1]) 3782 if (str[0] == '?' && !str[1])
3704 { 3783 {
3705 unsigned short r, g, b; 3784 unsigned short r, g, b;
3706 pix_colors_focused[color].get (display, r, g, b); 3785 pix_colors_focused[color].get (display, r, g, b);
… …
3712 3791
3713/* 3792/*
3714 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3793 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3715 */ 3794 */
3716void 3795void
3717rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3796rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3718{ 3797{
3719 int changed = 0; 3798 int changed = 0;
3720 int color; 3799 int color;
3721 char *buf, *name; 3800 char *buf, *name;
3722 bool query = str[0] == '?' && !str[1]; 3801 bool query = str[0] == '?' && !str[1];
… …
3929 } 4008 }
3930 break; 4009 break;
3931 4010
3932 case URxvt_view_up: 4011 case URxvt_view_up:
3933 case URxvt_view_down: 4012 case URxvt_view_down:
4013 {
3934 int lines = atoi (str); 4014 int lines = atoi (str);
3935 4015
3936 if (lines) 4016 if (lines)
3937 scr_page (op == URxvt_view_up ? UP : DN, lines); 4017 scr_page (op == URxvt_view_up ? UP : DN, lines);
3938 else 4018 else
3939 {
3940 scr_erase_savelines (); 4019 scr_erase_savelines ();
3941 } 4020 }
3942 4021
4022 break;
4023#endif
4024
4025#if ENABLE_PERL
4026 case URxvt_perl:
4027 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END)))
4028 ; // no responses yet
3943 break; 4029 break;
3944#endif 4030#endif
3945 } 4031 }
3946} 4032}
3947/*----------------------------------------------------------------------*/ 4033/*----------------------------------------------------------------------*/
… …
4063 if (mode) 4149 if (mode)
4064 SET_OPTION (Opt_intensityStyles); 4150 SET_OPTION (Opt_intensityStyles);
4065 else 4151 else
4066 CLR_OPTION (Opt_intensityStyles); 4152 CLR_OPTION (Opt_intensityStyles);
4067 4153
4068 want_refresh = 1; 4154 scr_touch (true);
4069 want_full_refresh = 1;
4070 break; 4155 break;
4071#endif 4156#endif
4072 case 1048: /* alternative cursor save */ 4157 case 1048: /* alternative cursor save */
4073 case 1049: 4158 case 1049:
4074 if (OPTION (Opt_secondaryScreen)) 4159 if (OPTION (Opt_secondaryScreen))
… …
4305 scr_color (Color_bg, Color_bg); 4390 scr_color (Color_bg, Color_bg);
4306 break; 4391 break;
4307 4392
4308 //case 50: // not variable spacing 4393 //case 50: // not variable spacing
4309 4394
4310#ifndef NO_BRIGHTCOLOR 4395#if ENABLE_FRILLS
4311 case 90: 4396 case 90:
4312 case 91: /* set bright fg color */ 4397 case 91: /* set bright fg color */
4313 case 92: 4398 case 92:
4314 case 93: 4399 case 93:
4315 case 94: 4400 case 94:
… …
4360 */ 4445 */
4361void 4446void
4362rxvt_term::tt_printf (const char *fmt,...) 4447rxvt_term::tt_printf (const char *fmt,...)
4363{ 4448{
4364 va_list arg_ptr; 4449 va_list arg_ptr;
4365 unsigned char buf[256]; 4450 char buf[256];
4366 4451
4367 va_start (arg_ptr, fmt); 4452 va_start (arg_ptr, fmt);
4368 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4453 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4369 va_end (arg_ptr); 4454 va_end (arg_ptr);
4370 tt_write (buf, strlen (buf)); 4455 tt_write (buf, strlen (buf));
… …
4375 * or generated by us in response to a query ESC sequence. 4460 * or generated by us in response to a query ESC sequence.
4376 */ 4461 */
4377const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4462const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4378 4463
4379void 4464void
4380rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4465rxvt_term::tt_write (const char *data, unsigned int len)
4381{ 4466{
4467 if (pty.pty < 0)
4468 return;
4469
4382 if (v_buflen == 0) 4470 if (v_buflen == 0)
4383 { 4471 {
4384 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4472 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4385 4473
4386 if ((unsigned int)written == len) 4474 if ((unsigned int)written == len)
… …
4388 4476
4389 data += written; 4477 data += written;
4390 len -= written; 4478 len -= written;
4391 } 4479 }
4392 4480
4393 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4481 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4394 4482
4395 memcpy (v_buffer + v_buflen, data, len); 4483 memcpy (v_buffer + v_buflen, data, len);
4396 v_buflen += len; 4484 v_buflen += len;
4397 4485
4398 pty_ev.set (EVENT_READ | EVENT_WRITE); 4486 pty_ev.set (EVENT_READ | EVENT_WRITE);

Diff Legend

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