--- rxvt-unicode/src/rxvtcolor.h	2004/02/11 08:13:45	1.5
+++ rxvt-unicode/src/rxvtcolor.h	2004/02/13 12:16:21	1.7
@@ -56,7 +56,7 @@
   
   io_manager_vec<xevent_watcher> xw;
 
-  io_watcher x_watcher; void x_event (io_watcher &w, short revents);
+  io_watcher x_ev; void x_cb (io_watcher &w, short revents);
 
   refcache<rxvt_xim> xims;
   vector<im_watcher *> imw;
@@ -75,6 +75,8 @@
   bool init ();
   ~rxvt_display ();
 
+  void flush ();
+
   void reg (xevent_watcher *w);
   void unreg (xevent_watcher *w);
   void reg (im_watcher *w);
@@ -88,8 +90,8 @@
 
 struct im_watcher : watcher, callback0<void> {
   template<class O1, class O2>
-  im_watcher (O1 *object, void (O2::*method)())
-  : callback0<void>(object,method)
+  im_watcher (O1 *object, void (O2::*method) ())
+  : callback0<void> (object,method)
   { }
 
   void start (rxvt_display *display)
@@ -106,8 +108,8 @@
   Window window;
 
   template<class O1, class O2>
-  xevent_watcher (O1 *object, void (O2::*method)(XEvent &))
-  : callback1<void, XEvent &>(object,method)
+  xevent_watcher (O1 *object, void (O2::*method) (XEvent &))
+  : callback1<void, XEvent &> (object,method)
   { }
 
   void start (rxvt_display *display, Window window)
@@ -130,14 +132,14 @@
 struct rxvt_color {
 #if XFT
   XftColor c;
-  operator Pixel() const { return c.pixel; }
+  operator Pixel () const { return c.pixel; }
 #else
   Pixel p;
-  operator Pixel() const { return p; }
+  operator Pixel () const { return p; }
 #endif
 
-  bool operator == (const rxvt_color &b) const { return Pixel(*this) == Pixel(b); }
-  bool operator != (const rxvt_color &b) const { return Pixel(*this) != Pixel(b); }
+  bool operator == (const rxvt_color &b) const { return Pixel (*this) == Pixel (b); }
+  bool operator != (const rxvt_color &b) const { return Pixel (*this) != Pixel (b); }
 
   void get (rxvt_display *display, unsigned short &cr, unsigned short &cg, unsigned short &cb);