--- rxvt-unicode/src/rxvttoolkit.h	2007/12/14 05:25:26	1.38
+++ rxvt-unicode/src/rxvttoolkit.h	2008/11/05 14:43:54	1.47
@@ -31,7 +31,6 @@
 
 #include "ev_cpp.h"
 
-#include "rxvtlib.h"
 #include "rxvtutil.h"
 
 #include "callback.h"
@@ -62,6 +61,7 @@
   XA_NET_WM_NAME,
   XA_NET_WM_ICON_NAME,
   XA_NET_WM_PING,
+  XA_NET_WM_ICON,
 #endif
 #if USE_XIM
   XA_WM_LOCALE_NAME,
@@ -76,7 +76,7 @@
   XA_XEMBED_INFO,
 #endif
 #if !ENABLE_MINIMAL
-  // these are usually allocated by other subsystens, but we do it
+  // these are usually allocated by other subsystems, but we do it
   // here to avoid a server roundtrip.
   XA_SCREEN_RESOURCES,
   XA_XDCCC_LINEAR_RGB_CORRECTION,
@@ -249,7 +249,11 @@
   void ref_next ();
   ~rxvt_display ();
 
-  void flush ();
+  void flush ()
+  {
+    flush_ev.start ();
+  }
+
   Atom atom (const char *name);
   void set_selection_owner (rxvt_term *owner);
 
@@ -266,7 +270,8 @@
 };
 
 #ifdef USE_XIM
-struct im_watcher : rxvt_watcher, callback<void (void)> {
+struct im_watcher : rxvt_watcher, callback<void (void)>
+{
   void start (rxvt_display *display)
   {
     display->reg (this);
@@ -328,6 +333,15 @@
   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 is_opaque () const
+  {
+#if XFT
+    return c.color.alpha == rgba::MAX_CC;
+#else
+    return 1;
+#endif
+  }
+
   bool alloc (rxvt_screen *screen, const rgba &color);
   void free (rxvt_screen *screen);