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

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.155 by sf-exg, Mon May 30 18:39:02 2011 UTC vs.
Revision 1.162 by sf-exg, Thu Aug 11 12:27:26 2011 UTC

  *            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)
- * tile       Tile image. Scaling/position modifiers above will affect
- *            the tile size and origin.
- * propscale  When scaling, scale proportionally. That is, maintain the
- *            proper aspect ratio for the image. Any portion of the
- *            background not covered by the image is filled with the
- *            current background color.
- * hscale     Scale horizontally, tile vertically ?
- * vscale     Tile horizontally, scale vertically ?
- * scale      Scale both up and down
- * auto       Same as 100x100+50+50
  */
 #ifdef HAVE_BG_PIXMAP
 void
 rxvt_term::bg_destroy ()
     {
       char **arr = rxvt_strsplit (':', ops + 1);
       for (int i = 0; arr[i]; i++)
         {
+          if (!strcasecmp (arr[i], "style=tiled"))
+            {
+              new_flags = BG_TILE;
+              w = h = noScale;
+              x = y = 0;
+              geom_flags = WidthValue|HeightValue|XValue|YValue;
+            }
+          else if (!strcasecmp (arr[i], "style=aspect-stretched"))
+            {
+              new_flags = BG_PROP_SCALE;
+              x = y = centerAlign;
+              geom_flags = XValue|YValue;
+            }
+          else if (!strcasecmp (arr[i], "style=stretched"))
+            {
+              new_flags = 0;
+              w = h = windowScale;
+              geom_flags = WidthValue|HeightValue;
+            }
+          else if (!strcasecmp (arr[i], "style=centered"))
+            {
+              new_flags = 0;
+              w = h = noScale;
+              x = y = centerAlign;
+              geom_flags = WidthValue|HeightValue|XValue|YValue;
+            }
+          else if (!strcasecmp (arr[i], "style=root-tiled"))
+            {
+              new_flags = BG_TILE|BG_ROOT_ALIGN;
+              w = h = noScale;
+              geom_flags = WidthValue|HeightValue;
+            }
+          else if (!strcasecmp (arr[i], "op=tile"))
+            new_flags |= BG_TILE;
+          else if (!strcasecmp (arr[i], "op=pscale"))
+            new_flags |= BG_PROP_SCALE;
+          else if (!strcasecmp (arr[i], "op=root"))
+            new_flags |= BG_ROOT_ALIGN;
+          // deprecated
-          if (!strcasecmp (arr[i], "tile"))
+          else if (!strcasecmp (arr[i], "tile"))
             {
+              new_flags |= BG_TILE;
               w = h = noScale;
               geom_flags |= WidthValue|HeightValue;
             }
           else if (!strcasecmp (arr[i], "propscale"))
             {
               new_flags |= BG_PROP_SCALE;
             }
           else if (!strcasecmp (arr[i], "hscale"))
             {
+              new_flags |= BG_TILE;
-              if (w == 0) w = windowScale;
+              w = windowScale;
               h = noScale;
               geom_flags |= WidthValue|HeightValue;
             }
           else if (!strcasecmp (arr[i], "vscale"))
             {
+              new_flags |= BG_TILE;
-              if (h == 0) h = windowScale;
+              h = windowScale;
               w = noScale;
               geom_flags |= WidthValue|HeightValue;
             }
           else if (!strcasecmp (arr[i], "scale"))
             {
-              if (h == 0) h = windowScale;
-              if (w == 0) w = windowScale;
+              w = h = windowScale;
               geom_flags |= WidthValue|HeightValue;
             }
           else if (!strcasecmp (arr[i], "auto"))
             {
               w = h = windowScale;
               x = y = centerAlign;
               geom_flags |= WidthValue|HeightValue|XValue|YValue;
             }
           else if (!strcasecmp (arr[i], "root"))
             {
-              new_flags |= BG_ROOT_ALIGN;
+              new_flags |= BG_TILE|BG_ROOT_ALIGN;
               w = h = noScale;
               geom_flags |= WidthValue|HeightValue;
             }
         } /* done parsing ops */
       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)
-  if ((bg_flags & BG_PROP_SCALE) || h_scale || v_scale
+      || (bg_flags & BG_PROP_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;
 }
                                   100, ASIMAGE_QUALITY_DEFAULT);
         }
       if (background == NULL)
         {
-          if (h_scale == 0 || v_scale == 0)
+          if (bg_flags & BG_TILE)
             {
               /* if tiling - pixmap has to be sized exactly as the image,
                  but there is no need to make it bigger than the window! */
               new_pmap_width = min (result->width, target_width);
               new_pmap_height = min (result->height, target_height);
           layers[0].clip_width = target_width;
           layers[0].clip_height = target_height;
           layers[0].tint = background_tint;
           layers[1].im = result;
-          if (h_scale == 0 || v_scale == 0)
+          if (bg_flags & BG_TILE)
             {
               /* tile horizontally */
               while (x > 0) x -= (int)result->width;
               layers[1].dst_x = x;
               layers[1].clip_width = result->width+target_width;
               /* clip horizontally */
               layers[1].dst_x = x;
               layers[1].clip_width = result->width;
             }
-          if (h_scale == 0 || v_scale == 0)
+          if (bg_flags & BG_TILE)
             {
               while (y > 0) y -= (int)result->height;
               layers[1].dst_y = y;
               layers[1].clip_height = result->height + target_height;
             }
       int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
       int dst_width = result->width, dst_height = result->height;
       if (background == NULL)
         {
-          if (!(h_scale == 0 || v_scale == 0))
+          if (!(bg_flags & BG_TILE))
             {
               src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width );
               src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);
             }
       root_pmap = bg_pixmap;
       bg_pixmap = None;
     }
   else
     {
-      if (h_scale == 0 || v_scale == 0)
+      if (bg_flags & BG_TILE)
         {
           new_pmap_width = min (image_width, target_width);
           new_pmap_height = min (image_height, target_height);
         }
     }
   gcv.foreground = pix_colors[Color_bg];
   gc = XCreateGC (dpy, vt, GCForeground, &gcv);
   if (gc)
     {
-      if (h_scale == 0 || v_scale == 0)
+      if (bg_flags & BG_TILE)
         {
           Pixmap tile = XCreatePixmap (dpy, vt, image_width, image_height, depth);
           pixbuf_to_pixmap (result, tile, gc,
                             0, 0,
                             0, 0,

Diff Legend

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

Comparing rxvt-unicode/src/background.C (file contents): Revision 1.155 by sf-exg, Mon May 30 18:39:02 2011 UTC vs. Revision 1.162 by sf-exg, Thu Aug 11 12:27:26 2011 UTC

Diff Legend

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.155 by sf-exg, Mon May 30 18:39:02 2011 UTC vs.
Revision 1.162 by sf-exg, Thu Aug 11 12:27:26 2011 UTC