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.230 by root, Wed Jan 4 00:09:12 2006 UTC vs.
Revision 1.249 by root, Sun Jan 8 01:02:15 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
… …
1268{ 1311{
1269 dDisp; 1312 dDisp;
1270 1313
1271 SET_R (this); 1314 SET_R (this);
1272 SET_LOCALE (locale); 1315 SET_LOCALE (locale);
1273
1274#if defined(CURSOR_BLINK)
1275 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1276 {
1277 if (hidden_cursor)
1278 {
1279 hidden_cursor = 0;
1280 want_refresh = 1;
1281 }
1282
1283 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1284 }
1285#endif
1286
1287#if defined(POINTER_BLANK)
1288 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1289 {
1290 if (ev.type == MotionNotify
1291 || ev.type == ButtonPress
1292 || ev.type == ButtonRelease)
1293 if (hidden_pointer)
1294 pointer_unblank ();
1295
1296 if (ev.type == KeyPress && hidden_pointer == 0)
1297 pointer_blank ();
1298 }
1299#endif
1300 1316
1301 Window unused_root, unused_child; 1317 Window unused_root, unused_child;
1302 int unused_root_x, unused_root_y; 1318 int unused_root_x, unused_root_y;
1303 unsigned int unused_mask; 1319 unsigned int unused_mask;
1304 1320
… …
1335 && ((ks >= 0x40 && ks <= 0x5f) 1351 && ((ks >= 0x40 && ks <= 0x5f)
1336 || (ks >= 0x61 && ks <= 0x7f))) 1352 || (ks >= 0x61 && ks <= 0x7f)))
1337 { 1353 {
1338 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1354 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f);
1339 commit_iso14755 (); 1355 commit_iso14755 ();
1340 return; // case-break; 1356 goto skip_switch;
1341 } 1357 }
1342 1358
1343 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1359 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1344 if (i[0] == ks) 1360 if (i[0] == ks)
1345 { 1361 {
1346 iso14755buf = ISO_14755_51 | i[1]; 1362 iso14755buf = ISO_14755_51 | i[1];
1347 commit_iso14755 (); 1363 commit_iso14755 ();
1348 return; // case-break; 1364 goto skip_switch;
1349 } 1365 }
1350 1366
1351 scr_bell (); 1367 scr_bell ();
1352# endif 1368# endif
1353 iso14755buf = 0; 1369 iso14755buf = 0;
… …
1371# endif 1387# endif
1372 else 1388 else
1373 iso14755buf = 0; 1389 iso14755buf = 0;
1374 } 1390 }
1375#endif 1391#endif
1392
1393 if (ev.xany.window == vt
1394 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END)))
1395 break;
1376 1396
1377#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1397#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1378 if (!(ev.xkey.state & ControlMask)) 1398 if (!(ev.xkey.state & ControlMask))
1379 slip_wheel_ev.stop (); 1399 slip_wheel_ev.stop ();
1380 else if (ks == XK_Control_L || ks == XK_Control_R) 1400 else if (ks == XK_Control_L || ks == XK_Control_R)
… …
1515 1535
1516 case SelectionRequest: 1536 case SelectionRequest:
1517 selection_send (ev.xselectionrequest); 1537 selection_send (ev.xselectionrequest);
1518 break; 1538 break;
1519 1539
1540 case MapNotify:
1541 mapped = 1;
1542#ifdef TEXT_BLINK
1543 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1544#endif
1545 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1546 break;
1547
1520 case UnmapNotify: 1548 case UnmapNotify:
1521 mapped = 0; 1549 mapped = 0;
1522#ifdef TEXT_BLINK 1550#ifdef TEXT_BLINK
1523 text_blink_ev.stop (); 1551 text_blink_ev.stop ();
1524#endif 1552#endif
1525 break; 1553 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; 1554 break;
1533 1555
1534#ifdef TRANSPARENT 1556#ifdef TRANSPARENT
1535 case ReparentNotify: 1557 case ReparentNotify:
1536 rootwin_cb (ev); 1558 rootwin_cb (ev);
… …
1595 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1617 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1596 break; 1618 break;
1597 1619
1598 if (ev.xany.window == vt) 1620 if (ev.xany.window == vt)
1599 { 1621 {
1622 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1623 ; // nop
1600 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1624 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1601 { 1625 {
1602 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1626 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1603 ; 1627 ;
1604 1628
1605 XQueryPointer (disp, vt, 1629 XQueryPointer (disp, vt,
… …
1691 refresh_limit = 0; 1715 refresh_limit = 0;
1692 scrollbar_show (1); 1716 scrollbar_show (1);
1693 } 1717 }
1694 break; 1718 break;
1695 } 1719 }
1720
1721skip_switch: ;
1722
1723#if defined(CURSOR_BLINK)
1724 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1725 {
1726 if (hidden_cursor)
1727 {
1728 hidden_cursor = 0;
1729 want_refresh = 1;
1730 }
1731
1732 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1733 }
1734#endif
1735
1736#if defined(POINTER_BLANK)
1737 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1738 {
1739 if (ev.type == MotionNotify
1740 || ev.type == ButtonPress
1741 || ev.type == ButtonRelease)
1742 if (hidden_pointer)
1743 pointer_unblank ();
1744
1745 if (ev.type == KeyPress && hidden_pointer == 0)
1746 pointer_blank ();
1747 }
1748#endif
1696} 1749}
1697 1750
1698void 1751void
1699rxvt_term::focus_in () 1752rxvt_term::focus_in ()
1700{ 1753{
1701 if (!focus) 1754 if (!focus)
1702 { 1755 {
1703 focus = 1; 1756 focus = 1;
1704 want_refresh = 1; 1757 want_refresh = 1;
1705 1758
1706 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1759 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1707 1760
1708#if USE_XIM 1761#if USE_XIM
1709 if (Input_Context != NULL) 1762 if (Input_Context != NULL)
1710 { 1763 {
1711 IMSetStatusPosition (); 1764 IMSetStatusPosition ();
… …
1732 if (focus) 1785 if (focus)
1733 { 1786 {
1734 focus = 0; 1787 focus = 0;
1735 want_refresh = 1; 1788 want_refresh = 1;
1736 1789
1737 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1790 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1738 1791
1739#if ENABLE_FRILLS || ISO_14755 1792#if ENABLE_FRILLS || ISO_14755
1740 if (iso14755buf) 1793 if (iso14755buf)
1741 { 1794 {
1742 iso14755buf = 0; 1795 iso14755buf = 0;
… …
1825#ifdef MOUSE_REPORT_DOUBLECLICK 1878#ifdef MOUSE_REPORT_DOUBLECLICK
1826 if (ev.button == MEvent.button && clickintime) 1879 if (ev.button == MEvent.button && clickintime)
1827 { 1880 {
1828 /* same button, within alloted time */ 1881 /* same button, within alloted time */
1829 MEvent.clicks++; 1882 MEvent.clicks++;
1883
1830 if (MEvent.clicks > 1) 1884 if (MEvent.clicks > 1)
1831 { 1885 {
1832 /* only report double clicks */ 1886 /* only report double clicks */
1833 MEvent.clicks = 2; 1887 MEvent.clicks = 2;
1834 mouse_report (ev); 1888 mouse_report (ev);
… …
1854 else 1908 else
1855 { 1909 {
1856 if (ev.button != MEvent.button) 1910 if (ev.button != MEvent.button)
1857 MEvent.clicks = 0; 1911 MEvent.clicks = 0;
1858 1912
1859 if (!PERL_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END))) 1913 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1860 switch (ev.button) 1914 switch (ev.button)
1861 { 1915 {
1862 case Button1: 1916 case Button1:
1863 /* allow meta + click to select rectangular areas */ 1917 /* allow meta + click to select rectangular areas */
1864 /* should be done in screen.C */ 1918 /* should be done in screen.C */
… …
2042 } 2096 }
2043 2097
2044 break; 2098 break;
2045 } 2099 }
2046 } 2100 }
2101
2047 return; 2102 return;
2048 } 2103 }
2104
2049#if MENUBAR 2105#if MENUBAR
2050 /* 2106 /*
2051 * Menubar window processing of button press 2107 * Menubar window processing of button press
2052 */ 2108 */
2053 if (isMenuBarWindow (ev.window)) 2109 if (isMenuBarWindow (ev.window))
… …
2115 */ 2171 */
2116 if (priv_modes & PrivMode_mouse_report 2172 if (priv_modes & PrivMode_mouse_report
2117 && bypass_keystate 2173 && bypass_keystate
2118 && ev.button == Button1 && MEvent.clicks <= 1) 2174 && ev.button == Button1 && MEvent.clicks <= 1)
2119 selection_extend (ev.x, ev.y, 0); 2175 selection_extend (ev.x, ev.y, 0);
2176
2177 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2178 return;
2120 2179
2121 switch (ev.button) 2180 switch (ev.button)
2122 { 2181 {
2123 case Button1: 2182 case Button1:
2124 case Button3: 2183 case Button3:
… …
2669 2728
2670bool 2729bool
2671rxvt_term::cmd_parse () 2730rxvt_term::cmd_parse ()
2672{ 2731{
2673 bool flag = false; 2732 bool flag = false;
2674 unicode_t ch = NOCHAR; 2733 wchar_t ch = NOCHAR;
2675 unsigned char *seq_begin; // remember start of esc-sequence here 2734 char *seq_begin; // remember start of esc-sequence here
2676 2735
2677 for (;;) 2736 for (;;)
2678 { 2737 {
2679 if (ch == NOCHAR) 2738 if (ch == NOCHAR)
2680 { 2739 {
2681 seq_begin = cmdbuf_ptr; 2740 seq_begin = cmdbuf_ptr;
2682 ch = next_char (); 2741 ch = next_char ();
2683 }
2684 2742
2685 if (ch == NOCHAR) // TODO: improve 2743 if (ch == NOCHAR)
2686 break; 2744 break;
2745 }
2687 2746
2688 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2747 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2689 { 2748 {
2690 if (!seen_input) 2749 if (!seen_input)
2691 { 2750 {
… …
2700 if (seen_resize && cmd_pid) 2759 if (seen_resize && cmd_pid)
2701 kill (-cmd_pid, SIGWINCH); 2760 kill (-cmd_pid, SIGWINCH);
2702 } 2761 }
2703 2762
2704 /* Read a text string from the input buffer */ 2763 /* Read a text string from the input buffer */
2705 unicode_t buf[UBUFSIZ]; 2764 wchar_t buf[UBUFSIZ];
2706 bool refreshnow = false; 2765 bool refreshnow = false;
2707 int nlines = 0; 2766 int nlines = 0;
2708 unicode_t *str = buf; 2767 wchar_t *str = buf;
2709 unicode_t *eol = str + min (ncol, UBUFSIZ); 2768 wchar_t *eol = str + min (ncol, UBUFSIZ);
2710 2769
2711 for (;;) 2770 for (;;)
2712 { 2771 {
2713 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2772 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2714 break; 2773 break;
… …
2732 } 2791 }
2733 2792
2734 // scr_add_lines only works for nlines <= nrow - 1. 2793 // scr_add_lines only works for nlines <= nrow - 1.
2735 if (nlines >= nrow - 1) 2794 if (nlines >= nrow - 1)
2736 { 2795 {
2796 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2737 scr_add_lines (buf, nlines, str - buf); 2797 scr_add_lines (buf, str - buf, nlines);
2798
2738 nlines = 0; 2799 nlines = 0;
2739 str = buf; 2800 str = buf;
2740 eol = str + min (ncol, UBUFSIZ); 2801 eol = str + min (ncol, UBUFSIZ);
2741 } 2802 }
2742 2803
… …
2755 2816
2756 seq_begin = cmdbuf_ptr; 2817 seq_begin = cmdbuf_ptr;
2757 ch = next_char (); 2818 ch = next_char ();
2758 } 2819 }
2759 2820
2821 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2760 scr_add_lines (buf, nlines, str - buf); 2822 scr_add_lines (buf, str - buf, nlines);
2761 2823
2762 /* 2824 /*
2763 * If there have been a lot of new lines, then update the screen 2825 * If there have been a lot of new lines, then update the screen
2764 * What the heck I'll cheat and only refresh less than every page-full. 2826 * What the heck I'll cheat and only refresh less than every page-full.
2765 * the number of pages between refreshes is refresh_limit, which 2827 * the number of pages between refreshes is refresh_limit, which
… …
2796 } 2858 }
2797 2859
2798 return flag; 2860 return flag;
2799} 2861}
2800 2862
2801// read the next octet
2802unicode_t
2803rxvt_term::next_octet ()
2804{
2805 return cmdbuf_ptr < cmdbuf_endp
2806 ? *cmdbuf_ptr++
2807 : NOCHAR;
2808}
2809
2810// read the next character 2863// read the next character
2811unicode_t 2864wchar_t
2812rxvt_term::next_char () 2865rxvt_term::next_char ()
2813{ 2866{
2814 while (cmdbuf_ptr < cmdbuf_endp) 2867 while (cmdbuf_ptr < cmdbuf_endp)
2815 { 2868 {
2816 // assume 7-bit to be ascii ALWAYS 2869 // assume 7-bit to be ascii ALWAYS
2817 if (*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b) 2870 if ((unsigned char)*cmdbuf_ptr <= 0x7f && *cmdbuf_ptr != 0x1b)
2818 return *cmdbuf_ptr++; 2871 return *cmdbuf_ptr++;
2819 2872
2820 wchar_t wc; 2873 wchar_t wc;
2821 size_t len = mbrtowc (&wc, (char *)cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate); 2874 size_t len = mbrtowc (&wc, cmdbuf_ptr, cmdbuf_endp - cmdbuf_ptr, mbstate);
2822 2875
2823 if (len == (size_t)-2) 2876 if (len == (size_t)-2)
2824 { 2877 {
2825 // the mbstate stores incomplete sequences. didn't know this :/ 2878 // the mbstate stores incomplete sequences. didn't know this :/
2826 cmdbuf_ptr = cmdbuf_endp; 2879 cmdbuf_ptr = cmdbuf_endp;
2827 break; 2880 break;
2828 } 2881 }
2829 2882
2830 if (len == (size_t)-1) 2883 if (len == (size_t)-1)
2831 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2884 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2832 2885
2833 // assume wchar == unicode 2886 // assume wchar == unicode
2834 cmdbuf_ptr += len; 2887 cmdbuf_ptr += len;
2835 return wc & UNICODE_MASK; 2888 return wc & UNICODE_MASK;
2836 } 2889 }
2837 2890
2838 return NOCHAR; 2891 return NOCHAR;
2892}
2893
2894// read the next octet
2895uint32_t
2896rxvt_term::next_octet ()
2897{
2898 return cmdbuf_ptr < cmdbuf_endp
2899 ? (unsigned char)*cmdbuf_ptr++
2900 : NOCHAR;
2839} 2901}
2840 2902
2841/* rxvt_cmd_getc () - Return next input character */ 2903/* rxvt_cmd_getc () - Return next input character */
2842/* 2904/*
2843 * Return the next input character after first passing any keyboard input 2905 * Return the next input character after first passing any keyboard input
2844 * to the command. 2906 * to the command.
2845 */ 2907 */
2846unicode_t 2908wchar_t
2847rxvt_term::cmd_getc () 2909rxvt_term::cmd_getc ()
2848{ 2910{
2849 unicode_t c = next_char (); 2911 wchar_t c = next_char ();
2850 2912
2851 if (c == NOCHAR) 2913 if (c == NOCHAR)
2852 throw out_of_input; 2914 throw out_of_input;
2853 2915
2854 return c; 2916 return c;
2855} 2917}
2856 2918
2857unicode_t 2919uint32_t
2858rxvt_term::cmd_get8 () 2920rxvt_term::cmd_get8 ()
2859{ 2921{
2860 unicode_t c = next_octet (); 2922 uint32_t c = next_octet ();
2861 2923
2862 if (c == NOCHAR) 2924 if (c == NOCHAR)
2863 throw out_of_input; 2925 throw out_of_input;
2864 2926
2865 return c; 2927 return c;
… …
2965 case C0_ESC: 3027 case C0_ESC:
2966 process_escape_seq (); 3028 process_escape_seq ();
2967 break; 3029 break;
2968 case C0_ENQ: /* terminal Status */ 3030 case C0_ENQ: /* terminal Status */
2969 if (rs[Rs_answerbackstring]) 3031 if (rs[Rs_answerbackstring])
2970 tt_write ((const unsigned char *)rs[Rs_answerbackstring], 3032 tt_write (rs [Rs_answerbackstring], strlen (rs [Rs_answerbackstring]));
2971 (unsigned int)strlen (rs[Rs_answerbackstring]));
2972 else 3033 else
2973 tt_write ((unsigned char *)VT100_ANS, 3034 tt_write (VT100_ANS, strlen (VT100_ANS));
2974 (unsigned int)strlen (VT100_ANS));
2975 break; 3035 break;
2976 case C0_BEL: /* bell */ 3036 case C0_BEL: /* bell */
2977 scr_bell (); 3037 scr_bell ();
2978 break; 3038 break;
2979 case C0_BS: /* backspace */ 3039 case C0_BS: /* backspace */
… …
3134 break; 3194 break;
3135 3195
3136 /* 8.3.87: NEXT LINE */ 3196 /* 8.3.87: NEXT LINE */
3137 case C1_NEL: /* ESC E */ 3197 case C1_NEL: /* ESC E */
3138 { 3198 {
3139 unicode_t nlcr[] = { C0_LF, C0_CR }; 3199 wchar_t nlcr[] = { C0_LF, C0_CR };
3140 scr_add_lines (nlcr, 1, 2); 3200 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3141 } 3201 }
3142 break; 3202 break;
3143 3203
3144 /* kidnapped escape sequence: Should be 8.3.48 */ 3204 /* kidnapped escape sequence: Should be 8.3.48 */
3145 case C1_ESA: /* ESC G */ 3205 case C1_ESA: /* ESC G */
… …
3167 process_dcs_seq (); 3227 process_dcs_seq ();
3168 break; 3228 break;
3169 3229
3170 /* 8.3.110: SINGLE CHARACTER INTRODUCER */ 3230 /* 8.3.110: SINGLE CHARACTER INTRODUCER */
3171 case C1_SCI: /* ESC Z */ 3231 case C1_SCI: /* ESC Z */
3172 tt_write ((const unsigned char *)ESCZ_ANSWER, 3232 tt_write (ESCZ_ANSWER, sizeof (ESCZ_ANSWER) - 1);
3173 (unsigned int) (sizeof (ESCZ_ANSWER) - 1));
3174 break; /* steal obsolete ESC [ c */ 3233 break; /* steal obsolete ESC [ c */
3175 3234
3176 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */ 3235 /* 8.3.16: CONTROL SEQUENCE INTRODUCER */
3177 case C1_CSI: /* ESC [ */ 3236 case C1_CSI: /* ESC [ */
3178 process_csi_seq (); 3237 process_csi_seq ();
… …
3422 case CSI_SU: /* 8.3.148: (1) SCROLL UP */ 3481 case CSI_SU: /* 8.3.148: (1) SCROLL UP */
3423 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]); 3482 scr_scroll_text (screen.tscroll, screen.bscroll, arg[0]);
3424 break; 3483 break;
3425 3484
3426 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */ 3485 case CSI_DA: /* 8.3.24: (0) DEVICE ATTRIBUTES */
3427 tt_write ((const unsigned char *)VT100_ANS, 3486 tt_write (VT100_ANS, sizeof (VT100_ANS) - 1);
3428 (unsigned int) (sizeof (VT100_ANS) - 1));
3429 break; 3487 break;
3430 3488
3431 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */ 3489 case CSI_SGR: /* 8.3.118: (0) SELECT GRAPHIC RENDITION */
3432 process_sgr_mode (nargs, arg); 3490 process_sgr_mode (nargs, arg);
3433 break; 3491 break;
… …
3635/*----------------------------------------------------------------------*/ 3693/*----------------------------------------------------------------------*/
3636/* 3694/*
3637 * get input up until STRING TERMINATOR (or BEL) 3695 * get input up until STRING TERMINATOR (or BEL)
3638 * ends_how is terminator used. returned input must be free()'d 3696 * ends_how is terminator used. returned input must be free()'d
3639 */ 3697 */
3640unsigned char * 3698char *
3641rxvt_term::get_to_st (unicode_t &ends_how) 3699rxvt_term::get_to_st (unicode_t &ends_how)
3642{ 3700{
3643 unicode_t ch; 3701 unicode_t ch;
3644 bool seen_esc = false; 3702 bool seen_esc = false;
3645 unsigned int n = 0; 3703 unsigned int n = 0;
… …
3678 3736
3679 string[n++] = '\0'; 3737 string[n++] = '\0';
3680 3738
3681 ends_how = (ch == 0x5c ? C0_ESC : ch); 3739 ends_how = (ch == 0x5c ? C0_ESC : ch);
3682 3740
3683 return (unsigned char *)rxvt_wcstombs (string); 3741 return rxvt_wcstombs (string);
3684} 3742}
3685 3743
3686/*----------------------------------------------------------------------*/ 3744/*----------------------------------------------------------------------*/
3687/* 3745/*
3688 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)' 3746 * process DEVICE CONTROL STRING `ESC P ... (ST|BEL)' or `0x90 ... (ST|BEL)'
3689 */ 3747 */
3690void 3748void
3691rxvt_term::process_dcs_seq () 3749rxvt_term::process_dcs_seq ()
3692{ 3750{
3693 unsigned char *s; 3751 char *s;
3694 unicode_t eh; 3752 unicode_t eh;
3695 3753
3696 /* 3754 /*
3697 * Not handled yet 3755 * Not handled yet
3698 */ 3756 */
… …
3717 for (arg = 0; isdigit (ch); ch = cmd_getc ()) 3775 for (arg = 0; isdigit (ch); ch = cmd_getc ())
3718 arg = arg * 10 + (ch - '0'); 3776 arg = arg * 10 + (ch - '0');
3719 3777
3720 if (ch == ';') 3778 if (ch == ';')
3721 { 3779 {
3722 unsigned char *s = get_to_st (eh); 3780 char *s = get_to_st (eh);
3723 3781
3724 if (s) 3782 if (s)
3725 { 3783 {
3726 process_xterm_seq (arg, (char *)s, eh); 3784 process_xterm_seq (arg, s, eh);
3727 free (s); 3785 free (s);
3728 } 3786 }
3729 } 3787 }
3730} 3788}
3731 3789
3732void 3790void
3733rxvt_term::process_color_seq (int report, int color, const char *str, unsigned char resp) 3791rxvt_term::process_color_seq (int report, int color, const char *str, char resp)
3734{ 3792{
3735 if (str[0] == '?' && !str[1]) 3793 if (str[0] == '?' && !str[1])
3736 { 3794 {
3737 unsigned short r, g, b; 3795 unsigned short r, g, b;
3738 pix_colors_focused[color].get (display, r, g, b); 3796 pix_colors_focused[color].get (display, r, g, b);
… …
3744 3802
3745/* 3803/*
3746 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL) 3804 * XTerm escape sequences: ESC ] Ps;Pt (ST|BEL)
3747 */ 3805 */
3748void 3806void
3749rxvt_term::process_xterm_seq (int op, const char *str, unsigned char resp) 3807rxvt_term::process_xterm_seq (int op, const char *str, char resp)
3750{ 3808{
3751 int changed = 0; 3809 int changed = 0;
3752 int color; 3810 int color;
3753 char *buf, *name; 3811 char *buf, *name;
3754 bool query = str[0] == '?' && !str[1]; 3812 bool query = str[0] == '?' && !str[1];
… …
3961 } 4019 }
3962 break; 4020 break;
3963 4021
3964 case URxvt_view_up: 4022 case URxvt_view_up:
3965 case URxvt_view_down: 4023 case URxvt_view_down:
4024 {
3966 int lines = atoi (str); 4025 int lines = atoi (str);
3967 4026
3968 if (lines) 4027 if (lines)
3969 scr_page (op == URxvt_view_up ? UP : DN, lines); 4028 scr_page (op == URxvt_view_up ? UP : DN, lines);
3970 else 4029 else
3971 scr_erase_savelines (); 4030 scr_erase_savelines ();
4031 }
3972 4032
3973 break; 4033 break;
3974#endif 4034#endif
3975 4035
3976#if ENABLE_PERL 4036#if ENABLE_PERL
3977 case URxvt_perl: 4037 case URxvt_perl:
3978 if (PERL_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END))) 4038 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3979 ; // no responses yet 4039 ; // no responses yet
3980 break; 4040 break;
3981
3982#endif 4041#endif
3983
3984 } 4042 }
3985} 4043}
3986/*----------------------------------------------------------------------*/ 4044/*----------------------------------------------------------------------*/
3987 4045
3988/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */ 4046/*{{{ process DEC private mode sequences `ESC [ ? Ps mode' */
… …
4097 /* extra handling for values with state unkept */ 4155 /* extra handling for values with state unkept */
4098 switch (arg[i]) 4156 switch (arg[i])
4099 { 4157 {
4100#if ENABLE_STYLES 4158#if ENABLE_STYLES
4101 case 1021: 4159 case 1021:
4102 if (mode) 4160 set_option (Opt_intensityStyles, mode);
4103 SET_OPTION (Opt_intensityStyles);
4104 else
4105 CLR_OPTION (Opt_intensityStyles);
4106 4161
4107 scr_touch (true); 4162 scr_touch (true);
4108 break; 4163 break;
4109#endif 4164#endif
4110 case 1048: /* alternative cursor save */ 4165 case 1048: /* alternative cursor save */
… …
4132 case 3: /* 80/132 */ 4187 case 3: /* 80/132 */
4133 if (priv_modes & PrivMode_132OK) 4188 if (priv_modes & PrivMode_132OK)
4134 set_widthheight (((state ? 132 : 80) * fwidth), height); 4189 set_widthheight (((state ? 132 : 80) * fwidth), height);
4135 break; 4190 break;
4136 case 4: /* smooth scrolling */ 4191 case 4: /* smooth scrolling */
4137 if (!state) 4192 set_option (Opt_jumpScroll, !state);
4138 SET_OPTION (Opt_jumpScroll);
4139 else
4140 CLR_OPTION (Opt_jumpScroll);
4141 break; 4193 break;
4142 case 5: /* reverse video */ 4194 case 5: /* reverse video */
4143 scr_rvideo_mode (state); 4195 scr_rvideo_mode (state);
4144 break; 4196 break;
4145 case 6: /* relative/absolute origins */ 4197 case 6: /* relative/absolute origins */
… …
4186#if 0 4238#if 0
4187 case 1001: 4239 case 1001:
4188 break; /* X11 mouse highlighting */ 4240 break; /* X11 mouse highlighting */
4189#endif 4241#endif
4190 case 1010: /* scroll to bottom on TTY output inhibit */ 4242 case 1010: /* scroll to bottom on TTY output inhibit */
4191 if (!state) 4243 set_option (Opt_scrollTtyOutput, !state);
4192 SET_OPTION (Opt_scrollTtyOutput);
4193 else
4194 CLR_OPTION (Opt_scrollTtyOutput);
4195 break; 4244 break;
4196 case 1011: /* scroll to bottom on key press */ 4245 case 1011: /* scroll to bottom on key press */
4197 if (state) 4246 set_option (Opt_scrollTtyKeypress, state);
4198 SET_OPTION (Opt_scrollTtyKeypress);
4199 else
4200 CLR_OPTION (Opt_scrollTtyKeypress);
4201 break; 4247 break;
4202 case 1047: /* secondary screen w/ clearing last */ 4248 case 1047: /* secondary screen w/ clearing last */
4203 if (OPTION (Opt_secondaryScreen)) 4249 if (OPTION (Opt_secondaryScreen))
4204 if (current_screen != PRIMARY) 4250 if (current_screen != PRIMARY)
4205 scr_erase_screen (2); 4251 scr_erase_screen (2);
… …
4343 scr_color (Color_bg, Color_bg); 4389 scr_color (Color_bg, Color_bg);
4344 break; 4390 break;
4345 4391
4346 //case 50: // not variable spacing 4392 //case 50: // not variable spacing
4347 4393
4348#ifndef NO_BRIGHTCOLOR 4394#if ENABLE_FRILLS
4349 case 90: 4395 case 90:
4350 case 91: /* set bright fg color */ 4396 case 91: /* set bright fg color */
4351 case 92: 4397 case 92:
4352 case 93: 4398 case 93:
4353 case 94: 4399 case 94:
… …
4398 */ 4444 */
4399void 4445void
4400rxvt_term::tt_printf (const char *fmt,...) 4446rxvt_term::tt_printf (const char *fmt,...)
4401{ 4447{
4402 va_list arg_ptr; 4448 va_list arg_ptr;
4403 unsigned char buf[256]; 4449 char buf[256];
4404 4450
4405 va_start (arg_ptr, fmt); 4451 va_start (arg_ptr, fmt);
4406 vsnprintf ((char *)buf, 256, fmt, arg_ptr); 4452 vsnprintf ((char *)buf, 256, fmt, arg_ptr);
4407 va_end (arg_ptr); 4453 va_end (arg_ptr);
4408 tt_write (buf, strlen (buf)); 4454 tt_write (buf, strlen (buf));
… …
4413 * or generated by us in response to a query ESC sequence. 4459 * or generated by us in response to a query ESC sequence.
4414 */ 4460 */
4415const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4461const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4416 4462
4417void 4463void
4418rxvt_term::tt_write (const unsigned char *data, unsigned int len) 4464rxvt_term::tt_write (const char *data, unsigned int len)
4419{ 4465{
4466 if (pty.pty < 0)
4467 return;
4468
4420 if (v_buflen == 0) 4469 if (v_buflen == 0)
4421 { 4470 {
4422 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4471 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4423 4472
4424 if ((unsigned int)written == len) 4473 if ((unsigned int)written == len)
… …
4426 4475
4427 data += written; 4476 data += written;
4428 len -= written; 4477 len -= written;
4429 } 4478 }
4430 4479
4431 v_buffer = (unsigned char *)realloc (v_buffer, v_buflen + len); 4480 v_buffer = (char *)realloc (v_buffer, v_buflen + len);
4432 4481
4433 memcpy (v_buffer + v_buflen, data, len); 4482 memcpy (v_buffer + v_buflen, data, len);
4434 v_buflen += len; 4483 v_buflen += len;
4435 4484
4436 pty_ev.set (EVENT_READ | EVENT_WRITE); 4485 pty_ev.set (EVENT_READ | EVENT_WRITE);

Diff Legend

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