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

Diff Legend

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