X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Futil%2Farea.h;h=77f957e2988ac914abe4aac35710a85d92eef761;hb=e7c43073246afe07cddf67d40d545f2bebcf62a1;hp=47c265ab9bd26eb1f57a4e262b7b0d6d34a3a79a;hpb=21dcd195642692401f855ef07b239364b5ef0c1b;p=chaz%2Ftint2

diff --git a/src/util/area.h b/src/util/area.h
index 47c265a..77f957e 100644
--- 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
@@ -40,32 +40,37 @@ typedef struct
 	double alpha;
 } Color;
 
-
 typedef struct
 {
-	Pixmap pmap;
 	Color back;
 	Border border;
-} Pmap;
+} 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
 	int posx, posy;
 	// width and height including border
 	int width, height;
-	Pmap pix;
-	Pmap pix_active;
+	Pixmap pix;
+	Background *bg;
 
 	// list of child : Area object
 	GSList *list;
 
+	// object visible on screen
 	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;
@@ -75,8 +80,9 @@ typedef struct {
 	void *panel;
 
 	// each object can overwrite following function
-	void (*_draw_foreground)(void *obj, cairo_t *c, int active);
-	void (*_resize)(void *obj);
+	void (*_draw_foreground)(void *obj, cairo_t *c);
+	// calculate size. 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);
@@ -84,17 +90,17 @@ typedef struct {
 
 
 
+void size_by_content (Area *a);
+void size_by_layout (Area *a);
 // draw background and foreground
 void refresh (Area *a);
-
-void size (Area *a);
-
+ 
 // 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);
+// draw pixmap
+void draw (Area *a);
+void draw_background (Area *a, cairo_t *c);
 
 void remove_area (Area *a);
 void add_area (Area *a);