*** empty log message ***

diff --git a/MANIFEST b/MANIFEST
index fd2c0f0e7734b4fc176629c04865a704cc2b8f97..21f3fdb78a8eeb726f4b5b03f151e19def3cc49e 100644 (file)
--- a/MANIFEST
+++ b/MANIFEST
@@ -174,6 +174,8 @@ src/rxvtperl.xs
 src/perl/example-refresh-hooks
 src/perl/block-graphics-to-ascii
 src/perl/digital-clock
+src/perl/option-popup
+src/perl/urxvt-popup
 src/perl/selection
 src/perl/mark-urls
 

diff --git a/src/perl/option-popup b/src/perl/option-popup
index d5166027c0350b822f68853fdfdd4a6e79ad4b4b..92da3d49494fe3e6364f17ca38cd2fc3dc5da7b7 100644 (file)
--- a/src/perl/option-popup
+++ b/src/perl/option-popup
@@ -16,7 +16,7 @@ sub on_button_press {
 
          my $optval = $urxvt::OPTION{$name};
 
-         $popup->add_toggle ($name => sub { $self->option ($optval, $_[0]); warn "toggle $optval, $_[0]" },
+         $popup->add_toggle ($name => sub { $self->option ($optval, $_[0]) },
                              $self->option ($optval));
       }
 

diff --git a/src/perl/urxvt-popup b/src/perl/urxvt-popup
index 259544760298b0226509b86436787c5761b564f2..f213aeb48470cd4a7f42051c9c68e83bddd08b13 100644 (file)
--- a/src/perl/urxvt-popup
+++ b/src/perl/urxvt-popup
@@ -30,7 +30,7 @@ sub on_motion_notify {
    my ($self, $event) = @_;
 
    $self->{hover} = $event->{row} + 1;
-   refresh $self;
+   $self->refresh;
 
    1
 }
@@ -39,7 +39,7 @@ sub on_button_press {
    my ($self, $event) = @_;
 
    $self->{press}[$event->{button}] = 1;
-   refresh $self;
+   $self->refresh;
 
    1
 }
@@ -57,13 +57,13 @@ sub on_button_release {
 
    $self->{press}[$event->{button}] = 0;
 
-   refresh $self;
-
    if ($col >= 0 && $col < $self->ncol
        && $row >= 0 && $row < @{ $self->{data}{item} }) {
       $self->{data}{item}[$row]{activate}->($event);
    }
 
+   $self->refresh;
+
    1
 }
 
@@ -71,7 +71,7 @@ sub on_focus_out {
    my ($self) = @_;
 
    delete $self->{hover};
-   refresh $self;
+   $self->refresh;
 
    ()
 }

diff --git a/src/urxvt.pm b/src/urxvt.pm
index 22aad3c141deee4f12e3941e62dd2eb55d250452..dc1de30bdd1836ea96eed43219ed47f2128ef0cf 100644 (file)
--- a/src/urxvt.pm
+++ b/src/urxvt.pm
@@ -487,8 +487,8 @@ sub invoke {
 
       for (map { split /,/, $TERM->resource ("perl_ext_$_") } 1, 2) {
          if ($_ eq "default") {
-            $want_ext{$_}++ for qw(selection);
-         } elsif (/-(.*)/) {
+            $want_ext{$_}++ for qw(selection option-popup);
+         } elsif (/^-(.*)$/) {
             delete $want_ext{$1};
          } else {
             $want_ext{$_}++;