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.224 by root, Sun Jan 1 06:18:20 2006 UTC vs.
Revision 1.243 by root, Fri Jan 6 05:43:36 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"
52 53
53#if HAVE_SCHED_YIELD 54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
54# include <sched.h> 56//# include <sched.h>
55#endif 57#endif
56 58
57#ifdef KEYSYM_RESOURCE 59#ifdef KEYSYM_RESOURCE
58# include "keyboard.h" 60# include "keyboard.h"
59#endif 61#endif
… …
266 mb[0] = ch[0]; 268 mb[0] = ch[0];
267 len = 1; 269 len = 1;
268 } 270 }
269 271
270 if (len > 0) 272 if (len > 0)
271 tt_write ((unsigned char *)mb, len); 273 tt_write (mb, len);
272 else 274 else
273 scr_bell (); 275 scr_bell ();
274 } 276 }
275 277
276 iso14755buf = 0; 278 iso14755buf = 0;
… …
304 KeySym keysym; 306 KeySym keysym;
305#ifdef DEBUG_CMD 307#ifdef DEBUG_CMD
306 static int debug_key = 1; /* accessible by a debugger only */ 308 static int debug_key = 1; /* accessible by a debugger only */
307#endif 309#endif
308 int valid_keysym; 310 int valid_keysym;
309 unsigned char kbuf[KBUFSZ]; 311 char kbuf[KBUFSZ];
310 312
311 /* 313 /*
312 * 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
313 * escape sequence to toggle the Keypad. 315 * escape sequence to toggle the Keypad.
314 * 316 *
… …
332 Status status_return; 334 Status status_return;
333 335
334#if 0 336#if 0
335#ifdef X_HAVE_UTF8_STRING 337#ifdef X_HAVE_UTF8_STRING
336 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
337 len = Xutf8LookupString (Input_Context, &ev, (char *)kbuf, 339 len = Xutf8LookupString (Input_Context, &ev, kbuf,
338 KBUFSZ, &keysym, &status_return); 340 KBUFSZ, &keysym, &status_return);
339 else 341 else
340#endif 342#endif
341#endif 343#endif
342 { 344 {
… …
379 || status_return == XLookupBoth; 381 || status_return == XLookupBoth;
380 } 382 }
381 else 383 else
382#endif 384#endif
383 { 385 {
384 len = XLookupString (&ev, (char *)kbuf, KBUFSZ, &keysym, &compose); 386 len = XLookupString (&ev, kbuf, KBUFSZ, &keysym, &compose);
385 valid_keysym = keysym != NoSymbol; 387 valid_keysym = keysym != NoSymbol;
386 } 388 }
387 389
388 if (valid_keysym) 390 if (valid_keysym)
389 { 391 {
… …
853 { 855 {
854#ifdef META8_OPTION 856#ifdef META8_OPTION
855 /* set 8-bit on */ 857 /* set 8-bit on */
856 if (meta && (meta_char == 0x80)) 858 if (meta && (meta_char == 0x80))
857 { 859 {
858 unsigned char *ch; 860 char *ch;
859 861
860 for (ch = kbuf; ch < kbuf + len; ch++) 862 for (ch = kbuf; ch < kbuf + len; ch++)
861 *ch |= 0x80; 863 *ch |= 0x80;
862 864
863 meta = 0; 865 meta = 0;
864 } 866 }
865#endif 867#endif
866 /* nil */ ; 868 /* nil */ ;
867 } 869 }
868 } 870 }
871
872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_STRING_LEN, kbuf, len, DT_END)))
873 return;
869 874
870 if (len <= 0) 875 if (len <= 0)
871 return; /* not mapped */ 876 return; /* not mapped */
872 877
873 if (OPTION (Opt_scrollTtyKeypress)) 878 if (OPTION (Opt_scrollTtyKeypress))
… …
896#ifdef META8_OPTION 901#ifdef META8_OPTION
897 && meta_char == C0_ESC 902 && meta_char == C0_ESC
898#endif 903#endif
899 ) 904 )
900 { 905 {
901 const unsigned char ch = C0_ESC; 906 const char ch = C0_ESC;
902 tt_write (&ch, 1); 907 tt_write (&ch, 1);
903 } 908 }
904 909
905#if defined(DEBUG_CMD) 910#if defined(DEBUG_CMD)
906 /* Display keyboard buffer contents */ 911 /* Display keyboard buffer contents */
… …
918 923
919#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
920/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
921/* attempt to `write' count to the input buffer */ 926/* attempt to `write' count to the input buffer */
922unsigned int 927unsigned int
923rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 928rxvt_term::cmd_write (const char *str, unsigned int count)
924{ 929{
925 unsigned int n, s; 930 unsigned int n, s;
926 931
927 n = cmdbuf_ptr - cmdbuf_base; 932 n = cmdbuf_ptr - cmdbuf_base;
928 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 933 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
965 } 970 }
966#endif 971#endif
967 972
968 if (want_refresh) 973 if (want_refresh)
969 { 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
970 scr_refresh (refresh_type); 1014 scr_refresh (refresh_type);
971 scrollbar_show (1); 1015 scrollbar_show (1);
972#ifdef USE_XIM 1016#ifdef USE_XIM
973 IMSendSpot (); 1017 IMSendSpot ();
974#endif 1018#endif
… …
984 SET_LOCALE (locale); 1028 SET_LOCALE (locale);
985 1029
986 display->flush (); 1030 display->flush ();
987 1031
988 if (want_refresh && !flush_ev.active) 1032 if (want_refresh && !flush_ev.active)
989 flush_ev.start (NOW + 0.01); 1033 flush_ev.start (NOW + 1. / 60.); // refresh at max. 60 hz normally
990} 1034}
991 1035
992void 1036void
993rxvt_term::flush_cb (time_watcher &w) 1037rxvt_term::flush_cb (time_watcher &w)
994{ 1038{
… …
1069 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY); 1113 w.start (w.at + SCROLLBAR_CONTINUOUS_DELAY);
1070 } 1114 }
1071} 1115}
1072#endif 1116#endif
1073 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
1074bool 1136bool
1075rxvt_term::pty_fill () 1137rxvt_term::pty_fill ()
1076{ 1138{
1077 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1139 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1078 1140
1079 if (CBUFSIZ == n) 1141 if (CBUFSIZ == n)
1080 { 1142 {
1081 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");
1082 n = 0; 1144 n = 0;
1083 } 1145 }
1084 1146
1085 memmove (cmdbuf_base, cmdbuf_ptr, n); 1147 memmove (cmdbuf_base, cmdbuf_ptr, n);
1086 cmdbuf_ptr = cmdbuf_base; 1148 cmdbuf_ptr = cmdbuf_base;
… …
1094 return true; 1156 return true;
1095 } 1157 }
1096 else if (r < 0 && (errno == EAGAIN || errno == EINTR)) 1158 else if (r < 0 && (errno == EAGAIN || errno == EINTR))
1097 { 1159 {
1098#if HAVE_SCHED_YIELD 1160#if HAVE_SCHED_YIELD
1099 sched_yield (); 1161 if (display->is_local)
1162 event_handler.cw_yield.start ();
1100#endif 1163#endif
1101 } 1164 }
1102 else 1165 else
1103 { 1166 {
1104 pty_ev.stop (); 1167 pty_ev.stop ();
… …
1142 1205
1143#ifdef POINTER_BLANK 1206#ifdef POINTER_BLANK
1144void 1207void
1145rxvt_term::pointer_blank () 1208rxvt_term::pointer_blank ()
1146{ 1209{
1147 if (! OPTION (Opt_pointerBlank)) 1210 if (!OPTION (Opt_pointerBlank))
1148 return; 1211 return;
1149 1212
1150 XDefineCursor (display->display, vt, display->blank_cursor); 1213 XDefineCursor (display->display, vt, display->blank_cursor);
1151 XFlush (display->display); 1214 XFlush (display->display);
1152 1215
… …
1351# endif 1414# endif
1352 else 1415 else
1353 iso14755buf = 0; 1416 iso14755buf = 0;
1354 } 1417 }
1355#endif 1418#endif
1419
1420 if (ev.xany.window == vt && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END)))
1421 break;
1356 1422
1357#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1423#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1358 if (!(ev.xkey.state & ControlMask)) 1424 if (!(ev.xkey.state & ControlMask))
1359 slip_wheel_ev.stop (); 1425 slip_wheel_ev.stop ();
1360 else if (ks == XK_Control_L || ks == XK_Control_R) 1426 else if (ks == XK_Control_L || ks == XK_Control_R)
… …
1575 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1641 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1576 break; 1642 break;
1577 1643
1578 if (ev.xany.window == vt) 1644 if (ev.xany.window == vt)
1579 { 1645 {
1646 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1647 ; // nop
1580 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1648 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1581 { 1649 {
1582 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1650 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1583 ; 1651 ;
1584 1652
1585 XQueryPointer (disp, vt, 1653 XQueryPointer (disp, vt,
… …
1680{ 1748{
1681 if (!focus) 1749 if (!focus)
1682 { 1750 {
1683 focus = 1; 1751 focus = 1;
1684 want_refresh = 1; 1752 want_refresh = 1;
1753
1754 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1755
1685#if USE_XIM 1756#if USE_XIM
1686 if (Input_Context != NULL) 1757 if (Input_Context != NULL)
1687 { 1758 {
1688 IMSetStatusPosition (); 1759 IMSetStatusPosition ();
1689 XSetICFocus (Input_Context); 1760 XSetICFocus (Input_Context);
… …
1709 if (focus) 1780 if (focus)
1710 { 1781 {
1711 focus = 0; 1782 focus = 0;
1712 want_refresh = 1; 1783 want_refresh = 1;
1713 1784
1785 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1786
1714#if ENABLE_FRILLS || ISO_14755 1787#if ENABLE_FRILLS || ISO_14755
1788 if (iso14755buf)
1789 {
1715 iso14755buf = 0; 1790 iso14755buf = 0;
1716#endif
1717#if ENABLE_OVERLAY 1791# if ENABLE_OVERLAY
1718 scr_overlay_off (); 1792 scr_overlay_off ();
1793# endif
1794 }
1719#endif 1795#endif
1720#if USE_XIM 1796#if USE_XIM
1721 if (Input_Context != NULL) 1797 if (Input_Context != NULL)
1722 XUnsetICFocus (Input_Context); 1798 XUnsetICFocus (Input_Context);
1723#endif 1799#endif
… …
1767rxvt_term::button_press (XButtonEvent &ev) 1843rxvt_term::button_press (XButtonEvent &ev)
1768{ 1844{
1769 int reportmode = 0, clickintime; 1845 int reportmode = 0, clickintime;
1770 1846
1771 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1847 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1848
1772 if (!bypass_keystate) 1849 if (!bypass_keystate)
1773 reportmode = !! (priv_modes & PrivMode_mouse_report); 1850 reportmode = !! (priv_modes & PrivMode_mouse_report);
1774 1851
1775 /* 1852 /*
1776 * VT window processing of button press 1853 * VT window processing of button press
… …
1796#ifdef MOUSE_REPORT_DOUBLECLICK 1873#ifdef MOUSE_REPORT_DOUBLECLICK
1797 if (ev.button == MEvent.button && clickintime) 1874 if (ev.button == MEvent.button && clickintime)
1798 { 1875 {
1799 /* same button, within alloted time */ 1876 /* same button, within alloted time */
1800 MEvent.clicks++; 1877 MEvent.clicks++;
1878
1801 if (MEvent.clicks > 1) 1879 if (MEvent.clicks > 1)
1802 { 1880 {
1803 /* only report double clicks */ 1881 /* only report double clicks */
1804 MEvent.clicks = 2; 1882 MEvent.clicks = 2;
1805 mouse_report (ev); 1883 mouse_report (ev);
… …
1825 else 1903 else
1826 { 1904 {
1827 if (ev.button != MEvent.button) 1905 if (ev.button != MEvent.button)
1828 MEvent.clicks = 0; 1906 MEvent.clicks = 0;
1829 1907
1908 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1830 switch (ev.button) 1909 switch (ev.button)
1831 { 1910 {
1832 case Button1: 1911 case Button1:
1833 /* allow meta + click to select rectangular areas */ 1912 /* allow meta + click to select rectangular areas */
1834 /* should be done in screen.C */ 1913 /* should be done in screen.C */
1835#if ENABLE_FRILLS 1914#if ENABLE_FRILLS
1836 selection.rect = !!(ev.state & ModMetaMask); 1915 selection.rect = !!(ev.state & ModMetaMask);
1837#else 1916#else
1838 selection.rect = false; 1917 selection.rect = false;
1839#endif 1918#endif
1840 1919
1841 /* allow shift+left click to extend selection */ 1920 /* allow shift+left click to extend selection */
1842 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1921 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1843 { 1922 {
1844 if (MEvent.button == Button1 && clickintime) 1923 if (MEvent.button == Button1 && clickintime)
1845 selection_rotate (ev.x, ev.y); 1924 selection_rotate (ev.x, ev.y);
1846 else 1925 else
1847 selection_extend (ev.x, ev.y, 1); 1926 selection_extend (ev.x, ev.y, 1);
1848 } 1927 }
1849 else 1928 else
1850 { 1929 {
1851 if (MEvent.button == Button1 && clickintime) 1930 if (MEvent.button == Button1 && clickintime)
1852 MEvent.clicks++; 1931 MEvent.clicks++;
1853 else 1932 else
1854 MEvent.clicks = 1; 1933 MEvent.clicks = 1;
1855 1934
1856 selection_click (MEvent.clicks, ev.x, ev.y); 1935 selection_click (MEvent.clicks, ev.x, ev.y);
1857 } 1936 }
1858 1937
1859 MEvent.button = Button1; 1938 MEvent.button = Button1;
1860 break; 1939 break;
1861 1940
1862 case Button3: 1941 case Button3:
1863 if (MEvent.button == Button3 && clickintime) 1942 if (MEvent.button == Button3 && clickintime)
1864 selection_rotate (ev.x, ev.y); 1943 selection_rotate (ev.x, ev.y);
1865 else 1944 else
1866 selection_extend (ev.x, ev.y, 1); 1945 selection_extend (ev.x, ev.y, 1);
1867 1946
1868 MEvent.button = Button3; 1947 MEvent.button = Button3;
1869 break; 1948 break;
1870 } 1949 }
1871 } 1950 }
1872 1951
1873 MEvent.time = ev.time; 1952 MEvent.time = ev.time;
1874 return; 1953 return;
1875 } 1954 }
1876 1955
… …
2012 } 2091 }
2013 2092
2014 break; 2093 break;
2015 } 2094 }
2016 } 2095 }
2096
2017 return; 2097 return;
2018 } 2098 }
2099
2019#if MENUBAR 2100#if MENUBAR
2020 /* 2101 /*
2021 * Menubar window processing of button press 2102 * Menubar window processing of button press
2022 */ 2103 */
2023 if (isMenuBarWindow (ev.window)) 2104 if (isMenuBarWindow (ev.window))
… …
2085 */ 2166 */
2086 if (priv_modes & PrivMode_mouse_report 2167 if (priv_modes & PrivMode_mouse_report
2087 && bypass_keystate 2168 && bypass_keystate
2088 && ev.button == Button1 && MEvent.clicks <= 1) 2169 && ev.button == Button1 && MEvent.clicks <= 1)
2089 selection_extend (ev.x, ev.y, 0); 2170 selection_extend (ev.x, ev.y, 0);
2171
2172 if (!HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2173 return;
2090 2174
2091 switch (ev.button) 2175 switch (ev.button)
2092 { 2176 {
2093 case Button1: 2177 case Button1:
2094 case Button3: 2178 case Button3:
… …
2640bool 2724bool
2641rxvt_term::cmd_parse () 2725rxvt_term::cmd_parse ()
2642{ 2726{
2643 bool flag = false; 2727 bool flag = false;
2644 unicode_t ch = NOCHAR; 2728 unicode_t ch = NOCHAR;
2645 unsigned char *seq_begin; // remember start of esc-sequence here 2729 char *seq_begin; // remember start of esc-sequence here
2646 2730
2647 for (;;) 2731 for (;;)
2648 { 2732 {
2649 if (ch == NOCHAR) 2733 if (ch == NOCHAR)
2650 { 2734 {
2651 seq_begin = cmdbuf_ptr; 2735 seq_begin = cmdbuf_ptr;
2652 ch = next_char (); 2736 ch = next_char ();
2653 }
2654 2737
2655 if (ch == NOCHAR) // TODO: improve 2738 if (ch == NOCHAR)
2656 break; 2739 break;
2740 }
2657 2741
2658 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2742 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2659 { 2743 {
2660 if (!seen_input) 2744 if (!seen_input)
2661 { 2745 {
… …
2694 2778
2695 if (!OPTION (Opt_jumpScroll) 2779 if (!OPTION (Opt_jumpScroll)
2696 || (refresh_count >= refresh_limit * (nrow - 1))) 2780 || (refresh_count >= refresh_limit * (nrow - 1)))
2697 { 2781 {
2698 refreshnow = true; 2782 refreshnow = true;
2783 refresh_count = 0;
2699 ch = NOCHAR; 2784 ch = NOCHAR;
2700 break; 2785 break;
2701 } 2786 }
2702 2787
2703 // scr_add_lines only works for nlines <= nrow - 1. 2788 // scr_add_lines only works for nlines <= nrow - 1.
2704 if (nlines >= nrow - 1) 2789 if (nlines >= nrow - 1)
2705 { 2790 {
2791 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END)))
2706 scr_add_lines (buf, nlines, str - buf); 2792 scr_add_lines (buf, nlines, str - buf);
2793
2707 nlines = 0; 2794 nlines = 0;
2708 str = buf; 2795 str = buf;
2709 eol = str + min (ncol, UBUFSIZ); 2796 eol = str + min (ncol, UBUFSIZ);
2710 } 2797 }
2711 2798
… …
2724 2811
2725 seq_begin = cmdbuf_ptr; 2812 seq_begin = cmdbuf_ptr;
2726 ch = next_char (); 2813 ch = next_char ();
2727 } 2814 }
2728 2815
2816 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END)))
2729 scr_add_lines (buf, nlines, str - buf); 2817 scr_add_lines (buf, nlines, str - buf);
2730 2818
2731 /* 2819 /*
2732 * If there have been a lot of new lines, then update the screen 2820 * If there have been a lot of new lines, then update the screen
2733 * What the heck I'll cheat and only refresh less than every page-full. 2821 * What the heck I'll cheat and only refresh less than every page-full.
2734 * the number of pages between refreshes is refresh_limit, which 2822 * the number of pages between refreshes is refresh_limit, which
… …
2740 refresh_limit++; 2828 refresh_limit++;
2741 else 2829 else
2742 { 2830 {
2743 flag = true; 2831 flag = true;
2744 scr_refresh (refresh_type); 2832 scr_refresh (refresh_type);
2833 flush_ev.stop ();
2745 } 2834 }
2746 } 2835 }
2747 2836
2748 } 2837 }
2749 else 2838 else
… …
2780rxvt_term::next_char () 2869rxvt_term::next_char ()
2781{ 2870{
2782 while (cmdbuf_ptr < cmdbuf_endp) 2871 while (cmdbuf_ptr < cmdbuf_endp)
2783 { 2872 {
2784 // assume 7-bit to be ascii ALWAYS 2873 // assume 7-bit to be ascii ALWAYS
2785 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2874 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2786 return *cmdbuf_ptr++; 2875 return *cmdbuf_ptr++;
2787 2876
2788 wchar_t wc; 2877 wchar_t wc;
2789 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2878 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2790 2879
2791 if (len == (size_t)-2) 2880 if (len == (size_t)-2)
2792 { 2881 {
2793 // the mbstate stores incomplete sequences. didn't know this :/ 2882 // the mbstate stores incomplete sequences. didn't know this :/
2794 cmdbuf_ptr = cmdbuf_endp; 2883 cmdbuf_ptr = cmdbuf_endp;
… …
2933 case C0_ESC: 3022 case C0_ESC:
2934 process_escape_seq (); 3023 process_escape_seq ();
2935 break; 3024 break;
2936 case C0_ENQ: /* terminal Status */ 3025 case C0_ENQ: /* terminal Status */
2937 if (rs[Rs_answerbackstring]) 3026 if (rs[Rs_answerbackstring])
2938 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3027 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2939 (unsigned int)strlen (rs[Rs_answerbackstring]));
2940 else 3028 else
2941 tt_write ((unsigned char *)VT100_ANS, 3029 tt_write (VT100_ANS, strlen (VT100_ANS));
2942 (unsigned int)strlen (VT100_ANS));
2943 break; 3030 break;
2944 case C0_BEL: /* bell */ 3031 case C0_BEL: /* bell */
2945 scr_bell (); 3032 scr_bell ();
2946 break; 3033 break;
2947 case C0_BS: /* backspace */ 3034 case C0_BS: /* backspace */
… …
3135 process_dcs_seq (); 3222 process_dcs_seq ();
3136 break; 3223 break;
3137 3224
3138 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3225 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3139 case C1_SCI: /* ESC Z */ 3226 case C1_SCI: /* ESC Z */
3140 tt_write ((const unsigned char *)ESCZ_ANSWER, 3227 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3141 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3142 break; /* steal obsolete ESC [ c */ 3228 break; /* steal obsolete ESC [ c */
3143 3229
3144 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3230 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3145 case C1_CSI: /* ESC [ */ 3231 case C1_CSI: /* ESC [ */
3146 process_csi_seq (); 3232 process_csi_seq ();
… …
3390 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3476 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3391 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3477 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3392 break; 3478 break;
3393 3479
3394 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3480 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3395 tt_write ((const unsigned char *)VT100_ANS, 3481 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3396 (unsigned int) (sizeof (VT100_ANS) - 1));
3397 break; 3482 break;
3398 3483
3399 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3484 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3400 process_sgr_mode (nargs, arg); 3485 process_sgr_mode (nargs, arg);
3401 break; 3486 break;
… …
3603/*----------------------------------------------------------------------*/ 3688/*----------------------------------------------------------------------*/
3604/* 3689/*
3605 * get input up until STRING TERMINATOR (or BEL) 3690 * get input up until STRING TERMINATOR (or BEL)
3606 * ends_how is terminator used. returned input must be free()'d 3691 * ends_how is terminator used. returned input must be free()'d
3607 */ 3692 */
3608unsigned char * 3693char *
3609rxvt_term::get_to_st (unicode_t &ends_how) 3694rxvt_term::get_to_st (unicode_t &ends_how)
3610{ 3695{
3611 unicode_t ch; 3696 unicode_t ch;
3612 bool seen_esc = false; 3697 bool seen_esc = false;
3613 unsigned int n = 0; 3698 unsigned int n = 0;
… …
3646 3731
3647 string[n++] = '\0'; 3732 string[n++] = '\0';
3648 3733
3649 ends_how = (ch == 0x5c ? C0_ESC : ch); 3734 ends_how = (ch == 0x5c ? C0_ESC : ch);
3650 3735
3651 return (unsigned char *)rxvt_wcstombs (string); 3736 return rxvt_wcstombs (string);
3652} 3737}
3653 3738
3654/*----------------------------------------------------------------------*/ 3739/*----------------------------------------------------------------------*/
3655/* 3740/*
3656 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3741 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3657 */ 3742 */
3658void 3743void
3659rxvt_term::process_dcs_seq () 3744rxvt_term::process_dcs_seq ()
3660{ 3745{
3661 unsigned char *s; 3746 char *s;
3662 unicode_t eh; 3747 unicode_t eh;
3663 3748
3664 /* 3749 /*
3665 * Not handled yet 3750 * Not handled yet
3666 */ 3751 */
… …
3685 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3770 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3686 arg = arg * 10 + (ch - '0'); 3771 arg = arg * 10 + (ch - '0');
3687 3772
3688 if (ch == ';') 3773 if (ch == ';')
3689 { 3774 {
3690 unsigned char *s = get_to_st (eh); 3775 char *s = get_to_st (eh);
3691 3776
3692 if (s) 3777 if (s)
3693 { 3778 {
3694 process_xterm_seq (arg, (char *)s, eh); 3779 process_xterm_seq (arg, s, eh);
3695 free (s); 3780 free (s);
3696 } 3781 }
3697 } 3782 }
3698} 3783}
3699 3784
3700void 3785void
3701rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3786rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3702{ 3787{
3703 if (str[0] == '?' && !str[1]) 3788 if (str[0] == '?' && !str[1])
3704 { 3789 {
3705 unsigned short r, g, b; 3790 unsigned short r, g, b;
3706 pix_colors_focused[color].get (display, r, g, b); 3791 pix_colors_focused[color].get (display, r, g, b);
… …
3712 3797
3713/* 3798/*
3714 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3799 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3715 */ 3800 */
3716void 3801void
3717rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3802rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3718{ 3803{
3719 int changed = 0; 3804 int changed = 0;
3720 int color; 3805 int color;
3721 char *buf, *name; 3806 char *buf, *name;
3722 bool query = str[0] == '?' && !str[1]; 3807 bool query = str[0] == '?' && !str[1];
… …
3929 } 4014 }
3930 break; 4015 break;
3931 4016
3932 case URxvt_view_up: 4017 case URxvt_view_up:
3933 case URxvt_view_down: 4018 case URxvt_view_down:
4019 {
3934 int lines = atoi (str); 4020 int lines = atoi (str);
3935 4021
3936 if (lines) 4022 if (lines)
3937 scr_page (op == URxvt_view_up ? UP : DN, lines); 4023 scr_page (op == URxvt_view_up ? UP : DN, lines);
3938 else 4024 else
3939 {
3940 scr_erase_savelines (); 4025 scr_erase_savelines ();
3941 } 4026 }
3942 4027
4028 break;
4029#endif
4030
4031#if ENABLE_PERL
4032 case URxvt_perl:
4033 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END)))
4034 ; // no responses yet
3943 break; 4035 break;
3944#endif 4036#endif
3945 } 4037 }
3946} 4038}
3947/*----------------------------------------------------------------------*/ 4039/*----------------------------------------------------------------------*/
… …
4063 if (mode) 4155 if (mode)
4064 SET_OPTION (Opt_intensityStyles); 4156 SET_OPTION (Opt_intensityStyles);
4065 else 4157 else
4066 CLR_OPTION (Opt_intensityStyles); 4158 CLR_OPTION (Opt_intensityStyles);
4067 4159
4068 want_refresh = 1; 4160 scr_touch (true);
4069 want_full_refresh = 1;
4070 break; 4161 break;
4071#endif 4162#endif
4072 case 1048: /* alternative cursor save */ 4163 case 1048: /* alternative cursor save */
4073 case 1049: 4164 case 1049:
4074 if (OPTION (Opt_secondaryScreen)) 4165 if (OPTION (Opt_secondaryScreen))
… …
4305 scr_color (Color_bg, Color_bg); 4396 scr_color (Color_bg, Color_bg);
4306 break; 4397 break;
4307 4398
4308 //case 50: // not variable spacing 4399 //case 50: // not variable spacing
4309 4400
4310#ifndef NO_BRIGHTCOLOR 4401#if ENABLE_FRILLS
4311 case 90: 4402 case 90:
4312 case 91: /* set bright fg color */ 4403 case 91: /* set bright fg color */
4313 case 92: 4404 case 92:
4314 case 93: 4405 case 93:
4315 case 94: 4406 case 94:
… …
4360 */ 4451 */
4361void 4452void
4362rxvt_term::tt_printf (const char *fmt,...) 4453rxvt_term::tt_printf (const char *fmt,...)
4363{ 4454{
4364 va_list arg_ptr; 4455 va_list arg_ptr;
4365 unsigned char buf[256]; 4456 char buf[256];
4366 4457
4367 va_start (arg_ptr, fmt); 4458 va_start (arg_ptr, fmt);
4368 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4459 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4369 va_end (arg_ptr); 4460 va_end (arg_ptr);
4370 tt_write (buf, strlen (buf)); 4461 tt_write (buf, strlen (buf));
… …
4375 * or generated by us in response to a query ESC sequence. 4466 * or generated by us in response to a query ESC sequence.
4376 */ 4467 */
4377const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4468const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4378 4469
4379void 4470void
4380rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4471rxvt_term::tt_write (const char *data, unsigned int len)
4381{ 4472{
4473 if (pty.pty < 0)
4474 return;
4475
4382 if (v_buflen == 0) 4476 if (v_buflen == 0)
4383 { 4477 {
4384 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4478 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4385 4479
4386 if ((unsigned int)written == len) 4480 if ((unsigned int)written == len)
… …
4388 4482
4389 data += written; 4483 data += written;
4390 len -= written; 4484 len -= written;
4391 } 4485 }
4392 4486
4393 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4487 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4394 4488
4395 memcpy (v_buffer + v_buflen, data, len); 4489 memcpy (v_buffer + v_buflen, data, len);
4396 v_buflen += len; 4490 v_buflen += len;
4397 4491
4398 pty_ev.set (EVENT_READ | EVENT_WRITE); 4492 pty_ev.set (EVENT_READ | EVENT_WRITE);

Diff Legend

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