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.12 by root, Wed Jan 11 02:13:56 2006 UTC vs.
Revision 1.22 by root, Thu Jul 6 18:56:10 2006 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
… …
34sub enter { 34sub enter {
35 my ($self) = @_; 35 my ($self) = @_;
36 36
37 return if $self->{overlay}; 37 return if $self->{overlay};
38 38
39 $self->{history} = [];
40 $self->{view_start} = $self->view_start; 39 $self->{view_start} = $self->view_start;
41 $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;
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,
… …
60 $self->pty_ev_events ($self->{pty_ev_events}); 61 $self->pty_ev_events ($self->{pty_ev_events});
61 62
62 delete $self->{manpage_overlay}; 63 delete $self->{manpage_overlay};
63 delete $self->{overlay}; 64 delete $self->{overlay};
64 delete $self->{history}; 65 delete $self->{history};
66 delete $self->{search};
65} 67}
66 68
67sub idle { 69sub idle {
68 my ($self) = @_; 70 my ($self) = @_;
69 71
70 $self->msg ("escape=exit, enter=accept, /=start search, n=next, p=previous, G=bottom"); 72 $self->msg ("(escape cancels) /$self->{search}█");
71
72 delete $self->{in_search};
73} 73}
74 74
75sub search { 75sub search {
76 my ($self, $offset) = @_; 76 my ($self, $dir) = @_;
77
78 my $row = -$self->view_start + ($self->nrow >> 1) + $offset;
79 77
80 delete $self->{found}; 78 delete $self->{found};
79 my $row = $self->{row};
81 80
82 my $search = $self->special_encode ($self->{search}); 81 my $search = $self->special_encode ($self->{search});
83 82
84 no re 'eval'; # just to be sure 83 no re 'eval'; # just to be sure
85 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;
86 88
87 while ($row > -$self->nsaved) { 89 my $text = $line->t;
88 my $line = $self->line ($row) 90 if ($text =~ /$re/g) {
89 or last; 91 do {
92 push @{ $self->{found} }, [$line->coord_of ($-[0]), $line->coord_of ($+[0])];
93 } while $text =~ /$re/g;
90 94
91 my $text = $line->t; 95 $self->{row} = $row;
92 if ($text =~ /$re/g) { 96 $self->view_start (List::Util::min 0, $row - ($self->nrow >> 1));
97 $self->want_refresh;
98 last;
93 do { 99 }
94 push @{ $self->{found} }, [$line->coord_of ($-[0]), $line->coord_of ($+[0])];
95 } while $text =~ /$re/g;
96 100
97 $self->view_start (-$row + ($self->nrow >> 1)); 101 $row = $dir < 0 ? $line->beg - 1 : $line->end + 1;
98 last;
99 } 102 }
100
101 $row = $line->beg - 1;
102 } 103 }
103 104
104 $self->msg ("enter/type/backspace: /$self->{search}_"
105 . ($self->{found} ? "" : " (not found)"));
106 $self->scr_bell unless $self->{found}; 105 $self->scr_bell unless $self->{found};
107} 106}
108 107
109sub refresh { 108sub refresh {
110 my ($self) = @_; 109 my ($self) = @_;
111 110
112 return unless $self->{found}; 111 return unless $self->{found};
113 112
114 $self->scr_xor_span (@$_, urxvt::SET_FGCOLOR (urxvt::RS_RVid, 15)) 113 my $xor = urxvt::RS_RVid | urxvt::RS_Blink;
115 for @{ $self->{found} }; 114 for (@{ $self->{found} }) {
115 $self->scr_xor_span (@$_, $xor);
116 $xor = urxvt::RS_RVid;
117 }
116 118
117 () 119 ()
118} 120}
119 121
120sub key_press { 122sub key_press {
121 my ($self, $event, $keysym, $string) = @_; 123 my ($self, $event, $keysym, $string) = @_;
122 124
123 if (exists $self->{in_search}) { 125 delete $self->{manpage_overlay};
126
124 if ($keysym == 0xff0d || $keysym == 0xff8d) { 127 if ($keysym == 0xff0d || $keysym == 0xff8d) { # enter
125 $self->idle; 128 if ($self->{found}) {
126 } elsif ($keysym == 0xff1b) { 129 my ($br, $bc, $er, $ec) = @{ $self->{found}[0] };
127 $self->view_start ($self->{in_search}); 130 $self->selection_beg ($br, $bc);
128 $self->idle; 131 $self->selection_end ($er, $ec);
129 } elsif ($keysym == 0xff08) { 132 $self->selection_make ($event->{time});
130 substr $self->{search}, -1, 1, "";
131 $self->search;
132 } elsif ($string ne "") {
133 return;
134 } 133 }
135
136 } else {
137 if ($keysym == 0xff0d || $keysym == 0xff8d) {
138 # TODO: set selection
139 $self->leave; 134 $self->leave;
140 } elsif ($keysym == 0xff1b) { 135 } elsif ($keysym == 0xff1b) { # escape
141 $self->view_start ($self->{view_start}); 136 $self->view_start ($self->{view_start});
142 $self->leave; 137 $self->leave;
143 } elsif ($keysym == 0xff52) { 138 } elsif ($keysym == 0xff57) { # end
144 $self->view_start ($self->view_start + 1); 139 $self->{row} = $self->nrow - 1;
145 } elsif ($keysym == 0xff54) {
146 $self->view_start ($self->view_start - 1);
147 } elsif ($string eq "/") {
148 delete $self->{manpage_overlay};
149 $self->{in_search} = $self->view_start;
150 $self->search;
151 } elsif ($string eq "G") {
152 $self->{history} = [];
153 $self->view_start (0); 140 $self->view_start (0);
154 } elsif ($string eq "n") { 141 } elsif ($keysym == 0xff52) { # up
155 if ($self->{found} && @{ $self->{found} }) { 142 $self->{row}-- if $self->{row} > $self->top_row;
156 push @{ $self->{history} }, [$self->view_start, $self->{found}];
157 $self->search (-1); 143 $self->search (-1);
144 } elsif ($keysym == 0xff54) { # down
145 $self->{row}++ if $self->{row} < $self->nrow;
146 $self->search (+1);
147 } elsif ($keysym == 0xff08) { # backspace
148 substr $self->{search}, -1, 1, "";
149 $self->search;
158 $self->idle; 150 $self->idle;
159 } 151 } elsif ($string !~ /[\x00-\x1f\x80-\xaf]/) {
160 } elsif ($string eq "p" or $string eq "N") { 152 return; # pass to tt_write
161 if (my $prev = pop @{ $self->{history} }) {
162 $self->view_start ($prev->[0]);
163 $self->{found} = $prev->[1];
164 $self->want_refresh;
165 }
166 } elsif ($string ne "") {
167 $self->scr_bell;
168 }
169 } 153 }
170 154
171 1 155 1
172} 156}
173 157
174sub tt_write { 158sub tt_write {
175 my ($self, $data) = @_; 159 my ($self, $data) = @_;
176 160
177 $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
178 $self->search; 166 $self->search (-1);
167 $self->idle;
179 168
180 1 169 1
181} 170}
182 171
183 172

Diff Legend

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