ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/perl/searchable-scrollback
(Generate patch)

Comparing rxvt-unicode/src/perl/searchable-scrollback (file contents):
Revision 1.30 by root, Tue Sep 4 22:41:12 2012 UTC vs.
Revision 1.38 by sf-exg, Sun Jun 8 19:40:20 2014 UTC

1#! perl 1#! perl
2 2
3# this extension implements scrollback buffer search 3# this extension implements scrollback buffer search
4 4
5#:META:X_RESOURCE:%:string:activation hotkey keysym 5#:META:RESOURCE:%:string:activation hotkey keysym
6#:META:BINDING:M-s:start
6 7
7=head1 NAME 8=head1 NAME
8 9
9searchable-scrollback<hotkey> - incremental scrollback search (enabled by default) 10searchable-scrollback - incremental scrollback search (enabled by default)
10 11
11=head1 DESCRIPTION 12=head1 DESCRIPTION
12 13
13Adds regex search functionality to the scrollback buffer, triggered 14Adds regex search functionality to the scrollback buffer, triggered by
14by a hotkey (default: C<M-s>). While in search mode, normal terminal 15the C<searchable-scrollback:start> action (bound to C<M-s> by
16default). While in search mode, normal terminal input/output is
15input/output is suspended and a regex is displayed at the bottom of the 17suspended and a regex is displayed at the bottom of the screen.
16screen.
17 18
18Inputting characters appends them to the regex and continues incremental 19Inputting characters appends them to the regex and continues incremental
19search. C<BackSpace> removes a character from the regex, C<Up> and C<Down> 20search. C<BackSpace> removes a character from the regex, C<Up> and C<Down>
20search upwards/downwards in the scrollback buffer, C<End> jumps to the 21search upwards/downwards in the scrollback buffer, C<End> jumps to the
21bottom. C<Escape> leaves search mode and returns to the point where search 22bottom. C<Escape> leaves search mode and returns to the point where search
… …
32=cut 33=cut
33 34
34sub on_init { 35sub on_init {
35 my ($self) = @_; 36 my ($self) = @_;
36 37
38 # only for backwards compatibility
37 my $hotkey = $self->{argv}[0] 39 my $hotkey = $self->{argv}[0]
38 || $self->x_resource ("%") 40 || $self->x_resource ("%")
39 || "M-s"; 41 || return;
40 42
41 $self->parse_keysym ($hotkey, "perl:searchable-scrollback:start") 43 $self->bind_action ($hotkey, "searchable-scrollback:start") # ugh
42 or warn "unable to register '$hotkey' as scrollback search start hotkey\n"; 44 or warn "unable to register '$hotkey' as scrollback search start hotkey\n";
43 45
44 () 46 ()
45} 47}
46 48
47sub on_user_command { 49sub on_action {
48 my ($self, $cmd) = @_; 50 my ($self, $action) = @_;
49 51
50 $cmd eq "searchable-scrollback:start" 52 $action eq "start"
51 and $self->enter; 53 and $self->enter;
52 54
53 () 55 ()
54} 56}
55 57
… …
89 $self->disable ("key_press", "tt_write", "refresh_begin", "refresh_end"); 91 $self->disable ("key_press", "tt_write", "refresh_begin", "refresh_end");
90 $self->pty_ev_events ($self->{pty_ev_events}); 92 $self->pty_ev_events ($self->{pty_ev_events});
91 93
92 delete $self->{manpage_overlay}; 94 delete $self->{manpage_overlay};
93 delete $self->{overlay}; 95 delete $self->{overlay};
94 delete $self->{history};
95 delete $self->{search}; 96 delete $self->{search};
96} 97}
97 98
98sub idle { 99sub idle {
99 my ($self) = @_; 100 my ($self) = @_;
100 101
101 $self->msg ("(escape cancels) /$self->{search}█"); 102 $self->msg ("(escape cancels) /$self->{search}█");
102} 103}
103 104
104sub search { 105sub search {
105 my ($self, $dir) = @_; 106 my ($self, $dir, $row) = @_;
106
107 delete $self->{found};
108 my $row = $self->{row};
109 107
110 my $search = $self->special_encode ($self->{search}); 108 my $search = $self->special_encode ($self->{search});
111 109
112 no re 'eval'; # just to be sure 110 no re 'eval'; # just to be sure
113 if (my $re = eval { qr/$search/ }) { 111 if (my $re = eval { qr/$search/ }) {
… …
115 my $line = $self->line ($row) 113 my $line = $self->line ($row)
116 or last; 114 or last;
117 115
118 my $text = $line->t; 116 my $text = $line->t;
119 if ($text =~ /$re/g) { 117 if ($text =~ /$re/g) {
118 delete $self->{found};
119
120 do { 120 do {
121 push @{ $self->{found} }, [$line->coord_of ($-[0]), $line->coord_of ($+[0])]; 121 push @{ $self->{found} }, [$line->coord_of ($-[0]), $line->coord_of ($+[0])];
122 } while $text =~ /$re/g; 122 } while $text =~ /$re/g;
123 123
124 $self->{row} = $row; 124 $self->{row} = $row;
… …
166 $self->leave; 166 $self->leave;
167 } elsif ($keysym == 0xff57) { # end 167 } elsif ($keysym == 0xff57) { # end
168 $self->{row} = $self->nrow - 1; 168 $self->{row} = $self->nrow - 1;
169 $self->view_start (0); 169 $self->view_start (0);
170 } elsif ($keysym == 0xff52) { # up 170 } elsif ($keysym == 0xff52) { # up
171 $self->{row}-- if $self->{row} > $self->top_row; 171 my $line = $self->line ($self->{row});
172 $self->search (-1); 172 $self->search (-1, $line->beg - 1)
173 if $line->beg > $self->top_row;
173 } elsif ($keysym == 0xff54) { # down 174 } elsif ($keysym == 0xff54) { # down
174 $self->{row}++ if $self->{row} < $self->nrow; 175 my $line = $self->line ($self->{row});
175 $self->search (+1); 176 $self->search (+1, $line->end + 1)
177 if $line->end < $self->nrow;
176 } elsif ($keysym == 0xff08) { # backspace 178 } elsif ($keysym == 0xff08) { # backspace
177 substr $self->{search}, -1, 1, ""; 179 substr $self->{search}, -1, 1, "";
178 $self->search; 180 $self->search (+1, $self->{row});
179 $self->idle; 181 $self->idle;
180 } elsif ($string !~ /[\x00-\x1f\x80-\xaf]/) { 182 } elsif ($string !~ /[\x00-\x1f\x80-\xaf]/) {
181 return; # pass to tt_write 183 return; # pass to tt_write
182 } 184 }
183 185
… …
190 $self->{search} .= $self->locale_decode ($data); 192 $self->{search} .= $self->locale_decode ($data);
191 193
192 $self->{search} =~ s/^\(\?i\)// 194 $self->{search} =~ s/^\(\?i\)//
193 if $self->{search} =~ /^\(.*[[:upper:]]/; 195 if $self->{search} =~ /^\(.*[[:upper:]]/;
194 196
197 delete $self->{found};
195 $self->search (-1); 198 $self->search (-1, $self->{row});
196 $self->idle; 199 $self->idle;
197 200
198 1 201 1
199} 202}
200 203

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines