X-Git-Url: https://git.brokenzipper.com/gitweb?a=blobdiff_plain;f=src%2Fbattery%2Fbattery.c;h=8d64f825cbf8b36243faa6af85c0013bbeda774a;hb=462228f2e82c6e5f61baeb49b6358273728baa90;hp=99e5aee84d7de7247e2848d7b76441e220a13ff4;hpb=ad50533aef71e9697fe78bb636e64079f198f985;p=chaz%2Ftint2

diff --git a/src/battery/battery.c b/src/battery/battery.c
index 99e5aee..8d64f82 100644
--- a/src/battery/battery.c
+++ b/src/battery/battery.c
@@ -37,7 +37,7 @@ PangoFontDescription *bat1_font_desc=0;
 PangoFontDescription *bat2_font_desc=0;
 struct batstate battery_state;
 int battery_enabled;
-static const struct timeout* battery_timeout=0;
+static timeout* battery_timeout=0;
 
 static char buf_bat_percentage[10];
 static char buf_bat_time[20];
@@ -186,15 +186,15 @@ void init_battery_panel(void *p)
 
 	if (panel_horizontal) {
 		// panel horizonal => fixed height and posy
-		battery->area.posy = panel->area.pix.border.width + panel->area.paddingy;
+		battery->area.posy = panel->area.bg->border.width + panel->area.paddingy;
 		battery->area.height = panel->area.height - (2 * battery->area.posy);
 	}
 	else {
 		// panel vertical => fixed width, height, posy and posx
 		battery->area.posy = panel->clock.area.posy + panel->clock.area.height + panel->area.paddingx;
 		battery->area.height = (2 * battery->area.paddingxlr) + (bat_time_height + bat_percentage_height);
-		battery->area.posx = panel->area.pix.border.width + panel->area.paddingy;
-		battery->area.width = panel->area.width - (2 * panel->area.pix.border.width) - (2 * panel->area.paddingy);
+		battery->area.posx = panel->area.bg->border.width + panel->area.paddingy;
+		battery->area.width = panel->area.width - (2 * panel->area.bg->border.width) - (2 * panel->area.paddingy);
 	}
 
 	battery->bat1_posy = (battery->area.height - bat_percentage_height) / 2;
@@ -212,36 +212,30 @@ void update_battery() {
 
 	fp = fopen(path_status, "r");
 	if(fp != NULL) {
-		fgets(tmp, sizeof tmp, fp);
+		if (fgets(tmp, sizeof tmp, 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;
+		}
 		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);
-		energy_now = atoi(tmp);
+		if (fgets(tmp, sizeof tmp, fp)) energy_now = atoi(tmp);
 		fclose(fp);
 	}
 
 	fp = fopen(path_energy_full, "r");
 	if(fp != NULL) {
-		fgets(tmp, sizeof tmp, fp);
-		energy_full = atoi(tmp);
+		if (fgets(tmp, sizeof tmp, fp)) energy_full = atoi(tmp);
 		fclose(fp);
 	}
 
 	fp = fopen(path_current_now, "r");
 	if(fp != NULL) {
-		fgets(tmp, sizeof tmp, fp);
-		current_now = atoi(tmp);
+		if (fgets(tmp, sizeof tmp, fp)) current_now = atoi(tmp);
 		fclose(fp);
 	}
 
@@ -268,15 +262,14 @@ void update_battery() {
 	if(energy_full > 0)
 		new_percentage = (energy_now*100)/energy_full;
 
-  if(battery_low_status > new_percentage && battery_state.state == BATTERY_DISCHARGING && !battery_low_cmd_send) {
-    printf("battery low, executing: %s\n", battery_low_cmd);
-    if (battery_low_cmd)
-      system(battery_low_cmd);
-    battery_low_cmd_send = 1;
+	if(battery_low_status > new_percentage && battery_state.state == BATTERY_DISCHARGING && !battery_low_cmd_send) {
+		if (battery_low_cmd)
+			if (-1 != system(battery_low_cmd))
+				battery_low_cmd_send = 1;
+	}
+	if(battery_low_status < new_percentage && battery_state.state == BATTERY_CHARGING && battery_low_cmd_send) {
+		battery_low_cmd_send = 0;
 	}
-  if(battery_low_status < new_percentage && battery_state.state == BATTERY_CHARGING && battery_low_cmd_send) {
-    battery_low_cmd_send = 0;
-  }
 
 	battery_state.percentage = new_percentage;
 
@@ -287,7 +280,7 @@ void update_battery() {
 }
 
 
-void draw_battery (void *obj, cairo_t *c, int active)
+void draw_battery (void *obj, cairo_t *c)
 {
 	Battery *battery = obj;
 	PangoLayout *layout;
@@ -360,13 +353,13 @@ void resize_battery(void *obj)
 	if(percentage_width > time_width) new_width = percentage_width;
 	else new_width = time_width;
 
-	new_width += (2*battery->area.paddingxlr) + (2*battery->area.pix.border.width);
+	new_width += (2*battery->area.paddingxlr) + (2*battery->area.bg->border.width);
 
 	int old_width = battery->area.width;
 
 	Panel *panel = ((Area*)obj)->panel;
 	battery->area.width = new_width + 1;
-	battery->area.posx = panel->area.width - battery->area.width - panel->area.paddingxlr - panel->area.pix.border.width;
+	battery->area.posx = panel->area.width - battery->area.width - panel->area.paddingxlr - panel->area.bg->border.width;
 	if (panel->clock.area.on_screen)
 		battery->area.posx -= (panel->clock.area.width + panel->area.paddingx);