--- trunk/dwm-status.pl	2010/03/31 06:55:19	135
+++ trunk/dwm-status.pl	2010/06/30 15:21:02	136
@@ -17,7 +17,6 @@
 
 my $debug = shift @ARGV;
 my $awesome = 0;
-my $dzen = 1;
 
 $|=1;
 
@@ -68,16 +67,8 @@
 	}
 });
 
-my $unit_colors = {
-	'b' => '#ff0000',
-	'k' => '#ffff00',
-	'M' => '#00ff00',
-	'G' => '#0000ff',
-};
-
 sub unit {
-	my ($v,$align) = @_;
-	$align ||= '';
+	my $v = shift;
 
 	warn "unit( $v )\n" if ($debug);
 
@@ -89,24 +80,13 @@
 		$v /= 1024;
 	}
 
-	my $unit = $units[$o];
-
-	my $out = '';
-	$out .= '^fg(' . $unit_colors->{$unit} . ')';
-
 	if ( $v >= 1 ) {
-		$out .= sprintf("%${align}5d",$v);
+		return sprintf("%d%s", $v, $units[$o]);
 	} elsif ( $v == 0 ) {
-		$out = ' ' x 5;
+		return '';
 	} else {
-		$out .= sprintf("%${align}5.1f", $v);
+		return sprintf("%.1f%s", $v, $units[$o]);
 	}
-
-	$unit = '^fg(#444444)' . $unit if $dzen;
-	$out =~ s/\s(\s*)$/$unit$1/ unless $out =~ m/\s{5}/;
-	$out .= '^fg(#ffffff)' if $dzen;
-
-	return $out;
 }
 
 my ( $lrx, $ltx ) = ( 0, 0 );
@@ -126,7 +106,7 @@
 			my $full = read_file( $sysfs_path );
 			$sysfs_path =~ s/_full/_now/;
 			my $now = read_file( $sysfs_path );
-			$bat = sprintf("%2d%%", $now * 100 / $full );
+			$bat = sprintf("%2d%% | ", $now * 100 / $full );
 
 		} elsif ( $proc_acpi_battery ) {
 
@@ -146,13 +126,15 @@
 				my $mm = int( ( $time - $hh ) * 60 );
 				my $ss = ( $time * 3600 ) % 60;
 
-				$bat = sprintf("%s %2d%% %02d:%02d:%02d %3.1fW!",
+				$bat = sprintf("%s %2d%% %02d:%02d:%02d %3.1fW!| ",
 					substr($state->{'charging state'},0,1),
 					$pcnt * 100, $hh, $mm, $ss,
 					$state->{'present rate'} / 1000
 				);
 			}
 		}
+	} else {
+		$bat =~ s/!(\|\s)$/ $1/;
 	}
 	$i++;
 
@@ -205,15 +187,14 @@
 	my $d_write = ( $d_w - $ld_w ) / $dt;
 	( $ld_r, $ld_w ) = ( $d_r, $d_w );
 
-	my $out = join( $dzen ? ' ^fg(#333333)|^fg(#ffffff) ' : ' | ',
+	my $out = sprintf("%s |%5s D %-5s|%5s > %-5s| %s%s | %s",
 		$load,
-		unit( $d_read ) . ' D ' . unit( $d_write, '-' ),
-		unit( $net_rx ) . ' > ' . unit( $net_tx, '-' ),
+		unit( $d_read ), unit( $d_write ),
+		unit( $net_rx ), unit( $net_tx ),
 		$bat, $temp,
 		$s,
 	);
 
-
 	print "$out\n";
 	if ( $awesome ) {
 		open(my $fh, '|-', 'awesome-client') || die "can't pipe to awesome-client: $!";