--- a/src/specifier.h	Mon Aug 13 11:17:10 2007 +0200
+++ b/src/specifier.h	Mon Aug 13 11:18:11 2007 +0200
@@ -413,6 +413,48 @@
 				  Lisp_Object oldval);
 };
 
+/* #### get image instances out of domains! */
+
+/* #### I think the following should abort() rather than return nil
+   when an invalid domain is given; much more likely we'll catch design
+   errors early. --ben */
+
+/* This turns out to be used heavily so we make it a macro to make it
+   inline.  Also, the majority of the time the object will turn out to
+   be a window so we move it from being checked last to being checked
+   first. */
+#define DOMAIN_DEVICE(obj)					\
+   (WINDOWP (obj) ? WINDOW_DEVICE (XWINDOW (obj))		\
+  : (FRAMEP  (obj) ? FRAME_DEVICE (XFRAME (obj))		\
+  : (DEVICEP (obj) ? obj					\
+  : (IMAGE_INSTANCEP (obj) ? image_instance_device (obj)	\
+  : Qnil))))
+
+#define DOMAIN_FRAME(obj)				\
+   (WINDOWP (obj) ? WINDOW_FRAME (XWINDOW (obj))	\
+  : (FRAMEP  (obj) ? obj				\
+  : (IMAGE_INSTANCEP (obj) ? image_instance_frame (obj)	\
+  : Qnil)))
+
+#define DOMAIN_WINDOW(obj)					\
+   (WINDOWP (obj) ? obj						\
+  : (IMAGE_INSTANCEP (obj) ? image_instance_window (obj)	\
+  : Qnil))
+
+#define DOMAIN_LIVE_P(obj)					\
+   (WINDOWP (obj) ? WINDOW_LIVE_P (XWINDOW (obj))		\
+  : (FRAMEP  (obj) ? FRAME_LIVE_P (XFRAME (obj))		\
+  : (DEVICEP (obj) ? DEVICE_LIVE_P (XDEVICE (obj))		\
+  : (IMAGE_INSTANCEP (obj) ? image_instance_live_p (obj)	\
+  : 0))))
+
+#define DOMAIN_XDEVICE(obj)			\
+  (XDEVICE (DOMAIN_DEVICE (obj)))
+#define DOMAIN_XFRAME(obj)			\
+  (XFRAME (DOMAIN_FRAME (obj)))
+#define DOMAIN_XWINDOW(obj)			\
+  (XWINDOW (DOMAIN_WINDOW (obj)))
+
 EXFUN (Fcopy_specifier, 6);
 EXFUN (Fmake_specifier, 1);
 EXFUN (Fset_specifier_dirty_flag, 1);
@@ -426,6 +468,7 @@
 extern enum spec_add_meth
 decode_how_to_add_specification (Lisp_Object how_to_add);
 Lisp_Object decode_specifier_tag_set (Lisp_Object tag_set);
+Lisp_Object decode_domain (Lisp_Object domain);
 
 void add_entry_to_specifier_type_list (Lisp_Object symbol,
 				       struct specifier_methods *meths);