--- rxvt-unicode/src/rxvttoolkit.h	2006/01/25 02:42:06	1.11
+++ rxvt-unicode/src/rxvttoolkit.h	2006/01/29 20:51:28	1.13
@@ -98,6 +98,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 +125,7 @@
 
 //public
   Display   *display;
-  int       depth;
   int       screen;
-  Visual    *visual;
-  Colormap  cmap;
   Window    root;
   rxvt_term *selection_owner;
   Atom      xa[NUM_XA];
@@ -192,6 +201,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 +226,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);
+  void get (rxvt_screen *screen, rxvt_rgba &rgba);
  
-  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 set (rxvt_screen *screen, const char *name);
+  bool set (rxvt_screen *screen, rxvt_rgba rgba);
 
-  rxvt_color fade (rxvt_display *, int percent); // fades to black
-  rxvt_color fade (rxvt_display *, int percent, rxvt_color &fadeto);
+  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_display *display);
+  void free (rxvt_screen *screen);
 };
 
 #endif