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

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.61 by sf-exg, Sun Oct 3 20:48:34 2010 UTC vs.
Revision 1.62 by sf-exg, Sun Oct 3 21:44:13 2010 UTC

                   w = h = noScale;
                   geom_flags |= WidthValue|HeightValue;
                 }
               else if (CHECK_GEOM_OPS ("propscale"))
                 {
-                  if (w == 0 && h == 0)
-                    {
-                      w = windowScale;
-                      geom_flags |= WidthValue;
-                    }
                   new_flags |= propScale;
                 }
               else if (CHECK_GEOM_OPS ("hscale"))
                 {
                   if (w == 0) w = windowScale;
 bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
 {
   int target_width = target->szHint.width;
   int target_height = target->szHint.height;
+  if (flags & propScale)
+    {
+      float scale = (float)target_width / image_width;
+      min_it (scale, (float)target_height / image_height);
+      w = image_width * scale + 0.5;
+      h = image_height * scale + 0.5;
+    }
+  else
+    {
-  w = h_scale * target_width / 100;
+      w = h_scale * target_width / 100;
-  h = v_scale * target_height / 100;
+      h = v_scale * target_height / 100;
+    }
   if (h_align == rootAlign || v_align == rootAlign)
     {
       target->get_window_origin (x, y);
       x = -x;

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