… | |
… | |
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_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 | |
|
|
979 | while (row > -nsaved && ROW (row - 1).is_longer ()) |
|
|
980 | --row; |
|
|
981 | |
|
|
982 | while (row < -view_start + nrow) |
|
|
983 | { |
|
|
984 | int start_row = row; |
|
|
985 | line_t *l; |
|
|
986 | |
|
|
987 | do |
|
|
988 | { |
|
|
989 | l = &ROW (row); |
|
|
990 | |
|
|
991 | if (!(l->f & LINE_FILTERED)) |
|
|
992 | { |
|
|
993 | // line not filtered, mark it as filtered |
|
|
994 | l->f |= LINE_FILTERED; |
|
|
995 | while (l->is_longer ()) |
|
|
996 | { |
|
|
997 | l = &ROW (++row); |
|
|
998 | l->f |= LINE_FILTERED; |
|
|
999 | } |
|
|
1000 | |
|
|
1001 | // and filter it |
|
|
1002 | HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END)); |
|
|
1003 | |
|
|
1004 | break; |
|
|
1005 | } |
|
|
1006 | } |
|
|
1007 | while (l->is_longer ()); |
|
|
1008 | |
|
|
1009 | row++; |
|
|
1010 | } |
|
|
1011 | |
|
|
1012 | } |
|
|
1013 | |
972 | scr_refresh (refresh_type); |
1014 | scr_refresh (refresh_type); |
973 | scrollbar_show (1); |
1015 | scrollbar_show (1); |
974 | #ifdef USE_XIM |
1016 | #ifdef USE_XIM |
975 | IMSendSpot (); |
1017 | IMSendSpot (); |
976 | #endif |
1018 | #endif |
… | |
… | |
1163 | |
1205 | |
1164 | #ifdef POINTER_BLANK |
1206 | #ifdef POINTER_BLANK |
1165 | void |
1207 | void |
1166 | rxvt_term::pointer_blank () |
1208 | rxvt_term::pointer_blank () |
1167 | { |
1209 | { |
1168 | if (! OPTION (Opt_pointerBlank)) |
1210 | if (!OPTION (Opt_pointerBlank)) |
1169 | return; |
1211 | return; |
1170 | |
1212 | |
1171 | XDefineCursor (display->display, vt, display->blank_cursor); |
1213 | XDefineCursor (display->display, vt, display->blank_cursor); |
1172 | XFlush (display->display); |
1214 | XFlush (display->display); |
1173 | |
1215 | |
… | |
… | |
1269 | { |
1311 | { |
1270 | dDisp; |
1312 | dDisp; |
1271 | |
1313 | |
1272 | SET_R (this); |
1314 | SET_R (this); |
1273 | SET_LOCALE (locale); |
1315 | SET_LOCALE (locale); |
1274 | |
|
|
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 | |
1316 | |
1302 | Window unused_root, unused_child; |
1317 | Window unused_root, unused_child; |
1303 | int unused_root_x, unused_root_y; |
1318 | int unused_root_x, unused_root_y; |
1304 | unsigned int unused_mask; |
1319 | unsigned int unused_mask; |
1305 | |
1320 | |
… | |
… | |
1336 | && ((ks >= 0x40 && ks <= 0x5f) |
1351 | && ((ks >= 0x40 && ks <= 0x5f) |
1337 | || (ks >= 0x61 && ks <= 0x7f))) |
1352 | || (ks >= 0x61 && ks <= 0x7f))) |
1338 | { |
1353 | { |
1339 | iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); |
1354 | iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); |
1340 | commit_iso14755 (); |
1355 | commit_iso14755 (); |
1341 | return; // case-break; |
1356 | goto skip_switch; |
1342 | } |
1357 | } |
1343 | |
1358 | |
1344 | for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) |
1359 | for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) |
1345 | if (i[0] == ks) |
1360 | if (i[0] == ks) |
1346 | { |
1361 | { |
1347 | iso14755buf = ISO_14755_51 | i[1]; |
1362 | iso14755buf = ISO_14755_51 | i[1]; |
1348 | commit_iso14755 (); |
1363 | commit_iso14755 (); |
1349 | return; // case-break; |
1364 | goto skip_switch; |
1350 | } |
1365 | } |
1351 | |
1366 | |
1352 | scr_bell (); |
1367 | scr_bell (); |
1353 | # endif |
1368 | # endif |
1354 | iso14755buf = 0; |
1369 | iso14755buf = 0; |
… | |
… | |
1372 | # endif |
1387 | # endif |
1373 | else |
1388 | else |
1374 | iso14755buf = 0; |
1389 | iso14755buf = 0; |
1375 | } |
1390 | } |
1376 | #endif |
1391 | #endif |
|
|
1392 | |
|
|
1393 | if (ev.xany.window == vt |
|
|
1394 | && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END))) |
|
|
1395 | break; |
1377 | |
1396 | |
1378 | #if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) |
1397 | #if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) |
1379 | if (!(ev.xkey.state & ControlMask)) |
1398 | if (!(ev.xkey.state & ControlMask)) |
1380 | slip_wheel_ev.stop (); |
1399 | slip_wheel_ev.stop (); |
1381 | else if (ks == XK_Control_L || ks == XK_Control_R) |
1400 | else if (ks == XK_Control_L || ks == XK_Control_R) |
… | |
… | |
1516 | |
1535 | |
1517 | case SelectionRequest: |
1536 | case SelectionRequest: |
1518 | selection_send (ev.xselectionrequest); |
1537 | selection_send (ev.xselectionrequest); |
1519 | break; |
1538 | break; |
1520 | |
1539 | |
|
|
1540 | case MapNotify: |
|
|
1541 | mapped = 1; |
|
|
1542 | #ifdef TEXT_BLINK |
|
|
1543 | text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL); |
|
|
1544 | #endif |
|
|
1545 | HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); |
|
|
1546 | break; |
|
|
1547 | |
1521 | case UnmapNotify: |
1548 | case UnmapNotify: |
1522 | mapped = 0; |
1549 | mapped = 0; |
1523 | #ifdef TEXT_BLINK |
1550 | #ifdef TEXT_BLINK |
1524 | text_blink_ev.stop (); |
1551 | text_blink_ev.stop (); |
1525 | #endif |
1552 | #endif |
1526 | break; |
1553 | 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; |
1554 | break; |
1534 | |
1555 | |
1535 | #ifdef TRANSPARENT |
1556 | #ifdef TRANSPARENT |
1536 | case ReparentNotify: |
1557 | case ReparentNotify: |
1537 | rootwin_cb (ev); |
1558 | rootwin_cb (ev); |
… | |
… | |
1596 | if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) |
1617 | if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) |
1597 | break; |
1618 | break; |
1598 | |
1619 | |
1599 | if (ev.xany.window == vt) |
1620 | if (ev.xany.window == vt) |
1600 | { |
1621 | { |
|
|
1622 | if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END))) |
|
|
1623 | ; // nop |
1601 | if (ev.xbutton.state & (Button1Mask | Button3Mask)) |
1624 | else if (ev.xbutton.state & (Button1Mask | Button3Mask)) |
1602 | { |
1625 | { |
1603 | while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) |
1626 | while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) |
1604 | ; |
1627 | ; |
1605 | |
1628 | |
1606 | XQueryPointer (disp, vt, |
1629 | XQueryPointer (disp, vt, |
… | |
… | |
1692 | refresh_limit = 0; |
1715 | refresh_limit = 0; |
1693 | scrollbar_show (1); |
1716 | scrollbar_show (1); |
1694 | } |
1717 | } |
1695 | break; |
1718 | break; |
1696 | } |
1719 | } |
|
|
1720 | |
|
|
1721 | skip_switch: ; |
|
|
1722 | |
|
|
1723 | #if defined(CURSOR_BLINK) |
|
|
1724 | if (OPTION (Opt_cursorBlink) && ev.type == KeyPress) |
|
|
1725 | { |
|
|
1726 | if (hidden_cursor) |
|
|
1727 | { |
|
|
1728 | hidden_cursor = 0; |
|
|
1729 | want_refresh = 1; |
|
|
1730 | } |
|
|
1731 | |
|
|
1732 | cursor_blink_ev.start (NOW + BLINK_INTERVAL); |
|
|
1733 | } |
|
|
1734 | #endif |
|
|
1735 | |
|
|
1736 | #if defined(POINTER_BLANK) |
|
|
1737 | if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0) |
|
|
1738 | { |
|
|
1739 | if (ev.type == MotionNotify |
|
|
1740 | || ev.type == ButtonPress |
|
|
1741 | || ev.type == ButtonRelease) |
|
|
1742 | if (hidden_pointer) |
|
|
1743 | pointer_unblank (); |
|
|
1744 | |
|
|
1745 | if (ev.type == KeyPress && hidden_pointer == 0) |
|
|
1746 | pointer_blank (); |
|
|
1747 | } |
|
|
1748 | #endif |
1697 | } |
1749 | } |
1698 | |
1750 | |
1699 | void |
1751 | void |
1700 | rxvt_term::focus_in () |
1752 | rxvt_term::focus_in () |
1701 | { |
1753 | { |
1702 | if (!focus) |
1754 | if (!focus) |
1703 | { |
1755 | { |
1704 | focus = 1; |
1756 | focus = 1; |
1705 | want_refresh = 1; |
1757 | want_refresh = 1; |
1706 | |
1758 | |
1707 | PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); |
1759 | HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); |
1708 | |
1760 | |
1709 | #if USE_XIM |
1761 | #if USE_XIM |
1710 | if (Input_Context != NULL) |
1762 | if (Input_Context != NULL) |
1711 | { |
1763 | { |
1712 | IMSetStatusPosition (); |
1764 | IMSetStatusPosition (); |
… | |
… | |
1733 | if (focus) |
1785 | if (focus) |
1734 | { |
1786 | { |
1735 | focus = 0; |
1787 | focus = 0; |
1736 | want_refresh = 1; |
1788 | want_refresh = 1; |
1737 | |
1789 | |
1738 | PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); |
1790 | HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); |
1739 | |
1791 | |
1740 | #if ENABLE_FRILLS || ISO_14755 |
1792 | #if ENABLE_FRILLS || ISO_14755 |
1741 | if (iso14755buf) |
1793 | if (iso14755buf) |
1742 | { |
1794 | { |
1743 | iso14755buf = 0; |
1795 | iso14755buf = 0; |
… | |
… | |
1826 | #ifdef MOUSE_REPORT_DOUBLECLICK |
1878 | #ifdef MOUSE_REPORT_DOUBLECLICK |
1827 | if (ev.button == MEvent.button && clickintime) |
1879 | if (ev.button == MEvent.button && clickintime) |
1828 | { |
1880 | { |
1829 | /* same button, within alloted time */ |
1881 | /* same button, within alloted time */ |
1830 | MEvent.clicks++; |
1882 | MEvent.clicks++; |
|
|
1883 | |
1831 | if (MEvent.clicks > 1) |
1884 | if (MEvent.clicks > 1) |
1832 | { |
1885 | { |
1833 | /* only report double clicks */ |
1886 | /* only report double clicks */ |
1834 | MEvent.clicks = 2; |
1887 | MEvent.clicks = 2; |
1835 | mouse_report (ev); |
1888 | mouse_report (ev); |
… | |
… | |
1855 | else |
1908 | else |
1856 | { |
1909 | { |
1857 | if (ev.button != MEvent.button) |
1910 | if (ev.button != MEvent.button) |
1858 | MEvent.clicks = 0; |
1911 | MEvent.clicks = 0; |
1859 | |
1912 | |
1860 | if (!PERL_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END))) |
1913 | if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END))) |
1861 | switch (ev.button) |
1914 | switch (ev.button) |
1862 | { |
1915 | { |
1863 | case Button1: |
1916 | case Button1: |
1864 | /* allow meta + click to select rectangular areas */ |
1917 | /* allow meta + click to select rectangular areas */ |
1865 | /* should be done in screen.C */ |
1918 | /* should be done in screen.C */ |
… | |
… | |
2043 | } |
2096 | } |
2044 | |
2097 | |
2045 | break; |
2098 | break; |
2046 | } |
2099 | } |
2047 | } |
2100 | } |
|
|
2101 | |
2048 | return; |
2102 | return; |
2049 | } |
2103 | } |
|
|
2104 | |
2050 | #if MENUBAR |
2105 | #if MENUBAR |
2051 | /* |
2106 | /* |
2052 | * Menubar window processing of button press |
2107 | * Menubar window processing of button press |
2053 | */ |
2108 | */ |
2054 | if (isMenuBarWindow (ev.window)) |
2109 | if (isMenuBarWindow (ev.window)) |
… | |
… | |
2116 | */ |
2171 | */ |
2117 | if (priv_modes & PrivMode_mouse_report |
2172 | if (priv_modes & PrivMode_mouse_report |
2118 | && bypass_keystate |
2173 | && bypass_keystate |
2119 | && ev.button == Button1 && MEvent.clicks <= 1) |
2174 | && ev.button == Button1 && MEvent.clicks <= 1) |
2120 | selection_extend (ev.x, ev.y, 0); |
2175 | selection_extend (ev.x, ev.y, 0); |
|
|
2176 | |
|
|
2177 | if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) |
|
|
2178 | return; |
2121 | |
2179 | |
2122 | switch (ev.button) |
2180 | switch (ev.button) |
2123 | { |
2181 | { |
2124 | case Button1: |
2182 | case Button1: |
2125 | case Button3: |
2183 | case Button3: |
… | |
… | |
2670 | |
2728 | |
2671 | bool |
2729 | bool |
2672 | rxvt_term::cmd_parse () |
2730 | rxvt_term::cmd_parse () |
2673 | { |
2731 | { |
2674 | bool flag = false; |
2732 | bool flag = false; |
2675 | unicode_t ch = NOCHAR; |
2733 | wchar_t ch = NOCHAR; |
2676 | char *seq_begin; // remember start of esc-sequence here |
2734 | char *seq_begin; // remember start of esc-sequence here |
2677 | |
2735 | |
2678 | for (;;) |
2736 | for (;;) |
2679 | { |
2737 | { |
2680 | if (ch == NOCHAR) |
2738 | if (ch == NOCHAR) |
2681 | { |
2739 | { |
2682 | seq_begin = cmdbuf_ptr; |
2740 | seq_begin = cmdbuf_ptr; |
2683 | ch = next_char (); |
2741 | ch = next_char (); |
2684 | } |
|
|
2685 | |
2742 | |
2686 | if (ch == NOCHAR) // TODO: improve |
2743 | if (ch == NOCHAR) |
2687 | break; |
2744 | break; |
|
|
2745 | } |
2688 | |
2746 | |
2689 | if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) |
2747 | if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) |
2690 | { |
2748 | { |
2691 | if (!seen_input) |
2749 | if (!seen_input) |
2692 | { |
2750 | { |
… | |
… | |
2701 | if (seen_resize && cmd_pid) |
2759 | if (seen_resize && cmd_pid) |
2702 | kill (-cmd_pid, SIGWINCH); |
2760 | kill (-cmd_pid, SIGWINCH); |
2703 | } |
2761 | } |
2704 | |
2762 | |
2705 | /* Read a text string from the input buffer */ |
2763 | /* Read a text string from the input buffer */ |
2706 | unicode_t buf[UBUFSIZ]; |
2764 | wchar_t buf[UBUFSIZ]; |
2707 | bool refreshnow = false; |
2765 | bool refreshnow = false; |
2708 | int nlines = 0; |
2766 | int nlines = 0; |
2709 | unicode_t *str = buf; |
2767 | wchar_t *str = buf; |
2710 | unicode_t *eol = str + min (ncol, UBUFSIZ); |
2768 | wchar_t *eol = str + min (ncol, UBUFSIZ); |
2711 | |
2769 | |
2712 | for (;;) |
2770 | for (;;) |
2713 | { |
2771 | { |
2714 | if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) |
2772 | if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) |
2715 | break; |
2773 | break; |
… | |
… | |
2733 | } |
2791 | } |
2734 | |
2792 | |
2735 | // scr_add_lines only works for nlines <= nrow - 1. |
2793 | // scr_add_lines only works for nlines <= nrow - 1. |
2736 | if (nlines >= nrow - 1) |
2794 | if (nlines >= nrow - 1) |
2737 | { |
2795 | { |
|
|
2796 | if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) |
2738 | scr_add_lines (buf, nlines, str - buf); |
2797 | scr_add_lines (buf, str - buf, nlines); |
|
|
2798 | |
2739 | nlines = 0; |
2799 | nlines = 0; |
2740 | str = buf; |
2800 | str = buf; |
2741 | eol = str + min (ncol, UBUFSIZ); |
2801 | eol = str + min (ncol, UBUFSIZ); |
2742 | } |
2802 | } |
2743 | |
2803 | |
… | |
… | |
2756 | |
2816 | |
2757 | seq_begin = cmdbuf_ptr; |
2817 | seq_begin = cmdbuf_ptr; |
2758 | ch = next_char (); |
2818 | ch = next_char (); |
2759 | } |
2819 | } |
2760 | |
2820 | |
|
|
2821 | if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END))) |
2761 | scr_add_lines (buf, nlines, str - buf); |
2822 | scr_add_lines (buf, str - buf, nlines); |
2762 | |
2823 | |
2763 | /* |
2824 | /* |
2764 | * If there have been a lot of new lines, then update the screen |
2825 | * 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. |
2826 | * 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 |
2827 | * the number of pages between refreshes is refresh_limit, which |
… | |
… | |
2797 | } |
2858 | } |
2798 | |
2859 | |
2799 | return flag; |
2860 | return flag; |
2800 | } |
2861 | } |
2801 | |
2862 | |
2802 | // read the next octet |
|
|
2803 | unicode_t |
|
|
2804 | rxvt_term::next_octet () |
|
|
2805 | { |
|
|
2806 | return cmdbuf_ptr < cmdbuf_endp |
|
|
2807 | ? *cmdbuf_ptr++ |
|
|
2808 | : NOCHAR; |
|
|
2809 | } |
|
|
2810 | |
|
|
2811 | // read the next character |
2863 | // read the next character |
2812 | unicode_t |
2864 | wchar_t |
2813 | rxvt_term::next_char () |
2865 | rxvt_term::next_char () |
2814 | { |
2866 | { |
2815 | while (cmdbuf_ptr < cmdbuf_endp) |
2867 | while (cmdbuf_ptr < cmdbuf_endp) |
2816 | { |
2868 | { |
2817 | // assume 7-bit to be ascii ALWAYS |
2869 | // assume 7-bit to be ascii ALWAYS |
… | |
… | |
2827 | cmdbuf_ptr = cmdbuf_endp; |
2879 | cmdbuf_ptr = cmdbuf_endp; |
2828 | break; |
2880 | break; |
2829 | } |
2881 | } |
2830 | |
2882 | |
2831 | if (len == (size_t)-1) |
2883 | if (len == (size_t)-1) |
2832 | return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through |
2884 | return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through |
2833 | |
2885 | |
2834 | // assume wchar == unicode |
2886 | // assume wchar == unicode |
2835 | cmdbuf_ptr += len; |
2887 | cmdbuf_ptr += len; |
2836 | return wc & UNICODE_MASK; |
2888 | return wc & UNICODE_MASK; |
2837 | } |
2889 | } |
2838 | |
2890 | |
2839 | return NOCHAR; |
2891 | return NOCHAR; |
|
|
2892 | } |
|
|
2893 | |
|
|
2894 | // read the next octet |
|
|
2895 | uint32_t |
|
|
2896 | rxvt_term::next_octet () |
|
|
2897 | { |
|
|
2898 | return cmdbuf_ptr < cmdbuf_endp |
|
|
2899 | ? (unsigned char)*cmdbuf_ptr++ |
|
|
2900 | : NOCHAR; |
2840 | } |
2901 | } |
2841 | |
2902 | |
2842 | /* rxvt_cmd_getc () - Return next input character */ |
2903 | /* rxvt_cmd_getc () - Return next input character */ |
2843 | /* |
2904 | /* |
2844 | * Return the next input character after first passing any keyboard input |
2905 | * Return the next input character after first passing any keyboard input |
2845 | * to the command. |
2906 | * to the command. |
2846 | */ |
2907 | */ |
2847 | unicode_t |
2908 | wchar_t |
2848 | rxvt_term::cmd_getc () |
2909 | rxvt_term::cmd_getc () |
2849 | { |
2910 | { |
2850 | unicode_t c = next_char (); |
2911 | wchar_t c = next_char (); |
2851 | |
2912 | |
2852 | if (c == NOCHAR) |
2913 | if (c == NOCHAR) |
2853 | throw out_of_input; |
2914 | throw out_of_input; |
2854 | |
2915 | |
2855 | return c; |
2916 | return c; |
2856 | } |
2917 | } |
2857 | |
2918 | |
2858 | unicode_t |
2919 | uint32_t |
2859 | rxvt_term::cmd_get8 () |
2920 | rxvt_term::cmd_get8 () |
2860 | { |
2921 | { |
2861 | unicode_t c = next_octet (); |
2922 | uint32_t c = next_octet (); |
2862 | |
2923 | |
2863 | if (c == NOCHAR) |
2924 | if (c == NOCHAR) |
2864 | throw out_of_input; |
2925 | throw out_of_input; |
2865 | |
2926 | |
2866 | return c; |
2927 | return c; |
… | |
… | |
3133 | break; |
3194 | break; |
3134 | |
3195 | |
3135 | /* 8.3.87: NEXT LINE */ |
3196 | /* 8.3.87: NEXT LINE */ |
3136 | case C1_NEL: /* ESC E */ |
3197 | case C1_NEL: /* ESC E */ |
3137 | { |
3198 | { |
3138 | unicode_t nlcr[] = { C0_LF, C0_CR }; |
3199 | wchar_t nlcr[] = { C0_LF, C0_CR }; |
3139 | scr_add_lines (nlcr, 1, 2); |
3200 | scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1); |
3140 | } |
3201 | } |
3141 | break; |
3202 | break; |
3142 | |
3203 | |
3143 | /* kidnapped escape sequence: Should be 8.3.48 */ |
3204 | /* kidnapped escape sequence: Should be 8.3.48 */ |
3144 | case C1_ESA: /* ESC G */ |
3205 | case C1_ESA: /* ESC G */ |
… | |
… | |
3972 | break; |
4033 | break; |
3973 | #endif |
4034 | #endif |
3974 | |
4035 | |
3975 | #if ENABLE_PERL |
4036 | #if ENABLE_PERL |
3976 | case URxvt_perl: |
4037 | case URxvt_perl: |
3977 | if (PERL_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END))) |
4038 | if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END))) |
3978 | ; // no responses yet |
4039 | ; // no responses yet |
3979 | break; |
4040 | break; |
3980 | #endif |
4041 | #endif |
3981 | } |
4042 | } |
3982 | } |
4043 | } |
… | |
… | |
4340 | scr_color (Color_bg, Color_bg); |
4401 | scr_color (Color_bg, Color_bg); |
4341 | break; |
4402 | break; |
4342 | |
4403 | |
4343 | //case 50: // not variable spacing |
4404 | //case 50: // not variable spacing |
4344 | |
4405 | |
4345 | #ifndef NO_BRIGHTCOLOR |
4406 | #if ENABLE_FRILLS |
4346 | case 90: |
4407 | case 90: |
4347 | case 91: /* set bright fg color */ |
4408 | case 91: /* set bright fg color */ |
4348 | case 92: |
4409 | case 92: |
4349 | case 93: |
4410 | case 93: |
4350 | case 94: |
4411 | case 94: |
… | |
… | |
4412 | const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT |
4473 | const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT |
4413 | |
4474 | |
4414 | void |
4475 | void |
4415 | rxvt_term::tt_write (const char *data, unsigned int len) |
4476 | rxvt_term::tt_write (const char *data, unsigned int len) |
4416 | { |
4477 | { |
|
|
4478 | if (pty.pty < 0) |
|
|
4479 | return; |
|
|
4480 | |
4417 | if (v_buflen == 0) |
4481 | if (v_buflen == 0) |
4418 | { |
4482 | { |
4419 | ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); |
4483 | ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); |
4420 | |
4484 | |
4421 | if ((unsigned int)written == len) |
4485 | if ((unsigned int)written == len) |