--- rxvt-unicode/src/perl/selection-autotransform	2006/01/13 04:19:41	1.3
+++ rxvt-unicode/src/perl/selection-autotransform	2012/06/06 15:06:41	1.9
@@ -1,11 +1,13 @@
 #! perl
 
+#:META:X_RESOURCE:%.:string:autotransform expression
+
 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 + 2)->cb (sub {
+   my $iow; $iow = urxvt::timer->new->after (2)->cb (sub {
       undef $overlay;
       undef $iow;
    });
@@ -14,12 +16,8 @@
 sub on_init {
    my ($self) = @_;
 
-   unless (urxvt::safe) {
-      warn "running with elevated privileges, ignoring selection-autotransform patterns";
-      return;
-   }
-
-   for (my $idx = 0; defined (my $res = urxvt::untaint $self->x_resource ("selection-autotransform.$idx")); $idx++) {
+   for (my $idx = 0; defined (my $res = $self->x_resource ("selection-autotransform.$idx")); $idx++) {
+      $res = $self->locale_decode ($res);
       my $transform = eval "sub { $res }";
 
       if ($transform) {
@@ -29,12 +27,21 @@
       }
    }
 
+   $self->{enabled} = 1;
+
+   push @{ $self->{term}{option_popup_hook} }, sub {
+      ("autotransform" => $self->{enabled}, sub { $self->{enabled} = shift })
+   };
+
    ()
 }
 
 sub on_sel_grab {
    my ($self) = @_;
 
+   $self->{enabled}
+      or return;
+
    my $text = $self->selection;
    local $_ = $text;
 
@@ -47,7 +54,7 @@
          last;
       }
    }
-      
+
    ()
 }