--- rxvt-unicode/src/rxvttoolkit.h	2005/08/11 02:05:07	1.8
+++ rxvt-unicode/src/rxvttoolkit.h	2006/01/25 21:03:04	1.12
@@ -17,6 +17,43 @@
 
 #include "callback.h"
 
+// see rxvttoolkit.C:xa_names, which must be kept in sync
+enum {
+  XA_TEXT,
+  XA_COMPOUND_TEXT,
+  XA_UTF8_STRING,
+  XA_MULTIPLE,
+  XA_TARGETS,
+  XA_TIMESTAMP,
+  XA_VT_SELECTION,
+  XA_INCR,
+  XA_WM_PROTOCOLS,
+  XA_WM_DELETE_WINDOW,
+  XA_CLIPBOARD,
+#if ENABLE_FRILLS
+  XA_MOTIF_WM_HINTS,
+#endif
+#if ENABLE_EWMH
+  XA_NET_WM_PID,
+  XA_NET_WM_NAME,
+  XA_NET_WM_ICON_NAME,
+  XA_NET_WM_PING,
+#endif
+#if USE_XIM
+  XA_WM_LOCALE_NAME,
+  XA_XIM_SERVERS,
+#endif
+#if TRANSPARENT
+  XA_XROOTPMAP_ID,
+  XA_ESETROOT_PMAP_ID,
+#endif
+#if ENABLE_XEMBED
+  XA_XEMBED,
+  XA_XEMBED_INFO,
+#endif
+  NUM_XA
+};
+
 struct rxvt_term;
 struct rxvt_display;
 
@@ -28,7 +65,8 @@
   char *id;
 
   refcounted (const char *id);
-  bool init () { return false; }
+  bool ref_init () { return false; }
+  void ref_next () { }
   ~refcounted ();
 };
 
@@ -55,14 +93,24 @@
   XIM xim;
 
   rxvt_xim (const char *id) : refcounted (id) { }
-  bool init ();
+  bool ref_init ();
   ~rxvt_xim ();
 };
 #endif
 
-struct rxvt_display : refcounted {
-  Atom xa_xim_servers;
+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 depth);
+  void clear ();
+};
+
+struct rxvt_display : refcounted {
   io_manager_vec<xevent_watcher> xw;
 
   io_watcher x_ev; void x_cb (io_watcher &w, short revents);
@@ -77,12 +125,10 @@
 
 //public
   Display   *display;
-  int       depth;
   int       screen;
-  Visual    *visual;
-  Colormap  cmap;
   Window    root;
   rxvt_term *selection_owner;
+  Atom      xa[NUM_XA];
 #ifndef NO_SLOW_LINK_SUPPORT
   bool      is_local;
 #endif
@@ -91,11 +137,11 @@
 #endif
 
   rxvt_display (const char *id);
-  bool init ();
+  XrmDatabase get_resources ();
+  bool ref_init ();
+  void ref_next ();
   ~rxvt_display ();
 
-  operator Display *() const { return display; }
-
   void flush ();
   Atom atom (const char *name);
   void set_selection_owner (rxvt_term *owner);
@@ -167,16 +213,16 @@
   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, 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 set (rxvt_screen *screen, Pixel p);
+  bool set (rxvt_screen *screen, const char *name);
+  bool set (rxvt_screen *screen, unsigned short cr, unsigned short cg, unsigned short cb);
 
-  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