--- rxvt-unicode/src/perl/selection-popup	2006/01/17 16:22:41	1.11
+++ rxvt-unicode/src/perl/selection-popup	2012/06/06 15:06:41	1.25
@@ -1,11 +1,13 @@
 #! perl
 
+#:META:X_RESOURCE:url-launcher:string:shell command to use
+
 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 {
+   my $iow; $iow = urxvt::timer->new->after (1)->cb (sub {
       undef $overlay;
       undef $iow;
    });
@@ -14,7 +16,7 @@
 sub on_start {
    my ($self) = @_;
 
-   $self->{browser} = $self->x_resource ("urlLauncher") || "x-www-browser";
+   $self->{browser} = $self->x_resource ("url-launcher") || "sensible-browser";
 
    $self->grab_button (3, urxvt::ControlMask);
 
@@ -56,10 +58,19 @@
       };
 
       for ($text) {
-         $add_button->("rot13" => sub { y/A-Za-z/N-ZA-Mn-za-m/ });
-         $add_button->("eval perl expression" => sub { no warnings; $_ = eval $_ });
+         /\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 $@ });
 
-         /^(\S+):(\d+):?$/
+         /./
+            and $add_button->((sprintf "to unicode hex index (%x)", ord) => sub { $_ = sprintf "%x", ord });
+
+         /(\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 +79,14 @@
          /[\\"'\ \t|&;<>()]/
             and $add_button->("shell quote" => sub { $_ = "\Q$_" });
 
-         /^(http|ftp|telnet|irc|news):\//
-            and $add_button->("run $self->{browser}" => sub { urxvt::exec_async $self->{browser}, $_ });
+         /^(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);