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.39 by root, Sun Nov 21 19:33:32 2021 UTC vs.
Revision 1.40 by root, Fri Dec 9 05:06:46 2022 UTC

… …
19Uses per-line display filtering (C<on_line_update>) to underline text 19Uses per-line display filtering (C<on_line_update>) to underline text
20matching a certain pattern and make it clickable. When clicked with the 20matching a certain pattern and make it clickable. When clicked with the
21mouse button specified in the C<matcher.button> resource (default 2, or 21mouse button specified in the C<matcher.button> resource (default 2, or
22middle), the program specified in the C<matcher.launcher> resource 22middle), the program specified in the C<matcher.launcher> resource
23(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
24with the matched text as first argument. The default configuration is 24with the matched text as first argument. The default configuration is
25suitable for matching URLs and launching a web browser, like the 25suitable for matching URLs and launching a web browser, like the
26former "mark-urls" extension. 26former "mark-urls" extension.
27 27
28The default pattern to match URLs can be overridden with the 28The default pattern to match URLs can be overridden with the
29C<matcher.pattern.0> resource, and additional patterns can be specified 29C<matcher.pattern.0> resource, and additional patterns can be specified
30with numbered patterns, in a manner similar to the "selection" extension. 30with numbered patterns, in a manner similar to the "selection" extension.
31The launcher can also be overridden on a per-pattern basis. 31The launcher can also be overridden on a per-pattern basis.
32 32
33It 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
34from the keyboard. Simply bind a keysym to "matcher:last" or 34from the keyboard. Simply bind a keysym to "matcher:last" or
35"matcher:list" as seen in the example below. 35"matcher:list" as seen in the example below.
36 36
37The C<matcher:select> action enables a mode in which it is possible to 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 38iterate over the matches using the keyboard and either activate them
39or copy them to the clipboard. While the mode is active, normal terminal 39or copy them to the clipboard. While the mode is active, normal terminal
… …
223 223
224sub most_recent { 224sub most_recent {
225 my ($self) = shift; 225 my ($self) = shift;
226 my $row = $self->nrow - 1; 226 my $row = $self->nrow - 1;
227 my @exec; 227 my @exec;
228
228 while ($row >= $self->top_row) { 229 while ($row >= $self->top_row) {
229 my $line = $self->line ($row); 230 my $line = $self->line ($row);
230 @exec = $self->command_for($row); 231 @exec = $self->command_for ($row);
231 last if(@exec); 232 last if @exec;
232 233
233 $row = $line->beg - 1; 234 $row = $line->beg - 1;
234 } 235 }
236
235 if(@exec) { 237 if (@exec) {
236 return $self->exec_async (@exec); 238 return $self->exec_async (@exec);
237 } 239 }
240
238 () 241 ()
239} 242}
240 243
241sub my_resource { 244sub my_resource {
242 $_[0]->x_resource ("%.$_[1]") 245 $_[0]->x_resource ("%.$_[1]")
… …
341 my $match = substr $text, $-[0], $+[0] - $-[0]; 344 my $match = substr $text, $-[0], $+[0] - $-[0];
342 my @begin = @-; 345 my @begin = @-;
343 my @end = @+; 346 my @end = @+;
344 my @exec; 347 my @exec;
345 348
346 if (!defined($off) || ($-[0] <= $off && $+[0] >= $off)) { 349 if (!(defined $off) || ($-[0] <= $off && $+[0] >= $off)) {
347 if ($launcher !~ /\$/) { 350 if ($launcher !~ /\$/) {
348 @exec = ($launcher, $match); 351 @exec = ($launcher, $match);
349 } else { 352 } else {
350 # 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...),
351 # but alas, m//g behaves differently in list context. 354 # but alas, m//g behaves differently in list context.
352 @exec = map { s/\$(\d+)|\$\{(\d+)\}/ 355 @exec = map {
356 s{\$(\d+)|\$\{(\d+)\}}{
353 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 $_
354 /egx; $_ } split /\s+/, $launcher; 360 } split /\s+/, $launcher;
355 } 361 }
356 362
357 push @matches, [ $line->coord_of ($begin[0]), $line->coord_of ($end[0]), $match, @exec ]; 363 push @matches, [ $line->coord_of ($begin[0]), $line->coord_of ($end[0]), $match, @exec ];
358 } 364 }
359 } 365 }
360 } 366 }
361 367
362 @matches; 368 @matches
363} 369}
364 370
365sub command_for { 371sub command_for {
366 my ($self, $row, $col) = @_; 372 my ($self, $row, $col) = @_;
367 373
… …
374 () 380 ()
375} 381}
376 382
377sub on_button_press { 383sub on_button_press {
378 my ($self, $event) = @_; 384 my ($self, $event) = @_;
385
386 if (
379 if($self->valid_button($event) 387 $self->valid_button ($event)
380 && (my @exec = $self->command_for($event->{row},$event->{col}))) { 388 && (my @exec = $self->command_for ($event->{row}, $event->{col}))
389 ) {
381 $self->{row} = $event->{row}; 390 $self->{row} = $event->{row};
382 $self->{col} = $event->{col}; 391 $self->{col} = $event->{col};
383 $self->{cmd} = \@exec; 392 $self->{cmd} = \@exec;
384 return 1; 393 return 1;
385 } else { 394 } else {
… …
398 my $col = delete $self->{col}; 407 my $col = delete $self->{col};
399 my $cmd = delete $self->{cmd}; 408 my $cmd = delete $self->{cmd};
400 409
401 return if !defined $row; 410 return if !defined $row;
402 411
403 if($row == $event->{row} && abs($col-$event->{col}) < 2 412 if (
413 $row == $event->{row}
414 && (abs $col-$event->{col}) < 2
404 && join("\x00", @$cmd) eq join("\x00", $self->command_for($row,$col))) { 415 && (join "\x00", @$cmd) eq (join "\x00", $self->command_for ($row, $col))
416 ) {
405 if($self->valid_button($event)) { 417 if ($self->valid_button ($event)) {
406
407 $self->exec_async (@$cmd); 418 $self->exec_async (@$cmd);
408
409 } 419 }
410 } 420 }
411 421
412 1; 422 1;
413} 423}

Diff Legend

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