--- rxvt-unicode/src/rxvtperl.h	2006/01/16 08:48:09	1.20
+++ rxvt-unicode/src/rxvtperl.h	2012/06/12 10:45:53	1.28
@@ -6,23 +6,23 @@
 #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 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
 
 enum data_type {
   DT_END,     // no further arguments
   DT_INT,
   DT_LONG,
-  DT_STR,     // 0-terminates string
+  DT_STR,     // 0-terminated string
   DT_STR_LEN, // string + length
-  DT_WCS_LEN, // wstring + length
+  DT_WCS_LEN, // wchar_t* + length
+  DT_LCS_LEN, // long* + length
   DT_XEVENT,
 };
 
@@ -38,6 +38,13 @@
   void *self;
   unsigned long grabtime;
   uint8_t should_invoke[HOOK_NUM];
+
+  // this object must be zero-initialised
+  rxvt_perl_term ()
+  {
+    should_invoke [HOOK_INIT]     =
+    should_invoke [HOOK_DESTROY]  = 1;
+  }
 };
 
 struct rxvt_perl_interp
@@ -46,16 +53,29 @@
 
   ~rxvt_perl_interp ();
 
+  void init ();
   void init (rxvt_term *term);
+  void eval (const char *str);
   bool invoke (rxvt_term *term, hook_type htype, ...);
   void line_update (rxvt_term *term);
+  void selection_finish (rxvt_selection *sel, char *data, unsigned int len);
+  void usage (rxvt_term *term, int type);
+
+  enum
+  {
+    RESOURCE_AVAILABLE = 1, // whether the option is valid
+    RESOURCE_ARG       = 2  // whether the option eats the next arg
+  };
+  uint8_t parse_resource (rxvt_term *term, const char *name, bool arg, bool longopt, bool flag, const char *value);
 };
 
 extern struct rxvt_perl_interp rxvt_perl;
 
 #else
-# define SHOULD_INVOKE(htype) false
-# define HOOK_INVOKE(args) false
+
+#define SHOULD_INVOKE(htype) false
+#define HOOK_INVOKE(args) false
+
 #endif
 
 #endif