*** empty log message ***

diff --git a/src/command.C b/src/command.C
index 9d878defaf7bbddbf8614115648bf1ffd32656d8..8cc5879c3e81f7d9421089f3d8449ffedc6c6595 100644 (file)
--- 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 614976206cc33340c44f85e85fde13efadacb9df..8c9fe7a2ffc2410fb451e7eca42713e9b3644246 100644 (file)
--- 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 71ea9bab8ad291b330435a98eddcf7e039de21f7..1abf5d4ebbf8bc8d39ac932df788fc4f82d1e6fe 100644 (file)
--- 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;