… | |
… | |
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 */ |
923 | unsigned int |
927 | unsigned int |
924 | rxvt_term::cmd_write (const unsigned char *str, unsigned int count) |
928 | rxvt_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; |
… | |
… | |
1113 | return true; |
1156 | return true; |
1114 | } |
1157 | } |
1115 | else if (r < 0 && (errno == EAGAIN || errno == EINTR)) |
1158 | else if (r < 0 && (errno == EAGAIN || errno == EINTR)) |
1116 | { |
1159 | { |
1117 | #if HAVE_SCHED_YIELD |
1160 | #if HAVE_SCHED_YIELD |
|
|
1161 | if (display->is_local) |
1118 | event_handler.cw_yield.start (); |
1162 | event_handler.cw_yield.start (); |
1119 | #endif |
1163 | #endif |
1120 | } |
1164 | } |
1121 | else |
1165 | else |
1122 | { |
1166 | { |
1123 | pty_ev.stop (); |
1167 | pty_ev.stop (); |
… | |
… | |
1161 | |
1205 | |
1162 | #ifdef POINTER_BLANK |
1206 | #ifdef POINTER_BLANK |
1163 | void |
1207 | void |
1164 | rxvt_term::pointer_blank () |
1208 | rxvt_term::pointer_blank () |
1165 | { |
1209 | { |
1166 | if (! OPTION (Opt_pointerBlank)) |
1210 | if (!OPTION (Opt_pointerBlank)) |
1167 | return; |
1211 | return; |
1168 | |
1212 | |
1169 | XDefineCursor (display->display, vt, display->blank_cursor); |
1213 | XDefineCursor (display->display, vt, display->blank_cursor); |
1170 | XFlush (display->display); |
1214 | XFlush (display->display); |
1171 | |
1215 | |
… | |
… | |
1370 | # endif |
1414 | # endif |
1371 | else |
1415 | else |
1372 | iso14755buf = 0; |
1416 | iso14755buf = 0; |
1373 | } |
1417 | } |
1374 | #endif |
1418 | #endif |
|
|
1419 | |
|
|
1420 | if (ev.xany.window == vt |
|
|
1421 | && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END))) |
|
|
1422 | break; |
1375 | |
1423 | |
1376 | #if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) |
1424 | #if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) |
1377 | if (!(ev.xkey.state & ControlMask)) |
1425 | if (!(ev.xkey.state & ControlMask)) |
1378 | slip_wheel_ev.stop (); |
1426 | slip_wheel_ev.stop (); |
1379 | else if (ks == XK_Control_L || ks == XK_Control_R) |
1427 | else if (ks == XK_Control_L || ks == XK_Control_R) |
… | |
… | |
1594 | if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) |
1642 | if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) |
1595 | break; |
1643 | break; |
1596 | |
1644 | |
1597 | if (ev.xany.window == vt) |
1645 | if (ev.xany.window == vt) |
1598 | { |
1646 | { |
|
|
1647 | if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) |
|
|
1648 | ; // nop |
1599 | if (ev.xbutton.state & (Button1Mask | Button3Mask)) |
1649 | else if (ev.xbutton.state & (Button1Mask | Button3Mask)) |
1600 | { |
1650 | { |
1601 | while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) |
1651 | while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) |
1602 | ; |
1652 | ; |
1603 | |
1653 | |
1604 | XQueryPointer (disp, vt, |
1654 | XQueryPointer (disp, vt, |
… | |
… | |
1700 | if (!focus) |
1750 | if (!focus) |
1701 | { |
1751 | { |
1702 | focus = 1; |
1752 | focus = 1; |
1703 | want_refresh = 1; |
1753 | want_refresh = 1; |
1704 | |
1754 | |
1705 | PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); |
1755 | HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); |
1706 | |
1756 | |
1707 | #if USE_XIM |
1757 | #if USE_XIM |
1708 | if (Input_Context != NULL) |
1758 | if (Input_Context != NULL) |
1709 | { |
1759 | { |
1710 | IMSetStatusPosition (); |
1760 | IMSetStatusPosition (); |
… | |
… | |
1731 | if (focus) |
1781 | if (focus) |
1732 | { |
1782 | { |
1733 | focus = 0; |
1783 | focus = 0; |
1734 | want_refresh = 1; |
1784 | want_refresh = 1; |
1735 | |
1785 | |
1736 | PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); |
1786 | HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); |
1737 | |
1787 | |
1738 | #if ENABLE_FRILLS || ISO_14755 |
1788 | #if ENABLE_FRILLS || ISO_14755 |
1739 | if (iso14755buf) |
1789 | if (iso14755buf) |
1740 | { |
1790 | { |
1741 | iso14755buf = 0; |
1791 | iso14755buf = 0; |
… | |
… | |
1794 | rxvt_term::button_press (XButtonEvent &ev) |
1844 | rxvt_term::button_press (XButtonEvent &ev) |
1795 | { |
1845 | { |
1796 | int reportmode = 0, clickintime; |
1846 | int reportmode = 0, clickintime; |
1797 | |
1847 | |
1798 | bypass_keystate = ev.state & (ModMetaMask | ShiftMask); |
1848 | bypass_keystate = ev.state & (ModMetaMask | ShiftMask); |
|
|
1849 | |
1799 | if (!bypass_keystate) |
1850 | if (!bypass_keystate) |
1800 | reportmode = !! (priv_modes & PrivMode_mouse_report); |
1851 | reportmode = !! (priv_modes & PrivMode_mouse_report); |
1801 | |
1852 | |
1802 | /* |
1853 | /* |
1803 | * VT window processing of button press |
1854 | * VT window processing of button press |
… | |
… | |
1823 | #ifdef MOUSE_REPORT_DOUBLECLICK |
1874 | #ifdef MOUSE_REPORT_DOUBLECLICK |
1824 | if (ev.button == MEvent.button && clickintime) |
1875 | if (ev.button == MEvent.button && clickintime) |
1825 | { |
1876 | { |
1826 | /* same button, within alloted time */ |
1877 | /* same button, within alloted time */ |
1827 | MEvent.clicks++; |
1878 | MEvent.clicks++; |
|
|
1879 | |
1828 | if (MEvent.clicks > 1) |
1880 | if (MEvent.clicks > 1) |
1829 | { |
1881 | { |
1830 | /* only report double clicks */ |
1882 | /* only report double clicks */ |
1831 | MEvent.clicks = 2; |
1883 | MEvent.clicks = 2; |
1832 | mouse_report (ev); |
1884 | mouse_report (ev); |
… | |
… | |
1852 | else |
1904 | else |
1853 | { |
1905 | { |
1854 | if (ev.button != MEvent.button) |
1906 | if (ev.button != MEvent.button) |
1855 | MEvent.clicks = 0; |
1907 | MEvent.clicks = 0; |
1856 | |
1908 | |
|
|
1909 | if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END))) |
1857 | switch (ev.button) |
1910 | switch (ev.button) |
1858 | { |
1911 | { |
1859 | case Button1: |
1912 | case Button1: |
1860 | /* allow meta + click to select rectangular areas */ |
1913 | /* allow meta + click to select rectangular areas */ |
1861 | /* should be done in screen.C */ |
1914 | /* should be done in screen.C */ |
1862 | #if ENABLE_FRILLS |
1915 | #if ENABLE_FRILLS |
1863 | selection.rect = !!(ev.state & ModMetaMask); |
1916 | selection.rect = !!(ev.state & ModMetaMask); |
1864 | #else |
1917 | #else |
1865 | selection.rect = false; |
1918 | selection.rect = false; |
1866 | #endif |
1919 | #endif |
1867 | |
1920 | |
1868 | /* allow shift+left click to extend selection */ |
1921 | /* allow shift+left click to extend selection */ |
1869 | if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) |
1922 | if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) |
1870 | { |
1923 | { |
1871 | if (MEvent.button == Button1 && clickintime) |
1924 | if (MEvent.button == Button1 && clickintime) |
1872 | selection_rotate (ev.x, ev.y); |
1925 | selection_rotate (ev.x, ev.y); |
1873 | else |
1926 | else |
1874 | selection_extend (ev.x, ev.y, 1); |
1927 | selection_extend (ev.x, ev.y, 1); |
1875 | } |
1928 | } |
1876 | else |
1929 | else |
1877 | { |
1930 | { |
1878 | if (MEvent.button == Button1 && clickintime) |
1931 | if (MEvent.button == Button1 && clickintime) |
1879 | MEvent.clicks++; |
1932 | MEvent.clicks++; |
1880 | else |
1933 | else |
1881 | MEvent.clicks = 1; |
1934 | MEvent.clicks = 1; |
1882 | |
1935 | |
1883 | selection_click (MEvent.clicks, ev.x, ev.y); |
1936 | selection_click (MEvent.clicks, ev.x, ev.y); |
1884 | } |
1937 | } |
1885 | |
1938 | |
1886 | MEvent.button = Button1; |
1939 | MEvent.button = Button1; |
1887 | break; |
1940 | break; |
1888 | |
1941 | |
1889 | case Button3: |
1942 | case Button3: |
1890 | if (MEvent.button == Button3 && clickintime) |
1943 | if (MEvent.button == Button3 && clickintime) |
1891 | selection_rotate (ev.x, ev.y); |
1944 | selection_rotate (ev.x, ev.y); |
1892 | else |
1945 | else |
1893 | selection_extend (ev.x, ev.y, 1); |
1946 | selection_extend (ev.x, ev.y, 1); |
1894 | |
1947 | |
1895 | MEvent.button = Button3; |
1948 | MEvent.button = Button3; |
1896 | break; |
1949 | break; |
1897 | } |
1950 | } |
1898 | } |
1951 | } |
1899 | |
1952 | |
1900 | MEvent.time = ev.time; |
1953 | MEvent.time = ev.time; |
1901 | return; |
1954 | return; |
1902 | } |
1955 | } |
1903 | |
1956 | |
… | |
… | |
2039 | } |
2092 | } |
2040 | |
2093 | |
2041 | break; |
2094 | break; |
2042 | } |
2095 | } |
2043 | } |
2096 | } |
|
|
2097 | |
2044 | return; |
2098 | return; |
2045 | } |
2099 | } |
|
|
2100 | |
2046 | #if MENUBAR |
2101 | #if MENUBAR |
2047 | /* |
2102 | /* |
2048 | * Menubar window processing of button press |
2103 | * Menubar window processing of button press |
2049 | */ |
2104 | */ |
2050 | if (isMenuBarWindow (ev.window)) |
2105 | if (isMenuBarWindow (ev.window)) |
… | |
… | |
2112 | */ |
2167 | */ |
2113 | if (priv_modes & PrivMode_mouse_report |
2168 | if (priv_modes & PrivMode_mouse_report |
2114 | && bypass_keystate |
2169 | && bypass_keystate |
2115 | && ev.button == Button1 && MEvent.clicks <= 1) |
2170 | && ev.button == Button1 && MEvent.clicks <= 1) |
2116 | selection_extend (ev.x, ev.y, 0); |
2171 | selection_extend (ev.x, ev.y, 0); |
|
|
2172 | |
|
|
2173 | if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) |
|
|
2174 | return; |
2117 | |
2175 | |
2118 | switch (ev.button) |
2176 | switch (ev.button) |
2119 | { |
2177 | { |
2120 | case Button1: |
2178 | case Button1: |
2121 | case Button3: |
2179 | case Button3: |
… | |
… | |
2666 | |
2724 | |
2667 | bool |
2725 | bool |
2668 | rxvt_term::cmd_parse () |
2726 | rxvt_term::cmd_parse () |
2669 | { |
2727 | { |
2670 | bool flag = false; |
2728 | bool flag = false; |
2671 | unicode_t ch = NOCHAR; |
2729 | wchar_t ch = NOCHAR; |
2672 | unsigned char *seq_begin; // remember start of esc-sequence here |
2730 | char *seq_begin; // remember start of esc-sequence here |
2673 | |
2731 | |
2674 | for (;;) |
2732 | for (;;) |
2675 | { |
2733 | { |
2676 | if (ch == NOCHAR) |
2734 | if (ch == NOCHAR) |
2677 | { |
2735 | { |
2678 | seq_begin = cmdbuf_ptr; |
2736 | seq_begin = cmdbuf_ptr; |
2679 | ch = next_char (); |
2737 | ch = next_char (); |
2680 | } |
|
|
2681 | |
2738 | |
2682 | if (ch == NOCHAR) // TODO: improve |
2739 | if (ch == NOCHAR) |
2683 | break; |
2740 | break; |
|
|
2741 | } |
2684 | |
2742 | |
2685 | if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) |
2743 | if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) |
2686 | { |
2744 | { |
2687 | if (!seen_input) |
2745 | if (!seen_input) |
2688 | { |
2746 | { |
… | |
… | |
2697 | if (seen_resize && cmd_pid) |
2755 | if (seen_resize && cmd_pid) |
2698 | kill (-cmd_pid, SIGWINCH); |
2756 | kill (-cmd_pid, SIGWINCH); |
2699 | } |
2757 | } |
2700 | |
2758 | |
2701 | /* Read a text string from the input buffer */ |
2759 | /* Read a text string from the input buffer */ |
2702 | unicode_t buf[UBUFSIZ]; |
2760 | wchar_t buf[UBUFSIZ]; |
2703 | bool refreshnow = false; |
2761 | bool refreshnow = false; |
2704 | int nlines = 0; |
2762 | int nlines = 0; |
2705 | unicode_t *str = buf; |
2763 | wchar_t *str = buf; |
2706 | unicode_t *eol = str + min (ncol, UBUFSIZ); |
2764 | wchar_t *eol = str + min (ncol, UBUFSIZ); |
2707 | |
2765 | |
2708 | for (;;) |
2766 | for (;;) |
2709 | { |
2767 | { |
2710 | if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) |
2768 | if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) |
2711 | break; |
2769 | break; |
… | |
… | |
2729 | } |
2787 | } |
2730 | |
2788 | |
2731 | // scr_add_lines only works for nlines <= nrow - 1. |
2789 | // scr_add_lines only works for nlines <= nrow - 1. |
2732 | if (nlines >= nrow - 1) |
2790 | if (nlines >= nrow - 1) |
2733 | { |
2791 | { |
|
|
2792 | if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) |
2734 | scr_add_lines (buf, nlines, str - buf); |
2793 | scr_add_lines (buf, str - buf, nlines); |
|
|
2794 | |
2735 | nlines = 0; |
2795 | nlines = 0; |
2736 | str = buf; |
2796 | str = buf; |
2737 | eol = str + min (ncol, UBUFSIZ); |
2797 | eol = str + min (ncol, UBUFSIZ); |
2738 | } |
2798 | } |
2739 | |
2799 | |
… | |
… | |
2752 | |
2812 | |
2753 | seq_begin = cmdbuf_ptr; |
2813 | seq_begin = cmdbuf_ptr; |
2754 | ch = next_char (); |
2814 | ch = next_char (); |
2755 | } |
2815 | } |
2756 | |
2816 | |
|
|
2817 | if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) |
2757 | scr_add_lines (buf, nlines, str - buf); |
2818 | scr_add_lines (buf, str - buf, nlines); |
2758 | |
2819 | |
2759 | /* |
2820 | /* |
2760 | * If there have been a lot of new lines, then update the screen |
2821 | * If there have been a lot of new lines, then update the screen |
2761 | * What the heck I'll cheat and only refresh less than every page-full. |
2822 | * What the heck I'll cheat and only refresh less than every page-full. |
2762 | * the number of pages between refreshes is refresh_limit, which |
2823 | * the number of pages between refreshes is refresh_limit, which |
… | |
… | |
2793 | } |
2854 | } |
2794 | |
2855 | |
2795 | return flag; |
2856 | return flag; |
2796 | } |
2857 | } |
2797 | |
2858 | |
2798 | // read the next octet |
|
|
2799 | unicode_t |
|
|
2800 | rxvt_term::next_octet () |
|
|
2801 | { |
|
|
2802 | return cmdbuf_ptr < cmdbuf_endp |
|
|
2803 | ? *cmdbuf_ptr++ |
|
|
2804 | : NOCHAR; |
|
|
2805 | } |
|
|
2806 | |
|
|
2807 | // read the next character |
2859 | // read the next character |
2808 | unicode_t |
2860 | wchar_t |
2809 | rxvt_term::next_char () |
2861 | rxvt_term::next_char () |
2810 | { |
2862 | { |
2811 | while (cmdbuf_ptr < cmdbuf_endp) |
2863 | while (cmdbuf_ptr < cmdbuf_endp) |
2812 | { |
2864 | { |
2813 | // assume 7-bit to be ascii ALWAYS |
2865 | // assume 7-bit to be ascii ALWAYS |
2814 | if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) |
2866 | if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) |
2815 | return *cmdbuf_ptr++; |
2867 | return *cmdbuf_ptr++; |
2816 | |
2868 | |
2817 | wchar_t wc; |
2869 | wchar_t wc; |
2818 | size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); |
2870 | size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); |
2819 | |
2871 | |
2820 | if (len == (size_t)-2) |
2872 | if (len == (size_t)-2) |
2821 | { |
2873 | { |
2822 | // the mbstate stores incomplete sequences. didn't know this :/ |
2874 | // the mbstate stores incomplete sequences. didn't know this :/ |
2823 | cmdbuf_ptr = cmdbuf_endp; |
2875 | cmdbuf_ptr = cmdbuf_endp; |
2824 | break; |
2876 | break; |
2825 | } |
2877 | } |
2826 | |
2878 | |
2827 | if (len == (size_t)-1) |
2879 | if (len == (size_t)-1) |
2828 | return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through |
2880 | return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through |
2829 | |
2881 | |
2830 | // assume wchar == unicode |
2882 | // assume wchar == unicode |
2831 | cmdbuf_ptr += len; |
2883 | cmdbuf_ptr += len; |
2832 | return wc & UNICODE_MASK; |
2884 | return wc & UNICODE_MASK; |
2833 | } |
2885 | } |
2834 | |
2886 | |
2835 | return NOCHAR; |
2887 | return NOCHAR; |
|
|
2888 | } |
|
|
2889 | |
|
|
2890 | // read the next octet |
|
|
2891 | uint32_t |
|
|
2892 | rxvt_term::next_octet () |
|
|
2893 | { |
|
|
2894 | return cmdbuf_ptr < cmdbuf_endp |
|
|
2895 | ? (unsigned char)*cmdbuf_ptr++ |
|
|
2896 | : NOCHAR; |
2836 | } |
2897 | } |
2837 | |
2898 | |
2838 | /* rxvt_cmd_getc () - Return next input character */ |
2899 | /* rxvt_cmd_getc () - Return next input character */ |
2839 | /* |
2900 | /* |
2840 | * Return the next input character after first passing any keyboard input |
2901 | * Return the next input character after first passing any keyboard input |
2841 | * to the command. |
2902 | * to the command. |
2842 | */ |
2903 | */ |
2843 | unicode_t |
2904 | wchar_t |
2844 | rxvt_term::cmd_getc () |
2905 | rxvt_term::cmd_getc () |
2845 | { |
2906 | { |
2846 | unicode_t c = next_char (); |
2907 | wchar_t c = next_char (); |
2847 | |
2908 | |
2848 | if (c == NOCHAR) |
2909 | if (c == NOCHAR) |
2849 | throw out_of_input; |
2910 | throw out_of_input; |
2850 | |
2911 | |
2851 | return c; |
2912 | return c; |
2852 | } |
2913 | } |
2853 | |
2914 | |
2854 | unicode_t |
2915 | uint32_t |
2855 | rxvt_term::cmd_get8 () |
2916 | rxvt_term::cmd_get8 () |
2856 | { |
2917 | { |
2857 | unicode_t c = next_octet (); |
2918 | uint32_t c = next_octet (); |
2858 | |
2919 | |
2859 | if (c == NOCHAR) |
2920 | if (c == NOCHAR) |
2860 | throw out_of_input; |
2921 | throw out_of_input; |
2861 | |
2922 | |
2862 | return c; |
2923 | return c; |
… | |
… | |
2962 | case C0_ESC: |
3023 | case C0_ESC: |
2963 | process_escape_seq (); |
3024 | process_escape_seq (); |
2964 | break; |
3025 | break; |
2965 | case C0_ENQ: /* terminal Status */ |
3026 | case C0_ENQ: /* terminal Status */ |
2966 | if (rs[Rs_answerbackstring]) |
3027 | if (rs[Rs_answerbackstring]) |
2967 | tt_write ((const unsigned char *)rs[Rs_answerbackstring], |
3028 | tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring])); |
2968 | (unsigned int)strlen (rs[Rs_answerbackstring])); |
|
|
2969 | else |
3029 | else |
2970 | tt_write ((unsigned char *)VT100_ANS, |
3030 | tt_write (VT100_ANS, strlen (VT100_ANS)); |
2971 | (unsigned int)strlen (VT100_ANS)); |
|
|
2972 | break; |
3031 | break; |
2973 | case C0_BEL: /* bell */ |
3032 | case C0_BEL: /* bell */ |
2974 | scr_bell (); |
3033 | scr_bell (); |
2975 | break; |
3034 | break; |
2976 | case C0_BS: /* backspace */ |
3035 | case C0_BS: /* backspace */ |
… | |
… | |
3131 | break; |
3190 | break; |
3132 | |
3191 | |
3133 | /* 8.3.87: NEXT LINE */ |
3192 | /* 8.3.87: NEXT LINE */ |
3134 | case C1_NEL: /* ESC E */ |
3193 | case C1_NEL: /* ESC E */ |
3135 | { |
3194 | { |
3136 | unicode_t nlcr[] = { C0_LF, C0_CR }; |
3195 | wchar_t nlcr[] = { C0_LF, C0_CR }; |
3137 | scr_add_lines (nlcr, 1, 2); |
3196 | scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); |
3138 | } |
3197 | } |
3139 | break; |
3198 | break; |
3140 | |
3199 | |
3141 | /* kidnapped escape sequence: Should be 8.3.48 */ |
3200 | /* kidnapped escape sequence: Should be 8.3.48 */ |
3142 | case C1_ESA: /* ESC G */ |
3201 | case C1_ESA: /* ESC G */ |
… | |
… | |
3164 | process_dcs_seq (); |
3223 | process_dcs_seq (); |
3165 | break; |
3224 | break; |
3166 | |
3225 | |
3167 | /* 8.3.110: SINGLE CHARACTER INTRODUCER */ |
3226 | /* 8.3.110: SINGLE CHARACTER INTRODUCER */ |
3168 | case C1_SCI: /* ESC Z */ |
3227 | case C1_SCI: /* ESC Z */ |
3169 | tt_write ((const unsigned char *)ESCZ_ANSWER, |
3228 | tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1); |
3170 | (unsigned int) (sizeof (ESCZ_ANSWER) - 1)); |
|
|
3171 | break; /* steal obsolete ESC [ c */ |
3229 | break; /* steal obsolete ESC [ c */ |
3172 | |
3230 | |
3173 | /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ |
3231 | /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ |
3174 | case C1_CSI: /* ESC [ */ |
3232 | case C1_CSI: /* ESC [ */ |
3175 | process_csi_seq (); |
3233 | process_csi_seq (); |
… | |
… | |
3419 | case CSI_SU: /* 8.3.148: (1) SCROLL UP */ |
3477 | case CSI_SU: /* 8.3.148: (1) SCROLL UP */ |
3420 | scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); |
3478 | scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); |
3421 | break; |
3479 | break; |
3422 | |
3480 | |
3423 | case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ |
3481 | case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ |
3424 | tt_write ((const unsigned char *)VT100_ANS, |
3482 | tt_write (VT100_ANS, sizeof (VT100_ANS) - 1); |
3425 | (unsigned int) (sizeof (VT100_ANS) - 1)); |
|
|
3426 | break; |
3483 | break; |
3427 | |
3484 | |
3428 | case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ |
3485 | case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ |
3429 | process_sgr_mode (nargs, arg); |
3486 | process_sgr_mode (nargs, arg); |
3430 | break; |
3487 | break; |
… | |
… | |
3632 | /*----------------------------------------------------------------------*/ |
3689 | /*----------------------------------------------------------------------*/ |
3633 | /* |
3690 | /* |
3634 | * get input up until STRING TERMINATOR (or BEL) |
3691 | * get input up until STRING TERMINATOR (or BEL) |
3635 | * ends_how is terminator used. returned input must be free()'d |
3692 | * ends_how is terminator used. returned input must be free()'d |
3636 | */ |
3693 | */ |
3637 | unsigned char * |
3694 | char * |
3638 | rxvt_term::get_to_st (unicode_t &ends_how) |
3695 | rxvt_term::get_to_st (unicode_t &ends_how) |
3639 | { |
3696 | { |
3640 | unicode_t ch; |
3697 | unicode_t ch; |
3641 | bool seen_esc = false; |
3698 | bool seen_esc = false; |
3642 | unsigned int n = 0; |
3699 | unsigned int n = 0; |
… | |
… | |
3675 | |
3732 | |
3676 | string[n++] = '\0'; |
3733 | string[n++] = '\0'; |
3677 | |
3734 | |
3678 | ends_how = (ch == 0x5c ? C0_ESC : ch); |
3735 | ends_how = (ch == 0x5c ? C0_ESC : ch); |
3679 | |
3736 | |
3680 | return (unsigned char *)rxvt_wcstombs (string); |
3737 | return rxvt_wcstombs (string); |
3681 | } |
3738 | } |
3682 | |
3739 | |
3683 | /*----------------------------------------------------------------------*/ |
3740 | /*----------------------------------------------------------------------*/ |
3684 | /* |
3741 | /* |
3685 | * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' |
3742 | * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' |
3686 | */ |
3743 | */ |
3687 | void |
3744 | void |
3688 | rxvt_term::process_dcs_seq () |
3745 | rxvt_term::process_dcs_seq () |
3689 | { |
3746 | { |
3690 | unsigned char *s; |
3747 | char *s; |
3691 | unicode_t eh; |
3748 | unicode_t eh; |
3692 | |
3749 | |
3693 | /* |
3750 | /* |
3694 | * Not handled yet |
3751 | * Not handled yet |
3695 | */ |
3752 | */ |
… | |
… | |
3714 | for (arg = 0; isdigit (ch); ch = cmd_getc ()) |
3771 | for (arg = 0; isdigit (ch); ch = cmd_getc ()) |
3715 | arg = arg * 10 + (ch - '0'); |
3772 | arg = arg * 10 + (ch - '0'); |
3716 | |
3773 | |
3717 | if (ch == ';') |
3774 | if (ch == ';') |
3718 | { |
3775 | { |
3719 | unsigned char *s = get_to_st (eh); |
3776 | char *s = get_to_st (eh); |
3720 | |
3777 | |
3721 | if (s) |
3778 | if (s) |
3722 | { |
3779 | { |
3723 | process_xterm_seq (arg, (char *)s, eh); |
3780 | process_xterm_seq (arg, s, eh); |
3724 | free (s); |
3781 | free (s); |
3725 | } |
3782 | } |
3726 | } |
3783 | } |
3727 | } |
3784 | } |
3728 | |
3785 | |
3729 | void |
3786 | void |
3730 | rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) |
3787 | rxvt_term::process_color_seq (int report, int color, const char *str, char resp) |
3731 | { |
3788 | { |
3732 | if (str[0] == '?' && !str[1]) |
3789 | if (str[0] == '?' && !str[1]) |
3733 | { |
3790 | { |
3734 | unsigned short r, g, b; |
3791 | unsigned short r, g, b; |
3735 | pix_colors_focused[color].get (display, r, g, b); |
3792 | pix_colors_focused[color].get (display, r, g, b); |
… | |
… | |
3741 | |
3798 | |
3742 | /* |
3799 | /* |
3743 | * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) |
3800 | * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) |
3744 | */ |
3801 | */ |
3745 | void |
3802 | void |
3746 | rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) |
3803 | rxvt_term::process_xterm_seq (int op, const char *str, char resp) |
3747 | { |
3804 | { |
3748 | int changed = 0; |
3805 | int changed = 0; |
3749 | int color; |
3806 | int color; |
3750 | char *buf, *name; |
3807 | char *buf, *name; |
3751 | bool query = str[0] == '?' && !str[1]; |
3808 | bool query = str[0] == '?' && !str[1]; |
… | |
… | |
3958 | } |
4015 | } |
3959 | break; |
4016 | break; |
3960 | |
4017 | |
3961 | case URxvt_view_up: |
4018 | case URxvt_view_up: |
3962 | case URxvt_view_down: |
4019 | case URxvt_view_down: |
|
|
4020 | { |
3963 | int lines = atoi (str); |
4021 | int lines = atoi (str); |
3964 | |
4022 | |
3965 | if (lines) |
4023 | if (lines) |
3966 | scr_page (op == URxvt_view_up ? UP : DN, lines); |
4024 | scr_page (op == URxvt_view_up ? UP : DN, lines); |
3967 | else |
4025 | else |
3968 | { |
|
|
3969 | scr_erase_savelines (); |
4026 | scr_erase_savelines (); |
3970 | } |
4027 | } |
3971 | |
4028 | |
|
|
4029 | break; |
|
|
4030 | #endif |
|
|
4031 | |
|
|
4032 | #if ENABLE_PERL |
|
|
4033 | case URxvt_perl: |
|
|
4034 | if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) |
|
|
4035 | ; // no responses yet |
3972 | break; |
4036 | break; |
3973 | #endif |
4037 | #endif |
3974 | } |
4038 | } |
3975 | } |
4039 | } |
3976 | /*----------------------------------------------------------------------*/ |
4040 | /*----------------------------------------------------------------------*/ |
… | |
… | |
4333 | scr_color (Color_bg, Color_bg); |
4397 | scr_color (Color_bg, Color_bg); |
4334 | break; |
4398 | break; |
4335 | |
4399 | |
4336 | //case 50: // not variable spacing |
4400 | //case 50: // not variable spacing |
4337 | |
4401 | |
4338 | #ifndef NO_BRIGHTCOLOR |
4402 | #if ENABLE_FRILLS |
4339 | case 90: |
4403 | case 90: |
4340 | case 91: /* set bright fg color */ |
4404 | case 91: /* set bright fg color */ |
4341 | case 92: |
4405 | case 92: |
4342 | case 93: |
4406 | case 93: |
4343 | case 94: |
4407 | case 94: |
… | |
… | |
4388 | */ |
4452 | */ |
4389 | void |
4453 | void |
4390 | rxvt_term::tt_printf (const char *fmt,...) |
4454 | rxvt_term::tt_printf (const char *fmt,...) |
4391 | { |
4455 | { |
4392 | va_list arg_ptr; |
4456 | va_list arg_ptr; |
4393 | unsigned char buf[256]; |
4457 | char buf[256]; |
4394 | |
4458 | |
4395 | va_start (arg_ptr, fmt); |
4459 | va_start (arg_ptr, fmt); |
4396 | vsnprintf ((char *)buf, 256, fmt, arg_ptr); |
4460 | vsnprintf ((char *)buf, 256, fmt, arg_ptr); |
4397 | va_end (arg_ptr); |
4461 | va_end (arg_ptr); |
4398 | tt_write (buf, strlen (buf)); |
4462 | tt_write (buf, strlen (buf)); |
… | |
… | |
4403 | * or generated by us in response to a query ESC sequence. |
4467 | * or generated by us in response to a query ESC sequence. |
4404 | */ |
4468 | */ |
4405 | const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT |
4469 | const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT |
4406 | |
4470 | |
4407 | void |
4471 | void |
4408 | rxvt_term::tt_write (const unsigned char *data, unsigned int len) |
4472 | rxvt_term::tt_write (const char *data, unsigned int len) |
4409 | { |
4473 | { |
|
|
4474 | if (pty.pty < 0) |
|
|
4475 | return; |
|
|
4476 | |
4410 | if (v_buflen == 0) |
4477 | if (v_buflen == 0) |
4411 | { |
4478 | { |
4412 | ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); |
4479 | ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); |
4413 | |
4480 | |
4414 | if ((unsigned int)written == len) |
4481 | if ((unsigned int)written == len) |
… | |
… | |
4416 | |
4483 | |
4417 | data += written; |
4484 | data += written; |
4418 | len -= written; |
4485 | len -= written; |
4419 | } |
4486 | } |
4420 | |
4487 | |
4421 | v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); |
4488 | v_buffer = (char *)realloc (v_buffer, v_buflen + len); |
4422 | |
4489 | |
4423 | memcpy (v_buffer + v_buflen, data, len); |
4490 | memcpy (v_buffer + v_buflen, data, len); |
4424 | v_buflen += len; |
4491 | v_buflen += len; |
4425 | |
4492 | |
4426 | pty_ev.set (EVENT_READ | EVENT_WRITE); |
4493 | pty_ev.set (EVENT_READ | EVENT_WRITE); |