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

Diff Legend

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