--- rxvt-unicode/src/perl/matcher	2014/06/13 21:49:19	1.25
+++ rxvt-unicode/src/perl/matcher	2014/06/22 07:51:21	1.31
@@ -7,7 +7,7 @@
 #:META:RESOURCE:%.button:string:the button, yeah
 #:META:RESOURCE:%.pattern.:string:extra pattern to match
 #:META:RESOURCE:%.launcher.:string:custom launcher for pattern
-#:META:RESOURCE:%.rend.:string:custom rednition for pattern
+#:META:RESOURCE:%.rend.:string:custom rendition for pattern
 
 =head1 NAME
 
@@ -33,6 +33,43 @@
 from the keyboard.  Simply bind a keysym to "matcher:last" or
 "matcher:list" as seen in the example below.
 
+The 'matcher:select' action enables a mode in which it is possible to
+iterate over the matches using the keyboard and either activate them
+or copy them to the clipboard. While the mode is active, normal terminal
+input/output is suspended and the following bindings are recognized:
+
+=over 4
+
+=item C<Up>
+
+Search for a match upwards.
+
+=item C<Down>
+
+Search for a match downwards.
+
+=item C<Home>
+
+Jump to the topmost match.
+
+=item C<End>
+
+Jump to the bottommost match.
+
+=item C<Escape>
+
+Leave the mode and return to the point where search was started.
+
+=item C<Enter>
+
+Activate the current match.
+
+=item C<y>
+
+Copy the current match to the clipboard.
+
+=back
+
 Example: load and use the matcher extension with defaults.
 
     URxvt.perl-ext:           default,matcher
@@ -59,18 +96,16 @@
       )+
    }x;
 
