--- rxvt-unicode/src/perl/selection-popup	2006/01/09 02:06:43	1.3
+++ rxvt-unicode/src/perl/selection-popup	2006/01/18 10:11:03	1.12
@@ -1,11 +1,28 @@
 #! perl
 
+sub msg {
+   my ($self, $msg) = @_;
+
+   my $overlay = $self->overlay (0, 0, $self->strwidth ($msg), 1);
+   $overlay->set (0, 0, $msg);
+   my $iow; $iow = urxvt::timer->new->start (urxvt::NOW + 1)->cb (sub {
+      undef $overlay;
+      undef $iow;
+   });
+}
+
 sub on_start {
    my ($self) = @_;
 
+   $self->{browser} = $self->x_resource ("urlLauncher") || "x-www-browser";
+
    $self->grab_button (3, urxvt::ControlMask);
+
+   ()
 }
 
+our @hook;
+
 sub on_button_press {
    my ($self, $event) = @_;
 
@@ -28,17 +45,21 @@
 
          $popup->add_button ($title => sub {
             for ($text) {
+               my $orig = $_;
                $cb->();
-               $self->selection ($_);
+
+               if ($orig ne $_) {
+                  $self->selection ($_);
+                  s/[\x00-\x1f\x80-\x9f]/·/g;
+                  $self->msg ($self->special_encode ($_));
+               }
             }
          });
       };
 
       for ($text) {
          $add_button->("rot13" => sub { y/A-Za-z/N-ZA-Mn-za-m/ });
-
-         urxvt::safe
-            and $add_button->("eval perl expression" => sub { $_ = eval urxvt::untaint $_ });
+         $add_button->("eval perl expression" => sub { no warnings; $_ = eval $_ });
 
          /^(\S+):(\d+):?$/
             and $add_button->("vi-commands to load '$1'" => sub { s/^(\S+):(\d+):?$/\x1b:e $1\x0d:$2\x0d/ });
@@ -46,8 +67,23 @@
          /%[0-9a-fA-F]{2}/ && !/%[^0-9a-fA-F]/ && !/%.[^0-9a-fA-F]/
             and $add_button->("uri unescape" => sub { s/%([0-9a-fA-F]{2})/chr hex $1/ge });
 
+         /[\\"'\ \t|&;<>()]/
+            and $add_button->("shell quote" => sub { $_ = "\Q$_" });
+
          /^(http|ftp|telnet|irc|news):\//
-            and $add_button->("run x-www-browser" => sub { system "x-www-browser \Q$_\E &" });
+            and $add_button->("run $self->{browser}" => sub { urxvt::exec_async $self->{browser}, $_ });
+
+         for my $hook (@hook) {
+            if (my ($title, $cb) = $hook->($popup)) {
+               $add_button->($title, $cb);
+            }
+         }
+
+         if (/^\s*((?:0x)?\d+)\s*$/) {
+            $popup->add_title (sprintf "%20s", eval $1);
+            $popup->add_title (sprintf "%20s", sprintf "0x%x", eval $1);
+            $popup->add_title (sprintf "%20s", sprintf "0%o", eval $1);
+         }
       }
 
       $popup->show;