--- rxvt-unicode/src/rxvttoolkit.h	2006/01/29 20:51:28	1.13
+++ rxvt-unicode/src/rxvttoolkit.h	2006/01/31 16:57:35	1.18
@@ -30,6 +30,11 @@
   XA_WM_PROTOCOLS,
   XA_WM_DELETE_WINDOW,
   XA_CLIPBOARD,
+  XA_AVERAGE_WIDTH,
+  XA_WEIGHT_NAME,
+  XA_SLANT,
+  XA_CHARSET_REGISTRY,
+  XA_CHARSET_ENCODING,
 #if ENABLE_FRILLS
   XA_MOTIF_WM_HINTS,
 #endif
@@ -51,6 +56,24 @@
   XA_XEMBED,
   XA_XEMBED_INFO,
 #endif
+#if !ENABLE_MINIMAL
+  // these are usually allocated by other subsystens, but we do it
+  // here to avoid a server roundtrip.
+  XA_SCREEN_RESOURCES,
+  XA_XDCCC_LINEAR_RGB_CORRECTION,
+  XA_XDCCC_LINEAR_RGB_MATRICES,
+  XA_WM_COLORMAP_WINDOWS,
+  XA_WM_STATE,
+  XA_cursor,
+# if USE_XIM
+  // various selection targets used by XIM
+  XA_TRANSPORT,
+  XA_LOCALES,
+  XA__XIM_PROTOCOL,
+  XA__XIM_XCONNECT,
+  XA__XIM_MOREDATA,
+# endif
+#endif
   NUM_XA
 };
 
@@ -226,15 +249,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); }
 
-  void get (rxvt_screen *screen, rxvt_rgba &rgba);
+  bool alloc (rxvt_screen *screen, const rxvt_rgba &color);
+  void free (rxvt_screen *screen);
+
+  void get (rxvt_screen *screen, rxvt_rgba &color);
  
   bool set (rxvt_screen *screen, const char *name);
-  bool set (rxvt_screen *screen, rxvt_rgba rgba);
+  bool set (rxvt_screen *screen, const rxvt_rgba &color);
 
-  rxvt_color fade (rxvt_screen *screen, int percent); // fades to black
-  rxvt_color fade (rxvt_screen *screen, int percent, rxvt_color &fadeto);
-
-  void free (rxvt_screen *screen);
+  void fade (rxvt_screen *screen, int percent, rxvt_color &result, const rxvt_rgba &to = rxvt_rgba (0, 0, 0));
 };
 
 #endif