X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fbattery%2Fbattery.c;h=5c1f6cc8ee814b3f67d84a6eb0fe44bb2b4f15d2;hb=b4a0127130213dba32519e1b478257228aa4dc10;hp=d5bf0a98851b870961beb299b2410254979b7e93;hpb=3083e8006371cfb4a454b8bce92a682e4bb87e50;p=chaz%2Ftint2

diff --git a/src/battery/battery.c b/src/battery/battery.c
index d5bf0a9..5c1f6cc 100644
--- a/src/battery/battery.c
+++ b/src/battery/battery.c
@@ -31,17 +31,30 @@
 #include "taskbar.h"
 #include "battery.h"
 #include "clock.h"
+#include "timer.h"
 
-PangoFontDescription *bat1_font_desc;
-PangoFontDescription *bat2_font_desc;
+PangoFontDescription *bat1_font_desc=0;
+PangoFontDescription *bat2_font_desc=0;
 struct batstate battery_state;
+int battery_enabled;
 
 static char buf_bat_percentage[10];
 static char buf_bat_time[20];
 
 int8_t battery_low_status;
-char *battery_low_cmd;
-char *path_energy_now, *path_energy_full, *path_current_now, *path_status;
+char *battery_low_cmd=0;
+char *path_energy_now=0;
+char *path_energy_full=0;
+char *path_current_now=0;
+char *path_status=0;
+
+void update_batterys()
+{
+	int i;
+	update_battery();
+	for (i=0 ; i < nb_panel ; i++)
+		panel1[i].battery.area.resize = 1;
+}
 
 
 void init_battery()
@@ -52,7 +65,8 @@ void init_battery()
 	const char *entryname;
 	char *battery_dir = 0;
 
-	path_energy_now = path_energy_full = path_current_now = path_status = 0;
+	if (!battery_enabled) return;
+
 	directory = g_dir_open("/sys/class/power_supply", 0, &error);
 	if (error)
 		g_error_free(error);
@@ -71,32 +85,76 @@ void init_battery()
 	}
 	if (directory)
 		g_dir_close(directory);
