| … | |
… | |
| 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 | |
| 1057 | void |
1057 | void |
| 1058 | rxvt_term::flush_cb (ev::timer &w, int revents) |
1058 | rxvt_term::flush_cb (ev::timer &w, int revents) |
| … | |
… | |
| 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 (!ev_is_active (&sel_scroll_ev)) |
| 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) |
1615 | if (ev_is_active (&sel_scroll_ev)) |
| 1616 | sel_scroll_ev.stop(); |
1616 | sel_scroll_ev.stop(); |
| 1617 | } |
1617 | } |
| 1618 | #endif |
1618 | #endif |
| 1619 | #ifdef MOUSE_THRESHOLD |
1619 | #ifdef MOUSE_THRESHOLD |
| 1620 | } |
1620 | } |
| … | |
… | |
| 2066 | scrollBar.setIdle (); |
2066 | scrollBar.setIdle (); |
| 2067 | scrollbar_show (0); |
2067 | scrollbar_show (0); |
| 2068 | } |
2068 | } |
| 2069 | |
2069 | |
| 2070 | #ifdef SELECTION_SCROLLING |
2070 | #ifdef SELECTION_SCROLLING |
| 2071 | if (sel_scroll_ev.active) |
2071 | if (ev_is_active (&sel_scroll_ev)) |
| 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 | { |
