--- rxvt-unicode/src/perl/selection	2006/01/06 20:50:58	1.14
+++ rxvt-unicode/src/perl/selection	2006/01/12 03:32:56	1.20
@@ -9,17 +9,23 @@
    ()
 }
 
-my @patterns = (
+# "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,25 +36,57 @@
    )}x,
 );
 
-my $x = "‘hallole’";
+# "correct obvious? crap"-patterns
+my @simplify_patterns = (
+   qr{^"([^\\"'\ \t|&;<>()*?]+)"$}, # "simple" => simple
+   qr{^(.*)[,\-]$},                 # strip off trailing , and -
+);
 
 sub on_sel_extend {
    my ($self) = @_;
 
    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);
 
-   for my $regex (@patterns) {
+   my @matches;
+
+   for my $regex (@mark_patterns) {
       while ($text =~ /$regex/g) {
-         if ($-[1] <= $offset and $offset <= $+[1]) {
-            $self->selection_beg ($line->coord_of ($-[1]));
-            $self->selection_end ($line->coord_of ($+[1]));
-            return 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;
+                  $ofs += $-[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;
 }