fixed background refresh on systray

[chaz/tint2] / src / battery / battery.c

diff --git a/src/battery/battery.c b/src/battery/battery.c
index 6a6877e45d5f1b05c2afd270c4ddf9509ff94f3e..222fbc5e1338634936a6ebac5f3edc19ef0aa937 100644 (file)
--- a/src/battery/battery.c
+++ b/src/battery/battery.c
@@ -40,7 +40,9 @@ static char buf_bat_percentage[10];
 static char buf_bat_time[20];
 
 int8_t battery_low_status;
-char* battery_low_cmd;
+char *battery_low_cmd;
+char *path_energy_now, *path_energy_full, *path_current_now, *path_status;
+
 
 void update_battery(struct batstate *data) {
        FILE *fp;
@@ -49,28 +51,28 @@ void update_battery(struct batstate *data) {
        int seconds = 0;
        int8_t new_percentage = 0;
 
-       fp = fopen("/sys/class/power_supply/BAT0/energy_now", "r");
+       fp = fopen(path_energy_now, "r");
        if(fp != NULL) {
                fgets(tmp, sizeof tmp, fp);
                energy_now = atoi(tmp);
                fclose(fp);
        }
 
-       fp = fopen("/sys/class/power_supply/BAT0/energy_full", "r");
+       fp = fopen(path_energy_full, "r");
        if(fp != NULL) {
                fgets(tmp, sizeof tmp, fp);
                energy_full = atoi(tmp);
                fclose(fp);
        }
 
-       fp = fopen("/sys/class/power_supply/BAT0/current_now", "r");
+       fp = fopen(path_current_now, "r");
        if(fp != NULL) {
                fgets(tmp, sizeof tmp, fp);
                current_now = atoi(tmp);
                fclose(fp);
        }
 
-       fp = fopen("/sys/class/power_supply/BAT0/status", "r");
+       fp = fopen(path_status, "r");
        if(fp != NULL) {
                fgets(tmp, sizeof tmp, fp);
                fclose(fp);
@@ -114,6 +116,53 @@ void update_battery(struct batstate *data) {
 
 void init_battery()
 {
+       // check battery
+       GDir *directory;
+       GError *error = NULL;
+       const char *entryname;
+       char *battery_dir = 0;
+
+       path_energy_now = path_energy_full = path_current_now = path_status = 0;
+       directory = g_dir_open("/sys/class/power_supply", 0, &error);
+       if (error)
+               g_error_free(error);
+       else {
+               while ((entryname=g_dir_read_name(directory))) {
+                       if (strncmp(entryname,"AC", 2) == 0) continue;
+
+                       char *path1 = g_build_filename("/sys/class/power_supply", entryname, "present", NULL);
+                       if (g_file_test (path1, G_FILE_TEST_EXISTS)) {
+                               g_free(path1);
+                               battery_dir = g_build_filename("/sys/class/power_supply", entryname, NULL);
+                               break;
+                       }
+                       g_free(path1);
+               }
+       }
+       if (battery_dir != 0) {
+               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 {
+                               g_free(battery_dir);
+                               battery_dir = 0;
+                               fprintf(stderr, "ERROR: can't found energy_* or charge_*\n");
+                       }
+                       g_free(path2);
+               }
+               path_current_now = g_build_filename(battery_dir, "current_now", NULL);
+               path_status = g_build_filename(battery_dir, "status", NULL);
+               g_free(path1);
+       }
+
        FILE *fp;
    Panel *panel;
    Battery *battery;
@@ -128,26 +177,27 @@ void init_battery()
                battery->area._draw_foreground = draw_battery;
                battery->area._resize = resize_battery;
 
+               if (battery_dir == 0) panel->battery.area.on_screen = 0;
                if (!battery->area.on_screen) continue;
-               if((fp = fopen("/sys/class/power_supply/BAT0/energy_now", "r")) == NULL) {
+               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;
                        continue;
                }
                fclose(fp);
-               if((fp = fopen("/sys/class/power_supply/BAT0/energy_full", "r")) == NULL) {
+               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;
                        continue;
                }
                fclose(fp);
-               if((fp = fopen("/sys/class/power_supply/BAT0/current_now", "r")) == NULL) {
+               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;
                        continue;
                }
                fclose(fp);
-               if((fp = fopen("/sys/class/power_supply/BAT0/status", "r")) == NULL) {
+               if((fp = fopen(path_status, "r")) == NULL) {
                        fprintf(stderr, "ERROR: battery applet can't open status");
                        panel->battery.area.on_screen = 0;
                        continue;
@@ -205,6 +255,7 @@ void draw_battery (void *obj, cairo_t *c, int active)
        g_object_unref(layout);
 }
 
+
 void resize_battery(void *obj)
 {
        Battery *battery = obj;
@@ -242,23 +293,19 @@ void resize_battery(void *obj)
 
        new_width += (2*battery->area.paddingxlr) + (2*battery->area.pix.border.width);
 
-       if(new_width > battery->area.width || new_width < (battery->area.width-6)) {
-               int i;
-               Panel *panel = ((Area*)obj)->panel;
-
-               printf("battery_width %d, new_width %d\n", battery->area.width, new_width);
-
-               // resize battery
-               // we try to limit the number of resize
-               battery->area.width = new_width + 1;
-               battery->area.posx = panel->area.width - battery->area.width - panel->area.paddingxlr - panel->area.pix.border.width;
-               if (panel->clock.area.on_screen)
-                       battery->area.posx -= (panel->clock.area.width + panel->area.paddingx);
+       int old_width = battery->area.width;
 
-               // resize other objects on panel
-               for (i=0 ; i < nb_panel ; i++)
-                       panel1[i].area.resize = 1;
+       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;
+       if (panel->clock.area.on_screen)
+               battery->area.posx -= (panel->clock.area.width + panel->area.paddingx);
 
+       if(new_width > old_width || new_width < (old_width-6)) {
+               // refresh and resize other objects on panel
+               // we try to limit the number of refresh
+               printf("battery_width %d, new_width %d\n", battery->area.width, new_width);
+               panel->area.resize = 1;
                systray.area.resize = 1;
                panel_refresh = 1;
        }