--- rxvt-unicode/src/command.C	2007/11/26 11:20:15	1.369
+++ rxvt-unicode/src/command.C	2007/12/11 15:42:51	1.373
@@ -1050,8 +1050,8 @@
 
   display->flush ();
 
-  if (want_refresh && !flush_ev.active)
-    flush_ev.start (1. / 60.); // refresh at max. 60 Hz normally
+  if (want_refresh && !ev_is_active (&flush_ev))
+    flush_ev.again ();
 }
 
 void
@@ -1478,7 +1478,7 @@
       case MapNotify:
         mapped = 1;
 #ifdef TEXT_BLINK
-        text_blink_ev.start (TEXT_BLINK_INTERVAL);
+        text_blink_ev.again ();
 #endif
         HOOK_INVOKE ((this, HOOK_MAP_NOTIFY, DT_XEVENT, &ev, DT_END));
         break;
@@ -1579,7 +1579,7 @@
                         /* 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 @@
                         /* 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
@@ -1959,7 +1959,7 @@
 #endif /* NO_SCROLLBAR_REPORT */
 
         {
-          char            upordown = 0;
+          char upordown = 0;
 
           if (scrollBar.style == R_SB_NEXT)
             {
@@ -2068,7 +2068,7 @@
     }
 
 #ifdef SELECTION_SCROLLING
-  if (sel_scroll_ev.active)
+  if (ev_is_active (&sel_scroll_ev))
     sel_scroll_ev.stop();
 #endif
 
@@ -3584,7 +3584,6 @@
                   { 67, PrivMode_BackSpace },
 #endif
                   { 1000, PrivMode_MouseX11 },
-                 // 1001 Use Hilite Mouse Tracking. NYI, TODO
                   { 1002, PrivMode_MouseBtnEvent },
                   { 1003, PrivMode_MouseAnyEvent },
                   { 1010, PrivMode_TtyOutputInh }, // rxvt extension
@@ -3695,10 +3694,6 @@
               if (state)		/* orthogonal */
                 priv_modes &= ~(PrivMode_MouseX10|PrivMode_MouseBtnEvent|PrivMode_MouseAnyEvent);
               break;
-#if 0
-            case 1001:
-              break;		/* X11 mouse highlighting */
-#endif
             case 1002:
             case 1003:
               if (state)