--- rxvt-unicode/src/rxvtperl.xs	2011/12/06 11:29:52	1.147
+++ rxvt-unicode/src/rxvtperl.xs	2012/06/04 15:15:49	1.159
@@ -25,11 +25,12 @@
 #include <perl.h>
 #include <XSUB.h>
 #undef line_t
+#undef bool // perl defines it's own bool type, except with g++... what a trap
 
 #include "../config.h"
 
-#include <cstddef>
-#include <cstdarg>
+#include <stddef.h>
+#include <stdarg.h>
 
 #include "unistd.h"
 
@@ -50,6 +51,23 @@
 
 /////////////////////////////////////////////////////////////////////////////
 
+typedef char *		octet_string;
+typedef char *		utf8_string;
+
+typedef GdkPixbuf *	urxvt__pixbuf;
+typedef rxvt_img *	urxvt__img;
+
+/////////////////////////////////////////////////////////////////////////////
+
+static void
+parse_color (rxvt_screen *s, rxvt_color &c, SV *sv)
+{
+  //TODO: support component stuff
+  c.set (s, SvPVbyte_nolen (sv));
+}
+
+/////////////////////////////////////////////////////////////////////////////
+
 static wchar_t *
 sv2wcs (SV *sv)
 {
@@ -784,6 +802,17 @@
     const_iv (XIMVisibleToForward),
     const_iv (XIMVisibleToBackword),
     const_iv (XIMVisibleToCenter),
+#if HAVE_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),
     const_iv (XIMBackwardChar),
@@ -922,11 +951,10 @@
         rxvt_term *term = new rxvt_term;
 
 	stringvec *argv = new stringvec;
-	stringvec *envv = new stringvec;
-
         for (int i = 0; i <= AvFILL (arg); i++)
           argv->push_back (strdup (SvPVbyte_nolen (*av_fetch (arg, i, 1))));
 
+	stringvec *envv = new stringvec;
         for (int i = AvFILL (env) + 1; i--; )
           envv->push_back (strdup (SvPVbyte_nolen (*av_fetch (env, i, 1))));
 
@@ -1102,13 +1130,6 @@
 	OUTPUT:
         RETVAL
 
-char *
-rxvt_term::locale ()
-	CODE:
-        RETVAL = THIS->locale;
-	OUTPUT:
-        RETVAL
-
 #define TERM_OFFSET(sym) offsetof (TermWin_t, sym)
 
 #define TERM_OFFSET_width       TERM_OFFSET(width)
@@ -1553,7 +1574,7 @@
           {
             THIS->set_option (optval, set);
 
-            if (THIS->env_colorfgbg [0]) // avoid doing this before START
+            if (THIS->init_done) // avoid doing this before START
               switch (optval)
                 {
                   case Opt_skipBuiltinGlyphs:
@@ -1563,6 +1584,11 @@
                     THIS->want_refresh = 1;
                     THIS->refresh_check ();
                     break;
+#ifdef CURSOR_BLINK
+                  case Opt_cursorBlink:
+                    THIS->cursor_blink_reset ();
+                    break;
+#endif
 
                   case Opt_cursorUnderline:
                     THIS->want_refresh = 1;
@@ -1832,7 +1858,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 *
@@ -1843,7 +1869,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 ()
@@ -1905,6 +1931,42 @@
 }
 
 #############################################################################
+# fancy bg bloatstuff (TODO: should be moved up somewhere)
+
+#ifdef ENABLE_TRANSPARENCY
+
+#if 0
+
+rxvt_img *
+rxvt_term::new_img_from_root ()
+	CODE:
+        RETVAL = rxvt_img::new_from_root (THIS);
+	OUTPUT:
+        RETVAL
+
+#endif
+
+#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
+
+#############################################################################
 # urxvt::overlay
 #############################################################################
 
@@ -1924,3 +1986,70 @@
 
 INCLUDE: $PERL <iom_perl.xs -pe s/IOM_MODULE/urxvt/g,s/IOM_CLASS/urxvt/g |
 
+MODULE = urxvt             PACKAGE = urxvt::pixbuf	PREFIX = gdk_pixbuf_
+
+#if HAVE_PIXBUF
+
+urxvt::pixbuf gdk_pixbuf_new_from_file (SV *klass, octet_string filename)
+        C_ARGS: filename, 0
+
+void
+DESTROY (urxvt::pixbuf self)
+	CODE:
+        gdk_pixbuf_unref (self);
+
+#endif
+
+MODULE = urxvt             PACKAGE = urxvt::img
+
+#if HAVE_IMG
+
+# 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);
+
+void
+rxvt_img::fill (SV *c)
+	INIT:
+        rxvt_color rc;
+        parse_color (THIS->s, rc, c);
+	C_ARGS: rc
+
+void
+rxvt_img::DESTROY ()
+	CODE:
+        delete THIS;
+
+void
+rxvt_img::blur (int rh, int rv)
+
+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.)
+
+void
+rxvt_img::unshare ()
+
+rxvt_img *
+rxvt_img::clone ()
+
+rxvt_img *
+rxvt_img::scale (int new_width, int new_height)
+
+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 p23)
+	INIT:
+        double matrix[9] = {
+          p11, p12, p13,
+          p21, p22, p23,
+          p31, p32, p33
+        };
+	C_ARGS: new_width, new_height, repeat, matrix
+        
+
+#endif
+