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

Comparing rxvt-unicode/src/rxvt.h (file contents):
Revision 1.489 by root, Mon May 28 16:40:03 2012 UTC vs.
Revision 1.493 by sf-exg, Thu May 31 20:23:51 2012 UTC

     environ = orig_env;
   }
 };
 #ifdef HAVE_BG_PIXMAP
+struct image_effects
+{
+  bool tint_set;
+  rxvt_color tint;
+  int shade;
+  int h_blurRadius, v_blurRadius;
+  image_effects ()
+  {
+    tint_set     =
+    h_blurRadius =
+    v_blurRadius = 0;
+    shade = 100;
+  }
+  bool need_tint ()
+  {
+    return shade != 100 || tint_set;
+  }
+  bool need_blur ()
+  {
+    return h_blurRadius && v_blurRadius;
+  }
+  bool set_tint (const rxvt_color &new_tint);
+  bool set_shade (const char *shade_str);
+  bool set_blur (const char *geom);
+};
 # ifdef BG_IMAGE_FROM_FILE
 enum {
   IM_IS_SET            = 1 << 0,
   IM_IS_SIZE_SENSITIVE = 1 << 1,
   IM_KEEP_ASPECT       = 1 << 2,
   defaultScale = windowScale,
   centerAlign = 50,
   defaultAlign = centerAlign,
 };
-struct rxvt_image
+struct rxvt_image : image_effects
 {
   unsigned short alpha;
   uint8_t flags;
   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 */
+  bool is_size_sensitive ()
+  {
+    return (!(flags & IM_TILE)
+            || h_scale || v_scale
+            || (!(flags & IM_ROOT_ALIGN) && (h_align || v_align)));
+  }
 #  ifdef HAVE_PIXBUF
   GdkPixbuf *pixbuf;
   void destroy ()
     BG_IS_TRANSPARENT    = 1 << 1,
     BG_NEEDS_REFRESH     = 1 << 2,
     BG_HAS_RENDER        = 1 << 3,
     BG_HAS_RENDER_CONV   = 1 << 4,
-    BG_CLIENT_RENDER     = 1 << 5,
-    BG_TINT_SET          = 1 << 6,
-    BG_TINT_BITAND       = 1 << 7,
   };
   uint8_t bg_flags;
 # ifdef BG_IMAGE_FROM_FILE
   void parse_image (int id, const char *type, const char *arg);
 # endif
 # ifdef ENABLE_TRANSPARENCY
   Pixmap      root_pixmap; /* current root pixmap set */
-  rxvt_color  tint;
+  image_effects root_effects;
-  int         shade;
-  int         h_blurRadius, v_blurRadius;
   void bg_set_transparent ()
   {
     bg_flags |= BG_IS_TRANSPARENT;
   }
   void bg_set_root_pixmap ();
-  bool bg_set_tint (rxvt_color &new_tint);
+  bool render_root_image ();
-  bool bg_set_shade (const char *shade_str);
-  bool bg_set_blur (const char *geom);
-  bool blur_pixmap (Pixmap pixmap, int width, int height);
-  bool tint_pixmap (Pixmap pixmap, int width, int height);
-  void tint_ximage (XImage *ximage);
-  bool make_transparency_pixmap ();
 # endif
+  bool blur_pixmap (Pixmap pixmap, int width, int height, bool argb, int h_blurRadius, int v_blurRadius);
+  bool tint_pixmap (Pixmap pixmap, int width, int height, bool argb, rxvt_color &tint, bool tint_set, int shade);
+  void tint_ximage (XImage *ximage, rxvt_color &tint, bool tint_set, int shade);
   ev_tstamp bg_valid_since;
   Pixmap bg_pixmap;
   unsigned int bg_pmap_width, bg_pmap_height;

Diff Legend

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

Comparing rxvt-unicode/src/rxvt.h (file contents): Revision 1.489 by root, Mon May 28 16:40:03 2012 UTC vs. Revision 1.493 by sf-exg, Thu May 31 20:23:51 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/rxvt.h (file contents):
Revision 1.489 by root, Mon May 28 16:40:03 2012 UTC vs.
Revision 1.493 by sf-exg, Thu May 31 20:23:51 2012 UTC