--- rxvt-unicode/src/perl/searchable-scrollback	2006/01/12 05:37:34	1.14
+++ rxvt-unicode/src/perl/searchable-scrollback	2014/05/28 08:05:17	1.35
@@ -2,23 +2,54 @@
 
 # this extension implements scrollback buffer search
 
+#:META:RESOURCE:%:string:activation hotkey keysym
+#:META:BINDING:M-s:start
+
+=head1 NAME
+
+searchable-scrollback<hotkey> - incremental scrollback search (enabled by default)
+
+=head1 DESCRIPTION
+
+Adds regex search functionality to the scrollback buffer, triggered
+by a hotkey (default: C<M-s>). While in search mode, normal terminal
+input/output is suspended and a regex is displayed at the bottom of the
+screen.
+
+Inputting characters appends them to the regex and continues incremental
+search. C<BackSpace> removes a character from the regex, C<Up> and C<Down>
+search upwards/downwards in the scrollback buffer, C<End> jumps to the
+bottom. C<Escape> leaves search mode and returns to the point where search
+was started, while C<Enter> or C<Return> stay at the current position and
+additionally stores the first match in the current line into the primary
+selection if the C<Shift> modifier is active.
+
+The regex defaults to "(?i)", resulting in a case-insensitive search. To
+get a case-sensitive search you can delete this prefix using C<BackSpace>
+or simply use an uppercase character which removes the "(?i)" prefix.
+
+See L<perlre> for more info about perl regular expression syntax.
+
+=cut
+
 sub on_init {
    my ($self) = @_;
 
+   # only for backwards compatibility
    my $hotkey = $self->{argv}[0]
-                || $self->x_resource ("searchable-scrollback")
-                || "M-s";
+                || $self->x_resource ("%")
+                || return;
 
-   $self->parse_keysym ($hotkey, "perl:searchable-scrollback:start")
+   $self->bind_action ($hotkey, "searchable-scrollback:start") # ugh
       or warn "unable to register '$hotkey' as scrollback search start hotkey\n";
 
    ()
 }
 
-sub on_keyboard_command {
-   my ($self, $cmd) = @_;
+sub on_action {
+   my ($self, $action) = @_;
 
-   $cmd eq "searchable-scrollback:start"
+   $action eq "start"
       and $self->enter;
 
    ()
@@ -37,8 +68,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,
@@ -61,7 +93,6 @@
 
    delete $self->{manpage_overlay};
    delete $self->{overlay};
-   delete $self->{history};
    delete $self->{search};
 }
 
@@ -80,25 +111,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 +138,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;
@@ -122,7 +155,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);
@@ -136,7 +169,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;
@@ -145,7 +178,7 @@
       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
    }
 
@@ -156,6 +189,10 @@
    my ($self, $data) = @_;
 
    $self->{search} .= $self->locale_decode ($data);
+
+   $self->{search} =~ s/^\(\?i\)//
+      if $self->{search} =~ /^\(.*[[:upper:]]/;
+
    $self->search (-1);
    $self->idle;