--- rxvt-unicode/src/background.h	2010/11/01 11:37:02	1.33
+++ rxvt-unicode/src/background.h	2010/11/18 17:28:12	1.36
@@ -23,19 +23,19 @@
   void destroy ();
 
   enum {
-    geometrySet     = 1 <<  0,
     propScale       = 1 <<  1,
     rootAlign       = 1 <<  2,
-    geometryFlags   = geometrySet | propScale | rootAlign,
+    geometryFlags   = propScale | rootAlign,
 
     tintSet         = 1 <<  8,
     tintNeeded      = 1 <<  9,
     tintWholesome   = 1 << 10,
-    tintServerSide  = 1 << 11,
-    tintFlags       = tintSet | tintServerSide | tintNeeded | tintWholesome,
+    tintFlags       = tintSet | tintNeeded | tintWholesome,
 
-    blurNeeded      = 1 << 12,
-    blurServerSide  = 1 << 13,
+    blurNeeded      = 1 << 11,
+
+    HAS_RENDER      = 1 << 12,
+    HAS_RENDER_CONV = 1 << 13,
 
     isTransparent   = 1 << 16,
     isInvalid       = 1 << 17,
@@ -76,17 +76,12 @@
   unsigned int h_scale, v_scale;/* percents of the window size */
   int h_align, v_align;         /* percents of the window size:
                                   0 - left align, 50 - center, 100 - right */
-  void unset_geometry ()
-  {
-    flags = flags & ~geometryFlags;
-  };
-  bool set_geometry (const char *geom);
+  bool set_geometry (const char *geom, bool update = false);
   void set_defaultGeometry ()
   {
     h_scale = v_scale = defaultScale;
     h_align = v_align = defaultAlign;
-    flags |= geometrySet;
-  };
+  }
 
   bool set_file (const char *file);
 # endif /* BG_IMAGE_FROM_FILE */
@@ -130,7 +125,7 @@
         flags |= isInvalid;
         invalid_since = ev::now ();
       }
-  };
+  }
 };
 #else
 # undef HAVE_BG_PIXMAP