--- rxvt-unicode/src/rxvtperl.h 2006/01/07 19:29:17 1.13 +++ rxvt-unicode/src/rxvtperl.h 2006/01/25 00:42:21 1.21 @@ -6,18 +6,24 @@ #define RXVTPERL_H_ #if ENABLE_PERL -# define SHOULD_INVOKE(htype) rxvt_perl.should_invoke [htype] +# 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" enum data_type { - DT_END, + DT_END, // no further arguments DT_INT, DT_LONG, - DT_STR, - DT_STR_LEN, - DT_WCS_LEN, + DT_STR, // 0-terminates string + DT_STR_LEN, // string + length + DT_WCS_LEN, // wchar_t* + length + DT_LCS_LEN, // long* + length DT_XEVENT, }; @@ -32,16 +38,16 @@ { 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); };