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

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.135 by sf-exg, Tue Jan 11 11:12:45 2011 UTC vs.
Revision 1.180 by sf-exg, Sat Dec 24 09:44:23 2011 UTC

 /*----------------------------------------------------------------------*
  * File:	background.C - former xpm.C
  *----------------------------------------------------------------------*
  *
  * All portions of code are copyright by their respective author/s.
- * Copyright (c) 2005-2008 Marc Lehmann <pcg@goof.com>
+ * Copyright (c) 2005-2008 Marc Lehmann <schmorp@schmorp.de>
  * Copyright (c) 2007      Sasha Vasko <sasha@aftercode.net>
  * Copyright (c) 2010      Emanuele Giaquinta <e.giaquinta@glauco.it>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
 #ifndef FilterConvolution
 #define FilterConvolution "convolution"
 #endif
-#define DO_TIMING_TEST 0
-#if DO_TIMING_TEST
-# include <sys/time.h>
-#define TIMING_TEST_START(id) \
-  struct timeval timing_test_##id##_stv; \
-  gettimeofday (&timing_test_##id##_stv, NULL);
-#define TIMING_TEST_PRINT_RESULT(id) \
-  do { \
-    struct timeval tv; \
-    gettimeofday (&tv, NULL); \
-    tv.tv_sec -= (timing_test_##id##_stv).tv_sec; \
-    fprintf (stderr, "%s: %s: %d: elapsed  %ld usec\n", #id, __FILE__, __LINE__, \
-             tv.tv_sec * 1000000 + tv.tv_usec - (timing_test_##id##_stv).tv_usec); \
-  } while (0)
-#else
-#define TIMING_TEST_START(id) do {} while (0)
-#define TIMING_TEST_PRINT_RESULT(id) do {} while (0)
-#endif
-/*
- * Pixmap geometry string interpretation :
- * Each geometry string contains zero or one scale/position
- * adjustment and may optionally be followed by a colon and one or more
- * colon-delimited pixmap operations.
- * The following table shows the valid geometry strings and their
- * effects on the background image :
- *
- * WxH+X+Y    Set scaling to W% by H%, and position to X% by Y%.
- *            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
-bgPixmap_t::bgPixmap_t ()
-{
-  // this is basically redundant as bgPixmap_t is only used in
-  // zero_initialised-derived structs
-#ifdef HAVE_AFTERIMAGE
-  original_asim = NULL;
-#endif
-#ifdef HAVE_PIXBUF
-  pixbuf = NULL;
-#endif
-#ifdef BG_IMAGE_FROM_FILE
-  have_image = false;
-  h_scale = v_scale = 0;
-  h_align = v_align = 0;
-#endif
-#ifdef ENABLE_TRANSPARENCY
-  shade = 100;
-#endif
-  flags = 0;
-  pixmap = None;
-  valid_since = invalid_since = 0;
-  target = 0;
-  target_x = target_y = 0;
-}
 void
-bgPixmap_t::destroy ()
+rxvt_term::bg_destroy ()
 {
 #ifdef HAVE_AFTERIMAGE
   if (original_asim)
     safe_asimage_destroy (original_asim);
+  if (asv)
+    destroy_asvisual (asv, 0);
+  if (asimman)
+    destroy_image_manager (asimman, 0);
 #endif
 #ifdef HAVE_PIXBUF
   if (pixbuf)
     g_object_unref (pixbuf);
 #endif
-  if (pixmap && target)
+  if (bg_pixmap)
-    XFreePixmap (target->dpy, pixmap);
+    XFreePixmap (dpy, bg_pixmap);
 }
 bool
-bgPixmap_t::set_position (int x, int y)
+rxvt_term::bg_set_position (int x, int y)
 {
   if (target_x != x
       || target_y != y)
     {
     }
   return false;
 }
 bool
-bgPixmap_t::window_size_sensitive ()
+rxvt_term::bg_window_size_sensitive ()
 {
 # ifdef ENABLE_TRANSPARENCY
-  if (flags & isTransparent)
+  if (bg_flags & BG_IS_TRANSPARENT)
     return true;
 # endif
 # ifdef BG_IMAGE_FROM_FILE
-  if (have_image)
+  if (bg_flags & BG_IS_FROM_FILE)
     {
-      if (flags & sizeSensitive)
+      if (bg_flags & BG_IS_SIZE_SENSITIVE)
         return true;
     }
 # endif
   return false;
 }
 bool
-bgPixmap_t::window_position_sensitive ()
+rxvt_term::bg_window_position_sensitive ()
 {
 # ifdef ENABLE_TRANSPARENCY
-  if (flags & isTransparent)
+  if (bg_flags & BG_IS_TRANSPARENT)
     return true;
 # endif
 # ifdef BG_IMAGE_FROM_FILE
-  if (have_image)
+  if (bg_flags & BG_IS_FROM_FILE)
     {
-      if (flags & rootAlign)
+      if (bg_flags & BG_ROOT_ALIGN)
         return true;
     }
 # endif
   return false;
   int smaller = min (image_size, window_size);
   if (align >= 0 && align <= 100)
     return diff * align / 100;
   else if (align > 100 && align <= 200)
-    return ((align - 100) * smaller / 100) + window_size - smaller;
+    return (align - 100) * smaller / 100 + window_size - smaller;
   else if (align >= -100 && align < 0)
-    return ((align + 100) * smaller / 100) - image_size;
+    return (align + 100) * smaller / 100 - image_size;
   return 0;
 }
 static inline int
 make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size)
     dst_size = target_size - dst_pos;
   return src_pos;
 }
 bool
-bgPixmap_t::set_geometry (const char *geom, bool update)
+rxvt_term::bg_set_geometry (const char *geom, bool update)
 {
   bool changed = false;
   int geom_flags = 0;
   int x = 0, y = 0;
   unsigned int w = 0, h = 0;
-  unsigned int n;
+  unsigned long new_flags = bg_flags & ~BG_GEOMETRY_FLAGS;
-  unsigned long new_flags = (flags & (~geometryFlags));
-  const char *ops;
   if (geom == NULL)
     return false;
-  char str[256];
+  if (geom[0])
-  ops = strchr (geom, ':');
-  if (ops == NULL)
-    n = strlen (geom);
-  else
-    n = ops - geom;
-  if (n >= sizeof (str))
-    return false;
-  memcpy (str, geom, n);
-  str[n] = '\0';
-  rxvt_strtrim (str);
-  if (str[0])
     {
-      /* we have geometry string - let's handle it prior to applying ops */
+      char **arr = rxvt_strsplit (':', geom);
+      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_KEEP_ASPECT;
+              w = h = windowScale;
+              x = y = centerAlign;
+              geom_flags = WidthValue|HeightValue|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=keep-aspect"))
+            new_flags |= BG_KEEP_ASPECT;
+          else if (!strcasecmp (arr[i], "op=root-align"))
+            new_flags |= BG_ROOT_ALIGN;
+          // deprecated
+          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_KEEP_ASPECT;
+              w = h = windowScale;
+              geom_flags |= WidthValue|HeightValue;
+            }
+          else if (!strcasecmp (arr[i], "hscale"))
+            {
+              new_flags |= BG_TILE;
+              w = windowScale;
+              h = noScale;
+              geom_flags |= WidthValue|HeightValue;
+            }
+          else if (!strcasecmp (arr[i], "vscale"))
+            {
+              new_flags |= BG_TILE;
+              h = windowScale;
+              w = noScale;
+              geom_flags |= WidthValue|HeightValue;
+            }
+          else if (!strcasecmp (arr[i], "scale"))
+            {
+              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_TILE|BG_ROOT_ALIGN;
+              w = h = noScale;
+              geom_flags |= WidthValue|HeightValue;
+            }
+          else
-      geom_flags = XParseGeometry (str, &x, &y, &w, &h);
+            geom_flags |= XParseGeometry (arr[i], &x, &y, &w, &h);
-    } /* done parsing geometry string */
+        } /* done parsing ops */
+      rxvt_free_strsplit (arr);
+    }
   if (!update)
     {
       if (!(geom_flags & XValue))
         x = y = defaultAlign;
         w = h;
       geom_flags |= WidthValue|HeightValue|XValue|YValue;
     }
