--- rxvt-unicode/src/rxvtperl.xs	2012/06/04 15:43:22	1.161
+++ rxvt-unicode/src/rxvtperl.xs	2012/06/06 20:55:37	1.175
@@ -54,6 +54,8 @@
 typedef char *		octet_string;
 typedef char *		utf8_string;
 
+typedef int		render_repeat_mode;
+
 typedef GdkPixbuf *	urxvt__pixbuf;
 typedef rxvt_img *	urxvt__img;
 
@@ -391,6 +393,55 @@
     }
 }
 
+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 +482,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 +702,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,7 +853,7 @@
     const_iv (XIMVisibleToForward),
     const_iv (XIMVisibleToBackword),
     const_iv (XIMVisibleToCenter),
-#if HAVE_XRENDER
+#if XRENDER
     const_iv (PictStandardARGB32),
     const_iv (PictStandardRGB24),
     const_iv (PictStandardA8),
@@ -835,6 +886,11 @@
 }
 
 void
+log (const char *msg)
+	CODE:
+        rxvt_log ("%s", msg);
+
+void
 warn (const char *msg)
 	CODE:
         rxvt_warn ("%s", msg);
@@ -847,6 +903,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:
@@ -980,7 +1052,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)
@@ -1247,10 +1336,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
 
@@ -1936,9 +2032,29 @@
 #############################################################################
 # fancy bg bloatstuff (TODO: should be moved up somewhere)
 
-#if ENABLE_TRANSPARENCY
+# TODO: ugly
+void
+rxvt_term::get_geometry ()
+	PPCODE:
+	EXTEND (SP, 4);
+        PUSHs (sv_2mortal (newSViv (THIS->parent_x)));
+        PUSHs (sv_2mortal (newSViv (THIS->parent_y)));
+        PUSHs (sv_2mortal (newSViv (THIS->szHint.width)));
+        PUSHs (sv_2mortal (newSViv (THIS->szHint.height)));
 
-#if 0
+#if HAVE_IMG
+
+rxvt_img *
+rxvt_term::new_img (SV *format, int width, int height)
+	CODE:
+        XRenderPictFormat *f = SvOK (format)
+                             ? XRenderFindStandardFormat (THIS->dpy, SvIV (format))
+                             : XRenderFindVisualFormat   (THIS->dpy, THIS->visual);
+        RETVAL = new rxvt_img (THIS, f, width, height);
+	OUTPUT:
+        RETVAL
+
+#if ENABLE_TRANSPARENCY
 
 rxvt_img *
 rxvt_term::new_img_from_root ()
@@ -1949,8 +2065,6 @@
 
 #endif
 
-#endif
-
 #if HAVE_PIXBUF
 
 rxvt_img *
@@ -1980,14 +2094,24 @@
 
         if (img) // TODO: cannot be false
           {
+            XRenderPictFormat *f = XRenderFindVisualFormat (THIS->dpy, THIS->visual);
+            rxvt_img *img2 = 0;
+
+            if (f != img->format)
+              img = img2 = img->convert_to (f, THIS->pix_colors [Color_bg]);
+
             img->unshare ();
             THIS->bg_pixmap = img->steal ();
             THIS->bg_flags |= rxvt_term::BG_NEEDS_REFRESH;
             THIS->bg_valid_since = ev::now (); // TODO: extra bloat
+
+            delete img2;
           }
 
 #endif
 
+#endif
+
 #############################################################################
 # urxvt::overlay
 #############################################################################
@@ -2029,6 +2153,34 @@
 # 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
+
+bool
+rxvt_img::shared ()
+	CODE:
+        RETVAL = THIS->shared;
+	OUTPUT:
+        RETVAL
+
+Pixmap
+rxvt_img::pm ()
+	CODE:
+        RETVAL = THIS->pm;
+	OUTPUT:
+        RETVAL
+
 void
 rxvt_img::fill (SV *c)
 	INIT:
@@ -2041,7 +2193,7 @@
 	CODE:
         delete THIS;
 
-void
+rxvt_img *
 rxvt_img::blur (int rh, int rv)
 
 void
@@ -2057,17 +2209,23 @@
 rxvt_img::clone ()
 
 rxvt_img *
-rxvt_img::scale (int new_width, int new_height)
+rxvt_img::sub_rect (int x, int y, int width, int height, render_repeat_mode repeat = RepeatNormal)
 
 rxvt_img *
-rxvt_img::transform (int new_width, int new_height, int repeat, NV p11, NV p12, NV p13, NV p21, NV p22, NV p23, NV p31, NV p32, NV p33)
+rxvt_img::transform (int new_width, int new_height, NV p11, NV p12, NV p13, NV p21, NV p22, NV p23, NV p31, NV p32, NV p33, render_repeat_mode repeat = RepeatNormal)
 	INIT:
         double matrix[9] = {
           p11, p12, p13,
           p21, p22, p23,
           p31, p32, p33
         };
-	C_ARGS: new_width, new_height, repeat, matrix
+	C_ARGS: new_width, new_height, matrix, repeat
+
+rxvt_img *
+rxvt_img::scale (int new_width, int new_height)
+
+rxvt_img *
+rxvt_img::rotate (int new_width, int new_height, int x, int y, NV phi, render_repeat_mode repeat = RepeatNormal)
 
 #endif