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.247 by root, Sat Jan 7 20:23:52 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_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
1165void 1207void
1166rxvt_term::pointer_blank () 1208rxvt_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
… …
1372# endif 1414# endif
1373 else 1415 else
1374 iso14755buf = 0; 1416 iso14755buf = 0;
1375 } 1417 }
1376#endif 1418#endif
1419
1420 if (ev.xany.window == vt
1421 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END)))
1422 break;
1377 1423
1378#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1424#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1379 if (!(ev.xkey.state & ControlMask)) 1425 if (!(ev.xkey.state & ControlMask))
1380 slip_wheel_ev.stop (); 1426 slip_wheel_ev.stop ();
1381 else if (ks == XK_Control_L || ks == XK_Control_R) 1427 else if (ks == XK_Control_L || ks == XK_Control_R)
… …
1516 1562
1517 case SelectionRequest: 1563 case SelectionRequest:
1518 selection_send (ev.xselectionrequest); 1564 selection_send (ev.xselectionrequest);
1519 break; 1565 break;
1520 1566
1567 case MapNotify:
1568 mapped = 1;
1569#ifdef TEXT_BLINK
1570 text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
1571#endif
1572 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1573 break;
1574
1521 case UnmapNotify: 1575 case UnmapNotify:
1522 mapped = 0; 1576 mapped = 0;
1523#ifdef TEXT_BLINK 1577#ifdef TEXT_BLINK
1524 text_blink_ev.stop (); 1578 text_blink_ev.stop ();
1525#endif 1579#endif
1526 break; 1580 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; 1581 break;
1534 1582
1535#ifdef TRANSPARENT 1583#ifdef TRANSPARENT
1536 case ReparentNotify: 1584 case ReparentNotify:
1537 rootwin_cb (ev); 1585 rootwin_cb (ev);
… …
1596 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1644 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1597 break; 1645 break;
1598 1646
1599 if (ev.xany.window == vt) 1647 if (ev.xany.window == vt)
1600 { 1648 {
1649 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1650 ; // nop
1601 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1651 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1602 { 1652 {
1603 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1653 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1604 ; 1654 ;
1605 1655
1606 XQueryPointer (disp, vt, 1656 XQueryPointer (disp, vt,
… …
1702 if (!focus) 1752 if (!focus)
1703 { 1753 {
1704 focus = 1; 1754 focus = 1;
1705 want_refresh = 1; 1755 want_refresh = 1;
1706 1756
1707 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1757 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1708 1758
1709#if USE_XIM 1759#if USE_XIM
1710 if (Input_Context != NULL) 1760 if (Input_Context != NULL)
1711 { 1761 {
1712 IMSetStatusPosition (); 1762 IMSetStatusPosition ();
… …
1733 if (focus) 1783 if (focus)
1734 { 1784 {
1735 focus = 0; 1785 focus = 0;
1736 want_refresh = 1; 1786 want_refresh = 1;
1737 1787
1738 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1788 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1739 1789
1740#if ENABLE_FRILLS || ISO_14755 1790#if ENABLE_FRILLS || ISO_14755
1741 if (iso14755buf) 1791 if (iso14755buf)
1742 { 1792 {
1743 iso14755buf = 0; 1793 iso14755buf = 0;
… …
1826#ifdef MOUSE_REPORT_DOUBLECLICK 1876#ifdef MOUSE_REPORT_DOUBLECLICK
1827 if (ev.button == MEvent.button && clickintime) 1877 if (ev.button == MEvent.button && clickintime)
1828 { 1878 {
1829 /* same button, within alloted time */ 1879 /* same button, within alloted time */
1830 MEvent.clicks++; 1880 MEvent.clicks++;
1881
1831 if (MEvent.clicks > 1) 1882 if (MEvent.clicks > 1)
1832 { 1883 {
1833 /* only report double clicks */ 1884 /* only report double clicks */
1834 MEvent.clicks = 2; 1885 MEvent.clicks = 2;
1835 mouse_report (ev); 1886 mouse_report (ev);
… …
1855 else 1906 else
1856 { 1907 {
1857 if (ev.button != MEvent.button) 1908 if (ev.button != MEvent.button)
1858 MEvent.clicks = 0; 1909 MEvent.clicks = 0;
1859 1910
1860 if (!PERL_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END))) 1911 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1861 switch (ev.button) 1912 switch (ev.button)
1862 { 1913 {
1863 case Button1: 1914 case Button1:
1864 /* allow meta + click to select rectangular areas */ 1915 /* allow meta + click to select rectangular areas */
1865 /* should be done in screen.C */ 1916 /* should be done in screen.C */
… …
2043 } 2094 }
2044 2095
2045 break; 2096 break;
2046 } 2097 }
2047 } 2098 }
2099
2048 return; 2100 return;
2049 } 2101 }
2102
2050#if MENUBAR 2103#if MENUBAR
2051 /* 2104 /*
2052 * Menubar window processing of button press 2105 * Menubar window processing of button press
2053 */ 2106 */
2054 if (isMenuBarWindow (ev.window)) 2107 if (isMenuBarWindow (ev.window))
… …
2116 */ 2169 */
2117 if (priv_modes & PrivMode_mouse_report 2170 if (priv_modes & PrivMode_mouse_report
2118 && bypass_keystate 2171 && bypass_keystate
2119 && ev.button == Button1 && MEvent.clicks <= 1) 2172 && ev.button == Button1 && MEvent.clicks <= 1)
2120 selection_extend (ev.x, ev.y, 0); 2173 selection_extend (ev.x, ev.y, 0);
2174
2175 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2176 return;
2121 2177
2122 switch (ev.button) 2178 switch (ev.button)
2123 { 2179 {
2124 case Button1: 2180 case Button1:
2125 case Button3: 2181 case Button3:
… …
2670 2726
2671bool 2727bool
2672rxvt_term::cmd_parse () 2728rxvt_term::cmd_parse ()
2673{ 2729{
2674 bool flag = false; 2730 bool flag = false;
2675 unicode_t ch = NOCHAR; 2731 wchar_t ch = NOCHAR;
2676 char *seq_begin; // remember start of esc-sequence here 2732 char *seq_begin; // remember start of esc-sequence here
2677 2733
2678 for (;;) 2734 for (;;)
2679 { 2735 {
2680 if (ch == NOCHAR) 2736 if (ch == NOCHAR)
2681 { 2737 {
2682 seq_begin = cmdbuf_ptr; 2738 seq_begin = cmdbuf_ptr;
2683 ch = next_char (); 2739 ch = next_char ();
2684 }
2685 2740
2686 if (ch == NOCHAR) // TODO: improve 2741 if (ch == NOCHAR)
2687 break; 2742 break;
2743 }
2688 2744
2689 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2745 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2690 { 2746 {
2691 if (!seen_input) 2747 if (!seen_input)
2692 { 2748 {
… …
2701 if (seen_resize && cmd_pid) 2757 if (seen_resize && cmd_pid)
2702 kill (-cmd_pid, SIGWINCH); 2758 kill (-cmd_pid, SIGWINCH);
2703 } 2759 }
2704 2760
2705 /* Read a text string from the input buffer */ 2761 /* Read a text string from the input buffer */
2706 unicode_t buf[UBUFSIZ]; 2762 wchar_t buf[UBUFSIZ];
2707 bool refreshnow = false; 2763 bool refreshnow = false;
2708 int nlines = 0; 2764 int nlines = 0;
2709 unicode_t *str = buf; 2765 wchar_t *str = buf;
2710 unicode_t *eol = str + min (ncol, UBUFSIZ); 2766 wchar_t *eol = str + min (ncol, UBUFSIZ);
2711 2767
2712 for (;;) 2768 for (;;)
2713 { 2769 {
2714 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT)) 2770 if (ch == NOCHAR || (IS_CONTROL (ch) && ch != C0_LF && ch != C0_CR && ch != C0_HT))
2715 break; 2771 break;
… …
2733 } 2789 }
2734 2790
2735 // scr_add_lines only works for nlines <= nrow - 1. 2791 // scr_add_lines only works for nlines <= nrow - 1.
2736 if (nlines >= nrow - 1) 2792 if (nlines >= nrow - 1)
2737 { 2793 {
2794 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2738 scr_add_lines (buf, nlines, str - buf); 2795 scr_add_lines (buf, str - buf, nlines);
2796
2739 nlines = 0; 2797 nlines = 0;
2740 str = buf; 2798 str = buf;
2741 eol = str + min (ncol, UBUFSIZ); 2799 eol = str + min (ncol, UBUFSIZ);
2742 } 2800 }
2743 2801
… …
2756 2814
2757 seq_begin = cmdbuf_ptr; 2815 seq_begin = cmdbuf_ptr;
2758 ch = next_char (); 2816 ch = next_char ();
2759 } 2817 }
2760 2818
2819 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_WCS_LEN, buf, str - buf, DT_END)))
2761 scr_add_lines (buf, nlines, str - buf); 2820 scr_add_lines (buf, str - buf, nlines);
2762 2821
2763 /* 2822 /*
2764 * If there have been a lot of new lines, then update the screen 2823 * 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. 2824 * 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 2825 * the number of pages between refreshes is refresh_limit, which
… …
2797 } 2856 }
2798 2857
2799 return flag; 2858 return flag;
2800} 2859}
2801 2860
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 2861// read the next character
2812unicode_t 2862wchar_t
2813rxvt_term::next_char () 2863rxvt_term::next_char ()
2814{ 2864{
2815 while (cmdbuf_ptr < cmdbuf_endp) 2865 while (cmdbuf_ptr < cmdbuf_endp)
2816 { 2866 {
2817 // assume 7-bit to be ascii ALWAYS 2867 // assume 7-bit to be ascii ALWAYS
… …
2827 cmdbuf_ptr = cmdbuf_endp; 2877 cmdbuf_ptr = cmdbuf_endp;
2828 break; 2878 break;
2829 } 2879 }
2830 2880
2831 if (len == (size_t)-1) 2881 if (len == (size_t)-1)
2832 return *cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through 2882 return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
2833 2883
2834 // assume wchar == unicode 2884 // assume wchar == unicode
2835 cmdbuf_ptr += len; 2885 cmdbuf_ptr += len;
2836 return wc & UNICODE_MASK; 2886 return wc & UNICODE_MASK;
2837 } 2887 }
2838 2888
2839 return NOCHAR; 2889 return NOCHAR;
2890}
2891
2892// read the next octet
2893uint32_t
2894rxvt_term::next_octet ()
2895{
2896 return cmdbuf_ptr < cmdbuf_endp
2897 ? (unsigned char)*cmdbuf_ptr++
2898 : NOCHAR;
2840} 2899}
2841 2900
2842/* rxvt_cmd_getc () - Return next input character */ 2901/* rxvt_cmd_getc () - Return next input character */
2843/* 2902/*
2844 * Return the next input character after first passing any keyboard input 2903 * Return the next input character after first passing any keyboard input
2845 * to the command. 2904 * to the command.
2846 */ 2905 */
2847unicode_t 2906wchar_t
2848rxvt_term::cmd_getc () 2907rxvt_term::cmd_getc ()
2849{ 2908{
2850 unicode_t c = next_char (); 2909 wchar_t c = next_char ();
2851 2910
2852 if (c == NOCHAR) 2911 if (c == NOCHAR)
2853 throw out_of_input; 2912 throw out_of_input;
2854 2913
2855 return c; 2914 return c;
2856} 2915}
2857 2916
2858unicode_t 2917uint32_t
2859rxvt_term::cmd_get8 () 2918rxvt_term::cmd_get8 ()
2860{ 2919{
2861 unicode_t c = next_octet (); 2920 uint32_t c = next_octet ();
2862 2921
2863 if (c == NOCHAR) 2922 if (c == NOCHAR)
2864 throw out_of_input; 2923 throw out_of_input;
2865 2924
2866 return c; 2925 return c;
… …
3133 break; 3192 break;
3134 3193
3135 /* 8.3.87: NEXT LINE */ 3194 /* 8.3.87: NEXT LINE */
3136 case C1_NEL: /* ESC E */ 3195 case C1_NEL: /* ESC E */
3137 { 3196 {
3138 unicode_t nlcr[] = { C0_LF, C0_CR }; 3197 wchar_t nlcr[] = { C0_LF, C0_CR };
3139 scr_add_lines (nlcr, 1, 2); 3198 scr_add_lines (nlcr, sizeof (nlcr) / sizeof (nlcr [0]), 1);
3140 } 3199 }
3141 break; 3200 break;
3142 3201
3143 /* kidnapped escape sequence: Should be 8.3.48 */ 3202 /* kidnapped escape sequence: Should be 8.3.48 */
3144 case C1_ESA: /* ESC G */ 3203 case C1_ESA: /* ESC G */
… …
3972 break; 4031 break;
3973#endif 4032#endif
3974 4033
3975#if ENABLE_PERL 4034#if ENABLE_PERL
3976 case URxvt_perl: 4035 case URxvt_perl:
3977 if (PERL_INVOKE ((this, HOOK_OSC_SEQ, DT_STRING, str, DT_END))) 4036 if (HOOK_INVOKE ((this, HOOK_OSC_SEQ, DT_STR, str, DT_END)))
3978 ; // no responses yet 4037 ; // no responses yet
3979 break; 4038 break;
3980#endif 4039#endif
3981 } 4040 }
3982} 4041}
… …
4412const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4471const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4413 4472
4414void 4473void
4415rxvt_term::tt_write (const char *data, unsigned int len) 4474rxvt_term::tt_write (const char *data, unsigned int len)
4416{ 4475{
4476 if (pty.pty < 0)
4477 return;
4478
4417 if (v_buflen == 0) 4479 if (v_buflen == 0)
4418 { 4480 {
4419 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4481 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4420 4482
4421 if ((unsigned int)written == len) 4483 if ((unsigned int)written == len)

Diff Legend

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