--- rxvt-unicode/src/perl/urxvt-popup	2006/01/07 21:22:02	1.4
+++ rxvt-unicode/src/perl/urxvt-popup	2006/01/08 00:29:38	1.7
@@ -3,8 +3,6 @@
 # this extension implements popup-menu functionality for urxvt. it works
 # together with the urxvt::popup class.
 
-use List::Util;
-
 sub refresh {
    my ($self) = @_;
 
@@ -18,7 +16,9 @@
          $rend = $self->{press} ? "\x1b[m" : "\x1b[30;46m";
       }
 
-      $cmd .= "$rend\x1b[K" . $self->locale_encode ($item->{text}) . "\015\012";
+      $cmd .= "$rend\x1b[K";
+      $cmd .= $self->locale_encode ($item->{render}->($item));
+      $cmd .= "\015\012";
 
       $row++;
    }
@@ -57,16 +57,11 @@
 
    $self->{press}[$event->{button}] = 0;
 
-   if ($event->{button} == 1) {
-      refresh $self;
-
-      warn "$event->{row} $event->{col}\n";#d#
+   refresh $self;
 
-      if ($col >= 0 && $col < $self->ncol
-          && $row >= 0 && $row < @{ $self->{data}{item} }) {
-         $self->{data}{item}[$row]{activate}->($event);
-         print "ok\n";
-      }
+   if ($col >= 0 && $col < $self->ncol
+       && $row >= 0 && $row < @{ $self->{data}{item} }) {
+      $self->{data}{item}[$row]{activate}->($event);
    }
 
    1