X-Git-Url: http://git.shiar.net/barcat.git/blobdiff_plain/ccbfed9910837a2be60c8b3ef0f990bcf60c0f2b..e31503d6e3fc1c0961d26db24e7474afa005e0ba:/barcat

diff --git a/barcat b/barcat
index 22f8d31..723c7da 100755
--- a/barcat
+++ b/barcat
@@ -99,6 +99,12 @@ while (readline) {
 
 $SIG{INT} = 'DEFAULT';
 
+sub color {
+	$opt{color} and defined $_[0] or return '';
+	return "\e[$_[0]m" if defined wantarray;
+	$_ = color(@_) . $_ . color(0) if defined;
+}
+
 sub show_lines {
 
 state $nr = $opt{hidemin} ? $opt{hidemin} - 1 : 0;
@@ -124,18 +130,18 @@ if ($opt{markers} // 1 and $size > 0) {
 	$barmark[ orderpos($#order * .68269) ] = '<';
 	$barmark[ orderpos($#order / 2) ] = '+';  # mean
 	$barmark[ -$minval * $size ] = '|' if $minval < 0;  # zero
-	defined and $opt{color} and $_ = "\e[36m$_\e[0m" for @barmark;
+	color(36) for @barmark;
 
 	state $lastmax = $maxval;
 	if ($maxval > $lastmax) {
 		print ' ' x ($lenval + $len);
-		printf "\e[90m" if $opt{color};
+		printf color(90);
 		printf '%-*s',
 			($lastmax - $minval) * $size + .5,
 			'-' x (($values[$nr - 1] - $minval) * $size);
-		print "\e[92m" if $opt{color};
+		print color(92);
 		say '+' x (($maxval - $lastmax - $minval) * $size + .5);
-		print "\e[0m" if $opt{color};
+		print color(0);
 		$lastmax = $maxval;
 	}
 }
@@ -156,12 +162,12 @@ while ($nr <= $#lines) {
 	$nr >= $opt{hidemax} and last if defined $opt{hidemax};
 	my $val = $values[$nr];
 	if (length $val) {
-		my $color = !$opt{color} ? 0 :
+		my $color = !$opt{color} ? undef :
 			$val == $order[0] ? 32 : # max
 			$val == $order[-1] ? 31 : # min
 			90;
 		$val = $opt{units} ? sival($val) : sprintf "%*s", $lenval, $val;
-		$val = "\e[${color}m$val\e[0m" if $color;
+		color($color) for $val;
 	}
 	my $line = $lines[$nr] =~ s/\n/$val/r;
 	printf '%-*s', $len + length($val), $line;