--- rxvt-unicode/src/background.h	2008/11/04 13:20:40	1.16
+++ rxvt-unicode/src/background.h	2011/01/09 23:48:37	1.39
@@ -11,6 +11,10 @@
 # undef max
 #endif
 
+#ifdef HAVE_PIXBUF
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#endif
+
 #if defined(BG_IMAGE_FROM_FILE) || defined(ENABLE_TRANSPARENCY)
 # define HAVE_BG_PIXMAP 1 /* to simplify further usage */
 struct bgPixmap_t
@@ -19,24 +23,24 @@
   void destroy ();
 
   enum {
-    geometrySet     = 1 <<  0,
     propScale       = 1 <<  1,
-    geometryFlags   = geometrySet | propScale,
+    rootAlign       = 1 <<  2,
+    geometryFlags   = propScale | rootAlign,
 
     tintSet         = 1 <<  8,
     tintNeeded      = 1 <<  9,
     tintWholesome   = 1 << 10,
-    tintServerSide  = 1 << 11,
-    tintFlags       = tintSet | tintServerSide | tintNeeded | tintWholesome,
+    tintFlags       = tintSet | tintNeeded | tintWholesome,
 
-    blurNeeded      = 1 << 12,
-    blurServerSide  = 1 << 13, /* this doesn't work yet */
+    blurNeeded      = 1 << 11,
+
+    HAS_RENDER      = 1 << 12,
+    HAS_RENDER_CONV = 1 << 13,
 
     isTransparent   = 1 << 16,
     isInvalid       = 1 << 17,
-    isVtOrigin      = 1 << 18,  /* if set pixmap has origin at corner of
-                                   vt window instead of parent[0]! */
     hasChanged      = 1 << 19,
+    sizeSensitive   = 1 << 20,
   };
 
   unsigned int flags;
@@ -44,55 +48,51 @@
   enum {
     transpPmapTiled       = 1 << 0,
     transpPmapTinted      = tintNeeded,
-    transpPmapBlured      = blurNeeded,
+    transpPmapBlurred     = blurNeeded,
     transpTransformations = tintNeeded | blurNeeded,
   }; /* these flags are returned by make_transparency_pixmap if called */
 
-  bool check_clearChanged ()
-  {
-    bool r = flags & hasChanged;
-    flags &= ~hasChanged;
-    return r;
-  };
-
 # ifdef  BG_IMAGE_FROM_FILE
 #  ifdef HAVE_AFTERIMAGE
   ASImage *original_asim;
-  bool render_asim (ASImage *background, ARGB32 background_tint);
 #  endif
 
+#  ifdef HAVE_PIXBUF
+  GdkPixbuf *pixbuf;
+  bool pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
+                         int src_x, int src_y, int dst_x, int dst_y,
+                         unsigned int width, unsigned int height);
+#  endif
+
+  void get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y);
+  bool render_image (unsigned long background_flags);
+  bool have_image;
+
   enum {
     noScale = 0,
     windowScale = 100,
     defaultScale = windowScale,
     centerAlign = 50,
     defaultAlign = centerAlign,
-    rootAlign = -10000
   };
 
   unsigned int h_scale, v_scale;/* percents of the window size */
   int h_align, v_align;         /* percents of the window size:
                                   0 - left align, 50 - center, 100 - right */
-  void unset_geometry ()
-  {
-    flags = flags & ~geometryFlags;
-  };
-  bool set_geometry (const char *geom);
+  bool set_geometry (const char *geom, bool update = false);
   void set_defaultGeometry ()
   {
     h_scale = v_scale = defaultScale;
     h_align = v_align = defaultAlign;
-    flags |= geometrySet;
-  };
+  }
 
   bool set_file (const char *file);
 # endif /* BG_IMAGE_FROM_FILE */
 
   rxvt_term *target;
-  bool set_target (rxvt_term *new_target);
+  void set_target (rxvt_term *new_target);
 
 # ifdef ENABLE_TRANSPARENCY
-  int         root_depth; /* obtained when target is set */
   Pixmap      root_pixmap; /* current root pixmap set */
   rxvt_color  tint;
   int         shade;
@@ -101,9 +101,10 @@
   bool set_transparent ();
   bool set_blur_radius (const char *geom);
   bool set_tint (rxvt_color &new_tint);
-  bool unset_tint ();
   bool set_shade (const char *shade_str);
-  bool set_root_pixmap ();
+  bool blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height);
+  bool tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height);
+  void set_root_pixmap ();
 
   unsigned long make_transparency_pixmap ();/* returns combination of the transpTransformations flags */
 # endif
@@ -113,14 +114,12 @@
   unsigned int pmap_width, pmap_height;
   unsigned int pmap_depth;
 
+  int target_x;
+  int target_y;
+  bool set_position (int x, int y);
   bool window_size_sensitive ();
   bool window_position_sensitive ();
 
-  bool is_parentOrigin ()
-  {
-    return !(flags & isVtOrigin);
-  };
-
   bool need_client_side_rendering ();
   void apply ();
   bool render ();
@@ -131,7 +130,7 @@
         flags |= isInvalid;
         invalid_since = ev::now ();
       }
-  };
+  }
 };
 #else
 # undef HAVE_BG_PIXMAP