--- rxvt-unicode/src/typemap	2006/01/20 10:27:08	1.3
+++ rxvt-unicode/src/typemap	2012/06/03 10:38:22	1.6
@@ -1,10 +1,7 @@
-rxvt_term *		T_TERM
+octet_string            T_OCTET_STRING
+utf8_string             T_UTF8_STRING
 
-perl_watcher *		T_WATCHER
-timer *			T_TIMER
-iow *			T_IOW
-pw *			T_PW
-iw *			T_IW
+rxvt_term *		T_TERM
 
 overlay *		T_OVERLAY
 
@@ -12,39 +9,26 @@
 Atom			T_UV
 Window			T_UV
 
-CHAINED			T_CHAINED
+urxvt::pixbuf           T_PTROBJ
+urxvt::img              T_PTROBJ
 
+GError **		T_UV
 
 INPUT
 
 T_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
 	$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);
-T_PW
-	$arg = newSVpw ($var);
-T_IW
-	$arg = newSViw ($var);
-T_CHAINED
-	$arg = newSVsv (ST(0));