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.23 by ayin, Wed Aug 1 17:55:37 2007 UTC

… …
13 or warn "unable to register '$hotkey' as scrollback search start hotkey\n"; 13 or warn "unable to register '$hotkey' as scrollback search start hotkey\n";
14 14
15 () 15 ()
16} 16}
17 17
18sub on_keyboard_command { 18sub on_user_command {
19 my ($self, $cmd) = @_; 19 my ($self, $cmd) = @_;
20 20
21 $cmd eq "searchable-scrollback:start" 21 $cmd eq "searchable-scrollback:start"
22 and $self->enter; 22 and $self->enter;
23 23
… …
37 return if $self->{overlay}; 37 return if $self->{overlay};
38 38
39 $self->{view_start} = $self->view_start; 39 $self->{view_start} = $self->view_start;
40 $self->{pty_ev_events} = $self->pty_ev_events (urxvt::EVENT_NONE); 40 $self->{pty_ev_events} = $self->pty_ev_events (urxvt::EVENT_NONE);
41 $self->{row} = $self->nrow - 1; 41 $self->{row} = $self->nrow - 1;
42 $self->{search} = "(?i)";
42 43
43 $self->enable ( 44 $self->enable (
44 key_press => \&key_press, 45 key_press => \&key_press,
45 tt_write => \&tt_write, 46 tt_write => \&tt_write,
46 refresh_begin => \&refresh, 47 refresh_begin => \&refresh,
… …
78 my $row = $self->{row}; 79 my $row = $self->{row};
79 80
80 my $search = $self->special_encode ($self->{search}); 81 my $search = $self->special_encode ($self->{search});
81 82
82 no re 'eval'; # just to be sure 83 no re 'eval'; # just to be sure
83 my $re = qr/$search/; 84 if (my $re = eval { qr/$search/ }) {
85 while ($self->nrow > $row && $row > $self->top_row) {
86 my $line = $self->line ($row)
87 or last;
84 88
85 while ($self->nrow > $row && $row > -$self->nsaved) { 89 my $text = $line->t;
86 my $line = $self->line ($row) 90 if ($text =~ /$re/g) {
87 or last; 91 do {
92 push @{ $self->{found} }, [$line->coord_of ($-[0]), $line->coord_of ($+[0])];
93 } while $text =~ /$re/g;
88 94
89 my $text = $line->t; 95 $self->{row} = $row;
90 if ($text =~ /$re/g) { 96 $self->view_start (List::Util::min 0, $row - ($self->nrow >> 1));
97 $self->want_refresh;
98 last;
91 do { 99 }
92 push @{ $self->{found} }, [$line->coord_of ($-[0]), $line->coord_of ($+[0])];
93 } while $text =~ /$re/g;
94 100
95 $self->{row} = $row; 101 $row = $dir < 0 ? $line->beg - 1 : $line->end + 1;
96 $self->view_start (-$row + ($self->nrow >> 1));
97 $self->want_refresh;
98 last;
99 } 102 }
100
101 $row = $dir < 0 ? $line->beg - 1 : $line->end + 1;
102 } 103 }
103 104
104 $self->scr_bell unless $self->{found}; 105 $self->scr_bell unless $self->{found};
105} 106}
106 107
107sub refresh { 108sub refresh {
108 my ($self) = @_; 109 my ($self) = @_;
109 110
111 return unless $self->{found};
112
110 my $xor = urxvt::RS_RVid | urxvt::RS_Uline; 113 my $xor = urxvt::RS_RVid | urxvt::RS_Blink;
111 for (@{ $self->{found} }) { 114 for (@{ $self->{found} }) {
112 $self->scr_xor_span (@$_, $xor); 115 $self->scr_xor_span (@$_, $xor);
113 $xor = urxvt::RS_RVid; 116 $xor = urxvt::RS_RVid;
114 } 117 }
115 118
… …
119sub key_press { 122sub key_press {
120 my ($self, $event, $keysym, $string) = @_; 123 my ($self, $event, $keysym, $string) = @_;
121 124
122 delete $self->{manpage_overlay}; 125 delete $self->{manpage_overlay};
123 126
124 if ($keysym == 0xff0d || $keysym == 0xff8d) { 127 if ($keysym == 0xff0d || $keysym == 0xff8d) { # enter
125 if ($self->{found}) { 128 if ($self->{found} && $event->{state} & urxvt::ShiftMask) {
126 my ($br, $bc, $er, $ec) = @{ $self->{found}[0] }; 129 my ($br, $bc, $er, $ec) = @{ $self->{found}[0] };
127 $self->selection_beg ($br, $bc); 130 $self->selection_beg ($br, $bc);
128 $self->selection_end ($er, $ec); 131 $self->selection_end ($er, $ec);
129 $self->selection_make ($event->{time}); 132 $self->selection_make ($event->{time});
130 } 133 }
131 $self->leave; 134 $self->leave;
132 } elsif ($keysym == 0xff1b) { 135 } elsif ($keysym == 0xff1b) { # escape
133 $self->view_start ($self->{view_start}); 136 $self->view_start ($self->{view_start});
134 $self->leave; 137 $self->leave;
135 } elsif ($keysym == 0xff57) { 138 } elsif ($keysym == 0xff57) { # end
136 $self->{row} = $self->nrow - 1; 139 $self->{row} = $self->nrow - 1;
137 $self->view_start (0); 140 $self->view_start (0);
138 } elsif ($keysym == 0xff52) { 141 } elsif ($keysym == 0xff52) { # up
139 $self->{row}-- if $self->{row} > -$self->nsaved; 142 $self->{row}-- if $self->{row} > $self->top_row;
140 $self->search (-1); 143 $self->search (-1);
141 } elsif ($keysym == 0xff54) { 144 } elsif ($keysym == 0xff54) { # down
142 $self->{row}++ if $self->{row} < $self->nrow; 145 $self->{row}++ if $self->{row} < $self->nrow;
143 $self->search (+1); 146 $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) { 147 } elsif ($keysym == 0xff08) { # backspace
157 substr $self->{search}, -1, 1, ""; 148 substr $self->{search}, -1, 1, "";
158 $self->search; 149 $self->search;
159 $self->idle; 150 $self->idle;
160 } elsif ($string =~ /^[^\x00-\x1f\x80-\xaf]+$/) { 151 } elsif ($string !~ /[\x00-\x1f\x80-\xaf]/) {
161 return; # pass to tt_write 152 return; # pass to tt_write
162 } 153 }
163 154
164 1 155 1
165} 156}
166 157
167sub tt_write { 158sub tt_write {
168 my ($self, $data) = @_; 159 my ($self, $data) = @_;
169 160
170 $self->{search} .= $self->locale_decode ($data); 161 $self->{search} .= $self->locale_decode ($data);
162
163 $self->{search} =~ s/^\(\?i\)//
164 if $self->{search} =~ /^\(.*[[:upper:]]/;
165
171 $self->search (-1); 166 $self->search (-1);
172 $self->idle; 167 $self->idle;
173 168
174 1 169 1
175} 170}

Diff Legend

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