panel_items : fixed some segfault.

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

diff --git a/src/battery/battery.c b/src/battery/battery.c
index b20b7d3193b911eaee818cf8f9a86c5fb893628f..086b6d0dd7180910f6780857026d87137e35438d 100644 (file)
--- a/src/battery/battery.c
+++ b/src/battery/battery.c
@@ -38,11 +38,8 @@
 
 #include "window.h"
 #include "server.h"
-#include "area.h"
 #include "panel.h"
-#include "taskbar.h"
 #include "battery.h"
-#include "clock.h"
 #include "timer.h"
 #include "common.h"
 
@@ -76,21 +73,20 @@ void update_batterys(void* arg)
                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;
+               if (panel1[i].battery.area.on_screen == 1) {
+                       panel1[i].battery.area.resize = 1;
+                       panel_refresh = 1;
+               }
        }
 }
 
@@ -230,6 +226,7 @@ void init_battery_panel(void *p)
        battery->area.parent = p;
        battery->area.panel = p;
        battery->area._draw_foreground = draw_battery;
+       battery->area.size_mode = SIZE_BY_CONTENT;
        battery->area._resize = resize_battery;
        battery->area.resize = 1;
        battery->area.redraw = 1;
@@ -249,8 +246,6 @@ void init_battery_panel(void *p)
        }
        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.bg->border.width + panel->area.paddingy;
                battery->area.width = panel->area.width - (2 * panel->area.bg->border.width) - (2 * panel->area.paddingy);
        }
@@ -448,15 +443,14 @@ void draw_battery (void *obj, cairo_t *c)
 }
 
 
-void resize_battery(void *obj)
+int resize_battery(void *obj)
 {
        Battery *battery = obj;
        PangoLayout *layout;
-       int percentage_width, time_width, new_width;
+       int percentage_width, time_width, new_width, ret = 0;
 
        percentage_width = time_width = 0;
        battery->area.redraw = 1;
-
        snprintf(buf_bat_percentage, sizeof(buf_bat_percentage), "%d%%", battery_state.percentage);
        if(battery_state.state == BATTERY_FULL) {
                strcpy(buf_bat_time, "Full");
@@ -464,7 +458,11 @@ void resize_battery(void *obj)
                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;
+       if (!panel_horizontal) {
+//             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);
+               return ret;
+       }
 
        cairo_surface_t *cs;
        cairo_t *c;
@@ -489,28 +487,22 @@ 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.bg->border.width);
-
        int old_width = battery->area.width;
-
-       Panel *panel = ((Area*)obj)->panel;
+       
+       new_width += (2*battery->area.paddingxlr) + (2*battery->area.bg->border.width);
        battery->area.width = new_width + 1;
-       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);
-
-       if(new_width > old_width || new_width < (old_width-6)) {
+       
+       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;
+               ret = 1;
        }
 
        g_object_unref (layout);
        cairo_destroy (c);
        cairo_surface_destroy (cs);
        XFreePixmap (server.dsp, pmap);
+       return ret;
 }