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.15 by root, Thu Jan 12 07:42:39 2006 UTC vs.
Revision 1.16 by root, Thu Jan 12 09:40:33 2006 UTC

78 my $row = $self->{row}; 78 my $row = $self->{row};
79 79
80 my $search = $self->special_encode ($self->{search}); 80 my $search = $self->special_encode ($self->{search});
81 81
82 no re 'eval'; # just to be sure 82 no re 'eval'; # just to be sure
83 my $re = qr/$search/; 83 if (my $re = eval { qr/$search/ }) {
84 while ($self->nrow > $row && $row > -$self->nsaved) {
85 my $line = $self->line ($row)
86 or last;
84 87
85 while ($self->nrow > $row && $row > -$self->nsaved) { 88 my $text = $line->t;
86 my $line = $self->line ($row) 89 if ($text =~ /$re/g) {
87 or last; 90 do {
91 push @{ $self->{found} }, [$line->coord_of ($-[0]), $line->coord_of ($+[0])];
92 } while $text =~ /$re/g;
88 93
89 my $text = $line->t; 94 $self->{row} = $row;
90 if ($text =~ /$re/g) { 95 $self->view_start (-$row + ($self->nrow >> 1));
96 $self->want_refresh;
97 last;
91 do { 98 }
92 push @{ $self->{found} }, [$line->coord_of ($-[0]), $line->coord_of ($+[0])];
93 } while $text =~ /$re/g;
94 99
95 $self->{row} = $row; 100 $row = $dir < 0 ? $line->beg - 1 : $line->end + 1;
96 $self->view_start (-$row + ($self->nrow >> 1));
97 $self->want_refresh;
98 last;
99 } 101 }
100
101 $row = $dir < 0 ? $line->beg - 1 : $line->end + 1;
102 } 102 }
103 103
104 $self->scr_bell unless $self->{found}; 104 $self->scr_bell unless $self->{found};
105} 105}
106 106

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines