--- rxvt-unicode/src/command.C	2010/10/22 18:03:10	1.457
+++ rxvt-unicode/src/command.C	2010/11/19 23:29:30	1.460
@@ -1438,6 +1438,25 @@
             while (XCheckTypedWindowEvent (dpy, ev.xconfigure.window, ConfigureNotify, &ev))
               ;
 
+#ifdef HAVE_BG_PIXMAP
+            bool moved = false;
+            if (bgPixmap.window_position_sensitive ())
+              {
+                int x, y;
+                if (ev.xconfigure.send_event)
+                  {
+                    x = ev.xconfigure.x;
+                    y = ev.xconfigure.y;
+                  }
+                else
+                  get_window_origin (x, y);
+
+                if (bgPixmap.set_position (x, y)
+                    || (bgPixmap.flags & bgPixmap_t::isInvalid))
+                  moved = true;
+              }
+#endif
+
             if (szHint.width != ev.xconfigure.width || szHint.height != ev.xconfigure.height)
               {
                 seen_resize = 1;
@@ -1446,7 +1465,7 @@
             else
               {
 #ifdef HAVE_BG_PIXMAP
-                if (bgPixmap.window_position_sensitive ())
+                if (moved)
                   {
                     if (mapped)
                       update_background ();
@@ -3450,25 +3469,33 @@
 
             if (*str != ';')
               {
-                /* reset to default scaling :*/
-                bgPixmap.unset_geometry ();
                 if (bgPixmap.set_file (str))	/* change pixmap */
-                  changed++;
-                str = strchr (str, ';');
-                if (str == NULL)
-                  bgPixmap.set_defaultGeometry ();
+                  {
+                    changed++;
+                    str = strchr (str, ';');
+                    if (str == NULL)
+                      bgPixmap.set_defaultGeometry ();
+                    else
+                      bgPixmap.set_geometry (str+1);
+                  }
               }
-
-            while (str)
+            else
               {
                 str++;
-                if (bgPixmap.set_geometry (str))
+                if (bgPixmap.set_geometry (str, true))
                   changed++;
-                str = strchr (str, ';');
               }
 
             if (changed)
-              update_background ();
+              {
+                if (bgPixmap.window_position_sensitive ())
+                  {
+                    int x, y;
+                    get_window_origin (x, y);
+                    bgPixmap.set_position (x, y);
+                  }
+                update_background ();
+              }
           }
         break;
 #endif