--- rxvt-unicode/src/perl/searchable-scrollback	2006/07/06 18:56:10	1.22
+++ rxvt-unicode/src/perl/searchable-scrollback	2012/06/06 15:06:41	1.27
@@ -2,6 +2,8 @@
 
 # this extension implements scrollback buffer search
 
+#:META:X_RESOURCE:%:string:activation hotkey keysym
+
 sub on_init {
    my ($self) = @_;
 
@@ -37,7 +39,7 @@
    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)";
 
@@ -82,7 +84,7 @@
 
    no re 'eval'; # just to be sure
    if (my $re = eval { qr/$search/ }) {
-      while ($self->nrow > $row && $row > $self->top_row) {
+      while ($self->nrow > $row && $row >= $self->top_row) {
          my $line = $self->line ($row)
             or last;
 
@@ -125,7 +127,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);
@@ -162,7 +164,7 @@
 
    $self->{search} =~ s/^\(\?i\)//
       if $self->{search} =~ /^\(.*[[:upper:]]/;
-   
+
    $self->search (-1);
    $self->idle;