--- rxvt-unicode/src/typemap	2006/01/03 04:18:47	1.2
+++ rxvt-unicode/src/typemap	2012/06/03 10:38:22	1.6
@@ -1,22 +1,34 @@
+octet_string            T_OCTET_STRING
+utf8_string             T_UTF8_STRING
+
 rxvt_term *		T_TERM
-timer *			T_TIMER
-iow *			T_IOW
+
 overlay *		T_OVERLAY
 
+Time			T_UV
+Atom			T_UV
+Window			T_UV
+
+urxvt::pixbuf           T_PTROBJ
+urxvt::img              T_PTROBJ
+
+GError **		T_UV
+
 INPUT
+
 T_TERM
 	$var = SvTERM ($arg);
-T_TIMER
-	$var = SvTIMER ($arg);
-T_IOW
-	$var = SvIOW ($arg);
 T_OVERLAY
 	$var = SvOVERLAY ($arg);
 
+T_OCTET_STRING
+        $var = SvPVbyte_nolen ($arg)
+
+T_UTF8_STRING
+        $var = SvPVutf8_nolen ($arg); // imperfect, destroys references
+
 OUTPUT
+
 T_TERM
 	$arg = newSVterm ($var);
-T_TIMER
-	$arg = newSVtimer ($var);
-T_IOW
-	$arg = newSViow ($var);
+