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

Diff Legend

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