-	if (battery_dir) {
-		char *path1 = g_build_filename(battery_dir, "energy_now", NULL);
-		if (g_file_test (path1, G_FILE_TEST_EXISTS)) {
-			path_energy_now = g_build_filename(battery_dir, "energy_now", NULL);
-			path_energy_full = g_build_filename(battery_dir, "energy_full", NULL);
+	if (!battery_dir) {
+		cleanup_battery();
+		fprintf(stderr, "ERROR: battery applet can't found power_supply\n");
+		return;
+	}
+
+	char *path1 = g_build_filename(battery_dir, "energy_now", NULL);
+	if (g_file_test (path1, G_FILE_TEST_EXISTS)) {
+		path_energy_now = g_build_filename(battery_dir, "energy_now", NULL);
+		path_energy_full = g_build_filename(battery_dir, "energy_full", NULL);
+	}
+	else {
+		char *path2 = g_build_filename(battery_dir, "charge_now", NULL);
+		if (g_file_test (path2, G_FILE_TEST_EXISTS)) {
+			path_energy_now = g_build_filename(battery_dir, "charge_now", NULL);
+			path_energy_full = g_build_filename(battery_dir, "charge_full", NULL);
 		}
 		else {
-			char *path2 = g_build_filename(battery_dir, "charge_now", NULL);
-			if (g_file_test (path2, G_FILE_TEST_EXISTS)) {
-				path_energy_now = g_build_filename(battery_dir, "charge_now", NULL);
-				path_energy_full = g_build_filename(battery_dir, "charge_full", NULL);
-			}
-			else {
-				g_free(battery_dir);
-				battery_dir = 0;
-				fprintf(stderr, "ERROR: can't found energy_* or charge_*\n");
-			}
-			g_free(path2);
+			fprintf(stderr, "ERROR: can't found energy_* or charge_*\n");
 		}
+		g_free(path2);
+	}
+	if (path_energy_now && path_energy_full) {
 		path_current_now = g_build_filename(battery_dir, "current_now", NULL);
 		path_status = g_build_filename(battery_dir, "status", NULL);
-		g_free(path1);
+
+		// check file
+		FILE *fp1, *fp2, *fp3, *fp4;
+		fp1 = fopen(path_energy_now, "r");
+		fp2 = fopen(path_energy_full, "r");
+		fp3 = fopen(path_current_now, "r");
+		fp4 = fopen(path_status, "r");
+		if (fp1 == NULL || fp2 == NULL || fp3 == NULL || fp4 == NULL) {
+			cleanup_battery();
+			fprintf(stderr, "ERROR: battery applet can't open energy_now\n");
+		}
+		fclose(fp1);
+		fclose(fp2);
+		fclose(fp3);
+		fclose(fp4);
 	}
 
-	if (battery_dir)
-		g_free(battery_dir);
+	g_free(path1);
+	g_free(battery_dir);
+
+	if (battery_enabled)
+		install_timer(0, 1000000, 5, 0, update_batterys);
+}
+
+
+void cleanup_battery()
+{
+	battery_enabled = 0;
+	if (bat1_font_desc)
+		pango_font_description_free(bat1_font_desc);
+	if (bat2_font_desc)
+		pango_font_description_free(bat2_font_desc);
+	if (path_energy_now)
+		g_free(path_energy_now);
+	if (path_energy_full)
+		g_free(path_energy_full);
+	if (path_current_now)
+		g_free(path_current_now);
+	if (path_status)
+		g_free(path_status);
+	if (battery_low_cmd)
+		g_free(battery_low_cmd);
+
+	battery_low_cmd = path_energy_now = path_energy_full = path_current_now = path_status = 0;
+	bat1_font_desc = bat2_font_desc = 0;
 }
 
 
@@ -104,12 +162,10 @@ void init_battery_panel(void *p)
 {
 	Panel *panel = (Panel*)p;
 	Battery *battery = &panel->battery;
-	FILE *fp;
 	int bat_percentage_height, bat_percentage_height_ink, bat_time_height, bat_time_height_ink;
-	char *battery_dir = 0;
 
-	if (battery_dir == 0) battery->area.on_screen = 0;
-	if (!battery->area.on_screen) return;
+	if (!battery_enabled)
+		return;
 
 	battery->area.parent = p;
 	battery->area.panel = p;
@@ -117,31 +173,7 @@ void init_battery_panel(void *p)
 	battery->area._resize = resize_battery;
 	battery->area.resize = 1;
 	battery->area.redraw = 1;
-
-	if((fp = fopen(path_energy_now, "r")) == NULL) {
-		fprintf(stderr, "ERROR: battery applet can't open energy_now\n");
-		panel->battery.area.on_screen = 0;
-		return;
-	}
-	fclose(fp);
-	if((fp = fopen(path_energy_full, "r")) == NULL) {
-		fprintf(stderr, "ERROR: battery applet can't open energy_full\n");
-		panel->battery.area.on_screen = 0;
-		return;
-	}
-	fclose(fp);
-	if((fp = fopen(path_current_now, "r")) == NULL) {
-		fprintf(stderr, "ERROR: battery applet can't open current_now\n");
-		panel->battery.area.on_screen = 0;
-		return;
-	}
-	fclose(fp);
-	if((fp = fopen(path_status, "r")) == NULL) {
-		fprintf(stderr, "ERROR: battery applet can't open status");
-		panel->battery.area.on_screen = 0;
-		return;
-	}
-	fclose(fp);
+	battery->area.on_screen = 1;
 
 	update_battery(&battery_state);
 	snprintf(buf_bat_percentage, sizeof(buf_bat_percentage), "%d%%", battery_state.percentage);
@@ -176,6 +208,20 @@ void update_battery() {
 	int seconds = 0;
 	int8_t new_percentage = 0;
 
+	fp = fopen(path_status, "r");
+	if(fp != NULL) {
+		fgets(tmp, sizeof tmp, fp);
+		fclose(fp);
+	}
+	battery_state.state = BATTERY_UNKNOWN;
+	if(strcasecmp(tmp, "Charging\n")==0) battery_state.state = BATTERY_CHARGING;
+	if(strcasecmp(tmp, "Discharging\n")==0) battery_state.state = BATTERY_DISCHARGING;
+	if(strcasecmp(tmp, "Full\n")==0) battery_state.state = BATTERY_FULL;
+	if (battery_state.state == BATTERY_DISCHARGING) {
+	}
+	else {
+	}
+
 	fp = fopen(path_energy_now, "r");
 	if(fp != NULL) {
 		fgets(tmp, sizeof tmp, fp);
@@ -197,16 +243,6 @@ void update_battery() {
 		fclose(fp);
 	}
 
-	fp = fopen(path_status, "r");
-	if(fp != NULL) {
-		fgets(tmp, sizeof tmp, fp);
-		fclose(fp);
-	}
-
-	battery_state.state = BATTERY_UNKNOWN;
-	if(strcasecmp(tmp, "Charging\n")==0) battery_state.state = BATTERY_CHARGING;
-	if(strcasecmp(tmp, "Discharging\n")==0) battery_state.state = BATTERY_DISCHARGING;
-
 	if(current_now > 0) {
 		switch(battery_state.state) {
 			case BATTERY_CHARGING:
@@ -236,6 +272,11 @@ void update_battery() {
 	}
 
 	battery_state.percentage = new_percentage;
+
+	// clamp percentage to 100 in case battery is misreporting that its current charge is more than its max
+	if(battery_state.percentage > 100) {
+		battery_state.percentage = 100;
+	}
 }
 
 
@@ -281,7 +322,11 @@ void resize_battery(void *obj)
 	battery->area.redraw = 1;
 
 	snprintf(buf_bat_percentage, sizeof(buf_bat_percentage), "%d%%", battery_state.percentage);
-	snprintf(buf_bat_time, sizeof(buf_bat_time), "%02d:%02d", battery_state.time.hours, battery_state.time.minutes);
+	if(battery_state.state == BATTERY_FULL) {
+		strcpy(buf_bat_time, "Full");
+	} else {
+		snprintf(buf_bat_time, sizeof(buf_bat_time), "%02d:%02d", battery_state.time.hours, battery_state.time.minutes);
+	}
 	// vertical panel doen't adjust width
 	if (!panel_horizontal) return;