From 40107fb985ed194288ae4062651294764360d2c2 Mon Sep 17 00:00:00 2001
From: root <root>
Date: Fri, 14 Dec 2007 02:08:18 +0000
Subject: [PATCH] *** empty log message ***

---
 Changes       |  1 +
 src/command.C | 17 +++++++++--------
 src/main.C    |  2 +-
 src/screen.C  |  2 +-
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/Changes b/Changes
index f5d33436..3e21119a 100644
--- a/Changes
+++ b/Changes
@@ -26,6 +26,7 @@ DUMB: support tex fonts
           fixes a problem with urxvt not refreshing.
         - the text blink callback was called even when no blinking
           text was visible.
+        - pre-8.4 slipwheeling behaviour has been reinstated.
 
 8.7  Sun Nov 25 10:23:49 CET 2007
         - update libev with an important bugfix that would cause crashes
diff --git a/src/command.C b/src/command.C
index 0ca537c6..47a2d7d4 100644
--- a/src/command.C
+++ b/src/command.C
@@ -1050,7 +1050,7 @@ rxvt_term::prepare_cb (ev::prepare &w, int revents)
 
   display->flush ();
 
-  if (want_refresh && !ev_is_active (&flush_ev))
+  if (want_refresh && !flush_ev.is_active ())
     flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
 }
 
@@ -1581,7 +1581,7 @@ rxvt_term::x_cb (XEvent &ev)
                         /* don't clobber the current delay if we are
                          * already in the middle of scrolling.
                          */
-                        if (!ev_is_active (&sel_scroll_ev))
+                        if (!sel_scroll_ev.is_active ())
                           sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
 
                         /* save the event params so we can highlight
@@ -1614,8 +1614,7 @@ rxvt_term::x_cb (XEvent &ev)
                         /* we are within the text window, so we
                          * shouldn't be scrolling
                          */
-                        if (ev_is_active (&sel_scroll_ev))
-                          sel_scroll_ev.stop();
+                        sel_scroll_ev.stop();
                       }
 #endif
 #ifdef MOUSE_THRESHOLD
@@ -1977,10 +1976,12 @@ rxvt_term::button_press (XButtonEvent &ev)
               else if (scrollbarrxvt_dnButton (ev.y))
                 upordown = 1;	/* down */
             }
+
           if (upordown)
             {
 #ifndef NO_SCROLLBAR_BUTTON_CONTINUAL_SCROLLING
-              cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
+              if (!cont_scroll_ev.is_active ())
+                cont_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
 #endif
               if (scr_page (upordown < 0 ? UP : DN, 1))
                 {
@@ -2070,8 +2071,7 @@ rxvt_term::button_release (XButtonEvent &ev)
     }
 
 #ifdef SELECTION_SCROLLING
-  if (ev_is_active (&sel_scroll_ev))
-    sel_scroll_ev.stop();
+  sel_scroll_ev.stop();
 #endif
 
   if (ev.window == vt)
@@ -2153,7 +2153,8 @@ rxvt_term::button_release (XButtonEvent &ev)
                   if (mouse_slip_wheel_speed < -nrow) mouse_slip_wheel_speed = -nrow;
                   if (mouse_slip_wheel_speed > +nrow) mouse_slip_wheel_speed = +nrow;
 
-                  slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
+                  if (!slip_wheel_ev.is_active ())
+                    slip_wheel_ev.start (SCROLLBAR_CONTINUOUS_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
                 }
               else
                 {
diff --git a/src/main.C b/src/main.C
index f4c8a017..114a160d 100644
--- a/src/main.C
+++ b/src/main.C
@@ -329,7 +329,7 @@ rxvt_term::child_cb (ev::child &w, int status)
 void
 rxvt_term::destroy ()
 {
-  if (ev_is_active (&destroy_ev))
+  if (destroy_ev.is_active ())
     return;
 
   HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
diff --git a/src/screen.C b/src/screen.C
index f0c5c609..550261f8 100644
--- a/src/screen.C
+++ b/src/screen.C
@@ -2321,7 +2321,7 @@ rxvt_term::scr_refresh () NOTHROW
 #ifdef TEXT_BLINK
               if (rend & RS_Blink && (back == Color_bg || fore == Color_bg))
                 {
-                  if (!ev_is_active (&text_blink_ev))
+                  if (!text_blink_ev.is_active ())
                     {
                       text_blink_ev.again ();
                       hidden_text = 0;
-- 
2.34.1