--- rxvt-unicode/src/rxvtimg.h	2012/06/07 19:06:26	1.23
+++ rxvt-unicode/src/rxvtimg.h	2012/06/14 17:06:57	1.33
@@ -1,19 +1,18 @@
 #ifndef IMG_H
 #define IMG_H
 
-#if HAVE_BG_PIXMAP && BG_IMAGE_FROM_FILE && ENABLE_TRANSPARENCY && HAVE_PIXBUF
+#if HAVE_BG_PIXMAP
   #define HAVE_IMG 1
 #endif
 
 #if HAVE_IMG
 
-#define float_to_component(d) ((d) * 65535.99)
+#define float_to_component(d) (int32_t)((d) * 65535.99)
 
 #include <X11/extensions/Xrender.h>
 
 class rxvt_img
 {
-  void alloc ();
   void destroy ();
   Picture src_picture ();
 
@@ -39,10 +38,12 @@
 
   rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int x, int y, int width, int height, int repeat = RepeatNormal);
   rxvt_img (const rxvt_img &img);
+  void alloc ();
 
-  //rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap);
+# if HAVE_PIXBUF
   static rxvt_img *new_from_pixbuf (rxvt_screen *s, GdkPixbuf *pb); // from pixbuf
   static rxvt_img *new_from_file (rxvt_screen *s, const char *filename); // via pixbuf
+# endif
   static rxvt_img *new_from_root (rxvt_screen *s); // get root pixmap
 
   ~rxvt_img ();
@@ -66,9 +67,12 @@
   }
 
   void unshare (); // prepare for write
-  void fill (const rxvt_color &c);
-  void brightness (unsigned short r, unsigned short g, unsigned short b, unsigned short a);
-  void contrast (unsigned short r, unsigned short g, unsigned short b, unsigned short a);
+  void fill (const rgba &c);
+  //void linear_gradient  (const XLinearGradient  *gradient, const XFixed *stops, const XRenderColor *colors, int nstops);
+  //void radial_gradient  (const XRadialGradient  *gradient, const XFixed *stops, const XRenderColor *colors, int nstops);
+  //void conical_gradient (const XConicalGradient *gradient, const XFixed *stops, const XRenderColor *colors, int nstops);
+  void brightness (int32_t r, int32_t g, int32_t b, int32_t a);
+  void contrast (int32_t r, int32_t g, int32_t b, int32_t a);
 
   void brightness (double r, double g, double b, double a = 1.)
   {
@@ -91,11 +95,19 @@
   rxvt_img *blur (int rh, int rv);
   rxvt_img *clone ();
   rxvt_img *sub_rect (int x, int y, int width, int height);
-  rxvt_img *transform (int new_width, int new_height, double matrix[9]);
+  rxvt_img *transform (double matrix[3][3]);
   rxvt_img *scale (int new_width, int new_height);
-  rxvt_img *rotate (int new_width, int new_height, int x, int y, double phi);
-  rxvt_img *convert_format (XRenderPictFormat *format, const rxvt_color &bg);
+  rxvt_img *rotate (int cx, int cy, double phi);
+  rxvt_img *convert_format (XRenderPictFormat *format, const rgba &bg);
   rxvt_img *blend (rxvt_img *img, double factor);
+
+  // egregiuous helper category
+  rxvt_img *replace (rxvt_img *&p)
+  {
+    delete p;
+    p = this;
+    return this;
+  }
 };
 
 #endif