--- rxvt-unicode/src/perl/selection	2006/01/08 01:30:32	1.15
+++ rxvt-unicode/src/perl/selection	2006/01/12 09:55:44	1.21
@@ -9,17 +9,23 @@
    ()
 }
 
+# "find interetsing things"-patterns
 my @mark_patterns = (
+   qr{([[:alnum:]]+)},
+
+   # common "parentheses"
+   qr{(?:^|\s) ‘  ([^‘’]+?) ’ (?:\s|\)|$)}x,
+   qr{(?:^|\s) `  ([^`']+?) ' (?:\s|\)|$)}x,
+   qr{         \{ ([^{}]+?) \} }x,
+   qr{         \[ ([^{}]+?) \] }x,
+
    # urls, just a heuristic
    qr{(
       (?:https?|ftp|news|mailto|file)://[ab-zA-Z0-9\-\@;\/?:&=%\$_.+!*\x27(),~]+
-      [ab-zA-Z0-9\-\@;\/?:&=%\$_+!*\x27(),~]   # do not include a trailing dot, its wrong too often
+      [ab-zA-Z0-9\-\@;\/?:&=%\$_+!*\x27()~]   # exclude some trailing characters (heuristic)
    )}x,
 
-   # common forms of quoting
-   qr{(?:^|\s) [‘`] ([^‘`’']+) [’'] (?:\s|$)}x,
-
-   # shell-like argument quoting
+   # shell-like argument quoting, basically always matches
    qr{\G [\ \t|&;<>()] *(
       (?:
          [^\\"'\ \t|&;<>()]+
@@ -30,39 +36,56 @@
    )}x,
 );
 
+# "correct obvious? crap"-patterns
 my @simplify_patterns = (
    qr{^"([^\\"'\ \t|&;<>()*?]+)"$}, # "simple" => simple
-   qr{^(.*)[,\-]$},
+   qr{^(.*)[,\-]$},                 # strip off trailing , and -
 );
 
 sub on_sel_extend {
-   my ($self) = @_;
+   my ($self, $time) = @_;
 
    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;
-            my ($ofs1, $ofs2) = ($-[1], $+[1]);
+
+            push @matches, [$ofs, length $match];
 
             for my $regex (@simplify_patterns) {
                if ($match =~ $regex) {
                   $match = $1;
-                  $ofs1 += $-[1];
-                  $ofs2 = $ofs1 + length $match;
+                  $ofs += $-[1];
                }
             }
 
-            $self->selection_beg ($line->coord_of ($ofs1));
-            $self->selection_end ($line->coord_of ($ofs2));
-            return 1;
+            push @matches, [$ofs, length $match];
          }
       }
    }
 
+   # whole line
+   push @matches, [0, ($line->end - $line->beg + 1) * $self->ncol];
+
+   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;
+   }
+
    ()
 }