-  if (ops)
-    {
-      char **arr = rxvt_strsplit (':', ops + 1);
-      for (int i = 0; arr[i]; i++)
-        {
-          if (!strcasecmp (arr[i], "tile"))
-            {
-              w = h = noScale;
-              geom_flags |= WidthValue|HeightValue;
-            }
-          else if (!strcasecmp (arr[i], "propscale"))
-            {
-              new_flags |= propScale;
-            }
-          else if (!strcasecmp (arr[i], "hscale"))
-            {
-              if (w == 0) w = windowScale;
-              h = noScale;
-              geom_flags |= WidthValue|HeightValue;
-            }
-          else if (!strcasecmp (arr[i], "vscale"))
-            {
-              if (h == 0) h = windowScale;
-              w = noScale;
-              geom_flags |= WidthValue|HeightValue;
-            }
-          else if (!strcasecmp (arr[i], "scale"))
-            {
-              if (h == 0) h = windowScale;
-              if (w == 0) w = 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 |= rootAlign;
-              w = h = noScale;
-              geom_flags |= WidthValue|HeightValue;
-            }
-        } /* done parsing ops */
-      rxvt_free_strsplit (arr);
-    }
   if (check_set_scale_value (geom_flags, WidthValue, h_scale, w))  changed = true;
   if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true;
   if (check_set_align_value (geom_flags, XValue, h_align, x))      changed = true;
   if (check_set_align_value (geom_flags, YValue, v_align, y))      changed = true;
-  if (new_flags != flags)
+  if (new_flags != bg_flags)
     {
-      flags = new_flags;
+      bg_flags = new_flags;
       changed = true;
     }
   return changed;
 }
 void
-bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
+rxvt_term::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_width = szHint.width;
-  int target_height = target->szHint.height;
+  int target_height = szHint.height;
-  if (flags & propScale)
+  w = h_scale * target_width / 100;
+  h = v_scale * target_height / 100;
+  if (bg_flags & BG_KEEP_ASPECT)
     {
-      float scale = (float)target_width / image_width;
+      float scale = (float)w / image_width;
-      min_it (scale, (float)target_height / image_height);
+      min_it (scale, (float)h / image_height);
       w = image_width * scale + 0.5;
       h = image_height * scale + 0.5;
     }
-  else
-    {
-      w = h_scale * target_width / 100;
-      h = v_scale * target_height / 100;
-    }
   if (!w) w = image_width;
   if (!h) h = image_height;
-  if (flags & rootAlign)
+  if (bg_flags & BG_ROOT_ALIGN)
     {
       x = -target_x;
       y = -target_y;
     }
   else
     {
       x = make_align_position (h_align, target_width, w);
       y = make_align_position (v_align, target_height, h);
     }
-  flags &= ~sizeSensitive;
+  bg_flags &= ~BG_IS_SIZE_SENSITIVE;
-  if ((flags & propScale) || h_scale || v_scale
+  if (!(bg_flags & BG_TILE)
+      || h_scale || v_scale
-      || (!(flags & rootAlign) && (h_align || v_align))
+      || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align))
       || w > target_width || h > target_height)
-    flags |= sizeSensitive;
+    bg_flags |= BG_IS_SIZE_SENSITIVE;
 }
 #  ifdef HAVE_AFTERIMAGE
 bool
