--- rxvt-unicode/src/perl/mark-urls	2006/01/11 02:13:56	1.5
+++ rxvt-unicode/src/perl/mark-urls	2006/01/17 16:22:41	1.8
@@ -10,7 +10,9 @@
 sub on_start {
    my ($self) = @_;
 
-   $self->{browser} = urxvt::untaint $self->x_resource ("urlLauncher") || "x-www-browser";
+   $self->{browser} = $self->x_resource ("urlLauncher") || "x-www-browser";
+
+   ()
 }
 
 sub on_line_update {
@@ -35,20 +37,26 @@
    ()
 }
 
-sub on_button_press {
+sub on_button_release {
     my ($self, $event) = @_;
     my $row = $event->{row};
     my $col = $event->{col};
 
     my $line = $self->line ($row);
     my $text = $line->t;
-
-    while($text =~ /$url/g) {
-        if ($-[0] <= $col && $+[0] >= $col) {
-            system "$self->{browser} \Q$1\E &";
-            return 1;
-        }
+    
+    my $mask = $self->ModLevel3Mask | $self->ModMetaMask
+             | urxvt::ShiftMask | urxvt::ControlMask;
+
+    if ($event->{button} == 2 && ($event->{state} & $mask) == 0) {
+       while ($text =~ /$url/g) {
+           if ($-[1] <= $col && $+[1] >= $col) {
+               urxvt::exec_async $self->{browser}, $1;
+               return 1;
+           }
+       }
     }
+
     ()
 }