--- rxvt-unicode/src/perl/searchable-scrollback	2006/01/09 23:00:07	1.2
+++ rxvt-unicode/src/perl/searchable-scrollback	2006/01/11 02:13:56	1.12
@@ -5,10 +5,12 @@
 sub on_init {
    my ($self) = @_;
 
-   my $hotkey = $self->{argv}[0] || "M-s";
+   my $hotkey = $self->{argv}[0]
+                || $self->x_resource ("searchable-scrollback")
+                || "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,9 +18,8 @@
 sub on_keyboard_command {
    my ($self, $cmd) = @_;
 
-   if ($cmd eq "searchable-scrollback:enter") {
-      $self->enter;
-   }
+   $cmd eq "searchable-scrollback:start"
+      and $self->enter;
 
    ()
 }
@@ -35,46 +36,53 @@
 
    return if $self->{overlay};
 
-   $self->{pty_ev_events} = $self->pty_ev_events (urxvt::EVENT_NONE);
+   $self->{history} = [];
    $self->{view_start} = $self->view_start;
+   $self->{pty_ev_events} = $self->pty_ev_events (urxvt::EVENT_NONE);
 
    $self->enable (
       key_press     => \&key_press,
+      tt_write      => \&tt_write,
       refresh_begin => \&refresh,
       refresh_end   => \&refresh,
    );
 
+   $self->{manpage_overlay} = $self->overlay (0, -2, $self->ncol, 1, urxvt::OVERLAY_RSTYLE, 0);
+   $self->{manpage_overlay}->set (0, 0, "scrollback search, see the ${urxvt::RXVTNAME}perl manpage for details");
+
    $self->idle;
 }
 
 sub leave {
    my ($self) = @_;
 
-   delete $self->{overlay};
-
-   $self->disable ("key_press", "refresh_begin", "refresh_end");
-
+   $self->disable ("key_press", "tt_write", "refresh_begin", "refresh_end");
    $self->pty_ev_events ($self->{pty_ev_events});
-   $self->want_refresh;
+
+   delete $self->{manpage_overlay};
+   delete $self->{overlay};
+   delete $self->{history};
 }
 
 sub idle {
    my ($self) = @_;
 
-   $self->msg ("scrollback search, escape=exit, enter=accept, /=start search, n=next, p=previous");
+   $self->msg ("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};
 
+   my $search = $self->special_encode ($self->{search});
+
    no re 'eval'; # just to be sure
-   my $re = qr/$self->{search}/;
+   my $re = qr/$search/;
 
    while ($row > -$self->nsaved) {
       my $line = $self->line ($row)
@@ -94,7 +102,7 @@
    }
 
    $self->msg ("enter/type/backspace: /$self->{search}_"
-               . ($self->{found} ? " (not found)" : ""));
+               . ($self->{found} ? "" : " (not found)"));
    $self->scr_bell unless $self->{found};
 }
 
@@ -103,7 +111,7 @@
 
    return unless $self->{found};
 
-   $self->scr_xor_span (@$_)
+   $self->scr_xor_span (@$_, urxvt::SET_FGCOLOR (urxvt::RS_RVid, 15))
       for @{ $self->{found} };
 
    ()
@@ -120,16 +128,14 @@
          $self->idle;
       } elsif ($keysym == 0xff08) {
          substr $self->{search}, -1, 1, "";
-
          $self->search;
       } elsif ($string ne "") {
-         $self->{search} .= $string;
-
-         $self->search;
+         return;
       }
+
    } else {
       if ($keysym == 0xff0d || $keysym == 0xff8d) {
-         # OK
+         # TODO: set selection
          $self->leave;
       } elsif ($keysym == 0xff1b) {
          $self->view_start ($self->{view_start});
@@ -139,11 +145,24 @@
       } elsif ($keysym == 0xff54) {
          $self->view_start ($self->view_start - 1);
       } elsif ($string eq "/") {
+         delete $self->{manpage_overlay};
          $self->{in_search} = $self->view_start;
          $self->search;
+      } elsif ($string eq "G") {
+         $self->{history} = [];
+         $self->view_start (0);
       } elsif ($string eq "n") {
-         $self->search;
-      } elsif ($string eq "p") {
+         if ($self->{found} && @{ $self->{found} }) {
+            push @{ $self->{history} }, [$self->view_start, $self->{found}];
+            $self->search (-1);
+            $self->idle;
+         }
+      } elsif ($string eq "p" or $string eq "N") {
+         if (my $prev = pop @{ $self->{history} }) {
+            $self->view_start ($prev->[0]);
+            $self->{found} = $prev->[1];
+            $self->want_refresh;
+         }
       } elsif ($string ne "") {
          $self->scr_bell;
       }
@@ -151,5 +170,14 @@
 
    1
 }
+
+sub tt_write {
+   my ($self, $data) = @_;
+
+   $self->{search} .= $self->locale_decode ($data);
+   $self->search;
+
+   1
+}