--- rxvt-unicode/src/rxvtimg.h	2012/06/06 20:20:23	1.14
+++ rxvt-unicode/src/rxvtimg.h	2012/06/15 19:50:56	1.40
@@ -1,51 +1,124 @@
-#ifndef IMG_H
+#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) (int32_t)((d) * 65535.99)
+
 #include <X11/extensions/Xrender.h>
 
 struct rxvt_img
 {
+  typedef double nv;
+
+  // *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, int repeat = RepeatNormal);
+  rxvt_img (const rxvt_img &img);
+  void alloc ();
+
+# 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
-  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 unshare (); // create a copy of the pixmap if !shared
-  void fill (const rxvt_color &c);
-  void brightness (double r, double g, double b, double a = 1.);
-  void contrast (double r, double g, double b, double a = 1.);
-  bool render_pixbuf (GdkPixbuf *pixbuf, int src_x, int src_y, int width, int height, int dst_x, int dst_y);
+  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 rgba &c);
+  void add_alpha ();
+  //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 (nv r, nv g, nv b, nv a = 1.)
+  {
+    brightness (float_to_component (r),
+                float_to_component (g),
+                float_to_component (b),
+                float_to_component (a));
+  }
+
+  void contrast (nv r, nv g, nv b, nv a = 1.)
+  {
+    contrast (float_to_component (r),
+              float_to_component (g),
+              float_to_component (b),
+              float_to_component (a));
+  }
+
+  void draw (rxvt_img *img, int op = PictOpOver, nv mask = 1.);
+#if 0
+  void draw (rxvt_img *img, int op = PictOpOver, nv mask = 1.,
+             nv px, nv py, nv qx, nv qy, nv rx, nv ry, nv sx, nv sy);
+#endif
 
   // 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, int repeat = RepeatNormal);
-  rxvt_img *transform (int new_width, int new_height, double matrix[9], int repeat = RepeatNormal);
+  rxvt_img *sub_rect (int x, int y, int width, int height);
+  rxvt_img *transform (const nv 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, int repeat = RepeatNormal);
-  rxvt_img *convert_to (XRenderPictFormat *format, const rxvt_color &bg);
-  rxvt_img *blend (rxvt_img *img, double factor);
+  rxvt_img *rotate (int cx, int cy, nv phi);
+  rxvt_img *convert_format (XRenderPictFormat *format, const rgba &bg);
+  rxvt_img *blend (rxvt_img *img, nv factor = 1.);
+
+  // egregiuous helper category
+  rxvt_img *replace (rxvt_img *&p)
+  {
+    delete p;
+    p = this;
+    return this;
+  }
+
+private:
+
+  void destroy ();
+  Picture picture ();
+  rxvt_img *transform (const nv *matrix);
 };
 
 #endif