[ViewVC] Diff of: cvs/rxvt-unicode/src/rxvttoolkit.C

Comparing rxvt-unicode/src/rxvttoolkit.C (file contents):
Revision 1.81 by root, Fri Dec 14 02:22:24 2007 UTC vs.
Revision 1.87 by root, Mon Dec 24 08:21:39 2007 UTC

 rxvt_display::rxvt_display (const char *id)
 : refcounted (id)
 , selection_owner (0)
 {
-  x_ev.set<rxvt_display, &rxvt_display::x_cb> (this);
+  x_ev    .set<rxvt_display, &rxvt_display::x_cb    > (this);
+  flush_ev.set<rxvt_display, &rxvt_display::flush_cb> (this);
 }
 XrmDatabase
 rxvt_display::get_resources (bool refresh)
 {
   socklen_t sl = sizeof (sa);
   if (!getsockname (fd, (sockaddr *)&sa, &sl))
     is_local = sa.sun_family == AF_UNIX;
+  flush_ev.start ();
   x_ev.start (fd, ev::READ);
   fcntl (fd, F_SETFD, FD_CLOEXEC);
   XSelectInput (dpy, root, PropertyChangeMask);
 #ifdef POINTER_BLANK
   XFreeCursor (dpy, blank_cursor);
 #endif
   x_ev.stop ();
+  flush_ev.stop ();
 #ifdef USE_XIM
   xims.clear ();
 #endif
   XCloseDisplay (dpy);
 }
             }
 #ifdef USE_XIM
         }
 #endif
     }
+}
+void rxvt_display::flush_cb (ev::prepare &w, int revents)
+{
+  w.stop ();
   XFlush (dpy);
-}
-void rxvt_display::flush ()
-{
-  x_cb (x_ev, ev::READ);
 }
 void rxvt_display::reg (xevent_watcher *w)
 {
   if (!w->active)
 }
 void rxvt_display::set_selection_owner (rxvt_term *owner)
 {
   if (selection_owner && selection_owner != owner)
+    {
+      rxvt_term *owner = selection_owner;
-    selection_owner->selection_clear ();
+      owner->selection_clear ();
+      owner->flush ();
+    }
   selection_owner = owner;
 }
 #ifdef USE_XIM

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines