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.235 by root, Wed Jan 4 20:43:37 2006 UTC vs.
Revision 1.257 by root, Wed Jan 11 05:29:40 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)
1276 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1277 {
1278 if (hidden_cursor)
1279 {
1280 hidden_cursor = 0;
1281 want_refresh = 1;
1282 }
1283
1284 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
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; 1316 Window unused_root, unused_child;
1303 int unused_root_x, unused_root_y; 1317 int unused_root_x, unused_root_y;
1304 unsigned int unused_mask; 1318 unsigned int unused_mask;
1305 1319
1306 switch (ev.type) 1320 switch (ev.type)
… …
1313 1327
1314 break; 1328 break;
1315 1329
1316 case KeyRelease: 1330 case KeyRelease:
1317 { 1331 {
1318#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1332#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1319 KeySym ks; 1333 KeySym keysym;
1320 1334
1321 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1335 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1322#endif 1336#endif
1323 1337
1324#if ENABLE_FRILLS || ISO_14755 1338#if ENABLE_FRILLS || ISO_14755
1325 // ISO 14755 support 1339 // ISO 14755 support
1326 if (iso14755buf) 1340 if (iso14755buf)
… …
1331# endif 1345# endif
1332# if ISO_14755 1346# if ISO_14755
1333 // iso14755 part 5.2 handling: release time 1347 // iso14755 part 5.2 handling: release time
1334 // first: controls 1348 // first: controls
1335 if ((ev.xkey.state & ControlMask) 1349 if ((ev.xkey.state & ControlMask)
1336 && ((ks >= 0x40 && ks <= 0x5f) 1350 && ((keysym >= 0x40 && keysym <= 0x5f)
1337 || (ks >= 0x61 && ks <= 0x7f))) 1351 || (keysym >= 0x61 && keysym <= 0x7f)))
1338 { 1352 {
1339 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1353 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1340 commit_iso14755 (); 1354 commit_iso14755 ();
1341 return; // case-break; 1355 goto skip_switch;
1342 } 1356 }
1343 1357
1344 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1358 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1345 if (i[0] == ks) 1359 if (i[0] == keysym)
1346 { 1360 {
1347 iso14755buf = ISO_14755_51 | i[1]; 1361 iso14755buf = ISO_14755_51 | i[1];
1348 commit_iso14755 (); 1362 commit_iso14755 ();
1349 return; // case-break; 1363 goto skip_switch;
1350 } 1364 }
1351 1365
1352 scr_bell (); 1366 scr_bell ();
1353# endif 1367# endif
1354 iso14755buf = 0; 1368 iso14755buf = 0;
… …
1373 else 1387 else
1374 iso14755buf = 0; 1388 iso14755buf = 0;
1375 } 1389 }
1376#endif 1390#endif
1377 1391
1392 if (ev.xany.window == vt
1393 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1394 break;
1395
1378#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1396#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1379 if (!(ev.xkey.state & ControlMask)) 1397 if (!(ev.xkey.state & ControlMask))
1380 slip_wheel_ev.stop (); 1398 slip_wheel_ev.stop ();
1381 else if (ks == XK_Control_L || ks == XK_Control_R) 1399 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1382 mouse_slip_wheel_speed = 0; 1400 mouse_slip_wheel_speed = 0;
1383#endif 1401#endif
1384 break; 1402 break;
1385 } 1403 }
1386 1404
… …
1516 1534
1517 case SelectionRequest: 1535 case SelectionRequest:
1518 selection_send (ev.xselectionrequest); 1536 selection_send (ev.xselectionrequest);
1519 break; 1537 break;
1520 1538
1539 case MapNotify:
1540 mapped = 1;
1541#ifdef TEXT_BLINK
1542 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1543#endif
1544 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1545 break;
1546
1521 case UnmapNotify: 1547 case UnmapNotify:
1522 mapped = 0; 1548 mapped = 0;
1523#ifdef TEXT_BLINK 1549#ifdef TEXT_BLINK
1524 text_blink_ev.stop (); 1550 text_blink_ev.stop ();
1525#endif 1551#endif
1526 break; 1552 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; 1553 break;
1534 1554
1535#ifdef TRANSPARENT 1555#ifdef TRANSPARENT
1536 case ReparentNotify: 1556 case ReparentNotify:
1537 rootwin_cb (ev); 1557 rootwin_cb (ev);
… …
1551 1571
1552 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev)) 1572 while (XCheckTypedWindowEvent (disp, vt, ev.xany.type, &ev))
1553 scr_expose (ev.xexpose.x, ev.xexpose.y, 1573 scr_expose (ev.xexpose.x, ev.xexpose.y,
1554 ev.xexpose.width, ev.xexpose.height, False); 1574 ev.xexpose.width, ev.xexpose.height, False);
1555 1575
1556 scr_refresh (refresh_type); 1576 want_refresh = 1;
1557 } 1577 }
1558 else 1578 else
1559 { 1579 {
1560 XEvent unused_event; 1580 XEvent unused_event;
1561 1581
… …
1596 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1616 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1597 break; 1617 break;
1598 1618
1599 if (ev.xany.window == vt) 1619 if (ev.xany.window == vt)
1600 { 1620 {
1621 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1622 ; // nop
1601 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1623 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1602 { 1624 {
1603 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1625 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1604 ; 1626 ;
1605 1627
1606 XQueryPointer (disp, vt, 1628 XQueryPointer (disp, vt,
… …
1686 &unused_root_x, &unused_root_y, 1708 &unused_root_x, &unused_root_y,
1687 &ev.xbutton.x, &ev.xbutton.y, 1709 &ev.xbutton.x, &ev.xbutton.y,
1688 &unused_mask); 1710 &unused_mask);
1689 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO, 1711 scr_move_to (scrollbar_position (ev.xbutton.y) - csrO,
1690 scrollbar_size ()); 1712 scrollbar_size ());
1691 scr_refresh (refresh_type); 1713 want_refresh = 1;
1692 refresh_limit = 0; 1714 refresh_limit = 0;
1693 scrollbar_show (1); 1715 scrollbar_show (1);
1694 } 1716 }
1695 break; 1717 break;
1696 } 1718 }
1719
1720skip_switch: ;
1721
1722#if defined(CURSOR_BLINK)
1723 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1724 {
1725 if (hidden_cursor)
1726 {
1727 hidden_cursor = 0;
1728 want_refresh = 1;
1729 }
1730
1731 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1732 }
1733#endif
1734
1735#if defined(POINTER_BLANK)
1736 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1737 {
1738 if (ev.type == MotionNotify
1739 || ev.type == ButtonPress
1740 || ev.type == ButtonRelease)
1741 if (hidden_pointer)
1742 pointer_unblank ();
1743
1744 if (ev.type == KeyPress && hidden_pointer == 0)
1745 pointer_blank ();
1746 }
1747#endif
1697} 1748}
1698 1749
1699void 1750void
1700rxvt_term::focus_in () 1751rxvt_term::focus_in ()
1701{ 1752{
1702 if (!focus) 1753 if (!focus)
1703 { 1754 {
1704 focus = 1; 1755 focus = 1;
1705 want_refresh = 1; 1756 want_refresh = 1;
1706 1757
1707 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1758 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1708 1759
1709#if USE_XIM 1760#if USE_XIM
1710 if (Input_Context != NULL) 1761 if (Input_Context != NULL)
1711 { 1762 {
1712 IMSetStatusPosition (); 1763 IMSetStatusPosition ();
… …
1733 if (focus) 1784 if (focus)
1734 { 1785 {
1735 focus = 0; 1786 focus = 0;
1736 want_refresh = 1; 1787 want_refresh = 1;
1737 1788
1738 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1789 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1739 1790
1740#if ENABLE_FRILLS || ISO_14755 1791#if ENABLE_FRILLS || ISO_14755
1741 if (iso14755buf) 1792 if (iso14755buf)
1742 { 1793 {
1743 iso14755buf = 0; 1794 iso14755buf = 0;
… …
1826#ifdef MOUSE_REPORT_DOUBLECLICK 1877#ifdef MOUSE_REPORT_DOUBLECLICK
1827 if (ev.button == MEvent.button && clickintime) 1878 if (ev.button == MEvent.button && clickintime)
1828 { 1879 {
1829 /* same button, within alloted time */ 1880 /* same button, within alloted time */
1830 MEvent.clicks++; 1881 MEvent.clicks++;
1882
1831 if (MEvent.clicks > 1) 1883 if (MEvent.clicks > 1)
1832 { 1884 {
1833 /* only report double clicks */ 1885 /* only report double clicks */
1834 MEvent.clicks = 2; 1886 MEvent.clicks = 2;
1835 mouse_report (ev); 1887 mouse_report (ev);
… …
1855 else 1907 else
1856 { 1908 {
1857 if (ev.button != MEvent.button) 1909 if (ev.button != MEvent.button)
1858 MEvent.clicks = 0; 1910 MEvent.clicks = 0;
1859 1911
1860 if (!PERL_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END))) 1912 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1861 switch (ev.button) 1913 switch (ev.button)
1862 { 1914 {
1863 case Button1: 1915 case Button1:
1864 /* allow meta + click to select rectangular areas */ 1916 /* allow meta + click to select rectangular areas */
1865 /* should be done in screen.C */ 1917 /* should be done in screen.C */
… …
2043 } 2095 }
2044 2096
2045 break; 2097 break;
2046 } 2098 }
2047 } 2099 }
2100
2048 return; 2101 return;
2049 } 2102 }
2103
2050#if MENUBAR 2104#if MENUBAR
2051 /* 2105 /*
2052 * Menubar window processing of button press 2106 * Menubar window processing of button press
2053 */ 2107 */
2054 if (isMenuBarWindow (ev.window)) 2108 if (isMenuBarWindow (ev.window))
… …
2117 if (priv_modes & PrivMode_mouse_report 2171 if (priv_modes & PrivMode_mouse_report
2118 && bypass_keystate 2172 && bypass_keystate
2119 && ev.button == Button1 && MEvent.clicks <= 1) 2173 && ev.button == Button1 && MEvent.clicks <= 1)
2120 selection_extend (ev.x, ev.y, 0); 2174 selection_extend (ev.x, ev.y, 0);
2121 2175
2176 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2177 return;
2178
2122 switch (ev.button) 2179 switch (ev.button)
2123 { 2180 {
2124 case Button1: 2181 case Button1:
2125 case Button3: 2182 case Button3:
2126 selection_make (ev.time); 2183 selection_make (ev.time);
… …
2157 slip_wheel_ev.start (); 2214 slip_wheel_ev.start ();
2158 } 2215 }
2159 else 2216 else
2160 { 2217 {
2161# endif 2218# endif
2162# ifdef JUMP_MOUSE_WHEEL
2163 scr_page (v, i); 2219 scr_page (v, i);
2164 scr_refresh (SMOOTH_REFRESH);
2165 scrollbar_show (1); 2220 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 2221# ifdef MOUSE_SLIP_WHEELING
2175 } 2222 }
2176#endif 2223# endif
2177 } 2224 }
2178 break; 2225 break;
2179#endif 2226#endif
2180 } 2227 }
2181 } 2228 }
… …
2670 2717
2671bool 2718bool
2672rxvt_term::cmd_parse () 2719rxvt_term::cmd_parse ()
2673{ 2720{
2674 bool flag = false; 2721 bool flag = false;
2675 unicode_t ch = NOCHAR; 2722 wchar_t ch = NOCHAR;
2676 char *seq_begin; // remember start of esc-sequence here 2723 char *seq_begin; // remember start of esc-sequence here
2677 2724
2678 for (;;) 2725 for (;;)
2679 { 2726 {
2680 if (ch == NOCHAR) 2727 if (ch == NOCHAR)
2681 { 2728 {
2682 seq_begin = cmdbuf_ptr; 2729 seq_begin = cmdbuf_ptr;
2683 ch = next_char (); 2730 ch = next_char ();
2684 }
2685 2731
2686 if (ch == NOCHAR) // TODO: improve 2732 if (ch == NOCHAR)
2687 break; 2733 break;
2734 }
2688 2735
2689 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2736 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2690 { 2737 {
2691 if (!seen_input) 2738 if (!seen_input)
2692 { 2739 {
… …
2701 if (seen_resize && cmd_pid) 2748 if (seen_resize && cmd_pid)
2702 kill (-cmd_pid, SIGWINCH); 2749 kill (-cmd_pid, SIGWINCH);
2703 } 2750 }
2704 2751
2705 /* Read a text string from the input buffer */ 2752 /* Read a text string from the input buffer */
2706 unicode_t buf[UBUFSIZ]; 2753 wchar_t buf[UBUFSIZ];
2707 bool refreshnow = false; 2754 bool refreshnow = false;
2708 int nlines = 0; 2755 int nlines = 0;
2709 unicode_t *str = buf; 2756 wchar_t *str = buf;
2710 unicode_t *eol = str + min (ncol, UBUFSIZ); 2757 wchar_t *eol = str + min (ncol, UBUFSIZ);
2711 2758
2712 for (;;) 2759 for (;;)
2713 { 2760 {
2714 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2761 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2715 break; 2762 break;
… …
2733 } 2780 }
2734 2781
2735 // scr_add_lines only works for nlines <= nrow - 1. 2782 // scr_add_lines only works for nlines <= nrow - 1.
2736 if (nlines >= nrow - 1) 2783 if (nlines >= nrow - 1)
2737 { 2784 {
2785 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2738 scr_add_lines (buf, nlines, str - buf); 2786 scr_add_lines (buf, str - buf, nlines);
2787
2739 nlines = 0; 2788 nlines = 0;
2740 str = buf; 2789 str = buf;
2741 eol = str + min (ncol, UBUFSIZ); 2790 eol = str + min (ncol, UBUFSIZ);
2742 } 2791 }
2743 2792
… …
2756 2805
2757 seq_begin = cmdbuf_ptr; 2806 seq_begin = cmdbuf_ptr;
2758 ch = next_char (); 2807 ch = next_char ();
2759 } 2808 }
2760 2809
2810 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2761 scr_add_lines (buf, nlines, str - buf); 2811 scr_add_lines (buf, str - buf, nlines);
2762 2812
2763 /* 2813 /*
2764 * If there have been a lot of new lines, then update the screen 2814 * If there have been a lot of new lines, then update the screen
2765 * What the heck I'll cheat and only refresh less than every page-full. 2815 * What the heck I'll cheat and only refresh less than every page-full.
2766 * the number of pages between refreshes is refresh_limit, which 2816 * the number of pages between refreshes is refresh_limit, which
… …
2772 refresh_limit++; 2822 refresh_limit++;
2773 else 2823 else
2774 { 2824 {
2775 flag = true; 2825 flag = true;
2776 scr_refresh (refresh_type); 2826 scr_refresh (refresh_type);
2777 flush_ev.stop (); 2827 want_refresh = 1;
2778 } 2828 }
2779 } 2829 }
2780 2830
2781 } 2831 }
2782 else 2832 else
… …
2797 } 2847 }
2798 2848
2799 return flag; 2849 return flag;
2800} 2850}
2801 2851
2802// read the next octet
2803unicode_t
2804rxvt_term::next_octet ()
2805{
2806 return cmdbuf_ptr < cmdbuf_endp
2807 ? *cmdbuf_ptr++
2808 : NOCHAR;
2809}
2810
2811// read the next character 2852// read the next character
2812unicode_t 2853wchar_t
2813rxvt_term::next_char () 2854rxvt_term::next_char ()
2814{ 2855{
2815 while (cmdbuf_ptr < cmdbuf_endp) 2856 while (cmdbuf_ptr < cmdbuf_endp)
2816 { 2857 {
2817 // assume 7-bit to be ascii ALWAYS 2858 // assume 7-bit to be ascii ALWAYS
… …
2827 cmdbuf_ptr = cmdbuf_endp; 2868 cmdbuf_ptr = cmdbuf_endp;
2828 break; 2869 break;
2829 } 2870 }
2830 2871
2831 if (len == (size_t)-1) 2872 if (len == (size_t)-1)
2832 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2873 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2833 2874
2834 // assume wchar == unicode 2875 // assume wchar == unicode
2835 cmdbuf_ptr += len; 2876 cmdbuf_ptr += len;
2836 return wc & UNICODE_MASK; 2877 return wc & UNICODE_MASK;
2837 } 2878 }
2838 2879
2839 return NOCHAR; 2880 return NOCHAR;
2881}
2882
2883// read the next octet
2884uint32_t
2885rxvt_term::next_octet ()
2886{
2887 return cmdbuf_ptr < cmdbuf_endp
2888 ? (unsigned char)*cmdbuf_ptr++
2889 : NOCHAR;
2840} 2890}
2841 2891
2842/* rxvt_cmd_getc () - Return next input character */ 2892/* rxvt_cmd_getc () - Return next input character */
2843/* 2893/*
2844 * Return the next input character after first passing any keyboard input 2894 * Return the next input character after first passing any keyboard input
2845 * to the command. 2895 * to the command.
2846 */ 2896 */
2847unicode_t 2897wchar_t
2848rxvt_term::cmd_getc () 2898rxvt_term::cmd_getc ()
2849{ 2899{
2850 unicode_t c = next_char (); 2900 wchar_t c = next_char ();
2851 2901
2852 if (c == NOCHAR) 2902 if (c == NOCHAR)
2853 throw out_of_input; 2903 throw out_of_input;
2854 2904
2855 return c; 2905 return c;
2856} 2906}
2857 2907
2858unicode_t 2908uint32_t
2859rxvt_term::cmd_get8 () 2909rxvt_term::cmd_get8 ()
2860{ 2910{
2861 unicode_t c = next_octet (); 2911 uint32_t c = next_octet ();
2862 2912
2863 if (c == NOCHAR) 2913 if (c == NOCHAR)
2864 throw out_of_input; 2914 throw out_of_input;
2865 2915
2866 return c; 2916 return c;
… …
3133 break; 3183 break;
3134 3184
3135 /* 8.3.87: NEXT LINE */ 3185 /* 8.3.87: NEXT LINE */
3136 case C1_NEL: /* ESC E */ 3186 case C1_NEL: /* ESC E */
3137 { 3187 {
3138 unicode_t nlcr[] = { C0_LF, C0_CR }; 3188 wchar_t nlcr[] = { C0_LF, C0_CR };
3139 scr_add_lines (nlcr, 1, 2); 3189 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3140 } 3190 }
3141 break; 3191 break;
3142 3192
3143 /* kidnapped escape sequence: Should be 8.3.48 */ 3193 /* kidnapped escape sequence: Should be 8.3.48 */
3144 case C1_ESA: /* ESC G */ 3194 case C1_ESA: /* ESC G */
… …
3808 { 3858 {
3809 if ((name = strchr (buf, ';')) == NULL) 3859 if ((name = strchr (buf, ';')) == NULL)
3810 break; 3860 break;
3811 3861
3812 *name++ = '\0'; 3862 *name++ = '\0';
3813 color = atoi (buf); 3863 color = atoi (buf) + minCOLOR;
3814 3864
3815 if (color < 0 || color >= TOTAL_COLORS) 3865 if (!IN_RANGE_INC (color, minCOLOR, maxTermCOLOR))
3816 break; 3866 break;
3817 3867
3818 if ((buf = strchr (name, ';')) != NULL) 3868 if ((buf = strchr (name, ';')) != NULL)
3819 *buf++ = '\0'; 3869 *buf++ = '\0';
3820 3870
3821 if (name[0] == '?' && !name[1]) 3871 if (name[0] == '?' && !name[1])
3822 { 3872 {
3823 unsigned short r, g, b; 3873 unsigned short r, g, b;
3824 pix_colors_focused[color + minCOLOR].get (display, r, g, b); 3874 pix_colors_focused[color].get (display, r, g, b);
3825 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp); 3875 tt_printf ("\033]%d;%d;rgb:%04x/%04x/%04x%c", XTerm_Color, color, r, g, b, resp);
3826 } 3876 }
3827 else 3877 else
3828 set_window_color (color + minCOLOR, name); 3878 set_window_color (color, name);
3829 } 3879 }
3830 break; 3880 break;
3831 case XTerm_Color00: 3881 case XTerm_Color00:
3832 process_color_seq (XTerm_Color00, Color_fg, str, resp); 3882 process_color_seq (XTerm_Color00, Color_fg, str, resp);
3833 break; 3883 break;
3834 case XTerm_Color01: 3884 case XTerm_Color01:
3835 process_color_seq (XTerm_Color00, Color_bg, str, resp); 3885 process_color_seq (XTerm_Color01, Color_bg, str, resp);
3836 break; 3886 break;
3837#ifndef NO_CURSORCOLOR 3887#ifndef NO_CURSORCOLOR
3838 case XTerm_Color_cursor: 3888 case XTerm_Color_cursor:
3839 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp); 3889 process_color_seq (XTerm_Color_cursor, Color_cursor, str, resp);
3840 break; 3890 break;
… …
3844 break; 3894 break;
3845 case XTerm_Color_pointer_bg: 3895 case XTerm_Color_pointer_bg:
3846 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp); 3896 process_color_seq (XTerm_Color_pointer_bg, Color_pointer_bg, str, resp);
3847 break; 3897 break;
3848#ifndef NO_BOLD_UNDERLINE_REVERSE 3898#ifndef NO_BOLD_UNDERLINE_REVERSE
3849 case XTerm_Color_BD:
3850 process_color_seq (XTerm_Color_BD, Color_BD, str, resp);
3851 break;
3852 case XTerm_Color_UL:
3853 process_color_seq (XTerm_Color_UL, Color_UL, str, resp);
3854 break;
3855 case XTerm_Color_RV: 3899 case XTerm_Color_RV:
3856 process_color_seq (XTerm_Color_RV, Color_RV, str, resp); 3900 process_color_seq (XTerm_Color_RV, Color_RV, str, resp);
3901 break;
3902 case Rxvt_Color_BD:
3903 case URxvt_Color_BD:
3904 process_color_seq (op, Color_BD, str, resp);
3905 break;
3906 case Rxvt_Color_UL:
3907 case URxvt_Color_UL:
3908 process_color_seq (op, Color_UL, str, resp);
3857 break; 3909 break;
3858 case URxvt_Color_IT: 3910 case URxvt_Color_IT:
3859 process_color_seq (URxvt_Color_IT, Color_IT, str, resp); 3911 process_color_seq (URxvt_Color_IT, Color_IT, str, resp);
3860 break; 3912 break;
3861#endif 3913#endif
… …
3866 if (am_transparent) 3918 if (am_transparent)
3867 want_full_refresh = want_refresh = 1; 3919 want_full_refresh = want_refresh = 1;
3868 break; 3920 break;
3869#endif 3921#endif
3870 3922
3871 case XTerm_Pixmap: 3923 case Rxvt_Pixmap:
3872 if (*str != ';') 3924 if (*str != ';')
3873 { 3925 {
3874#if XPM_BACKGROUND 3926#if XPM_BACKGROUND
3875 scale_pixmap (""); /* reset to default scaling */ 3927 scale_pixmap (""); /* reset to default scaling */
3876 set_bgPixmap (str); /* change pixmap */ 3928 set_bgPixmap (str); /* change pixmap */
3877#endif
3878 scr_touch (true); 3929 scr_touch (true);
3930#endif
3879 } 3931 }
3932
3880 while ((str = strchr (str, ';')) != NULL) 3933 while ((str = strchr (str, ';')) != NULL)
3881 { 3934 {
3882 str++; 3935 str++;
3883#if XPM_BACKGROUND 3936#if XPM_BACKGROUND
3884 changed += scale_pixmap (str); 3937 changed += scale_pixmap (str);
… …
3887 3940
3888 if (changed) 3941 if (changed)
3889 { 3942 {
3890#ifdef XPM_BACKGROUND 3943#ifdef XPM_BACKGROUND
3891 resize_pixmap (); 3944 resize_pixmap ();
3892#endif
3893 scr_touch (true); 3945 scr_touch (true);
3946#endif
3894 } 3947 }
3895 break; 3948 break;
3896 3949
3897 case XTerm_restoreFG: 3950 case Rxvt_restoreFG:
3898 set_window_color (Color_fg, str); 3951 set_window_color (Color_fg, str);
3899 break; 3952 break;
3900 case XTerm_restoreBG: 3953 case Rxvt_restoreBG:
3901 set_window_color (Color_bg, str); 3954 set_window_color (Color_bg, str);
3902 break; 3955 break;
3903 3956
3904 case XTerm_logfile: 3957 case XTerm_logfile:
3905 // TODO, when secure mode? 3958 // TODO, when secure mode?
… …
3910 if (OPTION (Opt_insecure)) 3963 if (OPTION (Opt_insecure))
3911 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked 3964 menubar_dispatch (const_cast<char *>(str)); // casting away constness is checked
3912 break; 3965 break;
3913#endif 3966#endif
3914#if 0 3967#if 0
3915 case XTerm_dumpscreen: /* no error notices */ 3968 case Rxvt_dumpscreen: /* no error notices */
3916 { 3969 {
3917 int fd; 3970 int fd;
3918 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0) 3971 if ((fd = open (str, O_RDWR | O_CREAT | O_EXCL, 0600)) >= 0)
3919 { 3972 {
3920 scr_dump (fd); 3973 scr_dump (fd);
… …
3972 break; 4025 break;
3973#endif 4026#endif
3974 4027
3975#if ENABLE_PERL 4028#if ENABLE_PERL
3976 case URxvt_perl: 4029 case URxvt_perl:
3977 if (PERL_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END))) 4030 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3978 ; // no responses yet 4031 ; // no responses yet
3979 break; 4032 break;
3980#endif 4033#endif
3981 } 4034 }
3982} 4035}
… …
4094 /* extra handling for values with state unkept */ 4147 /* extra handling for values with state unkept */
4095 switch (arg[i]) 4148 switch (arg[i])
4096 { 4149 {
4097#if ENABLE_STYLES 4150#if ENABLE_STYLES
4098 case 1021: 4151 case 1021:
4099 if (mode) 4152 set_option (Opt_intensityStyles, mode);
4100 SET_OPTION (Opt_intensityStyles);
4101 else
4102 CLR_OPTION (Opt_intensityStyles);
4103 4153
4104 scr_touch (true); 4154 scr_touch (true);
4105 break; 4155 break;
4106#endif 4156#endif
4107 case 1048: /* alternative cursor save */ 4157 case 1048: /* alternative cursor save */
… …
4129 case 3: /* 80/132 */ 4179 case 3: /* 80/132 */
4130 if (priv_modes & PrivMode_132OK) 4180 if (priv_modes & PrivMode_132OK)
4131 set_widthheight (((state ? 132 : 80) * fwidth), height); 4181 set_widthheight (((state ? 132 : 80) * fwidth), height);
4132 break; 4182 break;
4133 case 4: /* smooth scrolling */ 4183 case 4: /* smooth scrolling */
4134 if (!state) 4184 set_option (Opt_jumpScroll, !state);
4135 SET_OPTION (Opt_jumpScroll);
4136 else
4137 CLR_OPTION (Opt_jumpScroll);
4138 break; 4185 break;
4139 case 5: /* reverse video */ 4186 case 5: /* reverse video */
4140 scr_rvideo_mode (state); 4187 scr_rvideo_mode (state);
4141 break; 4188 break;
4142 case 6: /* relative/absolute origins */ 4189 case 6: /* relative/absolute origins */
… …
4183#if 0 4230#if 0
4184 case 1001: 4231 case 1001:
4185 break; /* X11 mouse highlighting */ 4232 break; /* X11 mouse highlighting */
4186#endif 4233#endif
4187 case 1010: /* scroll to bottom on TTY output inhibit */ 4234 case 1010: /* scroll to bottom on TTY output inhibit */
4188 if (!state) 4235 set_option (Opt_scrollTtyOutput, !state);
4189 SET_OPTION (Opt_scrollTtyOutput);
4190 else
4191 CLR_OPTION (Opt_scrollTtyOutput);
4192 break; 4236 break;
4193 case 1011: /* scroll to bottom on key press */ 4237 case 1011: /* scroll to bottom on key press */
4194 if (state) 4238 set_option (Opt_scrollTtyKeypress, state);
4195 SET_OPTION (Opt_scrollTtyKeypress);
4196 else
4197 CLR_OPTION (Opt_scrollTtyKeypress);
4198 break; 4239 break;
4199 case 1047: /* secondary screen w/ clearing last */ 4240 case 1047: /* secondary screen w/ clearing last */
4200 if (OPTION (Opt_secondaryScreen)) 4241 if (OPTION (Opt_secondaryScreen))
4201 if (current_screen != PRIMARY) 4242 if (current_screen != PRIMARY)
4202 scr_erase_screen (2); 4243 scr_erase_screen (2);
… …
4412const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4453const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4413 4454
4414void 4455void
4415rxvt_term::tt_write (const char *data, unsigned int len) 4456rxvt_term::tt_write (const char *data, unsigned int len)
4416{ 4457{
4458 if (HOOK_INVOKE ((this, HOOK_TT_WRITE, DT_STR_LEN, data, len, DT_END)))
4459 return;
4460
4461 if (pty.pty < 0)
4462 return;
4463
4417 if (v_buflen == 0) 4464 if (v_buflen == 0)
4418 { 4465 {
4419 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4466 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4420 4467
4421 if ((unsigned int)written == len) 4468 if ((unsigned int)written == len)

Diff Legend

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