ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/perl/matcher
(Generate patch)

Comparing rxvt-unicode/src/perl/matcher (file contents):
Revision 1.19 by sf-exg, Sat Jun 7 20:07:38 2014 UTC vs.
Revision 1.41 by sf-exg, Sun May 28 10:40:41 2023 UTC

1#! perl 1#! perl
2 2
3# Author: Tim Pope <rxvt-unicodeNOSPAM@tpope.org> 3# Author: Tim Pope <rxvt-unicodeNOSPAM@tpope.org>
4# Bob Farrell <robertanthonyfarrell@gmail.com> 4# Bob Farrell <robertanthonyfarrell@gmail.com>
5# Emanuele Giaquinta
5 6
6#:META:RESOURCE:%.launcher:string:default launcher command 7#:META:RESOURCE:%.launcher:string:default launcher command
7#:META:RESOURCE:%.button:string:the button, yeah 8#:META:RESOURCE:%.button:string:the mouse button used to activate a match
8#:META:RESOURCE:%.pattern.:string:extra pattern to match 9#:META:RESOURCE:%.pattern.:string:extra pattern to match
9#:META:RESOURCE:%.launcher.:string:custom launcher for pattern 10#:META:RESOURCE:%.launcher.:string:custom launcher for pattern
10#:META:RESOURCE:%.rend.:string:custom rednition for pattern 11#:META:RESOURCE:%.rend.:string:custom rendition for pattern
11 12
12=head1 NAME 13=head1 NAME
13 14
14matcher - match strings in terminal output and change their rendition 15matcher - match strings in terminal output and change their rendition
15 16
… …
18Uses per-line display filtering (C<on_line_update>) to underline text 19Uses per-line display filtering (C<on_line_update>) to underline text
19matching a certain pattern and make it clickable. When clicked with the 20matching a certain pattern and make it clickable. When clicked with the
20mouse button specified in the C<matcher.button> resource (default 2, or 21mouse button specified in the C<matcher.button> resource (default 2, or
21middle), the program specified in the C<matcher.launcher> resource 22middle), the program specified in the C<matcher.launcher> resource
22(default, the C<url-launcher> resource, C<sensible-browser>) will be started 23(default, the C<url-launcher> resource, C<sensible-browser>) will be started
23with the matched text as first argument. The default configuration is 24with the matched text as first argument. The default configuration is
24suitable for matching URLs and launching a web browser, like the 25suitable for matching URLs and launching a web browser, like the
25former "mark-urls" extension. 26former "mark-urls" extension.
26 27
27The default pattern to match URLs can be overridden with the 28The default pattern to match URLs can be overridden with the
28C<matcher.pattern.0> resource, and additional patterns can be specified 29C<matcher.pattern.0> resource, and additional patterns can be specified
29with numbered patterns, in a manner similar to the "selection" extension. 30with numbered patterns, in a manner similar to the "selection" extension.
30The launcher can also be overridden on a per-pattern basis. 31The launcher can also be overridden on a per-pattern basis.
31 32
32It is possible to activate the most recently seen match or a list of matches 33It is possible to activate the most recently seen match or a list of matches
33from the keyboard. Simply bind a keysym to "perl:matcher:last" or 34from the keyboard. Simply bind a keysym to "matcher:last" or
34"perl:matcher:list" as seen in the example below. 35"matcher:list" as seen in the example below.
36
37The C<matcher:select> action enables a mode in which it is possible to
38iterate over the matches using the keyboard and either activate them
39or copy them to the clipboard. While the mode is active, normal terminal
40input/output is suspended and the following bindings are recognized:
41
42=over
43
44=item C<Up>
45
46Search for a match upwards.
47
48=item C<Down>
49
50Search for a match downwards.
51
52=item C<Home>
53
54Jump to the topmost match.
55
56=item C<End>
57
58Jump to the bottommost match.
59
60=item C<Escape>
61
62Leave the mode and return to the point where search was started.
63
64=item C<Enter>
65
66Activate the current match.
67
68=item C<y>
69
70Copy the current match to the clipboard.
71
72=back
73
74It is also possible to cycle through the matches using a key
75combination bound to the C<matcher:select> action.
35 76
36Example: load and use the matcher extension with defaults. 77Example: load and use the matcher extension with defaults.
37 78
38 URxvt.perl-ext: default,matcher 79 URxvt.perl-ext: default,matcher
39 80
40Example: use a custom configuration. 81Example: use a custom configuration.
41 82
42 URxvt.url-launcher: sensible-browser 83 URxvt.url-launcher: sensible-browser
43 URxvt.keysym.C-Delete: perl:matcher:last 84 URxvt.keysym.C-Delete: matcher:last
44 URxvt.keysym.M-Delete: perl:matcher:list 85 URxvt.keysym.M-Delete: matcher:list
45 URxvt.matcher.button: 1 86 URxvt.matcher.button: 1
46 URxvt.matcher.pattern.1: \\bwww\\.[\\w-]+\\.[\\w./?&@#-]*[\\w/-] 87 URxvt.matcher.pattern.1: \\bwww\\.[\\w-]+\\.[\\w./?&@#-]*[\\w/-]
47 URxvt.matcher.pattern.2: \\B(/\\S+?):(\\d+)(?=:|$) 88 URxvt.matcher.pattern.2: \\B(/\\S+?):(\\d+)(?=:|$)
48 URxvt.matcher.launcher.2: gvim +$2 $1 89 URxvt.matcher.launcher.2: gvim +$2 $1
49 90
91=head2 Regex encoding/wide character matching
92
93Urxvt stores all text as unicode, in a special encoding that uses
94one character/code point per column. For various reasons, the regular
95expressions are matched directly against this encoding, which means there are a few things
96you need to keep in mind:
97
98=over
99
100=item X resources/command line arguments are locale-encoded
101
102The regexes taken from the command line or resources will be converted
103from locale encoding to unicode. This can change the number of code points
104per character.
105
106=item Wide characters are column-padded with C<$urxvt::NOCHAR>
107
108Wide characters (such as kanji and sometimes tabs) are padded with
109a special character value (C<$urxvt::NOCHAR>). That means that
110constructs such as C<\w> or C<.> will only match part of a character, as
111C<$urxvt::NOCHAR> is not matched by C<\w> and both only match the first
112"column" of a wide character.
113
114That means you have to incorporate C<$urxvt::NOCHAR> into parts of regexes
115that may match wide characters. For example, to match C<\w+> you might
116want to use C<[\w$urxvt::NOCHAR]+> instead, and to match a single character
117(C<.>) you might want to use C<.$urxvt::NOCHAR*> instead.
118
119=back
120
50=cut 121=cut
51 122
52my $url = 123my $url =
53 qr{ 124 qr{
54 (?:https?://|ftp://|news://|mailto:|file://|\bwww\.) 125 (?:https?://|ftp://|news://|mailto:|file://|\bwww\.)
55 [\w\-\@;\/?:&=%\$.+!*\x27,~#]* 126 [\w\-\@;\/?:&=%\$.+!*\x27,~#$urxvt::NOCHAR]*
56 ( 127 (
57 \([\w\-\@;\/?:&=%\$.+!*\x27,~#]*\)| # Allow a pair of matched parentheses 128 \([\w\-\@;\/?:&=%\$.+!*\x27,~#$urxvt::NOCHAR]*\)| # Allow a pair of matched parentheses
58 [\w\-\@;\/?:&=%\$+*~] # exclude some trailing characters (heuristic) 129 [\w\-\@;\/?:&=%\$+*~] # exclude some trailing characters (heuristic)
59 )+ 130 )+
60 }x; 131 }x;
61 132
62sub on_key_press { 133sub matchlist_key_press {
63 my ($self, $event, $keysym, $octets) = @_; 134 my ($self, $event, $keysym, $octets) = @_;
64 135
65 return unless $self->{overlay};
66
67 delete $self->{overlay}; 136 delete $self->{overlay};
137 $self->disable ("key_press");
68 138
69 my $i = ($keysym == 96 ? 0 : $keysym - 48); 139 my $i = ($keysym == 96 ? 0 : $keysym - 48);
70 if ($i >= 0 && $i < @{ $self->{matches} }) { 140 if ($i >= 0 && $i < @{ $self->{matches} }) {
71 my @exec = @{ $self->{matches}[$i] }; 141 my @exec = @{ $self->{matches}[$i] };
72 shift @exec;
73 $self->exec_async (@exec); 142 $self->exec_async (@exec[5 .. $#exec]);
74 } 143 }
75 144
76 1 145 1
77} 146}
78 147
79# backwards compat 148# backwards compat
80sub on_user_command { 149sub on_user_command {
81 my ($self, $cmd) = @_; 150 my ($self, $cmd) = @_;
82 151
83 if ($cmd =~ s/^matcher:list\b//) { 152 if ($cmd eq "matcher:list") {
84 $self->matchlist; 153 $self->matchlist;
85 } else { 154 } elsif ($cmd eq "matcher:last") {
86 if ($cmd =~ s/^matcher:last\b//) {
87 $self->most_recent; 155 $self->most_recent;
156 } elsif ($cmd eq "matcher:select") {
157 $self->select_enter;
88 } elsif ($cmd =~ s/^matcher\b//) { 158 } elsif ($cmd eq "matcher") {
89 # for backward compatibility 159 # for backward compatibility
90 $self->most_recent; 160 $self->most_recent;
91 } 161 }
162
163 ()
164}
165
166sub on_action {
167 my ($self, $action) = @_;
168
169 if ($action eq "list") {
170 $self->matchlist;
171 } elsif ($action eq "last") {
172 $self->most_recent;
173 } elsif ($action eq "select") {
174 $self->select_enter;
92 } 175 }
93 176
94 () 177 ()
95} 178}
96 179
97sub matchlist { 180sub matchlist {
98 my ($self) = @_; 181 my ($self) = @_;
99 182
100 @{ $self->{matches} } = (); 183 $self->{matches} = [];
101 my $row = $self->nrow - 1; 184 my $row = $self->nrow - 1;
102 while ($row >= 0 && @{ $self->{matches} } < 10) { 185 while ($row >= 0 && @{ $self->{matches} } < 10) {
103 my $line = $self->line ($row); 186 my $line = $self->line ($row);
104 my $text = $line->t; 187 my @matches = $self->find_matches ($row);
105 188
106 # FIXME: code duplicated from 'command_for'
107 my @matches;
108 for my $matcher (@{$self->{matchers}}) {
109 my $launcher = $matcher->[1] || $self->{launcher};
110 while ($text =~ /$matcher->[0]/g) {
111 my $match = substr ($text, $-[0], $+[0] - $-[0]);
112 my @beg = @-;
113 my @end = @+;
114 my @exec;
115
116 if ($launcher !~ /\$/) {
117 @exec = ($launcher, $match);
118 } else {
119 @exec = map { s/\$(\d+)|\$\{(\d+)\}/
120 substr ($text, $beg[$1 || $2], $end[$1 || $2] - $beg[$1 || $2])
121 /egx; $_ } split /\s+/, $launcher;
122 }
123
124 push @matches, [ $beg[0], $match, @exec ];
125 }
126 }
127
128 for (sort { $b->[0] <=> $a->[0] } @matches) { 189 for (sort { $b->[0] <=> $a->[0] or $b->[1] <=> $a->[1] } @matches) {
129 shift @$_;
130 push @{ $self->{matches} }, $_; 190 push @{ $self->{matches} }, $_;
131 last if @{ $self->{matches} } == 10; 191 last if @{ $self->{matches} } == 10;
132 } 192 }
133 193
134 $row = $line->beg - 1; 194 $row = $line->beg - 1;
… …
138 198
139 my $width = 0; 199 my $width = 0;
140 200
141 my $i = 0; 201 my $i = 0;
142 for my $match (@{ $self->{matches} }) { 202 for my $match (@{ $self->{matches} }) {
143 my $text = $match->[0]; 203 my $text = $match->[4];
144 my $w = $self->strwidth ("$i-$text"); 204 my $w = $self->strwidth ("$i-$text");
145 205
146 $width = $w if $w > $width; 206 $width = $w if $w > $width;
147 $i++; 207 $i++;
148 } 208 }
… …
150 $width = $self->ncol - 2 if $width > $self->ncol - 2; 210 $width = $self->ncol - 2 if $width > $self->ncol - 2;
151 211
152 $self->{overlay} = $self->overlay (0, 0, $width, scalar (@{ $self->{matches} }), urxvt::OVERLAY_RSTYLE, 2); 212 $self->{overlay} = $self->overlay (0, 0, $width, scalar (@{ $self->{matches} }), urxvt::OVERLAY_RSTYLE, 2);
153 my $i = 0; 213 my $i = 0;
154 for my $match (@{ $self->{matches} }) { 214 for my $match (@{ $self->{matches} }) {
155 my $text = $match->[0]; 215 my $text = $match->[4];
156 216
157 $self->{overlay}->set (0, $i, "$i-$text"); 217 $self->{overlay}->set (0, $i, "$i-$text");
158 $i++; 218 $i++;
159 } 219 }
160 220
221 $self->enable (key_press => \&matchlist_key_press);
161} 222}
162 223
163sub most_recent { 224sub most_recent {
164 my ($self) = shift; 225 my ($self) = @_;
165 my $row = $self->nrow; 226 my $row = $self->nrow - 1;
166 my @exec; 227
167 while($row-- > $self->top_row) { 228 while ($row >= $self->top_row) {
229 my $line = $self->line ($row);
168 @exec = $self->command_for($row); 230 my @exec = $self->command_for ($row);
169 last if(@exec);
170 }
171 if(@exec) { 231 if (@exec) {
172 return $self->exec_async (@exec); 232 return $self->exec_async (@exec);
233 }
234
235 $row = $line->beg - 1;
173 } 236 }
237
174 () 238 ()
175} 239}
176 240
177sub my_resource { 241sub my_resource {
178 $_[0]->x_resource ("%.$_[1]") 242 $_[0]->x_resource ("%.$_[1]")
… …
196sub on_start { 260sub on_start {
197 my ($self) = @_; 261 my ($self) = @_;
198 262
199 $self->{launcher} = $self->my_resource ("launcher") || $self->x_resource("url-launcher") || "sensible-browser"; 263 $self->{launcher} = $self->my_resource ("launcher") || $self->x_resource("url-launcher") || "sensible-browser";
200 264
201 $self->{matches} = [];
202 $self->{button} = 2; 265 $self->{button} = 2;
203 $self->{state} = 0; 266 $self->{state} = 0;
204 if($self->{argv}[0] || $self->my_resource ("button")) { 267 if($self->{argv}[0] || $self->my_resource ("button")) {
205 my @mods = split '', $self->{argv}[0] || $self->my_resource ("button"); 268 my @mods = split '', $self->{argv}[0] || $self->my_resource ("button");
206 for my $mod (@mods) { 269 for my $mod (@mods) {
… …
218 } 281 }
219 } 282 }
220 283
221 my @defaults = ($url); 284 my @defaults = ($url);
222 my @matchers; 285 my @matchers;
223 for (my $idx = 0; defined (my $res = $self->my_resource ("pattern.$idx") || $defaults[$idx]); $idx++) { 286 for (my $idx = 0; defined (my $res = $self->locale_decode ($self->my_resource ("pattern.$idx")) || $defaults[$idx]); $idx++) {
224 $res = $self->locale_decode ($res);
225 utf8::encode $res;
226 my $launcher = $self->my_resource ("launcher.$idx"); 287 my $launcher = $self->my_resource ("launcher.$idx");
227 $launcher =~ s/\$&|\$\{&\}/\${0}/g if $launcher; 288 $launcher =~ s/\$&|\$\{&\}/\${0}/g if $launcher;
228 my $rend = $self->parse_rend($self->my_resource ("rend.$idx")); 289 my $rend = $self->parse_rend($self->my_resource ("rend.$idx"));
229 unshift @matchers, [qr($res)x,$launcher,$rend]; 290 unshift @matchers, [qr($res)x,$launcher,$rend];
230 } 291 }
… …
237 my ($self, $row) = @_; 298 my ($self, $row) = @_;
238 299
239 # fetch the line that has changed 300 # fetch the line that has changed
240 my $line = $self->line ($row); 301 my $line = $self->line ($row);
241 my $text = $line->t; 302 my $text = $line->t;
242 my $i = 0; 303 my $rend;
243 304
244 # find all urls (if any) 305 # find all urls (if any)
245 for my $matcher (@{$self->{matchers}}) { 306 for my $matcher (@{$self->{matchers}}) {
246 while ($text =~ /$matcher->[0]/g) { 307 while ($text =~ /$matcher->[0]/g) {
247 #print "$&\n"; 308 #print "$&\n";
248 my $rend = $line->r; 309 $rend ||= $line->r;
249 310
250 # mark all characters as underlined. we _must_ not toggle underline, 311 # mark all characters as underlined. we _must_ not toggle underline,
251 # as we might get called on an already-marked url. 312 # as we might get called on an already-marked url.
252 &{$matcher->[2]} 313 &{$matcher->[2]}
253 for @{$rend}[ $-[0] .. $+[0] - 1]; 314 for @{$rend}[$-[0] .. $+[0] - 1];
254
255 $line->r ($rend);
256 } 315 }
257 } 316 }
317
318 $line->r ($rend) if $rend;
258 319
259 () 320 ()
260} 321}
261 322
262sub valid_button { 323sub valid_button {
… …
265 | urxvt::ShiftMask | urxvt::ControlMask; 326 | urxvt::ShiftMask | urxvt::ControlMask;
266 return ($event->{button} == $self->{button} && 327 return ($event->{button} == $self->{button} &&
267 ($event->{state} & $mask) == $self->{state}); 328 ($event->{state} & $mask) == $self->{state});
268} 329}
269 330
270sub command_for { 331sub find_matches {
271 my ($self, $row, $col) = @_; 332 my ($self, $row, $col) = @_;
272 my $line = $self->line ($row); 333 my $line = $self->line ($row);
273 my $text = $line->t; 334 my $text = $line->t;
335 my $off = $line->offset_of ($row, $col) if defined $col;
274 336
337 my @matches;
275 for my $matcher (@{$self->{matchers}}) { 338 for my $matcher (@{$self->{matchers}}) {
276 my $launcher = $matcher->[1] || $self->{launcher}; 339 my $launcher = $matcher->[1] || $self->{launcher};
277 while (($text =~ /$matcher->[0]/g)) { 340 while ($text =~ /$matcher->[0]/g) {
278 my $match = $&; 341 my $match = substr $text, $-[0], $+[0] - $-[0];
279 my @begin = @-; 342 my @begin = @-;
280 my @end = @+; 343 my @end = @+;
344 my @exec;
345
281 if (!defined($col) || ($-[0] <= $col && $+[0] >= $col)) { 346 if (!(defined $off) || ($-[0] <= $off && $+[0] >= $off)) {
282 if ($launcher !~ /\$/) { 347 if ($launcher !~ /\$/) {
283 return ($launcher,$match); 348 @exec = ($launcher, $match);
284 } else { 349 } else {
285 # It'd be nice to just access a list like ($&,$1,$2...), 350 # It'd be nice to just access a list like ($&,$1,$2...),
286 # but alas, m//g behaves differently in list context. 351 # but alas, m//g behaves differently in list context.
287 my @exec = map { s/\$(\d+)|\$\{(\d+)\}/ 352 @exec = map {
353 s{\$(\d+)|\$\{(\d+)\}}{
288 substr($text,$begin[$1||$2],$end[$1||$2]-$begin[$1||$2]) 354 substr $text, $begin[$1 || $2], $end[$1 || $2] - $begin[$1 || $2]
355 }egx;
356 $_
289 /egx; $_ } split(/\s+/, $launcher); 357 } split /\s+/, $launcher;
290 return @exec;
291 } 358 }
359
360 push @matches, [ $line->coord_of ($begin[0]), $line->coord_of ($end[0]), $match, @exec ];
292 } 361 }
293 } 362 }
363 }
364
365 @matches
366}
367
368sub command_for {
369 my ($self, $row, $col) = @_;
370
371 my @matches = $self->find_matches ($row, $col);
372 if (@matches) {
373 my @match = @{ $matches[0] };
374 return @match[5 .. $#match];
294 } 375 }
295 376
296 () 377 ()
297} 378}
298 379
299sub on_button_press { 380sub on_button_press {
300 my ($self, $event) = @_; 381 my ($self, $event) = @_;
382
383 if (
301 if($self->valid_button($event) 384 $self->valid_button ($event)
302 && (my @exec = $self->command_for($event->{row},$event->{col}))) { 385 && (my @exec = $self->command_for ($event->{row}, $event->{col}))
386 ) {
303 $self->{row} = $event->{row}; 387 $self->{row} = $event->{row};
304 $self->{col} = $event->{col}; 388 $self->{col} = $event->{col};
305 $self->{cmd} = \@exec; 389 $self->{cmd} = \@exec;
306 return 1; 390 return 1;
307 } else { 391 } else {
… …
320 my $col = delete $self->{col}; 404 my $col = delete $self->{col};
321 my $cmd = delete $self->{cmd}; 405 my $cmd = delete $self->{cmd};
322 406
323 return if !defined $row; 407 return if !defined $row;
324 408
325 if($row == $event->{row} && abs($col-$event->{col}) < 2 409 if (
410 $row == $event->{row}
411 && (abs $col-$event->{col}) < 2
326 && join("\x00", @$cmd) eq join("\x00", $self->command_for($row,$col))) { 412 && (join "\x00", @$cmd) eq (join "\x00", $self->command_for ($row, $col))
413 ) {
327 if($self->valid_button($event)) { 414 if ($self->valid_button ($event)) {
328
329 $self->exec_async (@$cmd); 415 $self->exec_async (@$cmd);
330
331 } 416 }
332 } 417 }
333 418
334 1; 419 1;
335} 420}
336 421
422sub select_enter {
423 my ($self) = @_;
424
425 $self->{view_start} = $self->view_start;
426 $self->{pty_ev_events} = $self->pty_ev_events (urxvt::EV_NONE);
427 $self->{cur_row} = $self->nrow - 1;
428
429 $self->enable (
430 key_press => \&select_key_press,
431 refresh_begin => \&select_refresh,
432 refresh_end => \&select_refresh,
433 );
434
435 $self->{overlay} = $self->overlay (0, -1, $self->ncol, 1, urxvt::OVERLAY_RSTYLE, 0);
436 $self->{overlay}->set (0, 0, "match-select");
437}
438
439sub select_leave {
440 my ($self) = @_;
441
442 $self->disable ("key_press", "refresh_begin", "refresh_end");
443 $self->pty_ev_events ($self->{pty_ev_events});
444
445 delete $self->{overlay};
446 delete $self->{matches};
447 delete $self->{id};
448}
449
450sub select_search {
451 my ($self, $dir, $row) = @_;
452
453 while ($self->nrow > $row && $row >= $self->top_row) {
454 my $line = $self->line ($row)
455 or last;
456
457 my @matches = $self->find_matches ($row);
458 if (@matches) {
459 @matches = sort { $a->[0] <=> $b->[0] or $a->[1] <=> $b->[1] } @matches;
460 $self->{matches} = \@matches;
461 $self->{cur_row} = $row;
462 $self->{id} = $dir < 0 ? @{ $self->{matches} } - 1 : 0;
463 $self->view_start ($row - ($self->nrow >> 1));
464 $self->want_refresh;
465 return 1;
466 }
467
468 $row = $dir < 0 ? $line->beg - 1 : $line->end + 1;
469 }
470
471 $self->scr_bell;
472
473 ()
474}
475
476sub select_refresh {
477 my ($self) = @_;
478
479 return unless $self->{matches};
480
481 my $cur = $self->{matches}[$self->{id}];
482 $self->scr_xor_span (@$cur[0 .. 3], urxvt::RS_RVid);
483
484 ()
485}
486
487sub select_key_press {
488 my ($self, $event, $keysym, $string) = @_;
489
490 if ($keysym == 0xff0d || $keysym == 0xff8d) { # enter
491 if ($self->{matches}) {
492 my @match = @{ $self->{matches}[$self->{id}] };
493 $self->exec_async (@match[5 .. $#match]);
494 }
495 $self->select_leave;
496 } elsif ($keysym == 0x79) { # y
497 if ($self->{matches}) {
498 $self->selection ($self->{matches}[$self->{id}][4], 1);
499 $self->selection_grab (urxvt::CurrentTime, 1);
500 }
501 $self->select_leave;
502 } elsif ($keysym == 0xff1b) { # escape
503 $self->view_start ($self->{view_start});
504 $self->select_leave;
505 } elsif ($keysym == 0xff50) { # home
506 $self->select_search (+1, $self->top_row)
507 } elsif ($keysym == 0xff57) { # end
508 $self->select_search (-1, $self->nrow - 1)
509 } elsif ($keysym == 0xff52) { # up
510 if ($self->{id} > 0) {
511 $self->{id}--;
512 $self->want_refresh;
513 } else {
514 my $line = $self->line ($self->{cur_row});
515 $self->select_search (-1, $line->beg - 1)
516 if $line->beg > $self->top_row;
517 }
518 } elsif ($keysym == 0xff54) { # down
519 if ($self->{id} < @{ $self->{matches} } - 1) {
520 $self->{id}++;
521 $self->want_refresh;
522 } else {
523 my $line = $self->line ($self->{cur_row});
524 $self->select_search (+1, $line->end + 1)
525 if $line->end < $self->nrow;
526 }
527 } elsif ($self->lookup_keysym ($keysym, $event->{state}) eq "matcher:select") {
528 if ($self->{id} > 0) {
529 $self->{id}--;
530 $self->want_refresh;
531 } else {
532 my $line = $self->line ($self->{cur_row});
533 $self->select_search (-1, $self->nrow - 1)
534 unless $self->select_search (-1, $line->beg - 1);
535 }
536 }
537
538 1
539}
540
337# vim:set sw=3 sts=3 et: 541# vim:set sw=3 sts=3 et:

Diff Legend

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