From: root <root>
Date: Sat, 4 Mar 2006 22:36:50 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=365d283ddb471b18d54c65a46cfc033aca68d86a;p=dana%2Furxvt.git

*** empty log message ***
---

diff --git a/Changes b/Changes
index e466e372..1a4a1f1e 100644
--- a/Changes
+++ b/Changes
@@ -21,6 +21,8 @@ DUMB: support tex fonts
 	- add FORCE_UNBUFFERED_XFT define to features.h.
 	- moved on_osc_seq to on_osc_seq_perl and added a more
           generic osc_seq.
+        - fix a bug causing double callback invocations when perl hooks
+          were invoked recursively.
 
 7.7  Tue Feb 21 12:32:49 CET 2006
 	- use double-buffered drawing (xft fonts only). On many driver/hardware
diff --git a/src/perl/automove-background b/src/perl/automove-background
index d6cc6d40..33793df5 100644
--- a/src/perl/automove-background
+++ b/src/perl/automove-background
@@ -5,13 +5,11 @@ sub on_osc_seq {
 
    if ($op == 20) {
       my ($pic, $commands) = split(/;/, $args, 2);
-      warn "   pic=$pic commands=$commands";
       if ($pic !~ /^$/ && $commands !~ /[+\-]/) {
          my ($x, $y) = $self->XTranslateCoordinates (
             $self->vt, $self->DefaultRootWindow,
             0, 0
          );
-         warn "      $x $y \\033]20;$pic;=+$x+$y\\007";
          $self->cmd_parse ("\033]20;$pic;=+$x+$y\007");
          return 1;
       }
diff --git a/src/urxvt.pm b/src/urxvt.pm
index 4b6ceff2..00789638 100644
--- a/src/urxvt.pm
+++ b/src/urxvt.pm
@@ -909,10 +909,8 @@ sub invoke {
       verbose 10, "$HOOKNAME[$htype] (" . (join ", ", $TERM, @_) . ")"
          if $verbosity >= 10;
 
-      keys %$cb;
-
-      while (my ($pkg, $cb) = each %$cb) {
-         my $retval_ = eval { $cb->($TERM->{_pkg}{$pkg}, @_) };
+      for my $pkg (keys %$cb) {
+         my $retval_ = eval { $cb->{$pkg}->($TERM->{_pkg}{$pkg}, @_) };
          $retval ||= $retval_;
 
          if ($@) {