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.14 by root, Sat May 17 13:34:35 2014 UTC vs.
Revision 1.40 by root, Fri Dec 9 05:06:46 2022 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:X_RESOURCE:%.launcher:string:default launcher command 7#:META:RESOURCE:%.launcher:string:default launcher command
7#:META:X_RESOURCE:%.button:string:the button, yeah 8#:META:RESOURCE:%.button:string:the mouse button used to activate a match
8#:META:X_RESOURCE:%.pattern.:string:extra pattern to match 9#:META:RESOURCE:%.pattern.:string:extra pattern to match
9#:META:X_RESOURCE:%.launcher.:string:custom launcher for pattern 10#:META:RESOURCE:%.launcher.:string:custom launcher for pattern
10#:META:X_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
17 18
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<urlLauncher> 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 if (! $self->{showing} ) { 136 delete $self->{overlay};
66 return; 137 $self->disable ("key_press");
67 }
68 138
69 my $i = ($keysym == 96 ? 0 : $keysym - 48); 139 my $i = ($keysym == 96 ? 0 : $keysym - 48);
70 if (($i > scalar(@{$self->{urls}})) || ($i < 0)) { 140 if ($i >= 0 && $i < @{ $self->{matches} }) {
71 $self->matchlist(); 141 my @exec = @{ $self->{matches}[$i] };
72 return; 142 $self->exec_async (@exec[5 .. $#exec]);
143 }
144
73 } 145 1
74
75 my @args = ($self->{urls}[ -$i-1 ]);
76 $self->matchlist();
77
78 $self->exec_async( $self->{launcher}, @args );
79} 146}
80 147
81# backwards compat 148# backwards compat
82sub on_user_command { 149sub on_user_command {
83 my ($self, $cmd) = @_; 150 my ($self, $cmd) = @_;
84 151
85 if ($cmd =~ s/^matcher:list\b//) { 152 if ($cmd eq "matcher:list") {
86 $self->matchlist; 153 $self->matchlist;
87 } else { 154 } elsif ($cmd eq "matcher:last") {
88 if ($cmd =~ s/^matcher:last\b//) {
89 $self->most_recent; 155 $self->most_recent;
156 } elsif ($cmd eq "matcher:select") {
157 $self->select_enter;
90 } elsif ($cmd =~ s/^matcher\b//) { 158 } elsif ($cmd eq "matcher") {
91 # for backward compatibility 159 # for backward compatibility
92 $self->most_recent; 160 $self->most_recent;
93 } 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;
94 } 175 }
95 176
96 () 177 ()
97} 178}
98 179
99sub matchlist { 180sub matchlist {
100 my ($self) = @_; 181 my ($self) = @_;
101 if ( $self->{showing} ) { 182
102 $self->{url_overlay}->hide; 183 $self->{matches} = [];
103 $self->{showing} = 0; 184 my $row = $self->nrow - 1;
104 return; 185 while ($row >= 0 && @{ $self->{matches} } < 10) {
105 }
106 @{$self->{urls}} = ();
107 my $line;
108 for (my $i = 0; $i < $self->nrow; $i ++) {
109 $line = $self->line($i); 186 my $line = $self->line ($row);
110 next if ($line->beg != $i); 187 my @matches = $self->find_matches ($row);
111 for my $url ($self->get_urls_from_line($line->t)) { 188
112 if (scalar(@{$self->{urls}}) == 10) { 189 for (sort { $b->[0] <=> $a->[0] or $b->[1] <=> $a->[1] } @matches) {
113 shift @{$self->{urls}};
114 }
115 push @{$self->{urls}}, $url; 190 push @{ $self->{matches} }, $_;
191 last if @{ $self->{matches} } == 10;
116 } 192 }
193
194 $row = $line->beg - 1;
117 } 195 }
118 196
119 if (! scalar(@{$self->{urls}})) { 197 return unless @{ $self->{matches} };
120 return;
121 }
122 198
123 my $max = 0; 199 my $width = 0;
124 my $i = scalar( @{$self->{urls}} ) - 1 ;;
125 200
126 my @temp = ();
127
128 for my $url (@{$self->{urls}}) {
129 my $url = "$i-$url";
130 my $xpos = 0;
131
132 if ($self->ncol + (length $url) >= $self->ncol) {
133 $url = substr( $url, 0, $self->ncol );
134 }
135
136 push @temp, $url;
137
138 if( length $url > $max ) {
139 $max = length $url;
140 }
141
142 $i--;
143 }
144
145 @temp = reverse @temp;
146
147 $self->{url_overlay} = $self->overlay(0, 0, $max, scalar( @temp ), urxvt::OVERLAY_RSTYLE, 2);
148 my $i = 0; 201 my $i = 0;
149 for my $url (@temp) { 202 for my $match (@{ $self->{matches} }) {
150 $self->{url_overlay}->set( 0, $i, $url, [(urxvt::OVERLAY_RSTYLE) x length $url]); 203 my $text = $match->[4];
151 $self->{showing} = 1; 204 my $w = $self->strwidth ("$i-$text");
205
206 $width = $w if $w > $width;
152 $i++; 207 $i++;
153 } 208 }
154 209
210 $width = $self->ncol - 2 if $width > $self->ncol - 2;
211
212 $self->{overlay} = $self->overlay (0, 0, $width, scalar (@{ $self->{matches} }), urxvt::OVERLAY_RSTYLE, 2);
213 my $i = 0;
214 for my $match (@{ $self->{matches} }) {
215 my $text = $match->[4];
216
217 $self->{overlay}->set (0, $i, "$i-$text");
218 $i++;
219 }
220
221 $self->enable (key_press => \&matchlist_key_press);
155} 222}
156 223
157sub most_recent { 224sub most_recent {
158 my ($self) = shift; 225 my ($self) = shift;
159 my $row = $self->nrow; 226 my $row = $self->nrow - 1;
160 my @exec; 227 my @exec;
228
161 while($row-- > $self->top_row) { 229 while ($row >= $self->top_row) {
230 my $line = $self->line ($row);
162 @exec = $self->command_for($row); 231 @exec = $self->command_for ($row);
163 last if(@exec); 232 last if @exec;
233
234 $row = $line->beg - 1;
164 } 235 }
236
165 if(@exec) { 237 if (@exec) {
166 return $self->exec_async (@exec); 238 return $self->exec_async (@exec);
167 } 239 }
240
168 () 241 ()
169} 242}
170 243
171sub my_resource { 244sub my_resource {
172 $_[0]->x_resource ("%.$_[1]") 245 $_[0]->x_resource ("%.$_[1]")
190sub on_start { 263sub on_start {
191 my ($self) = @_; 264 my ($self) = @_;
192 265
193 $self->{launcher} = $self->my_resource ("launcher") || $self->x_resource("url-launcher") || "sensible-browser"; 266 $self->{launcher} = $self->my_resource ("launcher") || $self->x_resource("url-launcher") || "sensible-browser";
194 267
195 $self->{urls} = [];
196 $self->{showing} = 0;
197 $self->{button} = 2; 268 $self->{button} = 2;
198 $self->{state} = 0; 269 $self->{state} = 0;
199 if($self->{argv}[0] || $self->my_resource ("button")) { 270 if($self->{argv}[0] || $self->my_resource ("button")) {
200 my @mods = split '', $self->{argv}[0] || $self->my_resource ("button"); 271 my @mods = split '', $self->{argv}[0] || $self->my_resource ("button");
201 for my $mod (@mods) { 272 for my $mod (@mods) {
213 } 284 }
214 } 285 }
215 286
216 my @defaults = ($url); 287 my @defaults = ($url);
217 my @matchers; 288 my @matchers;
218 for (my $idx = 0; defined (my $res = $self->my_resource ("pattern.$idx") || $defaults[$idx]); $idx++) { 289 for (my $idx = 0; defined (my $res = $self->locale_decode ($self->my_resource ("pattern.$idx")) || $defaults[$idx]); $idx++) {
219 $res = $self->locale_decode ($res);
220 utf8::encode $res;
221 my $launcher = $self->my_resource ("launcher.$idx"); 290 my $launcher = $self->my_resource ("launcher.$idx");
222 $launcher =~ s/\$&|\$\{&\}/\${0}/g if $launcher; 291 $launcher =~ s/\$&|\$\{&\}/\${0}/g if $launcher;
223 my $rend = $self->parse_rend($self->my_resource ("rend.$idx")); 292 my $rend = $self->parse_rend($self->my_resource ("rend.$idx"));
224 unshift @matchers, [qr($res)x,$launcher,$rend]; 293 unshift @matchers, [qr($res)x,$launcher,$rend];
225 } 294 }
226 $self->{matchers} = \@matchers; 295 $self->{matchers} = \@matchers;
227 296
228 () 297 ()
229} 298}
230 299
231sub get_urls_from_line {
232 my ($self, $line) = @_;
233 my @urls;
234 for my $matcher (@{$self->{matchers}}) {
235 while ($line =~ /$matcher->[0]/g) {
236 push @urls, substr( $line, $-[0], $+[0] - $-[0] );
237 }
238 }
239 return @urls;
240}
241
242sub on_line_update { 300sub on_line_update {
243 my ($self, $row) = @_; 301 my ($self, $row) = @_;
244 302
245 # fetch the line that has changed 303 # fetch the line that has changed
246 my $line = $self->line ($row); 304 my $line = $self->line ($row);
247 my $text = $line->t; 305 my $text = $line->t;
248 my $i = 0; 306 my $rend;
249 307
250 # find all urls (if any) 308 # find all urls (if any)
251 for my $matcher (@{$self->{matchers}}) { 309 for my $matcher (@{$self->{matchers}}) {
252 while ($text =~ /$matcher->[0]/g) { 310 while ($text =~ /$matcher->[0]/g) {
253 #print "$&\n"; 311 #print "$&\n";
254 my $rend = $line->r; 312 $rend ||= $line->r;
255 313
256 # mark all characters as underlined. we _must_ not toggle underline, 314 # mark all characters as underlined. we _must_ not toggle underline,
257 # as we might get called on an already-marked url. 315 # as we might get called on an already-marked url.
258 &{$matcher->[2]} 316 &{$matcher->[2]}
259 for @{$rend}[ $-[0] .. $+[0] - 1]; 317 for @{$rend}[$-[0] .. $+[0] - 1];
260
261 $line->r ($rend);
262 } 318 }
263 } 319 }
320
321 $line->r ($rend) if $rend;
264 322
265 () 323 ()
266} 324}
267 325
268sub valid_button { 326sub valid_button {
271 | urxvt::ShiftMask | urxvt::ControlMask; 329 | urxvt::ShiftMask | urxvt::ControlMask;
272 return ($event->{button} == $self->{button} && 330 return ($event->{button} == $self->{button} &&
273 ($event->{state} & $mask) == $self->{state}); 331 ($event->{state} & $mask) == $self->{state});
274} 332}
275 333
276sub command_for { 334sub find_matches {
277 my ($self, $row, $col) = @_; 335 my ($self, $row, $col) = @_;
278 my $line = $self->line ($row); 336 my $line = $self->line ($row);
279 my $text = $line->t; 337 my $text = $line->t;
338 my $off = $line->offset_of ($row, $col) if defined $col;
280 339
340 my @matches;
281 for my $matcher (@{$self->{matchers}}) { 341 for my $matcher (@{$self->{matchers}}) {
282 my $launcher = $matcher->[1] || $self->{launcher}; 342 my $launcher = $matcher->[1] || $self->{launcher};
283 while (($text =~ /$matcher->[0]/g)) { 343 while ($text =~ /$matcher->[0]/g) {
284 my $match = $&; 344 my $match = substr $text, $-[0], $+[0] - $-[0];
285 my @begin = @-; 345 my @begin = @-;
286 my @end = @+; 346 my @end = @+;
347 my @exec;
348
287 if (!defined($col) || ($-[0] <= $col && $+[0] >= $col)) { 349 if (!(defined $off) || ($-[0] <= $off && $+[0] >= $off)) {
288 if ($launcher !~ /\$/) { 350 if ($launcher !~ /\$/) {
289 return ($launcher,$match); 351 @exec = ($launcher, $match);
290 } else { 352 } else {
291 # It'd be nice to just access a list like ($&,$1,$2...), 353 # It'd be nice to just access a list like ($&,$1,$2...),
292 # but alas, m//g behaves differently in list context. 354 # but alas, m//g behaves differently in list context.
293 my @exec = map { s/\$(\d+)|\$\{(\d+)\}/ 355 @exec = map {
356 s{\$(\d+)|\$\{(\d+)\}}{
294 substr($text,$begin[$1||$2],$end[$1||$2]-$begin[$1||$2]) 357 substr $text, $begin[$1 || $2], $end[$1 || $2] - $begin[$1 || $2]
358 }egx;
359 $_
295 /egx; $_ } split(/\s+/, $launcher); 360 } split /\s+/, $launcher;
296 return @exec;
297 } 361 }
362
363 push @matches, [ $line->coord_of ($begin[0]), $line->coord_of ($end[0]), $match, @exec ];
298 } 364 }
299 } 365 }
366 }
367
368 @matches
369}
370
371sub command_for {
372 my ($self, $row, $col) = @_;
373
374 my @matches = $self->find_matches ($row, $col);
375 if (@matches) {
376 my @match = @{ $matches[0] };
377 return @match[5 .. $#match];
300 } 378 }
301 379
302 () 380 ()
303} 381}
304 382
305sub on_button_press { 383sub on_button_press {
306 my ($self, $event) = @_; 384 my ($self, $event) = @_;
385
386 if (
307 if($self->valid_button($event) 387 $self->valid_button ($event)
308 && (my @exec = $self->command_for($event->{row},$event->{col}))) { 388 && (my @exec = $self->command_for ($event->{row}, $event->{col}))
389 ) {
309 $self->{row} = $event->{row}; 390 $self->{row} = $event->{row};
310 $self->{col} = $event->{col}; 391 $self->{col} = $event->{col};
311 $self->{cmd} = \@exec; 392 $self->{cmd} = \@exec;
312 return 1; 393 return 1;
313 } else { 394 } else {
326 my $col = delete $self->{col}; 407 my $col = delete $self->{col};
327 my $cmd = delete $self->{cmd}; 408 my $cmd = delete $self->{cmd};
328 409
329 return if !defined $row; 410 return if !defined $row;
330 411
331 if($row == $event->{row} && abs($col-$event->{col}) < 2 412 if (
413 $row == $event->{row}
414 && (abs $col-$event->{col}) < 2
332 && join("\x00", @$cmd) eq join("\x00", $self->command_for($row,$col))) { 415 && (join "\x00", @$cmd) eq (join "\x00", $self->command_for ($row, $col))
416 ) {
333 if($self->valid_button($event)) { 417 if ($self->valid_button ($event)) {
334
335 $self->exec_async (@$cmd); 418 $self->exec_async (@$cmd);
336
337 } 419 }
338 } 420 }
339 421
340 1; 422 1;
341} 423}
342 424
425sub select_enter {
426 my ($self) = @_;
427
428 $self->{view_start} = $self->view_start;
429 $self->{pty_ev_events} = $self->pty_ev_events (urxvt::EV_NONE);
430 $self->{cur_row} = $self->nrow - 1;
431
432 $self->enable (
433 key_press => \&select_key_press,
434 refresh_begin => \&select_refresh,
435 refresh_end => \&select_refresh,
436 );
437
438 $self->{overlay} = $self->overlay (0, -1, $self->ncol, 1, urxvt::OVERLAY_RSTYLE, 0);
439 $self->{overlay}->set (0, 0, "match-select");
440}
441
442sub select_leave {
443 my ($self) = @_;
444
445 $self->disable ("key_press", "refresh_begin", "refresh_end");
446 $self->pty_ev_events ($self->{pty_ev_events});
447
448 delete $self->{overlay};
449 delete $self->{matches};
450 delete $self->{id};
451}
452
453sub select_search {
454 my ($self, $dir, $row) = @_;
455
456 while ($self->nrow > $row && $row >= $self->top_row) {
457 my $line = $self->line ($row)
458 or last;
459
460 my @matches = $self->find_matches ($row);
461 if (@matches) {
462 @matches = sort { $a->[0] <=> $b->[0] or $a->[1] <=> $b->[1] } @matches;
463 $self->{matches} = \@matches;
464 $self->{cur_row} = $row;
465 $self->{id} = $dir < 0 ? @{ $self->{matches} } - 1 : 0;
466 $self->view_start ($row - ($self->nrow >> 1));
467 $self->want_refresh;
468 return 1;
469 }
470
471 $row = $dir < 0 ? $line->beg - 1 : $line->end + 1;
472 }
473
474 $self->scr_bell;
475
476 ()
477}
478
479sub select_refresh {
480 my ($self) = @_;
481
482 return unless $self->{matches};
483
484 my $cur = $self->{matches}[$self->{id}];
485 $self->scr_xor_span (@$cur[0 .. 3], urxvt::RS_RVid);
486
487 ()
488}
489
490sub select_key_press {
491 my ($self, $event, $keysym, $string) = @_;
492
493 if ($keysym == 0xff0d || $keysym == 0xff8d) { # enter
494 if ($self->{matches}) {
495 my @match = @{ $self->{matches}[$self->{id}] };
496 $self->exec_async (@match[5 .. $#match]);
497 }
498 $self->select_leave;
499 } elsif ($keysym == 0x79) { # y
500 if ($self->{matches}) {
501 $self->selection ($self->{matches}[$self->{id}][4], 1);
502 $self->selection_grab (urxvt::CurrentTime, 1);
503 }
504 $self->select_leave;
505 } elsif ($keysym == 0xff1b) { # escape
506 $self->view_start ($self->{view_start});
507 $self->select_leave;
508 } elsif ($keysym == 0xff50) { # home
509 $self->select_search (+1, $self->top_row)
510 } elsif ($keysym == 0xff57) { # end
511 $self->select_search (-1, $self->nrow - 1)
512 } elsif ($keysym == 0xff52) { # up
513 if ($self->{id} > 0) {
514 $self->{id}--;
515 $self->want_refresh;
516 } else {
517 my $line = $self->line ($self->{cur_row});
518 $self->select_search (-1, $line->beg - 1)
519 if $line->beg > $self->top_row;
520 }
521 } elsif ($keysym == 0xff54) { # down
522 if ($self->{id} < @{ $self->{matches} } - 1) {
523 $self->{id}++;
524 $self->want_refresh;
525 } else {
526 my $line = $self->line ($self->{cur_row});
527 $self->select_search (+1, $line->end + 1)
528 if $line->end < $self->nrow;
529 }
530 } elsif ($self->lookup_keysym ($keysym, $event->{state}) eq "matcher:select") {
531 if ($self->{id} > 0) {
532 $self->{id}--;
533 $self->want_refresh;
534 } else {
535 my $line = $self->line ($self->{cur_row});
536 $self->select_search (-1, $self->nrow - 1)
537 unless $self->select_search (-1, $line->beg - 1);
538 }
539 }
540
541 1
542}
543
343# vim:set sw=3 sts=3 et: 544# vim:set sw=3 sts=3 et:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines