--- rxvt-unicode/src/screen.C	2007/09/03 08:48:00	1.277
+++ rxvt-unicode/src/screen.C	2007/11/11 04:08:00	1.283
@@ -276,7 +276,7 @@
 
       line_t *old_buf = row_buf;
       row_buf = (line_t *)rxvt_calloc (total_rows + nrow, sizeof (line_t));
-        
+
       int p    = MOD (term_start + prev_nrow, prev_total_rows);  // previous row
       int pend = MOD (term_start + top_row  , prev_total_rows);
       int q    = total_rows; // rewrapped row
@@ -330,7 +330,7 @@
                   // see below for cursor adjustment rationale
                   if (p == ocur.row)
                     screen.cur.row = q - (total_rows - nrow);
-                  
+
                   // fill a single destination line
                   while (lofs < llen && qcol < ncol)
                     {
@@ -366,7 +366,7 @@
 
           term_start = total_rows - nrow;
           top_row = q - term_start;
- 
+
           // make sure all terminal lines exist
           while (top_row > 0)
             scr_blank_screen_mem (ROW (--top_row), DEFAULT_RSTYLE);
@@ -374,7 +374,7 @@
       else
         {
           // if no scrollback exists (yet), wing, instead of wrap
-          
+
           for (int row = min (nrow, prev_nrow); row--; )
             {
               line_t &pline = old_buf [MOD (term_start + row, prev_total_rows)];
@@ -666,7 +666,7 @@
           ::swap (l1, l2);
           l2.touch ();
         }
-      
+
       // move and/or clear selection, if any
       if (selection.op && current_screen == selection.screen)
         {
@@ -712,7 +712,7 @@
               selection.beg.row  -= count;
               selection.end.row  -= count;
               selection.mark.row -= count;
-              
+
               selection_check (0);
             }
         }
@@ -834,7 +834,7 @@
       if (screen.flags & Screen_WrapNext)
         {
           scr_do_wrap ();
-          
+
           line->l = ncol;
           line->is_longer (1);
 
@@ -1062,7 +1062,7 @@
             if (!--count)
               break;
           }
-        else 
+        else
           ht &= l.t[i] == ' '
                 && RS_SAME (l.r[i], base_rend);
 
@@ -1868,7 +1868,7 @@
 
 #ifndef NO_BELL
 void
-rxvt_term::bell_cb (time_watcher &w)
+rxvt_term::bell_cb (ev::timer &w, int revents)
 {
   rvideo_bell = false;
   scr_rvideo_mode (rvideo_mode);
@@ -1887,16 +1887,14 @@
 #  endif
     XMapWindow (dpy, parent[0]);
 # endif
+
 # if ENABLE_FRILLS
   if (option (Opt_urgentOnBell))
     {
-      XWMHints *h;
-
-      h = XGetWMHints(dpy, parent[0]);
-      if (h != NULL)
+      if (XWMHints *h = XGetWMHints(dpy, parent[0]))
         {
           h->flags |= XUrgencyHint;
-          XSetWMHints(dpy, parent[0], h);
+          XSetWMHints (dpy, parent[0], h);
         }
     }
 # endif
@@ -1907,7 +1905,7 @@
       scr_rvideo_mode (rvideo_mode);
       display->flush ();
 
-      bell_ev.start (NOW + VISUAL_BELL_DURATION);
+      bell_ev.start (VISUAL_BELL_DURATION);
     }
   else
     XBell (dpy, 0);
@@ -2323,7 +2321,7 @@
                 {
                   if (!text_blink_ev.active)
                     {
-                      text_blink_ev.start (NOW + TEXT_BLINK_INTERVAL);
+                      text_blink_ev.start (TEXT_BLINK_INTERVAL, TEXT_BLINK_INTERVAL);
                       hidden_text = 0;
                     }
                   else if (hidden_text)
@@ -2488,11 +2486,11 @@
      scrollbar_show (0);
    }
 # endif
-#endif
-  
   scr_clear ();
   scr_touch (true);
   want_refresh = 1;
+#endif
+
 }
 
 /* ------------------------------------------------------------------------- */
@@ -2737,7 +2735,7 @@
 
       selection_wait = Sel_incr;
       incr_buf_fill = 0;
-      incr_ev.start (NOW + 10);
+      incr_ev.start (10);
 
       goto bailout;
     }
@@ -2756,7 +2754,7 @@
           incr_buf_size = 0;
           incr_ev.stop ();
         }
-      else 
+      else
         {
           if (selection_wait == Sel_normal
               && (win != display->root || prop != XA_CUT_BUFFER0)) // avoid recursion
@@ -2773,7 +2771,7 @@
     }
   else if (selection_wait == Sel_incr)
     {
-      incr_ev.start (NOW + 10);
+      incr_ev.start (10);
 
       while (incr_buf_fill + ct.nitems > incr_buf_size)
         {
@@ -2823,7 +2821,7 @@
 }
 
 void
-rxvt_term::incr_cb (time_watcher &w) NOTHROW
+rxvt_term::incr_cb (ev::timer &w, int revents) NOTHROW
 {
   selection_wait = Sel_none;
 
@@ -2844,7 +2842,7 @@
 
 /* ------------------------------------------------------------------------- */
 /*
- * Request the current selection: 
+ * Request the current selection:
  * Order: > internal selection if available
  *        > PRIMARY, SECONDARY, CLIPBOARD if ownership is claimed (+)
  *        > CUT_BUFFER0
@@ -3132,7 +3130,7 @@
   while (selection.mark.col > 0
          && ROW(selection.mark.row).t[selection.mark.col] == NOCHAR)
     --selection.mark.col;
-  
+
   if (selection.op)
     {      /* clear the old selection */
       selection.beg.row = selection.end.row = selection.mark.row;
@@ -3661,22 +3659,6 @@
 
   XSendEvent (dpy, rq.requestor, False, 0L, (XEvent *)&ev);
 }
-
-/* ------------------------------------------------------------------------- *
- *                              MOUSE ROUTINES                               *
- * ------------------------------------------------------------------------- */
-
-/*
- * return col/row values corresponding to x/y pixel values
- */
-void
-rxvt_term::pixel_position (int *x, int *y) NOTHROW
-{
-  *x = Pixel2Col (*x);
-  /* max_it (*x, 0); min_it (*x, (int)ncol - 1); */
-  *y = Pixel2Row (*y);
-  /* max_it (*y, 0); min_it (*y, (int)nrow - 1); */
-}
 
 /* ------------------------------------------------------------------------- */
 #ifdef USE_XIM