--- rxvt-unicode/src/perl/searchable-scrollback	2006/01/12 11:16:36	1.19
+++ rxvt-unicode/src/perl/searchable-scrollback	2007/11/11 04:08:00	1.24
@@ -15,7 +15,7 @@
    ()
 }
 
-sub on_keyboard_command {
+sub on_user_command {
    my ($self, $cmd) = @_;
 
    $cmd eq "searchable-scrollback:start"
@@ -37,8 +37,9 @@
    return if $self->{overlay};
 
    $self->{view_start} = $self->view_start;
-   $self->{pty_ev_events} = $self->pty_ev_events (urxvt::EVENT_NONE);
+   $self->{pty_ev_events} = $self->pty_ev_events (urxvt::EV_NONE);
    $self->{row} = $self->nrow - 1;
+   $self->{search} = "(?i)";
 
    $self->enable (
       key_press     => \&key_press,
@@ -81,7 +82,7 @@
 
    no re 'eval'; # just to be sure
    if (my $re = eval { qr/$search/ }) {
-      while ($self->nrow > $row && $row > -$self->nsaved) {
+      while ($self->nrow > $row && $row > $self->top_row) {
          my $line = $self->line ($row)
             or last;
 
@@ -92,7 +93,7 @@
             } while $text =~ /$re/g;
 
             $self->{row} = $row;
-            $self->view_start (List::Util::max 0, -$row + ($self->nrow >> 1));
+            $self->view_start (List::Util::min 0, $row - ($self->nrow >> 1));
             $self->want_refresh;
             last;
          }
@@ -124,7 +125,7 @@
    delete $self->{manpage_overlay};
 
    if ($keysym == 0xff0d || $keysym == 0xff8d) { # enter
-      if ($self->{found}) {
+      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);
@@ -138,7 +139,7 @@
       $self->{row} = $self->nrow - 1;
       $self->view_start (0);
    } elsif ($keysym == 0xff52) { # up
-      $self->{row}-- if $self->{row} > -$self->nsaved;
+      $self->{row}-- if $self->{row} > $self->top_row;
       $self->search (-1);
    } elsif ($keysym == 0xff54) { # down
       $self->{row}++ if $self->{row} < $self->nrow;
@@ -158,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;