--- rxvt-unicode/src/rxvttoolkit.h	2006/01/30 02:21:21	1.14
+++ rxvt-unicode/src/rxvttoolkit.h	2006/02/01 18:36:48	1.21
@@ -64,6 +64,15 @@
   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
 };
@@ -215,15 +224,15 @@
 
 typedef unsigned long Pixel;
 
-struct rxvt_rgba {
+struct rgba {
   unsigned short r, g, b, a;
 
   enum { MIN_CC = 0x0000, MAX_CC  = 0xffff };
 
-  rxvt_rgba ()
+  rgba ()
   { }
 
-  rxvt_rgba (unsigned short r, unsigned short g, unsigned short b, unsigned short a = MAX_CC)
+  rgba (unsigned short r, unsigned short g, unsigned short b, unsigned short a = MAX_CC)
   : r(r), g(g), b(b), a(a)
   { }
 };
@@ -231,24 +240,25 @@
 struct rxvt_color {
 #if XFT
   XftColor c;
-  operator Pixel () const { return c.pixel; }
 #else
-  Pixel p;
-  operator Pixel () const { return p; }
+  XColor c;
 #endif
 
+  operator Pixel () const { return c.pixel; }
+
   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 rgba &color);
+  void free (rxvt_screen *screen);
+
+  void get (rgba &color);
+  void get (XColor &color);
  
   bool set (rxvt_screen *screen, const char *name);
-  bool set (rxvt_screen *screen, rxvt_rgba rgba);
-
-  rxvt_color fade (rxvt_screen *screen, int percent); // fades to black
-  rxvt_color fade (rxvt_screen *screen, int percent, rxvt_color &fadeto);
+  bool set (rxvt_screen *screen, const rgba &color);
 
-  void free (rxvt_screen *screen);
+  void fade (rxvt_screen *screen, int percent, rxvt_color &result, const rgba &to = rgba (0, 0, 0));
 };
 
 #endif