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

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.203 by sf-exg, Tue Apr 10 15:08:47 2012 UTC vs.
Revision 1.206 by sf-exg, Thu Apr 12 10:22:50 2012 UTC

 # ifdef BG_IMAGE_FROM_FILE
 static inline int
 make_align_position (int align, int window_size, int image_size)
 {
-  int diff = window_size - image_size;
-  int smaller = min (image_size, window_size);
   if (align >= 0 && align <= 100)
-    return diff * align / 100;
+    return lerp (0, window_size - image_size, align);
-  else if (align > 100 && align <= 200)
+  else if (align > 100)
-    return (align - 100) * smaller / 100 + window_size - smaller;
+    return lerp (window_size - image_size, window_size, align - 100);
-  else if (align >= -100 && align < 0)
+  else
-    return (align + 100) * smaller / 100 - image_size;
+    return lerp (-image_size, 0, align + 100);
-  return 0;
 }
 static inline int
 make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size)
 {
     {
       x = make_align_position (h_align, target_width, w);
       y = make_align_position (v_align, target_height, h);
     }
-  bg_flags &= ~BG_IS_SIZE_SENSITIVE;
   if (!(bg_flags & BG_TILE)
       || h_scale || v_scale
       || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align))
-      || w > target_width || h > target_height)
+      || image_width > target_width || image_height > target_height)
     bg_flags |= BG_IS_SIZE_SENSITIVE;
+  else
+    bg_flags &= ~BG_IS_SIZE_SENSITIVE;
 }
 #  ifdef HAVE_PIXBUF
 bool
 rxvt_term::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
     {
       changed = true;
       v_blurRadius = vr;
     }
-  if (h_blurRadius == 0 || v_blurRadius == 0)
+  if (h_blurRadius && v_blurRadius)
+    bg_flags |= BG_NEEDS_BLUR;
+  else
     bg_flags &= ~BG_NEEDS_BLUR;
-  else
-    bg_flags |= BG_NEEDS_BLUR;
   return changed;
 }
 void

Diff Legend

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

Comparing rxvt-unicode/src/background.C (file contents): Revision 1.203 by sf-exg, Tue Apr 10 15:08:47 2012 UTC vs. Revision 1.206 by sf-exg, Thu Apr 12 10:22:50 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.203 by sf-exg, Tue Apr 10 15:08:47 2012 UTC vs.
Revision 1.206 by sf-exg, Thu Apr 12 10:22:50 2012 UTC