--- rxvt-unicode/src/rxvt.h	2012/06/11 17:05:58	1.508
+++ rxvt-unicode/src/rxvt.h	2012/12/29 14:23:35	1.511
@@ -77,10 +77,19 @@
 # include <gdk-pixbuf/gdk-pixbuf.h>
 #endif
 
-#if defined(BG_IMAGE_FROM_FILE) || defined(ENABLE_TRANSPARENCY)
+#if XRENDER && (HAVE_PIXBUF || ENABLE_TRANSPARENCY)
 # define HAVE_BG_PIXMAP 1
 #endif
 
+#if HAVE_BG_PIXMAP
+# if HAVE_PIXBUF
+#  define BG_IMAGE_FROM_FILE 1
+# endif
+# if ENABLE_TRANSPARENCY
+#  define BG_IMAGE_FROM_ROOT 1
+# endif
+#endif
+
 #include <ecb.h>
 #include "encoding.h"
 #include "rxvtutil.h"
@@ -582,7 +591,7 @@
 #ifdef RXVT_SCROLLBAR
   Color_trough,
 #endif
-#if ENABLE_TRANSPARENCY
+#if BG_IMAGE_FROM_ROOT
   Color_tint,
 #endif
 #if OFF_FOCUS_FADING
@@ -1194,7 +1203,7 @@
   bool render_image (rxvt_image &image);
 # endif
 
-# if ENABLE_TRANSPARENCY
+# if BG_IMAGE_FROM_ROOT
   rxvt_img *root_img;
   image_effects root_effects;
 
@@ -1283,7 +1292,7 @@
     XSelectInput (dpy, vt, vt_emask | vt_emask_perl | vt_emask_xim | vt_emask_mouse);
   }
 
-#if ENABLE_TRANSPARENCY || ENABLE_PERL
+#if BG_IMAGE_FROM_ROOT || ENABLE_PERL
   void rootwin_cb (XEvent &xev);
   xevent_watcher rootwin_ev;
 #endif
@@ -1445,6 +1454,13 @@
 
   // screen.C
 
+  bool option (uint8_t opt) const NOTHROW
+  {
+    return options[opt >> 3] & (1 << (opt & 7));
+  }
+
+  void set_option (uint8_t opt, bool set = true) NOTHROW;
+
   int fgcolor_of (rend_t r) const NOTHROW
   {
     int base = GET_BASEFG (r);
@@ -1473,13 +1489,6 @@
     return base;
   }
 
-  bool option (uint8_t opt) const NOTHROW
-  {
-    return options[opt >> 3] & (1 << (opt & 7));
-  }
-
-  void set_option (uint8_t opt, bool set = true) NOTHROW;
-
   // modifies first argument(!)
   void tt_paste (char *data, unsigned int len) NOTHROW;
   void paste (char *data, unsigned int len) NOTHROW;
@@ -1566,15 +1575,6 @@
   const char *x_resource (const char *name);
   void extract_resources ();
   void extract_keysym_resources ();
-  void find_resources (const char *n_prefix, const char *c_prefix, int mode,
-                       Bool (*proc)(XrmDatabase *, XrmBindingList, XrmQuarkList, XrmRepresentation *, XrmValue *, XPointer));
-  bool parse_bool_resource (const char *str)
-  {
-    return (!strcasecmp (str, "TRUE")
-            || !strcasecmp (str, "YES")
-            || !strcasecmp (str, "ON")
-            || !strcasecmp (str, "1"));
-  }
 };
 
 #endif /* _RXVT_H_ */