--- rxvt-unicode/src/perl/selection	2006/01/10 21:20:53	1.19
+++ rxvt-unicode/src/perl/selection	2006/01/12 03:32:56	1.20
@@ -11,11 +11,7 @@
 
 # "find interetsing things"-patterns
 my @mark_patterns = (
-   # urls, just a heuristic
-   qr{(
-      (?:https?|ftp|news|mailto|file)://[ab-zA-Z0-9\-\@;\/?:&=%\$_.+!*\x27(),~]+
-      [ab-zA-Z0-9\-\@;\/?:&=%\$_+!*\x27()~]   # exclude some trailing characters (heuristic)
-   )}x,
+   qr{([[:alnum:]]+)},
 
    # common "parentheses"
    qr{(?:^|\s) ‘  ([^‘’]+?) ’ (?:\s|\)|$)}x,
@@ -23,6 +19,12 @@
    qr{         \{ ([^{}]+?) \} }x,
    qr{         \[ ([^{}]+?) \] }x,
 
+   # urls, just a heuristic
+   qr{(
+      (?:https?|ftp|news|mailto|file)://[ab-zA-Z0-9\-\@;\/?:&=%\$_.+!*\x27(),~]+
+      [ab-zA-Z0-9\-\@;\/?:&=%\$_+!*\x27()~]   # exclude some trailing characters (heuristic)
+   )}x,
+
    # shell-like argument quoting, basically always matches
    qr{\G [\ \t|&;<>()] *(
       (?:
@@ -45,15 +47,21 @@
 
    my ($row, $col) = $self->selection_mark;
    my $line = $self->line ($row);
-   my $offset = $line->offset_of ($row, $col);
    my $text = $line->t;
+   my $markofs = $line->offset_of ($row, $col);
+   my $curlen  = $line->offset_of ($self->selection_end)
+               - $line->offset_of ($self->selection_beg);
+
+   my @matches;
 
    for my $regex (@mark_patterns) {
       while ($text =~ /$regex/g) {
-         if ($-[1] <= $offset and $offset <= $+[1]) {
+         if ($-[1] <= $markofs and $markofs <= $+[1]) {
             my $ofs = $-[1];
             my $match = $1;
 
+            push @matches, [$ofs, length $match];
+
             for my $regex (@simplify_patterns) {
                if ($match =~ $regex) {
                   $match = $1;
@@ -61,12 +69,24 @@
                }
             }
 
-            $self->selection_beg ($line->coord_of ($ofs));
-            $self->selection_end ($line->coord_of ($ofs + length $match));
-            return 1;
+            push @matches, [$ofs, length $match];
          }
       }
    }
 
-   ()
+   for (sort { $a->[1] <=> $b->[1] or $b->[0] <=> $a->[0] } @matches) {
+      my ($ofs, $len) = @$_;
+
+      next if $len <= $curlen;
+
+      $self->selection_beg ($line->coord_of ($ofs));
+      $self->selection_end ($line->coord_of ($ofs + $len));
+      return 1;
+   }
+
+   # whole line
+   $self->selection_beg ($line->beg, 0);
+   $self->selection_end ($line->end, $self->ncol);
+
+   return 1;
 }