--- rxvt-unicode/src/perl/searchable-scrollback	2014/05/17 13:38:23	1.32
+++ rxvt-unicode/src/perl/searchable-scrollback	2014/10/14 09:00:52	1.41
@@ -3,18 +3,18 @@
 # this extension implements scrollback buffer search
 
 #:META:RESOURCE:%:string:activation hotkey keysym
-#:META:KEYSYM:M-s:searchable-scrollback:start
+#:META:BINDING:M-s:start
 
 =head1 NAME
 
-searchable-scrollback<hotkey> - incremental scrollback search (enabled by default)
+searchable-scrollback - incremental scrollback search (enabled by default)
 
 =head1 DESCRIPTION
 
-Adds regex search functionality to the scrollback buffer, triggered
-by a hotkey (default: C<M-s>). While in search mode, normal terminal
-input/output is suspended and a regex is displayed at the bottom of the
-screen.
+Adds regex search functionality to the scrollback buffer, triggered by
+the C<searchable-scrollback:start> action (bound to C<M-s> by
+default). While in search mode, normal terminal input/output is
+suspended and a regex is displayed at the bottom of the screen.
 
 Inputting characters appends them to the regex and continues incremental
 search. C<BackSpace> removes a character from the regex, C<Up> and C<Down>
@@ -35,11 +35,12 @@
 sub on_init {
    my ($self) = @_;
 
+   # only for backwards compatibility
    my $hotkey = $self->{argv}[0]
                 || $self->x_resource ("%")
-                || "M-s";
+                || return;
 
-   $self->parse_keysym ($hotkey, "perl:searchable-scrollback:start")
+   $self->bind_action ($hotkey, "searchable-scrollback:start") # ugh
       or warn "unable to register '$hotkey' as scrollback search start hotkey\n";
 
    ()
@@ -54,6 +55,15 @@
    ()
 }
 
+sub on_action {
+   my ($self, $action) = @_;
+
+   $action eq "start"
+      and $self->enter;
+
+   ()
+}
+
 sub msg {
    my ($self, $msg) = @_;
 
@@ -92,8 +102,8 @@
 
    delete $self->{manpage_overlay};
    delete $self->{overlay};
-   delete $self->{history};
    delete $self->{search};
+   delete $self->{found};
 }
 
 sub idle {
@@ -103,10 +113,7 @@
 }
 
 sub search {
-   my ($self, $dir) = @_;
-
-   delete $self->{found};
-   my $row = $self->{row};
+   my ($self, $dir, $row) = @_;
 
    my $search = $self->special_encode ($self->{search});
 
@@ -118,6 +125,8 @@
 
          my $text = $line->t;
          if ($text =~ /$re/g) {
+            delete $self->{found};
+
             do {
                push @{ $self->{found} }, [$line->coord_of ($-[0]), $line->coord_of ($+[0])];
             } while $text =~ /$re/g;
@@ -125,14 +134,14 @@
             $self->{row} = $row;
             $self->view_start (List::Util::min 0, $row - ($self->nrow >> 1));
             $self->want_refresh;
-            last;
+            return;
          }
 
          $row = $dir < 0 ? $line->beg - 1 : $line->end + 1;
       }
    }
 
-   $self->scr_bell unless $self->{found};
+   $self->scr_bell;
 }
 
 sub refresh {
@@ -169,14 +178,16 @@
       $self->{row} = $self->nrow - 1;
       $self->view_start (0);
    } elsif ($keysym == 0xff52) { # up
-      $self->{row}-- if $self->{row} > $self->top_row;
-      $self->search (-1);
+      my $line = $self->line ($self->{row});
+      $self->search (-1, $line->beg - 1)
+         if $line->beg > $self->top_row;
    } elsif ($keysym == 0xff54) { # down
-      $self->{row}++ if $self->{row} < $self->nrow;
-      $self->search (+1);
+      my $line = $self->line ($self->{row});
+      $self->search (+1, $line->end + 1)
+         if $line->end < $self->nrow;
    } elsif ($keysym == 0xff08) { # backspace
       substr $self->{search}, -1, 1, "";
-      $self->search;
+      $self->search (+1, $self->{row});
       $self->idle;
    } elsif ($string !~ /[\x00-\x1f\x80-\xaf]/) {
       return; # pass to tt_write
@@ -193,7 +204,8 @@
    $self->{search} =~ s/^\(\?i\)//
       if $self->{search} =~ /^\(.*[[:upper:]]/;
 
-   $self->search (-1);
+   delete $self->{found};
+   $self->search (-1, $self->{row});
    $self->idle;
 
    1