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.223 by root, Sun Jan 1 05:28:28 2006 UTC vs.
Revision 1.234 by root, Wed Jan 4 04:42:45 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
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
58
53#ifdef KEYSYM_RESOURCE 59#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 60# include "keyboard.h"
55#endif 61#endif
56 62
57#include <csignal> 63#include <csignal>
58
59#define HAVE_SCHED_YIELD 1 //D//TODO//FIXME
60#if HAVE_SCHED_YIELD
61# include <sched.h>
62#endif
63 64
64/*----------------------------------------------------------------------*/ 65/*----------------------------------------------------------------------*/
65 66
66#define IS_CONTROL(ch) !((ch) & 0xffffff60UL) 67#define IS_CONTROL(ch) !((ch) & 0xffffff60UL)
67 68
… …
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;
… …
985 SET_LOCALE (locale); 986 SET_LOCALE (locale);
986 987
987 display->flush (); 988 display->flush ();
988 989
989 if (want_refresh && !flush_ev.active) 990 if (want_refresh && !flush_ev.active)
990 flush_ev.start (NOW + 0.01); 991 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
991} 992}
992 993
993void 994void
994rxvt_term::flush_cb (time_watcher &w) 995rxvt_term::flush_cb (time_watcher &w)
995{ 996{
… …
1070 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1071 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1071 } 1072 }
1072} 1073}
1073#endif 1074#endif
1074 1075
1076#if HAVE_SCHED_YIELD
1077static struct event_handler
1078{
1079 check_watcher cw_yield;
1080
1081 void yield (check_watcher &w)
1082 {
1083 sched_yield ();
1084 w.stop ();
1085 }
1086
1087 event_handler ()
1088 : cw_yield (this, &event_handler::yield)
1089 {
1090 }
1091} event_handler;
1092#endif
1093
1075bool 1094bool
1076rxvt_term::pty_fill () 1095rxvt_term::pty_fill ()
1077{ 1096{
1078 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1097 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1079 1098
1080 if (CBUFSIZ == n) 1099 if (CBUFSIZ == n)
1081 { 1100 {
1082 rxvt_warn ("pty_fill on full buffer, draining input, continuing.\n"); 1101 rxvt_warn ("PLEASE REPORT: pty_fill on full buffer, draining input, continuing.\n");
1083 n = 0; 1102 n = 0;
1084 } 1103 }
1085 1104
1086 memmove (cmdbuf_base, cmdbuf_ptr, n); 1105 memmove (cmdbuf_base, cmdbuf_ptr, n);
1087 cmdbuf_ptr = cmdbuf_base; 1106 cmdbuf_ptr = cmdbuf_base;
… …
1095 return true; 1114 return true;
1096 } 1115 }
1097 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1116 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1098 { 1117 {
1099#if HAVE_SCHED_YIELD 1118#if HAVE_SCHED_YIELD
1100 sched_yield (); 1119 if (display->is_local)
1120 event_handler.cw_yield.start ();
1101#endif 1121#endif
1102 } 1122 }
1103 else 1123 else
1104 { 1124 {
1105 pty_ev.stop (); 1125 pty_ev.stop ();
… …
1681{ 1701{
1682 if (!focus) 1702 if (!focus)
1683 { 1703 {
1684 focus = 1; 1704 focus = 1;
1685 want_refresh = 1; 1705 want_refresh = 1;
1706
1707 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1708
1686#if USE_XIM 1709#if USE_XIM
1687 if (Input_Context != NULL) 1710 if (Input_Context != NULL)
1688 { 1711 {
1689 IMSetStatusPosition (); 1712 IMSetStatusPosition ();
1690 XSetICFocus (Input_Context); 1713 XSetICFocus (Input_Context);
… …
1710 if (focus) 1733 if (focus)
1711 { 1734 {
1712 focus = 0; 1735 focus = 0;
1713 want_refresh = 1; 1736 want_refresh = 1;
1714 1737
1738 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1739
1715#if ENABLE_FRILLS || ISO_14755 1740#if ENABLE_FRILLS || ISO_14755
1741 if (iso14755buf)
1742 {
1716 iso14755buf = 0; 1743 iso14755buf = 0;
1717#endif
1718#if ENABLE_OVERLAY 1744# if ENABLE_OVERLAY
1719 scr_overlay_off (); 1745 scr_overlay_off ();
1746# endif
1747 }
1720#endif 1748#endif
1721#if USE_XIM 1749#if USE_XIM
1722 if (Input_Context != NULL) 1750 if (Input_Context != NULL)
1723 XUnsetICFocus (Input_Context); 1751 XUnsetICFocus (Input_Context);
1724#endif 1752#endif
… …
1768rxvt_term::button_press (XButtonEvent &ev) 1796rxvt_term::button_press (XButtonEvent &ev)
1769{ 1797{
1770 int reportmode = 0, clickintime; 1798 int reportmode = 0, clickintime;
1771 1799
1772 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1800 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1801
1773 if (!bypass_keystate) 1802 if (!bypass_keystate)
1774 reportmode = !! (priv_modes & PrivMode_mouse_report); 1803 reportmode = !! (priv_modes & PrivMode_mouse_report);
1775 1804
1776 /* 1805 /*
1777 * VT window processing of button press 1806 * VT window processing of button press
… …
1826 else 1855 else
1827 { 1856 {
1828 if (ev.button != MEvent.button) 1857 if (ev.button != MEvent.button)
1829 MEvent.clicks = 0; 1858 MEvent.clicks = 0;
1830 1859
1860 if (!PERL_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END)))
1831 switch (ev.button) 1861 switch (ev.button)
1832 { 1862 {
1833 case Button1: 1863 case Button1:
1834 /* allow meta + click to select rectangular areas */ 1864 /* allow meta + click to select rectangular areas */
1835 /* should be done in screen.C */ 1865 /* should be done in screen.C */
1836#if ENABLE_FRILLS 1866#if ENABLE_FRILLS
1837 selection.rect = !!(ev.state & ModMetaMask); 1867 selection.rect = !!(ev.state & ModMetaMask);
1838#else 1868#else
1839 selection.rect = false; 1869 selection.rect = false;
1840#endif 1870#endif
1841 1871
1842 /* allow shift+left click to extend selection */ 1872 /* allow shift+left click to extend selection */
1843 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1873 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1844 { 1874 {
1845 if (MEvent.button == Button1 && clickintime) 1875 if (MEvent.button == Button1 && clickintime)
1846 selection_rotate (ev.x, ev.y); 1876 selection_rotate (ev.x, ev.y);
1847 else 1877 else
1848 selection_extend (ev.x, ev.y, 1); 1878 selection_extend (ev.x, ev.y, 1);
1849 } 1879 }
1850 else 1880 else
1851 { 1881 {
1852 if (MEvent.button == Button1 && clickintime) 1882 if (MEvent.button == Button1 && clickintime)
1853 MEvent.clicks++; 1883 MEvent.clicks++;
1854 else 1884 else
1855 MEvent.clicks = 1; 1885 MEvent.clicks = 1;
1856 1886
1857 selection_click (MEvent.clicks, ev.x, ev.y); 1887 selection_click (MEvent.clicks, ev.x, ev.y);
1858 } 1888 }
1859 1889
1860 MEvent.button = Button1; 1890 MEvent.button = Button1;
1861 break; 1891 break;
1862 1892
1863 case Button3: 1893 case Button3:
1864 if (MEvent.button == Button3 && clickintime) 1894 if (MEvent.button == Button3 && clickintime)
1865 selection_rotate (ev.x, ev.y); 1895 selection_rotate (ev.x, ev.y);
1866 else 1896 else
1867 selection_extend (ev.x, ev.y, 1); 1897 selection_extend (ev.x, ev.y, 1);
1868 1898
1869 MEvent.button = Button3; 1899 MEvent.button = Button3;
1870 break; 1900 break;
1871 } 1901 }
1872 } 1902 }
1873 1903
1874 MEvent.time = ev.time; 1904 MEvent.time = ev.time;
1875 return; 1905 return;
1876 } 1906 }
1877 1907
… …
2641bool 2671bool
2642rxvt_term::cmd_parse () 2672rxvt_term::cmd_parse ()
2643{ 2673{
2644 bool flag = false; 2674 bool flag = false;
2645 unicode_t ch = NOCHAR; 2675 unicode_t ch = NOCHAR;
2646 unsigned char *seq_begin; // remember start of esc-sequence here 2676 char *seq_begin; // remember start of esc-sequence here
2647 2677
2648 for (;;) 2678 for (;;)
2649 { 2679 {
2650 if (ch == NOCHAR) 2680 if (ch == NOCHAR)
2651 { 2681 {
… …
2695 2725
2696 if (!OPTION (Opt_jumpScroll) 2726 if (!OPTION (Opt_jumpScroll)
2697 || (refresh_count >= refresh_limit * (nrow - 1))) 2727 || (refresh_count >= refresh_limit * (nrow - 1)))
2698 { 2728 {
2699 refreshnow = true; 2729 refreshnow = true;
2730 refresh_count = 0;
2700 ch = NOCHAR; 2731 ch = NOCHAR;
2701 break; 2732 break;
2702 } 2733 }
2703 2734
2704 // scr_add_lines only works for nlines <= nrow - 1. 2735 // scr_add_lines only works for nlines <= nrow - 1.
… …
2741 refresh_limit++; 2772 refresh_limit++;
2742 else 2773 else
2743 { 2774 {
2744 flag = true; 2775 flag = true;
2745 scr_refresh (refresh_type); 2776 scr_refresh (refresh_type);
2777 flush_ev.stop ();
2746 } 2778 }
2747 } 2779 }
2748 2780
2749 } 2781 }
2750 else 2782 else
… …
2781rxvt_term::next_char () 2813rxvt_term::next_char ()
2782{ 2814{
2783 while (cmdbuf_ptr < cmdbuf_endp) 2815 while (cmdbuf_ptr < cmdbuf_endp)
2784 { 2816 {
2785 // assume 7-bit to be ascii ALWAYS 2817 // assume 7-bit to be ascii ALWAYS
2786 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2818 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2787 return *cmdbuf_ptr++; 2819 return *cmdbuf_ptr++;
2788 2820
2789 wchar_t wc; 2821 wchar_t wc;
2790 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2822 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2791 2823
2792 if (len == (size_t)-2) 2824 if (len == (size_t)-2)
2793 { 2825 {
2794 // the mbstate stores incomplete sequences. didn't know this :/ 2826 // the mbstate stores incomplete sequences. didn't know this :/
2795 cmdbuf_ptr = cmdbuf_endp; 2827 cmdbuf_ptr = cmdbuf_endp;
… …
2934 case C0_ESC: 2966 case C0_ESC:
2935 process_escape_seq (); 2967 process_escape_seq ();
2936 break; 2968 break;
2937 case C0_ENQ: /* terminal Status */ 2969 case C0_ENQ: /* terminal Status */
2938 if (rs[Rs_answerbackstring]) 2970 if (rs[Rs_answerbackstring])
2939 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 2971 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2940 (unsigned int)strlen (rs[Rs_answerbackstring]));
2941 else 2972 else
2942 tt_write ((unsigned char *)VT100_ANS, 2973 tt_write (VT100_ANS, strlen (VT100_ANS));
2943 (unsigned int)strlen (VT100_ANS));
2944 break; 2974 break;
2945 case C0_BEL: /* bell */ 2975 case C0_BEL: /* bell */
2946 scr_bell (); 2976 scr_bell ();
2947 break; 2977 break;
2948 case C0_BS: /* backspace */ 2978 case C0_BS: /* backspace */
… …
3136 process_dcs_seq (); 3166 process_dcs_seq ();
3137 break; 3167 break;
3138 3168
3139 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3169 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3140 case C1_SCI: /* ESC Z */ 3170 case C1_SCI: /* ESC Z */
3141 tt_write ((const unsigned char *)ESCZ_ANSWER, 3171 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3142 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3143 break; /* steal obsolete ESC [ c */ 3172 break; /* steal obsolete ESC [ c */
3144 3173
3145 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3174 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3146 case C1_CSI: /* ESC [ */ 3175 case C1_CSI: /* ESC [ */
3147 process_csi_seq (); 3176 process_csi_seq ();
… …
3391 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3420 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3392 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3421 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3393 break; 3422 break;
3394 3423
3395 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3424 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3396 tt_write ((const unsigned char *)VT100_ANS, 3425 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3397 (unsigned int) (sizeof (VT100_ANS) - 1));
3398 break; 3426 break;
3399 3427
3400 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3428 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3401 process_sgr_mode (nargs, arg); 3429 process_sgr_mode (nargs, arg);
3402 break; 3430 break;
… …
3604/*----------------------------------------------------------------------*/ 3632/*----------------------------------------------------------------------*/
3605/* 3633/*
3606 * get input up until STRING TERMINATOR (or BEL) 3634 * get input up until STRING TERMINATOR (or BEL)
3607 * ends_how is terminator used. returned input must be free()'d 3635 * ends_how is terminator used. returned input must be free()'d
3608 */ 3636 */
3609unsigned char * 3637char *
3610rxvt_term::get_to_st (unicode_t &ends_how) 3638rxvt_term::get_to_st (unicode_t &ends_how)
3611{ 3639{
3612 unicode_t ch; 3640 unicode_t ch;
3613 bool seen_esc = false; 3641 bool seen_esc = false;
3614 unsigned int n = 0; 3642 unsigned int n = 0;
… …
3647 3675
3648 string[n++] = '\0'; 3676 string[n++] = '\0';
3649 3677
3650 ends_how = (ch == 0x5c ? C0_ESC : ch); 3678 ends_how = (ch == 0x5c ? C0_ESC : ch);
3651 3679
3652 return (unsigned char *)rxvt_wcstombs (string); 3680 return rxvt_wcstombs (string);
3653} 3681}
3654 3682
3655/*----------------------------------------------------------------------*/ 3683/*----------------------------------------------------------------------*/
3656/* 3684/*
3657 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3685 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3658 */ 3686 */
3659void 3687void
3660rxvt_term::process_dcs_seq () 3688rxvt_term::process_dcs_seq ()
3661{ 3689{
3662 unsigned char *s; 3690 char *s;
3663 unicode_t eh; 3691 unicode_t eh;
3664 3692
3665 /* 3693 /*
3666 * Not handled yet 3694 * Not handled yet
3667 */ 3695 */
… …
3686 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3714 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3687 arg = arg * 10 + (ch - '0'); 3715 arg = arg * 10 + (ch - '0');
3688 3716
3689 if (ch == ';') 3717 if (ch == ';')
3690 { 3718 {
3691 unsigned char *s = get_to_st (eh); 3719 char *s = get_to_st (eh);
3692 3720
3693 if (s) 3721 if (s)
3694 { 3722 {
3695 process_xterm_seq (arg, (char *)s, eh); 3723 process_xterm_seq (arg, s, eh);
3696 free (s); 3724 free (s);
3697 } 3725 }
3698 } 3726 }
3699} 3727}
3700 3728
3701void 3729void
3702rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3730rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3703{ 3731{
3704 if (str[0] == '?' && !str[1]) 3732 if (str[0] == '?' && !str[1])
3705 { 3733 {
3706 unsigned short r, g, b; 3734 unsigned short r, g, b;
3707 pix_colors_focused[color].get (display, r, g, b); 3735 pix_colors_focused[color].get (display, r, g, b);
… …
3713 3741
3714/* 3742/*
3715 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3743 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3716 */ 3744 */
3717void 3745void
3718rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3746rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3719{ 3747{
3720 int changed = 0; 3748 int changed = 0;
3721 int color; 3749 int color;
3722 char *buf, *name; 3750 char *buf, *name;
3723 bool query = str[0] == '?' && !str[1]; 3751 bool query = str[0] == '?' && !str[1];
… …
3930 } 3958 }
3931 break; 3959 break;
3932 3960
3933 case URxvt_view_up: 3961 case URxvt_view_up:
3934 case URxvt_view_down: 3962 case URxvt_view_down:
3963 {
3935 int lines = atoi (str); 3964 int lines = atoi (str);
3936 3965
3937 if (lines) 3966 if (lines)
3938 scr_page (op == URxvt_view_up ? UP : DN, lines); 3967 scr_page (op == URxvt_view_up ? UP : DN, lines);
3939 else 3968 else
3940 {
3941 scr_erase_savelines (); 3969 scr_erase_savelines ();
3942 } 3970 }
3943 3971
3972 break;
3973#endif
3974
3975#if ENABLE_PERL
3976 case URxvt_perl:
3977 if (PERL_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END)))
3978 ; // no responses yet
3944 break; 3979 break;
3945#endif 3980#endif
3946 } 3981 }
3947} 3982}
3948/*----------------------------------------------------------------------*/ 3983/*----------------------------------------------------------------------*/
… …
4064 if (mode) 4099 if (mode)
4065 SET_OPTION (Opt_intensityStyles); 4100 SET_OPTION (Opt_intensityStyles);
4066 else 4101 else
4067 CLR_OPTION (Opt_intensityStyles); 4102 CLR_OPTION (Opt_intensityStyles);
4068 4103
4069 want_refresh = 1; 4104 scr_touch (true);
4070 want_full_refresh = 1;
4071 break; 4105 break;
4072#endif 4106#endif
4073 case 1048: /* alternative cursor save */ 4107 case 1048: /* alternative cursor save */
4074 case 1049: 4108 case 1049:
4075 if (OPTION (Opt_secondaryScreen)) 4109 if (OPTION (Opt_secondaryScreen))
… …
4361 */ 4395 */
4362void 4396void
4363rxvt_term::tt_printf (const char *fmt,...) 4397rxvt_term::tt_printf (const char *fmt,...)
4364{ 4398{
4365 va_list arg_ptr; 4399 va_list arg_ptr;
4366 unsigned char buf[256]; 4400 char buf[256];
4367 4401
4368 va_start (arg_ptr, fmt); 4402 va_start (arg_ptr, fmt);
4369 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4403 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4370 va_end (arg_ptr); 4404 va_end (arg_ptr);
4371 tt_write (buf, strlen (buf)); 4405 tt_write (buf, strlen (buf));
… …
4376 * or generated by us in response to a query ESC sequence. 4410 * or generated by us in response to a query ESC sequence.
4377 */ 4411 */
4378const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4412const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4379 4413
4380void 4414void
4381rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4415rxvt_term::tt_write (const char *data, unsigned int len)
4382{ 4416{
4383 if (v_buflen == 0) 4417 if (v_buflen == 0)
4384 { 4418 {
4385 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4419 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4386 4420
… …
4389 4423
4390 data += written; 4424 data += written;
4391 len -= written; 4425 len -= written;
4392 } 4426 }
4393 4427
4394 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4428 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4395 4429
4396 memcpy (v_buffer + v_buflen, data, len); 4430 memcpy (v_buffer + v_buflen, data, len);
4397 v_buflen += len; 4431 v_buflen += len;
4398 4432
4399 pty_ev.set (EVENT_READ | EVENT_WRITE); 4433 pty_ev.set (EVENT_READ | EVENT_WRITE);

Diff Legend

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