X-Git-Url: http://git.shiar.nl/barcat.git/blobdiff_plain/628cc78d7f81eaad4f0a06a26afc171d2667e685..3f7e3fb002626412e76a781ba93d12f72562afcc:/barcat

diff --git a/barcat b/barcat
index ad6ccab..c5b7e0a 100755
--- a/barcat
+++ b/barcat
@@ -50,13 +50,24 @@ GetOptions(\%opt,
 		$opt{'graph-format'} = substr $_[1], 0, 1;
 	},
 	'spark:s' => sub {
-		$opt{spark} = [split //, $_[1] || '▁▂▃▄▅▆▇█'];
+		$opt{spark} = [split //, $_[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 )],
-		}->{$_[1]} // [ split /\s/, $_[1] ];
+			greys  => [map {"38;5;$_"} 52, 235..255, 47],
+		}->{$_[1]} // [ split /[^0-9;]/, $_[1] ];
 	},
 	'stat|s!',
 	'signal-stat=s',
@@ -90,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};
@@ -227,8 +238,13 @@ while ($nr <= $#lines) {
 	my $rel = length $val && ($val - $minval) / ($maxval - $minval);
 
 	if ($opt{spark}) {
-		print color($opt{palette}->[ $rel * $#{$opt{palette}} ]) if $opt{palette};
-		print $opt{spark}->[ $rel * $#{$opt{spark}} ];
+		print $opt{spark}->[
+			!$val ? 0 : # blank
+			$val == $order[0] ? -1 : # max
+			$val == $order[-1] ? 1 : # min
+			$#{$opt{spark}} < 3 ? 1 :
+			$rel * ($#{$opt{spark}} - 3) + 2.5
+		];
 		next;
 	}