--- rxvt-unicode/src/perl/searchable-scrollback	2006/01/09 22:41:41	1.1
+++ rxvt-unicode/src/perl/searchable-scrollback	2006/01/09 23:19:34	1.6
@@ -7,8 +7,8 @@
 
    my $hotkey = $self->{argv}[0] || "M-s";
 
-   $self->parse_keysym ($hotkey, "perl:searchable-scrollback:enter")
-      or warn "unable to register '$hotkey' as scrollback search enter hotkey\n";
+   $self->parse_keysym ($hotkey, "perl:searchable-scrollback:start")
+      or warn "unable to register '$hotkey' as scrollback search start hotkey\n";
 
    ()
 }
@@ -16,7 +16,7 @@
 sub on_keyboard_command {
    my ($self, $cmd) = @_;
 
-   if ($cmd eq "searchable-scrollback:enter") {
+   if ($cmd eq "searchable-scrollback:start") {
       $self->enter;
    }
 
@@ -39,12 +39,9 @@
    $self->{view_start} = $self->view_start;
 
    $self->enable (
-      refresh_begin => sub {
-         warn "beg(@_)\n";
-      },
-      refresh_end => sub {
-         warn "end(@_)\n";
-      },
+      key_press     => \&key_press,
+      refresh_begin => \&refresh,
+      refresh_end   => \&refresh,
    );
 
    $self->idle;
@@ -55,7 +52,7 @@
 
    delete $self->{overlay};
 
-   $self->disable ("refresh_begin", "refresh_end");
+   $self->disable ("key_press", "refresh_begin", "refresh_end");
 
    $self->pty_ev_events ($self->{pty_ev_events});
    $self->want_refresh;
@@ -64,15 +61,15 @@
 sub idle {
    my ($self) = @_;
 
-   $self->msg ("scrollback search, escape=exit, enter=accept, /=start search, n=next, p=previous");
+   $self->msg ("scrollback search, escape=exit, enter=accept, /=start search, n=next, p=previous, G=bottom");
 
    delete $self->{in_search};
 }
 
 sub search {
-   my ($self) = @_;
+   my ($self, $offset) = @_;
 
-   my $row = -$self->view_start;
+   my $row = -$self->view_start + ($self->nrow >> 1) + $offset;
 
    delete $self->{found};
 
@@ -86,7 +83,7 @@
       my $text = $line->t;
       if ($text =~ /$re/g) {
          do {
-            push @{ $self->{found} }, [$line->coord_of ($-[0]), $line->coord_of ($+[1])];
+            push @{ $self->{found} }, [$line->coord_of ($-[0]), $line->coord_of ($+[0])];
          } while $text =~ /$re/g;
 
          $self->view_start (-$row + ($self->nrow >> 1));
@@ -97,28 +94,37 @@
    }
 
    $self->msg ("enter/type/backspace: /$self->{search}_"
-               . ($self->{found} ? " (not found)" : ""));
+               . ($self->{found} ? "" : " (not found)"));
    $self->scr_bell unless $self->{found};
 }
 
-sub on_key_press {
-   my ($self, $event, $keysym, $string) =  @_;
+sub refresh {
+   my ($self) = @_;
+
+   return unless $self->{found};
+
+   $self->scr_xor_span (@$_, urxvt::SET_FGCOLOR (urxvt::RS_RVid, 15))
+      for @{ $self->{found} };
+
+   ()
+}
 
-   $self->{overlay}
-      or return;
+sub key_press {
+   my ($self, $event, $keysym, $string) =  @_;
 
    if (exists $self->{in_search}) {
       if ($keysym == 0xff0d || $keysym == 0xff8d) {
-         delete $self->{in_search};
+         $self->idle;
       } elsif ($keysym == 0xff1b) {
-         $self->view_start (delete $self->{in_search});
+         $self->view_start ($self->{in_search});
+         $self->idle;
       } elsif ($keysym == 0xff08) {
          substr $self->{search}, -1, 1, "";
+         $self->search;
       } elsif ($string ne "") {
          $self->{search} .= $string;
+         $self->search;
       }
-
-      $self->search;
    } else {
       if ($keysym == 0xff0d || $keysym == 0xff8d) {
          # OK
@@ -133,8 +139,13 @@
       } elsif ($string eq "/") {
          $self->{in_search} = $self->view_start;
          $self->search;
+      } elsif ($string eq "G") {
+         $self->view_start (0);
       } elsif ($string eq "n") {
-      } elsif ($string eq "p") {
+         $self->search (-1);
+         $self->idle;
+      } elsif ($string eq "p" or $string eq "N") {
+         # TODO
       } elsif ($string ne "") {
          $self->scr_bell;
       }