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.13 by root, Thu Jan 12 05:22:47 2006 UTC vs.
Revision 1.20 by root, Sun Jan 15 06:02:41 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->top_row) {
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 (List::Util::min 0, $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
107sub refresh { 107sub refresh {
108 my ($self) = @_; 108 my ($self) = @_;
109 109
110 return unless $self->{found};
111
110 my $xor = urxvt::RS_RVid | urxvt::RS_Uline; 112 my $xor = urxvt::RS_RVid | urxvt::RS_Blink;
111 for (@{ $self->{found} }) { 113 for (@{ $self->{found} }) {
112 $self->scr_xor_span (@$_, $xor); 114 $self->scr_xor_span (@$_, $xor);
113 $xor = urxvt::RS_RVid; 115 $xor = urxvt::RS_RVid;
114 } 116 }
115 117
119sub key_press { 121sub key_press {
120 my ($self, $event, $keysym, $string) = @_; 122 my ($self, $event, $keysym, $string) = @_;
121 123
122 delete $self->{manpage_overlay}; 124 delete $self->{manpage_overlay};
123 125
124 if ($keysym == 0xff0d || $keysym == 0xff8d) { 126 if ($keysym == 0xff0d || $keysym == 0xff8d) { # enter
125 if ($self->{found}) { 127 if ($self->{found}) {
126 my ($br, $bc, $er, $ec) = @{ $self->{found}[0] }; 128 my ($br, $bc, $er, $ec) = @{ $self->{found}[0] };
127 $self->selection_beg ($br, $bc); 129 $self->selection_beg ($br, $bc);
128 $self->selection_end ($er, $ec); 130 $self->selection_end ($er, $ec);
129 $self->selection_make ($event->{time}); 131 $self->selection_make ($event->{time});
130 } 132 }
131 $self->leave; 133 $self->leave;
132 } elsif ($keysym == 0xff1b) { 134 } elsif ($keysym == 0xff1b) { # escape
133 $self->view_start ($self->{view_start}); 135 $self->view_start ($self->{view_start});
134 $self->leave; 136 $self->leave;
135 } elsif ($keysym == 0xff57) { 137 } elsif ($keysym == 0xff57) { # end
136 $self->{row} = $self->nrow - 1; 138 $self->{row} = $self->nrow - 1;
137 $self->view_start (0); 139 $self->view_start (0);
138 } elsif ($keysym == 0xff52) { 140 } elsif ($keysym == 0xff52) { # up
139 $self->{row}-- if $self->{row} > -$self->nsaved; 141 $self->{row}-- if $self->{row} > $self->top_row;
140 $self->search (-1); 142 $self->search (-1);
141 } elsif ($keysym == 0xff54) { 143 } elsif ($keysym == 0xff54) { # down
142 $self->{row}++ if $self->{row} < $self->nrow; 144 $self->{row}++ if $self->{row} < $self->nrow;
143 $self->search (+1); 145 $self->search (+1);
144 } elsif ($string eq "n") {
145 if ($self->{found} && @{ $self->{found} }) {
146 push @{ $self->{history} }, [$self->view_start, $self->{found}];
147 $self->search (-1);
148 $self->idle;
149 }
150 } elsif ($string eq "p" or $string eq "N") {
151 if (my $prev = pop @{ $self->{history} }) {
152 $self->view_start ($prev->[0]);
153 $self->{found} = $prev->[1];
154 $self->want_refresh;
155 }
156 } elsif ($keysym == 0xff08) { 146 } elsif ($keysym == 0xff08) { # backspace
157 substr $self->{search}, -1, 1, ""; 147 substr $self->{search}, -1, 1, "";
158 $self->search; 148 $self->search;
159 $self->idle; 149 $self->idle;
160 } elsif ($string =~ /^[^\x00-\x1f\x80-\xaf]+$/) { 150 } elsif ($string !~ /[\x00-\x1f\x80-\xaf]/) {
161 return; # pass to tt_write 151 return; # pass to tt_write
162 } 152 }
163 153
164 1 154 1
165} 155}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines