--- rxvt-unicode/src/rxvttoolkit.h	2006/01/25 02:42:06	1.11
+++ 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
 };
 
@@ -98,6 +121,18 @@
 };
 #endif
 
+struct rxvt_screen {
+  rxvt_display *display;
+  Display *xdisp;
+  int depth;
+  Visual *visual;
+  Colormap cmap;
+
+  void set (rxvt_display *disp);
+  void set (rxvt_display *disp, int bitdepth);
+  void clear ();
+};
+
 struct rxvt_display : refcounted {
   io_manager_vec<xevent_watcher> xw;
 
@@ -113,10 +148,7 @@
 
 //public
   Display   *display;
-  int       depth;
   int       screen;
-  Visual    *visual;
-  Colormap  cmap;
   Window    root;
   rxvt_term *selection_owner;
   Atom      xa[NUM_XA];
@@ -192,6 +224,19 @@
 
 typedef unsigned long Pixel;
 
+struct rxvt_rgba {
+  unsigned short r, g, b, a;
+
+  enum { MIN_CC = 0x0000, MAX_CC  = 0xffff };
+
+  rxvt_rgba ()
+  { }
+
+  rxvt_rgba (unsigned short r, unsigned short g, unsigned short b, unsigned short a = MAX_CC)
+  : r(r), g(g), b(b), a(a)
+  { }
+};
+
 struct rxvt_color {
 #if XFT
   XftColor c;
@@ -204,16 +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_display *display, unsigned short &cr, unsigned short &cg, unsigned short &cb);
- 
-  bool set (rxvt_display *display, Pixel p);
-  bool set (rxvt_display *display, const char *name);
-  bool set (rxvt_display *display, unsigned short cr, unsigned short cg, unsigned short cb);
+  bool alloc (rxvt_screen *screen, const rxvt_rgba &color);
+  void free (rxvt_screen *screen);
 
-  rxvt_color fade (rxvt_display *, int percent); // fades to black
-  rxvt_color fade (rxvt_display *, int percent, rxvt_color &fadeto);
+  void get (rxvt_screen *screen, rxvt_rgba &color);
+ 
+  bool set (rxvt_screen *screen, const char *name);
+  bool set (rxvt_screen *screen, const rxvt_rgba &color);
 
-  void free (rxvt_display *display);
+  void fade (rxvt_screen *screen, int percent, rxvt_color &result, const rxvt_rgba &to = rxvt_rgba (0, 0, 0));
 };
 
 #endif