X-Git-Url: http://git.shiar.nl/barcat.git/blobdiff_plain/1f5f43d2286ee42043f574277429314fa8addf4f..628cc78d7f81eaad4f0a06a26afc171d2667e685:/barcat diff --git a/barcat b/barcat index 7038f06..ad6ccab 100755 --- a/barcat +++ b/barcat @@ -52,8 +52,11 @@ GetOptions(\%opt, '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', @@ -221,9 +224,11 @@ say( 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}) { - 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; } @@ -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 - $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; } @@ -243,7 +248,7 @@ while ($nr <= $#lines) { 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. -=item --palette=... +=item --palette=( | ...) Override colors of parsed numbers. Can be any CSI escape, such as I<90> for default dark grey,