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.367 by root, Sat Nov 24 11:06:12 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
… …
1476 break; 1478 break;
1477 1479
1478 case MapNotify: 1480 case MapNotify:
1479 mapped = 1; 1481 mapped = 1;
1480#ifdef TEXT_BLINK 1482#ifdef TEXT_BLINK
1481 text_blink_ev.start (TEXT_BLINK_INTERVAL); 1483 text_blink_ev.start ();
1482#endif 1484#endif
1483 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END)); 1485 HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
1484 break; 1486 break;
1485 1487
1486 case UnmapNotify: 1488 case UnmapNotify:
… …
1577 int dist; 1579 int dist;
1578 1580
1579 /* don't clobber the current delay if we are 1581 /* don't clobber the current delay if we are
1580 * already in the middle of scrolling. 1582 * already in the middle of scrolling.
1581 */ 1583 */
1582 if (!sel_scroll_ev.active) 1584 if (!ev_is_active (&sel_scroll_ev))
1583 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 1585 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1584 1586
1585 /* save the event params so we can highlight 1587 /* save the event params so we can highlight
1586 * the selection in the pending-scroll loop 1588 * the selection in the pending-scroll loop
1587 */ 1589 */
… …
1610 else 1612 else
1611 { 1613 {
1612 /* we are within the text window, so we 1614 /* we are within the text window, so we
1613 * shouldn't be scrolling 1615 * shouldn't be scrolling
1614 */ 1616 */
1615 if (sel_scroll_ev.active) 1617 if (ev_is_active (&sel_scroll_ev))
1616 sel_scroll_ev.stop(); 1618 sel_scroll_ev.stop();
1617 } 1619 }
1618#endif 1620#endif
1619#ifdef MOUSE_THRESHOLD 1621#ifdef MOUSE_THRESHOLD
1620 } 1622 }
… …
1685 XSetICFocus (Input_Context); 1687 XSetICFocus (Input_Context);
1686 } 1688 }
1687#endif 1689#endif
1688#if CURSOR_BLINK 1690#if CURSOR_BLINK
1689 if (option (Opt_cursorBlink)) 1691 if (option (Opt_cursorBlink))
1690 cursor_blink_ev.start (CURSOR_BLINK_INTERVAL, CURSOR_BLINK_INTERVAL); 1692 cursor_blink_ev.again ();
1691#endif 1693#endif
1692#if OFF_FOCUS_FADING 1694#if OFF_FOCUS_FADING
1693 if (rs[Rs_fade]) 1695 if (rs[Rs_fade])
1694 { 1696 {
1695 pix_colors = pix_colors_focused; 1697 pix_colors = pix_colors_focused;
… …
1957 } 1959 }
1958 else 1960 else
1959#endif /* NO_SCROLLBAR_REPORT */ 1961#endif /* NO_SCROLLBAR_REPORT */
1960 1962
1961 { 1963 {
1962 char upordown = 0; 1964 char upordown = 0;
1963 1965
1964 if (scrollBar.style == R_SB_NEXT) 1966 if (scrollBar.style == R_SB_NEXT)
1965 { 1967 {
1966 if (scrollbarnext_upButton (ev.y)) 1968 if (scrollbarnext_upButton (ev.y))
1967 upordown = -1; /* up */ 1969 upordown = -1; /* up */
… …
2066 scrollBar.setIdle (); 2068 scrollBar.setIdle ();
2067 scrollbar_show (0); 2069 scrollbar_show (0);
2068 } 2070 }
2069 2071
2070#ifdef SELECTION_SCROLLING 2072#ifdef SELECTION_SCROLLING
2071 if (sel_scroll_ev.active) 2073 if (ev_is_active (&sel_scroll_ev))
2072 sel_scroll_ev.stop(); 2074 sel_scroll_ev.stop();
2073#endif 2075#endif
2074 2076
2075 if (ev.window == vt) 2077 if (ev.window == vt)
2076 { 2078 {
… …
2751 nargs = 0; 2753 nargs = 0;
2752 2754
2753 priv = 0; 2755 priv = 0;
2754 ch = cmd_getc (); 2756 ch = cmd_getc ();
2755 if (ch >= '<' && ch <= '?') 2757 if (ch >= '<' && ch <= '?')
2758 {
2756 { /* '<' '=' '>' '?' */ 2759 /* '<' '=' '>' '?' */
2757 priv = ch; 2760 priv = ch;
2758 ch = cmd_getc (); 2761 ch = cmd_getc ();
2759 } 2762 }
2760 2763
2761 /* read any numerical arguments */ 2764 /* read any numerical arguments */
… …
3581 { 66, PrivMode_aplKP }, 3584 { 66, PrivMode_aplKP },
3582#ifndef NO_BACKSPACE_KEY 3585#ifndef NO_BACKSPACE_KEY
3583 { 67, PrivMode_BackSpace }, 3586 { 67, PrivMode_BackSpace },
3584#endif 3587#endif
3585 { 1000, PrivMode_MouseX11 }, 3588 { 1000, PrivMode_MouseX11 },
3586 // 1001 Use Hilite Mouse Tracking. NYI, TODO
3587 { 1002, PrivMode_MouseBtnEvent }, 3589 { 1002, PrivMode_MouseBtnEvent },
3588 { 1003, PrivMode_MouseAnyEvent }, 3590 { 1003, PrivMode_MouseAnyEvent },
3589 { 1010, PrivMode_TtyOutputInh }, // rxvt extension 3591 { 1010, PrivMode_TtyOutputInh }, // rxvt extension
3590 { 1011, PrivMode_Keypress }, // rxvt extension 3592 { 1011, PrivMode_Keypress }, // rxvt extension
3591 // 1035 enable modifiers for alt, numlock NYI 3593 // 1035 enable modifiers for alt, numlock NYI
… …
3692 /* case 67: - backspace key */ 3694 /* case 67: - backspace key */
3693 case 1000: /* X11 mouse reporting */ 3695 case 1000: /* X11 mouse reporting */
3694 if (state) /* orthogonal */ 3696 if (state) /* orthogonal */
3695 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent); 3697 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
3696 break; 3698 break;
3697#if 0
3698 case 1001:
3699 break; /* X11 mouse highlighting */
3700#endif
3701 case 1002: 3699 case 1002:
3702 case 1003: 3700 case 1003:
3703 if (state) 3701 if (state)
3704 { 3702 {
3705 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11); 3703 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseX11);
… …
3894rxvt_term::process_graphics () 3892rxvt_term::process_graphics ()
3895{ 3893{
3896 unicode_t ch, cmd = cmd_getc (); 3894 unicode_t ch, cmd = cmd_getc ();
3897 3895
3898 if (cmd == 'Q') 3896 if (cmd == 'Q')
3897 {
3899 { /* query graphics */ 3898 /* query graphics */
3900 tt_printf ("\033G0\012"); /* no graphics */ 3899 tt_printf ("\033G0\012"); /* no graphics */
3901 return; 3900 return;
3902 } 3901 }
3903 /* swallow other graphics sequences until terminating ':' */ 3902 /* swallow other graphics sequences until terminating ':' */
3904 do 3903 do

Diff Legend

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