--- rxvt-unicode/src/background.C	2012/05/31 20:23:51	1.228
+++ rxvt-unicode/src/background.C	2012/06/03 15:50:22	1.230
@@ -486,7 +486,7 @@
   bool need_blend = bg_flags & BG_IS_VALID;
 
   if (need_blend
-      && !(bg_flags & BG_HAS_RENDER))
+      && !(display->flags & DISPLAY_HAS_RENDER))
     return false;
 
   GdkPixbuf *result;
@@ -675,6 +675,7 @@
     }
   return False;
 }
+#  endif
 
 void
 rxvt_term::parse_image (int id, const char *type, const char *arg)
@@ -684,7 +685,6 @@
 
   rxvt_image *image = &image_vec[id];
 }
-#  endif
 
 rxvt_image::rxvt_image ()
 {
@@ -839,7 +839,7 @@
 {
   bool ret = false;
 #if XRENDER
-  if (!(bg_flags & BG_HAS_RENDER_CONV))
+  if (!(display->flags & DISPLAY_HAS_RENDER_CONV))
     return false;
 
   int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
@@ -933,7 +933,7 @@
         }
     }
 #  if XRENDER
-  else if (bg_flags & BG_HAS_RENDER)
+  else if (display->flags & DISPLAY_HAS_RENDER)
     {
       if (shade <= 100)
         {
@@ -1048,7 +1048,7 @@
   if (root_pixmap != None && root_depth != depth)
     {
 #if XRENDER
-      if (bg_flags & BG_HAS_RENDER)
+      if (display->flags & DISPLAY_HAS_RENDER)
         {
           recoded_root_pmap = XCreatePixmap (dpy, vt, root_pmap_width, root_pmap_height, depth);
 
@@ -1185,22 +1185,6 @@
 void
 rxvt_term::bg_init ()
 {
-  bg_flags &= ~(BG_HAS_RENDER | BG_HAS_RENDER_CONV);
-#if XRENDER
-  int major, minor;
-  if (XRenderQueryVersion (dpy, &major, &minor))
-    bg_flags |= BG_HAS_RENDER;
-  XFilters *filters = XRenderQueryFilters (dpy, vt);
-  if (filters)
-    {
-      for (int i = 0; i < filters->nfilter; i++)
-        if (!strcmp (filters->filter[i], FilterConvolution))
-          bg_flags |= BG_HAS_RENDER_CONV;
-
-      XFree (filters);
-    }
-#endif
-
 #ifdef BG_IMAGE_FROM_FILE
   if (rs[Rs_backgroundPixmap])
     {
@@ -1211,6 +1195,8 @@
 
 # ifndef NO_RESOURCES
   find_resources ("image", "Image", XrmEnumAllLevels, rxvt_define_image);
+# endif
+
   vector<rxvt_image>::iterator bg_image = image_vec.begin ();
   while (bg_image != image_vec.end ())
     {
@@ -1224,7 +1210,6 @@
           bg_image++;
         }
     }
-# endif
 
   if (image_vec.size () > 0
       && !bg_window_position_sensitive ())