--- rxvt-unicode/src/perl/selection-popup	2006/01/09 06:29:47	1.5
+++ rxvt-unicode/src/perl/selection-popup	2011/12/17 22:47:16	1.24
@@ -1,13 +1,11 @@
 #! perl
 
 sub msg {
-   my ($self, $msg1, $msg2) = @_;
+   my ($self, $msg) = @_;
 
-   my $overlay = $self->overlay (0, 0,
-      (List::Util::max map $self->strwidth ($_), $msg1, $msg2), 2);
-   $overlay->set (0, 0, $msg1);
-   $overlay->set (0, 1, $msg2);
-   my $iow; $iow = urxvt::timer->new->start (urxvt::NOW + 1)->cb (sub {
+   my $overlay = $self->overlay (0, 0, $self->strwidth ($msg), 1);
+   $overlay->set (0, 0, $msg);
+   my $iow; $iow = urxvt::timer->new->after (1)->cb (sub {
       undef $overlay;
       undef $iow;
    });
@@ -16,7 +14,11 @@
 sub on_start {
    my ($self) = @_;
 
+   $self->{browser} = $self->x_resource ("urlLauncher") || "sensible-browser";
+
    $self->grab_button (3, urxvt::ControlMask);
+
+   ()
 }
 
 sub on_button_press {
@@ -47,19 +49,26 @@
                if ($orig ne $_) {
                   $self->selection ($_);
                   s/[\x00-\x1f\x80-\x9f]/·/g;
-                  $self->msg ("Selection replaced by", $_);
+                  $self->msg ($self->special_encode ($_));
                }
             }
          });
       };
 
       for ($text) {
-         $add_button->("rot13" => sub { y/A-Za-z/N-ZA-Mn-za-m/ });
+         /\n/
+            and $add_button->("newlines to spaces" => sub { y/\n/ / });
+
+         /./
+            and $add_button->("rot13" => sub { y/A-Za-z/N-ZA-Mn-za-m/ });
+
+         /./
+            and $add_button->("eval perl expression" => sub { my $self = $self; no warnings; $_ = eval $_; $_ = "$@" if $@ });
 
-         urxvt::safe
-            and $add_button->("eval perl expression" => sub { $_ = eval urxvt::untaint $_ });
+         /./
+            and $add_button->((sprintf "to unicode hex index (%x)", ord) => sub { $_ = sprintf "%x", ord });
 
-         /^(\S+):(\d+):?$/
+         /(\S+):(\d+):?/
             and $add_button->("vi-commands to load '$1'" => sub { s/^(\S+):(\d+):?$/\x1b:e $1\x0d:$2\x0d/ });
 
          /%[0-9a-fA-F]{2}/ && !/%[^0-9a-fA-F]/ && !/%.[^0-9a-fA-F]/
@@ -68,8 +77,20 @@
          /[\\"'\ \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 &" });
+         /^(https?|ftp|telnet|irc|news):\//
+            and $add_button->("run $self->{browser}" => sub { $self->exec_async ($self->{browser}, $_) });
+
+         for my $hook (@{ $self->{term}{selection_popup_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;