--- rxvt-unicode/src/rxvtperl.h	2006/01/02 15:35:43	1.1
+++ rxvt-unicode/src/rxvtperl.h	2006/01/04 02:37:30	1.7
@@ -15,31 +15,14 @@
   DT_END,
   DT_INT,
   DT_LONG,
+  DT_STRING,
+  DT_XEVENT,
 };
 
 enum hook_type {
-  HOOK_LOAD,
-
-  HOOK_INIT,
-  HOOK_RESET,
-  HOOK_START,
-  HOOK_DESTROY,
-
-  HOOK_SEL_BEGIN,
-  HOOK_SEL_EXTEND,
-  HOOK_SEL_MAKE,
-  HOOK_SEL_GRAB,
-
-  HOOK_FOCUS_IN,
-  HOOK_FOCUS_OUT,
-
-  HOOK_VIEW_CHANGE,
-  HOOK_SCROLL_BACK,
-  HOOK_TTY_ACTIVITY,
-
-  HOOK_REFRESH_BEGIN,
-  HOOK_REFRESH_END,
-
+# define def(sym) HOOK_ ## sym,
+# include "hookinc.h"
+# undef def
   HOOK_NUM,
 };
 
@@ -57,7 +40,7 @@
 extern struct rxvt_perl_interp rxvt_perl;
 
 #else
-#define PERL_INVOKE(args) (void)0
+# define PERL_INVOKE(args) false
 #endif
 
 #endif