From: root <root>
Date: Tue, 11 Dec 2007 03:30:47 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=6d74f7ae0abd469be781fbc7d06d1894069ad238;p=dana%2Furxvt.git

*** empty log message ***
---

diff --git a/src/command.C b/src/command.C
index 9d878def..8cc5879c 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 && !flush_ev.active)
+  if (want_refresh && !ev_is_active (&flush_ev))
     flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
 }
 
@@ -1579,7 +1579,7 @@ rxvt_term::x_cb (XEvent &ev)
                         /* don't clobber the current delay if we are
                          * already in the middle of scrolling.
                          */
-                        if (!sel_scroll_ev.active)
+                        if (!ev_is_active (&sel_scroll_ev))
                           sel_scroll_ev.start (SCROLLBAR_INITIAL_DELAY, SCROLLBAR_CONTINUOUS_DELAY);
 
                         /* save the event params so we can highlight
@@ -1612,7 +1612,7 @@ rxvt_term::x_cb (XEvent &ev)
                         /* we are within the text window, so we
                          * shouldn't be scrolling
                          */
-                        if (sel_scroll_ev.active)
+                        if (ev_is_active (&sel_scroll_ev))
                           sel_scroll_ev.stop();
                       }
 #endif
@@ -2068,7 +2068,7 @@ rxvt_term::button_release (XButtonEvent &ev)
     }
 
 #ifdef SELECTION_SCROLLING
-  if (sel_scroll_ev.active)
+  if (ev_is_active (&sel_scroll_ev))
     sel_scroll_ev.stop();
 #endif
 
diff --git a/src/main.C b/src/main.C
index 61497620..8c9fe7a2 100644
--- a/src/main.C
+++ b/src/main.C
@@ -331,7 +331,7 @@ rxvt_term::child_cb (ev::child &w, int status)
 void
 rxvt_term::destroy ()
 {
-  if (destroy_ev.active)
+  if (ev_is_active (&destroy_ev))
     return;
 
   HOOK_INVOKE ((this, HOOK_DESTROY, DT_END));
diff --git a/src/screen.C b/src/screen.C
index 71ea9bab..1abf5d4e 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 (!text_blink_ev.active)
+                  if (!ev_is_active (&text_blink_ev))
                     {
                       text_blink_ev.start (TEXT_BLINK_INTERVAL, TEXT_BLINK_INTERVAL);
                       hidden_text = 0;