--- rxvt-unicode/src/rxvtperl.h	2006/01/02 15:35:43	1.1
+++ rxvt-unicode/src/rxvtperl.h	2006/01/16 08:48:09	1.20
@@ -6,58 +6,56 @@
 #define RXVTPERL_H_
 
 #if ENABLE_PERL
+# define SHOULD_INVOKE(htype) \
+    (  (htype) == HOOK_INIT		\
+    || (htype) == HOOK_DESTROY		\
+    || (htype) == HOOK_REFRESH_BEGIN	\
+    || (htype) == HOOK_REFRESH_END	\
+    || perl.should_invoke [htype])
+# define HOOK_INVOKE(args) rxvt_perl.invoke args
 
 #include "rxvt.h"
 
-#define PERL_INVOKE(args) rxvt_perl.invoke args
-
 enum data_type {
-  DT_END,
+  DT_END,     // no further arguments
   DT_INT,
   DT_LONG,
+  DT_STR,     // 0-terminates string
+  DT_STR_LEN, // string + length
+  DT_WCS_LEN, // wstring + length
+  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,
 };
 
+struct rxvt_perl_term
+{
+  void *self;
+  unsigned long grabtime;
+  uint8_t should_invoke[HOOK_NUM];
+};
+
 struct rxvt_perl_interp
 {
-  rxvt_perl_interp ();
-  ~rxvt_perl_interp ();
+  char **perl_environ;
 
-  bool should_invoke[HOOK_NUM];
+  ~rxvt_perl_interp ();
 
-  void init ();
+  void init (rxvt_term *term);
   bool invoke (rxvt_term *term, hook_type htype, ...);
+  void line_update (rxvt_term *term);
 };
 
 extern struct rxvt_perl_interp rxvt_perl;
 
 #else
-#define PERL_INVOKE(args) (void)0
+# define SHOULD_INVOKE(htype) false
+# define HOOK_INVOKE(args) false
 #endif
 
 #endif