-bgPixmap_t::render_image (unsigned long background_flags)
+rxvt_term::render_image (unsigned long tr_flags)
 {
-  if (target == NULL)
-    return false;
-  target->init_asv ();
+  init_asv ();
   ASImage *background = NULL;
   ARGB32 background_tint = TINT_LEAVE_SAME;
 #   ifdef ENABLE_TRANSPARENCY
-  if (background_flags)
+  if (tr_flags)
-    background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
+    background = pixmap2ximage (asv, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, 100);
-  if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
+  if (tr_flags & BG_NEEDS_TINT)
     {
       ShadingInfo as_shade;
       as_shade.shading = shade;
       rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
-      if (flags & tintSet)
+      if (bg_flags & BG_TINT_SET)
         tint.get (c);
       as_shade.tintColor.red = c.r;
       as_shade.tintColor.green = c.g;
       as_shade.tintColor.blue = c.b;
       background_tint = shading2tint32 (&as_shade);
     }
-  if (!(background_flags & transpPmapBlurred) && (flags & blurNeeded) && background != NULL)
+  if ((tr_flags & BG_NEEDS_BLUR) && background != NULL)
     {
-      ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
+      ASImage *tmp = blur_asimage_gauss (asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
-                                         (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage,
+                                         ASA_XImage,
                                          100, ASIMAGE_QUALITY_DEFAULT);
       if (tmp)
         {
           destroy_asimage (&background);
           background = tmp;
     }
 #   endif
   ASImage *result = 0;
-  int target_width    = target->szHint.width;
+  int target_width    = szHint.width;
-  int target_height   = target->szHint.height;
+  int target_height   = szHint.height;
   int new_pmap_width  = target_width;
   int new_pmap_height = target_height;
   int x = 0;
   int y = 0;
   if (original_asim)
     get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);
   if (!original_asim
-      || (!(flags & rootAlign)
+      || (!(bg_flags & BG_ROOT_ALIGN)
           && (x >= target_width
               || y >= target_height
-              || (x + w <= 0)
+              || x + w <= 0
-              || (y + h <= 0))))
+              || y + h <= 0)))
     {
       if (background)
         {
           new_pmap_width = background->width;
           new_pmap_height = background->height;
           result = background;
           if (background_tint != TINT_LEAVE_SAME)
             {
-              ASImage *tmp = tile_asimage (target->asv, background, 0, 0,
+              ASImage *tmp = tile_asimage (asv, background, 0, 0,
                                            target_width, target_height, background_tint,
                                            ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT);
               if (tmp)
                 result = tmp;
             }
     }
   else
     {
       result = original_asim;
-      if ((w != original_asim->width)
+      if (w != original_asim->width
-          || (h != original_asim->height))
+          || h != original_asim->height)
         {
-          result = scale_asimage (target->asv, original_asim,
+          result = scale_asimage (asv, original_asim,
                                   w, h,
-                                  background ? ASA_ASImage : ASA_XImage,
+                                  ASA_XImage,
                                   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);
               /* we also need to tile our image in both directions */
-              ASImage *tmp = tile_asimage (target->asv, result,
+              ASImage *tmp = tile_asimage (asv, result,
                                            (int)result->width - x,
                                            (int)result->height - y,
                                            new_pmap_width,
                                            new_pmap_height,
                                            TINT_LEAVE_SAME, ASA_XImage,
           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;
             }
             {
               layers[1].dst_y = y;
               layers[1].clip_height = result->height;
             }
-          if (target->rs[Rs_blendtype])
+          if (rs[Rs_blendtype])
             {
-              layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]);
+              layers[1].merge_scanlines = blend_scanlines_name2func (rs[Rs_blendtype]);
               if (layers[1].merge_scanlines == NULL)
                 layers[1].merge_scanlines = alphablend_scanlines;
             }
-          ASImage *tmp = merge_layers (target->asv, layers, 2, target_width, target_height,
+          ASImage *tmp = merge_layers (asv, layers, 2, target_width, target_height,
                                        ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
           if (tmp)
             {
               if (result != original_asim)
     {
       XGCValues gcv;
       GC gc;
       /* create Pixmap */
-      if (pixmap == None
+      if (bg_pixmap == None
-          || pmap_width != new_pmap_width
+          || bg_pmap_width != new_pmap_width
-          || pmap_height != new_pmap_height)
+          || bg_pmap_height != new_pmap_height)
         {
-          if (pixmap)
+          if (bg_pixmap)
-            XFreePixmap (target->dpy, pixmap);
+            XFreePixmap (dpy, bg_pixmap);
-          pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
+          bg_pixmap = XCreatePixmap (dpy, vt, new_pmap_width, new_pmap_height, depth);
-          pmap_width = new_pmap_width;
+          bg_pmap_width = new_pmap_width;
-          pmap_height = new_pmap_height;
+          bg_pmap_height = new_pmap_height;
         }
       /* fill with background color (if result's not completely overlapping it) */
-      gcv.foreground = target->pix_colors[Color_bg];
+      gcv.foreground = pix_colors[Color_bg];
-      gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
+      gc = XCreateGC (dpy, vt, GCForeground, &gcv);
       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);
             }
           if (dst_x > 0 || dst_y > 0
               || dst_x + dst_width < new_pmap_width
               || dst_y + dst_height < new_pmap_height)
-            XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
+            XFillRectangle (dpy, bg_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
         }
       /* put result on pixmap */
       if (dst_x < new_pmap_width && dst_y < new_pmap_height)
-        asimage2drawable (target->asv, pixmap, result, gc, src_x, src_y, dst_x, dst_y, dst_width, dst_height, True);
+        asimage2drawable (asv, bg_pixmap, result, gc, src_x, src_y, dst_x, dst_y, dst_width, dst_height, True);
       if (result != background && result != original_asim)
         destroy_asimage (&result);
-      XFreeGC (target->dpy, gc);
+      XFreeGC (dpy, gc);
       ret = true;
     }
   if (background)
 }
 #  endif /* HAVE_AFTERIMAGE */
 #  ifdef HAVE_PIXBUF
 bool
-bgPixmap_t::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
+rxvt_term::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
-                              int src_x, int src_y, int dst_x, int dst_y,
+                             int src_x, int src_y, int dst_x, int dst_y,
-                              unsigned int width, unsigned int height)
+                             unsigned int width, unsigned int height)
 {
   XImage *ximage;
   char *data, *line;
   int bytes_per_pixel;
   int width_r, width_g, width_b;
   int sh_r, sh_g, sh_b;
   int rowstride;
   int channels;
   unsigned char *row;
-  Visual *visual = target->visual;
-  int depth = target->depth;
   if (visual->c_class != TrueColor)
     return false;
   if (depth == 24 || depth == 32)
   else if (depth == 15 || depth == 16)
     bytes_per_pixel = 2;
   else
     return false;
-  width_r = rxvt_popcount (visual->red_mask);
+  width_r = ecb_popcount32 (visual->red_mask);
-  width_g = rxvt_popcount (visual->green_mask);
+  width_g = ecb_popcount32 (visual->green_mask);
-  width_b = rxvt_popcount (visual->blue_mask);
+  width_b = ecb_popcount32 (visual->blue_mask);
   if (width_r > 8 || width_g > 8 || width_b > 8)
     return false;
-  sh_r = rxvt_ctz (visual->red_mask);
+  sh_r = ecb_ctz32 (visual->red_mask);
-  sh_g = rxvt_ctz (visual->green_mask);
+  sh_g = ecb_ctz32 (visual->green_mask);
-  sh_b = rxvt_ctz (visual->blue_mask);
+  sh_b = ecb_ctz32 (visual->blue_mask);
   if (width > INT_MAX / height / bytes_per_pixel)
     return false;
   data = (char *)malloc (width * height * bytes_per_pixel);
   if (!data)
     return false;
-  ximage = XCreateImage (target->dpy, visual, depth, ZPixmap, 0, data,
+  ximage = XCreateImage (dpy, visual, depth, ZPixmap, 0, data,
                          width, height, bytes_per_pixel * 8, 0);
   if (!ximage)
     {
       free (data);
       return false;
     }
-  ximage->byte_order = byteorder::big_endian () ? MSBFirst : LSBFirst;
+  ximage->byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
   rowstride = gdk_pixbuf_get_rowstride (pixbuf);
   channels = gdk_pixbuf_get_n_channels (pixbuf);
   row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels;
   line = data;
       row += rowstride;
       line += ximage->bytes_per_line;
     }
-  XPutImage (target->dpy, pixmap, gc, ximage, 0, 0, dst_x, dst_y, width, height);
+  XPutImage (dpy, pixmap, gc, ximage, 0, 0, dst_x, dst_y, width, height);
   XDestroyImage (ximage);
   return true;
 }
 bool
-bgPixmap_t::render_image (unsigned long background_flags)
+rxvt_term::render_image (unsigned long tr_flags)
 {
-  if (target == NULL)
-    return false;
   if (!pixbuf)
     return false;
-  if (background_flags
+  if (tr_flags
-      && !(flags & HAS_RENDER))
+      && !(bg_flags & BG_HAS_RENDER))
     return false;
   GdkPixbuf *result;
   int image_width = gdk_pixbuf_get_width (pixbuf);
   int image_height = gdk_pixbuf_get_height (pixbuf);
-  int target_width    = target->szHint.width;
+  int target_width    = szHint.width;
-  int target_height   = target->szHint.height;
+  int target_height   = szHint.height;
   int new_pmap_width  = target_width;
   int new_pmap_height = target_height;
   int x = 0;
   int y = 0;
   int w = 0;
   int h = 0;
   get_image_geometry (image_width, image_height, w, h, x, y);
-  if (!(flags & rootAlign)
+  if (!(bg_flags & BG_ROOT_ALIGN)
       && (x >= target_width
           || y >= target_height
-          || (x + w <= 0)
+          || x + w <= 0
-          || (y + h <= 0)))
+          || y + h <= 0))
     return false;
   result = pixbuf;
-  if ((w != image_width)
+  if (w != image_width
-      || (h != image_height))
+      || h != image_height)
     {
       result = gdk_pixbuf_scale_simple (pixbuf,
                                         w, h,
                                         GDK_INTERP_BILINEAR);
     }
+  if (!result)
+    return false;
   bool ret = false;
-  if (result)
-    {
-      XGCValues gcv;
+  XGCValues gcv;
-      GC gc;
+  GC gc;
-      Pixmap root_pmap;
+  Pixmap root_pmap;
-      image_width = gdk_pixbuf_get_width (result);
+  image_width = gdk_pixbuf_get_width (result);
-      image_height = gdk_pixbuf_get_height (result);
+  image_height = gdk_pixbuf_get_height (result);
-      if (background_flags)
+  if (tr_flags)
-        {
+    {
-          root_pmap = pixmap;
+      root_pmap = bg_pixmap;
-          pixmap = None;
+      bg_pixmap = None;
+    }
+  else
+    {
+      if (bg_flags & BG_TILE)
-        }
+        {
-      else
-        {
-          if (h_scale == 0 || v_scale == 0)
-            {
-              new_pmap_width = min (image_width, target_width);
+          new_pmap_width = min (image_width, target_width);
-              new_pmap_height = min (image_height, target_height);
+          new_pmap_height = min (image_height, target_height);
-            }
+        }
-        }
+    }
-      if (pixmap == None
+  if (bg_pixmap == None
-          || pmap_width != new_pmap_width
+      || bg_pmap_width != new_pmap_width
-          || pmap_height != new_pmap_height)
+      || bg_pmap_height != new_pmap_height)
-        {
+    {
-          if (pixmap)
+      if (bg_pixmap)
-            XFreePixmap (target->dpy, pixmap);
+        XFreePixmap (dpy, bg_pixmap);
-          pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
+      bg_pixmap = XCreatePixmap (dpy, vt, new_pmap_width, new_pmap_height, depth);
-          pmap_width = new_pmap_width;
+      bg_pmap_width = new_pmap_width;
-          pmap_height = new_pmap_height;
+      bg_pmap_height = new_pmap_height;
+    }
+  gcv.foreground = pix_colors[Color_bg];
+  gc = XCreateGC (dpy, vt, GCForeground, &gcv);
+  if (gc)
+    {
+      if (bg_flags & BG_TILE)
-        }
+        {
-      gcv.foreground = target->pix_colors[Color_bg];
-      gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
-      if (h_scale == 0 || v_scale == 0)
-        {
-          Pixmap tile = XCreatePixmap (target->dpy, target->vt, image_width, image_height, target->depth);
+          Pixmap tile = XCreatePixmap (dpy, vt, image_width, image_height, depth);
           pixbuf_to_pixmap (result, tile, gc,
                             0, 0,
                             0, 0,
                             image_width, image_height);
           gcv.tile = tile;
           gcv.fill_style = FillTiled;
           gcv.ts_x_origin = x;
           gcv.ts_y_origin = y;
-          XChangeGC (target->dpy, gc, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
+          XChangeGC (dpy, gc, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
-          XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
+          XFillRectangle (dpy, bg_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
-          XFreePixmap (target->dpy, tile);
+          XFreePixmap (dpy, tile);
         }
       else
         {
           int src_x, src_y, dst_x, dst_y;
           int dst_width, dst_height;
           src_y = make_clip_rectangle (y, image_height, new_pmap_height, dst_y, dst_height);
           if (dst_x > 0 || dst_y > 0
               || dst_x + dst_width < new_pmap_width
               || dst_y + dst_height < new_pmap_height)
-            XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
+            XFillRectangle (dpy, bg_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
           if (dst_x < new_pmap_width && dst_y < new_pmap_height)
-            pixbuf_to_pixmap (result, pixmap, gc,
+            pixbuf_to_pixmap (result, bg_pixmap, gc,
                               src_x, src_y,
                               dst_x, dst_y,
                               dst_width, dst_height);
         }
 #if XRENDER
-      if (background_flags)
+      if (tr_flags)
         {
-          Display *dpy = target->dpy;
           XRenderPictureAttributes pa;
-          XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, target->visual);
+          XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, visual);
           Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa);
-          XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
+          XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual);
-          Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa);
+          Picture dst = XRenderCreatePicture (dpy, bg_pixmap, dst_format, 0, &pa);
           pa.repeat = True;
-          Pixmap mask_pmap = XCreatePixmap (dpy, target->vt, 1, 1, 8);
+          Pixmap mask_pmap = XCreatePixmap (dpy, vt, 1, 1, 8);
           XRenderPictFormat *mask_format = XRenderFindStandardFormat (dpy, PictStandardA8);
           Picture mask = XRenderCreatePicture (dpy, mask_pmap, mask_format, CPRepeat, &pa);
           XFreePixmap (dpy, mask_pmap);
-          if (src && dst && mask)
-            {
-              XRenderColor mask_c;
+          XRenderColor mask_c;
-              mask_c.alpha = 0x8000;
+          mask_c.alpha = 0x8000;
-              mask_c.red = 0;
+          mask_c.red = 0;
-              mask_c.green = 0;
+          mask_c.green = 0;
-              mask_c.blue = 0;
+          mask_c.blue = 0;
-              XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
+          XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
-              XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height);
+          XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height);
-            }
           XRenderFreePicture (dpy, src);
           XRenderFreePicture (dpy, dst);
           XRenderFreePicture (dpy, mask);
-          XFreePixmap (dpy, root_pmap);
         }
 #endif
-      if (result != pixbuf)
-        g_object_unref (result);
-      XFreeGC (target->dpy, gc);
+      XFreeGC (dpy, gc);
       ret = true;
     }
+  if (result != pixbuf)
+    g_object_unref (result);
+  if (tr_flags)
+    XFreePixmap (dpy, root_pmap);
   return ret;
 }
 #  endif /* HAVE_PIXBUF */
 bool
-bgPixmap_t::set_file (const char *file)
+rxvt_term::bg_set_file (const char *file)
 {
   if (!file || !*file)
     return false;
+  bool ret = false;
-  if (const char *p = strchr (file, ';'))
+  const char *p = strchr (file, ';');
+  if (p)
     {
       size_t len = p - file;
       char *f = rxvt_temp_buf<char> (len + 1);
       memcpy (f, file, len);
       f[len] = '\0';
       file = f;
     }
 #  ifdef HAVE_AFTERIMAGE
-  if (!target->asimman)
+  if (!asimman)
-    target->asimman = create_generic_imageman (target->rs[Rs_path]);
+    asimman = create_generic_imageman (rs[Rs_path]);
-  ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
+  ASImage *image = get_asimage (asimman, file, 0xFFFFFFFF, 100);
   if (image)
     {
       if (original_asim)
         safe_asimage_destroy (original_asim);
       original_asim = image;
-      flags |= CLIENT_RENDER;
+      bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER;
-      have_image = true;
-      return true;
+      ret = true;
     }
 #  endif
 #  ifdef HAVE_PIXBUF
   GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
   if (image)
     {
       if (pixbuf)
         g_object_unref (pixbuf);
       pixbuf = image;
-      have_image = true;
+      bg_flags |= BG_IS_FROM_FILE;
-      return true;
+      ret = true;
     }
 #  endif
+  if (ret)
+    {
+      if (p)
+        bg_set_geometry (p + 1);
+      else
+        bg_set_default_geometry ();
+    }
-  return false;
+  return ret;
 }
 # endif /* BG_IMAGE_FROM_FILE */
 # ifdef ENABLE_TRANSPARENCY
 bool
-bgPixmap_t::set_transparent ()
+rxvt_term::bg_set_transparent ()
 {
-  if (!(flags & isTransparent))
+  if (!(bg_flags & BG_IS_TRANSPARENT))
     {
-      flags |= isTransparent;
+      bg_flags |= BG_IS_TRANSPARENT;
       return true;
     }
   return false;
 }
 bool
-bgPixmap_t::set_blur_radius (const char *geom)
+rxvt_term::bg_set_blur (const char *geom)
 {
   bool changed = false;
   unsigned int hr, vr;
   int junk;
   int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
       changed = true;
       v_blurRadius = vr;
     }
   if (v_blurRadius == 0 && h_blurRadius == 0)
-    flags &= ~blurNeeded;
+    bg_flags &= ~BG_NEEDS_BLUR;
   else
-    flags |= blurNeeded;
+    bg_flags |= BG_NEEDS_BLUR;
   return changed;
 }
