cleanup code

[chaz/tint2] / src / util / area.h

diff --git a/src/util/area.h b/src/util/area.h
index fc294f3ea7fdd69358f2a12d32da8637b7f536cf..7270419d9ee6b20bb63c6a3d2ab3d0351f4c221a 100644 (file)
--- a/src/util/area.h
+++ b/src/util/area.h
@@ -47,6 +47,10 @@ typedef struct
 } Background;
 
 
+// way to calculate the size
+// SIZE_BY_LAYOUT objects : taskbar and task
+// SIZE_BY_CONTENT objects : clock, battery, launcher, systray
+enum { SIZE_BY_LAYOUT, SIZE_BY_CONTENT };
 
 typedef struct {
        // coordinate relative to panel window
@@ -59,8 +63,12 @@ typedef struct {
        // list of child : Area object
        GSList *list;
 
+       // object visible on screen. 
+       // An object (like systray) could be enabled but hidden (because no tray icon).
        int on_screen;
-       // need compute position and width
+       // way to calculate the size (SIZE_BY_CONTENT or SIZE_BY_LAYOUT)
+       int size_mode;
+       // need to calculate position and width
        int resize;
        // need redraw Pixmap
        int redraw;
@@ -74,22 +82,33 @@ typedef struct {
 
        // each object can overwrite following function
        void (*_draw_foreground)(void *obj, cairo_t *c);
-       void (*_resize)(void *obj);
+       // update area's content and update size (width/heith). 
+       // return '1' if size changed, '0' otherwise.
+       int (*_resize)(void *obj);
        void (*_add_child)(void *obj);
        int (*_remove_child)(void *obj);
        const char* (*_get_tooltip_text)(void *obj);
 } Area;
 
+// on startup, initialize fixed pos/size
+void init_rendering(void *obj, int pos);
 
-
+void rendering(void *obj);
+void size_by_content (Area *a);
+void size_by_layout (Area *a, int pos, int level);
 // draw background and foreground
 void refresh (Area *a);
-
-void size (Area *a);
+ 
+// generic resize for SIZE_BY_LAYOUT objects
+int resize_by_layout(void *obj);
 
 // set 'redraw' on an area and childs
 void set_redraw (Area *a);
 
+// hide/unhide area
+void hide(Area *a);
+void show(Area *a);
+
 // draw pixmap
 void draw (Area *a);
 void draw_background (Area *a, cairo_t *c);