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.219 by root, Sat Dec 31 17:16:17 2005 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"
53
54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
56//# include <sched.h>
57#endif
52 58
53#ifdef KEYSYM_RESOURCE 59#ifdef KEYSYM_RESOURCE
54# include "keyboard.h" 60# include "keyboard.h"
55#endif 61#endif
56 62
… …
155 } 161 }
156 162
157 x--; 163 x--;
158 } 164 }
159} 165}
160#endif
161 166
162void 167void
163rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y) 168rxvt_term::iso14755_51 (unicode_t ch, rend_t r, int x, int y)
164{ 169{
165#if ENABLE_OVERLAY
166 rxvt_fontset *fs = FONTSET (r); 170 rxvt_fontset *fs = FONTSET (r);
167 rxvt_font *f = (*fs)[fs->find_font (ch)]; 171 rxvt_font *f = (*fs)[fs->find_font (ch)];
168 wchar_t *chr, *alloc, ch2, *fname; 172 wchar_t *chr, *alloc, ch2, *fname;
169 int len; 173 int len;
170 174
… …
238 242
239# if ENABLE_COMBINING 243# if ENABLE_COMBINING
240 if (alloc) 244 if (alloc)
241 delete [] alloc; 245 delete [] alloc;
242# endif 246# endif
243#endif
244} 247}
248#endif
245 249
246void 250void
247rxvt_term::commit_iso14755 () 251rxvt_term::commit_iso14755 ()
248{ 252{
249 wchar_t ch[2]; 253 wchar_t ch[2];
… …
264 mb[0] = ch[0]; 268 mb[0] = ch[0];
265 len = 1; 269 len = 1;
266 } 270 }
267 271
268 if (len > 0) 272 if (len > 0)
269 tt_write ((unsigned char *)mb, len); 273 tt_write (mb, len);
270 else 274 else
271 scr_bell (); 275 scr_bell ();
272 } 276 }
273 277
274 iso14755buf = 0; 278 iso14755buf = 0;
… …
302 KeySym keysym; 306 KeySym keysym;
303#ifdef DEBUG_CMD 307#ifdef DEBUG_CMD
304 static int debug_key = 1; /* accessible by a debugger only */ 308 static int debug_key = 1; /* accessible by a debugger only */
305#endif 309#endif
306 int valid_keysym; 310 int valid_keysym;
307 unsigned char kbuf[KBUFSZ]; 311 char kbuf[KBUFSZ];
308 312
309 /* 313 /*
310 * 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
311 * escape sequence to toggle the Keypad. 315 * escape sequence to toggle the Keypad.
312 * 316 *
… …
330 Status status_return; 334 Status status_return;
331 335
332#if 0 336#if 0
333#ifdef X_HAVE_UTF8_STRING 337#ifdef X_HAVE_UTF8_STRING
334 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
335 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 339 len = Xutf8LookupString (Input_Context, &ev, kbuf,
336 KBUFSZ, &keysym, &status_return); 340 KBUFSZ, &keysym, &status_return);
337 else 341 else
338#endif 342#endif
339#endif 343#endif
340 { 344 {
… …
377 || status_return == XLookupBoth; 381 || status_return == XLookupBoth;
378 } 382 }
379 else 383 else
380#endif 384#endif
381 { 385 {
382 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 386 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
383 valid_keysym = keysym != NoSymbol; 387 valid_keysym = keysym != NoSymbol;
384 } 388 }
385 389
386 if (valid_keysym) 390 if (valid_keysym)
387 { 391 {
… …
851 { 855 {
852#ifdef META8_OPTION 856#ifdef META8_OPTION
853 /* set 8-bit on */ 857 /* set 8-bit on */
854 if (meta && (meta_char == 0x80)) 858 if (meta && (meta_char == 0x80))
855 { 859 {
856 unsigned char *ch; 860 char *ch;
857 861
858 for (ch = kbuf; ch < kbuf + len; ch++) 862 for (ch = kbuf; ch < kbuf + len; ch++)
859 *ch |= 0x80; 863 *ch |= 0x80;
860 864
861 meta = 0; 865 meta = 0;
862 } 866 }
863#endif 867#endif
864 /* nil */ ; 868 /* nil */ ;
865 } 869 }
866 } 870 }
871
872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_STRING_LEN, kbuf, len, DT_END)))
873 return;
867 874
868 if (len <= 0) 875 if (len <= 0)
869 return; /* not mapped */ 876 return; /* not mapped */
870 877
871 if (OPTION (Opt_scrollTtyKeypress)) 878 if (OPTION (Opt_scrollTtyKeypress))
… …
894#ifdef META8_OPTION 901#ifdef META8_OPTION
895 && meta_char == C0_ESC 902 && meta_char == C0_ESC
896#endif 903#endif
897 ) 904 )
898 { 905 {
899 const unsigned char ch = C0_ESC; 906 const char ch = C0_ESC;
900 tt_write (&ch, 1); 907 tt_write (&ch, 1);
901 } 908 }
902 909
903#if defined(DEBUG_CMD) 910#if defined(DEBUG_CMD)
904 /* Display keyboard buffer contents */ 911 /* Display keyboard buffer contents */
… …
916 923
917#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
918/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
919/* attempt to `write' count to the input buffer */ 926/* attempt to `write' count to the input buffer */
920unsigned int 927unsigned int
921rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 928rxvt_term::cmd_write (const char *str, unsigned int count)
922{ 929{
923 unsigned int n, s; 930 unsigned int n, s;
924 931
925 n = cmdbuf_ptr - cmdbuf_base; 932 n = cmdbuf_ptr - cmdbuf_base;
926 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 933 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
963 } 970 }
964#endif 971#endif
965 972
966 if (want_refresh) 973 if (want_refresh)
967 { 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
968 scr_refresh (refresh_type); 1014 scr_refresh (refresh_type);
969 scrollbar_show (1); 1015 scrollbar_show (1);
970#ifdef USE_XIM 1016#ifdef USE_XIM
971 IMSendSpot (); 1017 IMSendSpot ();
972#endif 1018#endif
… …
982 SET_LOCALE (locale); 1028 SET_LOCALE (locale);
983 1029
984 display->flush (); 1030 display->flush ();
985 1031
986 if (want_refresh && !flush_ev.active) 1032 if (want_refresh && !flush_ev.active)
987 flush_ev.start (NOW + 0.01); 1033 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
988} 1034}
989 1035
990void 1036void
991rxvt_term::flush_cb (time_watcher &w) 1037rxvt_term::flush_cb (time_watcher &w)
992{ 1038{
… …
1067 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1113 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1068 } 1114 }
1069} 1115}
1070#endif 1116#endif
1071 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
1072bool 1136bool
1073rxvt_term::pty_fill () 1137rxvt_term::pty_fill ()
1074{ 1138{
1075 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1139 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1076 1140
1077 if (CBUFSIZ == n) 1141 if (CBUFSIZ == n)
1078 { 1142 {
1079 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");
1080 n = 0; 1144 n = 0;
1081 } 1145 }
1082 1146
1083 memmove (cmdbuf_base, cmdbuf_ptr, n); 1147 memmove (cmdbuf_base, cmdbuf_ptr, n);
1084 cmdbuf_ptr = cmdbuf_base; 1148 cmdbuf_ptr = cmdbuf_base;
1085 cmdbuf_endp = cmdbuf_ptr + n; 1149 cmdbuf_endp = cmdbuf_ptr + n;
1086 1150
1087 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1151 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
1088 1152
1089 if (n > 0) 1153 if (r > 0)
1090 { 1154 {
1091 cmdbuf_endp += n; 1155 cmdbuf_endp += r;
1092 return true; 1156 return true;
1093 } 1157 }
1094 else if ((n < 0 && errno != EAGAIN && errno != EINTR) || n == 0) 1158 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1159 {
1160#if HAVE_SCHED_YIELD
1161 if (display->is_local)
1162 event_handler.cw_yield.start ();
1163#endif
1164 }
1165 else
1095 { 1166 {
1096 pty_ev.stop (); 1167 pty_ev.stop ();
1097 1168
1098 if (!OPTION (Opt_hold)) 1169 if (!OPTION (Opt_hold))
1099 destroy (); 1170 destroy ();
… …
1567 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1638 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1568 break; 1639 break;
1569 1640
1570 if (ev.xany.window == vt) 1641 if (ev.xany.window == vt)
1571 { 1642 {
1643 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1644 ; // nop
1572 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1645 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1573 { 1646 {
1574 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1647 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1575 ; 1648 ;
1576 1649
1577 XQueryPointer (disp, vt, 1650 XQueryPointer (disp, vt,
… …
1672{ 1745{
1673 if (!focus) 1746 if (!focus)
1674 { 1747 {
1675 focus = 1; 1748 focus = 1;
1676 want_refresh = 1; 1749 want_refresh = 1;
1750
1751 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1752
1677#if USE_XIM 1753#if USE_XIM
1678 if (Input_Context != NULL) 1754 if (Input_Context != NULL)
1679 { 1755 {
1680 IMSetStatusPosition (); 1756 IMSetStatusPosition ();
1681 XSetICFocus (Input_Context); 1757 XSetICFocus (Input_Context);
… …
1701 if (focus) 1777 if (focus)
1702 { 1778 {
1703 focus = 0; 1779 focus = 0;
1704 want_refresh = 1; 1780 want_refresh = 1;
1705 1781
1782 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1783
1706#if ENABLE_FRILLS || ISO_14755 1784#if ENABLE_FRILLS || ISO_14755
1785 if (iso14755buf)
1786 {
1707 iso14755buf = 0; 1787 iso14755buf = 0;
1708#endif
1709#if ENABLE_OVERLAY 1788# if ENABLE_OVERLAY
1710 scr_overlay_off (); 1789 scr_overlay_off ();
1790# endif
1791 }
1711#endif 1792#endif
1712#if USE_XIM 1793#if USE_XIM
1713 if (Input_Context != NULL) 1794 if (Input_Context != NULL)
1714 XUnsetICFocus (Input_Context); 1795 XUnsetICFocus (Input_Context);
1715#endif 1796#endif
… …
1759rxvt_term::button_press (XButtonEvent &ev) 1840rxvt_term::button_press (XButtonEvent &ev)
1760{ 1841{
1761 int reportmode = 0, clickintime; 1842 int reportmode = 0, clickintime;
1762 1843
1763 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1844 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1845
1764 if (!bypass_keystate) 1846 if (!bypass_keystate)
1765 reportmode = !! (priv_modes & PrivMode_mouse_report); 1847 reportmode = !! (priv_modes & PrivMode_mouse_report);
1766 1848
1767 /* 1849 /*
1768 * VT window processing of button press 1850 * VT window processing of button press
… …
1817 else 1899 else
1818 { 1900 {
1819 if (ev.button != MEvent.button) 1901 if (ev.button != MEvent.button)
1820 MEvent.clicks = 0; 1902 MEvent.clicks = 0;
1821 1903
1904 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1822 switch (ev.button) 1905 switch (ev.button)
1823 { 1906 {
1824 case Button1: 1907 case Button1:
1825 /* allow meta + click to select rectangular areas */ 1908 /* allow meta + click to select rectangular areas */
1826 /* should be done in screen.C */ 1909 /* should be done in screen.C */
1827#if ENABLE_FRILLS 1910#if ENABLE_FRILLS
1828 selection.rect = !!(ev.state & ModMetaMask); 1911 selection.rect = !!(ev.state & ModMetaMask);
1829#else 1912#else
1830 selection.rect = false; 1913 selection.rect = false;
1831#endif 1914#endif
1832 1915
1833 /* allow shift+left click to extend selection */ 1916 /* allow shift+left click to extend selection */
1834 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1917 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1835 { 1918 {
1836 if (MEvent.button == Button1 && clickintime) 1919 if (MEvent.button == Button1 && clickintime)
1837 selection_rotate (ev.x, ev.y); 1920 selection_rotate (ev.x, ev.y);
1838 else 1921 else
1839 selection_extend (ev.x, ev.y, 1); 1922 selection_extend (ev.x, ev.y, 1);
1840 } 1923 }
1841 else 1924 else
1842 { 1925 {
1843 if (MEvent.button == Button1 && clickintime) 1926 if (MEvent.button == Button1 && clickintime)
1844 MEvent.clicks++; 1927 MEvent.clicks++;
1845 else 1928 else
1846 MEvent.clicks = 1; 1929 MEvent.clicks = 1;
1847 1930
1848 selection_click (MEvent.clicks, ev.x, ev.y); 1931 selection_click (MEvent.clicks, ev.x, ev.y);
1849 } 1932 }
1850 1933
1851 MEvent.button = Button1; 1934 MEvent.button = Button1;
1852 break; 1935 break;
1853 1936
1854 case Button3: 1937 case Button3:
1855 if (MEvent.button == Button3 && clickintime) 1938 if (MEvent.button == Button3 && clickintime)
1856 selection_rotate (ev.x, ev.y); 1939 selection_rotate (ev.x, ev.y);
1857 else 1940 else
1858 selection_extend (ev.x, ev.y, 1); 1941 selection_extend (ev.x, ev.y, 1);
1859 1942
1860 MEvent.button = Button3; 1943 MEvent.button = Button3;
1861 break; 1944 break;
1862 } 1945 }
1863 } 1946 }
1864 1947
1865 MEvent.time = ev.time; 1948 MEvent.time = ev.time;
1866 return; 1949 return;
1867 } 1950 }
1868 1951
… …
2077 */ 2160 */
2078 if (priv_modes & PrivMode_mouse_report 2161 if (priv_modes & PrivMode_mouse_report
2079 && bypass_keystate 2162 && bypass_keystate
2080 && ev.button == Button1 && MEvent.clicks <= 1) 2163 && ev.button == Button1 && MEvent.clicks <= 1)
2081 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;
2082 2168
2083 switch (ev.button) 2169 switch (ev.button)
2084 { 2170 {
2085 case Button1: 2171 case Button1:
2086 case Button3: 2172 case Button3:
… …
2632bool 2718bool
2633rxvt_term::cmd_parse () 2719rxvt_term::cmd_parse ()
2634{ 2720{
2635 bool flag = false; 2721 bool flag = false;
2636 unicode_t ch = NOCHAR; 2722 unicode_t ch = NOCHAR;
2637 unsigned char *seq_begin; // remember start of esc-sequence here 2723 char *seq_begin; // remember start of esc-sequence here
2638 2724
2639 for (;;) 2725 for (;;)
2640 { 2726 {
2641 if (ch == NOCHAR) 2727 if (ch == NOCHAR)
2642 { 2728 {
2643 seq_begin = cmdbuf_ptr; 2729 seq_begin = cmdbuf_ptr;
2644 ch = next_char (); 2730 ch = next_char ();
2645 }
2646 2731
2647 if (ch == NOCHAR) // TODO: improve 2732 if (ch == NOCHAR)
2648 break; 2733 break;
2734 }
2649 2735
2650 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)
2651 { 2737 {
2652 if (!seen_input) 2738 if (!seen_input)
2653 { 2739 {
… …
2686 2772
2687 if (!OPTION (Opt_jumpScroll) 2773 if (!OPTION (Opt_jumpScroll)
2688 || (refresh_count >= refresh_limit * (nrow - 1))) 2774 || (refresh_count >= refresh_limit * (nrow - 1)))
2689 { 2775 {
2690 refreshnow = true; 2776 refreshnow = true;
2777 refresh_count = 0;
2691 ch = NOCHAR; 2778 ch = NOCHAR;
2692 break; 2779 break;
2693 } 2780 }
2694 2781
2695 // scr_add_lines only works for nlines <= nrow - 1. 2782 // scr_add_lines only works for nlines <= nrow - 1.
2696 if (nlines >= nrow - 1) 2783 if (nlines >= nrow - 1)
2697 { 2784 {
2785 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END)))
2698 scr_add_lines (buf, nlines, str - buf); 2786 scr_add_lines (buf, nlines, str - buf);
2787
2699 nlines = 0; 2788 nlines = 0;
2700 str = buf; 2789 str = buf;
2701 eol = str + min (ncol, UBUFSIZ); 2790 eol = str + min (ncol, UBUFSIZ);
2702 } 2791 }
2703 2792
… …
2716 2805
2717 seq_begin = cmdbuf_ptr; 2806 seq_begin = cmdbuf_ptr;
2718 ch = next_char (); 2807 ch = next_char ();
2719 } 2808 }
2720 2809
2810 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END)))
2721 scr_add_lines (buf, nlines, str - buf); 2811 scr_add_lines (buf, nlines, str - buf);
2722 2812
2723 /* 2813 /*
2724 * 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
2725 * 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.
2726 * the number of pages between refreshes is refresh_limit, which 2816 * the number of pages between refreshes is refresh_limit, which
… …
2732 refresh_limit++; 2822 refresh_limit++;
2733 else 2823 else
2734 { 2824 {
2735 flag = true; 2825 flag = true;
2736 scr_refresh (refresh_type); 2826 scr_refresh (refresh_type);
2827 flush_ev.stop ();
2737 } 2828 }
2738 } 2829 }
2739 2830
2740 } 2831 }
2741 else 2832 else
… …
2772rxvt_term::next_char () 2863rxvt_term::next_char ()
2773{ 2864{
2774 while (cmdbuf_ptr < cmdbuf_endp) 2865 while (cmdbuf_ptr < cmdbuf_endp)
2775 { 2866 {
2776 // assume 7-bit to be ascii ALWAYS 2867 // assume 7-bit to be ascii ALWAYS
2777 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2868 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2778 return *cmdbuf_ptr++; 2869 return *cmdbuf_ptr++;
2779 2870
2780 wchar_t wc; 2871 wchar_t wc;
2781 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);
2782 2873
2783 if (len == (size_t)-2) 2874 if (len == (size_t)-2)
2784 { 2875 {
2785 // the mbstate stores incomplete sequences. didn't know this :/ 2876 // the mbstate stores incomplete sequences. didn't know this :/
2786 cmdbuf_ptr = cmdbuf_endp; 2877 cmdbuf_ptr = cmdbuf_endp;
… …
2925 case C0_ESC: 3016 case C0_ESC:
2926 process_escape_seq (); 3017 process_escape_seq ();
2927 break; 3018 break;
2928 case C0_ENQ: /* terminal Status */ 3019 case C0_ENQ: /* terminal Status */
2929 if (rs[Rs_answerbackstring]) 3020 if (rs[Rs_answerbackstring])
2930 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3021 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2931 (unsigned int)strlen (rs[Rs_answerbackstring]));
2932 else 3022 else
2933 tt_write ((unsigned char *)VT100_ANS, 3023 tt_write (VT100_ANS, strlen (VT100_ANS));
2934 (unsigned int)strlen (VT100_ANS));
2935 break; 3024 break;
2936 case C0_BEL: /* bell */ 3025 case C0_BEL: /* bell */
2937 scr_bell (); 3026 scr_bell ();
2938 break; 3027 break;
2939 case C0_BS: /* backspace */ 3028 case C0_BS: /* backspace */
… …
3127 process_dcs_seq (); 3216 process_dcs_seq ();
3128 break; 3217 break;
3129 3218
3130 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3219 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3131 case C1_SCI: /* ESC Z */ 3220 case C1_SCI: /* ESC Z */
3132 tt_write ((const unsigned char *)ESCZ_ANSWER, 3221 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3133 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3134 break; /* steal obsolete ESC [ c */ 3222 break; /* steal obsolete ESC [ c */
3135 3223
3136 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3224 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3137 case C1_CSI: /* ESC [ */ 3225 case C1_CSI: /* ESC [ */
3138 process_csi_seq (); 3226 process_csi_seq ();
… …
3382 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3470 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3383 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3471 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3384 break; 3472 break;
3385 3473
3386 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3474 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3387 tt_write ((const unsigned char *)VT100_ANS, 3475 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3388 (unsigned int) (sizeof (VT100_ANS) - 1));
3389 break; 3476 break;
3390 3477
3391 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3478 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3392 process_sgr_mode (nargs, arg); 3479 process_sgr_mode (nargs, arg);
3393 break; 3480 break;
… …
3595/*----------------------------------------------------------------------*/ 3682/*----------------------------------------------------------------------*/
3596/* 3683/*
3597 * get input up until STRING TERMINATOR (or BEL) 3684 * get input up until STRING TERMINATOR (or BEL)
3598 * ends_how is terminator used. returned input must be free()'d 3685 * ends_how is terminator used. returned input must be free()'d
3599 */ 3686 */
3600unsigned char * 3687char *
3601rxvt_term::get_to_st (unicode_t &ends_how) 3688rxvt_term::get_to_st (unicode_t &ends_how)
3602{ 3689{
3603 unicode_t ch; 3690 unicode_t ch;
3604 bool seen_esc = false; 3691 bool seen_esc = false;
3605 unsigned int n = 0; 3692 unsigned int n = 0;
… …
3638 3725
3639 string[n++] = '\0'; 3726 string[n++] = '\0';
3640 3727
3641 ends_how = (ch == 0x5c ? C0_ESC : ch); 3728 ends_how = (ch == 0x5c ? C0_ESC : ch);
3642 3729
3643 return (unsigned char *)rxvt_wcstombs (string); 3730 return rxvt_wcstombs (string);
3644} 3731}
3645 3732
3646/*----------------------------------------------------------------------*/ 3733/*----------------------------------------------------------------------*/
3647/* 3734/*
3648 * 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)'
3649 */ 3736 */
3650void 3737void
3651rxvt_term::process_dcs_seq () 3738rxvt_term::process_dcs_seq ()
3652{ 3739{
3653 unsigned char *s; 3740 char *s;
3654 unicode_t eh; 3741 unicode_t eh;
3655 3742
3656 /* 3743 /*
3657 * Not handled yet 3744 * Not handled yet
3658 */ 3745 */
… …
3677 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3764 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3678 arg = arg * 10 + (ch - '0'); 3765 arg = arg * 10 + (ch - '0');
3679 3766
3680 if (ch == ';') 3767 if (ch == ';')
3681 { 3768 {
3682 unsigned char *s = get_to_st (eh); 3769 char *s = get_to_st (eh);
3683 3770
3684 if (s) 3771 if (s)
3685 { 3772 {
3686 process_xterm_seq (arg, (char *)s, eh); 3773 process_xterm_seq (arg, s, eh);
3687 free (s); 3774 free (s);
3688 } 3775 }
3689 } 3776 }
3690} 3777}
3691 3778
3692void 3779void
3693rxvt_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)
3694{ 3781{
3695 if (str[0] == '?' && !str[1]) 3782 if (str[0] == '?' && !str[1])
3696 { 3783 {
3697 unsigned short r, g, b; 3784 unsigned short r, g, b;
3698 pix_colors_focused[color].get (display, r, g, b); 3785 pix_colors_focused[color].get (display, r, g, b);
… …
3704 3791
3705/* 3792/*
3706 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3793 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3707 */ 3794 */
3708void 3795void
3709rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3796rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3710{ 3797{
3711 int changed = 0; 3798 int changed = 0;
3712 int color; 3799 int color;
3713 char *buf, *name; 3800 char *buf, *name;
3714 bool query = str[0] == '?' && !str[1]; 3801 bool query = str[0] == '?' && !str[1];
… …
3921 } 4008 }
3922 break; 4009 break;
3923 4010
3924 case URxvt_view_up: 4011 case URxvt_view_up:
3925 case URxvt_view_down: 4012 case URxvt_view_down:
4013 {
3926 int lines = atoi (str); 4014 int lines = atoi (str);
3927 4015
3928 if (lines) 4016 if (lines)
3929 scr_page (op == URxvt_view_up ? UP : DN, lines); 4017 scr_page (op == URxvt_view_up ? UP : DN, lines);
3930 else 4018 else
3931 {
3932 scr_erase_savelines (); 4019 scr_erase_savelines ();
3933 } 4020 }
3934 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
3935 break; 4029 break;
3936#endif 4030#endif
3937 } 4031 }
3938} 4032}
3939/*----------------------------------------------------------------------*/ 4033/*----------------------------------------------------------------------*/
… …
4048 } 4142 }
4049 4143
4050 /* extra handling for values with state unkept */ 4144 /* extra handling for values with state unkept */
4051 switch (arg[i]) 4145 switch (arg[i])
4052 { 4146 {
4147#if ENABLE_STYLES
4148 case 1021:
4149 if (mode)
4150 SET_OPTION (Opt_intensityStyles);
4151 else
4152 CLR_OPTION (Opt_intensityStyles);
4153
4154 scr_touch (true);
4155 break;
4156#endif
4053 case 1048: /* alternative cursor save */ 4157 case 1048: /* alternative cursor save */
4054 case 1049: 4158 case 1049:
4055 if (OPTION (Opt_secondaryScreen)) 4159 if (OPTION (Opt_secondaryScreen))
4056 if (mode == 0) 4160 if (mode == 0)
4057 scr_cursor (RESTORE); 4161 scr_cursor (RESTORE);
… …
4140 if (state) 4244 if (state)
4141 SET_OPTION (Opt_scrollTtyKeypress); 4245 SET_OPTION (Opt_scrollTtyKeypress);
4142 else 4246 else
4143 CLR_OPTION (Opt_scrollTtyKeypress); 4247 CLR_OPTION (Opt_scrollTtyKeypress);
4144 break; 4248 break;
4145#if ENABLE_STYLES
4146 case 1021:
4147 if (state)
4148 SET_OPTION (Opt_intensityStyles);
4149 else
4150 CLR_OPTION (Opt_intensityStyles);
4151#endif
4152 case 1047: /* secondary screen w/ clearing last */ 4249 case 1047: /* secondary screen w/ clearing last */
4153 if (OPTION (Opt_secondaryScreen)) 4250 if (OPTION (Opt_secondaryScreen))
4154 if (current_screen != PRIMARY) 4251 if (current_screen != PRIMARY)
4155 scr_erase_screen (2); 4252 scr_erase_screen (2);
4156 scr_change_screen (state); 4253 scr_change_screen (state);
… …
4293 scr_color (Color_bg, Color_bg); 4390 scr_color (Color_bg, Color_bg);
4294 break; 4391 break;
4295 4392
4296 //case 50: // not variable spacing 4393 //case 50: // not variable spacing
4297 4394
4298#ifndef NO_BRIGHTCOLOR 4395#if ENABLE_FRILLS
4299 case 90: 4396 case 90:
4300 case 91: /* set bright fg color */ 4397 case 91: /* set bright fg color */
4301 case 92: 4398 case 92:
4302 case 93: 4399 case 93:
4303 case 94: 4400 case 94:
… …
4315 case 106: 4412 case 106:
4316 case 107: 4413 case 107:
4317 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4414 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4318 break; 4415 break;
4319#endif 4416#endif
4320
4321 } 4417 }
4322 } 4418 }
4323} 4419}
4324/*}}} */ 4420/*}}} */
4325 4421
… …
4349 */ 4445 */
4350void 4446void
4351rxvt_term::tt_printf (const char *fmt,...) 4447rxvt_term::tt_printf (const char *fmt,...)
4352{ 4448{
4353 va_list arg_ptr; 4449 va_list arg_ptr;
4354 unsigned char buf[256]; 4450 char buf[256];
4355 4451
4356 va_start (arg_ptr, fmt); 4452 va_start (arg_ptr, fmt);
4357 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4453 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4358 va_end (arg_ptr); 4454 va_end (arg_ptr);
4359 tt_write (buf, strlen (buf)); 4455 tt_write (buf, strlen (buf));
… …
4364 * or generated by us in response to a query ESC sequence. 4460 * or generated by us in response to a query ESC sequence.
4365 */ 4461 */
4366const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4462const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4367 4463
4368void 4464void
4369rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4465rxvt_term::tt_write (const char *data, unsigned int len)
4370{ 4466{
4467 if (pty.pty < 0)
4468 return;
4469
4371 if (v_buflen == 0) 4470 if (v_buflen == 0)
4372 { 4471 {
4373 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));
4374 4473
4375 if ((unsigned int)written == len) 4474 if ((unsigned int)written == len)
… …
4377 4476
4378 data += written; 4477 data += written;
4379 len -= written; 4478 len -= written;
4380 } 4479 }
4381 4480
4382 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4481 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4383 4482
4384 memcpy (v_buffer + v_buflen, data, len); 4483 memcpy (v_buffer + v_buflen, data, len);
4385 v_buflen += len; 4484 v_buflen += len;
4386 4485
4387 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