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

Comparing rxvt-unicode/src/rxvtcolor.C (file contents):
Revision 1.6 by pcg, Wed Feb 11 08:13:45 2004 UTC vs.
Revision 1.7 by pcg, Thu Feb 12 01:42:03 2004 UTC

 /////////////////////////////////////////////////////////////////////////////
 rxvt_display::rxvt_display (const char *id)
 : refcounted (id)
-, x_watcher (this, &rxvt_display::x_event)
+, x_ev (this, &rxvt_display::x_cb)
 , selection_owner (0)
 {
 }
 bool rxvt_display::init ()
         }
     }
 #endif
   int fd = XConnectionNumber (display);
-  x_watcher.start (fd, EVENT_READ);
+  x_ev.start (fd, EVENT_READ);
   fcntl (fd, F_SETFL, FD_CLOEXEC);
   XSelectInput (display, root, PropertyChangeMask);
   xa_xim_servers = XInternAtom (display, "XIM_SERVERS", 0);
+  flush ();
   return true;
 }
 rxvt_display::~rxvt_display ()
 {
-  x_watcher.stop ();
+  x_ev.stop ();
   XCloseDisplay (display);
 }
 void rxvt_display::im_change_cb ()
 {
   for (im_watcher **i = imw.begin (); i != imw.end (); ++i)
     (*i)->call ();
 }
-void rxvt_display::x_event (io_watcher &w, short revents)
+void rxvt_display::x_cb (io_watcher &w, short revents)
 {
   do
     {
       XEvent xev;
       XNextEvent (display, &xev);
           else if (xw[i]->window == xev.xany.window)
             xw[i]->call (xev);
         }
     }
   while (XPending (display));
+  flush ();
+}
+void rxvt_display::flush ()
+{
+  for (;;)
+    {
+      XFlush (display);
+      if (!XPending (display))
+        break;
+      x_cb (x_ev, 0);
+    }
 }
 void rxvt_display::reg (xevent_watcher *w)
 {
   xw.push_back (w);

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