--- rxvt-unicode/src/rxvtimg.h	2012/06/07 06:08:10	1.16
+++ rxvt-unicode/src/rxvtimg.h	2012/06/07 19:06:26	1.23
@@ -11,32 +11,53 @@
 
 #include <X11/extensions/Xrender.h>
 
-struct rxvt_img
+class rxvt_img
 {
+  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;
+  pixref *ref; // shared refcnt
   int x, y, w, h, repeat;
   XRenderPictFormat *format;
-  bool shared; // true if we don't own it
 
-  rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int width, int height);
-  rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap);
+  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 ();
 
   Pixmap steal ()
   {
-    shared = true;
+    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)
@@ -44,7 +65,7 @@
     this->repeat = repeat;
   }
 
-  void unshare (); // create a copy of the pixmap if !shared
+  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);
@@ -65,16 +86,15 @@
               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);
 };