moved initial values in function default_xxx

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

diff --git a/src/battery/battery.c b/src/battery/battery.c
index 8d64f825cbf8b36243faa6af85c0013bbeda774a..82aabab322edd9db41d9945a19c119e15537db13 100644 (file)
--- a/src/battery/battery.c
+++ b/src/battery/battery.c
@@ -33,29 +33,74 @@
 #include "clock.h"
 #include "timer.h"
 
-PangoFontDescription *bat1_font_desc=0;
-PangoFontDescription *bat2_font_desc=0;
+PangoFontDescription *bat1_font_desc;
+PangoFontDescription *bat2_font_desc;
 struct batstate battery_state;
 int battery_enabled;
-static timeout* battery_timeout=0;
+int percentage_hide;
+static timeout* battery_timeout;
 
 static char buf_bat_percentage[10];
 static char buf_bat_time[20];
 
 int8_t battery_low_status;
-char *battery_low_cmd=0;
-unsigned char battery_low_cmd_send=0;
-char *path_energy_now=0;
-char *path_energy_full=0;
-char *path_current_now=0;
-char *path_status=0;
+unsigned char battery_low_cmd_send;
+char *battery_low_cmd;
+char *path_energy_now;
+char *path_energy_full;
+char *path_current_now;
+char *path_status;
 
 void update_batterys(void* arg)
 {
        int i;
        update_battery();
-       for (i=0 ; i < nb_panel ; i++)
+       for (i=0 ; i < nb_panel ; i++) {
+               if (battery_state.percentage >= percentage_hide) {
+                       if (panel1[i].battery.area.on_screen == 1) {
+                               panel1[i].battery.area.on_screen = 0;
+                               // force resize on panel
+                               panel1[i].area.resize = 1;
+                               panel_refresh = 1;
+                       }
+                       continue;
+               }
+               else {
+                       if (panel1[i].battery.area.on_screen == 0) {
+                               panel1[i].battery.area.on_screen = 1;
+                               // force resize on panel
+                               panel1[i].area.resize = 1;
+                               panel_refresh = 1;
+                       }
+               }
                panel1[i].battery.area.resize = 1;
+       }
+}
+
+void default_battery()
+{
+       battery_enabled = 0;
+       percentage_hide = 101;
+       battery_low_cmd_send = 0;
+       battery_timeout = 0;
+       bat1_font_desc = 0;
+       bat2_font_desc = 0;
+       battery_low_cmd = 0;
+       path_energy_now = 0;
+       path_energy_full = 0;
+       path_current_now = 0;
+       path_status = 0;
+}
+
+void cleanup_battery()
+{
+       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);
 }
 
 
@@ -133,30 +178,7 @@ void init_battery()
        g_free(battery_dir);
 
        if (battery_enabled && battery_timeout==0)
-               battery_timeout = add_timeout(10, 5000, update_batterys, 0);
-}
-
-
-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;
+               battery_timeout = add_timeout(10, 10000, update_batterys, 0);
 }
 
 
@@ -263,9 +285,8 @@ void update_battery() {
                new_percentage = (energy_now*100)/energy_full;
 
        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;
+                       system(battery_low_cmd);  // return value == -1, since we've set SIGCHLD to SIGIGN
+                       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;