named palette presets fire, whites

[barcat.git] / barcat

diff --git a/barcat b/barcat
index 7038f066634216f992b4c9c8ce3f715108ed13ff..ad6ccab98ffdaf7ad0eaab230979ff1fbbecff05 100755 (executable)
--- a/barcat
+++ b/barcat
@@ -52,8 +52,11 @@ GetOptions(\%opt,
        'spark:s' => sub {
                $opt{spark} = [split //, $_[1] || '▁▂▃▄▅▆▇█'];
        },
        'spark:s' => sub {
                $opt{spark} = [split //, $_[1] || '▁▂▃▄▅▆▇█'];
        },

-       'palette:s' => sub {
-               $opt{palette} = [ split /\s/, $_[1] ];
+       'palette=s' => sub {
+               $opt{palette} = {
+                       fire   => [qw( 90 31 91 33 93 97 96 )],
+                       whites => [qw( 1;30 0;37 1;37 )],
+               }->{$_[1]} // [ split /\s/, $_[1] ];

        },
        'stat|s!',
        'signal-stat=s',
        },
        'stat|s!',
        'signal-stat=s',


@@ -221,9 +224,11 @@ say(
 while ($nr <= $#lines) {
        $nr >= $opt{hidemax} and last if defined $opt{hidemax};
        my $val = $values[$nr];
 while ($nr <= $#lines) {
        $nr >= $opt{hidemax} and last if defined $opt{hidemax};
        my $val = $values[$nr];

+       my $rel = length $val && ($val - $minval) / ($maxval - $minval);

 
        if ($opt{spark}) {
 
        if ($opt{spark}) {

-               print $opt{spark}->[ ($val - $minval) / $maxval * $#{$opt{spark}} ];
+               print color($opt{palette}->[ $rel * $#{$opt{palette}} ]) if $opt{palette};
+               print $opt{spark}->[ $rel * $#{$opt{spark}} ];

                next;
        }
 
                next;
        }
 


@@ -231,7 +236,7 @@ while ($nr <= $#lines) {
                my $color = !$opt{palette} ? undef :
                        $val == $order[0] ? $opt{palette}->[-1] : # max
                        $val == $order[-1] ? $opt{palette}->[0] : # min
                my $color = !$opt{palette} ? undef :
                        $val == $order[0] ? $opt{palette}->[-1] : # max
                        $val == $order[-1] ? $opt{palette}->[0] : # min

-                       $opt{palette}->[1] // $opt{palette}->[0];
+                       $opt{palette}->[ $rel * ($#{$opt{palette}} - 1) + 1 ];

                $val = $opt{units} ? sival($val) : sprintf "%*s", $lenval, $val;
                color($color) for $val;
        }
                $val = $opt{units} ? sival($val) : sprintf "%*s", $lenval, $val;
                color($color) for $val;
        }


@@ -243,7 +248,7 @@ while ($nr <= $#lines) {
 continue {
        $nr++;
 }
 continue {
        $nr++;
 }

-say '' if $opt{spark};
+say $opt{palette} ? color(0) : '' if $opt{spark};

 
 }
 
 
 }
 


@@ -394,7 +399,7 @@ Bars extend from 0 or the minimum value if lower,
 to the largest value encountered.
 These options can be set to customize this range.
 
 to the largest value encountered.
 These options can be set to customize this range.
 

-=item --palette=<color>...
+=item --palette=(<preset> | <color>...)

 
 Override colors of parsed numbers.
 Can be any CSI escape, such as I<90> for default dark grey,
 
 Override colors of parsed numbers.
 Can be any CSI escape, such as I<90> for default dark grey,