--- rxvt-unicode/src/rxvttoolkit.h	2012/06/07 16:04:31	1.64
+++ rxvt-unicode/src/rxvttoolkit.h	2012/12/29 14:23:35	1.69
@@ -68,7 +68,7 @@
   XA_WM_LOCALE_NAME,
   XA_XIM_SERVERS,
 #endif
-#if ENABLE_TRANSPARENCY
+#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
   XA_XROOTPMAP_ID,
   XA_ESETROOT_PMAP_ID,
 #endif
@@ -219,11 +219,10 @@
   void clear ();
 };
 
-enum {
+enum
+{
   DISPLAY_HAS_RENDER      = 1 << 0,
-  DISPLAY_HAS_RENDER_10   = 1 << 1,
-  DISPLAY_HAS_RENDER_MUL  = 1 << 2,
-  DISPLAY_HAS_RENDER_CONV = 1 << 3,
+  DISPLAY_HAS_RENDER_CONV = 1 << 1,
 };
 
 struct rxvt_display : refcounted
@@ -320,14 +319,14 @@
 
 struct rgba
 {
-  unsigned short r, g, b, a;
+  uint16_t r, g, b, a;
 
   enum { MIN_CC = 0x0000, MAX_CC  = 0xffff };
 
   rgba ()
   { }
 
-  rgba (unsigned short r, unsigned short g, unsigned short b, unsigned short a = MAX_CC)
+  rgba (uint16_t r, uint16_t g, uint16_t b, uint16_t a = MAX_CC)
   : r(r), g(g), b(b), a(a)
   { }
 };
@@ -357,6 +356,12 @@
   bool alloc (rxvt_screen *screen, const rgba &color);
   void free (rxvt_screen *screen);
 
+  operator rgba () const
+  {
+    rgba c;
+    get (c);
+    return c;
+  }
   void get (rgba &color) const;
   void get (XColor &color) const;