X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Futil%2Farea.h;h=16465b29daeb1d7d5e0f79051842e82b4cac39b8;hb=928fc258ac46f2cc098f714921c028351b07ec31;hp=0499e1a294439b630e2dd27609904e01756153ba;hpb=2930680396e47d66f7690e7ff92d5bcccbbf996c;p=chaz%2Ftint2

diff --git a/src/util/area.h b/src/util/area.h
index 0499e1a..16465b2 100644
--- a/src/util/area.h
+++ b/src/util/area.h
@@ -1,90 +1,105 @@
 /**************************************************************************
 * Copyright (C) 2008 thierry lorthiois (lorthiois@bbsoft.fr)
-* 
+*
 * base class for all graphical objects (panel, taskbar, task, systray, clock, ...).
-* Area is at the begining of each graphical object so &object == &area.
-* 
+* Area is at the begining of each object (&object == &area).
+*
 * Area manage the background and border drawing, size and padding.
-* Area also manage the tree of visible objects
+* Each Area has one Pixmap (pix).
+*
+* Area manage the tree of all objects. Parent object drawn before child object.
 *   panel -> taskbars -> tasks
 *         -> systray -> icons
 *         -> clock
-* 
-* draw_foreground(obj) and draw(obj) are virtual function.
-* 
-* resize_width(obj, width) = 0 : fonction virtuelle à redéfinir
-*    recalcule la largeur de l'objet (car la hauteur est fixe)
-*    - taille systray calculée à partir de la liste des icones
-*    - taille clock calculée à partir de l'heure
-*    - taille d'une tache calculée à partir de la taskbar (ajout, suppression, taille)
-*    - taille d'une taskbar calculée à partir de la taille du panel et des autres objets
-* 
-* voir resize_taskbar(), resize_clock() et resize_tasks()
-* variable widthChanged ou bien emission d'un signal ???
-* voir config(obj) configure un objet (définie les positions verticales)
+*
+* draw_foreground(obj) and resize(obj) are virtual function.
 *
 **************************************************************************/
 
 #ifndef AREA_H
 #define AREA_H
 
+#include <glib.h>
 #include <X11/Xlib.h>
-#include <pango/pangocairo.h>
-
-#include "common.h"
-
+#include <cairo.h>
+#include <cairo-xlib.h>
 
 
 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
+{
+	Color back;
+	Border border;
+} 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 {
-   // TODO: isoler 'draw' de 'refresh'
-   // TODO: isoler les données locales des données communes aux freres
-   // absolute coordinate in panel
-   int posx, posy;
-   int width, height;
-   Pixmap pmap;
-
-   // list of child : Area object
-   GSList *list;
-   
-   // need redraw Pixmap
-   int redraw;   
-   int paddingx, paddingy;   
-   // parent Area
-   void *parent;
-   
-   Color back;
-   Border border;
-   
-   // each object can overwrite following function
-   void (*draw)(void *obj);
-   void (*draw_foreground)(void *obj, cairo_t *c);
-   void (*add_child)(void *obj);
-   int (*remove_child)(void *obj);   
+	// 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;
+	// 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;
+	// 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);
+	// 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);
 } Area;
 
 
-
+void rendering(void *panel);
+void size_by_content (Area *a);
+void size_by_layout (Area *a, int pos, int level);
 // draw background and foreground
 void refresh (Area *a);
-
+ 
 // set 'redraw' on an area and childs
 void set_redraw (Area *a);
+
+// draw pixmap
 void draw (Area *a);
 void draw_background (Area *a, cairo_t *c);
 
@@ -92,5 +107,10 @@ void remove_area (Area *a);
 void add_area (Area *a);
 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