[ViewVC] Diff of: cvs/rxvt-unicode/src/perl/matcher

Comparing rxvt-unicode/src/perl/matcher (file contents):
Revision 1.31 by sf-exg, Sun Jun 22 07:51:21 2014 UTC vs.
Revision 1.38 by sf-exg, Sun Nov 21 17:08:57 2021 UTC

 #! perl
 # Author: Tim Pope <rxvt-unicodeNOSPAM@tpope.org>
 #         Bob Farrell <robertanthonyfarrell@gmail.com>
+#         Emanuele Giaquinta
 #:META:RESOURCE:%.launcher:string:default launcher command
-#:META:RESOURCE:%.button:string:the button, yeah
+#:META:RESOURCE:%.button:string:the mouse button used to activate a match
 #:META:RESOURCE:%.pattern.:string:extra pattern to match
 #:META:RESOURCE:%.launcher.:string:custom launcher for pattern
 #:META:RESOURCE:%.rend.:string:custom rendition for pattern
 =head1 NAME
 It is possible to activate the most recently seen match or a list of matches
 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
+The C<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
+=over
 =item C<Up>
 Search for a match upwards.
 =item C<y>
 Copy the current match to the clipboard.
 =back
+It is also possible to cycle through the matches using a key
+combination bound to the C<matcher:select> action.
 Example: load and use the matcher extension with defaults.
     URxvt.perl-ext:           default,matcher
 =cut
 my $url =
    qr{
       (?:https?://|ftp://|news://|mailto:|file://|\bwww\.)
-      [\w\-\@;\/?:&=%\$.+!*\x27,~#]*
+      [\w\-\@;\/?:&=%\$.+!*\x27,~#$urxvt::NOCHAR]*
       (
-         \([\w\-\@;\/?:&=%\$.+!*\x27,~#]*\)| # Allow a pair of matched parentheses
+         \([\w\-\@;\/?:&=%\$.+!*\x27,~#$urxvt::NOCHAR]*\)| # Allow a pair of matched parentheses
          [\w\-\@;\/?:&=%\$+*~]  # exclude some trailing characters (heuristic)
       )+
    }x;
 sub matchlist_key_press {
 # backwards compat
 sub on_user_command {
    my ($self, $cmd) = @_;
-   if ($cmd =~ s/^matcher:list\b//) {
+   if ($cmd eq "matcher:list") {
       $self->matchlist;
-   } else {
+   } elsif ($cmd eq "matcher:last") {
-      if ($cmd =~ s/^matcher:last\b//) {
-         $self->most_recent;
+      $self->most_recent;
+   } elsif ($cmd eq "matcher:select") {
+      $self->select_enter;
-      } elsif ($cmd =~ s/^matcher\b//) {
+   } elsif ($cmd eq "matcher") {
-         # for backward compatibility
+      # for backward compatibility
-         $self->most_recent;
+      $self->most_recent;
-      }
    }
    ()
 }
    $self->enable (key_press => \&matchlist_key_press);
 }
 sub most_recent {
    my ($self) = shift;
-   my $row = $self->nrow;
+   my $row = $self->nrow - 1;
    my @exec;
-   while($row-- > $self->top_row) {
+   while ($row >= $self->top_row) {
+      my $line = $self->line ($row);
       @exec = $self->command_for($row);
       last if(@exec);
+      $row = $line->beg - 1;
    }
    if(@exec) {
       return $self->exec_async (@exec);
    }
    ()
       }
    }
    my @defaults = ($url);
    my @matchers;
-   for (my $idx = 0; defined (my $res = $self->my_resource ("pattern.$idx") || $defaults[$idx]); $idx++) {
+   for (my $idx = 0; defined (my $res = $self->locale_decode ($self->my_resource ("pattern.$idx")) || $defaults[$idx]); $idx++) {
-      $res = $self->locale_decode ($res);
-      utf8::encode $res;
       my $launcher = $self->my_resource ("launcher.$idx");
       $launcher =~ s/\$&|\$\{&\}/\${0}/g if $launcher;
       my $rend = $self->parse_rend($self->my_resource ("rend.$idx"));
       unshift @matchers, [qr($res)x,$launcher,$rend];
    }
    my ($self, $row) = @_;
    # fetch the line that has changed
    my $line = $self->line ($row);
    my $text = $line->t;
+   my $rend;
    # find all urls (if any)
    for my $matcher (@{$self->{matchers}}) {
       while ($text =~ /$matcher->[0]/g) {
          #print "$&\n";
-         my $rend = $line->r;
+         $rend ||= $line->r;
          # 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];
-         $line->r ($rend);
       }
    }
+   $line->r ($rend) if $rend;
    ()
 }
 sub valid_button {
       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->view_start ($row - ($self->nrow >> 1));
          $self->want_refresh;
-         return;
+         return 1;
       }
       $row = $dir < 0 ? $line->beg - 1 : $line->end + 1;
    }
    $self->scr_bell;
+   ()
 }
 sub select_refresh {
    my ($self) = @_;
       } else {
          my $line = $self->line ($self->{cur_row});
          $self->select_search (+1, $line->end + 1)
             if $line->end < $self->nrow;
       }
+   } elsif ($self->lookup_keysym ($keysym, $event->{state}) eq "matcher:select") {
+      if ($self->{id} > 0) {
+         $self->{id}--;
+         $self->want_refresh;
+      } else {
+         my $line = $self->line ($self->{cur_row});
+         $self->select_search (-1, $self->nrow - 1)
+            unless $self->select_search (-1, $line->beg - 1);
+      }
    }
    1
 }

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing rxvt-unicode/src/perl/matcher (file contents): Revision 1.31 by sf-exg, Sun Jun 22 07:51:21 2014 UTC vs. Revision 1.38 by sf-exg, Sun Nov 21 17:08:57 2021 UTC

Diff Legend

Comparing rxvt-unicode/src/perl/matcher (file contents):
Revision 1.31 by sf-exg, Sun Jun 22 07:51:21 2014 UTC vs.
Revision 1.38 by sf-exg, Sun Nov 21 17:08:57 2021 UTC