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.364 by ayin, Mon Nov 12 14:53:13 2007 UTC vs.
Revision 1.375 by root, Tue Dec 11 21:10:46 2007 UTC

… …
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 && !ev_is_active (&flush_ev))
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
… …
1251 int x, y; 1253 int x, y;
1252 int code = 32; 1254 int code = 32;
1253 1255
1254 x = Pixel2Col (ev.x); 1256 x = Pixel2Col (ev.x);
1255 y = Pixel2Row (ev.y); 1257 y = Pixel2Row (ev.y);
1256 if (ev.type == MotionNotify) { 1258 if (ev.type == MotionNotify)
1259 {
1257 if (x == mouse_row && y == mouse_col) 1260 if (x == mouse_row && y == mouse_col)
1258 return; 1261 return;
1259 mouse_row = x; 1262 mouse_row = x;
1260 mouse_col = y; 1263 mouse_col = y;
1261 code += 32; 1264 code += 32;
1262 } 1265 }
1263 1266
1264 if (MEvent.button == AnyButton) 1267 if (MEvent.button == AnyButton)
1265 button_number = 3; 1268 button_number = 3;
1266 else 1269 else
1267 { 1270 {
… …
1475 break; 1478 break;
1476 1479
1477 case MapNotify: 1480 case MapNotify:
1478 mapped = 1; 1481 mapped = 1;
1479#ifdef TEXT_BLINK 1482#ifdef TEXT_BLINK
1480 text_blink_ev.start (TEXT_BLINK_INTERVAL); 1483 text_blink_ev.start ();
1481#endif 1484#endif
1482 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1485 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1483 break; 1486 break;
1484 1487
1485 case UnmapNotify: 1488 case UnmapNotify:
… …
1576 int dist; 1579 int dist;
1577 1580
1578 /* don't clobber the current delay if we are 1581 /* don't clobber the current delay if we are
1579 * already in the middle of scrolling. 1582 * already in the middle of scrolling.
1580 */ 1583 */
1581 if (!sel_scroll_ev.active) 1584 if (!ev_is_active (&sel_scroll_ev))
1582 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 1585 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1583 1586
1584 /* save the event params so we can highlight 1587 /* save the event params so we can highlight
1585 * the selection in the pending-scroll loop 1588 * the selection in the pending-scroll loop
1586 */ 1589 */
… …
1609 else 1612 else
1610 { 1613 {
1611 /* we are within the text window, so we 1614 /* we are within the text window, so we
1612 * shouldn't be scrolling 1615 * shouldn't be scrolling
1613 */ 1616 */
1614 if (sel_scroll_ev.active) 1617 if (ev_is_active (&sel_scroll_ev))
1615 sel_scroll_ev.stop(); 1618 sel_scroll_ev.stop();
1616 } 1619 }
1617#endif 1620#endif
1618#ifdef MOUSE_THRESHOLD 1621#ifdef MOUSE_THRESHOLD
1619 } 1622 }
… …
1684 XSetICFocus (Input_Context); 1687 XSetICFocus (Input_Context);
1685 } 1688 }
1686#endif 1689#endif
1687#if CURSOR_BLINK 1690#if CURSOR_BLINK
1688 if (option (Opt_cursorBlink)) 1691 if (option (Opt_cursorBlink))
1689 cursor_blink_ev.start (CURSOR_BLINK_INTERVAL, CURSOR_BLINK_INTERVAL); 1692 cursor_blink_ev.again ();
1690#endif 1693#endif
1691#if OFF_FOCUS_FADING 1694#if OFF_FOCUS_FADING
1692 if (rs[Rs_fade]) 1695 if (rs[Rs_fade])
1693 { 1696 {
1694 pix_colors = pix_colors_focused; 1697 pix_colors = pix_colors_focused;
… …
1849 mouse_report (ev); 1852 mouse_report (ev);
1850 } 1853 }
1851#else 1854#else
1852 MEvent.button = ev.button; 1855 MEvent.button = ev.button;
1853 mouse_report (ev); 1856 mouse_report (ev);
1854#endif /* MOUSE_REPORT_DOUBLECLICK */ 1857#endif /* MOUSE_REPORT_DOUBLECLICK */
1855 1858
1856 } 1859 }
1857 else 1860 else
1858 { 1861 {
1859 if (ev.button != MEvent.button) 1862 if (ev.button != MEvent.button)
… …
1953 tt_printf ("\033[5~"); 1956 tt_printf ("\033[5~");
1954 break; 1957 break;
1955 } 1958 }
1956 } 1959 }
1957 else 1960 else
1958#endif /* NO_SCROLLBAR_REPORT */ 1961#endif /* NO_SCROLLBAR_REPORT */
1959 1962
1960 { 1963 {
1961 char upordown = 0; 1964 char upordown = 0;
1962 1965
1963 if (scrollBar.style == R_SB_NEXT) 1966 if (scrollBar.style == R_SB_NEXT)
1964 { 1967 {
1965 if (scrollbarnext_upButton (ev.y)) 1968 if (scrollbarnext_upButton (ev.y))
1966 upordown = -1; /* up */ 1969 upordown = -1; /* up */
… …
2065 scrollBar.setIdle (); 2068 scrollBar.setIdle ();
2066 scrollbar_show (0); 2069 scrollbar_show (0);
2067 } 2070 }
2068 2071
2069#ifdef SELECTION_SCROLLING 2072#ifdef SELECTION_SCROLLING
2070 if (sel_scroll_ev.active) 2073 if (ev_is_active (&sel_scroll_ev))
2071 sel_scroll_ev.stop(); 2074 sel_scroll_ev.stop();
2072#endif 2075#endif
2073 2076
2074 if (ev.window == vt) 2077 if (ev.window == vt)
2075 { 2078 {
… …
2100 mouse_report (ev); 2103 mouse_report (ev);
2101 } 2104 }
2102#else /* MOUSE_REPORT_DOUBLECLICK */ 2105#else /* MOUSE_REPORT_DOUBLECLICK */
2103 MEvent.button = AnyButton; 2106 MEvent.button = AnyButton;
2104 mouse_report (ev); 2107 mouse_report (ev);
2105#endif /* MOUSE_REPORT_DOUBLECLICK */ 2108#endif /* MOUSE_REPORT_DOUBLECLICK */
2106 return; 2109 return;
2107 } 2110 }
2108 2111
2109 /* 2112 /*
2110 * dumb hack to compensate for the failure of click-and-drag 2113 * dumb hack to compensate for the failure of click-and-drag
… …
2226 2229
2227 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1) 2230 if (!option (Opt_jumpScroll) || refresh_count >= nrow - 1)
2228 { 2231 {
2229 refresh_count = 0; 2232 refresh_count = 0;
2230 2233
2231 if (!option (Opt_skipScroll) || ev::ev_time () > ev::now () + 1. / 60.) 2234 if (!option (Opt_skipScroll) || ev_time () > ev::now () + 1. / 60.)
2232 { 2235 {
2233 refreshnow = true; 2236 refreshnow = true;
2234 ch = NOCHAR; 2237 ch = NOCHAR;
2235 break; 2238 break;
2236 } 2239 }
… …
2447 } 2450 }
2448 } 2451 }
2449 2452
2450 pclose_printer (fd); 2453 pclose_printer (fd);
2451} 2454}
2452#endif /* PRINTPIPE */ 2455#endif /* PRINTPIPE */
2453/*}}} */ 2456/*}}} */
2454 2457
2455/* *INDENT-OFF* */ 2458/* *INDENT-OFF* */
2456enum { 2459enum {
2457 C1_40 = 0x40, 2460 C1_40 = 0x40,
… …
2750 nargs = 0; 2753 nargs = 0;
2751 2754
2752 priv = 0; 2755 priv = 0;
2753 ch = cmd_getc (); 2756 ch = cmd_getc ();
2754 if (ch >= '<' && ch <= '?') 2757 if (ch >= '<' && ch <= '?')
2758 {
2755 { /* '<' '=' '>' '?' */ 2759 /* '<' '=' '>' '?' */
2756 priv = ch; 2760 priv = ch;
2757 ch = cmd_getc (); 2761 ch = cmd_getc ();
2758 } 2762 }
2759 2763
2760 /* read any numerical arguments */ 2764 /* read any numerical arguments */
… …
3580 { 66, PrivMode_aplKP }, 3584 { 66, PrivMode_aplKP },
3581#ifndef NO_BACKSPACE_KEY 3585#ifndef NO_BACKSPACE_KEY
3582 { 67, PrivMode_BackSpace }, 3586 { 67, PrivMode_BackSpace },
3583#endif 3587#endif
3584 { 1000, PrivMode_MouseX11 }, 3588 { 1000, PrivMode_MouseX11 },
3585 // 1001 Use Hilite Mouse Tracking. NYI, TODO
3586 { 1002, PrivMode_MouseBtnEvent }, 3589 { 1002, PrivMode_MouseBtnEvent },
3587 { 1003, PrivMode_MouseAnyEvent }, 3590 { 1003, PrivMode_MouseAnyEvent },
3588 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3591 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3589 { 1011, PrivMode_Keypress }, // rxvt extension 3592 { 1011, PrivMode_Keypress }, // rxvt extension
3590 // 1035 enable modifiers for alt, numlock NYI 3593 // 1035 enable modifiers for alt, numlock NYI
… …
3691 /* case 67: - backspace key */ 3694 /* case 67: - backspace key */
3692 case 1000: /* X11 mouse reporting */ 3695 case 1000: /* X11 mouse reporting */
3693 if (state) /* orthogonal */ 3696 if (state) /* orthogonal */
3694 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3697 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3695 break; 3698 break;
3696#if 0
3697 case 1001:
3698 break; /* X11 mouse highlighting */
3699#endif
3700 case 1002: 3699 case 1002:
3701 case 1003: 3700 case 1003:
3702 if (state) { 3701 if (state)
3702 {
3703 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3703 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
3704 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent; 3704 priv_modes &= arg[i] == 1003 ? ~PrivMode_MouseBtnEvent : ~PrivMode_MouseAnyEvent;
3705 vt_emask_mouse = PointerMotionMask; 3705 vt_emask_mouse = PointerMotionMask;
3706 }
3706 } else 3707 else
3707 vt_emask_mouse = NoEventMask; 3708 vt_emask_mouse = NoEventMask;
3708 vt_select_input (); 3709 vt_select_input ();
3709 break; 3710 break;
3710 case 1010: /* scroll to bottom on TTY output inhibit */ 3711 case 1010: /* scroll to bottom on TTY output inhibit */
3711 set_option (Opt_scrollTtyOutput, !state); 3712 set_option (Opt_scrollTtyOutput, !state);
… …
3891rxvt_term::process_graphics () 3892rxvt_term::process_graphics ()
3892{ 3893{
3893 unicode_t ch, cmd = cmd_getc (); 3894 unicode_t ch, cmd = cmd_getc ();
3894 3895
3895 if (cmd == 'Q') 3896 if (cmd == 'Q')
3897 {
3896 { /* query graphics */ 3898 /* query graphics */
3897 tt_printf ("\033G0\012"); /* no graphics */ 3899 tt_printf ("\033G0\012"); /* no graphics */
3898 return; 3900 return;
3899 } 3901 }
3900 /* swallow other graphics sequences until terminating ':' */ 3902 /* swallow other graphics sequences until terminating ':' */
3901 do 3903 do

Diff Legend

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