--- rxvt-unicode/src/rxvtperl.xs	2012/06/03 18:04:44	1.158
+++ rxvt-unicode/src/rxvtperl.xs	2012/06/12 10:45:53	1.192
@@ -54,7 +54,11 @@
 typedef char *		octet_string;
 typedef char *		utf8_string;
 
+typedef int		render_repeat_mode;
+
+#if HAVE_PIXBUF
 typedef GdkPixbuf *	urxvt__pixbuf;
+#endif
 typedef rxvt_img *	urxvt__img;
 
 /////////////////////////////////////////////////////////////////////////////
@@ -62,7 +66,7 @@
 static void
 parse_color (rxvt_screen *s, rxvt_color &c, SV *sv)
 {
-  //TODO: support component stuff
+  //TODO: support component stuff, 0..1
   c.set (s, SvPVbyte_nolen (sv));
 }
 
@@ -341,7 +345,7 @@
 }
 
 void
-rxvt_perl_interp::init (rxvt_term *term)
+rxvt_perl_interp::init ()
 {
   if (!perl)
     {
@@ -381,8 +385,14 @@
 
       rxvt_pop_locale ();
     }
+}
 
-  if (perl)
+void
+rxvt_perl_interp::init (rxvt_term *term)
+{
+  init ();
+
+  if (perl && !term->perl.self)
     {
       // runs outside of perls ENV
       term->perl.self = (void *)newSVptr ((void *)term, "urxvt::term");
@@ -391,6 +401,61 @@
     }
 }
 
+void
+rxvt_perl_interp::eval (const char *str)
+{
+  eval_pv (str, 1);
+}
+
+void
+rxvt_perl_interp::usage (rxvt_term *term, int type)
+{
+  localise_env set_environ (perl_environ);
+
+  ENTER;
+  SAVETMPS;
+
+  dSP;
+  PUSHMARK (SP);
+  EXTEND (SP, 2);
+  PUSHs (sv_2mortal (newSVterm (term)));
+  PUSHs (sv_2mortal (newSViv (type)));
+  PUTBACK;
+  call_pv ("urxvt::usage", G_VOID | G_DISCARD);
+
+  FREETMPS;
+  LEAVE;
+}
+
+uint8_t
+rxvt_perl_interp::parse_resource (rxvt_term *term, const char *name, bool arg, bool longopt, bool flag, const char *value)
+{
+  localise_env set_environ (perl_environ);
+
+  ENTER;
+  SAVETMPS;
+
+  dSP;
+  PUSHMARK (SP);
+  EXTEND (SP, 6);
+  PUSHs (sv_2mortal (newSVterm (term)));
+  PUSHs (sv_2mortal (newSVpv (name, 0)));
+  PUSHs (arg     ? &PL_sv_yes : &PL_sv_no);
+  PUSHs (longopt ? &PL_sv_yes : &PL_sv_no);
+  PUSHs (flag    ? &PL_sv_yes : &PL_sv_no);
+  PUSHs (value ? sv_2mortal (newSVpv (value, 0)) : &PL_sv_undef);
+  PUTBACK;
+  call_pv ("urxvt::parse_resource", G_SCALAR);
+  SPAGAIN;
+
+  uint8_t ret = POPi;
+
+  FREETMPS;
+  LEAVE;
+
+  return ret;
+}
+
 static void
 ungrab (rxvt_term *THIS)
 {
@@ -431,8 +496,7 @@
 
   bool event_consumed;
 
-  if (htype == HOOK_INIT || htype == HOOK_DESTROY // must be called always
-      || term->perl.should_invoke [htype])
+  if (term->perl.should_invoke [htype])
     {
       dSP;
       va_list ap;
@@ -652,6 +716,7 @@
 
   dSP;
   XPUSHs (sv_2mortal (newSVpvn (data, len)));
+  PUTBACK;
   call_sv ((SV *)sel->cb_sv, G_VOID | G_DISCARD | G_EVAL);
 
   if (SvTRUE (ERRSV))
@@ -802,12 +867,16 @@
     const_iv (XIMVisibleToForward),
     const_iv (XIMVisibleToBackword),
     const_iv (XIMVisibleToCenter),
-#if HAVE_XRENDER
+#if XRENDER
     const_iv (PictStandardARGB32),
     const_iv (PictStandardRGB24),
     const_iv (PictStandardA8),
     const_iv (PictStandardA4),
     const_iv (PictStandardA1),
+    const_iv (RepeatNone),
+    const_iv (RepeatNormal),
+    const_iv (RepeatPad),
+    const_iv (RepeatReflect),
 #endif
 #   if 0
     const_iv (XIMForwardChar),
@@ -831,6 +900,11 @@
 }
 
 void
+log (const char *msg)
+	CODE:
+        rxvt_log ("%s", msg);
+
+void
 warn (const char *msg)
 	CODE:
         rxvt_warn ("%s", msg);
@@ -843,6 +917,22 @@
 void
 _exit (int status)
 
+void
+catch_fatal (SV *block)
+	PROTOTYPE: &
+        CODE:
+        try
+          {
+            PUSHMARK (SP);
+            PUTBACK;
+            call_sv (block, G_VOID | G_DISCARD);
+            SPAGAIN;
+          }
+        catch (const rxvt_failure_exception &e)
+          {
+            croak ("rxvt_fatal exception caught, trying to continue.");
+          }
+
 NV
 NOW ()
 	CODE:
@@ -976,7 +1066,24 @@
 void
 rxvt_term::set_should_invoke (int htype, int inc)
 	CODE:
-        THIS->perl.should_invoke [htype] += inc;
+        uint8_t &count = THIS->perl.should_invoke [htype];
+        uint8_t prev = count;
+        count += inc;
+        if (!prev != !count)
+	  {
+            // hook status changed, react
+            switch (htype)
+              {
+                case HOOK_POSITION_CHANGE:
+                  if (count)
+                    THIS->get_window_origin (THIS->parent_x, THIS->parent_y);
+              }
+	  }
+
+void
+rxvt_term::put_option_db (octet_string specifier, octet_string value)
+	CODE:
+        XrmPutStringResource (&THIS->option_db, specifier, value);
 
 int
 rxvt_term::grab_button (int button, U32 modifiers, Window window = THIS->vt)
@@ -1243,10 +1350,17 @@
         OUTPUT:
         RETVAL
 
-Window
-rxvt_term::vt ()
+int
+rxvt_term::parent_x ()
 	CODE:
-        RETVAL = THIS->vt;
+        RETVAL = THIS->parent_x;
+        OUTPUT:
+        RETVAL
+
+int
+rxvt_term::parent_y ()
+	CODE:
+        RETVAL = THIS->parent_y;
         OUTPUT:
         RETVAL
 
@@ -1732,6 +1846,9 @@
 rxvt_term::scr_bell ()
 
 void
+rxvt_term::scr_recolour (bool refresh = true);
+
+void
 rxvt_term::scr_change_screen (int screen)
 
 void
@@ -1854,7 +1971,7 @@
 }
 
 Atom
