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.365 by ayin, Thu Nov 15 10:13:37 2007 UTC vs.
Revision 1.378 by root, Fri Dec 14 02:27:54 2007 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-2006 Marc Lehmann <pcg@goof.com> 30 * Copyright (c) 2003-2007 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.
… …
1048{ 1048{
1049 make_current (); 1049 make_current ();
1050 1050
1051 display->flush (); 1051 display->flush ();
1052 1052
1053 if (want_refresh && !flush_ev.active) 1053 if (want_refresh && !flush_ev.is_active ())
1054 flush_ev.start (1. / 60.); // refresh at max. 60 hz normally 1054 flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
1055} 1055}
1056 1056
1057void 1057void
1058rxvt_term::flush_cb (ev::timer &w, int revents) 1058rxvt_term::flush_cb (ev::timer &w, int revents)
1059{ 1059{
… …
1079 if (scr_refresh_rend (RS_Blink, RS_Blink)) 1079 if (scr_refresh_rend (RS_Blink, RS_Blink))
1080 { 1080 {
1081 hidden_text = !hidden_text; 1081 hidden_text = !hidden_text;
1082 want_refresh = 1; 1082 want_refresh = 1;
1083 } 1083 }
1084 else
1085 w.stop ();
1084} 1086}
1085#endif 1087#endif
1086 1088
1087#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1089#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1088void 1090void
… …
1112 1114
1113#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1115#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1114void 1116void
1115rxvt_term::slip_wheel_cb (ev::timer &w, int revents) 1117rxvt_term::slip_wheel_cb (ev::timer &w, int revents)
1116{ 1118{
1117 if (mouse_slip_wheel_speed == 0
1118 || mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed) 1119 if (mouse_slip_wheel_speed < 0 ? scr_page (DN, -mouse_slip_wheel_speed)
1119 : scr_page (UP, mouse_slip_wheel_speed)) 1120 : scr_page (UP, mouse_slip_wheel_speed))
1121 want_refresh = 1;
1122
1123 if (view_start == top_row || view_start == 0 || mouse_slip_wheel_speed == 0)
1120 { 1124 {
1121 if (view_start == top_row || view_start == 0)
1122 mouse_slip_wheel_speed = 0; 1125 mouse_slip_wheel_speed = 0;
1123
1124 want_refresh = 1;
1125 }
1126 else
1127 w.stop (); 1126 w.stop ();
1127 }
1128} 1128}
1129#endif 1129#endif
1130 1130
1131#if LINUX_YIELD_HACK 1131#if LINUX_YIELD_HACK
1132static struct event_handler 1132static struct event_handler
… …
1476 break; 1476 break;
1477 1477
1478 case MapNotify: 1478 case MapNotify:
1479 mapped = 1; 1479 mapped = 1;
1480#ifdef TEXT_BLINK 1480#ifdef TEXT_BLINK
1481 text_blink_ev.start (TEXT_BLINK_INTERVAL); 1481 text_blink_ev.start ();
1482#endif 1482#endif
1483 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1483 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1484 break; 1484 break;
1485 1485
1486 case UnmapNotify: 1486 case UnmapNotify:
… …
1577 int dist; 1577 int dist;
1578 1578
1579 /* don't clobber the current delay if we are 1579 /* don't clobber the current delay if we are
1580 * already in the middle of scrolling. 1580 * already in the middle of scrolling.
1581 */ 1581 */
1582 if (!sel_scroll_ev.active) 1582 if (!sel_scroll_ev.is_active ())
1583 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 1583 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1584 1584
1585 /* save the event params so we can highlight 1585 /* save the event params so we can highlight
1586 * the selection in the pending-scroll loop 1586 * the selection in the pending-scroll loop
1587 */ 1587 */
… …
1610 else 1610 else
1611 { 1611 {
1612 /* we are within the text window, so we 1612 /* we are within the text window, so we
1613 * shouldn't be scrolling 1613 * shouldn't be scrolling
1614 */ 1614 */
1615 if (sel_scroll_ev.active)
1616 sel_scroll_ev.stop(); 1615 sel_scroll_ev.stop();
1617 } 1616 }
1618#endif 1617#endif
1619#ifdef MOUSE_THRESHOLD 1618#ifdef MOUSE_THRESHOLD
1620 } 1619 }
1621#endif 1620#endif
… …
1685 XSetICFocus (Input_Context); 1684 XSetICFocus (Input_Context);
1686 } 1685 }
1687#endif 1686#endif
1688#if CURSOR_BLINK 1687#if CURSOR_BLINK
1689 if (option (Opt_cursorBlink)) 1688 if (option (Opt_cursorBlink))
1690 cursor_blink_ev.start (CURSOR_BLINK_INTERVAL, CURSOR_BLINK_INTERVAL); 1689 cursor_blink_ev.again ();
1691#endif 1690#endif
1692#if OFF_FOCUS_FADING 1691#if OFF_FOCUS_FADING
1693 if (rs[Rs_fade]) 1692 if (rs[Rs_fade])
1694 { 1693 {
1695 pix_colors = pix_colors_focused; 1694 pix_colors = pix_colors_focused;
… …
1850 mouse_report (ev); 1849 mouse_report (ev);
1851 } 1850 }
1852#else 1851#else
1853 MEvent.button = ev.button; 1852 MEvent.button = ev.button;
1854 mouse_report (ev); 1853 mouse_report (ev);
1855#endif /* MOUSE_REPORT_DOUBLECLICK */ 1854#endif /* MOUSE_REPORT_DOUBLECLICK */
1856 1855
1857 } 1856 }
1858 else 1857 else
1859 { 1858 {
1860 if (ev.button != MEvent.button) 1859 if (ev.button != MEvent.button)
… …
1954 tt_printf ("\033[5~"); 1953 tt_printf ("\033[5~");
1955 break; 1954 break;
1956 } 1955 }
1957 } 1956 }
1958 else 1957 else
1959#endif /* NO_SCROLLBAR_REPORT */ 1958#endif /* NO_SCROLLBAR_REPORT */
1960 1959
1961 { 1960 {
1962 char upordown = 0; 1961 char upordown = 0;
1963 1962
1964 if (scrollBar.style == R_SB_NEXT) 1963 if (scrollBar.style == R_SB_NEXT)
1965 { 1964 {
1966 if (scrollbarnext_upButton (ev.y)) 1965 if (scrollbarnext_upButton (ev.y))
1967 upordown = -1; /* up */ 1966 upordown = -1; /* up */
… …
1973 if (scrollbarrxvt_upButton (ev.y)) 1972 if (scrollbarrxvt_upButton (ev.y))
1974 upordown = -1; /* up */ 1973 upordown = -1; /* up */
1975 else if (scrollbarrxvt_dnButton (ev.y)) 1974 else if (scrollbarrxvt_dnButton (ev.y))
1976 upordown = 1; /* down */ 1975 upordown = 1; /* down */
1977 } 1976 }
1977
1978 if (upordown) 1978 if (upordown)
1979 { 1979 {
1980#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1980#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1981 if (!cont_scroll_ev.is_active ())
1981 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 1982 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1982#endif 1983#endif
1983 if (scr_page (upordown < 0 ? UP : DN, 1)) 1984 if (scr_page (upordown < 0 ? UP : DN, 1))
1984 { 1985 {
1985 if (upordown < 0) 1986 if (upordown < 0)
1986 scrollBar.setUp (); 1987 scrollBar.setUp ();
… …
2066 scrollBar.setIdle (); 2067 scrollBar.setIdle ();
2067 scrollbar_show (0); 2068 scrollbar_show (0);
2068 } 2069 }
2069 2070
2070#ifdef SELECTION_SCROLLING 2071#ifdef SELECTION_SCROLLING
2071 if (sel_scroll_ev.active)
2072 sel_scroll_ev.stop(); 2072 sel_scroll_ev.stop();
2073#endif 2073#endif
2074 2074
2075 if (ev.window == vt) 2075 if (ev.window == vt)
2076 { 2076 {
2077 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2077 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2101 mouse_report (ev); 2101 mouse_report (ev);
2102 } 2102 }
2103#else /* MOUSE_REPORT_DOUBLECLICK */ 2103#else /* MOUSE_REPORT_DOUBLECLICK */
2104 MEvent.button = AnyButton; 2104 MEvent.button = AnyButton;
2105 mouse_report (ev); 2105 mouse_report (ev);
2106#endif /* MOUSE_REPORT_DOUBLECLICK */ 2106#endif /* MOUSE_REPORT_DOUBLECLICK */
2107 return; 2107 return;
2108 } 2108 }
2109 2109
2110 /* 2110 /*
2111 * dumb hack to compensate for the failure of click-and-drag 2111 * dumb hack to compensate for the failure of click-and-drag
… …
2149 { 2149 {
2150 mouse_slip_wheel_speed += v ? -1 : 1; 2150 mouse_slip_wheel_speed += v ? -1 : 1;
2151 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2151 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2152 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2152 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2153 2153
2154 if (!slip_wheel_ev.is_active ())
2154 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2155 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2155 } 2156 }
2156 else 2157 else
2157 { 2158 {
2158# endif 2159# endif
2159 scr_page (v, i); 2160 scr_page (v, i);
… …
2227 2228
2228 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1) 2229 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2229 { 2230 {
2230 refresh_count = 0; 2231 refresh_count = 0;
2231 2232
2232 if (!option (Opt_skipScroll) || ev::ev_time () > ev::now () + 1. / 60.) 2233 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2233 { 2234 {
2234 refreshnow = true; 2235 refreshnow = true;
2235 ch = NOCHAR; 2236 ch = NOCHAR;
2236 break; 2237 break;
2237 } 2238 }
… …
2448 } 2449 }
2449 } 2450 }
2450 2451
2451 pclose_printer (fd); 2452 pclose_printer (fd);
2452} 2453}
2453#endif /* PRINTPIPE */ 2454#endif /* PRINTPIPE */
2454/*}}} */ 2455/*}}} */
2455 2456
2456/* *INDENT-OFF* */ 2457/* *INDENT-OFF* */
2457enum { 2458enum {
2458 C1_40 = 0x40, 2459 C1_40 = 0x40,
… …
2751 nargs = 0; 2752 nargs = 0;
2752 2753
2753 priv = 0; 2754 priv = 0;
2754 ch = cmd_getc (); 2755 ch = cmd_getc ();
2755 if (ch >= '<' && ch <= '?') 2756 if (ch >= '<' && ch <= '?')
2757 {
2756 { /* '<' '=' '>' '?' */ 2758 /* '<' '=' '>' '?' */
2757 priv = ch; 2759 priv = ch;
2758 ch = cmd_getc (); 2760 ch = cmd_getc ();
2759 } 2761 }
2760 2762
2761 /* read any numerical arguments */ 2763 /* read any numerical arguments */
… …
3581 { 66, PrivMode_aplKP }, 3583 { 66, PrivMode_aplKP },
3582#ifndef NO_BACKSPACE_KEY 3584#ifndef NO_BACKSPACE_KEY
3583 { 67, PrivMode_BackSpace }, 3585 { 67, PrivMode_BackSpace },
3584#endif 3586#endif
3585 { 1000, PrivMode_MouseX11 }, 3587 { 1000, PrivMode_MouseX11 },
3586 // 1001 Use Hilite Mouse Tracking. NYI, TODO
3587 { 1002, PrivMode_MouseBtnEvent }, 3588 { 1002, PrivMode_MouseBtnEvent },
3588 { 1003, PrivMode_MouseAnyEvent }, 3589 { 1003, PrivMode_MouseAnyEvent },
3589 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3590 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3590 { 1011, PrivMode_Keypress }, // rxvt extension 3591 { 1011, PrivMode_Keypress }, // rxvt extension
3591 // 1035 enable modifiers for alt, numlock NYI 3592 // 1035 enable modifiers for alt, numlock NYI
… …
3692 /* case 67: - backspace key */ 3693 /* case 67: - backspace key */
3693 case 1000: /* X11 mouse reporting */ 3694 case 1000: /* X11 mouse reporting */
3694 if (state) /* orthogonal */ 3695 if (state) /* orthogonal */
3695 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3696 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3696 break; 3697 break;
3697#if 0
3698 case 1001:
3699 break; /* X11 mouse highlighting */
3700#endif
3701 case 1002: 3698 case 1002:
3702 case 1003: 3699 case 1003:
3703 if (state) 3700 if (state)
3704 { 3701 {
3705 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3702 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
… …
3894rxvt_term::process_graphics () 3891rxvt_term::process_graphics ()
3895{ 3892{
3896 unicode_t ch, cmd = cmd_getc (); 3893 unicode_t ch, cmd = cmd_getc ();
3897 3894
3898 if (cmd == 'Q') 3895 if (cmd == 'Q')
3896 {
3899 { /* query graphics */ 3897 /* query graphics */
3900 tt_printf ("\033G0\012"); /* no graphics */ 3898 tt_printf ("\033G0\012"); /* no graphics */
3901 return; 3899 return;
3902 } 3900 }
3903 /* swallow other graphics sequences until terminating ':' */ 3901 /* swallow other graphics sequences until terminating ':' */
3904 do 3902 do

Diff Legend

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