-static inline unsigned long
+void
-compute_tint_shade_flags (rxvt_color *tint, int shade)
+rxvt_term::set_tint_shade_flags ()
 {
-  unsigned long flags = 0;
   rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
   bool has_shade = shade != 100;
-  if (tint)
+  bg_flags &= ~BG_TINT_FLAGS;
+  if (bg_flags & BG_TINT_SET)
     {
-      tint->get (c);
+      tint.get (c);
       if (!has_shade
           && (c.r <= 0x00ff || c.r >= 0xff00)
           && (c.g <= 0x00ff || c.g >= 0xff00)
           && (c.b <= 0x00ff || c.b >= 0xff00))
-        flags |= bgPixmap_t::tintWholesome;
+        bg_flags |= BG_TINT_BITAND;
     }
-  if (has_shade || tint)
+  if (has_shade || (bg_flags & BG_TINT_SET))
-    flags |= bgPixmap_t::tintNeeded;
+    bg_flags |= BG_NEEDS_TINT;
-  return flags;
 }
 bool
-bgPixmap_t::set_tint (rxvt_color &new_tint)
+rxvt_term::bg_set_tint (rxvt_color &new_tint)
 {
-  if (!(flags & tintSet) || tint != new_tint)
+  if (!(bg_flags & BG_TINT_SET) || tint != new_tint)
     {
-      unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
       tint = new_tint;
-      flags = (flags & ~tintFlags) | new_flags | tintSet;
+      bg_flags |= BG_TINT_SET;
+      set_tint_shade_flags ();
       return true;
     }
   return false;
 }
 bool
