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.239 by root, Fri Jan 6 03:02:22 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;
… …
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
… …
985 SET_LOCALE (locale); 1025 SET_LOCALE (locale);
986 1026
987 display->flush (); 1027 display->flush ();
988 1028
989 if (want_refresh && !flush_ev.active) 1029 if (want_refresh && !flush_ev.active)
990 flush_ev.start (NOW + 0.01); 1030 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
991} 1031}
992 1032
993void 1033void
994rxvt_term::flush_cb (time_watcher &w) 1034rxvt_term::flush_cb (time_watcher &w)
995{ 1035{
… …
1070 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1110 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1071 } 1111 }
1072} 1112}
1073#endif 1113#endif
1074 1114
1115#if HAVE_SCHED_YIELD
1116static struct event_handler
1117{
1118 check_watcher cw_yield;
1119
1120 void yield (check_watcher &w)
1121 {
1122 sched_yield ();
1123 w.stop ();
1124 }
1125
1126 event_handler ()
1127 : cw_yield (this, &event_handler::yield)
1128 {
1129 }
1130} event_handler;
1131#endif
1132
1075bool 1133bool
1076rxvt_term::pty_fill () 1134rxvt_term::pty_fill ()
1077{ 1135{
1078 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1136 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1079 1137
1080 if (CBUFSIZ == n) 1138 if (CBUFSIZ == n)
1081 { 1139 {
1082 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");
1083 n = 0; 1141 n = 0;
1084 } 1142 }
1085 1143
1086 memmove (cmdbuf_base, cmdbuf_ptr, n); 1144 memmove (cmdbuf_base, cmdbuf_ptr, n);
1087 cmdbuf_ptr = cmdbuf_base; 1145 cmdbuf_ptr = cmdbuf_base;
… …
1095 return true; 1153 return true;
1096 } 1154 }
1097 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1155 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1098 { 1156 {
1099#if HAVE_SCHED_YIELD 1157#if HAVE_SCHED_YIELD
1100 sched_yield (); 1158 if (display->is_local)
1159 event_handler.cw_yield.start ();
1101#endif 1160#endif
1102 } 1161 }
1103 else 1162 else
1104 { 1163 {
1105 pty_ev.stop (); 1164 pty_ev.stop ();
… …
1681{ 1740{
1682 if (!focus) 1741 if (!focus)
1683 { 1742 {
1684 focus = 1; 1743 focus = 1;
1685 want_refresh = 1; 1744 want_refresh = 1;
1745
1746 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1747
1686#if USE_XIM 1748#if USE_XIM
1687 if (Input_Context != NULL) 1749 if (Input_Context != NULL)
1688 { 1750 {
1689 IMSetStatusPosition (); 1751 IMSetStatusPosition ();
1690 XSetICFocus (Input_Context); 1752 XSetICFocus (Input_Context);
… …
1710 if (focus) 1772 if (focus)
1711 { 1773 {
1712 focus = 0; 1774 focus = 0;
1713 want_refresh = 1; 1775 want_refresh = 1;
1714 1776
1777 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1778
1715#if ENABLE_FRILLS || ISO_14755 1779#if ENABLE_FRILLS || ISO_14755
1780 if (iso14755buf)
1781 {
1716 iso14755buf = 0; 1782 iso14755buf = 0;
1717#endif
1718#if ENABLE_OVERLAY 1783# if ENABLE_OVERLAY
1719 scr_overlay_off (); 1784 scr_overlay_off ();
1785# endif
1786 }
1720#endif 1787#endif
1721#if USE_XIM 1788#if USE_XIM
1722 if (Input_Context != NULL) 1789 if (Input_Context != NULL)
1723 XUnsetICFocus (Input_Context); 1790 XUnsetICFocus (Input_Context);
1724#endif 1791#endif
… …
1768rxvt_term::button_press (XButtonEvent &ev) 1835rxvt_term::button_press (XButtonEvent &ev)
1769{ 1836{
1770 int reportmode = 0, clickintime; 1837 int reportmode = 0, clickintime;
1771 1838
1772 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1839 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1840
1773 if (!bypass_keystate) 1841 if (!bypass_keystate)
1774 reportmode = !! (priv_modes & PrivMode_mouse_report); 1842 reportmode = !! (priv_modes & PrivMode_mouse_report);
1775 1843
1776 /* 1844 /*
1777 * VT window processing of button press 1845 * VT window processing of button press
… …
1826 else 1894 else
1827 { 1895 {
1828 if (ev.button != MEvent.button) 1896 if (ev.button != MEvent.button)
1829 MEvent.clicks = 0; 1897 MEvent.clicks = 0;
1830 1898
1899 if (!HOOK_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END)))
1831 switch (ev.button) 1900 switch (ev.button)
1832 { 1901 {
1833 case Button1: 1902 case Button1:
1834 /* allow meta + click to select rectangular areas */ 1903 /* allow meta + click to select rectangular areas */
1835 /* should be done in screen.C */ 1904 /* should be done in screen.C */
1836#if ENABLE_FRILLS 1905#if ENABLE_FRILLS
1837 selection.rect = !!(ev.state & ModMetaMask); 1906 selection.rect = !!(ev.state & ModMetaMask);
1838#else 1907#else
1839 selection.rect = false; 1908 selection.rect = false;
1840#endif 1909#endif
1841 1910
1842 /* allow shift+left click to extend selection */ 1911 /* allow shift+left click to extend selection */
1843 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1912 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1844 { 1913 {
1845 if (MEvent.button == Button1 && clickintime) 1914 if (MEvent.button == Button1 && clickintime)
1846 selection_rotate (ev.x, ev.y); 1915 selection_rotate (ev.x, ev.y);
1847 else 1916 else
1848 selection_extend (ev.x, ev.y, 1); 1917 selection_extend (ev.x, ev.y, 1);
1849 } 1918 }
1850 else 1919 else
1851 { 1920 {
1852 if (MEvent.button == Button1 && clickintime) 1921 if (MEvent.button == Button1 && clickintime)
1853 MEvent.clicks++; 1922 MEvent.clicks++;
1854 else 1923 else
1855 MEvent.clicks = 1; 1924 MEvent.clicks = 1;
1856 1925
1857 selection_click (MEvent.clicks, ev.x, ev.y); 1926 selection_click (MEvent.clicks, ev.x, ev.y);
1858 } 1927 }
1859 1928
1860 MEvent.button = Button1; 1929 MEvent.button = Button1;
1861 break; 1930 break;
1862 1931
1863 case Button3: 1932 case Button3:
1864 if (MEvent.button == Button3 && clickintime) 1933 if (MEvent.button == Button3 && clickintime)
1865 selection_rotate (ev.x, ev.y); 1934 selection_rotate (ev.x, ev.y);
1866 else 1935 else
1867 selection_extend (ev.x, ev.y, 1); 1936 selection_extend (ev.x, ev.y, 1);
1868 1937
1869 MEvent.button = Button3; 1938 MEvent.button = Button3;
1870 break; 1939 break;
1871 } 1940 }
1872 } 1941 }
1873 1942
1874 MEvent.time = ev.time; 1943 MEvent.time = ev.time;
1875 return; 1944 return;
1876 } 1945 }
1877 1946
… …
2641bool 2710bool
2642rxvt_term::cmd_parse () 2711rxvt_term::cmd_parse ()
2643{ 2712{
2644 bool flag = false; 2713 bool flag = false;
2645 unicode_t ch = NOCHAR; 2714 unicode_t ch = NOCHAR;
2646 unsigned char *seq_begin; // remember start of esc-sequence here 2715 char *seq_begin; // remember start of esc-sequence here
2647 2716
2648 for (;;) 2717 for (;;)
2649 { 2718 {
2650 if (ch == NOCHAR) 2719 if (ch == NOCHAR)
2651 { 2720 {
2652 seq_begin = cmdbuf_ptr; 2721 seq_begin = cmdbuf_ptr;
2653 ch = next_char (); 2722 ch = next_char ();
2654 }
2655 2723
2656 if (ch == NOCHAR) // TODO: improve 2724 if (ch == NOCHAR)
2657 break; 2725 break;
2726 }
2658 2727
2659 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)
2660 { 2729 {
2661 if (!seen_input) 2730 if (!seen_input)
2662 { 2731 {
… …
2695 2764
2696 if (!OPTION (Opt_jumpScroll) 2765 if (!OPTION (Opt_jumpScroll)
2697 || (refresh_count >= refresh_limit * (nrow - 1))) 2766 || (refresh_count >= refresh_limit * (nrow - 1)))
2698 { 2767 {
2699 refreshnow = true; 2768 refreshnow = true;
2769 refresh_count = 0;
2700 ch = NOCHAR; 2770 ch = NOCHAR;
2701 break; 2771 break;
2702 } 2772 }
2703 2773
2704 // scr_add_lines only works for nlines <= nrow - 1. 2774 // scr_add_lines only works for nlines <= nrow - 1.
2705 if (nlines >= nrow - 1) 2775 if (nlines >= nrow - 1)
2706 { 2776 {
2777 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END)))
2707 scr_add_lines (buf, nlines, str - buf); 2778 scr_add_lines (buf, nlines, str - buf);
2779
2708 nlines = 0; 2780 nlines = 0;
2709 str = buf; 2781 str = buf;
2710 eol = str + min (ncol, UBUFSIZ); 2782 eol = str + min (ncol, UBUFSIZ);
2711 } 2783 }
2712 2784
… …
2725 2797
2726 seq_begin = cmdbuf_ptr; 2798 seq_begin = cmdbuf_ptr;
2727 ch = next_char (); 2799 ch = next_char ();
2728 } 2800 }
2729 2801
2802 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END)))
2730 scr_add_lines (buf, nlines, str - buf); 2803 scr_add_lines (buf, nlines, str - buf);
2731 2804
2732 /* 2805 /*
2733 * 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
2734 * 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.
2735 * the number of pages between refreshes is refresh_limit, which 2808 * the number of pages between refreshes is refresh_limit, which
… …
2741 refresh_limit++; 2814 refresh_limit++;
2742 else 2815 else
2743 { 2816 {
2744 flag = true; 2817 flag = true;
2745 scr_refresh (refresh_type); 2818 scr_refresh (refresh_type);
2819 flush_ev.stop ();
2746 } 2820 }
2747 } 2821 }
2748 2822
2749 } 2823 }
2750 else 2824 else
… …
2781rxvt_term::next_char () 2855rxvt_term::next_char ()
2782{ 2856{
2783 while (cmdbuf_ptr < cmdbuf_endp) 2857 while (cmdbuf_ptr < cmdbuf_endp)
2784 { 2858 {
2785 // assume 7-bit to be ascii ALWAYS 2859 // assume 7-bit to be ascii ALWAYS
2786 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2860 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2787 return *cmdbuf_ptr++; 2861 return *cmdbuf_ptr++;
2788 2862
2789 wchar_t wc; 2863 wchar_t wc;
2790 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);
2791 2865
2792 if (len == (size_t)-2) 2866 if (len == (size_t)-2)
2793 { 2867 {
2794 // the mbstate stores incomplete sequences. didn't know this :/ 2868 // the mbstate stores incomplete sequences. didn't know this :/
2795 cmdbuf_ptr = cmdbuf_endp; 2869 cmdbuf_ptr = cmdbuf_endp;
… …
2934 case C0_ESC: 3008 case C0_ESC:
2935 process_escape_seq (); 3009 process_escape_seq ();
2936 break; 3010 break;
2937 case C0_ENQ: /* terminal Status */ 3011 case C0_ENQ: /* terminal Status */
2938 if (rs[Rs_answerbackstring]) 3012 if (rs[Rs_answerbackstring])
2939 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3013 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2940 (unsigned int)strlen (rs[Rs_answerbackstring]));
2941 else 3014 else
2942 tt_write ((unsigned char *)VT100_ANS, 3015 tt_write (VT100_ANS, strlen (VT100_ANS));
2943 (unsigned int)strlen (VT100_ANS));
2944 break; 3016 break;
2945 case C0_BEL: /* bell */ 3017 case C0_BEL: /* bell */
2946 scr_bell (); 3018 scr_bell ();
2947 break; 3019 break;
2948 case C0_BS: /* backspace */ 3020 case C0_BS: /* backspace */
… …
3136 process_dcs_seq (); 3208 process_dcs_seq ();
3137 break; 3209 break;
3138 3210
3139 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3211 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3140 case C1_SCI: /* ESC Z */ 3212 case C1_SCI: /* ESC Z */
3141 tt_write ((const unsigned char *)ESCZ_ANSWER, 3213 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3142 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3143 break; /* steal obsolete ESC [ c */ 3214 break; /* steal obsolete ESC [ c */
3144 3215
3145 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3216 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3146 case C1_CSI: /* ESC [ */ 3217 case C1_CSI: /* ESC [ */
3147 process_csi_seq (); 3218 process_csi_seq ();
… …
3391 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3462 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3392 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3463 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3393 break; 3464 break;
3394 3465
3395 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3466 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3396 tt_write ((const unsigned char *)VT100_ANS, 3467 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3397 (unsigned int) (sizeof (VT100_ANS) - 1));
3398 break; 3468 break;
3399 3469
3400 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3470 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3401 process_sgr_mode (nargs, arg); 3471 process_sgr_mode (nargs, arg);
3402 break; 3472 break;
… …
3604/*----------------------------------------------------------------------*/ 3674/*----------------------------------------------------------------------*/
3605/* 3675/*
3606 * get input up until STRING TERMINATOR (or BEL) 3676 * get input up until STRING TERMINATOR (or BEL)
3607 * ends_how is terminator used. returned input must be free()'d 3677 * ends_how is terminator used. returned input must be free()'d
3608 */ 3678 */
3609unsigned char * 3679char *
3610rxvt_term::get_to_st (unicode_t &ends_how) 3680rxvt_term::get_to_st (unicode_t &ends_how)
3611{ 3681{
3612 unicode_t ch; 3682 unicode_t ch;
3613 bool seen_esc = false; 3683 bool seen_esc = false;
3614 unsigned int n = 0; 3684 unsigned int n = 0;
… …
3647 3717
3648 string[n++] = '\0'; 3718 string[n++] = '\0';
3649 3719
3650 ends_how = (ch == 0x5c ? C0_ESC : ch); 3720 ends_how = (ch == 0x5c ? C0_ESC : ch);
3651 3721
3652 return (unsigned char *)rxvt_wcstombs (string); 3722 return rxvt_wcstombs (string);
3653} 3723}
3654 3724
3655/*----------------------------------------------------------------------*/ 3725/*----------------------------------------------------------------------*/
3656/* 3726/*
3657 * 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)'
3658 */ 3728 */
3659void 3729void
3660rxvt_term::process_dcs_seq () 3730rxvt_term::process_dcs_seq ()
3661{ 3731{
3662 unsigned char *s; 3732 char *s;
3663 unicode_t eh; 3733 unicode_t eh;
3664 3734
3665 /* 3735 /*
3666 * Not handled yet 3736 * Not handled yet
3667 */ 3737 */
… …
3686 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3756 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3687 arg = arg * 10 + (ch - '0'); 3757 arg = arg * 10 + (ch - '0');
3688 3758
3689 if (ch == ';') 3759 if (ch == ';')
3690 { 3760 {
3691 unsigned char *s = get_to_st (eh); 3761 char *s = get_to_st (eh);
3692 3762
3693 if (s) 3763 if (s)
3694 { 3764 {
3695 process_xterm_seq (arg, (char *)s, eh); 3765 process_xterm_seq (arg, s, eh);
3696 free (s); 3766 free (s);
3697 } 3767 }
3698 } 3768 }
3699} 3769}
3700 3770
3701void 3771void
3702rxvt_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)
3703{ 3773{
3704 if (str[0] == '?' && !str[1]) 3774 if (str[0] == '?' && !str[1])
3705 { 3775 {
3706 unsigned short r, g, b; 3776 unsigned short r, g, b;
3707 pix_colors_focused[color].get (display, r, g, b); 3777 pix_colors_focused[color].get (display, r, g, b);
… …
3713 3783
3714/* 3784/*
3715 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3785 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3716 */ 3786 */
3717void 3787void
3718rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3788rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3719{ 3789{
3720 int changed = 0; 3790 int changed = 0;
3721 int color; 3791 int color;
3722 char *buf, *name; 3792 char *buf, *name;
3723 bool query = str[0] == '?' && !str[1]; 3793 bool query = str[0] == '?' && !str[1];
… …
3930 } 4000 }
3931 break; 4001 break;
3932 4002
3933 case URxvt_view_up: 4003 case URxvt_view_up:
3934 case URxvt_view_down: 4004 case URxvt_view_down:
4005 {
3935 int lines = atoi (str); 4006 int lines = atoi (str);
3936 4007
3937 if (lines) 4008 if (lines)
3938 scr_page (op == URxvt_view_up ? UP : DN, lines); 4009 scr_page (op == URxvt_view_up ? UP : DN, lines);
3939 else 4010 else
3940 {
3941 scr_erase_savelines (); 4011 scr_erase_savelines ();
3942 } 4012 }
3943 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
3944 break; 4021 break;
3945#endif 4022#endif
3946 } 4023 }
3947} 4024}
3948/*----------------------------------------------------------------------*/ 4025/*----------------------------------------------------------------------*/
… …
4064 if (mode) 4141 if (mode)
4065 SET_OPTION (Opt_intensityStyles); 4142 SET_OPTION (Opt_intensityStyles);
4066 else 4143 else
4067 CLR_OPTION (Opt_intensityStyles); 4144 CLR_OPTION (Opt_intensityStyles);
4068 4145
4069 want_refresh = 1; 4146 scr_touch (true);
4070 want_full_refresh = 1;
4071 break; 4147 break;
4072#endif 4148#endif
4073 case 1048: /* alternative cursor save */ 4149 case 1048: /* alternative cursor save */
4074 case 1049: 4150 case 1049:
4075 if (OPTION (Opt_secondaryScreen)) 4151 if (OPTION (Opt_secondaryScreen))
… …
4306 scr_color (Color_bg, Color_bg); 4382 scr_color (Color_bg, Color_bg);
4307 break; 4383 break;
4308 4384
4309 //case 50: // not variable spacing 4385 //case 50: // not variable spacing
4310 4386
4311#ifndef NO_BRIGHTCOLOR 4387#if ENABLE_FRILLS
4312 case 90: 4388 case 90:
4313 case 91: /* set bright fg color */ 4389 case 91: /* set bright fg color */
4314 case 92: 4390 case 92:
4315 case 93: 4391 case 93:
4316 case 94: 4392 case 94:
… …
4361 */ 4437 */
4362void 4438void
4363rxvt_term::tt_printf (const char *fmt,...) 4439rxvt_term::tt_printf (const char *fmt,...)
4364{ 4440{
4365 va_list arg_ptr; 4441 va_list arg_ptr;
4366 unsigned char buf[256]; 4442 char buf[256];
4367 4443
4368 va_start (arg_ptr, fmt); 4444 va_start (arg_ptr, fmt);
4369 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4445 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4370 va_end (arg_ptr); 4446 va_end (arg_ptr);
4371 tt_write (buf, strlen (buf)); 4447 tt_write (buf, strlen (buf));
… …
4376 * or generated by us in response to a query ESC sequence. 4452 * or generated by us in response to a query ESC sequence.
4377 */ 4453 */
4378const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4454const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4379 4455
4380void 4456void
4381rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4457rxvt_term::tt_write (const char *data, unsigned int len)
4382{ 4458{
4459 if (pty.pty < 0)
4460 return;
4461
4383 if (v_buflen == 0) 4462 if (v_buflen == 0)
4384 { 4463 {
4385 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4464 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4386 4465
4387 if ((unsigned int)written == len) 4466 if ((unsigned int)written == len)
… …
4389 4468
4390 data += written; 4469 data += written;
4391 len -= written; 4470 len -= written;
4392 } 4471 }
4393 4472
4394 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4473 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4395 4474
4396 memcpy (v_buffer + v_buflen, data, len); 4475 memcpy (v_buffer + v_buflen, data, len);
4397 v_buflen += len; 4476 v_buflen += len;
4398 4477
4399 pty_ev.set (EVENT_READ | EVENT_WRITE); 4478 pty_ev.set (EVENT_READ | EVENT_WRITE);

Diff Legend

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