--- rxvt-unicode/src/perl/searchable-scrollback	2006/01/12 05:22:47	1.13
+++ rxvt-unicode/src/perl/searchable-scrollback	2007/08/01 17:55:37	1.23
@@ -15,7 +15,7 @@
    ()
 }
 
-sub on_keyboard_command {
+sub on_user_command {
    my ($self, $cmd) = @_;
 
    $cmd eq "searchable-scrollback:start"
@@ -39,6 +39,7 @@
    $self->{view_start} = $self->view_start;
    $self->{pty_ev_events} = $self->pty_ev_events (urxvt::EVENT_NONE);
    $self->{row} = $self->nrow - 1;
+   $self->{search} = "(?i)";
 
    $self->enable (
       key_press     => \&key_press,
@@ -80,25 +81,25 @@
    my $search = $self->special_encode ($self->{search});
 
    no re 'eval'; # just to be sure
-   my $re = qr/$search/;
+   if (my $re = eval { qr/$search/ }) {
+      while ($self->nrow > $row && $row > $self->top_row) {
+         my $line = $self->line ($row)
+            or last;
+
+         my $text = $line->t;
+         if ($text =~ /$re/g) {
+            do {
+               push @{ $self->{found} }, [$line->coord_of ($-[0]), $line->coord_of ($+[0])];
+            } while $text =~ /$re/g;
+
+            $self->{row} = $row;
+            $self->view_start (List::Util::min 0, $row - ($self->nrow >> 1));
+            $self->want_refresh;
+            last;
+         }
 
-   while ($self->nrow > $row && $row > -$self->nsaved) {
-      my $line = $self->line ($row)
-         or last;
-
-      my $text = $line->t;
-      if ($text =~ /$re/g) {
-         do {
-            push @{ $self->{found} }, [$line->coord_of ($-[0]), $line->coord_of ($+[0])];
-         } while $text =~ /$re/g;
-
-         $self->{row} = $row;
-         $self->view_start (-$row + ($self->nrow >> 1));
-         $self->want_refresh;
-         last;
+         $row = $dir < 0 ? $line->beg - 1 : $line->end + 1;
       }
-
-      $row = $dir < 0 ? $line->beg - 1 : $line->end + 1;
    }
 
    $self->scr_bell unless $self->{found};
@@ -107,7 +108,9 @@
 sub refresh {
    my ($self) = @_;
 
-   my $xor = urxvt::RS_RVid | urxvt::RS_Uline;
+   return unless $self->{found};
+
+   my $xor = urxvt::RS_RVid | urxvt::RS_Blink;
    for (@{ $self->{found} }) {
       $self->scr_xor_span (@$_, $xor);
       $xor = urxvt::RS_RVid;
@@ -121,43 +124,31 @@
 
    delete $self->{manpage_overlay};
 
-   if ($keysym == 0xff0d || $keysym == 0xff8d) {
-      if ($self->{found}) {
+   if ($keysym == 0xff0d || $keysym == 0xff8d) { # enter
+      if ($self->{found} && $event->{state} & urxvt::ShiftMask) {
          my ($br, $bc, $er, $ec) = @{ $self->{found}[0] };
          $self->selection_beg ($br, $bc);
          $self->selection_end ($er, $ec);
          $self->selection_make ($event->{time});
       }
       $self->leave;
-   } elsif ($keysym == 0xff1b) {
+   } elsif ($keysym == 0xff1b) { # escape
       $self->view_start ($self->{view_start});
       $self->leave;
-   } elsif ($keysym == 0xff57) {
+   } elsif ($keysym == 0xff57) { # end
       $self->{row} = $self->nrow - 1;
       $self->view_start (0);
-   } elsif ($keysym == 0xff52) {
-      $self->{row}-- if $self->{row} > -$self->nsaved;
+   } elsif ($keysym == 0xff52) { # up
+      $self->{row}-- if $self->{row} > $self->top_row;
       $self->search (-1);
-   } elsif ($keysym == 0xff54) {
+   } elsif ($keysym == 0xff54) { # down
       $self->{row}++ if $self->{row} < $self->nrow;
       $self->search (+1);
-   } elsif ($string eq "n") {
-      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 ($keysym == 0xff08) {
+   } elsif ($keysym == 0xff08) { # backspace
       substr $self->{search}, -1, 1, "";
       $self->search;
       $self->idle;
-   } elsif ($string =~ /^[^\x00-\x1f\x80-\xaf]+$/) {
+   } elsif ($string !~ /[\x00-\x1f\x80-\xaf]/) {
       return; # pass to tt_write
    }
 
@@ -168,6 +159,10 @@
    my ($self, $data) = @_;
 
    $self->{search} .= $self->locale_decode ($data);
+
+   $self->{search} =~ s/^\(\?i\)//
+      if $self->{search} =~ /^\(.*[[:upper:]]/;
+   
    $self->search (-1);
    $self->idle;