--- rxvt-unicode/src/rxvtperl.xs	2012/06/14 18:59:39	1.198
+++ rxvt-unicode/src/rxvtperl.xs	2014/05/18 18:09:52	1.223
@@ -59,6 +59,7 @@
 #if HAVE_PIXBUF
 typedef GdkPixbuf *	urxvt__pixbuf;
 #endif
+#if HAVE_IMG
 typedef rxvt_img *	urxvt__img;
 typedef rxvt_img::nv	rxvt_img__nv;
 
@@ -107,6 +108,7 @@
 }
 
 /////////////////////////////////////////////////////////////////////////////
+#endif
 
 static wchar_t *
 sv2wcs (SV *sv)
@@ -493,6 +495,20 @@
 }
 
 static void
+_keysym_resource_push (rxvt_term *term, const char *k, const char *v)
+{
+  dSP;
+  XPUSHs (sv_2mortal (newSVpv (v, 0)));
+  PUTBACK;
+}
+
+static void
+_keysym_resources (rxvt_term *term)
+{
+  term->enumerate_keysym_resources (_keysym_resource_push);
+}
+
+static void
 ungrab (rxvt_term *THIS)
 {
   if (THIS->perl.grabtime)
@@ -793,6 +809,10 @@
     IV iv;
   } *civ, const_iv[] = {
 #   define const_iv(name) { # name, (IV)name }
+    const_iv (HOOK_INIT),
+    const_iv (HOOK_DESTROY),
+    const_iv (HOOK_ACTION),
+
     const_iv (NUM_RESOURCES),
     const_iv (DEFAULT_RSTYLE),
     const_iv (OVERLAY_RSTYLE),
@@ -813,6 +833,18 @@
     const_iv (RS_RVid),
     const_iv (RS_Uline),
 
+    // TODO: should support all colour constants, create colorinc.h &c
+    const_iv (Color_fg),
+    const_iv (Color_bg),
+#if OFF_FOCUS_FADING
+    const_iv (Color_fade),
+#endif
+    const_iv (Color_pointer_fg),
+    const_iv (Color_pointer_bg),
+    const_iv (Color_border),
+    const_iv (NRS_COLORS),
+    const_iv (TOTAL_COLORS),
+
     const_iv (CurrentTime),
     const_iv (ShiftMask),
     const_iv (LockMask),
@@ -1177,6 +1209,13 @@
 	CODE:
         XrmPutStringResource (&THIS->option_db, specifier, value);
 
+void
+rxvt_term::_keysym_resources ()
+	PPCODE:
+        PUTBACK;
+        _keysym_resources (THIS);
+        SPAGAIN;
+
 int
 rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
 	CODE:
@@ -1456,6 +1495,13 @@
         OUTPUT:
         RETVAL
 
+Window
+rxvt_term::vt ()
+	CODE:
+        RETVAL = THIS->vt;
+        OUTPUT:
+        RETVAL
+
 void
 rxvt_term::vt_emask_add (U32 emask)
 	CODE:
@@ -1808,9 +1854,11 @@
         RETVAL
 
 bool
-rxvt_term::parse_keysym (char *keysym, char *str)
+rxvt_term::bind_action (char *keysym, char *str)
+        ALIAS:
+           parse_keysym = 1
 	CODE:
-        RETVAL = 0 < THIS->parse_keysym (keysym, str);
+        RETVAL = 0 < THIS->bind_action (keysym, str);
         THIS->keyboard->register_done ();
 	OUTPUT:
         RETVAL
@@ -1819,7 +1867,7 @@
 rxvt_term::register_command (int keysym, unsigned int state, SV *str)
         CODE:
         wchar_t *wstr = sv2wcs (str);
-        THIS->keyboard->register_user_translation (keysym, state, wstr);
+        THIS->keyboard->register_action (keysym, state, wstr);
         free (wstr);
 
 void
@@ -1872,7 +1920,7 @@
               {
                 THIS->selection.screen = THIS->current_screen;
 
-                THIS->want_refresh = 1;
+                THIS->selection_changed ();
                 THIS->refresh_check ();
               }
           }
@@ -1888,6 +1936,9 @@
         RETVAL
 
 void
