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.238 by root, Fri Jan 6 02:58:02 2006 UTC

… …
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;
… …
897#ifdef META8_OPTION 898#ifdef META8_OPTION
898 && meta_char == C0_ESC 899 && meta_char == C0_ESC
899#endif 900#endif
900 ) 901 )
901 { 902 {
902 const unsigned char ch = C0_ESC; 903 const char ch = C0_ESC;
903 tt_write (&ch, 1); 904 tt_write (&ch, 1);
904 } 905 }
905 906
906#if defined(DEBUG_CMD) 907#if defined(DEBUG_CMD)
907 /* Display keyboard buffer contents */ 908 /* Display keyboard buffer contents */
… …
919 920
920#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 921#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
921/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 922/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
922/* attempt to `write' count to the input buffer */ 923/* attempt to `write' count to the input buffer */
923unsigned int 924unsigned int
924rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 925rxvt_term::cmd_write (const char *str, unsigned int count)
925{ 926{
926 unsigned int n, s; 927 unsigned int n, s;
927 928
928 n = cmdbuf_ptr - cmdbuf_base; 929 n = cmdbuf_ptr - cmdbuf_base;
929 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 930 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
966 } 967 }
967#endif 968#endif
968 969
969 if (want_refresh) 970 if (want_refresh)
970 { 971 {
972 if (SHOULD_INVOKE (HOOK_LINE_UPDATE))
973 {
974 int row = -view_start;
975
976 while (row > -nsaved && ROW (row - 1).is_longer ())
977 --row;
978
979 while (row < -view_start + nrow)
980 {
981 int start_row = row;
982 line_t *l;
983
984 do
985 {
986 l = &ROW (row);
987
988 if (!(l->f & LINE_FILTERED))
989 {
990 // line not filtered, mark it as filtered
991 l->f |= LINE_FILTERED;
992 while (l->is_longer ())
993 {
994 l = &ROW (++row);
995 l->f |= LINE_FILTERED;
996 }
997
998 // and filter it
999 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1000
1001 break;
1002 }
1003 }
1004 while (l->is_longer ());
1005
1006 row++;
1007 }
1008
1009 }
1010
971 scr_refresh (refresh_type); 1011 scr_refresh (refresh_type);
972 scrollbar_show (1); 1012 scrollbar_show (1);
973#ifdef USE_XIM 1013#ifdef USE_XIM
974 IMSendSpot (); 1014 IMSendSpot ();
975#endif 1015#endif
… …
1095{ 1135{
1096 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1136 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1097 1137
1098 if (CBUFSIZ == n) 1138 if (CBUFSIZ == n)
1099 { 1139 {
1100 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1140 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1101 n = 0; 1141 n = 0;
1102 } 1142 }
1103 1143
1104 memmove (cmdbuf_base, cmdbuf_ptr, n); 1144 memmove (cmdbuf_base, cmdbuf_ptr, n);
1105 cmdbuf_ptr = cmdbuf_base; 1145 cmdbuf_ptr = cmdbuf_base;
… …
1113 return true; 1153 return true;
1114 } 1154 }
1115 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1155 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1116 { 1156 {
1117#if HAVE_SCHED_YIELD 1157#if HAVE_SCHED_YIELD
1158 if (display->is_local)
1118 event_handler.cw_yield.start (); 1159 event_handler.cw_yield.start ();
1119#endif 1160#endif
1120 } 1161 }
1121 else 1162 else
1122 { 1163 {
1123 pty_ev.stop (); 1164 pty_ev.stop ();
… …
1700 if (!focus) 1741 if (!focus)
1701 { 1742 {
1702 focus = 1; 1743 focus = 1;
1703 want_refresh = 1; 1744 want_refresh = 1;
1704 1745
1705 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1746 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1706 1747
1707#if USE_XIM 1748#if USE_XIM
1708 if (Input_Context != NULL) 1749 if (Input_Context != NULL)
1709 { 1750 {
1710 IMSetStatusPosition (); 1751 IMSetStatusPosition ();
… …
1731 if (focus) 1772 if (focus)
1732 { 1773 {
1733 focus = 0; 1774 focus = 0;
1734 want_refresh = 1; 1775 want_refresh = 1;
1735 1776
1736 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1777 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1737 1778
1738#if ENABLE_FRILLS || ISO_14755 1779#if ENABLE_FRILLS || ISO_14755
1739 if (iso14755buf) 1780 if (iso14755buf)
1740 { 1781 {
1741 iso14755buf = 0; 1782 iso14755buf = 0;
… …
1794rxvt_term::button_press (XButtonEvent &ev) 1835rxvt_term::button_press (XButtonEvent &ev)
1795{ 1836{
1796 int reportmode = 0, clickintime; 1837 int reportmode = 0, clickintime;
1797 1838
1798 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1839 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1840
1799 if (!bypass_keystate) 1841 if (!bypass_keystate)
1800 reportmode = !! (priv_modes & PrivMode_mouse_report); 1842 reportmode = !! (priv_modes & PrivMode_mouse_report);
1801 1843
1802 /* 1844 /*
1803 * VT window processing of button press 1845 * VT window processing of button press
… …
1852 else 1894 else
1853 { 1895 {
1854 if (ev.button != MEvent.button) 1896 if (ev.button != MEvent.button)
1855 MEvent.clicks = 0; 1897 MEvent.clicks = 0;
1856 1898
1899 if (!HOOK_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END)))
1857 switch (ev.button) 1900 switch (ev.button)
1858 { 1901 {
1859 case Button1: 1902 case Button1:
1860 /* allow meta + click to select rectangular areas */ 1903 /* allow meta + click to select rectangular areas */
1861 /* should be done in screen.C */ 1904 /* should be done in screen.C */
1862#if ENABLE_FRILLS 1905#if ENABLE_FRILLS
1863 selection.rect = !!(ev.state & ModMetaMask); 1906 selection.rect = !!(ev.state & ModMetaMask);
1864#else 1907#else
1865 selection.rect = false; 1908 selection.rect = false;
1866#endif 1909#endif
1867 1910
1868 /* allow shift+left click to extend selection */ 1911 /* allow shift+left click to extend selection */
1869 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1912 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1870 { 1913 {
1871 if (MEvent.button == Button1 && clickintime) 1914 if (MEvent.button == Button1 && clickintime)
1872 selection_rotate (ev.x, ev.y); 1915 selection_rotate (ev.x, ev.y);
1873 else 1916 else
1874 selection_extend (ev.x, ev.y, 1); 1917 selection_extend (ev.x, ev.y, 1);
1875 } 1918 }
1876 else 1919 else
1877 { 1920 {
1878 if (MEvent.button == Button1 && clickintime) 1921 if (MEvent.button == Button1 && clickintime)
1879 MEvent.clicks++; 1922 MEvent.clicks++;
1880 else 1923 else
1881 MEvent.clicks = 1; 1924 MEvent.clicks = 1;
1882 1925
1883 selection_click (MEvent.clicks, ev.x, ev.y); 1926 selection_click (MEvent.clicks, ev.x, ev.y);
1884 } 1927 }
1885 1928
1886 MEvent.button = Button1; 1929 MEvent.button = Button1;
1887 break; 1930 break;
1888 1931
1889 case Button3: 1932 case Button3:
1890 if (MEvent.button == Button3 && clickintime) 1933 if (MEvent.button == Button3 && clickintime)
1891 selection_rotate (ev.x, ev.y); 1934 selection_rotate (ev.x, ev.y);
1892 else 1935 else
1893 selection_extend (ev.x, ev.y, 1); 1936 selection_extend (ev.x, ev.y, 1);
1894 1937
1895 MEvent.button = Button3; 1938 MEvent.button = Button3;
1896 break; 1939 break;
1897 } 1940 }
1898 } 1941 }
1899 1942
1900 MEvent.time = ev.time; 1943 MEvent.time = ev.time;
1901 return; 1944 return;
1902 } 1945 }
1903 1946
… …
2667bool 2710bool
2668rxvt_term::cmd_parse () 2711rxvt_term::cmd_parse ()
2669{ 2712{
2670 bool flag = false; 2713 bool flag = false;
2671 unicode_t ch = NOCHAR; 2714 unicode_t ch = NOCHAR;
2672 unsigned char *seq_begin; // remember start of esc-sequence here 2715 char *seq_begin; // remember start of esc-sequence here
2673 2716
2674 for (;;) 2717 for (;;)
2675 { 2718 {
2676 if (ch == NOCHAR) 2719 if (ch == NOCHAR)
2677 { 2720 {
2678 seq_begin = cmdbuf_ptr; 2721 seq_begin = cmdbuf_ptr;
2679 ch = next_char (); 2722 ch = next_char ();
2680 }
2681 2723
2682 if (ch == NOCHAR) // TODO: improve 2724 if (ch == NOCHAR)
2683 break; 2725 break;
2726 }
2684 2727
2685 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2728 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2686 { 2729 {
2687 if (!seen_input) 2730 if (!seen_input)
2688 { 2731 {
… …
2729 } 2772 }
2730 2773
2731 // scr_add_lines only works for nlines <= nrow - 1. 2774 // scr_add_lines only works for nlines <= nrow - 1.
2732 if (nlines >= nrow - 1) 2775 if (nlines >= nrow - 1)
2733 { 2776 {
2777 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END)))
2734 scr_add_lines (buf, nlines, str - buf); 2778 scr_add_lines (buf, nlines, str - buf);
2779
2735 nlines = 0; 2780 nlines = 0;
2736 str = buf; 2781 str = buf;
2737 eol = str + min (ncol, UBUFSIZ); 2782 eol = str + min (ncol, UBUFSIZ);
2738 } 2783 }
2739 2784
… …
2752 2797
2753 seq_begin = cmdbuf_ptr; 2798 seq_begin = cmdbuf_ptr;
2754 ch = next_char (); 2799 ch = next_char ();
2755 } 2800 }
2756 2801
2802 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END)))
2757 scr_add_lines (buf, nlines, str - buf); 2803 scr_add_lines (buf, nlines, str - buf);
2758 2804
2759 /* 2805 /*
2760 * If there have been a lot of new lines, then update the screen 2806 * 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. 2807 * 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 2808 * the number of pages between refreshes is refresh_limit, which
… …
2809rxvt_term::next_char () 2855rxvt_term::next_char ()
2810{ 2856{
2811 while (cmdbuf_ptr < cmdbuf_endp) 2857 while (cmdbuf_ptr < cmdbuf_endp)
2812 { 2858 {
2813 // assume 7-bit to be ascii ALWAYS 2859 // assume 7-bit to be ascii ALWAYS
2814 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2860 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2815 return *cmdbuf_ptr++; 2861 return *cmdbuf_ptr++;
2816 2862
2817 wchar_t wc; 2863 wchar_t wc;
2818 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2864 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2819 2865
2820 if (len == (size_t)-2) 2866 if (len == (size_t)-2)
2821 { 2867 {
2822 // the mbstate stores incomplete sequences. didn't know this :/ 2868 // the mbstate stores incomplete sequences. didn't know this :/
2823 cmdbuf_ptr = cmdbuf_endp; 2869 cmdbuf_ptr = cmdbuf_endp;
… …
2962 case C0_ESC: 3008 case C0_ESC:
2963 process_escape_seq (); 3009 process_escape_seq ();
2964 break; 3010 break;
2965 case C0_ENQ: /* terminal Status */ 3011 case C0_ENQ: /* terminal Status */
2966 if (rs[Rs_answerbackstring]) 3012 if (rs[Rs_answerbackstring])
2967 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3013 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2968 (unsigned int)strlen (rs[Rs_answerbackstring]));
2969 else 3014 else
2970 tt_write ((unsigned char *)VT100_ANS, 3015 tt_write (VT100_ANS, strlen (VT100_ANS));
2971 (unsigned int)strlen (VT100_ANS));
2972 break; 3016 break;
2973 case C0_BEL: /* bell */ 3017 case C0_BEL: /* bell */
2974 scr_bell (); 3018 scr_bell ();
2975 break; 3019 break;
2976 case C0_BS: /* backspace */ 3020 case C0_BS: /* backspace */
… …
3164 process_dcs_seq (); 3208 process_dcs_seq ();
3165 break; 3209 break;
3166 3210
3167 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3211 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3168 case C1_SCI: /* ESC Z */ 3212 case C1_SCI: /* ESC Z */
3169 tt_write ((const unsigned char *)ESCZ_ANSWER, 3213 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3170 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3171 break; /* steal obsolete ESC [ c */ 3214 break; /* steal obsolete ESC [ c */
3172 3215
3173 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3216 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3174 case C1_CSI: /* ESC [ */ 3217 case C1_CSI: /* ESC [ */
3175 process_csi_seq (); 3218 process_csi_seq ();
… …
3419 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3462 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3420 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3463 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3421 break; 3464 break;
3422 3465
3423 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3466 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3424 tt_write ((const unsigned char *)VT100_ANS, 3467 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3425 (unsigned int) (sizeof (VT100_ANS) - 1));
3426 break; 3468 break;
3427 3469
3428 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3470 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3429 process_sgr_mode (nargs, arg); 3471 process_sgr_mode (nargs, arg);
3430 break; 3472 break;
… …
3632/*----------------------------------------------------------------------*/ 3674/*----------------------------------------------------------------------*/
3633/* 3675/*
3634 * get input up until STRING TERMINATOR (or BEL) 3676 * get input up until STRING TERMINATOR (or BEL)
3635 * ends_how is terminator used. returned input must be free()'d 3677 * ends_how is terminator used. returned input must be free()'d
3636 */ 3678 */
3637unsigned char * 3679char *
3638rxvt_term::get_to_st (unicode_t &ends_how) 3680rxvt_term::get_to_st (unicode_t &ends_how)
3639{ 3681{
3640 unicode_t ch; 3682 unicode_t ch;
3641 bool seen_esc = false; 3683 bool seen_esc = false;
3642 unsigned int n = 0; 3684 unsigned int n = 0;
… …
3675 3717
3676 string[n++] = '\0'; 3718 string[n++] = '\0';
3677 3719
3678 ends_how = (ch == 0x5c ? C0_ESC : ch); 3720 ends_how = (ch == 0x5c ? C0_ESC : ch);
3679 3721
3680 return (unsigned char *)rxvt_wcstombs (string); 3722 return rxvt_wcstombs (string);
3681} 3723}
3682 3724
3683/*----------------------------------------------------------------------*/ 3725/*----------------------------------------------------------------------*/
3684/* 3726/*
3685 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3727 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3686 */ 3728 */
3687void 3729void
3688rxvt_term::process_dcs_seq () 3730rxvt_term::process_dcs_seq ()
3689{ 3731{
3690 unsigned char *s; 3732 char *s;
3691 unicode_t eh; 3733 unicode_t eh;
3692 3734
3693 /* 3735 /*
3694 * Not handled yet 3736 * Not handled yet
3695 */ 3737 */
… …
3714 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3756 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3715 arg = arg * 10 + (ch - '0'); 3757 arg = arg * 10 + (ch - '0');
3716 3758
3717 if (ch == ';') 3759 if (ch == ';')
3718 { 3760 {
3719 unsigned char *s = get_to_st (eh); 3761 char *s = get_to_st (eh);
3720 3762
3721 if (s) 3763 if (s)
3722 { 3764 {
3723 process_xterm_seq (arg, (char *)s, eh); 3765 process_xterm_seq (arg, s, eh);
3724 free (s); 3766 free (s);
3725 } 3767 }
3726 } 3768 }
3727} 3769}
3728 3770
3729void 3771void
3730rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3772rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3731{ 3773{
3732 if (str[0] == '?' && !str[1]) 3774 if (str[0] == '?' && !str[1])
3733 { 3775 {
3734 unsigned short r, g, b; 3776 unsigned short r, g, b;
3735 pix_colors_focused[color].get (display, r, g, b); 3777 pix_colors_focused[color].get (display, r, g, b);
… …
3741 3783
3742/* 3784/*
3743 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3785 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3744 */ 3786 */
3745void 3787void
3746rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3788rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3747{ 3789{
3748 int changed = 0; 3790 int changed = 0;
3749 int color; 3791 int color;
3750 char *buf, *name; 3792 char *buf, *name;
3751 bool query = str[0] == '?' && !str[1]; 3793 bool query = str[0] == '?' && !str[1];
… …
3958 } 4000 }
3959 break; 4001 break;
3960 4002
3961 case URxvt_view_up: 4003 case URxvt_view_up:
3962 case URxvt_view_down: 4004 case URxvt_view_down:
4005 {
3963 int lines = atoi (str); 4006 int lines = atoi (str);
3964 4007
3965 if (lines) 4008 if (lines)
3966 scr_page (op == URxvt_view_up ? UP : DN, lines); 4009 scr_page (op == URxvt_view_up ? UP : DN, lines);
3967 else 4010 else
3968 {
3969 scr_erase_savelines (); 4011 scr_erase_savelines ();
3970 } 4012 }
3971 4013
4014 break;
4015#endif
4016
4017#if ENABLE_PERL
4018 case URxvt_perl:
4019 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END)))
4020 ; // no responses yet
3972 break; 4021 break;
3973#endif 4022#endif
3974 } 4023 }
3975} 4024}
3976/*----------------------------------------------------------------------*/ 4025/*----------------------------------------------------------------------*/
… …
4333 scr_color (Color_bg, Color_bg); 4382 scr_color (Color_bg, Color_bg);
4334 break; 4383 break;
4335 4384
4336 //case 50: // not variable spacing 4385 //case 50: // not variable spacing
4337 4386
4338#ifndef NO_BRIGHTCOLOR 4387#if ENABLE_FRILLS
4339 case 90: 4388 case 90:
4340 case 91: /* set bright fg color */ 4389 case 91: /* set bright fg color */
4341 case 92: 4390 case 92:
4342 case 93: 4391 case 93:
4343 case 94: 4392 case 94:
… …
4388 */ 4437 */
4389void 4438void
4390rxvt_term::tt_printf (const char *fmt,...) 4439rxvt_term::tt_printf (const char *fmt,...)
4391{ 4440{
4392 va_list arg_ptr; 4441 va_list arg_ptr;
4393 unsigned char buf[256]; 4442 char buf[256];
4394 4443
4395 va_start (arg_ptr, fmt); 4444 va_start (arg_ptr, fmt);
4396 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4445 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4397 va_end (arg_ptr); 4446 va_end (arg_ptr);
4398 tt_write (buf, strlen (buf)); 4447 tt_write (buf, strlen (buf));
… …
4403 * or generated by us in response to a query ESC sequence. 4452 * or generated by us in response to a query ESC sequence.
4404 */ 4453 */
4405const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4454const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4406 4455
4407void 4456void
4408rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4457rxvt_term::tt_write (const char *data, unsigned int len)
4409{ 4458{
4410 if (v_buflen == 0) 4459 if (v_buflen == 0)
4411 { 4460 {
4412 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4461 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4413 4462
… …
4416 4465
4417 data += written; 4466 data += written;
4418 len -= written; 4467 len -= written;
4419 } 4468 }
4420 4469
4421 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4470 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4422 4471
4423 memcpy (v_buffer + v_buflen, data, len); 4472 memcpy (v_buffer + v_buflen, data, len);
4424 v_buflen += len; 4473 v_buflen += len;
4425 4474
4426 pty_ev.set (EVENT_READ | EVENT_WRITE); 4475 pty_ev.set (EVENT_READ | EVENT_WRITE);

Diff Legend

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