--- rxvt-unicode/src/typemap	2006/01/02 17:50:53	1.1
+++ rxvt-unicode/src/typemap	2012/06/03 15:54:05	1.7
@@ -1,19 +1,34 @@
-rxvt_term *		T_TERM
-timer *			T_TIMER
-iow *			T_IOW
+overlay *		OVERLAY
+
+Time			T_UV
+Atom			T_UV
+Window			T_UV
+
+urxvt::pixbuf           T_PTROBJ
+urxvt::img              T_PTROBJ
+
+octet_string            OCTET_STRING
+utf8_string             UTF8_STRING
+
+rxvt_term *		TERM
+
+GError **		T_UV
 
 INPUT
-T_TERM
+
+TERM
 	$var = SvTERM ($arg);
-T_TIMER
-	$var = SvTIMER ($arg);
-T_IOW
-	$var = SvIOW ($arg);
+OVERLAY
+	$var = SvOVERLAY ($arg);
+
+OCTET_STRING
+        $var = SvPVbyte_nolen ($arg)
+
+UTF8_STRING
+        $var = SvPVutf8_nolen ($arg) /* imperfect, destroys references */
 
 OUTPUT
-T_TERM
+
+TERM
 	$arg = newSVterm ($var);
-T_TIMER
-	$arg = newSVtimer ($var);
-T_IOW
-	$arg = newSViow ($var);
+