X-Git-Url: http://git.shiar.net/barcat.git/blobdiff_plain/a2fdd02d4caa4055817ea721c4790f08394a89fd..86f0baa047d92c961adb8dc8527e955d1254ad0b:/barcat?ds=sidebyside

diff --git a/barcat b/barcat
index cc128a0..4d3205f 100755
--- a/barcat
+++ b/barcat
@@ -57,20 +57,30 @@ GetOptions(\%opt,
 	'indicators:s',
 	'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] ];
+			greys  => [map {"38;5;$_"} 0, 232..255, 15],
+			random => [map {"38;5;$_"} List::Util::shuffle(17..231)],
+			rainbow=> [map {"38;5;$_"}
+				196, # r
+				(map { 196 + $_*6   } 0..4), # +g
+				(map { 226 - $_*6*6 } 0..4), # -r
+				(map {  46 + $_     } 0..4), # +b
+				(map {  51 - $_*6   } 0..4), # -g
+				(map {  21 + $_*6*6 } 0..4), # +r
+				(map { 201 - $_     } 0..4), # -b
+				196,
+			],
+		}->{$_[1]} // do {
+			my @vals = split /[^0-9;]/, $_[1]
+				or die "Empty palette resulting from \"$_[1]\"\n";
+			\@vals;
+		};
 	},
 	'stat|s!',
 	'signal-stat=s',
@@ -106,8 +116,8 @@ $opt{'value-length'} = 1 if $opt{unmodified};
 $opt{'signal-stat'} //= exists $SIG{INFO} ? 'INFO' : 'QUIT';
 $opt{markers} //= '=avg >31.73v <68.27v +50v |0';
 $opt{palette} //= $opt{color} && [31, 90, 32];
-$opt{indicators} = [split //,
-	$opt{indicators} || ($opt{ascii} ? ' .oO' : ' ▁▂▃▄▅▆▇█')
+$opt{indicators} = [split //, $opt{indicators} ||
+	($opt{ascii} ? ' .oO' : $opt{spark} ? ' ▁▂▃▄▅▆▇█' : ' ▏▎▍▌▋▊▉█')
 ] if defined $opt{indicators} or $opt{spark};
 $opt{hidemin} = ($opt{hidemin} || 1) - 1;
 $opt{input} = (@ARGV && $ARGV[0] =~ m/\A[-0-9]/) ? \@ARGV : undef
@@ -281,7 +291,7 @@ while ($nr <= $limit) {
 		$val == $order[-1] ? $opt{palette}->[0] : # min
 		$opt{palette}->[ $rel * ($#{$opt{palette}} - 1) + 1 ];
 	my $indicator = $opt{indicators} && $opt{indicators}->[
-		!$val || !$#{$opt{indicators}} ? 0 : # blank
+		!length($val) || !$#{$opt{indicators}} ? 0 : # blank
 		$#{$opt{indicators}} < 2 ? 1 :
 		$val >= $order[0] ? -1 :
 		$rel * ($#{$opt{indicators}} - 1e-14) + 1
@@ -663,6 +673,10 @@ Sparkline graphics of simple input given as inline parameters:
 
     barcat -_ 3 1 4 1 5 0 9 2 4
 
+Misusing the spark functionality to draw a lolcat line:
+
+    seq $(tput cols) | barcat --spark --indicator=- --palette=rainbow
+
 =head1 AUTHOR
 
 Mischa POSLAWSKY <perl@shiar.org>