-bgPixmap_t::set_shade (const char *shade_str)
+rxvt_term::bg_set_shade (const char *shade_str)
 {
   int new_shade = (shade_str) ? atoi (shade_str) : 100;
   clamp_it (new_shade, -100, 200);
   if (new_shade < 0)
     new_shade = 200 - (100 + new_shade);
   if (new_shade != shade)
     {
-      unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade);
       shade = new_shade;
-      flags = (flags & (~tintFlags | tintSet)) | new_flags;
+      set_tint_shade_flags ();
       return true;
     }
   return false;
 }
     params[i+2] = XDoubleToFixed (kernel[i] / sum);
 }
 #endif
 bool
-bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
+rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
 {
   bool ret = false;
 #if XRENDER
   int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
   double *kernel = (double *)malloc (size * sizeof (double));
   XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
-  Display *dpy = target->dpy;
   XRenderPictureAttributes pa;
   XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
   Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
   Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
-  if (kernel && params && src && dst)
+  if (kernel && params)
     {
       if (h_blurRadius)
         {
           size = h_blurRadius * 2 + 1;
           get_gaussian_kernel (h_blurRadius, size, kernel, params);
       if (v_blurRadius)
         {
           size = v_blurRadius * 2 + 1;
           get_gaussian_kernel (v_blurRadius, size, kernel, params);
-          swap (params[0], params[1]);
+          ::swap (params[0], params[1]);
           XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
           XRenderComposite (dpy,
                             PictOpSrc,
                             src,
 #endif
   return ret;
 }
 bool
-bgPixmap_t::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
+rxvt_term::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
 {
-  Display *dpy = target->dpy;
   bool ret = false;
-  if (flags & tintWholesome)
+  if (bg_flags & BG_TINT_BITAND)
     {
       XGCValues gcv;
       GC gc;
       /* In this case we can tint image server-side getting significant
         }
     }
   else
     {
 #  if XRENDER
-      rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
+      rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
-      if (flags & tintSet)
+      if (bg_flags & BG_TINT_SET)
         tint.get (c);
       if (shade <= 100)
         {
-          c.r = (c.r * shade) / 100;
+          c.r = c.r * shade / 100;
-          c.g = (c.g * shade) / 100;
+          c.g = c.g * shade / 100;
-          c.b = (c.b * shade) / 100;
+          c.b = c.b * shade / 100;
         }
       else
         {
-          c.r = (c.r * (200 - shade)) / 100;
+          c.r = c.r * (200 - shade) / 100;
-          c.g = (c.g * (200 - shade)) / 100;
+          c.g = c.g * (200 - shade) / 100;
-          c.b = (c.b * (200 - shade)) / 100;
+          c.b = c.b * (200 - shade) / 100;
         }
       XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
       XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
       XRenderPictureAttributes pa;
       Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
       XFreePixmap (dpy, overlay_pmap);
       pa.component_alpha = True;
       Pixmap mask_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
-      Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
+      Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat | CPComponentAlpha, &pa);
       XFreePixmap (dpy, mask_pmap);
-      if (mask_pic && overlay_pic && back_pic)
-        {
-          XRenderColor mask_c;
+      XRenderColor mask_c;
-          mask_c.red = mask_c.green = mask_c.blue = 0;
-          mask_c.alpha = 0xffff;
+      mask_c.alpha = 0xffff;
+      mask_c.red   =
+      mask_c.green =
+      mask_c.blue  = 0;
+      XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
+      mask_c.alpha = 0;
+      mask_c.red   = 0xffff - c.r;
+      mask_c.green = 0xffff - c.g;
+      mask_c.blue  = 0xffff - c.b;
+      XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
+      XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
+      if (shade > 100)
+        {
+          mask_c.red = mask_c.green = mask_c.blue = 0xffff * (shade - 100) / 100;
+          mask_c.alpha = 0;
           XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
-          mask_c.alpha = 0;
-          mask_c.red = 0xffff - c.r;
-          mask_c.green = 0xffff - c.g;
-          mask_c.blue = 0xffff - c.b;
-          XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
-          XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
-          if (shade > 100)
-            {
-              mask_c.red = mask_c.green = mask_c.blue = 0xffff * (shade - 100) / 100;
-              mask_c.alpha = 0;
-              XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
-              XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height);
+          XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height);
-            }
+        }
-          ret = true;
+      ret = true;
-        }
       XRenderFreePicture (dpy, mask_pic);
       XRenderFreePicture (dpy, overlay_pic);
       XRenderFreePicture (dpy, back_pic);
 #  endif
     }
   return ret;
 }
-/* make_transparency_pixmap()
+/*
  * Builds a pixmap of the same size as the terminal window that contains
  * the tiled portion of the root pixmap that is supposed to be covered by
  * our window.
  */
 unsigned long
-bgPixmap_t::make_transparency_pixmap ()
+rxvt_term::make_transparency_pixmap ()
 {
   unsigned long result = 0;
-  if (target == NULL)
-    return 0;
   /* root dimensions may change from call to call - but Display structure should
    * be always up-to-date, so let's use it :
    */
-  int screen = target->display->screen;
+  int screen = display->screen;
-  Display *dpy = target->dpy;
   int root_depth = DefaultDepth (dpy, screen);
   int root_width = DisplayWidth (dpy, screen);
   int root_height = DisplayHeight (dpy, screen);
   unsigned int root_pmap_width, root_pmap_height;
-  int window_width = target->szHint.width;
+  int window_width = szHint.width;
-  int window_height = target->szHint.height;
+  int window_height = szHint.height;
   int sx, sy;
   XGCValues gcv;
   GC gc;
   sx = target_x;
     {
       Window wdummy;
       int idummy;
       unsigned int udummy;
-      target->allowedxerror = -1;
+      allowedxerror = -1;
       if (!XGetGeometry (dpy, root_pixmap, &wdummy, &idummy, &idummy, &root_pmap_width, &root_pmap_height, &udummy, &udummy))
         root_pixmap = None;
-      target->allowedxerror = 0;
+      allowedxerror = 0;
     }
   Pixmap recoded_root_pmap = root_pixmap;
-  if (root_pixmap != None && root_depth != target->depth)
+  if (root_pixmap != None && root_depth != depth)
     {
 #if XRENDER
-      if (flags & HAS_RENDER)
+      if (bg_flags & BG_HAS_RENDER)
         {
+          recoded_root_pmap = XCreatePixmap (dpy, vt, root_pmap_width, root_pmap_height, depth);
           XRenderPictureAttributes pa;
           XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
           Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa);
-          recoded_root_pmap = XCreatePixmap (dpy, target->vt, root_pmap_width, root_pmap_height, target->depth);
-          XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
+          XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual);
           Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa);
-          if (src && dst)
-            XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);
+          XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);
-          else
-            {
-              XFreePixmap (dpy, recoded_root_pmap);
-              root_pixmap = None;
-            }
           XRenderFreePicture (dpy, src);
           XRenderFreePicture (dpy, dst);
         }
       else
 #endif
-      root_pixmap = None;
+      recoded_root_pmap = None;
     }
-  if (root_pixmap == None)
+  if (recoded_root_pmap == None)
     return 0;
-  if (pixmap == None
+  if (bg_pixmap == None
-      || pmap_width != window_width
+      || bg_pmap_width != window_width
-      || pmap_height != window_height)
+      || bg_pmap_height != window_height)
     {
-      if (pixmap)
+      if (bg_pixmap)
-        XFreePixmap (target->dpy, pixmap);
+        XFreePixmap (dpy, bg_pixmap);
-      pixmap = XCreatePixmap (target->dpy, target->vt, window_width, window_height, target->depth);
+      bg_pixmap = XCreatePixmap (dpy, vt, window_width, window_height, depth);
-      pmap_width = window_width;
+      bg_pmap_width = window_width;
-      pmap_height = window_height;
+      bg_pmap_height = window_height;
     }
-  if (pixmap == None)
-    return 0;
   /* straightforward pixmap copy */
-  while (sx < 0) sx += (int)root_width;
+  while (sx < 0) sx += root_pmap_width;
-  while (sy < 0) sy += (int)root_height;
+  while (sy < 0) sy += root_pmap_height;
   gcv.tile = recoded_root_pmap;
   gcv.fill_style = FillTiled;
   gcv.ts_x_origin = -sx;
   gcv.ts_y_origin = -sy;
-  gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
+  gc = XCreateGC (dpy, vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
   if (gc)
     {
-      XFillRectangle (dpy, pixmap, gc, 0, 0, window_width, window_height);
+      XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height);
-      result |= transpPmapTiled;
+      result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS);
       XFreeGC (dpy, gc);
-      if (!(flags & CLIENT_RENDER))
+      if (!(bg_flags & BG_CLIENT_RENDER))
         {
-          if ((flags & blurNeeded)
+          if ((bg_flags & BG_NEEDS_BLUR)
-              && (flags & HAS_RENDER_CONV))
+              && (bg_flags & BG_HAS_RENDER_CONV))
             {
-              if (blur_pixmap (pixmap, target->visual, window_width, window_height))
+              if (blur_pixmap (bg_pixmap, visual, window_width, window_height))
-                result |= transpPmapBlurred;
+                result &= ~BG_NEEDS_BLUR;
-            }
-          if ((flags & tintNeeded)
-              && (flags & (tintWholesome | HAS_RENDER)))
-            {
+            }
+          if ((bg_flags & BG_NEEDS_TINT)
+              && (bg_flags & (BG_TINT_BITAND | BG_HAS_RENDER)))
+            {
-              if (tint_pixmap (pixmap, target->visual, window_width, window_height))
+              if (tint_pixmap (bg_pixmap, visual, window_width, window_height))
-                result |= transpPmapTinted;
+                result &= ~BG_NEEDS_TINT;
             }
         } /* server side rendering completed */
     }
   if (recoded_root_pmap != root_pixmap)
   return result;
 }
 void
