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.220 by root, Sat Dec 31 18:19:06 2005 UTC vs.
Revision 1.242 by root, Fri Jan 6 05:37:59 2006 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
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
… …
262 mb[0] = ch[0]; 268 mb[0] = ch[0];
263 len = 1; 269 len = 1;
264 } 270 }
265 271
266 if (len > 0) 272 if (len > 0)
267 tt_write ((unsigned char *)mb, len); 273 tt_write (mb, len);
268 else 274 else
269 scr_bell (); 275 scr_bell ();
270 } 276 }
271 277
272 iso14755buf = 0; 278 iso14755buf = 0;
… …
300 KeySym keysym; 306 KeySym keysym;
301#ifdef DEBUG_CMD 307#ifdef DEBUG_CMD
302 static int debug_key = 1; /* accessible by a debugger only */ 308 static int debug_key = 1; /* accessible by a debugger only */
303#endif 309#endif
304 int valid_keysym; 310 int valid_keysym;
305 unsigned char kbuf[KBUFSZ]; 311 char kbuf[KBUFSZ];
306 312
307 /* 313 /*
308 * 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
309 * escape sequence to toggle the Keypad. 315 * escape sequence to toggle the Keypad.
310 * 316 *
… …
328 Status status_return; 334 Status status_return;
329 335
330#if 0 336#if 0
331#ifdef X_HAVE_UTF8_STRING 337#ifdef X_HAVE_UTF8_STRING
332 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
333 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 339 len = Xutf8LookupString (Input_Context, &ev, kbuf,
334 KBUFSZ, &keysym, &status_return); 340 KBUFSZ, &keysym, &status_return);
335 else 341 else
336#endif 342#endif
337#endif 343#endif
338 { 344 {
… …
375 || status_return == XLookupBoth; 381 || status_return == XLookupBoth;
376 } 382 }
377 else 383 else
378#endif 384#endif
379 { 385 {
380 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 386 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
381 valid_keysym = keysym != NoSymbol; 387 valid_keysym = keysym != NoSymbol;
382 } 388 }
383 389
384 if (valid_keysym) 390 if (valid_keysym)
385 { 391 {
… …
849 { 855 {
850#ifdef META8_OPTION 856#ifdef META8_OPTION
851 /* set 8-bit on */ 857 /* set 8-bit on */
852 if (meta && (meta_char == 0x80)) 858 if (meta && (meta_char == 0x80))
853 { 859 {
854 unsigned char *ch; 860 char *ch;
855 861
856 for (ch = kbuf; ch < kbuf + len; ch++) 862 for (ch = kbuf; ch < kbuf + len; ch++)
857 *ch |= 0x80; 863 *ch |= 0x80;
858 864
859 meta = 0; 865 meta = 0;
860 } 866 }
861#endif 867#endif
862 /* nil */ ; 868 /* nil */ ;
863 } 869 }
864 } 870 }
871
872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_STRING_LEN, kbuf, len, DT_END)))
873 return;
865 874
866 if (len <= 0) 875 if (len <= 0)
867 return; /* not mapped */ 876 return; /* not mapped */
868 877
869 if (OPTION (Opt_scrollTtyKeypress)) 878 if (OPTION (Opt_scrollTtyKeypress))
… …
892#ifdef META8_OPTION 901#ifdef META8_OPTION
893 && meta_char == C0_ESC 902 && meta_char == C0_ESC
894#endif 903#endif
895 ) 904 )
896 { 905 {
897 const unsigned char ch = C0_ESC; 906 const char ch = C0_ESC;
898 tt_write (&ch, 1); 907 tt_write (&ch, 1);
899 } 908 }
900 909
901#if defined(DEBUG_CMD) 910#if defined(DEBUG_CMD)
902 /* Display keyboard buffer contents */ 911 /* Display keyboard buffer contents */
… …
914 923
915#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
916/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
917/* attempt to `write' count to the input buffer */ 926/* attempt to `write' count to the input buffer */
918unsigned int 927unsigned int
919rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 928rxvt_term::cmd_write (const char *str, unsigned int count)
920{ 929{
921 unsigned int n, s; 930 unsigned int n, s;
922 931
923 n = cmdbuf_ptr - cmdbuf_base; 932 n = cmdbuf_ptr - cmdbuf_base;
924 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 933 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
961 } 970 }
962#endif 971#endif
963 972
964 if (want_refresh) 973 if (want_refresh)
965 { 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
966 scr_refresh (refresh_type); 1014 scr_refresh (refresh_type);
967 scrollbar_show (1); 1015 scrollbar_show (1);
968#ifdef USE_XIM 1016#ifdef USE_XIM
969 IMSendSpot (); 1017 IMSendSpot ();
970#endif 1018#endif
… …
980 SET_LOCALE (locale); 1028 SET_LOCALE (locale);
981 1029
982 display->flush (); 1030 display->flush ();
983 1031
984 if (want_refresh && !flush_ev.active) 1032 if (want_refresh && !flush_ev.active)
985 flush_ev.start (NOW + 0.01); 1033 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
986} 1034}
987 1035
988void 1036void
989rxvt_term::flush_cb (time_watcher &w) 1037rxvt_term::flush_cb (time_watcher &w)
990{ 1038{
… …
1065 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1113 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1066 } 1114 }
1067} 1115}
1068#endif 1116#endif
1069 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
1070bool 1136bool
1071rxvt_term::pty_fill () 1137rxvt_term::pty_fill ()
1072{ 1138{
1073 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1139 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1074 1140
1075 if (CBUFSIZ == n) 1141 if (CBUFSIZ == n)
1076 { 1142 {
1077 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");
1078 n = 0; 1144 n = 0;
1079 } 1145 }
1080 1146
1081 memmove (cmdbuf_base, cmdbuf_ptr, n); 1147 memmove (cmdbuf_base, cmdbuf_ptr, n);
1082 cmdbuf_ptr = cmdbuf_base; 1148 cmdbuf_ptr = cmdbuf_base;
1083 cmdbuf_endp = cmdbuf_ptr + n; 1149 cmdbuf_endp = cmdbuf_ptr + n;
1084 1150
1085 n = read (pty.pty, cmdbuf_endp, CBUFSIZ - n); 1151 ssize_t r = read (pty.pty, cmdbuf_endp, CBUFSIZ - n);
1086 1152
1087 if (n > 0) 1153 if (r > 0)
1088 { 1154 {
1089 cmdbuf_endp += n; 1155 cmdbuf_endp += r;
1090 return true; 1156 return true;
1091 } 1157 }
1092 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
1093 { 1166 {
1094 pty_ev.stop (); 1167 pty_ev.stop ();
1095 1168
1096 if (!OPTION (Opt_hold)) 1169 if (!OPTION (Opt_hold))
1097 destroy (); 1170 destroy ();
… …
1132 1205
1133#ifdef POINTER_BLANK 1206#ifdef POINTER_BLANK
1134void 1207void
1135rxvt_term::pointer_blank () 1208rxvt_term::pointer_blank ()
1136{ 1209{
1137 if (! OPTION (Opt_pointerBlank)) 1210 if (!OPTION (Opt_pointerBlank))
1138 return; 1211 return;
1139 1212
1140 XDefineCursor (display->display, vt, display->blank_cursor); 1213 XDefineCursor (display->display, vt, display->blank_cursor);
1141 XFlush (display->display); 1214 XFlush (display->display);
1142 1215
… …
1341# endif 1414# endif
1342 else 1415 else
1343 iso14755buf = 0; 1416 iso14755buf = 0;
1344 } 1417 }
1345#endif 1418#endif
1419
1420 if (ev.xany.window == vt && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END)))
1421 break;
1346 1422
1347#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1423#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1348 if (!(ev.xkey.state & ControlMask)) 1424 if (!(ev.xkey.state & ControlMask))
1349 slip_wheel_ev.stop (); 1425 slip_wheel_ev.stop ();
1350 else if (ks == XK_Control_L || ks == XK_Control_R) 1426 else if (ks == XK_Control_L || ks == XK_Control_R)
… …
1565 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1641 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1566 break; 1642 break;
1567 1643
1568 if (ev.xany.window == vt) 1644 if (ev.xany.window == vt)
1569 { 1645 {
1646 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1647 ; // nop
1570 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1648 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1571 { 1649 {
1572 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1650 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1573 ; 1651 ;
1574 1652
1575 XQueryPointer (disp, vt, 1653 XQueryPointer (disp, vt,
… …
1670{ 1748{
1671 if (!focus) 1749 if (!focus)
1672 { 1750 {
1673 focus = 1; 1751 focus = 1;
1674 want_refresh = 1; 1752 want_refresh = 1;
1753
1754 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1755
1675#if USE_XIM 1756#if USE_XIM
1676 if (Input_Context != NULL) 1757 if (Input_Context != NULL)
1677 { 1758 {
1678 IMSetStatusPosition (); 1759 IMSetStatusPosition ();
1679 XSetICFocus (Input_Context); 1760 XSetICFocus (Input_Context);
… …
1699 if (focus) 1780 if (focus)
1700 { 1781 {
1701 focus = 0; 1782 focus = 0;
1702 want_refresh = 1; 1783 want_refresh = 1;
1703 1784
1785 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1786
1704#if ENABLE_FRILLS || ISO_14755 1787#if ENABLE_FRILLS || ISO_14755
1788 if (iso14755buf)
1789 {
1705 iso14755buf = 0; 1790 iso14755buf = 0;
1706#endif
1707#if ENABLE_OVERLAY 1791# if ENABLE_OVERLAY
1708 scr_overlay_off (); 1792 scr_overlay_off ();
1793# endif
1794 }
1709#endif 1795#endif
1710#if USE_XIM 1796#if USE_XIM
1711 if (Input_Context != NULL) 1797 if (Input_Context != NULL)
1712 XUnsetICFocus (Input_Context); 1798 XUnsetICFocus (Input_Context);
1713#endif 1799#endif
… …
1757rxvt_term::button_press (XButtonEvent &ev) 1843rxvt_term::button_press (XButtonEvent &ev)
1758{ 1844{
1759 int reportmode = 0, clickintime; 1845 int reportmode = 0, clickintime;
1760 1846
1761 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1847 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1848
1762 if (!bypass_keystate) 1849 if (!bypass_keystate)
1763 reportmode = !! (priv_modes & PrivMode_mouse_report); 1850 reportmode = !! (priv_modes & PrivMode_mouse_report);
1764 1851
1765 /* 1852 /*
1766 * VT window processing of button press 1853 * VT window processing of button press
… …
1815 else 1902 else
1816 { 1903 {
1817 if (ev.button != MEvent.button) 1904 if (ev.button != MEvent.button)
1818 MEvent.clicks = 0; 1905 MEvent.clicks = 0;
1819 1906
1907 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1820 switch (ev.button) 1908 switch (ev.button)
1821 { 1909 {
1822 case Button1: 1910 case Button1:
1823 /* allow meta + click to select rectangular areas */ 1911 /* allow meta + click to select rectangular areas */
1824 /* should be done in screen.C */ 1912 /* should be done in screen.C */
1825#if ENABLE_FRILLS 1913#if ENABLE_FRILLS
1826 selection.rect = !!(ev.state & ModMetaMask); 1914 selection.rect = !!(ev.state & ModMetaMask);
1827#else 1915#else
1828 selection.rect = false; 1916 selection.rect = false;
1829#endif 1917#endif
1830 1918
1831 /* allow shift+left click to extend selection */ 1919 /* allow shift+left click to extend selection */
1832 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1920 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1833 { 1921 {
1834 if (MEvent.button == Button1 && clickintime) 1922 if (MEvent.button == Button1 && clickintime)
1835 selection_rotate (ev.x, ev.y); 1923 selection_rotate (ev.x, ev.y);
1836 else 1924 else
1837 selection_extend (ev.x, ev.y, 1); 1925 selection_extend (ev.x, ev.y, 1);
1838 } 1926 }
1839 else 1927 else
1840 { 1928 {
1841 if (MEvent.button == Button1 && clickintime) 1929 if (MEvent.button == Button1 && clickintime)
1842 MEvent.clicks++; 1930 MEvent.clicks++;
1843 else 1931 else
1844 MEvent.clicks = 1; 1932 MEvent.clicks = 1;
1845 1933
1846 selection_click (MEvent.clicks, ev.x, ev.y); 1934 selection_click (MEvent.clicks, ev.x, ev.y);
1847 } 1935 }
1848 1936
1849 MEvent.button = Button1; 1937 MEvent.button = Button1;
1850 break; 1938 break;
1851 1939
1852 case Button3: 1940 case Button3:
1853 if (MEvent.button == Button3 && clickintime) 1941 if (MEvent.button == Button3 && clickintime)
1854 selection_rotate (ev.x, ev.y); 1942 selection_rotate (ev.x, ev.y);
1855 else 1943 else
1856 selection_extend (ev.x, ev.y, 1); 1944 selection_extend (ev.x, ev.y, 1);
1857 1945
1858 MEvent.button = Button3; 1946 MEvent.button = Button3;
1859 break; 1947 break;
1860 } 1948 }
1861 } 1949 }
1862 1950
1863 MEvent.time = ev.time; 1951 MEvent.time = ev.time;
1864 return; 1952 return;
1865 } 1953 }
1866 1954
… …
2075 */ 2163 */
2076 if (priv_modes & PrivMode_mouse_report 2164 if (priv_modes & PrivMode_mouse_report
2077 && bypass_keystate 2165 && bypass_keystate
2078 && ev.button == Button1 && MEvent.clicks <= 1) 2166 && ev.button == Button1 && MEvent.clicks <= 1)
2079 selection_extend (ev.x, ev.y, 0); 2167 selection_extend (ev.x, ev.y, 0);
2168
2169 if (!HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2170 return;
2080 2171
2081 switch (ev.button) 2172 switch (ev.button)
2082 { 2173 {
2083 case Button1: 2174 case Button1:
2084 case Button3: 2175 case Button3:
… …
2630bool 2721bool
2631rxvt_term::cmd_parse () 2722rxvt_term::cmd_parse ()
2632{ 2723{
2633 bool flag = false; 2724 bool flag = false;
2634 unicode_t ch = NOCHAR; 2725 unicode_t ch = NOCHAR;
2635 unsigned char *seq_begin; // remember start of esc-sequence here 2726 char *seq_begin; // remember start of esc-sequence here
2636 2727
2637 for (;;) 2728 for (;;)
2638 { 2729 {
2639 if (ch == NOCHAR) 2730 if (ch == NOCHAR)
2640 { 2731 {
2641 seq_begin = cmdbuf_ptr; 2732 seq_begin = cmdbuf_ptr;
2642 ch = next_char (); 2733 ch = next_char ();
2643 }
2644 2734
2645 if (ch == NOCHAR) // TODO: improve 2735 if (ch == NOCHAR)
2646 break; 2736 break;
2737 }
2647 2738
2648 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2739 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2649 { 2740 {
2650 if (!seen_input) 2741 if (!seen_input)
2651 { 2742 {
… …
2684 2775
2685 if (!OPTION (Opt_jumpScroll) 2776 if (!OPTION (Opt_jumpScroll)
2686 || (refresh_count >= refresh_limit * (nrow - 1))) 2777 || (refresh_count >= refresh_limit * (nrow - 1)))
2687 { 2778 {
2688 refreshnow = true; 2779 refreshnow = true;
2780 refresh_count = 0;
2689 ch = NOCHAR; 2781 ch = NOCHAR;
2690 break; 2782 break;
2691 } 2783 }
2692 2784
2693 // scr_add_lines only works for nlines <= nrow - 1. 2785 // scr_add_lines only works for nlines <= nrow - 1.
2694 if (nlines >= nrow - 1) 2786 if (nlines >= nrow - 1)
2695 { 2787 {
2788 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END)))
2696 scr_add_lines (buf, nlines, str - buf); 2789 scr_add_lines (buf, nlines, str - buf);
2790
2697 nlines = 0; 2791 nlines = 0;
2698 str = buf; 2792 str = buf;
2699 eol = str + min (ncol, UBUFSIZ); 2793 eol = str + min (ncol, UBUFSIZ);
2700 } 2794 }
2701 2795
… …
2714 2808
2715 seq_begin = cmdbuf_ptr; 2809 seq_begin = cmdbuf_ptr;
2716 ch = next_char (); 2810 ch = next_char ();
2717 } 2811 }
2718 2812
2813 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END)))
2719 scr_add_lines (buf, nlines, str - buf); 2814 scr_add_lines (buf, nlines, str - buf);
2720 2815
2721 /* 2816 /*
2722 * If there have been a lot of new lines, then update the screen 2817 * If there have been a lot of new lines, then update the screen
2723 * What the heck I'll cheat and only refresh less than every page-full. 2818 * What the heck I'll cheat and only refresh less than every page-full.
2724 * the number of pages between refreshes is refresh_limit, which 2819 * the number of pages between refreshes is refresh_limit, which
… …
2730 refresh_limit++; 2825 refresh_limit++;
2731 else 2826 else
2732 { 2827 {
2733 flag = true; 2828 flag = true;
2734 scr_refresh (refresh_type); 2829 scr_refresh (refresh_type);
2830 flush_ev.stop ();
2735 } 2831 }
2736 } 2832 }
2737 2833
2738 } 2834 }
2739 else 2835 else
… …
2770rxvt_term::next_char () 2866rxvt_term::next_char ()
2771{ 2867{
2772 while (cmdbuf_ptr < cmdbuf_endp) 2868 while (cmdbuf_ptr < cmdbuf_endp)
2773 { 2869 {
2774 // assume 7-bit to be ascii ALWAYS 2870 // assume 7-bit to be ascii ALWAYS
2775 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2871 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2776 return *cmdbuf_ptr++; 2872 return *cmdbuf_ptr++;
2777 2873
2778 wchar_t wc; 2874 wchar_t wc;
2779 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2875 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2780 2876
2781 if (len == (size_t)-2) 2877 if (len == (size_t)-2)
2782 { 2878 {
2783 // the mbstate stores incomplete sequences. didn't know this :/ 2879 // the mbstate stores incomplete sequences. didn't know this :/
2784 cmdbuf_ptr = cmdbuf_endp; 2880 cmdbuf_ptr = cmdbuf_endp;
… …
2923 case C0_ESC: 3019 case C0_ESC:
2924 process_escape_seq (); 3020 process_escape_seq ();
2925 break; 3021 break;
2926 case C0_ENQ: /* terminal Status */ 3022 case C0_ENQ: /* terminal Status */
2927 if (rs[Rs_answerbackstring]) 3023 if (rs[Rs_answerbackstring])
2928 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3024 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2929 (unsigned int)strlen (rs[Rs_answerbackstring]));
2930 else 3025 else
2931 tt_write ((unsigned char *)VT100_ANS, 3026 tt_write (VT100_ANS, strlen (VT100_ANS));
2932 (unsigned int)strlen (VT100_ANS));
2933 break; 3027 break;
2934 case C0_BEL: /* bell */ 3028 case C0_BEL: /* bell */
2935 scr_bell (); 3029 scr_bell ();
2936 break; 3030 break;
2937 case C0_BS: /* backspace */ 3031 case C0_BS: /* backspace */
… …
3125 process_dcs_seq (); 3219 process_dcs_seq ();
3126 break; 3220 break;
3127 3221
3128 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3222 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3129 case C1_SCI: /* ESC Z */ 3223 case C1_SCI: /* ESC Z */
3130 tt_write ((const unsigned char *)ESCZ_ANSWER, 3224 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3131 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3132 break; /* steal obsolete ESC [ c */ 3225 break; /* steal obsolete ESC [ c */
3133 3226
3134 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3227 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3135 case C1_CSI: /* ESC [ */ 3228 case C1_CSI: /* ESC [ */
3136 process_csi_seq (); 3229 process_csi_seq ();
… …
3380 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3473 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3381 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3474 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3382 break; 3475 break;
3383 3476
3384 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3477 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3385 tt_write ((const unsigned char *)VT100_ANS, 3478 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3386 (unsigned int) (sizeof (VT100_ANS) - 1));
3387 break; 3479 break;
3388 3480
3389 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3481 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3390 process_sgr_mode (nargs, arg); 3482 process_sgr_mode (nargs, arg);
3391 break; 3483 break;
… …
3593/*----------------------------------------------------------------------*/ 3685/*----------------------------------------------------------------------*/
3594/* 3686/*
3595 * get input up until STRING TERMINATOR (or BEL) 3687 * get input up until STRING TERMINATOR (or BEL)
3596 * ends_how is terminator used. returned input must be free()'d 3688 * ends_how is terminator used. returned input must be free()'d
3597 */ 3689 */
3598unsigned char * 3690char *
3599rxvt_term::get_to_st (unicode_t &ends_how) 3691rxvt_term::get_to_st (unicode_t &ends_how)
3600{ 3692{
3601 unicode_t ch; 3693 unicode_t ch;
3602 bool seen_esc = false; 3694 bool seen_esc = false;
3603 unsigned int n = 0; 3695 unsigned int n = 0;
… …
3636 3728
3637 string[n++] = '\0'; 3729 string[n++] = '\0';
3638 3730
3639 ends_how = (ch == 0x5c ? C0_ESC : ch); 3731 ends_how = (ch == 0x5c ? C0_ESC : ch);
3640 3732
3641 return (unsigned char *)rxvt_wcstombs (string); 3733 return rxvt_wcstombs (string);
3642} 3734}
3643 3735
3644/*----------------------------------------------------------------------*/ 3736/*----------------------------------------------------------------------*/
3645/* 3737/*
3646 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3738 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3647 */ 3739 */
3648void 3740void
3649rxvt_term::process_dcs_seq () 3741rxvt_term::process_dcs_seq ()
3650{ 3742{
3651 unsigned char *s; 3743 char *s;
3652 unicode_t eh; 3744 unicode_t eh;
3653 3745
3654 /* 3746 /*
3655 * Not handled yet 3747 * Not handled yet
3656 */ 3748 */
… …
3675 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3767 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3676 arg = arg * 10 + (ch - '0'); 3768 arg = arg * 10 + (ch - '0');
3677 3769
3678 if (ch == ';') 3770 if (ch == ';')
3679 { 3771 {
3680 unsigned char *s = get_to_st (eh); 3772 char *s = get_to_st (eh);
3681 3773
3682 if (s) 3774 if (s)
3683 { 3775 {
3684 process_xterm_seq (arg, (char *)s, eh); 3776 process_xterm_seq (arg, s, eh);
3685 free (s); 3777 free (s);
3686 } 3778 }
3687 } 3779 }
3688} 3780}
3689 3781
3690void 3782void
3691rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3783rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3692{ 3784{
3693 if (str[0] == '?' && !str[1]) 3785 if (str[0] == '?' && !str[1])
3694 { 3786 {
3695 unsigned short r, g, b; 3787 unsigned short r, g, b;
3696 pix_colors_focused[color].get (display, r, g, b); 3788 pix_colors_focused[color].get (display, r, g, b);
… …
3702 3794
3703/* 3795/*
3704 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3796 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3705 */ 3797 */
3706void 3798void
3707rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3799rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3708{ 3800{
3709 int changed = 0; 3801 int changed = 0;
3710 int color; 3802 int color;
3711 char *buf, *name; 3803 char *buf, *name;
3712 bool query = str[0] == '?' && !str[1]; 3804 bool query = str[0] == '?' && !str[1];
… …
3919 } 4011 }
3920 break; 4012 break;
3921 4013
3922 case URxvt_view_up: 4014 case URxvt_view_up:
3923 case URxvt_view_down: 4015 case URxvt_view_down:
4016 {
3924 int lines = atoi (str); 4017 int lines = atoi (str);
3925 4018
3926 if (lines) 4019 if (lines)
3927 scr_page (op == URxvt_view_up ? UP : DN, lines); 4020 scr_page (op == URxvt_view_up ? UP : DN, lines);
3928 else 4021 else
3929 {
3930 scr_erase_savelines (); 4022 scr_erase_savelines ();
3931 } 4023 }
3932 4024
4025 break;
4026#endif
4027
4028#if ENABLE_PERL
4029 case URxvt_perl:
4030 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END)))
4031 ; // no responses yet
3933 break; 4032 break;
3934#endif 4033#endif
3935 } 4034 }
3936} 4035}
3937/*----------------------------------------------------------------------*/ 4036/*----------------------------------------------------------------------*/
… …
4052 case 1021: 4151 case 1021:
4053 if (mode) 4152 if (mode)
4054 SET_OPTION (Opt_intensityStyles); 4153 SET_OPTION (Opt_intensityStyles);
4055 else 4154 else
4056 CLR_OPTION (Opt_intensityStyles); 4155 CLR_OPTION (Opt_intensityStyles);
4156
4157 scr_touch (true);
4158 break;
4057#endif 4159#endif
4058 case 1048: /* alternative cursor save */ 4160 case 1048: /* alternative cursor save */
4059 case 1049: 4161 case 1049:
4060 if (OPTION (Opt_secondaryScreen)) 4162 if (OPTION (Opt_secondaryScreen))
4061 if (mode == 0) 4163 if (mode == 0)
… …
4291 scr_color (Color_bg, Color_bg); 4393 scr_color (Color_bg, Color_bg);
4292 break; 4394 break;
4293 4395
4294 //case 50: // not variable spacing 4396 //case 50: // not variable spacing
4295 4397
4296#ifndef NO_BRIGHTCOLOR 4398#if ENABLE_FRILLS
4297 case 90: 4399 case 90:
4298 case 91: /* set bright fg color */ 4400 case 91: /* set bright fg color */
4299 case 92: 4401 case 92:
4300 case 93: 4402 case 93:
4301 case 94: 4403 case 94:
… …
4313 case 106: 4415 case 106:
4314 case 107: 4416 case 107:
4315 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg); 4417 scr_color ((unsigned int) (minBrightCOLOR + (arg[i] - 100)), Color_bg);
4316 break; 4418 break;
4317#endif 4419#endif
4318
4319 } 4420 }
4320 } 4421 }
4321} 4422}
4322/*}}} */ 4423/*}}} */
4323 4424
… …
4347 */ 4448 */
4348void 4449void
4349rxvt_term::tt_printf (const char *fmt,...) 4450rxvt_term::tt_printf (const char *fmt,...)
4350{ 4451{
4351 va_list arg_ptr; 4452 va_list arg_ptr;
4352 unsigned char buf[256]; 4453 char buf[256];
4353 4454
4354 va_start (arg_ptr, fmt); 4455 va_start (arg_ptr, fmt);
4355 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4456 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4356 va_end (arg_ptr); 4457 va_end (arg_ptr);
4357 tt_write (buf, strlen (buf)); 4458 tt_write (buf, strlen (buf));
… …
4362 * or generated by us in response to a query ESC sequence. 4463 * or generated by us in response to a query ESC sequence.
4363 */ 4464 */
4364const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4465const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4365 4466
4366void 4467void
4367rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4468rxvt_term::tt_write (const char *data, unsigned int len)
4368{ 4469{
4470 if (pty.pty < 0)
4471 return;
4472
4369 if (v_buflen == 0) 4473 if (v_buflen == 0)
4370 { 4474 {
4371 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4475 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4372 4476
4373 if ((unsigned int)written == len) 4477 if ((unsigned int)written == len)
… …
4375 4479
4376 data += written; 4480 data += written;
4377 len -= written; 4481 len -= written;
4378 } 4482 }
4379 4483
4380 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4484 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4381 4485
4382 memcpy (v_buffer + v_buflen, data, len); 4486 memcpy (v_buffer + v_buflen, data, len);
4383 v_buflen += len; 4487 v_buflen += len;
4384 4488
4385 pty_ev.set (EVENT_READ | EVENT_WRITE); 4489 pty_ev.set (EVENT_READ | EVENT_WRITE);

Diff Legend

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