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.375 by root, Tue Dec 11 21:10:46 2007 UTC vs.
Revision 1.376 by root, Fri Dec 14 02:08:18 2007 UTC

… …
1048{ 1048{
1049 make_current (); 1049 make_current ();
1050 1050
1051 display->flush (); 1051 display->flush ();
1052 1052
1053 if (want_refresh && !ev_is_active (&flush_ev)) 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)
… …
1579 int dist; 1579 int dist;
1580 1580
1581 /* don't clobber the current delay if we are 1581 /* don't clobber the current delay if we are
1582 * already in the middle of scrolling. 1582 * already in the middle of scrolling.
1583 */ 1583 */
1584 if (!ev_is_active (&sel_scroll_ev)) 1584 if (!sel_scroll_ev.is_active ())
1585 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 1585 sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1586 1586
1587 /* save the event params so we can highlight 1587 /* save the event params so we can highlight
1588 * the selection in the pending-scroll loop 1588 * the selection in the pending-scroll loop
1589 */ 1589 */
… …
1612 else 1612 else
1613 { 1613 {
1614 /* we are within the text window, so we 1614 /* we are within the text window, so we
1615 * shouldn't be scrolling 1615 * shouldn't be scrolling
1616 */ 1616 */
1617 if (ev_is_active (&sel_scroll_ev))
1618 sel_scroll_ev.stop(); 1617 sel_scroll_ev.stop();
1619 } 1618 }
1620#endif 1619#endif
1621#ifdef MOUSE_THRESHOLD 1620#ifdef MOUSE_THRESHOLD
1622 } 1621 }
1623#endif 1622#endif
… …
1975 if (scrollbarrxvt_upButton (ev.y)) 1974 if (scrollbarrxvt_upButton (ev.y))
1976 upordown = -1; /* up */ 1975 upordown = -1; /* up */
1977 else if (scrollbarrxvt_dnButton (ev.y)) 1976 else if (scrollbarrxvt_dnButton (ev.y))
1978 upordown = 1; /* down */ 1977 upordown = 1; /* down */
1979 } 1978 }
1979
1980 if (upordown) 1980 if (upordown)
1981 { 1981 {
1982#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING 1982#ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
1983 if (!cont_scroll_ev.is_active ())
1983 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 1984 cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
1984#endif 1985#endif
1985 if (scr_page (upordown < 0 ? UP : DN, 1)) 1986 if (scr_page (upordown < 0 ? UP : DN, 1))
1986 { 1987 {
1987 if (upordown < 0) 1988 if (upordown < 0)
1988 scrollBar.setUp (); 1989 scrollBar.setUp ();
… …
2068 scrollBar.setIdle (); 2069 scrollBar.setIdle ();
2069 scrollbar_show (0); 2070 scrollbar_show (0);
2070 } 2071 }
2071 2072
2072#ifdef SELECTION_SCROLLING 2073#ifdef SELECTION_SCROLLING
2073 if (ev_is_active (&sel_scroll_ev))
2074 sel_scroll_ev.stop(); 2074 sel_scroll_ev.stop();
2075#endif 2075#endif
2076 2076
2077 if (ev.window == vt) 2077 if (ev.window == vt)
2078 { 2078 {
2079 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END))) 2079 if (HOOK_INVOKE ((this, HOOK_BUTTON_RELEASE, DT_XEVENT, &ev, DT_END)))
… …
2151 { 2151 {
2152 mouse_slip_wheel_speed += v ? -1 : 1; 2152 mouse_slip_wheel_speed += v ? -1 : 1;
2153 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow; 2153 if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
2154 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow; 2154 if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
2155 2155
2156 if (!slip_wheel_ev.is_active ())
2156 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY); 2157 slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
2157 } 2158 }
2158 else 2159 else
2159 { 2160 {
2160# endif 2161# endif
2161 scr_page (v, i); 2162 scr_page (v, i);

Diff Legend

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