X-Git-Url: http://git.shiar.nl/barcat.git/blobdiff_plain/1f5f43d2286ee42043f574277429314fa8addf4f..b0dd9c1ee3383d5a611c0046765470cf003c2c76:/barcat

diff --git a/barcat b/barcat
index 7038f06..804b3b0 100755
--- a/barcat
+++ b/barcat
@@ -52,8 +52,22 @@ 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 )],
+			fire88 => [map {"38;5;$_"} qw(
+				80  32 48 64  68 72 76  77 78 79  47
+			)],
+			fire256=> [map {"38;5;$_"} qw(
+				235  52 88 124 160 196
+				202 208 214 220 226  227 228 229 230 231  159
+			)],
+			ramp88 => [map {"38;5;$_"} qw(
+				64 65 66 67 51 35 39 23 22 26 25 28
+			)],
+			whites => [qw( 1;30 0;37 1;37 )],
+			greys  => [map {"38;5;$_"} 52, 235..255, 47],
+		}->{$_[1]} // [ split /[^0-9;]/, $_[1] ];
 	},
 	'stat|s!',
 	'signal-stat=s',
@@ -87,7 +101,7 @@ GetOptions(\%opt,
 	},
 ) or exit 64;  # EX_USAGE
 
-$opt{width} ||= $ENV{COLUMNS} || 80;
+$opt{width} ||= $ENV{COLUMNS} || qx(tput cols) || 80;
 $opt{color} //= -t *STDOUT;  # enable on tty
 $opt{'graph-format'} //= '-';
 $opt{trim}   *= $opt{width} / 100 if $opt{trimpct};
@@ -221,9 +235,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 +247,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 +259,7 @@ while ($nr <= $#lines) {
 continue {
 	$nr++;
 }
-say '' if $opt{spark};
+say $opt{palette} ? color(0) : '' if $opt{spark};
 
 }
 
@@ -394,7 +410,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=<color>...
+=item --palette=(<preset> | <color>...)
 
 Override colors of parsed numbers.
 Can be any CSI escape, such as I<90> for default dark grey,