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.228 by root, Mon Jan 2 16:08:34 2006 UTC vs.
Revision 1.247 by root, Sat Jan 7 20:23:52 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.
… …
50#include "rxvtperl.h" 50#include "rxvtperl.h"
51#include "version.h" 51#include "version.h"
52#include "command.h" 52#include "command.h"
53 53
54#if HAVE_SCHED_YIELD 54#if HAVE_SCHED_YIELD
55#undef HAVE_SCHED_YIELD // disabled for the time being
55# include <sched.h> 56//# include <sched.h>
56#endif 57#endif
57 58
58#ifdef KEYSYM_RESOURCE 59#ifdef KEYSYM_RESOURCE
59# include "keyboard.h" 60# include "keyboard.h"
60#endif 61#endif
… …
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;
865 } 866 }
866#endif 867#endif
867 /* nil */ ; 868 /* nil */ ;
868 } 869 }
869 } 870 }
871
872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_STR_LEN, kbuf, len, DT_END)))
873 return;
870 874
871 if (len <= 0) 875 if (len <= 0)
872 return; /* not mapped */ 876 return; /* not mapped */
873 877
874 if (OPTION (Opt_scrollTtyKeypress)) 878 if (OPTION (Opt_scrollTtyKeypress))
… …
897#ifdef META8_OPTION 901#ifdef META8_OPTION
898 && meta_char == C0_ESC 902 && meta_char == C0_ESC
899#endif 903#endif
900 ) 904 )
901 { 905 {
902 const unsigned char ch = C0_ESC; 906 const char ch = C0_ESC;
903 tt_write (&ch, 1); 907 tt_write (&ch, 1);
904 } 908 }
905 909
906#if defined(DEBUG_CMD) 910#if defined(DEBUG_CMD)
907 /* Display keyboard buffer contents */ 911 /* Display keyboard buffer contents */
… …
919 923
920#if MENUBAR_MAX || defined (KEYSYM_RESOURCE) 924#if MENUBAR_MAX || defined (KEYSYM_RESOURCE)
921/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */ 925/*{{{ rxvt_cmd_write (), rxvt_cmd_getc () */
922/* attempt to `write' count to the input buffer */ 926/* attempt to `write' count to the input buffer */
923unsigned int 927unsigned int
924rxvt_term::cmd_write (const unsigned char *str, unsigned int count) 928rxvt_term::cmd_write (const char *str, unsigned int count)
925{ 929{
926 unsigned int n, s; 930 unsigned int n, s;
927 931
928 n = cmdbuf_ptr - cmdbuf_base; 932 n = cmdbuf_ptr - cmdbuf_base;
929 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp; 933 s = cmdbuf_base + CBUFSIZ - 1 - cmdbuf_endp;
… …
966 } 970 }
967#endif 971#endif
968 972
969 if (want_refresh) 973 if (want_refresh)
970 { 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
971 scr_refresh (refresh_type); 1014 scr_refresh (refresh_type);
972 scrollbar_show (1); 1015 scrollbar_show (1);
973#ifdef USE_XIM 1016#ifdef USE_XIM
974 IMSendSpot (); 1017 IMSendSpot ();
975#endif 1018#endif
… …
1095{ 1138{
1096 ssize_t n = cmdbuf_endp - cmdbuf_ptr; 1139 ssize_t n = cmdbuf_endp - cmdbuf_ptr;
1097 1140
1098 if (CBUFSIZ == n) 1141 if (CBUFSIZ == n)
1099 { 1142 {
1100 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");
1101 n = 0; 1144 n = 0;
1102 } 1145 }
1103 1146
1104 memmove (cmdbuf_base, cmdbuf_ptr, n); 1147 memmove (cmdbuf_base, cmdbuf_ptr, n);
1105 cmdbuf_ptr = cmdbuf_base; 1148 cmdbuf_ptr = cmdbuf_base;
… …
1162 1205
1163#ifdef POINTER_BLANK 1206#ifdef POINTER_BLANK
1164void 1207void
1165rxvt_term::pointer_blank () 1208rxvt_term::pointer_blank ()
1166{ 1209{
1167 if (! OPTION (Opt_pointerBlank)) 1210 if (!OPTION (Opt_pointerBlank))
1168 return; 1211 return;
1169 1212
1170 XDefineCursor (display->display, vt, display->blank_cursor); 1213 XDefineCursor (display->display, vt, display->blank_cursor);
1171 XFlush (display->display); 1214 XFlush (display->display);
1172 1215
… …
1371# endif 1414# endif
1372 else 1415 else
1373 iso14755buf = 0; 1416 iso14755buf = 0;
1374 } 1417 }
1375#endif 1418#endif
1419
1420 if (ev.xany.window == vt
1421 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END)))
1422 break;
1376 1423
1377#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1424#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1378 if (!(ev.xkey.state & ControlMask)) 1425 if (!(ev.xkey.state & ControlMask))
1379 slip_wheel_ev.stop (); 1426 slip_wheel_ev.stop ();
1380 else if (ks == XK_Control_L || ks == XK_Control_R) 1427 else if (ks == XK_Control_L || ks == XK_Control_R)
… …
1515 1562
1516 case SelectionRequest: 1563 case SelectionRequest:
1517 selection_send (ev.xselectionrequest); 1564 selection_send (ev.xselectionrequest);
1518 break; 1565 break;
1519 1566
1567 case MapNotify:
1568 mapped = 1;
1569#ifdef TEXT_BLINK
1570 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1571#endif
1572 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1573 break;
1574
1520 case UnmapNotify: 1575 case UnmapNotify:
1521 mapped = 0; 1576 mapped = 0;
1522#ifdef TEXT_BLINK 1577#ifdef TEXT_BLINK
1523 text_blink_ev.stop (); 1578 text_blink_ev.stop ();
1524#endif 1579#endif
1525 break; 1580 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1526
1527 case MapNotify:
1528 mapped = 1;
1529#ifdef TEXT_BLINK
1530 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1531#endif
1532 break; 1581 break;
1533 1582
1534#ifdef TRANSPARENT 1583#ifdef TRANSPARENT
1535 case ReparentNotify: 1584 case ReparentNotify:
1536 rootwin_cb (ev); 1585 rootwin_cb (ev);
… …
1595 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1644 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1596 break; 1645 break;
1597 1646
1598 if (ev.xany.window == vt) 1647 if (ev.xany.window == vt)
1599 { 1648 {
1649 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1650 ; // nop
1600 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1651 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1601 { 1652 {
1602 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1653 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1603 ; 1654 ;
1604 1655
1605 XQueryPointer (disp, vt, 1656 XQueryPointer (disp, vt,
… …
1701 if (!focus) 1752 if (!focus)
1702 { 1753 {
1703 focus = 1; 1754 focus = 1;
1704 want_refresh = 1; 1755 want_refresh = 1;
1705 1756
1706 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1757 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1707 1758
1708#if USE_XIM 1759#if USE_XIM
1709 if (Input_Context != NULL) 1760 if (Input_Context != NULL)
1710 { 1761 {
1711 IMSetStatusPosition (); 1762 IMSetStatusPosition ();
… …
1732 if (focus) 1783 if (focus)
1733 { 1784 {
1734 focus = 0; 1785 focus = 0;
1735 want_refresh = 1; 1786 want_refresh = 1;
1736 1787
1737 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1788 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1738 1789
1739#if ENABLE_FRILLS || ISO_14755 1790#if ENABLE_FRILLS || ISO_14755
1740 if (iso14755buf) 1791 if (iso14755buf)
1741 { 1792 {
1742 iso14755buf = 0; 1793 iso14755buf = 0;
… …
1795rxvt_term::button_press (XButtonEvent &ev) 1846rxvt_term::button_press (XButtonEvent &ev)
1796{ 1847{
1797 int reportmode = 0, clickintime; 1848 int reportmode = 0, clickintime;
1798 1849
1799 bypass_keystate = ev.state & (ModMetaMask | ShiftMask); 1850 bypass_keystate = ev.state & (ModMetaMask | ShiftMask);
1851
1800 if (!bypass_keystate) 1852 if (!bypass_keystate)
1801 reportmode = !! (priv_modes & PrivMode_mouse_report); 1853 reportmode = !! (priv_modes & PrivMode_mouse_report);
1802 1854
1803 /* 1855 /*
1804 * VT window processing of button press 1856 * VT window processing of button press
… …
1824#ifdef MOUSE_REPORT_DOUBLECLICK 1876#ifdef MOUSE_REPORT_DOUBLECLICK
1825 if (ev.button == MEvent.button && clickintime) 1877 if (ev.button == MEvent.button && clickintime)
1826 { 1878 {
1827 /* same button, within alloted time */ 1879 /* same button, within alloted time */
1828 MEvent.clicks++; 1880 MEvent.clicks++;
1881
1829 if (MEvent.clicks > 1) 1882 if (MEvent.clicks > 1)
1830 { 1883 {
1831 /* only report double clicks */ 1884 /* only report double clicks */
1832 MEvent.clicks = 2; 1885 MEvent.clicks = 2;
1833 mouse_report (ev); 1886 mouse_report (ev);
… …
1853 else 1906 else
1854 { 1907 {
1855 if (ev.button != MEvent.button) 1908 if (ev.button != MEvent.button)
1856 MEvent.clicks = 0; 1909 MEvent.clicks = 0;
1857 1910
1911 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1858 switch (ev.button) 1912 switch (ev.button)
1859 { 1913 {
1860 case Button1: 1914 case Button1:
1861 /* allow meta + click to select rectangular areas */ 1915 /* allow meta + click to select rectangular areas */
1862 /* should be done in screen.C */ 1916 /* should be done in screen.C */
1863#if ENABLE_FRILLS 1917#if ENABLE_FRILLS
1864 selection.rect = !!(ev.state & ModMetaMask); 1918 selection.rect = !!(ev.state & ModMetaMask);
1865#else 1919#else
1866 selection.rect = false; 1920 selection.rect = false;
1867#endif 1921#endif
1868 1922
1869 /* allow shift+left click to extend selection */ 1923 /* allow shift+left click to extend selection */
1870 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1924 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report))
1871 { 1925 {
1872 if (MEvent.button == Button1 && clickintime) 1926 if (MEvent.button == Button1 && clickintime)
1873 selection_rotate (ev.x, ev.y); 1927 selection_rotate (ev.x, ev.y);
1874 else 1928 else
1875 selection_extend (ev.x, ev.y, 1); 1929 selection_extend (ev.x, ev.y, 1);
1876 } 1930 }
1877 else 1931 else
1878 { 1932 {
1879 if (MEvent.button == Button1 && clickintime) 1933 if (MEvent.button == Button1 && clickintime)
1880 MEvent.clicks++; 1934 MEvent.clicks++;
1881 else 1935 else
1882 MEvent.clicks = 1; 1936 MEvent.clicks = 1;
1883 1937
1884 selection_click (MEvent.clicks, ev.x, ev.y); 1938 selection_click (MEvent.clicks, ev.x, ev.y);
1885 } 1939 }
1886 1940
1887 MEvent.button = Button1; 1941 MEvent.button = Button1;
1888 break; 1942 break;
1889 1943
1890 case Button3: 1944 case Button3:
1891 if (MEvent.button == Button3 && clickintime) 1945 if (MEvent.button == Button3 && clickintime)
1892 selection_rotate (ev.x, ev.y); 1946 selection_rotate (ev.x, ev.y);
1893 else 1947 else
1894 selection_extend (ev.x, ev.y, 1); 1948 selection_extend (ev.x, ev.y, 1);
1895 1949
1896 MEvent.button = Button3; 1950 MEvent.button = Button3;
1897 break; 1951 break;
1898 } 1952 }
1899 } 1953 }
1900 1954
1901 MEvent.time = ev.time; 1955 MEvent.time = ev.time;
1902 return; 1956 return;
1903 } 1957 }
1904 1958
… …
2040 } 2094 }
2041 2095
2042 break; 2096 break;
2043 } 2097 }
2044 } 2098 }
2099
2045 return; 2100 return;
2046 } 2101 }
2102
2047#if MENUBAR 2103#if MENUBAR
2048 /* 2104 /*
2049 * Menubar window processing of button press 2105 * Menubar window processing of button press
2050 */ 2106 */
2051 if (isMenuBarWindow (ev.window)) 2107 if (isMenuBarWindow (ev.window))
… …
2113 */ 2169 */
2114 if (priv_modes & PrivMode_mouse_report 2170 if (priv_modes & PrivMode_mouse_report
2115 && bypass_keystate 2171 && bypass_keystate
2116 && ev.button == Button1 && MEvent.clicks <= 1) 2172 && ev.button == Button1 && MEvent.clicks <= 1)
2117 selection_extend (ev.x, ev.y, 0); 2173 selection_extend (ev.x, ev.y, 0);
2174
2175 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2176 return;
2118 2177
2119 switch (ev.button) 2178 switch (ev.button)
2120 { 2179 {
2121 case Button1: 2180 case Button1:
2122 case Button3: 2181 case Button3:
… …
2667 2726
2668bool 2727bool
2669rxvt_term::cmd_parse () 2728rxvt_term::cmd_parse ()
2670{ 2729{
2671 bool flag = false; 2730 bool flag = false;
2672 unicode_t ch = NOCHAR; 2731 wchar_t ch = NOCHAR;
2673 unsigned char *seq_begin; // remember start of esc-sequence here 2732 char *seq_begin; // remember start of esc-sequence here
2674 2733
2675 for (;;) 2734 for (;;)
2676 { 2735 {
2677 if (ch == NOCHAR) 2736 if (ch == NOCHAR)
2678 { 2737 {
2679 seq_begin = cmdbuf_ptr; 2738 seq_begin = cmdbuf_ptr;
2680 ch = next_char (); 2739 ch = next_char ();
2681 }
2682 2740
2683 if (ch == NOCHAR) // TODO: improve 2741 if (ch == NOCHAR)
2684 break; 2742 break;
2743 }
2685 2744
2686 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2745 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2687 { 2746 {
2688 if (!seen_input) 2747 if (!seen_input)
2689 { 2748 {
… …
2698 if (seen_resize && cmd_pid) 2757 if (seen_resize && cmd_pid)
2699 kill (-cmd_pid, SIGWINCH); 2758 kill (-cmd_pid, SIGWINCH);
2700 } 2759 }
2701 2760
2702 /* Read a text string from the input buffer */ 2761 /* Read a text string from the input buffer */
2703 unicode_t buf[UBUFSIZ]; 2762 wchar_t buf[UBUFSIZ];
2704 bool refreshnow = false; 2763 bool refreshnow = false;
2705 int nlines = 0; 2764 int nlines = 0;
2706 unicode_t *str = buf; 2765 wchar_t *str = buf;
2707 unicode_t *eol = str + min (ncol, UBUFSIZ); 2766 wchar_t *eol = str + min (ncol, UBUFSIZ);
2708 2767
2709 for (;;) 2768 for (;;)
2710 { 2769 {
2711 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2770 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2712 break; 2771 break;
… …
2730 } 2789 }
2731 2790
2732 // scr_add_lines only works for nlines <= nrow - 1. 2791 // scr_add_lines only works for nlines <= nrow - 1.
2733 if (nlines >= nrow - 1) 2792 if (nlines >= nrow - 1)
2734 { 2793 {
2794 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2735 scr_add_lines (buf, nlines, str - buf); 2795 scr_add_lines (buf, str - buf, nlines);
2796
2736 nlines = 0; 2797 nlines = 0;
2737 str = buf; 2798 str = buf;
2738 eol = str + min (ncol, UBUFSIZ); 2799 eol = str + min (ncol, UBUFSIZ);
2739 } 2800 }
2740 2801
… …
2753 2814
2754 seq_begin = cmdbuf_ptr; 2815 seq_begin = cmdbuf_ptr;
2755 ch = next_char (); 2816 ch = next_char ();
2756 } 2817 }
2757 2818
2819 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2758 scr_add_lines (buf, nlines, str - buf); 2820 scr_add_lines (buf, str - buf, nlines);
2759 2821
2760 /* 2822 /*
2761 * If there have been a lot of new lines, then update the screen 2823 * If there have been a lot of new lines, then update the screen
2762 * What the heck I'll cheat and only refresh less than every page-full. 2824 * What the heck I'll cheat and only refresh less than every page-full.
2763 * the number of pages between refreshes is refresh_limit, which 2825 * the number of pages between refreshes is refresh_limit, which
… …
2794 } 2856 }
2795 2857
2796 return flag; 2858 return flag;
2797} 2859}
2798 2860
2799// read the next octet
2800unicode_t
2801rxvt_term::next_octet ()
2802{
2803 return cmdbuf_ptr < cmdbuf_endp
2804 ? *cmdbuf_ptr++
2805 : NOCHAR;
2806}
2807
2808// read the next character 2861// read the next character
2809unicode_t 2862wchar_t
2810rxvt_term::next_char () 2863rxvt_term::next_char ()
2811{ 2864{
2812 while (cmdbuf_ptr < cmdbuf_endp) 2865 while (cmdbuf_ptr < cmdbuf_endp)
2813 { 2866 {
2814 // assume 7-bit to be ascii ALWAYS 2867 // assume 7-bit to be ascii ALWAYS
2815 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2868 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2816 return *cmdbuf_ptr++; 2869 return *cmdbuf_ptr++;
2817 2870
2818 wchar_t wc; 2871 wchar_t wc;
2819 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);
2820 2873
2821 if (len == (size_t)-2) 2874 if (len == (size_t)-2)
2822 { 2875 {
2823 // the mbstate stores incomplete sequences. didn't know this :/ 2876 // the mbstate stores incomplete sequences. didn't know this :/
2824 cmdbuf_ptr = cmdbuf_endp; 2877 cmdbuf_ptr = cmdbuf_endp;
2825 break; 2878 break;
2826 } 2879 }
2827 2880
2828 if (len == (size_t)-1) 2881 if (len == (size_t)-1)
2829 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2882 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2830 2883
2831 // assume wchar == unicode 2884 // assume wchar == unicode
2832 cmdbuf_ptr += len; 2885 cmdbuf_ptr += len;
2833 return wc & UNICODE_MASK; 2886 return wc & UNICODE_MASK;
2834 } 2887 }
2835 2888
2836 return NOCHAR; 2889 return NOCHAR;
2890}
2891
2892// read the next octet
2893uint32_t
2894rxvt_term::next_octet ()
2895{
2896 return cmdbuf_ptr < cmdbuf_endp
2897 ? (unsigned char)*cmdbuf_ptr++
2898 : NOCHAR;
2837} 2899}
2838 2900
2839/* rxvt_cmd_getc () - Return next input character */ 2901/* rxvt_cmd_getc () - Return next input character */
2840/* 2902/*
2841 * Return the next input character after first passing any keyboard input 2903 * Return the next input character after first passing any keyboard input
2842 * to the command. 2904 * to the command.
2843 */ 2905 */
2844unicode_t 2906wchar_t
2845rxvt_term::cmd_getc () 2907rxvt_term::cmd_getc ()
2846{ 2908{
2847 unicode_t c = next_char (); 2909 wchar_t c = next_char ();
2848 2910
2849 if (c == NOCHAR) 2911 if (c == NOCHAR)
2850 throw out_of_input; 2912 throw out_of_input;
2851 2913
2852 return c; 2914 return c;
2853} 2915}
2854 2916
2855unicode_t 2917uint32_t
2856rxvt_term::cmd_get8 () 2918rxvt_term::cmd_get8 ()
2857{ 2919{
2858 unicode_t c = next_octet (); 2920 uint32_t c = next_octet ();
2859 2921
2860 if (c == NOCHAR) 2922 if (c == NOCHAR)
2861 throw out_of_input; 2923 throw out_of_input;
2862 2924
2863 return c; 2925 return c;
… …
2963 case C0_ESC: 3025 case C0_ESC:
2964 process_escape_seq (); 3026 process_escape_seq ();
2965 break; 3027 break;
2966 case C0_ENQ: /* terminal Status */ 3028 case C0_ENQ: /* terminal Status */
2967 if (rs[Rs_answerbackstring]) 3029 if (rs[Rs_answerbackstring])
2968 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3030 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2969 (unsigned int)strlen (rs[Rs_answerbackstring]));
2970 else 3031 else
2971 tt_write ((unsigned char *)VT100_ANS, 3032 tt_write (VT100_ANS, strlen (VT100_ANS));
2972 (unsigned int)strlen (VT100_ANS));
2973 break; 3033 break;
2974 case C0_BEL: /* bell */ 3034 case C0_BEL: /* bell */
2975 scr_bell (); 3035 scr_bell ();
2976 break; 3036 break;
2977 case C0_BS: /* backspace */ 3037 case C0_BS: /* backspace */
… …
3132 break; 3192 break;
3133 3193
3134 /* 8.3.87: NEXT LINE */ 3194 /* 8.3.87: NEXT LINE */
3135 case C1_NEL: /* ESC E */ 3195 case C1_NEL: /* ESC E */
3136 { 3196 {
3137 unicode_t nlcr[] = { C0_LF, C0_CR }; 3197 wchar_t nlcr[] = { C0_LF, C0_CR };
3138 scr_add_lines (nlcr, 1, 2); 3198 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3139 } 3199 }
3140 break; 3200 break;
3141 3201
3142 /* kidnapped escape sequence: Should be 8.3.48 */ 3202 /* kidnapped escape sequence: Should be 8.3.48 */
3143 case C1_ESA: /* ESC G */ 3203 case C1_ESA: /* ESC G */
… …
3165 process_dcs_seq (); 3225 process_dcs_seq ();
3166 break; 3226 break;
3167 3227
3168 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3228 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3169 case C1_SCI: /* ESC Z */ 3229 case C1_SCI: /* ESC Z */
3170 tt_write ((const unsigned char *)ESCZ_ANSWER, 3230 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3171 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3172 break; /* steal obsolete ESC [ c */ 3231 break; /* steal obsolete ESC [ c */
3173 3232
3174 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3233 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3175 case C1_CSI: /* ESC [ */ 3234 case C1_CSI: /* ESC [ */
3176 process_csi_seq (); 3235 process_csi_seq ();
… …
3420 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3479 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3421 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3480 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3422 break; 3481 break;
3423 3482
3424 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3483 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3425 tt_write ((const unsigned char *)VT100_ANS, 3484 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3426 (unsigned int) (sizeof (VT100_ANS) - 1));
3427 break; 3485 break;
3428 3486
3429 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3487 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3430 process_sgr_mode (nargs, arg); 3488 process_sgr_mode (nargs, arg);
3431 break; 3489 break;
… …
3633/*----------------------------------------------------------------------*/ 3691/*----------------------------------------------------------------------*/
3634/* 3692/*
3635 * get input up until STRING TERMINATOR (or BEL) 3693 * get input up until STRING TERMINATOR (or BEL)
3636 * ends_how is terminator used. returned input must be free()'d 3694 * ends_how is terminator used. returned input must be free()'d
3637 */ 3695 */
3638unsigned char * 3696char *
3639rxvt_term::get_to_st (unicode_t &ends_how) 3697rxvt_term::get_to_st (unicode_t &ends_how)
3640{ 3698{
3641 unicode_t ch; 3699 unicode_t ch;
3642 bool seen_esc = false; 3700 bool seen_esc = false;
3643 unsigned int n = 0; 3701 unsigned int n = 0;
… …
3676 3734
3677 string[n++] = '\0'; 3735 string[n++] = '\0';
3678 3736
3679 ends_how = (ch == 0x5c ? C0_ESC : ch); 3737 ends_how = (ch == 0x5c ? C0_ESC : ch);
3680 3738
3681 return (unsigned char *)rxvt_wcstombs (string); 3739 return rxvt_wcstombs (string);
3682} 3740}
3683 3741
3684/*----------------------------------------------------------------------*/ 3742/*----------------------------------------------------------------------*/
3685/* 3743/*
3686 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3744 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3687 */ 3745 */
3688void 3746void
3689rxvt_term::process_dcs_seq () 3747rxvt_term::process_dcs_seq ()
3690{ 3748{
3691 unsigned char *s; 3749 char *s;
3692 unicode_t eh; 3750 unicode_t eh;
3693 3751
3694 /* 3752 /*
3695 * Not handled yet 3753 * Not handled yet
3696 */ 3754 */
… …
3715 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3773 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3716 arg = arg * 10 + (ch - '0'); 3774 arg = arg * 10 + (ch - '0');
3717 3775
3718 if (ch == ';') 3776 if (ch == ';')
3719 { 3777 {
3720 unsigned char *s = get_to_st (eh); 3778 char *s = get_to_st (eh);
3721 3779
3722 if (s) 3780 if (s)
3723 { 3781 {
3724 process_xterm_seq (arg, (char *)s, eh); 3782 process_xterm_seq (arg, s, eh);
3725 free (s); 3783 free (s);
3726 } 3784 }
3727 } 3785 }
3728} 3786}
3729 3787
3730void 3788void
3731rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3789rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3732{ 3790{
3733 if (str[0] == '?' && !str[1]) 3791 if (str[0] == '?' && !str[1])
3734 { 3792 {
3735 unsigned short r, g, b; 3793 unsigned short r, g, b;
3736 pix_colors_focused[color].get (display, r, g, b); 3794 pix_colors_focused[color].get (display, r, g, b);
… …
3742 3800
3743/* 3801/*
3744 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3802 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3745 */ 3803 */
3746void 3804void
3747rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3805rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3748{ 3806{
3749 int changed = 0; 3807 int changed = 0;
3750 int color; 3808 int color;
3751 char *buf, *name; 3809 char *buf, *name;
3752 bool query = str[0] == '?' && !str[1]; 3810 bool query = str[0] == '?' && !str[1];
… …
3959 } 4017 }
3960 break; 4018 break;
3961 4019
3962 case URxvt_view_up: 4020 case URxvt_view_up:
3963 case URxvt_view_down: 4021 case URxvt_view_down:
4022 {
3964 int lines = atoi (str); 4023 int lines = atoi (str);
3965 4024
3966 if (lines) 4025 if (lines)
3967 scr_page (op == URxvt_view_up ? UP : DN, lines); 4026 scr_page (op == URxvt_view_up ? UP : DN, lines);
3968 else 4027 else
3969 {
3970 scr_erase_savelines (); 4028 scr_erase_savelines ();
3971 } 4029 }
3972 4030
4031 break;
4032#endif
4033
4034#if ENABLE_PERL
4035 case URxvt_perl:
4036 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
4037 ; // no responses yet
3973 break; 4038 break;
3974#endif 4039#endif
3975 } 4040 }
3976} 4041}
3977/*----------------------------------------------------------------------*/ 4042/*----------------------------------------------------------------------*/
… …
4334 scr_color (Color_bg, Color_bg); 4399 scr_color (Color_bg, Color_bg);
4335 break; 4400 break;
4336 4401
4337 //case 50: // not variable spacing 4402 //case 50: // not variable spacing
4338 4403
4339#ifndef NO_BRIGHTCOLOR 4404#if ENABLE_FRILLS
4340 case 90: 4405 case 90:
4341 case 91: /* set bright fg color */ 4406 case 91: /* set bright fg color */
4342 case 92: 4407 case 92:
4343 case 93: 4408 case 93:
4344 case 94: 4409 case 94:
… …
4389 */ 4454 */
4390void 4455void
4391rxvt_term::tt_printf (const char *fmt,...) 4456rxvt_term::tt_printf (const char *fmt,...)
4392{ 4457{
4393 va_list arg_ptr; 4458 va_list arg_ptr;
4394 unsigned char buf[256]; 4459 char buf[256];
4395 4460
4396 va_start (arg_ptr, fmt); 4461 va_start (arg_ptr, fmt);
4397 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4462 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4398 va_end (arg_ptr); 4463 va_end (arg_ptr);
4399 tt_write (buf, strlen (buf)); 4464 tt_write (buf, strlen (buf));
… …
4404 * or generated by us in response to a query ESC sequence. 4469 * or generated by us in response to a query ESC sequence.
4405 */ 4470 */
4406const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4471const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4407 4472
4408void 4473void
4409rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4474rxvt_term::tt_write (const char *data, unsigned int len)
4410{ 4475{
4476 if (pty.pty < 0)
4477 return;
4478
4411 if (v_buflen == 0) 4479 if (v_buflen == 0)
4412 { 4480 {
4413 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4481 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4414 4482
4415 if ((unsigned int)written == len) 4483 if ((unsigned int)written == len)
… …
4417 4485
4418 data += written; 4486 data += written;
4419 len -= written; 4487 len -= written;
4420 } 4488 }
4421 4489
4422 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4490 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4423 4491
4424 memcpy (v_buffer + v_buflen, data, len); 4492 memcpy (v_buffer + v_buflen, data, len);
4425 v_buflen += len; 4493 v_buflen += len;
4426 4494
4427 pty_ev.set (EVENT_READ | EVENT_WRITE); 4495 pty_ev.set (EVENT_READ | EVENT_WRITE);

Diff Legend

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