X-Git-Url: https://ruderich.org/simon/gitweb/?p=fcscs%2Ffcscs.git;a=blobdiff_plain;f=bin%2Ffcscs;h=8194f9410c580991a4a8b08ab047ed1b1a44007a;hp=017ae5bfa327ad4b109efaeb1b24a24cd1e7be17;hb=a2487880bae64aa72c98f20111a063200831a74b;hpb=fabb3318b36ef82dd8e23c13eab3dbb715307fb6 diff --git a/bin/fcscs b/bin/fcscs index 017ae5b..8194f94 100755 --- a/bin/fcscs +++ b/bin/fcscs @@ -102,7 +102,7 @@ or another number to select the longer match. Use backspace to remove the last entered number. Press return before entering a number to select the last (lowest numbered) -match. To abort without selecting any match either use "q". +match (underlined by default). To abort without selecting any match use "q". To change the selection mode (e.g. paths, files, etc.) use one of the mappings explained below. Per default URLs are selected, see options for a way to @@ -307,9 +307,13 @@ package Screen { my $attr_id = $config->{attribute}{match_id}; my $attr_string = $config->{attribute}{match_string}; + my $attr_last = $config->{attribute}{match_last}; foreach (@{$matches_add}) { - $self->draw($_->{y}, $_->{x}, $attr_string, $_->{string}); + my $attr = (defined $_->{id} and $_->{id} == 1) + ? $attr_last + : $attr_string; + $self->draw($_->{y}, $_->{x}, $attr, $_->{string}); if (defined $_->{id}) { $self->draw($_->{y}, $_->{x}, $attr_id, $_->{id}); } @@ -496,8 +500,8 @@ sub run_in_background { # closes the window (because the parent process has exited). local $SIG{HUP} = 'IGNORE'; - # Necessary for GNU screen or it'll keep the window open until the - # paste command has run. + # Necessary for GNU screen or it'll keep the window open until an + # external command has run. close STDIN or die $!; close STDOUT or die $!; close STDERR or die $!; @@ -548,7 +552,8 @@ sub select_match { $number = $number * 10 + $char; } elsif ($char eq "\b" or $char eq "\x7f") { # backspace $number = int($number / 10); - } elsif ($char eq "\n") { + } elsif ($char eq "\n" + or $char eq $config->{setting}{alternative_return}) { if ($number == 0) { # number without selection matches last entry $number = 1; } @@ -626,8 +631,9 @@ sub extend_match { my $match_old = \%{$match}; my $char = $screen->getch; - if ($char eq "\n") { # accept match - last; + if ($char eq "\n" + or $char eq $config->{setting}{alternative_return}) { + last; # accept match } elsif ($char eq 'w') { # select current word (both directions) extend_match_regex_left($line, $match, qr/\w+/); @@ -645,7 +651,7 @@ sub extend_match { } elsif ($char eq 'E') { # select current WORD (only right) extend_match_regex_right($line, $match, qr/\S+/); - } elsif ($char eq '^') { # select to beginning of line + } elsif ($char eq '0') { # select to beginning of line extend_match_regex_left($line, $match, qr/.+/); } elsif ($char eq '$') { # select to end of line extend_match_regex_right($line, $match, qr/.+/); @@ -762,7 +768,7 @@ configurable at the moment): =item B extend WORD to the right -=item B<^> extend to beginning of line +=item B<0> extend to beginning of line =item B<$> extend to end of line @@ -824,6 +830,9 @@ sub mapping_mode_search { $screen->cursor(0); + $screen->prompt(name => undef, value => undef); # clear prompt + $screen->draw_prompt($config); + return { select => 'search', matches => \@last_matches, @@ -1012,6 +1021,16 @@ The following simple mappings are available by default: =back +The following additional mappings are available by default: + +=over + +=item B<\n> accept current selection (not customizable) + +=item B additional key to accept selection (B option) + +=back + All (single-byte) keys except numbers, backspace and return can be mapped. Unknown mappings are ignored when pressing keys. @@ -1050,6 +1069,8 @@ Defaults in parentheses (foreground, background, attribute). =item B attribute for matches (yellow, default, normal) +=item B attribute for the match selected by return (yellow, default, underline) + =item B attribute for prompt name (standout) =item B attribute for prompt flags (standout) @@ -1068,6 +1089,8 @@ my %attribute = ( match_id => $screen->color_pair(Curses::COLOR_RED, -1) | Curses::A_BOLD, match_string => $screen->color_pair(Curses::COLOR_YELLOW, -1), + match_last => $screen->color_pair(Curses::COLOR_YELLOW, -1) + | Curses::A_UNDERLINE, prompt_name => Curses::A_STANDOUT, prompt_flags => Curses::A_STANDOUT, ); @@ -1078,21 +1101,23 @@ Defaults in parentheses. =over -=item B enable debug mode, writes to I<~/.config/fcscs/log> (C<0>) +=item B enable debug mode, writes to I<~/.config/fcscs/log> (C<0>) + +=item B start in this mode, must be a valid mode mapping (C<\&mapping_mode_url>) -=item B start in this mode, must be a valid mode mapping (C<\&mapping_mode_url>) +=item B set multiplexer ("screen" or "tmux") if not autodetected (C) -=item B set multiplexer ("screen" or "tmux") if not autodetected (C) +=item B ignore case when searching (C<0>) -=item B ignore case when searching (C<0>) +=item B ignore case unless one uppercase character is searched (C<1>) -=item B ignore case unless one uppercase character is searched (C<1>) +=item B sleep x us before running paste command (C<100_000>) -=item B sleep x us before running paste command (C<100_000>) +=item B GNU Screen's msgwait variable, used when yanking (C<5>) -=item B GNU Screen's msgwait variable, used when yanking (C<5>) +=item B additional accept key like return, set to C<\n> to disable (C) -=item B browser command as array reference (C<['x-www-browser']>) +=item B browser command as array reference (C<['x-www-browser']>) =back @@ -1104,15 +1129,17 @@ Example: =cut my %setting = ( # options - debug => 0, - initial_mode => \&mapping_mode_url, - multiplexer => undef, - ignorecase => 0, - smartcase => 1, - paste_sleep => 100_000, - screen_msgwait => 5, + debug => 0, + initial_mode => \&mapping_mode_url, + multiplexer => undef, + ignorecase => 0, + smartcase => 1, + paste_sleep => 100_000, + screen_msgwait => 5, + # global mappings + alternative_return => 's', # commands - browser => ['x-www-browser'], + browser => ['x-www-browser'], ); =head2 REGEXPS @@ -1378,8 +1405,8 @@ RESULT: $screen->debug('input', 'selecting match'); my $tmp = $result; $result = select_match($result->{select}, - $screen, \%config, $input, - $result->{matches}); + $screen, \%config, $input, + $result->{matches}); $result->{handler} = $tmp->{handler}; $result->{extend} = $tmp->{extend}; goto RESULT; # reprocess special entries in result