*add* drag'n'drop task reordering

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

diff --git a/src/battery/battery.c b/src/battery/battery.c
index 8d64f825cbf8b36243faa6af85c0013bbeda774a..fd2ffce4bf59d74e6de728bad2e64bd638dcce59 100644 (file)
--- a/src/battery/battery.c
+++ b/src/battery/battery.c
@@ -37,6 +37,7 @@ PangoFontDescription *bat1_font_desc=0;
 PangoFontDescription *bat2_font_desc=0;
 struct batstate battery_state;
 int battery_enabled;
+int percentage_hide = 101;
 static timeout* battery_timeout=0;
 
 static char buf_bat_percentage[10];
@@ -54,8 +55,26 @@ 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;
+       }
 }
 
 
@@ -133,7 +152,7 @@ void init_battery()
        g_free(battery_dir);
 
        if (battery_enabled && battery_timeout==0)
-               battery_timeout = add_timeout(10, 5000, update_batterys, 0);
+               battery_timeout = add_timeout(10, 10000, update_batterys, 0);
 }
 
 
@@ -263,9 +282,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;