-XInternAtom (rxvt_term *term, char *atom_name, int only_if_exists = FALSE)
+XInternAtom (rxvt_term *term, octet_string atom_name, int only_if_exists = FALSE)
 	C_ARGS: term->dpy, atom_name, only_if_exists
 
 char *
@@ -1865,7 +1982,7 @@
 
 void
 XDeleteProperty (rxvt_term *term, Window window, Atom property)
-  	C_ARGS: term->dpy, window, property
+	C_ARGS: term->dpy, window, property
 
 Window
 rxvt_term::DefaultRootWindow ()
@@ -1929,19 +2046,98 @@
 #############################################################################
 # fancy bg bloatstuff (TODO: should be moved up somewhere)
 
-#ifdef ENABLE_TRANSPARENCY
+bool
+rxvt_term::has_render ()
+	CODE:
+        RETVAL = THIS->display->flags & DISPLAY_HAS_RENDER;
+	OUTPUT:
+        RETVAL
+
+void
+rxvt_term::background_geometry (bool border = false)
+	PPCODE:
+	EXTEND (SP, 4);
+        PUSHs (sv_2mortal (newSViv (THIS->parent_x + (border ? THIS->window_vt_x : 0))));
+        PUSHs (sv_2mortal (newSViv (THIS->parent_y + (border ? THIS->window_vt_y : 0))));
+        PUSHs (sv_2mortal (newSViv (border ? THIS->vt_width  : THIS->szHint.width )));
+        PUSHs (sv_2mortal (newSViv (border ? THIS->vt_height : THIS->szHint.height)));
+
+#if HAVE_IMG
+
+rxvt_img *
+rxvt_term::new_img (SV *format, int width = 1, int height = 1)
+	CODE:
+        XRenderPictFormat *f = SvOK (format)
+                             ? XRenderFindStandardFormat (THIS->dpy, SvIV (format))
+                             : XRenderFindVisualFormat   (THIS->dpy, THIS->visual);
+        RETVAL = new rxvt_img (THIS, f, 0, 0, width, height);
+        RETVAL->alloc ();
+	OUTPUT:
+        RETVAL
 
