cleanup code

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

diff --git a/src/util/area.h b/src/util/area.h
index c5c833805dfea2319ce6b2cbb9bada3722b8b3a0..7270419d9ee6b20bb63c6a3d2ab3d0351f4c221a 100644 (file)
--- a/src/util/area.h
+++ b/src/util/area.h
@@ -5,7 +5,7 @@
 * Area is at the begining of each object (&object == &area).
 *
 * Area manage the background and border drawing, size and padding.
-* Each Area have 2 Pixmap (pix and pix_active).
+* Each Area has one Pixmap (pix).
 *
 * Area manage the tree of all objects. Parent object drawn before child object.
 *   panel -> taskbars -> tasks
@@ -27,73 +27,91 @@
 
 typedef struct
 {
-   double color[3];
-   double alpha;
-   int width;
-   int rounded;
+       double color[3];
+       double alpha;
+       int width;
+       int rounded;
 } Border;
 
 
 typedef struct
 {
-   double color[3];
-   double alpha;
+       double color[3];
+       double alpha;
 } Color;
 
-
 typedef struct
 {
-   Pixmap pmap;
-   Color back;
-   Border border;
-} Pmap;
-
+       Color back;
+       Border border;
+} Background;
 
-typedef struct {
-   // absolute coordinate in panel
-   int posx, posy;
-   // width and height including border
-   int width, height;
-   Pmap pix;
-   Pmap pix_active;
 
-   // list of child : Area object
-   GSList *list;
+// 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
+       int posx, posy;
+       // width and height including border
+       int width, height;
+       Pixmap pix;
+       Background *bg;
+
+       // 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;
-   int use_active, is_active;
-   // paddingxlr = horizontal padding left/right
-   // paddingx = horizontal padding between childs
-   int paddingxlr, paddingx, paddingy;
-   // parent Area
-   void *parent;
-   // panel
-   void *panel;
-
-   // each object can overwrite following function
-   void (*_draw_foreground)(void *obj, cairo_t *c, int active);
-   void (*_resize)(void *obj);
-   void (*_add_child)(void *obj);
-   int (*_remove_child)(void *obj);
+       // need redraw Pixmap
+       int redraw;
+       // paddingxlr = horizontal padding left/right
+       // paddingx = horizontal padding between childs
+       int paddingxlr, paddingx, paddingy;
+       // parent Area
+       void *parent;
+       // panel
+       void *panel;
+
+       // each object can overwrite following function
+       void (*_draw_foreground)(void *obj, cairo_t *c);
+       // 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);
 
-// draw pixmap and pixmap_active
-void draw (Area *a, int active);
-void draw_background (Area *a, cairo_t *c, int active);
+// 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);
 
 void remove_area (Area *a);
 void add_area (Area *a);
@@ -102,5 +120,7 @@ void free_area (Area *a);
 // draw rounded rectangle
 void draw_rect(cairo_t *c, double x, double y, double w, double h, double r);
 
+// clear pixmap with transparent color
+void clear_pixmap(Pixmap p, int x, int y, int w, int h);
 #endif