[ViewVC] Diff of: cvs/rxvt-unicode/src/background.C

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.59 by sf-exg, Wed Sep 8 22:17:06 2010 UTC vs.
Revision 1.61 by sf-exg, Sun Oct 3 20:48:34 2010 UTC

 # endif
 # ifdef BG_IMAGE_FROM_FILE
   if (have_image)
     {
-      if (h_scale != 0 || v_scale != 0
+      if (flags & sizeSensitive)
-          || h_align != 0 || v_align != 0)
         return true;
     }
 # endif
   return false;
 make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size)
 {
   int src_pos = 0;
   dst_pos = 0;
   dst_size = size;
-  if (pos < 0 && size > target_size)
+  if (pos < 0)
     {
       src_pos = -pos;
       dst_size += pos;
     }
   else if (pos > 0)
   if (h_align != rootAlign)
     x = make_align_position (h_align, target_width, w > 0 ? w : image_width);
   if (v_align != rootAlign)
     y = make_align_position (v_align, target_height, h > 0 ? h : image_height);
+  flags &= ~sizeSensitive;
+  if (h_scale != 0 || v_scale != 0
+      || h_align != 0 || v_align != 0
+      || image_width > target_width || image_height > target_height)
+    flags |= sizeSensitive;
 }
 #  ifdef HAVE_AFTERIMAGE
 bool
 bgPixmap_t::render_image (unsigned long background_flags)

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines