--- rxvt-unicode/src/rxvtimg.h	2012/06/07 07:53:12	1.17
+++ rxvt-unicode/src/rxvtimg.h	2012/06/09 11:13:14	1.28
@@ -7,7 +7,7 @@
 
 #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>
 
@@ -15,36 +15,48 @@
 {
   void alloc ();
   void destroy ();
+  Picture src_picture ();
 
 public:
+  // *could* also hold the Pixmap itself
+  struct pixref
+  {
+    int cnt;
+    int w, h;
+    bool ours; // false if we don't own the pixmap at all
+
+    pixref (int w, int h)
+    : cnt(1), w(w), h(h), ours(true)
+    {
+    }
+  };
+
   rxvt_screen *s;
   Pixmap pm;
-  int *refcnt; // shared refcnt
+  pixref *ref; // shared refcnt
   int x, y, w, h, repeat;
   XRenderPictFormat *format;
 
-  rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int width, int height);
+  rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int x, int y, int width, int height, int repeat = RepeatNormal);
   rxvt_img (const rxvt_img &img);
 
-  //rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap);
+  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
   static rxvt_img *new_from_root (rxvt_screen *s); // get root pixmap
-  static rxvt_img *new_from_file (rxvt_screen *s, const char *filename); // from pixbuf
 
   ~rxvt_img ();
 
-  // TODO: steal should not do what it does, and this todo should be more specific
   Pixmap steal ()
   {
-    Pixmap retval = pm;
-    pm = None;
-    return retval;
+    ref->ours = false;
+    return pm;
   }
 
   // inplace
   void move (int dx, int dy)
   {
-    x += dx;
-    y += dy;
+    x -= dx;
+    y -= dy;
   }
 
   void repeat_mode (int repeat)
@@ -54,8 +66,11 @@
 
   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 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.)
   {
@@ -73,17 +88,24 @@
               float_to_component (a));
   }
 
-  bool render_pixbuf (GdkPixbuf *pixbuf, int src_x, int src_y, int width, int height, int dst_x, int dst_y);
-
   // copy
+  rxvt_img *reify (); // make x, y 0, make real width/height
   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 *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_to (XRenderPictFormat *format, const rxvt_color &bg);
+  rxvt_img *convert_format (XRenderPictFormat *format, const rxvt_color &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