--- rxvt-unicode/src/background.C	2011/08/11 12:27:26	1.162
+++ rxvt-unicode/src/background.C	2011/08/19 17:49:08	1.168
@@ -34,22 +34,6 @@
 #define FilterConvolution "convolution"
 #endif
 
-/*
- * Pixmap geometry string interpretation :
- * Each geometry string contains zero or one scale/position
- * adjustment and may optionally be followed by a colon and one or more
- * colon-delimited pixmap operations.
- * The following table shows the valid geometry strings and their
- * effects on the background image :
- *
- * WxH+X+Y    Set scaling to W% by H%, and position to X% by Y%.
- *            W and H are percentages of the terminal window size.
- *            X and Y are also percentages; e.g., +50+50 centers
- *            the image in the window.
- *
- * Pixmap Operations : (should be prepended by a colon)
- */
-
 #ifdef HAVE_BG_PIXMAP
 void
 rxvt_term::bg_destroy ()
@@ -199,54 +183,14 @@
   int geom_flags = 0;
   int x = 0, y = 0;
   unsigned int w = 0, h = 0;
-  unsigned int n;
   unsigned long new_flags = (bg_flags & (~BG_GEOMETRY_FLAGS));
-  const char *ops;
 
   if (geom == NULL)
     return false;
 
-  char str[256];
-
-  ops = strchr (geom, ':');
-  if (ops == NULL)
-    n = strlen (geom);
-  else
-    n = ops - geom;
-
-  if (n >= sizeof (str))
-    return false;
-
-  memcpy (str, geom, n);
-  str[n] = '\0';
-  rxvt_strtrim (str);
-
-  if (str[0])
-    {
-      /* we have geometry string - let's handle it prior to applying ops */
-      geom_flags = XParseGeometry (str, &x, &y, &w, &h);
-    } /* done parsing geometry string */
-
-  if (!update)
-    {
-      if (!(geom_flags & XValue))
-        x = y = defaultAlign;
-      else if (!(geom_flags & YValue))
-        y = x;
-
-      if (!(geom_flags & (WidthValue|HeightValue)))
-        w = h = defaultScale;
-      else if (!(geom_flags & HeightValue))
-        h = w;
-      else if (!(geom_flags & WidthValue))
-        w = h;
-
-      geom_flags |= WidthValue|HeightValue|XValue|YValue;
-    }
-
-  if (ops)
+  if (geom[0])
     {
-      char **arr = rxvt_strsplit (':', ops + 1);
+      char **arr = rxvt_strsplit (':', geom);
 
       for (int i = 0; arr[i]; i++) 
         {
@@ -260,8 +204,9 @@
           else if (!strcasecmp (arr[i], "style=aspect-stretched"))
             {
               new_flags = BG_PROP_SCALE;
+              w = h = windowScale;
               x = y = centerAlign;
-              geom_flags = XValue|YValue;
+              geom_flags = WidthValue|HeightValue|XValue|YValue;
             }
           else if (!strcasecmp (arr[i], "style=stretched"))
             {
@@ -331,11 +276,31 @@
               w = h = noScale;
               geom_flags |= WidthValue|HeightValue;
             }
+
+          else
+            geom_flags |= XParseGeometry (arr[i], &x, &y, &w, &h);
         } /* done parsing ops */
 
       rxvt_free_strsplit (arr);
     }
 
+  if (!update)
+    {
+      if (!(geom_flags & XValue))
+        x = y = defaultAlign;
+      else if (!(geom_flags & YValue))
+        y = x;
+
+      if (!(geom_flags & (WidthValue|HeightValue)))
+        w = h = defaultScale;
+      else if (!(geom_flags & HeightValue))
+        h = w;
+      else if (!(geom_flags & WidthValue))
+        w = h;
+
+      geom_flags |= WidthValue|HeightValue|XValue|YValue;
+    }
+
   if (check_set_scale_value (geom_flags, WidthValue, h_scale, w))  changed = true;
   if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true;
   if (check_set_align_value (geom_flags, XValue, h_align, x))      changed = true;
@@ -356,18 +321,16 @@
   int target_width = szHint.width;
   int target_height = szHint.height;
 
+  w = h_scale * target_width / 100;
+  h = v_scale * target_height / 100;
+
   if (bg_flags & BG_PROP_SCALE)
     {
-      float scale = (float)target_width / image_width;
-      min_it (scale, (float)target_height / image_height);
+      float scale = (float)w / image_width;
+      min_it (scale, (float)h / image_height);
       w = image_width * scale + 0.5;
       h = image_height * scale + 0.5;
     }
-  else
-    {
-      w = h_scale * target_width / 100;
-      h = v_scale * target_height / 100;
-    }
 
   if (!w) w = image_width;
   if (!h) h = image_height;
@@ -385,7 +348,7 @@
 
   bg_flags &= ~BG_IS_SIZE_SENSITIVE;
   if (!(bg_flags & BG_TILE)
-      || (bg_flags & BG_PROP_SCALE) || h_scale || v_scale
+      || h_scale || v_scale
       || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align))
       || w > target_width || h > target_height)
     bg_flags |= BG_IS_SIZE_SENSITIVE;
@@ -887,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);
@@ -906,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
 
@@ -918,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 */