--- trunk/dwm-status.pl	2007/05/27 08:39:20	32
+++ trunk/dwm-status.pl	2007/06/14 11:56:26	39
@@ -13,12 +13,15 @@
 my $dt = 3;
 my $acpi_every = 10;
 
+my $disk_blk_size = 512;
+
 my $debug = shift @ARGV;
 
 $|=1;
 
 sub proc2hash {
 	my $f = shift;
+	return unless -f $f;
 	open(my $fh, '<', $f) || die "can't open $f: $!";
 	my $h;
 	while(<$fh>) {
@@ -27,16 +30,48 @@
 		$value =~ s/ m[VW]h*$//;
 		$h->{$key} = $value;
 	}
-	warn dump( $h ) if ( $debug );
+	warn "$f ",dump( $h ) if ( $debug );
 	return $h;
 }
 
+my $proc_acpi_battery;
+sub find_proc_acpi {
+	my ( $path, $check ) = @_;
+
+	if ( -e "/proc/acpi/$path" ) {
+		opendir(my $items, "/proc/acpi/$path") || die "can't open /proc/acpi/$path: $!";
+		foreach my $item ( readdir( $items ) ) {
+			$check->( $item ) && last;
+		}
+	}
+}
+
+my $proc_acpi_thermal_zone_temperature;
+find_proc_acpi('thermal_zone', sub {
+	my $thm = shift;
+	return if ( ! -e "/proc/acpi/thermal_zone/$thm/temperature" );
+	warn "# using thermal zone $thm\n" if ( $debug );
+	$proc_acpi_thermal_zone_temperature = "/proc/acpi/thermal_zone/$thm/temperature";
+});
+
+find_proc_acpi('battery', sub {
+	my $bat = shift;
+	return unless $bat =~ /BAT/;
+
+	warn "# testing battery $bat\n" if ( $debug );
+
+	if ( proc2hash( "/proc/acpi/battery/$bat/info" )->{present} eq 'yes' ) {
+		$proc_acpi_battery = "/proc/acpi/battery/$bat";
+		warn "using $proc_acpi_battery to monitor battery\n";
+	}
+});
+
 sub unit {
 	my $v = shift;
 
 	warn "unit( $v )\n" if ($debug);
 
-	my @units = qw/b k m g/;
+	my @units = qw/b k M G/;
 	my $o = 0;
 
 	while ( ( $v / 1024 ) >= 1 ) {
@@ -45,13 +80,16 @@
 	}
 
 	if ( $v >= 1 ) {
-		return sprintf("%d%s/s", $v, $units[$o]);
+		return sprintf("%d%s", $v, $units[$o]);
+	} elsif ( $v == 0 ) {
+		return '';
 	} else {
-		return sprintf("%.1f%s/s", $v, $units[$o]);
+		return sprintf("%.1f%s", $v, $units[$o]);
 	}
 }
 
 my ( $lrx, $ltx ) = ( 0, 0 );
+my ( $ld_r, $ld_w ) = ( 0, 0 );
 my $bat;
 
 my $i = 0;
@@ -59,16 +97,17 @@
 while ( 1 ) {
 	my $s = strftime("%Y-%m-%d %H:%M:%S", localtime());
 
-	if ( $i % $acpi_every == 0 ) {
+	if ( $i % $acpi_every == 0 && $proc_acpi_battery ) {
 
-		my $state = proc2hash( '/proc/acpi/battery/BAT0/state' );
+		my $state = proc2hash( "$proc_acpi_battery/state" );
 
 		if ( $state->{'present rate'} != 0 ) {
-			my $info = proc2hash( '/proc/acpi/battery/BAT0/info' );
+			my $info = proc2hash( "$proc_acpi_battery/info" );
 
 			my $pcnt = $state->{'remaining capacity'} / $info->{'design capacity'};
 
 			my $time = $state->{'remaining capacity'} / ( $state->{'present rate'} );
+			$time = ( $info->{'design capacity'} - $state->{'remaining capacity'} ) / $state->{'present rate'} if ( $state->{'charging state'} eq 'charging' );
 
 			warn "time = $time\n" if ($debug);
 
@@ -94,29 +133,57 @@
 	chomp( $load );
 	$load =~ s!\s\d+/\d+.*!!;
 
-	my $temp = read_file('/proc/acpi/thermal_zone/THM0/temperature');
-	chomp( $temp );
-	$temp =~ s!^.*:\s+!!;
+	my $temp = '';
+	if ( $proc_acpi_thermal_zone_temperature ) {
+		$temp = read_file( $proc_acpi_thermal_zone_temperature );
+		chomp( $temp );
+		$temp =~ s!^.*:\s+!!;
+	}
 
 	my $net = read_file('/proc/net/dev');
 	my ( $rx, $tx ) = ( 0,0 );
 
 	foreach ( split(/\n/, $net) ) {
 		s/^\s+//;
+		s/:\s+/:/;
 		my @n = split(/\s+/, $_, 17);
-		next unless ( $n[0] =~ m!(eth\d|ath\d):! );
+		next unless ( $n[0] =~ s!(eth\d|ath\d):!! );
 
 		warn dump( @n ) if ($debug);
-		$rx += $n[1];
-		$tx += $n[9];
+		$rx += $n[0];
+		$tx += $n[8];
 	}
 	warn "rx: $rx tx: $tx\n" if ($debug);
 
-	my $r = ( $rx - $lrx ) / $dt;
-	my $t = ( $tx - $ltx ) / $dt;
+	my $net_rx = ( $rx - $lrx ) / $dt;
+	my $net_tx = ( $tx - $ltx ) / $dt;
 	( $lrx, $ltx ) = ( $rx, $tx );
 
-	printf "%s | %s |%6s >> %-6s| %s%s\n", $s, $load, unit( $r ), unit( $t ), $bat, $temp;
+	my $disk = read_file('/proc/diskstats');
+	my ( $d_r, $d_w ) = ( 0,0 );
+
+	foreach ( split(/\n/, $disk) ) {
+		s/^\s+//;
+		my @d = split(/\s+/, $_, 17);
+		next unless ( $d[2] =~ m/^[sh]d\w$/ );
+
+		warn dump( @d ) if ($debug);
+		$d_r += $d[5] * $disk_blk_size;
+		$d_w += $d[7] * $disk_blk_size;
+	}
+	warn "d_r: $d_r d_w: $d_w\n" if ($debug);
+
+	my $d_read = ( $d_r - $ld_r ) / $dt;
+	my $d_write = ( $d_w - $ld_w ) / $dt;
+	( $ld_r, $ld_w ) = ( $d_r, $d_w );
+
+	printf("%s | %s |%5s D %-5s|%5s > %-5s| %s%s\n",
+		$s,
+		$load,
+		unit( $d_read ), unit( $d_write ),
+		unit( $net_rx ), unit( $net_tx ),
+		$bat, $temp,
+	);
 
 	sleep $dt;
 }