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.236 by root, Thu Jan 5 01:04:10 2006 UTC vs.
Revision 1.260 by root, Fri Jan 13 05:04:33 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.
… …
867#endif 867#endif
868 /* nil */ ; 868 /* nil */ ;
869 } 869 }
870 } 870 }
871 871
872 if (HOOK_INVOKE ((this, HOOK_KEY_PRESS, DT_XEVENT, &ev, DT_INT, keysym, DT_STR_LEN, kbuf, len, DT_END)))
873 return;
874
872 if (len <= 0) 875 if (len <= 0)
873 return; /* not mapped */ 876 return; /* not mapped */
874 877
875 if (OPTION (Opt_scrollTtyKeypress)) 878 if (OPTION (Opt_scrollTtyKeypress))
876 if (view_start) 879 if (view_start)
… …
967 } 970 }
968#endif 971#endif
969 972
970 if (want_refresh) 973 if (want_refresh)
971 { 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
972 scr_refresh (refresh_type); 1013 scr_refresh (refresh_type);
973 scrollbar_show (1); 1014 scrollbar_show (1);
974#ifdef USE_XIM 1015#ifdef USE_XIM
975 IMSendSpot (); 1016 IMSendSpot ();
976#endif 1017#endif
… …
1163 1204
1164#ifdef POINTER_BLANK 1205#ifdef POINTER_BLANK
1165void 1206void
1166rxvt_term::pointer_blank () 1207rxvt_term::pointer_blank ()
1167{ 1208{
1168 if (! OPTION (Opt_pointerBlank)) 1209 if (!OPTION (Opt_pointerBlank))
1169 return; 1210 return;
1170 1211
1171 XDefineCursor (display->display, vt, display->blank_cursor); 1212 XDefineCursor (display->display, vt, display->blank_cursor);
1172 XFlush (display->display); 1213 XFlush (display->display);
1173 1214
… …
1270 dDisp; 1311 dDisp;
1271 1312
1272 SET_R (this); 1313 SET_R (this);
1273 SET_LOCALE (locale); 1314 SET_LOCALE (locale);
1274 1315
1275#if defined(CURSOR_BLINK) 1316 if (ev.xany.window == vt
1276 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) 1317 && HOOK_INVOKE ((this, HOOK_X_EVENT, DT_XEVENT, &ev, DT_END)))
1277 { 1318 return;
1278 if (hidden_cursor)
1279 {
1280 hidden_cursor = 0;
1281 want_refresh = 1;
1282 }
1283 1319
1284 cursor_blink_ev.start (NOW + BLINK_INTERVAL); 1320 // for XQueryPointer
1285 }
1286#endif
1287
1288#if defined(POINTER_BLANK)
1289 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1290 {
1291 if (ev.type == MotionNotify
1292 || ev.type == ButtonPress
1293 || ev.type == ButtonRelease)
1294 if (hidden_pointer)
1295 pointer_unblank ();
1296
1297 if (ev.type == KeyPress && hidden_pointer == 0)
1298 pointer_blank ();
1299 }
1300#endif
1301
1302 Window unused_root, unused_child; 1321 Window unused_root, unused_child;
1303 int unused_root_x, unused_root_y; 1322 int unused_root_x, unused_root_y;
1304 unsigned int unused_mask; 1323 unsigned int unused_mask;
1305 1324
1306 switch (ev.type) 1325 switch (ev.type)
… …
1313 1332
1314 break; 1333 break;
1315 1334
1316 case KeyRelease: 1335 case KeyRelease:
1317 { 1336 {
1318#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1337#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1319 KeySym ks; 1338 KeySym keysym;
1320 1339
1321 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1340 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1322#endif 1341#endif
1323 1342
1324#if ENABLE_FRILLS || ISO_14755 1343#if ENABLE_FRILLS || ISO_14755
1325 // ISO 14755 support 1344 // ISO 14755 support
1326 if (iso14755buf) 1345 if (iso14755buf)
… …
1331# endif 1350# endif
1332# if ISO_14755 1351# if ISO_14755
1333 // iso14755 part 5.2 handling: release time 1352 // iso14755 part 5.2 handling: release time
1334 // first: controls 1353 // first: controls
1335 if ((ev.xkey.state & ControlMask) 1354 if ((ev.xkey.state & ControlMask)
1336 && ((ks >= 0x40 && ks <= 0x5f) 1355 && ((keysym >= 0x40 && keysym <= 0x5f)
1337 || (ks >= 0x61 && ks <= 0x7f))) 1356 || (keysym >= 0x61 && keysym <= 0x7f)))
1338 { 1357 {
1339 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1358 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1340 commit_iso14755 (); 1359 commit_iso14755 ();
1341 return; // case-break; 1360 goto skip_switch;
1342 } 1361 }
1343 1362
1344 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1363 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1345 if (i[0] == ks) 1364 if (i[0] == keysym)
1346 { 1365 {
1347 iso14755buf = ISO_14755_51 | i[1]; 1366 iso14755buf = ISO_14755_51 | i[1];
1348 commit_iso14755 (); 1367 commit_iso14755 ();
1349 return; // case-break; 1368 goto skip_switch;
1350 } 1369 }
1351 1370
1352 scr_bell (); 1371 scr_bell ();
1353# endif 1372# endif
1354 iso14755buf = 0; 1373 iso14755buf = 0;
… …
1373 else 1392 else
1374 iso14755buf = 0; 1393 iso14755buf = 0;
1375 } 1394 }
1376#endif 1395#endif
1377 1396
1397 if (ev.xany.window == vt
1398 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1399 break;
1400
1378#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1401#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1379 if (!(ev.xkey.state & ControlMask)) 1402 if (!(ev.xkey.state & ControlMask))
1380 slip_wheel_ev.stop (); 1403 slip_wheel_ev.stop ();
1381 else if (ks == XK_Control_L || ks == XK_Control_R) 1404 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1382 mouse_slip_wheel_speed = 0; 1405 mouse_slip_wheel_speed = 0;
1383#endif 1406#endif
1384 break; 1407 break;
1385 } 1408 }
1386 1409
… …
1516 1539
1517 case SelectionRequest: 1540 case SelectionRequest:
1518 selection_send (ev.xselectionrequest); 1541 selection_send (ev.xselectionrequest);
1519 break; 1542 break;
1520 1543
1544 case MapNotify:
1545 mapped = 1;
1546#ifdef TEXT_BLINK
1547 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1548#endif
1549 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1550 break;
1551
1521 case UnmapNotify: 1552 case UnmapNotify:
1522 mapped = 0; 1553 mapped = 0;
1523#ifdef TEXT_BLINK 1554#ifdef TEXT_BLINK
1524 text_blink_ev.stop (); 1555 text_blink_ev.stop ();
1525#endif 1556#endif
1526 break; 1557 HOOK_INVOKE ((this, HOOK_UNMAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1527
1528 case MapNotify:
1529 mapped = 1;
1530#ifdef TEXT_BLINK
1531 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1532#endif
1533 break; 1558 break;
1534 1559
1535#ifdef TRANSPARENT 1560#ifdef TRANSPARENT
1536 case ReparentNotify: 1561 case ReparentNotify:
1537 rootwin_cb (ev); 1562 rootwin_cb (ev);
… …
1551 1576
1552 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1577 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1553 scr_expose (ev.xexpose.x, ev.xexpose.y, 1578 scr_expose (ev.xexpose.x, ev.xexpose.y,
1554 ev.xexpose.width, ev.xexpose.height, False); 1579 ev.xexpose.width, ev.xexpose.height, False);
1555 1580
1556 scr_refresh (refresh_type); 1581 want_refresh = 1;
1557 } 1582 }
1558 else 1583 else
1559 { 1584 {
1560 XEvent unused_event; 1585 XEvent unused_event;
1561 1586
… …
1580#endif 1605#endif
1581 } 1606 }
1582 break; 1607 break;
1583 1608
1584 case MotionNotify: 1609 case MotionNotify:
1610 printf ("motion notify\n");//D
1585#ifdef POINTER_BLANK 1611#ifdef POINTER_BLANK
1586 if (hidden_pointer) 1612 if (hidden_pointer)
1587 pointer_unblank (); 1613 pointer_unblank ();
1588#endif 1614#endif
1589#if MENUBAR 1615#if MENUBAR
… …
1596 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1622 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1597 break; 1623 break;
1598 1624
1599 if (ev.xany.window == vt) 1625 if (ev.xany.window == vt)
1600 { 1626 {
1627 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1628 ; // nop
1601 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1629 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1602 { 1630 {
1603 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1631 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1604 ; 1632 ;
1605 1633
1606 XQueryPointer (disp, vt, 1634 XQueryPointer (disp, vt,
… …
1686 &unused_root_x, &unused_root_y, 1714 &unused_root_x, &unused_root_y,
1687 &ev.xbutton.x, &ev.xbutton.y, 1715 &ev.xbutton.x, &ev.xbutton.y,
1688 &unused_mask); 1716 &unused_mask);
1689 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1717 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1690 scrollbar_size ()); 1718 scrollbar_size ());
1691 scr_refresh (refresh_type); 1719 want_refresh = 1;
1692 refresh_limit = 0; 1720 refresh_limit = 0;
1693 scrollbar_show (1); 1721 scrollbar_show (1);
1694 } 1722 }
1695 break; 1723 break;
1696 } 1724 }
1725
1726skip_switch: ;
1727
1728#if defined(CURSOR_BLINK)
1729 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1730 {
1731 if (hidden_cursor)
1732 {
1733 hidden_cursor = 0;
1734 want_refresh = 1;
1735 }
1736
1737 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1738 }
1739#endif
1740
1741#if defined(POINTER_BLANK)
1742 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1743 {
1744 if (ev.type == MotionNotify
1745 || ev.type == ButtonPress
1746 || ev.type == ButtonRelease)
1747 if (hidden_pointer)
1748 pointer_unblank ();
1749
1750 if (ev.type == KeyPress && hidden_pointer == 0)
1751 pointer_blank ();
1752 }
1753#endif
1697} 1754}
1698 1755
1699void 1756void
1700rxvt_term::focus_in () 1757rxvt_term::focus_in ()
1701{ 1758{
1702 if (!focus) 1759 if (!focus)
1703 { 1760 {
1704 focus = 1; 1761 focus = 1;
1705 want_refresh = 1; 1762 want_refresh = 1;
1706 1763
1707 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1764 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1708 1765
1709#if USE_XIM 1766#if USE_XIM
1710 if (Input_Context != NULL) 1767 if (Input_Context != NULL)
1711 { 1768 {
1712 IMSetStatusPosition (); 1769 IMSetStatusPosition ();
… …
1733 if (focus) 1790 if (focus)
1734 { 1791 {
1735 focus = 0; 1792 focus = 0;
1736 want_refresh = 1; 1793 want_refresh = 1;
1737 1794
1738 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1795 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1739 1796
1740#if ENABLE_FRILLS || ISO_14755 1797#if ENABLE_FRILLS || ISO_14755
1741 if (iso14755buf) 1798 if (iso14755buf)
1742 { 1799 {
1743 iso14755buf = 0; 1800 iso14755buf = 0;
… …
1826#ifdef MOUSE_REPORT_DOUBLECLICK 1883#ifdef MOUSE_REPORT_DOUBLECLICK
1827 if (ev.button == MEvent.button && clickintime) 1884 if (ev.button == MEvent.button && clickintime)
1828 { 1885 {
1829 /* same button, within alloted time */ 1886 /* same button, within alloted time */
1830 MEvent.clicks++; 1887 MEvent.clicks++;
1888
1831 if (MEvent.clicks > 1) 1889 if (MEvent.clicks > 1)
1832 { 1890 {
1833 /* only report double clicks */ 1891 /* only report double clicks */
1834 MEvent.clicks = 2; 1892 MEvent.clicks = 2;
1835 mouse_report (ev); 1893 mouse_report (ev);
… …
1855 else 1913 else
1856 { 1914 {
1857 if (ev.button != MEvent.button) 1915 if (ev.button != MEvent.button)
1858 MEvent.clicks = 0; 1916 MEvent.clicks = 0;
1859 1917
1860 if (!PERL_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END))) 1918 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1861 switch (ev.button) 1919 switch (ev.button)
1862 { 1920 {
1863 case Button1: 1921 case Button1:
1864 /* allow meta + click to select rectangular areas */ 1922 /* allow meta + click to select rectangular areas */
1865 /* should be done in screen.C */ 1923 /* should be done in screen.C */
… …
1868#else 1926#else
1869 selection.rect = false; 1927 selection.rect = false;
1870#endif 1928#endif
1871 1929
1872 /* allow shift+left click to extend selection */ 1930 /* allow shift+left click to extend selection */
1873 if (ev.state & ShiftMask && ! (priv_modes & PrivMode_mouse_report)) 1931 if (ev.state & ShiftMask && !(priv_modes & PrivMode_mouse_report))
1874 { 1932 {
1875 if (MEvent.button == Button1 && clickintime) 1933 if (MEvent.button == Button1 && clickintime)
1876 selection_rotate (ev.x, ev.y); 1934 selection_rotate (ev.x, ev.y);
1877 else 1935 else
1878 selection_extend (ev.x, ev.y, 1); 1936 selection_extend (ev.x, ev.y, 1);
… …
2043 } 2101 }
2044 2102
2045 break; 2103 break;
2046 } 2104 }
2047 } 2105 }
2106
2048 return; 2107 return;
2049 } 2108 }
2109
2050#if MENUBAR 2110#if MENUBAR
2051 /* 2111 /*
2052 * Menubar window processing of button press 2112 * Menubar window processing of button press
2053 */ 2113 */
2054 if (isMenuBarWindow (ev.window)) 2114 if (isMenuBarWindow (ev.window))
… …
2117 if (priv_modes & PrivMode_mouse_report 2177 if (priv_modes & PrivMode_mouse_report
2118 && bypass_keystate 2178 && bypass_keystate
2119 && ev.button == Button1 && MEvent.clicks <= 1) 2179 && ev.button == Button1 && MEvent.clicks <= 1)
2120 selection_extend (ev.x, ev.y, 0); 2180 selection_extend (ev.x, ev.y, 0);
2121 2181
2182 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2183 return;
2184
2122 switch (ev.button) 2185 switch (ev.button)
2123 { 2186 {
2124 case Button1: 2187 case Button1:
2125 case Button3: 2188 case Button3:
2126 selection_make (ev.time); 2189 selection_make (ev.time);
… …
2157 slip_wheel_ev.start (); 2220 slip_wheel_ev.start ();
2158 } 2221 }
2159 else 2222 else
2160 { 2223 {
2161# endif 2224# endif
2162# ifdef JUMP_MOUSE_WHEEL
2163 scr_page (v, i); 2225 scr_page (v, i);
2164 scr_refresh (SMOOTH_REFRESH);
2165 scrollbar_show (1); 2226 scrollbar_show (1);
2166# else
2167 while (i--)
2168 {
2169 scr_page (v, 1);
2170 scr_refresh (SMOOTH_REFRESH);
2171 scrollbar_show (1);
2172 }
2173# endif
2174# ifdef MOUSE_SLIP_WHEELING 2227# ifdef MOUSE_SLIP_WHEELING
2175 } 2228 }
2176#endif 2229# endif
2177 } 2230 }
2178 break; 2231 break;
2179#endif 2232#endif
2180 } 2233 }
2181 } 2234 }
… …
2670 2723
2671bool 2724bool
2672rxvt_term::cmd_parse () 2725rxvt_term::cmd_parse ()
2673{ 2726{
2674 bool flag = false; 2727 bool flag = false;
2675 unicode_t ch = NOCHAR; 2728 wchar_t ch = NOCHAR;
2676 char *seq_begin; // remember start of esc-sequence here 2729 char *seq_begin; // remember start of esc-sequence here
2677 2730
2678 for (;;) 2731 for (;;)
2679 { 2732 {
2680 if (ch == NOCHAR) 2733 if (ch == NOCHAR)
2681 { 2734 {
2682 seq_begin = cmdbuf_ptr; 2735 seq_begin = cmdbuf_ptr;
2683 ch = next_char (); 2736 ch = next_char ();
2684 }
2685 2737
2686 if (ch == NOCHAR) // TODO: improve 2738 if (ch == NOCHAR)
2687 break; 2739 break;
2740 }
2688 2741
2689 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2742 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2690 { 2743 {
2691 if (!seen_input) 2744 if (!seen_input)
2692 { 2745 {
… …
2701 if (seen_resize && cmd_pid) 2754 if (seen_resize && cmd_pid)
2702 kill (-cmd_pid, SIGWINCH); 2755 kill (-cmd_pid, SIGWINCH);
2703 } 2756 }
2704 2757
2705 /* Read a text string from the input buffer */ 2758 /* Read a text string from the input buffer */
2706 unicode_t buf[UBUFSIZ]; 2759 wchar_t buf[UBUFSIZ];
2707 bool refreshnow = false; 2760 bool refreshnow = false;
2708 int nlines = 0; 2761 int nlines = 0;
2709 unicode_t *str = buf; 2762 wchar_t *str = buf;
2710 unicode_t *eol = str + min (ncol, UBUFSIZ); 2763 wchar_t *eol = str + min (ncol, UBUFSIZ);
2711 2764
2712 for (;;) 2765 for (;;)
2713 { 2766 {
2714 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2767 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2715 break; 2768 break;
… …
2733 } 2786 }
2734 2787
2735 // scr_add_lines only works for nlines <= nrow - 1. 2788 // scr_add_lines only works for nlines <= nrow - 1.
2736 if (nlines >= nrow - 1) 2789 if (nlines >= nrow - 1)
2737 { 2790 {
2738 if (!PERL_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END))) 2791 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2739 scr_add_lines (buf, nlines, str - buf); 2792 scr_add_lines (buf, str - buf, nlines);
2740 2793
2741 nlines = 0; 2794 nlines = 0;
2742 str = buf; 2795 str = buf;
2743 eol = str + min (ncol, UBUFSIZ); 2796 eol = str + min (ncol, UBUFSIZ);
2744 } 2797 }
… …
2758 2811
2759 seq_begin = cmdbuf_ptr; 2812 seq_begin = cmdbuf_ptr;
2760 ch = next_char (); 2813 ch = next_char ();
2761 } 2814 }
2762 2815
2763 if (!PERL_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END))) 2816 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2764 scr_add_lines (buf, nlines, str - buf); 2817 scr_add_lines (buf, str - buf, nlines);
2765 2818
2766 /* 2819 /*
2767 * If there have been a lot of new lines, then update the screen 2820 * If there have been a lot of new lines, then update the screen
2768 * What the heck I'll cheat and only refresh less than every page-full. 2821 * What the heck I'll cheat and only refresh less than every page-full.
2769 * the number of pages between refreshes is refresh_limit, which 2822 * the number of pages between refreshes is refresh_limit, which
… …
2775 refresh_limit++; 2828 refresh_limit++;
2776 else 2829 else
2777 { 2830 {
2778 flag = true; 2831 flag = true;
2779 scr_refresh (refresh_type); 2832 scr_refresh (refresh_type);
2780 flush_ev.stop (); 2833 want_refresh = 1;
2781 } 2834 }
2782 } 2835 }
2783 2836
2784 } 2837 }
2785 else 2838 else
… …
2800 } 2853 }
2801 2854
2802 return flag; 2855 return flag;
2803} 2856}
2804 2857
2805// read the next octet
2806unicode_t
2807rxvt_term::next_octet ()
2808{
2809 return cmdbuf_ptr < cmdbuf_endp
2810 ? *cmdbuf_ptr++
2811 : NOCHAR;
2812}
2813
2814// read the next character 2858// read the next character
2815unicode_t 2859wchar_t
2816rxvt_term::next_char () 2860rxvt_term::next_char ()
2817{ 2861{
2818 while (cmdbuf_ptr < cmdbuf_endp) 2862 while (cmdbuf_ptr < cmdbuf_endp)
2819 { 2863 {
2820 // assume 7-bit to be ascii ALWAYS 2864 // assume 7-bit to be ascii ALWAYS
… …
2830 cmdbuf_ptr = cmdbuf_endp; 2874 cmdbuf_ptr = cmdbuf_endp;
2831 break; 2875 break;
2832 } 2876 }
2833 2877
2834 if (len == (size_t)-1) 2878 if (len == (size_t)-1)
2835 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2879 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2836 2880
2837 // assume wchar == unicode 2881 // assume wchar == unicode
2838 cmdbuf_ptr += len; 2882 cmdbuf_ptr += len;
2839 return wc & UNICODE_MASK; 2883 return wc & UNICODE_MASK;
2840 } 2884 }
2841 2885
2842 return NOCHAR; 2886 return NOCHAR;
2887}
2888
2889// read the next octet
2890uint32_t
2891rxvt_term::next_octet ()
2892{
2893 return cmdbuf_ptr < cmdbuf_endp
2894 ? (unsigned char)*cmdbuf_ptr++
2895 : NOCHAR;
2843} 2896}
2844 2897
2845/* rxvt_cmd_getc () - Return next input character */ 2898/* rxvt_cmd_getc () - Return next input character */
2846/* 2899/*
2847 * Return the next input character after first passing any keyboard input 2900 * Return the next input character after first passing any keyboard input
2848 * to the command. 2901 * to the command.
2849 */ 2902 */
2850unicode_t 2903wchar_t
2851rxvt_term::cmd_getc () 2904rxvt_term::cmd_getc ()
2852{ 2905{
2853 unicode_t c = next_char (); 2906 wchar_t c = next_char ();
2854 2907
2855 if (c == NOCHAR) 2908 if (c == NOCHAR)
2856 throw out_of_input; 2909 throw out_of_input;
2857 2910
2858 return c; 2911 return c;
2859} 2912}
2860 2913
2861unicode_t 2914uint32_t
2862rxvt_term::cmd_get8 () 2915rxvt_term::cmd_get8 ()
2863{ 2916{
2864 unicode_t c = next_octet (); 2917 uint32_t c = next_octet ();
2865 2918
2866 if (c == NOCHAR) 2919 if (c == NOCHAR)
2867 throw out_of_input; 2920 throw out_of_input;
2868 2921
2869 return c; 2922 return c;
… …
3136 break; 3189 break;
3137 3190
3138 /* 8.3.87: NEXT LINE */ 3191 /* 8.3.87: NEXT LINE */
3139 case C1_NEL: /* ESC E */ 3192 case C1_NEL: /* ESC E */
3140 { 3193 {
3141 unicode_t nlcr[] = { C0_LF, C0_CR }; 3194 wchar_t nlcr[] = { C0_LF, C0_CR };
3142 scr_add_lines (nlcr, 1, 2); 3195 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3143 } 3196 }
3144 break; 3197 break;
3145 3198
3146 /* kidnapped escape sequence: Should be 8.3.48 */ 3199 /* kidnapped escape sequence: Should be 8.3.48 */
3147 case C1_ESA: /* ESC G */ 3200 case C1_ESA: /* ESC G */
… …
3811 { 3864 {
3812 if ((name = strchr (buf, ';')) == NULL) 3865 if ((name = strchr (buf, ';')) == NULL)
3813 break; 3866 break;
3814 3867
3815 *name++ = '\0'; 3868 *name++ = '\0';
3816 color = atoi (buf); 3869 color = atoi (buf) + minCOLOR;
3817 3870
3818 if (color < 0 || color >= TOTAL_COLORS) 3871 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3819 break; 3872 break;
3820 3873
3821 if ((buf = strchr (name, ';')) != NULL) 3874 if ((buf = strchr (name, ';')) != NULL)
3822 *buf++ = '\0'; 3875 *buf++ = '\0';
3823 3876
3824 if (name[0] == '?' && !name[1]) 3877 if (name[0] == '?' && !name[1])
3825 { 3878 {
3826 unsigned short r, g, b; 3879 unsigned short r, g, b;
3827 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3880 pix_colors_focused[color].get (display, r, g, b);
3828 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3881 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3829 } 3882 }
3830 else 3883 else
3831 set_window_color (color + minCOLOR, name); 3884 set_window_color (color, name);
3832 } 3885 }
3833 break; 3886 break;
3834 case XTerm_Color00: 3887 case XTerm_Color00:
3835 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3888 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3836 break; 3889 break;
3837 case XTerm_Color01: 3890 case XTerm_Color01:
3838 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3891 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3839 break; 3892 break;
3840#ifndef NO_CURSORCOLOR 3893#ifndef NO_CURSORCOLOR
3841 case XTerm_Color_cursor: 3894 case XTerm_Color_cursor:
3842 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3895 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3843 break; 3896 break;
… …
3847 break; 3900 break;
3848 case XTerm_Color_pointer_bg: 3901 case XTerm_Color_pointer_bg:
3849 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3902 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3850 break; 3903 break;
3851#ifndef NO_BOLD_UNDERLINE_REVERSE 3904#ifndef NO_BOLD_UNDERLINE_REVERSE
3852 case XTerm_Color_BD:
3853 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3854 break;
3855 case XTerm_Color_UL:
3856 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3857 break;
3858 case XTerm_Color_RV: 3905 case XTerm_Color_RV:
3859 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3906 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3907 break;
3908 case Rxvt_Color_BD:
3909 case URxvt_Color_BD:
3910 process_color_seq (op, Color_BD, str, resp);
3911 break;
3912 case Rxvt_Color_UL:
3913 case URxvt_Color_UL:
3914 process_color_seq (op, Color_UL, str, resp);
3860 break; 3915 break;
3861 case URxvt_Color_IT: 3916 case URxvt_Color_IT:
3862 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3917 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3863 break; 3918 break;
3864#endif 3919#endif
… …
3869 if (am_transparent) 3924 if (am_transparent)
3870 want_full_refresh = want_refresh = 1; 3925 want_full_refresh = want_refresh = 1;
3871 break; 3926 break;
3872#endif 3927#endif
3873 3928
3874 case XTerm_Pixmap: 3929 case Rxvt_Pixmap:
3875 if (*str != ';') 3930 if (*str != ';')
3876 { 3931 {
3877#if XPM_BACKGROUND 3932#if XPM_BACKGROUND
3878 scale_pixmap (""); /* reset to default scaling */ 3933 scale_pixmap (""); /* reset to default scaling */
3879 set_bgPixmap (str); /* change pixmap */ 3934 set_bgPixmap (str); /* change pixmap */
3880#endif
3881 scr_touch (true); 3935 scr_touch (true);
3936#endif
3882 } 3937 }
3938
3883 while ((str = strchr (str, ';')) != NULL) 3939 while ((str = strchr (str, ';')) != NULL)
3884 { 3940 {
3885 str++; 3941 str++;
3886#if XPM_BACKGROUND 3942#if XPM_BACKGROUND
3887 changed += scale_pixmap (str); 3943 changed += scale_pixmap (str);
… …
3890 3946
3891 if (changed) 3947 if (changed)
3892 { 3948 {
3893#ifdef XPM_BACKGROUND 3949#ifdef XPM_BACKGROUND
3894 resize_pixmap (); 3950 resize_pixmap ();
3895#endif
3896 scr_touch (true); 3951 scr_touch (true);
3952#endif
3897 } 3953 }
3898 break; 3954 break;
3899 3955
3900 case XTerm_restoreFG: 3956 case Rxvt_restoreFG:
3901 set_window_color (Color_fg, str); 3957 set_window_color (Color_fg, str);
3902 break; 3958 break;
3903 case XTerm_restoreBG: 3959 case Rxvt_restoreBG:
3904 set_window_color (Color_bg, str); 3960 set_window_color (Color_bg, str);
3905 break; 3961 break;
3906 3962
3907 case XTerm_logfile: 3963 case XTerm_logfile:
3908 // TODO, when secure mode? 3964 // TODO, when secure mode?
… …
3913 if (OPTION (Opt_insecure)) 3969 if (OPTION (Opt_insecure))
3914 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3970 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3915 break; 3971 break;
3916#endif 3972#endif
3917#if 0 3973#if 0
3918 case XTerm_dumpscreen: /* no error notices */ 3974 case Rxvt_dumpscreen: /* no error notices */
3919 { 3975 {
3920 int fd; 3976 int fd;
3921 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3977 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3922 { 3978 {
3923 scr_dump (fd); 3979 scr_dump (fd);
… …
3975 break; 4031 break;
3976#endif 4032#endif
3977 4033
3978#if ENABLE_PERL 4034#if ENABLE_PERL
3979 case URxvt_perl: 4035 case URxvt_perl:
3980 if (PERL_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END))) 4036 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3981 ; // no responses yet 4037 ; // no responses yet
3982 break; 4038 break;
3983#endif 4039#endif
3984 } 4040 }
3985} 4041}
… …
4097 /* extra handling for values with state unkept */ 4153 /* extra handling for values with state unkept */
4098 switch (arg[i]) 4154 switch (arg[i])
4099 { 4155 {
4100#if ENABLE_STYLES 4156#if ENABLE_STYLES
4101 case 1021: 4157 case 1021:
4102 if (mode) 4158 set_option (Opt_intensityStyles, mode);
4103 SET_OPTION (Opt_intensityStyles);
4104 else
4105 CLR_OPTION (Opt_intensityStyles);
4106 4159
4107 scr_touch (true); 4160 scr_touch (true);
4108 break; 4161 break;
4109#endif 4162#endif
4110 case 1048: /* alternative cursor save */ 4163 case 1048: /* alternative cursor save */
… …
4132 case 3: /* 80/132 */ 4185 case 3: /* 80/132 */
4133 if (priv_modes & PrivMode_132OK) 4186 if (priv_modes & PrivMode_132OK)
4134 set_widthheight (((state ? 132 : 80) * fwidth), height); 4187 set_widthheight (((state ? 132 : 80) * fwidth), height);
4135 break; 4188 break;
4136 case 4: /* smooth scrolling */ 4189 case 4: /* smooth scrolling */
4137 if (!state) 4190 set_option (Opt_jumpScroll, !state);
4138 SET_OPTION (Opt_jumpScroll);
4139 else
4140 CLR_OPTION (Opt_jumpScroll);
4141 break; 4191 break;
4142 case 5: /* reverse video */ 4192 case 5: /* reverse video */
4143 scr_rvideo_mode (state); 4193 scr_rvideo_mode (state);
4144 break; 4194 break;
4145 case 6: /* relative/absolute origins */ 4195 case 6: /* relative/absolute origins */
… …
4186#if 0 4236#if 0
4187 case 1001: 4237 case 1001:
4188 break; /* X11 mouse highlighting */ 4238 break; /* X11 mouse highlighting */
4189#endif 4239#endif
4190 case 1010: /* scroll to bottom on TTY output inhibit */ 4240 case 1010: /* scroll to bottom on TTY output inhibit */
4191 if (!state) 4241 set_option (Opt_scrollTtyOutput, !state);
4192 SET_OPTION (Opt_scrollTtyOutput);
4193 else
4194 CLR_OPTION (Opt_scrollTtyOutput);
4195 break; 4242 break;
4196 case 1011: /* scroll to bottom on key press */ 4243 case 1011: /* scroll to bottom on key press */
4197 if (state) 4244 set_option (Opt_scrollTtyKeypress, state);
4198 SET_OPTION (Opt_scrollTtyKeypress);
4199 else
4200 CLR_OPTION (Opt_scrollTtyKeypress);
4201 break; 4245 break;
4202 case 1047: /* secondary screen w/ clearing last */ 4246 case 1047: /* secondary screen w/ clearing last */
4203 if (OPTION (Opt_secondaryScreen)) 4247 if (OPTION (Opt_secondaryScreen))
4204 if (current_screen != PRIMARY) 4248 if (current_screen != PRIMARY)
4205 scr_erase_screen (2); 4249 scr_erase_screen (2);
… …
4415const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4459const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4416 4460
4417void 4461void
4418rxvt_term::tt_write (const char *data, unsigned int len) 4462rxvt_term::tt_write (const char *data, unsigned int len)
4419{ 4463{
4464 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4465 return;
4466
4467 if (pty.pty < 0)
4468 return;
4469
4420 if (v_buflen == 0) 4470 if (v_buflen == 0)
4421 { 4471 {
4422 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));
4423 4473
4424 if ((unsigned int)written == len) 4474 if ((unsigned int)written == len)

Diff Legend

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