--- rxvt-unicode/src/rxvtimg.h	2012/06/04 18:17:25	1.10
+++ rxvt-unicode/src/rxvtimg.h	2012/06/07 06:08:10	1.16
@@ -7,13 +7,15 @@
 
 #if HAVE_IMG
 
+#define float_to_component(d) ((d) * 65535.99)
+
 #include <X11/extensions/Xrender.h>
 
 struct rxvt_img
 {
   rxvt_screen *s;
   Pixmap pm;
-  int w, h;
+  int x, y, w, h, repeat;
   XRenderPictFormat *format;
   bool shared; // true if we don't own it
 
@@ -31,19 +33,49 @@
   }
 
   // inplace
+  void move (int dx, int dy)
+  {
+    x += dx;
+    y += dy;
+  }
+
+  void repeat_mode (int repeat)
+  {
+    this->repeat = repeat;
+  }
+
   void unshare (); // create a copy of the pixmap if !shared
   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 *blur (int rh, int rv);
   rxvt_img *clone ();
-  rxvt_img *transform (int new_width, int new_height, int repeat, double matrix[9]);
+  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 repeat, int x, int y, double phi);
-  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