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.252 by root, Mon Jan 9 22:41:41 2006 UTC

… …
25 * - extensive modifications 25 * - extensive modifications
26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org> 26 * Copyright (c) 1998 Alfredo K. Kojima <kojima@windowmaker.org>
27 * Copyright (c) 2001 Marius Gedminas 27 * Copyright (c) 2001 Marius Gedminas
28 * - Ctrl/Mod4+Tab works like Meta+Tab (options) 28 * - Ctrl/Mod4+Tab works like Meta+Tab (options)
29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org> 29 * Copyright (c) 2003 Rob McMullen <robm@flipturn.org>
30 * Copyright (c) 2003-2005 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
31 * 31 *
32 * This program is free software; you can redistribute it and/or modify 32 * This program is free software; you can redistribute it and/or modify
33 * it under the terms of the GNU General Public License as published by 33 * it under the terms of the GNU General Public License as published by
34 * the Free Software Foundation; either version 2 of the License, or 34 * the Free Software Foundation; either version 2 of the License, or
35 * (at your option) any later version. 35 * (at your option) any later version.
… …
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 row++;
994 else
995 {
996 // line not filtered, mark it as filtered
997 l->f |= LINE_FILTERED;
998 while (l->is_longer ())
999 {
1000 l = &ROW (++row);
1001 l->f |= LINE_FILTERED;
1002 }
1003
1004 // and filter it
1005 HOOK_INVOKE ((this, HOOK_LINE_UPDATE, DT_INT, start_row, DT_END));
1006
1007 break;
1008 }
1009 }
1010 while (l->is_longer () && row < end_row);
1011 }
1012 while (++row < end_row);
1013 }
1014
972 scr_refresh (refresh_type); 1015 scr_refresh (refresh_type);
973 scrollbar_show (1); 1016 scrollbar_show (1);
974#ifdef USE_XIM 1017#ifdef USE_XIM
975 IMSendSpot (); 1018 IMSendSpot ();
976#endif 1019#endif
… …
1163 1206
1164#ifdef POINTER_BLANK 1207#ifdef POINTER_BLANK
1165void 1208void
1166rxvt_term::pointer_blank () 1209rxvt_term::pointer_blank ()
1167{ 1210{
1168 if (! OPTION (Opt_pointerBlank)) 1211 if (!OPTION (Opt_pointerBlank))
1169 return; 1212 return;
1170 1213
1171 XDefineCursor (display->display, vt, display->blank_cursor); 1214 XDefineCursor (display->display, vt, display->blank_cursor);
1172 XFlush (display->display); 1215 XFlush (display->display);
1173 1216
… …
1270 dDisp; 1313 dDisp;
1271 1314
1272 SET_R (this); 1315 SET_R (this);
1273 SET_LOCALE (locale); 1316 SET_LOCALE (locale);
1274 1317
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; 1318 Window unused_root, unused_child;
1303 int unused_root_x, unused_root_y; 1319 int unused_root_x, unused_root_y;
1304 unsigned int unused_mask; 1320 unsigned int unused_mask;
1305 1321
1306 switch (ev.type) 1322 switch (ev.type)
… …
1313 1329
1314 break; 1330 break;
1315 1331
1316 case KeyRelease: 1332 case KeyRelease:
1317 { 1333 {
1318#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 1334#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ISO_14755 || ENABLE_PERL
1319 KeySym ks; 1335 KeySym keysym;
1320 1336
1321 ks = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/ 1337 keysym = XLookupKeysym (&ev.xkey, ev.xkey.state & ShiftMask ? 1 : 0); // sorry, only shift supported :/
1322#endif 1338#endif
1323 1339
1324#if ENABLE_FRILLS || ISO_14755 1340#if ENABLE_FRILLS || ISO_14755
1325 // ISO 14755 support 1341 // ISO 14755 support
1326 if (iso14755buf) 1342 if (iso14755buf)
… …
1331# endif 1347# endif
1332# if ISO_14755 1348# if ISO_14755
1333 // iso14755 part 5.2 handling: release time 1349 // iso14755 part 5.2 handling: release time
1334 // first: controls 1350 // first: controls
1335 if ((ev.xkey.state & ControlMask) 1351 if ((ev.xkey.state & ControlMask)
1336 && ((ks >= 0x40 && ks <= 0x5f) 1352 && ((keysym >= 0x40 && keysym <= 0x5f)
1337 || (ks >= 0x61 && ks <= 0x7f))) 1353 || (keysym >= 0x61 && keysym <= 0x7f)))
1338 { 1354 {
1339 iso14755buf = ISO_14755_51 | 0x2400 | (ks & 0x1f); 1355 iso14755buf = ISO_14755_51 | 0x2400 | (keysym & 0x1f);
1340 commit_iso14755 (); 1356 commit_iso14755 ();
1341 return; // case-break; 1357 goto skip_switch;
1342 } 1358 }
1343 1359
1344 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2) 1360 for (unsigned short *i = iso14755_symtab; i[0]; i+= 2)
1345 if (i[0] == ks) 1361 if (i[0] == keysym)
1346 { 1362 {
1347 iso14755buf = ISO_14755_51 | i[1]; 1363 iso14755buf = ISO_14755_51 | i[1];
1348 commit_iso14755 (); 1364 commit_iso14755 ();
1349 return; // case-break; 1365 goto skip_switch;
1350 } 1366 }
1351 1367
1352 scr_bell (); 1368 scr_bell ();
1353# endif 1369# endif
1354 iso14755buf = 0; 1370 iso14755buf = 0;
… …
1373 else 1389 else
1374 iso14755buf = 0; 1390 iso14755buf = 0;
1375 } 1391 }
1376#endif 1392#endif
1377 1393
1394 if (ev.xany.window == vt
1395 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_INT, keysym, DT_END)))
1396 break;
1397
1378#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1398#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1379 if (!(ev.xkey.state & ControlMask)) 1399 if (!(ev.xkey.state & ControlMask))
1380 slip_wheel_ev.stop (); 1400 slip_wheel_ev.stop ();
1381 else if (ks == XK_Control_L || ks == XK_Control_R) 1401 else if (keysym == XK_Control_L || keysym == XK_Control_R)
1382 mouse_slip_wheel_speed = 0; 1402 mouse_slip_wheel_speed = 0;
1383#endif 1403#endif
1384 break; 1404 break;
1385 } 1405 }
1386 1406
… …
1516 1536
1517 case SelectionRequest: 1537 case SelectionRequest:
1518 selection_send (ev.xselectionrequest); 1538 selection_send (ev.xselectionrequest);
1519 break; 1539 break;
1520 1540
1541 case MapNotify:
1542 mapped = 1;
1543#ifdef TEXT_BLINK
1544 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1545#endif
1546 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1547 break;
1548
1521 case UnmapNotify: 1549 case UnmapNotify:
1522 mapped = 0; 1550 mapped = 0;
1523#ifdef TEXT_BLINK 1551#ifdef TEXT_BLINK
1524 text_blink_ev.stop (); 1552 text_blink_ev.stop ();
1525#endif 1553#endif
1526 break; 1554 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; 1555 break;
1534 1556
1535#ifdef TRANSPARENT 1557#ifdef TRANSPARENT
1536 case ReparentNotify: 1558 case ReparentNotify:
1537 rootwin_cb (ev); 1559 rootwin_cb (ev);
… …
1596 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1618 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1597 break; 1619 break;
1598 1620
1599 if (ev.xany.window == vt) 1621 if (ev.xany.window == vt)
1600 { 1622 {
1623 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1624 ; // nop
1601 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1625 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1602 { 1626 {
1603 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1627 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1604 ; 1628 ;
1605 1629
1606 XQueryPointer (disp, vt, 1630 XQueryPointer (disp, vt,
… …
1692 refresh_limit = 0; 1716 refresh_limit = 0;
1693 scrollbar_show (1); 1717 scrollbar_show (1);
1694 } 1718 }
1695 break; 1719 break;
1696 } 1720 }
1721
1722skip_switch: ;
1723
1724#if defined(CURSOR_BLINK)
1725 if (OPTION (Opt_cursorBlink) && ev.type == KeyPress)
1726 {
1727 if (hidden_cursor)
1728 {
1729 hidden_cursor = 0;
1730 want_refresh = 1;
1731 }
1732
1733 cursor_blink_ev.start (NOW + BLINK_INTERVAL);
1734 }
1735#endif
1736
1737#if defined(POINTER_BLANK)
1738 if (OPTION (Opt_pointerBlank) && pointerBlankDelay > 0)
1739 {
1740 if (ev.type == MotionNotify
1741 || ev.type == ButtonPress
1742 || ev.type == ButtonRelease)
1743 if (hidden_pointer)
1744 pointer_unblank ();
1745
1746 if (ev.type == KeyPress && hidden_pointer == 0)
1747 pointer_blank ();
1748 }
1749#endif
1697} 1750}
1698 1751
1699void 1752void
1700rxvt_term::focus_in () 1753rxvt_term::focus_in ()
1701{ 1754{
1702 if (!focus) 1755 if (!focus)
1703 { 1756 {
1704 focus = 1; 1757 focus = 1;
1705 want_refresh = 1; 1758 want_refresh = 1;
1706 1759
1707 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1760 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1708 1761
1709#if USE_XIM 1762#if USE_XIM
1710 if (Input_Context != NULL) 1763 if (Input_Context != NULL)
1711 { 1764 {
1712 IMSetStatusPosition (); 1765 IMSetStatusPosition ();
… …
1733 if (focus) 1786 if (focus)
1734 { 1787 {
1735 focus = 0; 1788 focus = 0;
1736 want_refresh = 1; 1789 want_refresh = 1;
1737 1790
1738 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1791 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1739 1792
1740#if ENABLE_FRILLS || ISO_14755 1793#if ENABLE_FRILLS || ISO_14755
1741 if (iso14755buf) 1794 if (iso14755buf)
1742 { 1795 {
1743 iso14755buf = 0; 1796 iso14755buf = 0;
… …
1826#ifdef MOUSE_REPORT_DOUBLECLICK 1879#ifdef MOUSE_REPORT_DOUBLECLICK
1827 if (ev.button == MEvent.button && clickintime) 1880 if (ev.button == MEvent.button && clickintime)
1828 { 1881 {
1829 /* same button, within alloted time */ 1882 /* same button, within alloted time */
1830 MEvent.clicks++; 1883 MEvent.clicks++;
1884
1831 if (MEvent.clicks > 1) 1885 if (MEvent.clicks > 1)
1832 { 1886 {
1833 /* only report double clicks */ 1887 /* only report double clicks */
1834 MEvent.clicks = 2; 1888 MEvent.clicks = 2;
1835 mouse_report (ev); 1889 mouse_report (ev);
… …
1855 else 1909 else
1856 { 1910 {
1857 if (ev.button != MEvent.button) 1911 if (ev.button != MEvent.button)
1858 MEvent.clicks = 0; 1912 MEvent.clicks = 0;
1859 1913
1860 if (!PERL_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END))) 1914 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1861 switch (ev.button) 1915 switch (ev.button)
1862 { 1916 {
1863 case Button1: 1917 case Button1:
1864 /* allow meta + click to select rectangular areas */ 1918 /* allow meta + click to select rectangular areas */
1865 /* should be done in screen.C */ 1919 /* should be done in screen.C */
… …
2043 } 2097 }
2044 2098
2045 break; 2099 break;
2046 } 2100 }
2047 } 2101 }
2102
2048 return; 2103 return;
2049 } 2104 }
2105
2050#if MENUBAR 2106#if MENUBAR
2051 /* 2107 /*
2052 * Menubar window processing of button press 2108 * Menubar window processing of button press
2053 */ 2109 */
2054 if (isMenuBarWindow (ev.window)) 2110 if (isMenuBarWindow (ev.window))
… …
2116 */ 2172 */
2117 if (priv_modes & PrivMode_mouse_report 2173 if (priv_modes & PrivMode_mouse_report
2118 && bypass_keystate 2174 && bypass_keystate
2119 && ev.button == Button1 && MEvent.clicks <= 1) 2175 && ev.button == Button1 && MEvent.clicks <= 1)
2120 selection_extend (ev.x, ev.y, 0); 2176 selection_extend (ev.x, ev.y, 0);
2177
2178 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2179 return;
2121 2180
2122 switch (ev.button) 2181 switch (ev.button)
2123 { 2182 {
2124 case Button1: 2183 case Button1:
2125 case Button3: 2184 case Button3:
… …
2670 2729
2671bool 2730bool
2672rxvt_term::cmd_parse () 2731rxvt_term::cmd_parse ()
2673{ 2732{
2674 bool flag = false; 2733 bool flag = false;
2675 unicode_t ch = NOCHAR; 2734 wchar_t ch = NOCHAR;
2676 char *seq_begin; // remember start of esc-sequence here 2735 char *seq_begin; // remember start of esc-sequence here
2677 2736
2678 for (;;) 2737 for (;;)
2679 { 2738 {
2680 if (ch == NOCHAR) 2739 if (ch == NOCHAR)
2681 { 2740 {
2682 seq_begin = cmdbuf_ptr; 2741 seq_begin = cmdbuf_ptr;
2683 ch = next_char (); 2742 ch = next_char ();
2684 }
2685 2743
2686 if (ch == NOCHAR) // TODO: improve 2744 if (ch == NOCHAR)
2687 break; 2745 break;
2746 }
2688 2747
2689 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2748 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2690 { 2749 {
2691 if (!seen_input) 2750 if (!seen_input)
2692 { 2751 {
… …
2701 if (seen_resize && cmd_pid) 2760 if (seen_resize && cmd_pid)
2702 kill (-cmd_pid, SIGWINCH); 2761 kill (-cmd_pid, SIGWINCH);
2703 } 2762 }
2704 2763
2705 /* Read a text string from the input buffer */ 2764 /* Read a text string from the input buffer */
2706 unicode_t buf[UBUFSIZ]; 2765 wchar_t buf[UBUFSIZ];
2707 bool refreshnow = false; 2766 bool refreshnow = false;
2708 int nlines = 0; 2767 int nlines = 0;
2709 unicode_t *str = buf; 2768 wchar_t *str = buf;
2710 unicode_t *eol = str + min (ncol, UBUFSIZ); 2769 wchar_t *eol = str + min (ncol, UBUFSIZ);
2711 2770
2712 for (;;) 2771 for (;;)
2713 { 2772 {
2714 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2773 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2715 break; 2774 break;
… …
2733 } 2792 }
2734 2793
2735 // scr_add_lines only works for nlines <= nrow - 1. 2794 // scr_add_lines only works for nlines <= nrow - 1.
2736 if (nlines >= nrow - 1) 2795 if (nlines >= nrow - 1)
2737 { 2796 {
2738 if (!PERL_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END))) 2797 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2739 scr_add_lines (buf, nlines, str - buf); 2798 scr_add_lines (buf, str - buf, nlines);
2740 2799
2741 nlines = 0; 2800 nlines = 0;
2742 str = buf; 2801 str = buf;
2743 eol = str + min (ncol, UBUFSIZ); 2802 eol = str + min (ncol, UBUFSIZ);
2744 } 2803 }
… …
2758 2817
2759 seq_begin = cmdbuf_ptr; 2818 seq_begin = cmdbuf_ptr;
2760 ch = next_char (); 2819 ch = next_char ();
2761 } 2820 }
2762 2821
2763 if (!PERL_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END))) 2822 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2764 scr_add_lines (buf, nlines, str - buf); 2823 scr_add_lines (buf, str - buf, nlines);
2765 2824
2766 /* 2825 /*
2767 * If there have been a lot of new lines, then update the screen 2826 * If there have been a lot of new lines, then update the screen
2768 * What the heck I'll cheat and only refresh less than every page-full. 2827 * What the heck I'll cheat and only refresh less than every page-full.
2769 * the number of pages between refreshes is refresh_limit, which 2828 * the number of pages between refreshes is refresh_limit, which
… …
2800 } 2859 }
2801 2860
2802 return flag; 2861 return flag;
2803} 2862}
2804 2863
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 2864// read the next character
2815unicode_t 2865wchar_t
2816rxvt_term::next_char () 2866rxvt_term::next_char ()
2817{ 2867{
2818 while (cmdbuf_ptr < cmdbuf_endp) 2868 while (cmdbuf_ptr < cmdbuf_endp)
2819 { 2869 {
2820 // assume 7-bit to be ascii ALWAYS 2870 // assume 7-bit to be ascii ALWAYS
… …
2830 cmdbuf_ptr = cmdbuf_endp; 2880 cmdbuf_ptr = cmdbuf_endp;
2831 break; 2881 break;
2832 } 2882 }
2833 2883
2834 if (len == (size_t)-1) 2884 if (len == (size_t)-1)
2835 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2885 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2836 2886
2837 // assume wchar == unicode 2887 // assume wchar == unicode
2838 cmdbuf_ptr += len; 2888 cmdbuf_ptr += len;
2839 return wc & UNICODE_MASK; 2889 return wc & UNICODE_MASK;
2840 } 2890 }
2841 2891
2842 return NOCHAR; 2892 return NOCHAR;
2893}
2894
2895// read the next octet
2896uint32_t
2897rxvt_term::next_octet ()
2898{
2899 return cmdbuf_ptr < cmdbuf_endp
2900 ? (unsigned char)*cmdbuf_ptr++
2901 : NOCHAR;
2843} 2902}
2844 2903
2845/* rxvt_cmd_getc () - Return next input character */ 2904/* rxvt_cmd_getc () - Return next input character */
2846/* 2905/*
2847 * Return the next input character after first passing any keyboard input 2906 * Return the next input character after first passing any keyboard input
2848 * to the command. 2907 * to the command.
2849 */ 2908 */
2850unicode_t 2909wchar_t
2851rxvt_term::cmd_getc () 2910rxvt_term::cmd_getc ()
2852{ 2911{
2853 unicode_t c = next_char (); 2912 wchar_t c = next_char ();
2854 2913
2855 if (c == NOCHAR) 2914 if (c == NOCHAR)
2856 throw out_of_input; 2915 throw out_of_input;
2857 2916
2858 return c; 2917 return c;
2859} 2918}
2860 2919
2861unicode_t 2920uint32_t
2862rxvt_term::cmd_get8 () 2921rxvt_term::cmd_get8 ()
2863{ 2922{
2864 unicode_t c = next_octet (); 2923 uint32_t c = next_octet ();
2865 2924
2866 if (c == NOCHAR) 2925 if (c == NOCHAR)
2867 throw out_of_input; 2926 throw out_of_input;
2868 2927
2869 return c; 2928 return c;
… …
3136 break; 3195 break;
3137 3196
3138 /* 8.3.87: NEXT LINE */ 3197 /* 8.3.87: NEXT LINE */
3139 case C1_NEL: /* ESC E */ 3198 case C1_NEL: /* ESC E */
3140 { 3199 {
3141 unicode_t nlcr[] = { C0_LF, C0_CR }; 3200 wchar_t nlcr[] = { C0_LF, C0_CR };
3142 scr_add_lines (nlcr, 1, 2); 3201 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3143 } 3202 }
3144 break; 3203 break;
3145 3204
3146 /* kidnapped escape sequence: Should be 8.3.48 */ 3205 /* kidnapped escape sequence: Should be 8.3.48 */
3147 case C1_ESA: /* ESC G */ 3206 case C1_ESA: /* ESC G */
… …
3975 break; 4034 break;
3976#endif 4035#endif
3977 4036
3978#if ENABLE_PERL 4037#if ENABLE_PERL
3979 case URxvt_perl: 4038 case URxvt_perl:
3980 if (PERL_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END))) 4039 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3981 ; // no responses yet 4040 ; // no responses yet
3982 break; 4041 break;
3983#endif 4042#endif
3984 } 4043 }
3985} 4044}
… …
4097 /* extra handling for values with state unkept */ 4156 /* extra handling for values with state unkept */
4098 switch (arg[i]) 4157 switch (arg[i])
4099 { 4158 {
4100#if ENABLE_STYLES 4159#if ENABLE_STYLES
4101 case 1021: 4160 case 1021:
4102 if (mode) 4161 set_option (Opt_intensityStyles, mode);
4103 SET_OPTION (Opt_intensityStyles);
4104 else
4105 CLR_OPTION (Opt_intensityStyles);
4106 4162
4107 scr_touch (true); 4163 scr_touch (true);
4108 break; 4164 break;
4109#endif 4165#endif
4110 case 1048: /* alternative cursor save */ 4166 case 1048: /* alternative cursor save */
… …
4132 case 3: /* 80/132 */ 4188 case 3: /* 80/132 */
4133 if (priv_modes & PrivMode_132OK) 4189 if (priv_modes & PrivMode_132OK)
4134 set_widthheight (((state ? 132 : 80) * fwidth), height); 4190 set_widthheight (((state ? 132 : 80) * fwidth), height);
4135 break; 4191 break;
4136 case 4: /* smooth scrolling */ 4192 case 4: /* smooth scrolling */
4137 if (!state) 4193 set_option (Opt_jumpScroll, !state);
4138 SET_OPTION (Opt_jumpScroll);
4139 else
4140 CLR_OPTION (Opt_jumpScroll);
4141 break; 4194 break;
4142 case 5: /* reverse video */ 4195 case 5: /* reverse video */
4143 scr_rvideo_mode (state); 4196 scr_rvideo_mode (state);
4144 break; 4197 break;
4145 case 6: /* relative/absolute origins */ 4198 case 6: /* relative/absolute origins */
… …
4186#if 0 4239#if 0
4187 case 1001: 4240 case 1001:
4188 break; /* X11 mouse highlighting */ 4241 break; /* X11 mouse highlighting */
4189#endif 4242#endif
4190 case 1010: /* scroll to bottom on TTY output inhibit */ 4243 case 1010: /* scroll to bottom on TTY output inhibit */
4191 if (!state) 4244 set_option (Opt_scrollTtyOutput, !state);
4192 SET_OPTION (Opt_scrollTtyOutput);
4193 else
4194 CLR_OPTION (Opt_scrollTtyOutput);
4195 break; 4245 break;
4196 case 1011: /* scroll to bottom on key press */ 4246 case 1011: /* scroll to bottom on key press */
4197 if (state) 4247 set_option (Opt_scrollTtyKeypress, state);
4198 SET_OPTION (Opt_scrollTtyKeypress);
4199 else
4200 CLR_OPTION (Opt_scrollTtyKeypress);
4201 break; 4248 break;
4202 case 1047: /* secondary screen w/ clearing last */ 4249 case 1047: /* secondary screen w/ clearing last */
4203 if (OPTION (Opt_secondaryScreen)) 4250 if (OPTION (Opt_secondaryScreen))
4204 if (current_screen != PRIMARY) 4251 if (current_screen != PRIMARY)
4205 scr_erase_screen (2); 4252 scr_erase_screen (2);
… …
4415const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4462const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4416 4463
4417void 4464void
4418rxvt_term::tt_write (const char *data, unsigned int len) 4465rxvt_term::tt_write (const char *data, unsigned int len)
4419{ 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