*** empty log message ***

diff --git a/Changes b/Changes
index 1811dc7d606aa226e410e429dcaa7544da6bca0e..176b3e00eb9ddb8e633e4566ef6a59101be84abe 100644 (file)
--- a/Changes
+++ b/Changes
@@ -12,6 +12,7 @@ WISH: meta-tagging of data by regex/master process (obsoleted by embedded perl)
 WISH: OnTheSpot editing, or maybe switch to miiiiiiif
 WISH: just for fun, do shade and tint with XRender.
 
+TODO: document -pelr options/resources
        - optionally embed a perl interpreter, which can be used for more
           intelligent/customized selection support, visual feedback, menus
           etc. See the urxvtperl manpage.

diff --git a/src/rxvtperl.xs b/src/rxvtperl.xs
index 5be34cb0ebeb3260625d9dbfbfa586065a3e47f8..f04ce40eac9bbc0d05becb5ed725840629d0648a 100644 (file)
--- a/src/rxvtperl.xs
+++ b/src/rxvtperl.xs
@@ -210,21 +210,14 @@ rxvt_perl_interp::init ()
 bool
 rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
 {
-  if (!perl)
-    return false;
+  // INIT and DESTROY must be requested by the runtime
 
+  if (!perl || !should_invoke [htype])
+    return false;
+  
   if (htype == HOOK_INIT) // first hook ever called
     term->self = (void *)newSVptr ((void *)term, "urxvt::term");
-  else if (htype == HOOK_DESTROY)
-    {
-      // TODO: clear magic
-      hv_clear ((HV *)SvRV ((SV *)term->self));
-      SvREFCNT_dec ((SV *)term->self);
-    }
 
-  if (!should_invoke [htype])
-    return false;
-  
   dSP;
   va_list ap;
 
@@ -272,6 +265,13 @@ rxvt_perl_interp::invoke (rxvt_term *term, hook_type htype, ...)
             if (SvTRUE (ERRSV))
               rxvt_warn ("perl hook %d evaluation error: %s", htype, SvPV_nolen (ERRSV));
 
+            if (htype == HOOK_DESTROY)
+              {
+                // TODO: clear magic
+                hv_clear ((HV *)SvRV ((SV *)term->self));
+                SvREFCNT_dec ((SV *)term->self);
+              }
+
             return count;
           }
 

diff --git a/src/urxvt.pm b/src/urxvt.pm
index eabcb6c1c0c35bd1ef0aa8f18911c314256cb050..b1b0ab3ef2efc6a82772f1babc1ea40e5f2ba65d 100644 (file)
--- a/src/urxvt.pm
+++ b/src/urxvt.pm
@@ -33,7 +33,9 @@ terminals created with that specific option value.
 
 All objects (such as terminals, time watchers etc.) are typical
 reference-to-hash objects. The hash can be used to store anything you
-like. The only reserved member is C<_ptr>, which must not be changed.
+like. All members starting with an underscore (such as C<_ptr> or
+C<_hook>) are reserved for internal uses and must not be accessed or
+modified).
 
 When objects are destroyed on the C++ side, the perl object hashes are
 emptied, so its best to store related objects such as time watchers and
@@ -174,27 +176,30 @@ BEGIN {
    };
 }
 
-my $verbosity = $ENV{URXVT_PERL_VERBOSITY} || 10;
+my $verbosity = $ENV{URXVT_PERL_VERBOSITY};
 
 sub verbose {
    my ($level, $msg) = @_;
-   warn "$msg\n"; #d#
+   warn "$msg\n" if $level < $verbosity;
 }
 
-my @invoke_cb;
+my %hook_global;
+my @hook_count;
 
 # called by the rxvt core
 sub invoke {
    local $term = shift;
    my $htype = shift;
 
-   my $cb = $invoke_cb[$htype];
-
    verbose 10, "$HOOKNAME[$htype] (" . (join ", ", $term, @_) . ")"
       if $verbosity >= 10;
 
-   while (my ($k, $v) = each %$cb) {
-      return 1 if $v->($term, @_);
+   for my $cb ($hook_global{_hook}[$htype], $term->{_hook}[$htype]) {
+      $cb or next;
+
+      while (my ($k, $v) = each %$cb) {
+         return 1 if $v->($term, @_);
+      }
    }
 
    0
@@ -205,14 +210,15 @@ sub invoke {
 sub register_package($) {
    my ($pkg) = @_;
 
-   for my $hook (0.. $#HOOKNAME) {
-      my $name = $HOOKNAME[$hook];
+   for my $htype (0.. $#HOOKNAME) {
+      my $name = $HOOKNAME[$htype];
 
       my $ref = $pkg->can ("on_" . lc $name)
          or next;
 
-      $invoke_cb[$hook]{$ref*1} = $ref;
-      set_should_invoke $hook, 1;
+      $term->{_hook}[$htype]{$ref*1} = $ref;
+      $hook_count[$htype]++
+         or set_should_invoke $htype, 1;
    }
 }
 
@@ -220,7 +226,7 @@ my $script_pkg = "script0000";
 my %script_pkg;
 
 # load a single script into its own package, once only
-sub load_script($) {
+sub script_package($) {
    my ($path) = @_;
 
    $script_pkg{$path} ||= do {
@@ -235,10 +241,8 @@ sub load_script($) {
          . do { local $/; <$fh> }
          or die "$path: $@";
 
-      register_package $pkg;
-
       $pkg
-   };
+   }
 }
 
 sub load_scripts($) {
@@ -246,9 +250,9 @@ sub load_scripts($) {
 
    verbose 3, "loading scripts from '$dir'";
 
-   load_script $_
+   register_package script_package $_
       for grep -f $_,
-         <$dir/perl-ext/*>;
+         <$dir/*>;
 }
 
 sub on_init {
@@ -260,8 +264,24 @@ sub on_init {
       if defined $libdir;
 }
 
-register_package __PACKAGE__;
-load_scripts $LIBDIR;
+sub on_destroy {
+   my ($term) = @_;
+
+   my $hook = $term->{_hook}
+      or return;
+
+   for my $htype (0..$#$hook) {
+      $hook_count[$htype] -= scalar keys %{ $hook->[$htype] || {} }
+         or set_should_invoke $htype, 0;
+   }
+}
+
+{
+   local $term = \%hook_global;
+
+   register_package __PACKAGE__;
+   load_scripts "$LIBDIR/perl-ext";
+}
 
 =back