-sub on_key_press {
+sub matchlist_key_press {
    my ($self, $event, $keysym, $octets) = @_;
 
-   return unless $self->{overlay};
-
    delete $self->{overlay};
+   $self->disable ("key_press");
 
    my $i = ($keysym == 96 ? 0 : $keysym - 48);
    if ($i >= 0 && $i < @{ $self->{matches} }) {
       my @exec = @{ $self->{matches}[$i] };
-      shift @exec;
-      $self->exec_async (@exec);
+      $self->exec_async (@exec[5 .. $#exec]);
    }
 
    1
@@ -101,6 +136,8 @@
       $self->matchlist;
    } elsif ($action eq "last") {
       $self->most_recent;
+   } elsif ($action eq "select") {
+      $self->select_enter;
    }
 
    ()
@@ -109,14 +146,13 @@
 sub matchlist {
    my ($self) = @_;
 
-   @{ $self->{matches} } = ();
+   $self->{matches} = [];
    my $row = $self->nrow - 1;
    while ($row >= 0 && @{ $self->{matches} } < 10) {
       my $line = $self->line ($row);
       my @matches = $self->find_matches ($row);
 
-      for (sort { $b->[0] <=> $a->[0] } @matches) {
-         shift @$_;
+      for (sort { $b->[0] <=> $a->[0] or $b->[1] <=> $a->[1] } @matches) {
          push @{ $self->{matches} }, $_;
          last if @{ $self->{matches} } == 10;
       }
@@ -130,7 +166,7 @@
 
    my $i = 0;
    for my $match (@{ $self->{matches} }) {
-      my $text = $match->[0];
+      my $text = $match->[4];
       my $w = $self->strwidth ("$i-$text");
 
       $width = $w if $w > $width;
@@ -142,12 +178,13 @@
    $self->{overlay} = $self->overlay (0, 0, $width, scalar (@{ $self->{matches} }), urxvt::OVERLAY_RSTYLE, 2);
    my $i = 0;
    for my $match (@{ $self->{matches} }) {
-      my $text = $match->[0];
+      my $text = $match->[4];
 
       $self->{overlay}->set (0, $i, "$i-$text");
       $i++;
    }
 
+   $self->enable (key_press => \&matchlist_key_press);
 }
 
 sub most_recent {
@@ -188,7 +225,6 @@
 
    $self->{launcher} = $self->my_resource ("launcher") || $self->x_resource("url-launcher") || "sensible-browser";
 
-   $self->{matches} = [];
    $self->{button}  = 2;
    $self->{state}   = 0;
    if($self->{argv}[0] || $self->my_resource ("button")) {
@@ -229,7 +265,6 @@
    # fetch the line that has changed
    my $line = $self->line ($row);
    my $text = $line->t;
-   my $i = 0;
 
    # find all urls (if any)
    for my $matcher (@{$self->{matchers}}) {
@@ -240,7 +275,7 @@
          # mark all characters as underlined. we _must_ not toggle underline,
          # as we might get called on an already-marked url.
          &{$matcher->[2]}
-         for @{$rend}[ $-[0] .. $+[0] - 1];
+            for @{$rend}[$-[0] .. $+[0] - 1];
 
          $line->r ($rend);
       }
@@ -261,7 +296,7 @@
    my ($self, $row, $col) = @_;
    my $line = $self->line ($row);
    my $text = $line->t;
-   my $off = $line->offset_of ($row, $col) if $col;
+   my $off = $line->offset_of ($row, $col) if defined $col;
 
    my @matches;
    for my $matcher (@{$self->{matchers}}) {
@@ -283,7 +318,7 @@
                   /egx; $_ } split /\s+/, $launcher;
             }
 
-            push @matches, [ $begin[0], $match, @exec ];
+            push @matches, [ $line->coord_of ($begin[0]), $line->coord_of ($end[0]), $match, @exec ];
          }
       }
    }
@@ -297,7 +332,7 @@
    my @matches = $self->find_matches ($row, $col);
    if (@matches) {
       my @match = @{ $matches[0] };
-      return @match[2 .. $#match];
+      return @match[5 .. $#match];
    }
 
    ()
@@ -341,4 +376,112 @@
    1;
 }
 
+sub select_enter {
+   my ($self) = @_;
+
+   $self->{view_start} = $self->view_start;
+   $self->{pty_ev_events} = $self->pty_ev_events (urxvt::EV_NONE);
+   $self->{cur_row} = $self->nrow - 1;
+
+   $self->enable (
+      key_press     => \&select_key_press,
+      refresh_begin => \&select_refresh,
+      refresh_end   => \&select_refresh,
+   );
+
+   $self->{overlay} = $self->overlay (0, -1, $self->ncol, 1, urxvt::OVERLAY_RSTYLE, 0);
+   $self->{overlay}->set (0, 0, "match-select");
+}
+
+sub select_leave {
+   my ($self) = @_;
+
+   $self->disable ("key_press", "refresh_begin", "refresh_end");
+   $self->pty_ev_events ($self->{pty_ev_events});
+
+   delete $self->{overlay};
+   delete $self->{matches};
+   delete $self->{id};
+}
+
+sub select_search {
+   my ($self, $dir, $row) = @_;
+
+   while ($self->nrow > $row && $row >= $self->top_row) {
+      my $line = $self->line ($row)
+          or last;
+
+      my @matches = $self->find_matches ($row);
+      if (@matches) {
+         @matches = sort { $a->[0] <=> $b->[0] or $a->[1] <=> $b->[1] } @matches;
+         $self->{matches} = \@matches;
+         $self->{cur_row} = $row;
+         $self->{id} = $dir < 0 ? @{ $self->{matches} } - 1 : 0;
+         $self->view_start (List::Util::min 0, $row - ($self->nrow >> 1));
+         $self->want_refresh;
+         return;
+      }
+
+      $row = $dir < 0 ? $line->beg - 1 : $line->end + 1;
+   }
+
+   $self->scr_bell;
+}
+
+sub select_refresh {
+   my ($self) = @_;
+
+   return unless $self->{matches};
+
+   my $cur = $self->{matches}[$self->{id}];
+   $self->scr_xor_span (@$cur[0 .. 3], urxvt::RS_RVid);
+
+   ()
+}
+
+sub select_key_press {
+   my ($self, $event, $keysym, $string) =  @_;
+
+   if ($keysym == 0xff0d || $keysym == 0xff8d) { # enter
+      if ($self->{matches}) {
+         my @match = @{ $self->{matches}[$self->{id}] };
+         $self->exec_async (@match[5 .. $#match]);
+      }
+      $self->select_leave;
+   } elsif ($keysym == 0x79) { # y
+      if ($self->{matches}) {
+         $self->selection ($self->{matches}[$self->{id}][4], 1);
+         $self->selection_grab (urxvt::CurrentTime, 1);
+      }
+      $self->select_leave;
+   } elsif ($keysym == 0xff1b) { # escape
+      $self->view_start ($self->{view_start});
+      $self->select_leave;
+   } elsif ($keysym == 0xff50) { # home
+      $self->select_search (+1, $self->top_row)
+   } elsif ($keysym == 0xff57) { # end
+      $self->select_search (-1, $self->nrow - 1)
+   } elsif ($keysym == 0xff52) { # up
+      if ($self->{id} > 0) {
+         $self->{id}--;
+         $self->want_refresh;
+      } else {
+         my $line = $self->line ($self->{cur_row});
+         $self->select_search (-1, $line->beg - 1)
+            if $line->beg > $self->top_row;
+      }
+   } elsif ($keysym == 0xff54) { # down
+      if ($self->{id} < @{ $self->{matches} } - 1) {
+         $self->{id}++;
+         $self->want_refresh;
+      } else {
+         my $line = $self->line ($self->{cur_row});
+         $self->select_search (+1, $line->end + 1)
+            if $line->end < $self->nrow;
+      }
+   }
+
+   1
+}
+
 # vim:set sw=3 sts=3 et: