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.36 by sf-exg, Sat May 31 08:33:47 2014 UTC vs.
Revision 1.39 by sf-exg, Mon Jun 9 19:40:42 2014 UTC

101 101
102 $self->msg ("(escape cancels) /$self->{search}█"); 102 $self->msg ("(escape cancels) /$self->{search}█");
103} 103}
104 104
105sub search { 105sub search {
106 my ($self, $dir) = @_; 106 my ($self, $dir, $row) = @_;
107
108 delete $self->{found};
109 my $row = $self->{row};
110 107
111 my $search = $self->special_encode ($self->{search}); 108 my $search = $self->special_encode ($self->{search});
112 109
113 no re 'eval'; # just to be sure 110 no re 'eval'; # just to be sure
114 if (my $re = eval { qr/$search/ }) { 111 if (my $re = eval { qr/$search/ }) {
116 my $line = $self->line ($row) 113 my $line = $self->line ($row)
117 or last; 114 or last;
118 115
119 my $text = $line->t; 116 my $text = $line->t;
120 if ($text =~ /$re/g) { 117 if ($text =~ /$re/g) {
118 delete $self->{found};
119
121 do { 120 do {
122 push @{ $self->{found} }, [$line->coord_of ($-[0]), $line->coord_of ($+[0])]; 121 push @{ $self->{found} }, [$line->coord_of ($-[0]), $line->coord_of ($+[0])];
123 } while $text =~ /$re/g; 122 } while $text =~ /$re/g;
124 123
125 $self->{row} = $row; 124 $self->{row} = $row;
126 $self->view_start (List::Util::min 0, $row - ($self->nrow >> 1)); 125 $self->view_start (List::Util::min 0, $row - ($self->nrow >> 1));
127 $self->want_refresh; 126 $self->want_refresh;
128 last; 127 return;
129 } 128 }
130 129
131 $row = $dir < 0 ? $line->beg - 1 : $line->end + 1; 130 $row = $dir < 0 ? $line->beg - 1 : $line->end + 1;
132 } 131 }
133 } 132 }
134 133
135 $self->scr_bell unless $self->{found}; 134 $self->scr_bell;
136} 135}
137 136
138sub refresh { 137sub refresh {
139 my ($self) = @_; 138 my ($self) = @_;
140 139
167 $self->leave; 166 $self->leave;
168 } elsif ($keysym == 0xff57) { # end 167 } elsif ($keysym == 0xff57) { # end
169 $self->{row} = $self->nrow - 1; 168 $self->{row} = $self->nrow - 1;
170 $self->view_start (0); 169 $self->view_start (0);
171 } elsif ($keysym == 0xff52) { # up 170 } elsif ($keysym == 0xff52) { # up
172 $self->{row}-- if $self->{row} > $self->top_row; 171 my $line = $self->line ($self->{row});
173 $self->search (-1); 172 $self->search (-1, $line->beg - 1)
173 if $line->beg > $self->top_row;
174 } elsif ($keysym == 0xff54) { # down 174 } elsif ($keysym == 0xff54) { # down
175 $self->{row}++ if $self->{row} < $self->nrow; 175 my $line = $self->line ($self->{row});
176 $self->search (+1); 176 $self->search (+1, $line->end + 1)
177 if $line->end < $self->nrow;
177 } elsif ($keysym == 0xff08) { # backspace 178 } elsif ($keysym == 0xff08) { # backspace
178 substr $self->{search}, -1, 1, ""; 179 substr $self->{search}, -1, 1, "";
179 $self->search; 180 $self->search (+1, $self->{row});
180 $self->idle; 181 $self->idle;
181 } elsif ($string !~ /[\x00-\x1f\x80-\xaf]/) { 182 } elsif ($string !~ /[\x00-\x1f\x80-\xaf]/) {
182 return; # pass to tt_write 183 return; # pass to tt_write
183 } 184 }
184 185
191 $self->{search} .= $self->locale_decode ($data); 192 $self->{search} .= $self->locale_decode ($data);
192 193
193 $self->{search} =~ s/^\(\?i\)// 194 $self->{search} =~ s/^\(\?i\)//
194 if $self->{search} =~ /^\(.*[[:upper:]]/; 195 if $self->{search} =~ /^\(.*[[:upper:]]/;
195 196
197 delete $self->{found};
196 $self->search (-1); 198 $self->search (-1, $self->{row});
197 $self->idle; 199 $self->idle;
198 200
199 1 201 1
200} 202}
201 203

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines