--- rxvt-unicode/src/rxvtimg.h	2012/06/04 15:53:12	1.9
+++ rxvt-unicode/src/rxvtimg.h	2012/06/07 10:22:55	1.20
@@ -7,18 +7,40 @@
 
 #if HAVE_IMG
 
+#define float_to_component(d) ((d) * 65535.99)
+
 #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;
-  int w, h;
+  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);
+  rxvt_img (const rxvt_img &img);
+
+  //rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap);
   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
 
@@ -26,23 +48,55 @@
 
   Pixmap steal ()
   {
-    shared = true;
+    ref->ours = false;
     return pm;
   }
 
   // inplace
-  void unshare (); // create a copy of the pixmap if !shared
+  void move (int dx, int dy)
+  {
+    x -= dx;
+    y -= dy;
+  }
+
+  void repeat_mode (int repeat)
+  {
+    this->repeat = repeat;
+  }
+
+  void unshare (); // prepare for write
   void fill (const rxvt_color &c);
-  void blur (int rh, int rv);
-  void brightness (double r, double g, double b, double a = 1.);
-  void contrast (double r, double g, double b, double a = 1.);
+  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 brightness (double r, double g, double b, double a = 1.)
+  {
+    brightness (float_to_component (r),
+                float_to_component (g),
+                float_to_component (b),
+                float_to_component (a));
+  }
+
+  void contrast (double r, double g, double b, double a = 1.)
+  {
+    contrast (float_to_component (r),
+              float_to_component (g),
+              float_to_component (b),
+              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 *transform (int new_width, int new_height, int repeat, double matrix[9]);
-  rxvt_img *convert_to (XRenderPictFormat *format);
+  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 *blend (rxvt_img *img, double factor);
 };
 
 #endif