--- rxvt-unicode/src/perl/mark-urls	2006/01/10 21:20:53	1.4
+++ rxvt-unicode/src/perl/mark-urls	2006/07/06 19:06:40	1.12
@@ -3,10 +3,18 @@
 # same url as used in "selection"
 my $url =
    qr{(
-      (?:https?|ftp|news|mailto|file)://[ab-zA-Z0-9\-\@;\/?:&=%\$_.+!*\x27(),~]+
+      (?:https?://|ftp://|news://|mailto:|file://)[ab-zA-Z0-9\-\@;\/?:&=%\$_.+!*\x27(),~#]+
       [ab-zA-Z0-9\-\@;\/?:&=%\$_+!*\x27()~]   # exclude some trailing characters (heuristic)
    )}x;
 
+sub on_start {
+   my ($self) = @_;
+
+   $self->{browser} = $self->x_resource ("urlLauncher") || "x-www-browser";
+
+   ()
+}
+
 sub on_line_update {
    my ($self, $row) = @_;
 
@@ -29,22 +37,27 @@
    ()
 }
 
-# needs confgiurability TODO
-#sub on_button_press {
-#    my ($self, $event) = @_;
-#    my $row = $event->{row};
-#    my $col =  $event->{col};
-#
-#    my $line = $self->line ($row);
-#    my $text = $line->t;
-#
-#    while($text =~ /$url/g) {
-#        #print "... " . ($-[0] 
-#        if ($-[0] <= $col && $+[0] >= $col) {
-#            system "firefox \Q$1\E &";
-#            return 1;
-#        }
-#    }
-#    ()
-#}
+sub on_button_release {
+    my ($self, $event) = @_;
+
+    my $mask = $self->ModLevel3Mask | $self->ModMetaMask
+             | urxvt::ShiftMask | urxvt::ControlMask;
+
+    if ($event->{button} == 2 && ($event->{state} & $mask) == 0) {
+       my $row = $event->{row};
+       my $col = $event->{col};
+
+       my $line = $self->line ($row);
+       my $text = $line->t;
+    
+       while ($text =~ /$url/g) {
+           if ($-[1] <= $col && $+[1] >= $col) {
+               $self->exec_async ($self->{browser}, $1);
+               return 1;
+           }
+       }
+    }
+
+    ()
+}