tint2 looks good for me. if you see bugs, report it.

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

diff --git a/src/util/area.h b/src/util/area.h
index 9a29ebd2ac07aeb446d1278affec11cd8cb8bd48..da32592c39b31cd005f5bf75973983124775a094 100644 (file)
--- a/src/util/area.h
+++ b/src/util/area.h
@@ -7,33 +7,22 @@
 * Area manage the background and border drawing, size and padding.
 * Each Area have 2 Pixmap (pix and pix_active).
 *
-* Area also manage the tree of visible objects. Parent object drawn before child object.
+* Area manage the tree of all objects. Parent object drawn before child object.
 *   panel -> taskbars -> tasks
 *         -> systray -> icons
 *         -> clock
 *
-* draw_foreground(obj) is virtual function.
-*
-* TODO :
-* 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()
-* 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
@@ -60,8 +49,6 @@ typedef struct
 } Pmap;
 
 
-// TODO: isoler 'draw' de 'refresh'
-// TODO: isoler les données locales des données communes aux freres
 typedef struct {
    // absolute coordinate in panel
    int posx, posy;
@@ -72,17 +59,25 @@ typedef struct {
    // list of child : Area object
    GSList *list;
 
+       int visible;
+       // need compute position and width
+       int resize;
    // need redraw Pixmap
    int redraw;
    int use_active, is_active;
-   int paddingx, paddingy;
+   // 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 (*add_child)(void *obj);
-   int (*remove_child)(void *obj);
+   void (*_draw_foreground)(void *obj, cairo_t *c, int active);
+   void (*_resize)(void *obj);
+   void (*_add_child)(void *obj);
+   int (*_remove_child)(void *obj);
 } Area;
 
 
@@ -101,5 +96,8 @@ 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);
+
 #endif