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.32 by root, Sat May 17 13:38:23 2014 UTC vs.
Revision 1.41 by sf-exg, Tue Oct 14 09:00:52 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:RESOURCE:%:string:activation hotkey keysym 5#:META:RESOURCE:%:string:activation hotkey keysym
6#:META:KEYSYM:M-s:searchable-scrollback:start 6#:META:BINDING:M-s:start
7 7
8=head1 NAME 8=head1 NAME
9 9
10searchable-scrollback<hotkey> - incremental scrollback search (enabled by default) 10searchable-scrollback - incremental scrollback search (enabled by default)
11 11
12=head1 DESCRIPTION 12=head1 DESCRIPTION
13 13
14Adds regex search functionality to the scrollback buffer, triggered 14Adds regex search functionality to the scrollback buffer, triggered by
15by 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
16input/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.
17screen.
18 18
19Inputting characters appends them to the regex and continues incremental 19Inputting characters appends them to the regex and continues incremental
20search. 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>
21search upwards/downwards in the scrollback buffer, C<End> jumps to the 21search upwards/downwards in the scrollback buffer, C<End> jumps to the
22bottom. 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
… …
33=cut 33=cut
34 34
35sub on_init { 35sub on_init {
36 my ($self) = @_; 36 my ($self) = @_;
37 37
38 # only for backwards compatibility
38 my $hotkey = $self->{argv}[0] 39 my $hotkey = $self->{argv}[0]
39 || $self->x_resource ("%") 40 || $self->x_resource ("%")
40 || "M-s"; 41 || return;
41 42
42 $self->parse_keysym ($hotkey, "perl:searchable-scrollback:start") 43 $self->bind_action ($hotkey, "searchable-scrollback:start") # ugh
43 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";
44 45
45 () 46 ()
46} 47}
47 48
48sub on_user_command { 49sub on_user_command {
49 my ($self, $cmd) = @_; 50 my ($self, $cmd) = @_;
50 51
51 $cmd eq "searchable-scrollback:start" 52 $cmd eq "searchable-scrollback:start"
53 and $self->enter;
54
55 ()
56}
57
58sub on_action {
59 my ($self, $action) = @_;
60
61 $action eq "start"
52 and $self->enter; 62 and $self->enter;
53 63
54 () 64 ()
55} 65}
56 66
… …
90 $self->disable ("key_press", "tt_write", "refresh_begin", "refresh_end"); 100 $self->disable ("key_press", "tt_write", "refresh_begin", "refresh_end");
91 $self->pty_ev_events ($self->{pty_ev_events}); 101 $self->pty_ev_events ($self->{pty_ev_events});
92 102
93 delete $self->{manpage_overlay}; 103 delete $self->{manpage_overlay};
94 delete $self->{overlay}; 104 delete $self->{overlay};
95 delete $self->{history};
96 delete $self->{search}; 105 delete $self->{search};
106 delete $self->{found};
97} 107}
98 108
99sub idle { 109sub idle {
100 my ($self) = @_; 110 my ($self) = @_;
101 111
102 $self->msg ("(escape cancels) /$self->{search}█"); 112 $self->msg ("(escape cancels) /$self->{search}█");
103} 113}
104 114
105sub search { 115sub search {
106 my ($self, $dir) = @_; 116 my ($self, $dir, $row) = @_;
107
108 delete $self->{found};
109 my $row = $self->{row};
110 117
111 my $search = $self->special_encode ($self->{search}); 118 my $search = $self->special_encode ($self->{search});
112 119
113 no re 'eval'; # just to be sure 120 no re 'eval'; # just to be sure
114 if (my $re = eval { qr/$search/ }) { 121 if (my $re = eval { qr/$search/ }) {
… …
116 my $line = $self->line ($row) 123 my $line = $self->line ($row)
117 or last; 124 or last;
118 125
119 my $text = $line->t; 126 my $text = $line->t;
120 if ($text =~ /$re/g) { 127 if ($text =~ /$re/g) {
128 delete $self->{found};
129
121 do { 130 do {
122 push @{ $self->{found} }, [$line->coord_of ($-[0]), $line->coord_of ($+[0])]; 131 push @{ $self->{found} }, [$line->coord_of ($-[0]), $line->coord_of ($+[0])];
123 } while $text =~ /$re/g; 132 } while $text =~ /$re/g;
124 133
125 $self->{row} = $row; 134 $self->{row} = $row;
126 $self->view_start (List::Util::min 0, $row - ($self->nrow >> 1)); 135 $self->view_start (List::Util::min 0, $row - ($self->nrow >> 1));
127 $self->want_refresh; 136 $self->want_refresh;
128 last; 137 return;
129 } 138 }
130 139
131 $row = $dir < 0 ? $line->beg - 1 : $line->end + 1; 140 $row = $dir < 0 ? $line->beg - 1 : $line->end + 1;
132 } 141 }
133 } 142 }
134 143
135 $self->scr_bell unless $self->{found}; 144 $self->scr_bell;
136} 145}
137 146
138sub refresh { 147sub refresh {
139 my ($self) = @_; 148 my ($self) = @_;
140 149
… …
167 $self->leave; 176 $self->leave;
168 } elsif ($keysym == 0xff57) { # end 177 } elsif ($keysym == 0xff57) { # end
169 $self->{row} = $self->nrow - 1; 178 $self->{row} = $self->nrow - 1;
170 $self->view_start (0); 179 $self->view_start (0);
171 } elsif ($keysym == 0xff52) { # up 180 } elsif ($keysym == 0xff52) { # up
172 $self->{row}-- if $self->{row} > $self->top_row; 181 my $line = $self->line ($self->{row});
173 $self->search (-1); 182 $self->search (-1, $line->beg - 1)
183 if $line->beg > $self->top_row;
174 } elsif ($keysym == 0xff54) { # down 184 } elsif ($keysym == 0xff54) { # down
175 $self->{row}++ if $self->{row} < $self->nrow; 185 my $line = $self->line ($self->{row});
176 $self->search (+1); 186 $self->search (+1, $line->end + 1)
187 if $line->end < $self->nrow;
177 } elsif ($keysym == 0xff08) { # backspace 188 } elsif ($keysym == 0xff08) { # backspace
178 substr $self->{search}, -1, 1, ""; 189 substr $self->{search}, -1, 1, "";
179 $self->search; 190 $self->search (+1, $self->{row});
180 $self->idle; 191 $self->idle;
181 } elsif ($string !~ /[\x00-\x1f\x80-\xaf]/) { 192 } elsif ($string !~ /[\x00-\x1f\x80-\xaf]/) {
182 return; # pass to tt_write 193 return; # pass to tt_write
183 } 194 }
184 195
… …
191 $self->{search} .= $self->locale_decode ($data); 202 $self->{search} .= $self->locale_decode ($data);
192 203
193 $self->{search} =~ s/^\(\?i\)// 204 $self->{search} =~ s/^\(\?i\)//
194 if $self->{search} =~ /^\(.*[[:upper:]]/; 205 if $self->{search} =~ /^\(.*[[:upper:]]/;
195 206
207 delete $self->{found};
196 $self->search (-1); 208 $self->search (-1, $self->{row});
197 $self->idle; 209 $self->idle;
198 210
199 1 211 1
200} 212}
201 213

Diff Legend

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