-bgPixmap_t::set_root_pixmap ()
+rxvt_term::bg_set_root_pixmap ()
 {
-  Pixmap new_root_pixmap = target->get_pixmap_property (target->xa[XA_XROOTPMAP_ID]);
+  Pixmap new_root_pixmap = get_pixmap_property (xa[XA_XROOTPMAP_ID]);
   if (new_root_pixmap == None)
-    new_root_pixmap = target->get_pixmap_property (target->xa[XA_ESETROOT_PMAP_ID]);
+    new_root_pixmap = get_pixmap_property (xa[XA_ESETROOT_PMAP_ID]);
   root_pixmap = new_root_pixmap;
 }
 # endif /* ENABLE_TRANSPARENCY */
 #if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
 static void shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c);
 # endif
 bool
-bgPixmap_t::render ()
+rxvt_term::bg_render ()
 {
-  unsigned long background_flags = 0;
+  unsigned long tr_flags = 0;
-  if (target == NULL)
-    return false;
-  invalidate ();
+  bg_invalidate ();
 # ifdef ENABLE_TRANSPARENCY
-  if (flags & isTransparent)
+  if (bg_flags & BG_IS_TRANSPARENT)
     {
       /*  we need to re-generate transparency pixmap in that case ! */
-      background_flags = make_transparency_pixmap ();
+      tr_flags = make_transparency_pixmap ();
-      if (background_flags == 0)
+      if (tr_flags == 0)
         return false;
-      else if ((background_flags & transpTransformations) == (flags & transpTransformations))
+      bg_flags |= BG_IS_VALID;
-        flags &= ~isInvalid;
     }
 # endif
 # ifdef BG_IMAGE_FROM_FILE
-  if (have_image
+  if ((bg_flags & BG_IS_FROM_FILE)
-      || (background_flags & transpTransformations) != (flags & transpTransformations))
+      || (tr_flags & BG_EFFECTS_FLAGS))
     {
-      if (render_image (background_flags))
+      if (render_image (tr_flags))
-        flags &= ~isInvalid;
+        bg_flags |= BG_IS_VALID;
     }
 # endif
 # if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
   XImage *result = NULL;
-  if (background_flags && (flags & isInvalid))
+  if (tr_flags & BG_NEEDS_TINT)
     {
-      result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
+      result = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
     }
   if (result)
     {
       /* our own client-side tinting */
-      if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
+      //if (tr_flags & BG_NEEDS_TINT)
+      if (1)
         {
           rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
-          if (flags & tintSet)
+          if (bg_flags & BG_TINT_SET)
             tint.get (c);
-          shade_ximage (DefaultVisual (target->dpy, target->display->screen), result, shade, c);
+          shade_ximage (DefaultVisual (dpy, display->screen), result, shade, c);
         }
-      GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
+      GC gc = XCreateGC (dpy, vt, 0UL, NULL);
       if (gc)
         {
-          XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
+          XPutImage (dpy, bg_pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
-          XFreeGC (target->dpy, gc);
+          XFreeGC (dpy, gc);
-          flags &= ~isInvalid;
         }
       XDestroyImage (result);
     }
 # endif
-  if (flags & isInvalid)
+  if (!(bg_flags & BG_IS_VALID))
     {
-      if (pixmap != None)
+      if (bg_pixmap != None)
         {
-          XFreePixmap (target->dpy, pixmap);
+          XFreePixmap (dpy, bg_pixmap);
-          pixmap = None;
+          bg_pixmap = None;
         }
     }
-  apply ();
+  scr_recolour (false);
+  bg_flags |= BG_NEEDS_REFRESH;
-  valid_since = ev::now ();
+  bg_valid_since = ev::now ();
   return true;
 }
 void
-bgPixmap_t::set_target (rxvt_term *new_target)
+rxvt_term::bg_init ()
 {
-  target = new_target;
+#ifdef ENABLE_TRANSPARENCY
+  shade = 100;
+#endif
-  flags &= ~(HAS_RENDER | HAS_RENDER_CONV);
+  bg_flags &= ~(BG_HAS_RENDER | BG_HAS_RENDER_CONV);
 #if XRENDER
   int major, minor;
-  if (XRenderQueryVersion (target->dpy, &major, &minor))
+  if (XRenderQueryVersion (dpy, &major, &minor))
-    flags |= HAS_RENDER;
+    bg_flags |= BG_HAS_RENDER;
-  XFilters *filters = XRenderQueryFilters (target->dpy, target->vt);
+  XFilters *filters = XRenderQueryFilters (dpy, vt);
   if (filters)
     {
       for (int i = 0; i < filters->nfilter; i++)
         if (!strcmp (filters->filter[i], FilterConvolution))
-          flags |= HAS_RENDER_CONV;
+          bg_flags |= BG_HAS_RENDER_CONV;
       XFree (filters);
     }
 #endif
 }
-void
-bgPixmap_t::apply ()
-{
-  if (target == NULL)
-    return;
-  if (pixmap != None)
-    {
-      /* set target's background to pixmap */
-# ifdef ENABLE_TRANSPARENCY
-      if (flags & isTransparent)
-        {
-          XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
-          XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
-          if (target->scrollBar.win)
-            XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
-        }
-      else
-# endif
-        {
-          /* force old pixmap dereference in case it was transparent before :*/
-          XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
-          XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
-          /* do we also need to set scrollbar's background here ? */
-          if (target->scrollBar.win)
-            XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
-        }
-    }
-  else
-    {
-      /* set target background to a pixel */
-      XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
-      XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
-      /* do we also need to set scrollbar's background here ? */
-      if (target->scrollBar.win)
-        XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
-    }
-  /* don't want Expose on the parent or vt. It is better to use
-     scr_touch or we get a great deal of flicker otherwise: */
-  XClearWindow (target->dpy, target->parent[0]);
-  if (target->scrollBar.state && target->scrollBar.win)
-    {
-      target->scrollBar.state = STATE_IDLE;
-      target->scrollBar.show (0);
-    }
-  target->want_refresh = 1;
-  flags |= hasChanged;
-}
 #endif /* HAVE_BG_PIXMAP */
 #if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
-/* taken from aterm-0.4.2 */
+/* based on code from aterm-0.4.2 */
+static inline void
+fill_lut (uint32_t *lookup, uint32_t mask, int sh, unsigned short low, unsigned short high)
+{
+  for (int i = 0; i <= mask >> sh; i++)
+    {
+      uint32_t tmp;
+      tmp = i * high;
+      tmp += (mask >> sh) * low;
+      lookup[i] = (tmp / 0xffff) << sh;
+    }
+}
 static void
 shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c)
 {
   int sh_r, sh_g, sh_b;
   uint32_t mask_r, mask_g, mask_b;
   uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
-  rgba low;
+  unsigned short low;
   rgba high;
-  int i;
-  int host_byte_order = byteorder::big_endian () ? MSBFirst : LSBFirst;
+  int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
   if (visual->c_class != TrueColor || ximage->format != ZPixmap) return;
   /* for convenience */
   mask_r = visual->red_mask;
       high.r = c.r * shade / 100;
       high.g = c.g * shade / 100;
       high.b = c.b * shade / 100;
-      low.r = 65535 * (100 - shade) / 100;
+      low = 0xffff * (100 - shade) / 100;
-      low.g = 65535 * (100 - shade) / 100;
-      low.b = 65535 * (100 - shade) / 100;
     }
   else
     {
       high.r = c.r * shade / 100;
       high.g = c.g * shade / 100;
       high.b = c.b * shade / 100;
-      low.r = low.g = low.b = 0;
+      low = 0;
     }
   /* fill our lookup tables */
-  for (i = 0; i <= mask_r>>sh_r; i++)
+  fill_lut (lookup_r, mask_r, sh_r, low, high.r);
-    {
+  fill_lut (lookup_g, mask_g, sh_g, low, high.g);
-      uint32_t tmp;
+  fill_lut (lookup_b, mask_b, sh_b, low, high.b);
-      tmp = i * high.r;
-      tmp += (mask_r>>sh_r) * low.r;
-      lookup_r[i] = (tmp/65535)<<sh_r;
-    }
-  for (i = 0; i <= mask_g>>sh_g; i++)
-    {
-      uint32_t tmp;
-      tmp = i * high.g;
-      tmp += (mask_g>>sh_g) * low.g;
-      lookup_g[i] = (tmp/65535)<<sh_g;
-    }
-  for (i = 0; i <= mask_b>>sh_b; i++)
-    {
-      uint32_t tmp;
-      tmp = i * high.b;
-      tmp += (mask_b>>sh_b) * low.b;
-      lookup_b[i] = (tmp/65535)<<sh_b;
-    }
   /* apply table to input image (replacing colors by newly calculated ones) */
   if (ximage->bits_per_pixel == 32
       && (ximage->depth == 24 || ximage->depth == 32)
       && ximage->byte_order == host_byte_order)

Diff Legend

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

Comparing rxvt-unicode/src/background.C (file contents): Revision 1.135 by sf-exg, Tue Jan 11 11:12:45 2011 UTC vs. Revision 1.180 by sf-exg, Sat Dec 24 09:44:23 2011 UTC

Diff Legend

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.135 by sf-exg, Tue Jan 11 11:12:45 2011 UTC vs.
Revision 1.180 by sf-exg, Sat Dec 24 09:44:23 2011 UTC