--- rxvt-unicode/src/perl/selection	2006/01/25 13:24:45	1.35
+++ rxvt-unicode/src/perl/selection	2007/11/19 09:27:08	1.44
@@ -1,6 +1,6 @@
 #! perl
 
-sub on_keyboard_command {
+sub on_user_command {
    my ($self, $cmd) = @_;
 
    $cmd eq "selection:rot13"
@@ -23,25 +23,42 @@
       push @{ $self->{patterns} }, qr/$res/;
    }
 
+   $self->{enabled} = 1;
+
+   push @{ $self->{term}{option_popup_hook} }, sub {
+      ("new selection" => $self->{enabled}, sub { $self->{enabled} = shift })
+   };
+
    ()
 }
 
 # "find interesting things"-patterns
 my @mark_patterns = (
+   qr{ ([[:word:]]+) }x,
+   qr{ ([^[:space:]]+) }x,
+
    # common types of "parentheses"
-   qr{ (?<![^[:space:]]) ‘ ([^‘’]+) ’ (?![^[:space]]) }x,
-   qr{ (?<![^[:space:]]) ` ([^`']+) ' (?![^[:space]]) }x,
+   qr{ (?<![^[:space:]])  ` ([^‘’]+)  ` (?![^[:space:]]) }x,
+   qr{ (?<![^[:space:]])  ‘ ([^‘’]+)  ’ (?![^[:space:]]) }x,
+   qr{ (?<![^[:space:]])  ` ([^`']+)  ' (?![^[:space:]]) }x,
+
+   qr{ (?<![^[:space:]])  ‘ ([^`']+)  ’ (?![^[:space:]]) }x,
+   qr{ (?<![^[:space:]])  “ ([^`']+)  ” (?![^[:space:]]) }x,
+
+   qr{ (?<![^[:space:]]) (' [^[:space:]] [^']* ')                 }x,
+   qr{                   (' [^']* [^[:space:]] ') (?![^[:space:]]) }x,
    qr{ (?<![^[:space:]]) (" [^[:space:]] [^"]* ")                 }x,
-   qr{                   (" [^"]* [^[:space:]] ") (?![^[:space]]) }x,
-   qr{ \< ([^<>[:space:]]+) \> }x,
-   qr{ \{ ([^{}[:space:]]+) \} }x,
-   qr{ \[ ([^{}[:space:]]+) \] }x,
-   qr{ \( ([^()[:space:]]+) \) }x,
+   qr{                   (" [^"]* [^[:space:]] ") (?![^[:space:]]) }x,
+
+   qr{ \< ([^>]+) \> }x,
+   qr{ \( ([^)]+) \) }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()~]   # exclude some trailing characters (heuristic)
+      (?:https?://|ftp://|news://|mailto:|file://|\bwww\.)[ab-zA-Z0-9\-\@;\/?:&=%\$_.+!*\x27(),~#]+
+      [ab-zA-Z0-9\-\@;\/?:&=%\$_+*()~]   # exclude some trailing characters (heuristic)
    )}x,
 
    # shell-like argument quoting, basically always matches
@@ -64,6 +81,9 @@
 sub on_sel_extend {
    my ($self, $time) = @_;
 
+   $self->{enabled}
+      or return;
+
    my ($row, $col) = $self->selection_mark;
    my $line = $self->line ($row);
    my $text = $line->t;
@@ -74,7 +94,7 @@
    my @matches;
 
    if ($markofs < $line->l) {
-      # convert markofs form character to UTF-8 offset space
+      # convert markofs from character to UTF-8 offset space
       {
          my $prefix = substr $text, 0, $markofs;
          utf8::encode $prefix;