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.40 by sf-exg, Mon Jun 9 19:54:26 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_user_command {
48 my ($self, $cmd) = @_; 50 my ($self, $cmd) = @_;
49 51
50 $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"
51 and $self->enter; 62 and $self->enter;
52 63
53 () 64 ()
54} 65}
55 66
… …
89 $self->disable ("key_press", "tt_write", "refresh_begin", "refresh_end"); 100 $self->disable ("key_press", "tt_write", "refresh_begin", "refresh_end");
90 $self->pty_ev_events ($self->{pty_ev_events}); 101 $self->pty_ev_events ($self->{pty_ev_events});
91 102
92 delete $self->{manpage_overlay}; 103 delete $self->{manpage_overlay};
93 delete $self->{overlay}; 104 delete $self->{overlay};
94 delete $self->{history};
95 delete $self->{search}; 105 delete $self->{search};
96} 106}
97 107
98sub idle { 108sub idle {
99 my ($self) = @_; 109 my ($self) = @_;
100 110
101 $self->msg ("(escape cancels) /$self->{search}█"); 111 $self->msg ("(escape cancels) /$self->{search}█");
102} 112}
103 113
104sub search { 114sub search {
105 my ($self, $dir) = @_; 115 my ($self, $dir, $row) = @_;
106
107 delete $self->{found};
108 my $row = $self->{row};
109 116
110 my $search = $self->special_encode ($self->{search}); 117 my $search = $self->special_encode ($self->{search});
111 118
112 no re 'eval'; # just to be sure 119 no re 'eval'; # just to be sure
113 if (my $re = eval { qr/$search/ }) { 120 if (my $re = eval { qr/$search/ }) {
… …
115 my $line = $self->line ($row) 122 my $line = $self->line ($row)
116 or last; 123 or last;
117 124
118 my $text = $line->t; 125 my $text = $line->t;
119 if ($text =~ /$re/g) { 126 if ($text =~ /$re/g) {
127 delete $self->{found};
128
120 do { 129 do {
121 push @{ $self->{found} }, [$line->coord_of ($-[0]), $line->coord_of ($+[0])]; 130 push @{ $self->{found} }, [$line->coord_of ($-[0]), $line->coord_of ($+[0])];
122 } while $text =~ /$re/g; 131 } while $text =~ /$re/g;
123 132
124 $self->{row} = $row; 133 $self->{row} = $row;
125 $self->view_start (List::Util::min 0, $row - ($self->nrow >> 1)); 134 $self->view_start (List::Util::min 0, $row - ($self->nrow >> 1));
126 $self->want_refresh; 135 $self->want_refresh;
127 last; 136 return;
128 } 137 }
129 138
130 $row = $dir < 0 ? $line->beg - 1 : $line->end + 1; 139 $row = $dir < 0 ? $line->beg - 1 : $line->end + 1;
131 } 140 }
132 } 141 }
133 142
134 $self->scr_bell unless $self->{found}; 143 $self->scr_bell;
135} 144}
136 145
137sub refresh { 146sub refresh {
138 my ($self) = @_; 147 my ($self) = @_;
139 148
… …
166 $self->leave; 175 $self->leave;
167 } elsif ($keysym == 0xff57) { # end 176 } elsif ($keysym == 0xff57) { # end
168 $self->{row} = $self->nrow - 1; 177 $self->{row} = $self->nrow - 1;
169 $self->view_start (0); 178 $self->view_start (0);
170 } elsif ($keysym == 0xff52) { # up 179 } elsif ($keysym == 0xff52) { # up
171 $self->{row}-- if $self->{row} > $self->top_row; 180 my $line = $self->line ($self->{row});
172 $self->search (-1); 181 $self->search (-1, $line->beg - 1)
182 if $line->beg > $self->top_row;
173 } elsif ($keysym == 0xff54) { # down 183 } elsif ($keysym == 0xff54) { # down
174 $self->{row}++ if $self->{row} < $self->nrow; 184 my $line = $self->line ($self->{row});
175 $self->search (+1); 185 $self->search (+1, $line->end + 1)
186 if $line->end < $self->nrow;
176 } elsif ($keysym == 0xff08) { # backspace 187 } elsif ($keysym == 0xff08) { # backspace
177 substr $self->{search}, -1, 1, ""; 188 substr $self->{search}, -1, 1, "";
178 $self->search; 189 $self->search (+1, $self->{row});
179 $self->idle; 190 $self->idle;
180 } elsif ($string !~ /[\x00-\x1f\x80-\xaf]/) { 191 } elsif ($string !~ /[\x00-\x1f\x80-\xaf]/) {
181 return; # pass to tt_write 192 return; # pass to tt_write
182 } 193 }
183 194
… …
190 $self->{search} .= $self->locale_decode ($data); 201 $self->{search} .= $self->locale_decode ($data);
191 202
192 $self->{search} =~ s/^\(\?i\)// 203 $self->{search} =~ s/^\(\?i\)//
193 if $self->{search} =~ /^\(.*[[:upper:]]/; 204 if $self->{search} =~ /^\(.*[[:upper:]]/;
194 205
206 delete $self->{found};
195 $self->search (-1); 207 $self->search (-1, $self->{row});
196 $self->idle; 208 $self->idle;
197 209
198 1 210 1
199} 211}
200 212

Diff Legend

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