--- rxvt-unicode/src/perl/selection-pastebin	2006/01/17 17:01:54	1.3
+++ rxvt-unicode/src/perl/selection-pastebin	2006/01/19 16:07:09	1.9
@@ -1,22 +1,8 @@
 #! perl
 
-my $timers = {};
 my $pastebin_cmd;
 my $pastebin_url;
 
-sub on_start {
-   my ($self) = @_;
-   $pastebin_cmd =
-      $self->x_resource ("selection-pastebin.cmd")
-      or "scp -p % ruth:/var/www/www.ta-sa.org/files/txt/";
-
-   $pastebin_url = 
-      $self->x_resource ("selection-pastebin.url")
-      or "http://www.ta-sa.org/files/txt/";
-
-   ()
-}
-
 sub upload_paste {
    my ($self) = @_;
 
@@ -29,7 +15,8 @@
 
    my $msg = "uploaded $filename";
 
-   if (open my $o, ">" . $tmpfile) {
+   if (open my $o, ">", $tmpfile) {
+      chmod 0644, $tmpfile;
       print $o $txt;
       close $o;
    } else {
@@ -48,22 +35,39 @@
       $msg = "couldn't upload, '$cmd' failed";
    }
 
-   my $ov = $timers->{ov} = $self->overlay (-1, 0, length ($msg), 1, urxvt::OVERLAY_RSTYLE, 0);
+   unlink $tmpfile;
+
+   my $ov = $self->overlay (-1, 0, length $msg, 1, urxvt::OVERLAY_RSTYLE, 0);
    $ov->set (0, 0, $msg);
 
-   $timers->{t1} =
+   my $timer; $timer =
       urxvt::timer
               ->new
-              ->start ((int urxvt::NOW) + 5) # make sure we update "on" the second
-              ->interval (1)
-              ->cb (sub { delete $timers->{ov}; delete $timers->{t1}; });
+              ->after (5)
+              ->cb (sub {undef $timer; undef $ov; });
+}
+
+sub on_start {
+   my ($self) = @_;
+   $pastebin_cmd = $self->x_resource ("selection-pastebin.cmd")
+                   || "rcp -p % ruth:/var/www/www.ta-sa.org/files/txt/";
+
+   $pastebin_url = $self->x_resource ("selection-pastebin.url")
+                   || "http://www.ta-sa.org/files/txt/%";
+
+   ()
 }
 
+push @urxvt::ext::selection_popup::hook, sub {
+   ("pastebin upload" => sub { $self->upload_paste })
+};
+
 sub on_keyboard_command {
    my ($self, $cmd) = @_;
 
-   $cmd eq "selection-pastebin:remote-pastebin"
-      and upload_paste ($self);
+   if ($cmd eq "selection-pastebin:remote-pastebin") {
+      $self->upload_paste;
+   }
 
    ()
 }