--- rxvt-unicode/src/rxvtperl.xs	2012/06/14 18:59:39	1.198
+++ rxvt-unicode/src/rxvtperl.xs	2012/06/30 09:01:12	1.202
@@ -1456,6 +1456,13 @@
         OUTPUT:
         RETVAL
 
+Window
+rxvt_term::vt ()
+	CODE:
+        RETVAL = THIS->vt;
+        OUTPUT:
+        RETVAL
+
 void
 rxvt_term::vt_emask_add (U32 emask)
 	CODE:
@@ -2157,7 +2164,7 @@
 #if HAVE_IMG
 
 rxvt_img *
-rxvt_term::new_img (SV *format, int x = 0, int y = 0, int width = 1, int height = 1)
+rxvt_term::new_img (SV *format = &PL_sv_undef, int x = 0, int y = 0, int width = 1, int height = 1)
 	CODE:
         XRenderPictFormat *f = SvOK (format)
                              ? XRenderFindStandardFormat (THIS->dpy, SvIV (format))
@@ -2262,7 +2269,7 @@
 void
 DESTROY (urxvt::pixbuf self)
 	CODE:
-        gdk_pixbuf_unref (self);
+        g_object_unref (self);
 
 #endif
 
@@ -2284,29 +2291,19 @@
 
 int
 rxvt_img::x ()
-	CODE:
-        RETVAL = THIS->x;
-	OUTPUT:
-        RETVAL
-
-int
-rxvt_img::y ()
-	CODE:
-        RETVAL = THIS->y;
-	OUTPUT:
-        RETVAL
-
-int
-rxvt_img::w ()
-	CODE:
-        RETVAL = THIS->w;
-	OUTPUT:
-        RETVAL
-
-int
-rxvt_img::h ()
-	CODE:
-        RETVAL = THIS->h;
+	ALIAS:
+        x = 0
+        y = 1
+        w = 2
+        h = 3
+	CODE:
+        switch (ix)
+          {
+            case 0: RETVAL = THIS->x; break;
+            case 1: RETVAL = THIS->y; break;
+            case 2: RETVAL = THIS->w; break;
+            case 3: RETVAL = THIS->h; break;
+          }
 	OUTPUT:
         RETVAL
 
@@ -2329,11 +2326,14 @@
         delete THIS;
 
 void
+rxvt_img::add_alpha ()
+
+void
 rxvt_img::unshare ()
 
-int
+void
 rxvt_img::repeat_mode (render_repeat_mode repeat = 0)
-	CODE:
+	PPCODE:
         if (items >= 2)
           THIS->repeat_mode (repeat);
         if (GIMME_V != G_VOID)
@@ -2348,6 +2348,9 @@
 void
 rxvt_img::contrast (rxvt_img::nv r, rxvt_img::nv g, rxvt_img::nv b, rxvt_img::nv a = 1.)
 
+void
+rxvt_img::draw (rxvt_img *img, int op = PictOpOver, rxvt_img::nv mask = 1.);
+
 rxvt_img *
 rxvt_img::clone ()
 
@@ -2376,5 +2379,36 @@
 rxvt_img *
 rxvt_img::rotate (int x, int y, rxvt_img::nv phi)
 
+void
+rxvt_img::tint (SV *c)
+	INIT:
+        rgba cc = parse_rgba (c, THIS->s);
+	C_ARGS: cc
+
+rxvt_img *
+rxvt_img::filter (octet_string name, SV *params = &PL_sv_undef)
+	CODE:
+        rxvt_img::nv *vparams = 0;
+        int nparams = 0;
+
+        if (SvOK (params))
+	  {
+            // we overlay rxvt_temp_buf, what a hack
+            assert (sizeof (rxvt_img::nv) >= sizeof (int));
+
+            if (!SvROK (params) || SvTYPE (SvRV (params)) != SVt_PVAV)
+              croak ("rxvt_img::filter: params must be an array reference with parameter values");
+
+            nparams = av_len ((AV *)SvRV (params)) + 1;
+            vparams = rxvt_temp_buf<rxvt_img::nv> (nparams);
+
+            for (int i = 0; i < nparams; ++i)
+              vparams [i] = SvNV (*av_fetch ((AV *)SvRV (params), i, 1));
+          }
+
+        RETVAL = THIS->filter (name, nparams, vparams);
+	OUTPUT:
+        RETVAL
+
 #endif