--- rxvt-unicode/src/typemap	2006/01/20 10:27:08	1.3
+++ rxvt-unicode/src/typemap	2012/06/03 15:54:05	1.7
@@ -1,50 +1,34 @@
-rxvt_term *		T_TERM
-
-perl_watcher *		T_WATCHER
-timer *			T_TIMER
-iow *			T_IOW
-pw *			T_PW
-iw *			T_IW
-
-overlay *		T_OVERLAY
+overlay *		OVERLAY
 
 Time			T_UV
 Atom			T_UV
 Window			T_UV
 
-CHAINED			T_CHAINED
+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_WATCHER
-	$var = SvWATCHER ($arg);
-T_TIMER
-	$var = SvTIMER ($arg);
-T_IOW
-	$var = SvIOW ($arg);
-T_PW
-	$var = SvPW ($arg);
-T_IW
-	$var = SvIW ($arg);
-T_OVERLAY
+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);
-T_PW
-	$arg = newSVpw ($var);
-T_IW
-	$arg = newSViw ($var);
-T_CHAINED
-	$arg = newSVsv (ST(0));