X-Git-Url: http://git.shiar.nl/barcat.git/blobdiff_plain/6b28dcb8caa34f50a9f95e64948d6e2f697b34a7..v1.02-6-g05d1a75398:/graph

diff --git a/graph b/graph
index 8bf473d..3095106 100755
--- a/graph
+++ b/graph
@@ -16,7 +16,8 @@ sub podexit {
 my %opt;
 GetOptions(\%opt,
 	'color|c!',
-	'follow|f:i',
+	'C' => sub { $opt{color} = 0 },
+	'interval|t:i',
 	'trim|length|l=s' => sub {
 		my ($optname, $optval) = @_;
 		$optval =~ s/%$// and $opt{trimpct}++;
@@ -37,13 +38,13 @@ $opt{width} ||= $ENV{COLUMNS} || 80;
 $opt{color} //= -t *STDOUT;  # enable on tty
 $opt{trim}   *= $opt{width} / 100 if $opt{trimpct};
 
-if (defined $opt{follow}) {
-	$opt{follow} ||= 1;
+if (defined $opt{interval}) {
+	$opt{interval} ||= 1;
 	$SIG{ALRM} = sub {
 		show_lines();
-		alarm $opt{follow};
+		alarm $opt{interval};
 	};
-	alarm $opt{follow};
+	alarm $opt{interval};
 }
 
 $SIG{INT} = 'IGNORE';  # continue after assumed eof
@@ -52,7 +53,7 @@ my (@lines, @values);
 while (readline) {
 	s/\r?\n\z//;
 	s/^\h*// unless $opt{unmodified};
-	push @values, s/^ ( \h* -? [0-9]* \.? [0-9]+ |)//x && $1;
+	push @values, s/^ ( \h* -? [0-9]* \.? [0-9]+ |)/\n/x && $1;
 	if (defined $opt{trim}) {
 		my $trimpos = abs $opt{trim};
 		if ($trimpos <= 1) {
@@ -77,7 +78,7 @@ my $maxval = $order[0];
 my $minval = min $order[-1], 0;
 my $lenval = max map { length } @order;
 my $len    = defined $opt{trim} && $opt{trim} <= 0 ? -$opt{trim} + 1 :
-	1 + max map { length } @lines;  # left padding
+	max map { length $values[$_] && length $lines[$_] } 0 .. $#lines;  # left padding
 my $size   = ($maxval - $minval) &&
 	($opt{width} - $lenval - $len) / ($maxval - $minval);  # bar multiplication
 
@@ -112,12 +113,12 @@ while ($nr <= $#lines) {
 			$val == $order[0] ? 32 : # max
 			$val == $order[-1] ? 31 : # min
 			90;
-		printf "\e[%sm", $color if $color;
-		printf "%*s", $lenval, $val;
-		print "\e[0m" if $color;
+		$val = sprintf "%*s", $lenval, $val;
+		$val = "\e[${color}m$val\e[0m" if $color;
 	}
-	printf '%-*s', $len, $lines[$nr];
-	print $barmark[$_] // '-' for 1 .. $size && (($val || 0) - $minval) * $size;
+	$lines[$nr] =~ s/\n/$val/;
+	printf '%-*s', $len + length($val), $lines[$nr];
+	print $barmark[$_] // '-' for 1 .. $size && (($values[$nr] || 0) - $minval) * $size;
 	say '';
 	$nr++;
 }
@@ -149,9 +150,9 @@ Force colored output of values and bar markers.
 Defaults on if output is a tty,
 disabled otherwise such as when piped or redirected.
 
-=item -f, --follow[=<seconds>]
+=item -t, --interval[=<seconds>]
 
-Interval to output partial progress.
+Interval time to output partial progress.
 
 =item -l, --length=[-]<size>[%]
 
@@ -270,7 +271,7 @@ Or the most frequent authors:
 Latency history:
 
     ping google.com |
-    perl -pe '$|=1; print s/ time=(.*)// ? "$1 for " : "> "' | graph -f
+    perl -pe '$|=1; print s/ time=(.*)// ? "$1 for " : "> "' | graph -t
 
 =head1 AUTHOR