+rxvt_term::selection_request (Time tm, int selnum)
+
+void
 rxvt_term::selection_clear (bool clipboard = false)
 
 void
@@ -1953,6 +2004,14 @@
 }
 
 void
+rxvt_term::tt_write_user_input (SV *octets)
+        INIT:
+          STRLEN len;
+          char *str = SvPVbyte (octets, len);
+	C_ARGS:
+          str, len
+
+void
 rxvt_term::tt_write (SV *octets)
         INIT:
           STRLEN len;
@@ -2157,7 +2216,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))
@@ -2196,23 +2255,22 @@
 
 #endif
 
-#if HAVE_BG_PIXMAP
-
 void
 rxvt_term::set_background (rxvt_img *img, bool border = false)
 	CODE:
-        THIS->bg_destroy ();
-        THIS->bg_flags &= ~(rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER | rxvt_term::BG_IS_TRANSPARENT);
+        delete THIS->bg_img;
+        THIS->bg_img = 0;
+        THIS->bg_flags = 0;
 
         if (img) // TODO: cannot be false
           {
             img = img->clone (); // own the img
 
             if (img->repeat != RepeatNormal) // X11 only supports RepeatNormal as bg pixmap
-                img->sub_rect (0, 0,
-                               border ? THIS->vt_width  : THIS->szHint.width,
-                               border ? THIS->vt_height : THIS->szHint.height)
-                   ->replace (img);
+              img->sub_rect (0, 0,
+                             border ? THIS->vt_width  : THIS->szHint.width,
+                             border ? THIS->vt_height : THIS->szHint.height)
+                 ->replace (img);
 
             // just in case, should usually be a nop
             img->reify ()
@@ -2230,8 +2288,6 @@
 
 #endif
 
-#endif
-
 #############################################################################
 # urxvt::overlay
 #############################################################################
@@ -2262,7 +2318,7 @@
 void
 DESTROY (urxvt::pixbuf self)
 	CODE:
-        gdk_pixbuf_unref (self);
+        g_object_unref (self);
 
 #endif
 
@@ -2284,29 +2340,19 @@
 
 int
 rxvt_img::x ()
+	ALIAS:
+        x = 0
+        y = 1
+        w = 2
+        h = 3
 	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;
+        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
 
@@ -2318,10 +2364,11 @@
         RETVAL
 
 void
-rxvt_img::fill (SV *c)
+rxvt_img::fill (SV *c, int x = 0, int y = 0, int w = THIS->w, int h = THIS->h)
+	PROTOTYPE: $;$$$$
 	INIT:
         rgba cc = parse_rgba (c, THIS->s);
-	C_ARGS: cc
+	C_ARGS: cc, x, y, w, h
 
 void
 rxvt_img::DESTROY ()
@@ -2329,11 +2376,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 +2398,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 ()
 
@@ -2361,6 +2414,9 @@
 rxvt_img::blur (int rh, int rv)
 
 rxvt_img *
+rxvt_img::muladd (rxvt_img::nv mul, rxvt_img::nv add)
+
+rxvt_img *
 rxvt_img::transform (rxvt_img::nv p11, rxvt_img::nv p12, rxvt_img::nv p13, rxvt_img::nv p21, rxvt_img::nv p22, rxvt_img::nv p23, rxvt_img::nv p31, rxvt_img::nv p32, rxvt_img::nv p33)
 	INIT:
         rxvt_img::nv matrix[3][3] = {
@@ -2376,5 +2432,37 @@
 rxvt_img *
 rxvt_img::rotate (int x, int y, rxvt_img::nv phi)
 
+rxvt_img *
+rxvt_img::tint (SV *c)
+	INIT:
+        rgba cc = parse_rgba (c, THIS->s);
+	C_ARGS: cc
+
+rxvt_img *
+rxvt_img::shade (rxvt_img::nv factor)
+
+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))
+	  {
+            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_img::nv *)malloc (nparams * sizeof (rxvt_img::nv));
+
+            for (int i = 0; i < nparams; ++i)
+              vparams [i] = SvNV (*av_fetch ((AV *)SvRV (params), i, 1));
+          }
+
+        RETVAL = THIS->filter (name, nparams, vparams);
+        free (vparams);
+	OUTPUT:
+        RETVAL
+
 #endif