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.23 by sf-exg, Thu Jun 12 12:19:09 2014 UTC vs.
Revision 1.32 by sf-exg, Wed Jul 30 15:22:51 2014 UTC

… …
5 5
6#:META:RESOURCE:%.launcher:string:default launcher command 6#:META:RESOURCE:%.launcher:string:default launcher command
7#:META:RESOURCE:%.button:string:the button, yeah 7#:META:RESOURCE:%.button:string:the button, yeah
8#:META:RESOURCE:%.pattern.:string:extra pattern to match 8#:META:RESOURCE:%.pattern.:string:extra pattern to match
9#:META:RESOURCE:%.launcher.:string:custom launcher for pattern 9#:META:RESOURCE:%.launcher.:string:custom launcher for pattern
10#:META:RESOURCE:%.rend.:string:custom rednition for pattern 10#:META:RESOURCE:%.rend.:string:custom rendition for pattern
11 11
12=head1 NAME 12=head1 NAME
13 13
14matcher - match strings in terminal output and change their rendition 14matcher - match strings in terminal output and change their rendition
15 15
… …
30The launcher can also be overridden on a per-pattern basis. 30The launcher can also be overridden on a per-pattern basis.
31 31
32It is possible to activate the most recently seen match or a list of matches 32It is possible to activate the most recently seen match or a list of matches
33from the keyboard. Simply bind a keysym to "matcher:last" or 33from the keyboard. Simply bind a keysym to "matcher:last" or
34"matcher:list" as seen in the example below. 34"matcher:list" as seen in the example below.
35
36The 'matcher:select' action enables a mode in which it is possible to
37iterate over the matches using the keyboard and either activate them
38or copy them to the clipboard. While the mode is active, normal terminal
39input/output is suspended and the following bindings are recognized:
40
41=over 4
42
43=item C<Up>
44
45Search for a match upwards.
46
47=item C<Down>
48
49Search for a match downwards.
50
51=item C<Home>
52
53Jump to the topmost match.
54
55=item C<End>
56
57Jump to the bottommost match.
58
59=item C<Escape>
60
61Leave the mode and return to the point where search was started.
62
63=item C<Enter>
64
65Activate the current match.
66
67=item C<y>
68
69Copy the current match to the clipboard.
70
71=back
35 72
36Example: load and use the matcher extension with defaults. 73Example: load and use the matcher extension with defaults.
37 74
38 URxvt.perl-ext: default,matcher 75 URxvt.perl-ext: default,matcher
39 76
… …
57 \([\w\-\@;\/?:&=%\$.+!*\x27,~#]*\)| # Allow a pair of matched parentheses 94 \([\w\-\@;\/?:&=%\$.+!*\x27,~#]*\)| # Allow a pair of matched parentheses
58 [\w\-\@;\/?:&=%\$+*~] # exclude some trailing characters (heuristic) 95 [\w\-\@;\/?:&=%\$+*~] # exclude some trailing characters (heuristic)
59 )+ 96 )+
60 }x; 97 }x;
61 98
62sub on_key_press { 99sub matchlist_key_press {
63 my ($self, $event, $keysym, $octets) = @_; 100 my ($self, $event, $keysym, $octets) = @_;
64 101
65 return unless $self->{overlay};
66
67 delete $self->{overlay}; 102 delete $self->{overlay};
103 $self->disable ("key_press");
68 104
69 my $i = ($keysym == 96 ? 0 : $keysym - 48); 105 my $i = ($keysym == 96 ? 0 : $keysym - 48);
70 if ($i >= 0 && $i < @{ $self->{matches} }) { 106 if ($i >= 0 && $i < @{ $self->{matches} }) {
71 my @exec = @{ $self->{matches}[$i] }; 107 my @exec = @{ $self->{matches}[$i] };
72 shift @exec;
73 $self->exec_async (@exec); 108 $self->exec_async (@exec[5 .. $#exec]);
74 } 109 }
75 110
76 1 111 1
77} 112}
78 113
… …
99 134
100 if ($action eq "list") { 135 if ($action eq "list") {
101 $self->matchlist; 136 $self->matchlist;
102 } elsif ($action eq "last") { 137 } elsif ($action eq "last") {
103 $self->most_recent; 138 $self->most_recent;
139 } elsif ($action eq "select") {
140 $self->select_enter;
104 } 141 }
105 142
106 () 143 ()
107} 144}
108 145
109sub matchlist { 146sub matchlist {
110 my ($self) = @_; 147 my ($self) = @_;
111 148
112 @{ $self->{matches} } = (); 149 $self->{matches} = [];
113 my $row = $self->nrow - 1; 150 my $row = $self->nrow - 1;
114 while ($row >= 0 && @{ $self->{matches} } < 10) { 151 while ($row >= 0 && @{ $self->{matches} } < 10) {
115 my $line = $self->line ($row); 152 my $line = $self->line ($row);
116 my @matches = $self->find_matches ($row, 0); 153 my @matches = $self->find_matches ($row);
117 154
118 for (sort { $b->[0] <=> $a->[0] } @matches) { 155 for (sort { $b->[0] <=> $a->[0] or $b->[1] <=> $a->[1] } @matches) {
119 shift @$_;
120 push @{ $self->{matches} }, $_; 156 push @{ $self->{matches} }, $_;
121 last if @{ $self->{matches} } == 10; 157 last if @{ $self->{matches} } == 10;
122 } 158 }
123 159
124 $row = $line->beg - 1; 160 $row = $line->beg - 1;
… …
128 164
129 my $width = 0; 165 my $width = 0;
130 166
131 my $i = 0; 167 my $i = 0;
132 for my $match (@{ $self->{matches} }) { 168 for my $match (@{ $self->{matches} }) {
133 my $text = $match->[0]; 169 my $text = $match->[4];
134 my $w = $self->strwidth ("$i-$text"); 170 my $w = $self->strwidth ("$i-$text");
135 171
136 $width = $w if $w > $width; 172 $width = $w if $w > $width;
137 $i++; 173 $i++;
138 } 174 }
… …
140 $width = $self->ncol - 2 if $width > $self->ncol - 2; 176 $width = $self->ncol - 2 if $width > $self->ncol - 2;
141 177
142 $self->{overlay} = $self->overlay (0, 0, $width, scalar (@{ $self->{matches} }), urxvt::OVERLAY_RSTYLE, 2); 178 $self->{overlay} = $self->overlay (0, 0, $width, scalar (@{ $self->{matches} }), urxvt::OVERLAY_RSTYLE, 2);
143 my $i = 0; 179 my $i = 0;
144 for my $match (@{ $self->{matches} }) { 180 for my $match (@{ $self->{matches} }) {
145 my $text = $match->[0]; 181 my $text = $match->[4];
146 182
147 $self->{overlay}->set (0, $i, "$i-$text"); 183 $self->{overlay}->set (0, $i, "$i-$text");
148 $i++; 184 $i++;
149 } 185 }
150 186
187 $self->enable (key_press => \&matchlist_key_press);
151} 188}
152 189
153sub most_recent { 190sub most_recent {
154 my ($self) = shift; 191 my ($self) = shift;
155 my $row = $self->nrow; 192 my $row = $self->nrow - 1;
156 my @exec; 193 my @exec;
157 while($row-- > $self->top_row) { 194 while ($row >= $self->top_row) {
195 my $line = $self->line ($row);
158 @exec = $self->command_for($row); 196 @exec = $self->command_for($row);
159 last if(@exec); 197 last if(@exec);
198
199 $row = $line->beg - 1;
160 } 200 }
161 if(@exec) { 201 if(@exec) {
162 return $self->exec_async (@exec); 202 return $self->exec_async (@exec);
163 } 203 }
164 () 204 ()
… …
186sub on_start { 226sub on_start {
187 my ($self) = @_; 227 my ($self) = @_;
188 228
189 $self->{launcher} = $self->my_resource ("launcher") || $self->x_resource("url-launcher") || "sensible-browser"; 229 $self->{launcher} = $self->my_resource ("launcher") || $self->x_resource("url-launcher") || "sensible-browser";
190 230
191 $self->{matches} = [];
192 $self->{button} = 2; 231 $self->{button} = 2;
193 $self->{state} = 0; 232 $self->{state} = 0;
194 if($self->{argv}[0] || $self->my_resource ("button")) { 233 if($self->{argv}[0] || $self->my_resource ("button")) {
195 my @mods = split '', $self->{argv}[0] || $self->my_resource ("button"); 234 my @mods = split '', $self->{argv}[0] || $self->my_resource ("button");
196 for my $mod (@mods) { 235 for my $mod (@mods) {
… …
227 my ($self, $row) = @_; 266 my ($self, $row) = @_;
228 267
229 # fetch the line that has changed 268 # fetch the line that has changed
230 my $line = $self->line ($row); 269 my $line = $self->line ($row);
231 my $text = $line->t; 270 my $text = $line->t;
232 my $i = 0;
233 271
234 # find all urls (if any) 272 # find all urls (if any)
235 for my $matcher (@{$self->{matchers}}) { 273 for my $matcher (@{$self->{matchers}}) {
236 while ($text =~ /$matcher->[0]/g) { 274 while ($text =~ /$matcher->[0]/g) {
237 #print "$&\n"; 275 #print "$&\n";
238 my $rend = $line->r; 276 my $rend = $line->r;
239 277
240 # mark all characters as underlined. we _must_ not toggle underline, 278 # mark all characters as underlined. we _must_ not toggle underline,
241 # as we might get called on an already-marked url. 279 # as we might get called on an already-marked url.
242 &{$matcher->[2]} 280 &{$matcher->[2]}
243 for @{$rend}[ $-[0] .. $+[0] - 1]; 281 for @{$rend}[$-[0] .. $+[0] - 1];
244 282
245 $line->r ($rend); 283 $line->r ($rend);
246 } 284 }
247 } 285 }
248 286
… …
259 297
260sub find_matches { 298sub find_matches {
261 my ($self, $row, $col) = @_; 299 my ($self, $row, $col) = @_;
262 my $line = $self->line ($row); 300 my $line = $self->line ($row);
263 my $text = $line->t; 301 my $text = $line->t;
302 my $off = $line->offset_of ($row, $col) if defined $col;
264 303
265 my @matches; 304 my @matches;
266 for my $matcher (@{$self->{matchers}}) { 305 for my $matcher (@{$self->{matchers}}) {
267 my $launcher = $matcher->[1] || $self->{launcher}; 306 my $launcher = $matcher->[1] || $self->{launcher};
268 while ($text =~ /$matcher->[0]/g) { 307 while ($text =~ /$matcher->[0]/g) {
269 my $match = substr $text, $-[0], $+[0] - $-[0]; 308 my $match = substr $text, $-[0], $+[0] - $-[0];
270 my @begin = @-; 309 my @begin = @-;
271 my @end = @+; 310 my @end = @+;
272 my @exec; 311 my @exec;
273 312
274 if (!defined($col) || ($-[0] <= $col && $+[0] >= $col)) { 313 if (!defined($off) || ($-[0] <= $off && $+[0] >= $off)) {
275 if ($launcher !~ /\$/) { 314 if ($launcher !~ /\$/) {
276 @exec = ($launcher, $match); 315 @exec = ($launcher, $match);
277 } else { 316 } else {
278 # It'd be nice to just access a list like ($&,$1,$2...), 317 # It'd be nice to just access a list like ($&,$1,$2...),
279 # but alas, m//g behaves differently in list context. 318 # but alas, m//g behaves differently in list context.
280 @exec = map { s/\$(\d+)|\$\{(\d+)\}/ 319 @exec = map { s/\$(\d+)|\$\{(\d+)\}/
281 substr $text, $begin[$1 || $2], $end[$1 || $2] - $begin[$1 || $2] 320 substr $text, $begin[$1 || $2], $end[$1 || $2] - $begin[$1 || $2]
282 /egx; $_ } split /\s+/, $launcher; 321 /egx; $_ } split /\s+/, $launcher;
283 } 322 }
284 323
285 push @matches, [ $begin[0], $match, @exec ]; 324 push @matches, [ $line->coord_of ($begin[0]), $line->coord_of ($end[0]), $match, @exec ];
286 } 325 }
287 } 326 }
288 } 327 }
289 328
290 @matches; 329 @matches;
… …
294 my ($self, $row, $col) = @_; 333 my ($self, $row, $col) = @_;
295 334
296 my @matches = $self->find_matches ($row, $col); 335 my @matches = $self->find_matches ($row, $col);
297 if (@matches) { 336 if (@matches) {
298 my @match = @{ $matches[0] }; 337 my @match = @{ $matches[0] };
299 return @match[2 .. $#match]; 338 return @match[5 .. $#match];
300 } 339 }
301 340
302 () 341 ()
303} 342}
304 343
… …
338 } 377 }
339 378
340 1; 379 1;
341} 380}
342 381
382sub select_enter {
383 my ($self) = @_;
384
385 $self->{view_start} = $self->view_start;
386 $self->{pty_ev_events} = $self->pty_ev_events (urxvt::EV_NONE);
387 $self->{cur_row} = $self->nrow - 1;
388
389 $self->enable (
390 key_press => \&select_key_press,
391 refresh_begin => \&select_refresh,
392 refresh_end => \&select_refresh,
393 );
394
395 $self->{overlay} = $self->overlay (0, -1, $self->ncol, 1, urxvt::OVERLAY_RSTYLE, 0);
396 $self->{overlay}->set (0, 0, "match-select");
397}
398
399sub select_leave {
400 my ($self) = @_;
401
402 $self->disable ("key_press", "refresh_begin", "refresh_end");
403 $self->pty_ev_events ($self->{pty_ev_events});
404
405 delete $self->{overlay};
406 delete $self->{matches};
407 delete $self->{id};
408}
409
410sub select_search {
411 my ($self, $dir, $row) = @_;
412
413 while ($self->nrow > $row && $row >= $self->top_row) {
414 my $line = $self->line ($row)
415 or last;
416
417 my @matches = $self->find_matches ($row);
418 if (@matches) {
419 @matches = sort { $a->[0] <=> $b->[0] or $a->[1] <=> $b->[1] } @matches;
420 $self->{matches} = \@matches;
421 $self->{cur_row} = $row;
422 $self->{id} = $dir < 0 ? @{ $self->{matches} } - 1 : 0;
423 $self->view_start (List::Util::min 0, $row - ($self->nrow >> 1));
424 $self->want_refresh;
425 return;
426 }
427
428 $row = $dir < 0 ? $line->beg - 1 : $line->end + 1;
429 }
430
431 $self->scr_bell;
432}
433
434sub select_refresh {
435 my ($self) = @_;
436
437 return unless $self->{matches};
438
439 my $cur = $self->{matches}[$self->{id}];
440 $self->scr_xor_span (@$cur[0 .. 3], urxvt::RS_RVid);
441
442 ()
443}
444
445sub select_key_press {
446 my ($self, $event, $keysym, $string) = @_;
447
448 if ($keysym == 0xff0d || $keysym == 0xff8d) { # enter
449 if ($self->{matches}) {
450 my @match = @{ $self->{matches}[$self->{id}] };
451 $self->exec_async (@match[5 .. $#match]);
452 }
453 $self->select_leave;
454 } elsif ($keysym == 0x79) { # y
455 if ($self->{matches}) {
456 $self->selection ($self->{matches}[$self->{id}][4], 1);
457 $self->selection_grab (urxvt::CurrentTime, 1);
458 }
459 $self->select_leave;
460 } elsif ($keysym == 0xff1b) { # escape
461 $self->view_start ($self->{view_start});
462 $self->select_leave;
463 } elsif ($keysym == 0xff50) { # home
464 $self->select_search (+1, $self->top_row)
465 } elsif ($keysym == 0xff57) { # end
466 $self->select_search (-1, $self->nrow - 1)
467 } elsif ($keysym == 0xff52) { # up
468 if ($self->{id} > 0) {
469 $self->{id}--;
470 $self->want_refresh;
471 } else {
472 my $line = $self->line ($self->{cur_row});
473 $self->select_search (-1, $line->beg - 1)
474 if $line->beg > $self->top_row;
475 }
476 } elsif ($keysym == 0xff54) { # down
477 if ($self->{id} < @{ $self->{matches} } - 1) {
478 $self->{id}++;
479 $self->want_refresh;
480 } else {
481 my $line = $self->line ($self->{cur_row});
482 $self->select_search (+1, $line->end + 1)
483 if $line->end < $self->nrow;
484 }
485 }
486
487 1
488}
489
343# vim:set sw=3 sts=3 et: 490# vim:set sw=3 sts=3 et:

Diff Legend

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