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.241 by root, Fri Jan 6 05:28:55 2006 UTC

… …
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_STRING_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 && HOOK_INVOKE ((this, HOOK_KEY_RELEASE, DT_XEVENT, &ev, DT_END)))
1421 break;
1377 1422
1378#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1423#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1379 if (!(ev.xkey.state & ControlMask)) 1424 if (!(ev.xkey.state & ControlMask))
1380 slip_wheel_ev.stop (); 1425 slip_wheel_ev.stop ();
1381 else if (ks == XK_Control_L || ks == XK_Control_R) 1426 else if (ks == XK_Control_L || ks == XK_Control_R)
… …
1596 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate) 1641 if ((priv_modes & PrivMode_mouse_report) && !bypass_keystate)
1597 break; 1642 break;
1598 1643
1599 if (ev.xany.window == vt) 1644 if (ev.xany.window == vt)
1600 { 1645 {
1646 if (HOOK_INVOKE ((this, HOOK_MOTION_NOTIFY, DT_XEVENT, &ev, DT_END)))
1647 ; // nop
1601 if (ev.xbutton.state & (Button1Mask | Button3Mask)) 1648 else if (ev.xbutton.state & (Button1Mask | Button3Mask))
1602 { 1649 {
1603 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev)) 1650 while (XCheckTypedWindowEvent (disp, vt, MotionNotify, &ev))
1604 ; 1651 ;
1605 1652
1606 XQueryPointer (disp, vt, 1653 XQueryPointer (disp, vt,
… …
1702 if (!focus) 1749 if (!focus)
1703 { 1750 {
1704 focus = 1; 1751 focus = 1;
1705 want_refresh = 1; 1752 want_refresh = 1;
1706 1753
1707 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1754 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1708 1755
1709#if USE_XIM 1756#if USE_XIM
1710 if (Input_Context != NULL) 1757 if (Input_Context != NULL)
1711 { 1758 {
1712 IMSetStatusPosition (); 1759 IMSetStatusPosition ();
… …
1733 if (focus) 1780 if (focus)
1734 { 1781 {
1735 focus = 0; 1782 focus = 0;
1736 want_refresh = 1; 1783 want_refresh = 1;
1737 1784
1738 PERL_INVOKE ((this, HOOK_FOCUS_OUT, DT_END)); 1785 HOOK_INVOKE ((this, HOOK_FOCUS_OUT, DT_END));
1739 1786
1740#if ENABLE_FRILLS || ISO_14755 1787#if ENABLE_FRILLS || ISO_14755
1741 if (iso14755buf) 1788 if (iso14755buf)
1742 { 1789 {
1743 iso14755buf = 0; 1790 iso14755buf = 0;
… …
1855 else 1902 else
1856 { 1903 {
1857 if (ev.button != MEvent.button) 1904 if (ev.button != MEvent.button)
1858 MEvent.clicks = 0; 1905 MEvent.clicks = 0;
1859 1906
1860 if (!PERL_INVOKE ((this, HOOK_MOUSE_CLICK, DT_XEVENT, &ev, DT_END))) 1907 if (!HOOK_INVOKE ((this, HOOK_BUTTON_PRESS, DT_XEVENT, &ev, DT_END)))
1861 switch (ev.button) 1908 switch (ev.button)
1862 { 1909 {
1863 case Button1: 1910 case Button1:
1864 /* allow meta + click to select rectangular areas */ 1911 /* allow meta + click to select rectangular areas */
1865 /* should be done in screen.C */ 1912 /* should be done in screen.C */
… …
2116 */ 2163 */
2117 if (priv_modes & PrivMode_mouse_report 2164 if (priv_modes & PrivMode_mouse_report
2118 && bypass_keystate 2165 && bypass_keystate
2119 && ev.button == Button1 && MEvent.clicks <= 1) 2166 && ev.button == Button1 && MEvent.clicks <= 1)
2120 selection_extend (ev.x, ev.y, 0); 2167 selection_extend (ev.x, ev.y, 0);
2168
2169 if (!HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
2170 return;
2121 2171
2122 switch (ev.button) 2172 switch (ev.button)
2123 { 2173 {
2124 case Button1: 2174 case Button1:
2125 case Button3: 2175 case Button3:
… …
2679 { 2729 {
2680 if (ch == NOCHAR) 2730 if (ch == NOCHAR)
2681 { 2731 {
2682 seq_begin = cmdbuf_ptr; 2732 seq_begin = cmdbuf_ptr;
2683 ch = next_char (); 2733 ch = next_char ();
2684 }
2685 2734
2686 if (ch == NOCHAR) // TODO: improve 2735 if (ch == NOCHAR)
2687 break; 2736 break;
2737 }
2688 2738
2689 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT) 2739 if (!IS_CONTROL (ch) || ch == C0_LF || ch == C0_CR || ch == C0_HT)
2690 { 2740 {
2691 if (!seen_input) 2741 if (!seen_input)
2692 { 2742 {
… …
2733 } 2783 }
2734 2784
2735 // scr_add_lines only works for nlines <= nrow - 1. 2785 // scr_add_lines only works for nlines <= nrow - 1.
2736 if (nlines >= nrow - 1) 2786 if (nlines >= nrow - 1)
2737 { 2787 {
2788 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END)))
2738 scr_add_lines (buf, nlines, str - buf); 2789 scr_add_lines (buf, nlines, str - buf);
2790
2739 nlines = 0; 2791 nlines = 0;
2740 str = buf; 2792 str = buf;
2741 eol = str + min (ncol, UBUFSIZ); 2793 eol = str + min (ncol, UBUFSIZ);
2742 } 2794 }
2743 2795
… …
2756 2808
2757 seq_begin = cmdbuf_ptr; 2809 seq_begin = cmdbuf_ptr;
2758 ch = next_char (); 2810 ch = next_char ();
2759 } 2811 }
2760 2812
2813 if (!HOOK_INVOKE ((this, HOOK_ADD_LINES, DT_USTRING_LEN, buf, str - buf, DT_END)))
2761 scr_add_lines (buf, nlines, str - buf); 2814 scr_add_lines (buf, nlines, str - buf);
2762 2815
2763 /* 2816 /*
2764 * If there have been a lot of new lines, then update the screen 2817 * 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. 2818 * 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 2819 * the number of pages between refreshes is refresh_limit, which
… …
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_STRING, str, DT_END)))
3978 ; // no responses yet 4031 ; // no responses yet
3979 break; 4032 break;
3980#endif 4033#endif
3981 } 4034 }
3982} 4035}
… …
4412const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT 4465const unsigned int MAX_PTY_WRITE = 255; // minimum MAX_INPUT
4413 4466
4414void 4467void
4415rxvt_term::tt_write (const char *data, unsigned int len) 4468rxvt_term::tt_write (const char *data, unsigned int len)
4416{ 4469{
4470 if (pty.pty < 0)
4471 return;
4472
4417 if (v_buflen == 0) 4473 if (v_buflen == 0)
4418 { 4474 {
4419 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE)); 4475 ssize_t written = write (pty.pty, data, min (len, MAX_PTY_WRITE));
4420 4476
4421 if ((unsigned int)written == len) 4477 if ((unsigned int)written == len)

Diff Legend

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