--- rxvt-unicode/src/background.C	2011/08/15 09:25:56	1.165
+++ rxvt-unicode/src/background.C	2011/11/20 11:09:21	1.173
@@ -152,9 +152,9 @@
   if (align >= 0 && align <= 100)
     return diff * align / 100;
   else if (align > 100 && align <= 200)
-    return ((align - 100) * smaller / 100) + window_size - smaller;
+    return (align - 100) * smaller / 100 + window_size - smaller;
   else if (align >= -100 && align < 0)
-    return ((align + 100) * smaller / 100) - image_size;
+    return (align + 100) * smaller / 100 - image_size;
   return 0;
 }
 
@@ -183,7 +183,7 @@
   int geom_flags = 0;
   int x = 0, y = 0;
   unsigned int w = 0, h = 0;
-  unsigned long new_flags = (bg_flags & (~BG_GEOMETRY_FLAGS));
+  unsigned long new_flags = bg_flags & ~BG_GEOMETRY_FLAGS;
 
   if (geom == NULL)
     return false;
@@ -192,7 +192,7 @@
     {
       char **arr = rxvt_strsplit (':', geom);
 
-      for (int i = 0; arr[i]; i++) 
+      for (int i = 0; arr[i]; i++)
         {
           if (!strcasecmp (arr[i], "style=tiled"))
             {
@@ -385,7 +385,7 @@
   if ((tr_flags & BG_NEEDS_BLUR) && background != NULL)
     {
       ASImage *tmp = blur_asimage_gauss (asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
-                                         (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage,
+                                         ASA_XImage,
                                          100, ASIMAGE_QUALITY_DEFAULT);
       if (tmp)
         {
@@ -414,8 +414,8 @@
       || (!(bg_flags & BG_ROOT_ALIGN)
           && (x >= target_width
               || y >= target_height
-              || (x + w <= 0)
-              || (y + h <= 0))))
+              || x + w <= 0
+              || y + h <= 0)))
     {
       if (background)
         {
@@ -439,12 +439,12 @@
     {
       result = original_asim;
 
-      if ((w != original_asim->width)
-          || (h != original_asim->height))
+      if (w != original_asim->width
+          || h != original_asim->height)
         {
           result = scale_asimage (asv, original_asim,
                                   w, h,
-                                  background ? ASA_ASImage : ASA_XImage,
+                                  ASA_XImage,
                                   100, ASIMAGE_QUALITY_DEFAULT);
         }
 
@@ -704,14 +704,14 @@
   if (!(bg_flags & BG_ROOT_ALIGN)
       && (x >= target_width
           || y >= target_height
-          || (x + w <= 0)
-          || (y + h <= 0)))
+          || x + w <= 0
+          || y + h <= 0))
     return false;
 
   result = pixbuf;
 
-  if ((w != image_width)
-      || (h != image_height))
+  if (w != image_width
+      || h != image_height)
     {
       result = gdk_pixbuf_scale_simple (pixbuf,
                                         w, h,
@@ -850,7 +850,10 @@
   if (!file || !*file)
     return false;
 
-  if (const char *p = strchr (file, ';'))
+  bool ret = false;
+  const char *p = strchr (file, ';');
+
+  if (p)
     {
       size_t len = p - file;
       char *f = rxvt_temp_buf<char> (len + 1);
@@ -869,7 +872,7 @@
         safe_asimage_destroy (original_asim);
       original_asim = image;
       bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER;
-      return true;
+      ret = true;
     }
 #  endif
 
@@ -881,11 +884,19 @@
         g_object_unref (pixbuf);
       pixbuf = image;
       bg_flags |= BG_IS_FROM_FILE;
-      return true;
+      ret = true;
     }
 #  endif
 
-  return false;
+  if (ret)
+    {
+      if (p)
+        bg_set_geometry (p + 1);
+      else
+        bg_set_default_geometry ();
+    }
+
+  return ret;
 }
 
 # endif /* BG_IMAGE_FROM_FILE */
@@ -1332,8 +1343,7 @@
       tr_flags = make_transparency_pixmap ();
       if (tr_flags == 0)
         return false;
-      else if (!(tr_flags & BG_EFFECTS_FLAGS))
-        bg_flags |= BG_IS_VALID;
+      bg_flags |= BG_IS_VALID;
     }
 # endif
 
@@ -1349,7 +1359,7 @@
 # if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
   XImage *result = NULL;
 
-  if (tr_flags && !(bg_flags & BG_IS_VALID))
+  if (tr_flags & BG_NEEDS_TINT)
     {
       result = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
     }
@@ -1357,7 +1367,8 @@
   if (result)
     {
       /* our own client-side tinting */
-      if (tr_flags & BG_NEEDS_TINT)
+      //if (tr_flags & BG_NEEDS_TINT)
+      if (1)
         {
           rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
           if (bg_flags & BG_TINT_SET)
@@ -1372,7 +1383,6 @@
           XPutImage (dpy, bg_pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
 
           XFreeGC (dpy, gc);
-          bg_flags |= BG_IS_VALID;
         }
 
       XDestroyImage (result);
@@ -1423,7 +1433,7 @@
 #endif /* HAVE_BG_PIXMAP */
 
 #if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
-/* taken from aterm-0.4.2 */
+/* based on code from aterm-0.4.2 */
 
 static void
 shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c)