-# rxvt_img *
-# rxvt_term::new_root_img ()
-# 	CODE:
-#         RETVAL = rxvt_img::new_from_root (THIS);
-# 	OUTPUT:
-#         RETVAL
+#if ENABLE_TRANSPARENCY
+
+rxvt_img *
+rxvt_term::new_img_from_root ()
+	CODE:
+        RETVAL = rxvt_img::new_from_root (THIS);
+	OUTPUT:
+        RETVAL
 
 #endif
 
 #if HAVE_PIXBUF
 
+rxvt_img *
+rxvt_term::new_img_from_file (octet_string filename)
+	CODE:
+        try
+          {
+            RETVAL = rxvt_img::new_from_file (THIS, filename);
+          }
+        catch (const class rxvt_failure_exception &e)
+          {
+            croak ("new_img_from_file failed");
+          }
+	OUTPUT:
+        RETVAL
+
+#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);
+
+        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);
+
+            // just in case, should usually be a nop
+            img->reify ()
+               ->replace (img);
+
+            img->convert_format (XRenderFindVisualFormat (THIS->dpy, THIS->visual), THIS->pix_colors [Color_bg])
+               ->replace (img);
+
+            THIS->bg_img = img;
+            THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH | rxvt_term::BG_INHIBIT_RENDER;
+
+            if (!border)
+              THIS->bg_flags |= rxvt_term::BG_IS_TRANSPARENT;
+          }
+
+#endif
+
 #endif
 
 #############################################################################
@@ -1985,6 +2181,27 @@
 # rxvt_img *new (rxvt_screen *screen, XRenderPictFormat *format, int width, int height)
 # rxvt_img *rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap);
 
+int
+rxvt_img::w ()
+	CODE:
+        RETVAL = THIS->w;
+	OUTPUT:
+        RETVAL
+
+int
+rxvt_img::h ()
+	CODE:
+        RETVAL = THIS->h;
+	OUTPUT:
+        RETVAL
+
+Pixmap
+rxvt_img::pm ()
+	CODE:
+        RETVAL = THIS->pm;
+	OUTPUT:
+        RETVAL
+
 void
 rxvt_img::fill (SV *c)
 	INIT:
@@ -1993,22 +2210,57 @@
 	C_ARGS: rc
 
 void
-rxvt_img::blur (int rh, int rv)
+rxvt_img::DESTROY ()
+	CODE:
+        delete THIS;
 
 void
-rxvt_img::brightness (double r, double g, double b, double a = 1.)
+rxvt_img::unshare ()
+
+int
+rxvt_img::repeat_mode (render_repeat_mode repeat = 0)
+	CODE:
+        if (items >= 2)
+          THIS->repeat_mode (repeat);
+        if (GIMME_V != G_VOID)
+          XPUSHs (sv_2mortal (newSViv (THIS->repeat)));
 
 void
-rxvt_img::contrast (double r, double g, double b, double a = 1.)
+rxvt_img::move (int dx, int dy)
+
+void
+rxvt_img::brightness (NV r, NV g, NV b, NV a = 1.)
+
+void
+rxvt_img::contrast (NV r, NV g, NV b, NV a = 1.)
+
+rxvt_img *
+rxvt_img::clone ()
+
+rxvt_img *
+rxvt_img::reify ()
 
 rxvt_img *
-rxvt_img::copy ()
+rxvt_img::sub_rect (int x, int y, int width, int height)
+
+rxvt_img *
+rxvt_img::blur (int rh, int rv)
+
+rxvt_img *
+rxvt_img::transform (NV p11, NV p12, NV p13, NV p21, NV p22, NV p23, NV p31, NV p32, NV p33, int new_width = 0, int new_height = 0)
+	INIT:
+        double matrix[9] = {
+          p11, p12, p13,
+          p21, p22, p23,
+          p31, p32, p33
+        };
+	C_ARGS: matrix, new_width, new_height
 
 rxvt_img *
 rxvt_img::scale (int new_width, int new_height)
 
-# rxvt_img *
-# rxvt_img::transform (int new_width, int new_height, double matrix[16]);
+rxvt_img *
+rxvt_img::rotate (int x, int y, NV phi, int new_width = 0, int new_height = 0)
 
 #endif