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

diff --git a/src/util/area.h b/src/util/area.h
index 0499e1a..c5c8338 100644
--- a/src/util/area.h
+++ b/src/util/area.h
@@ -1,38 +1,28 @@
 /**************************************************************************
 * 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 have 2 Pixmap (pix and pix_active).
+*
+* 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
@@ -51,31 +41,44 @@ typedef struct
 } Color;
 
 
+typedef struct
+{
+   Pixmap pmap;
+   Color back;
+   Border border;
+} Pmap;
+
+
 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;
+   // width and height including border
    int width, height;
-   Pixmap pmap;
+   Pmap pix;
+   Pmap pix_active;
 
    // list of child : Area object
    GSList *list;
-   
+
+	int on_screen;
+	// need compute position and width
+	int resize;
    // need redraw Pixmap
-   int redraw;   
-   int paddingx, paddingy;   
+   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;
-   
-   Color back;
-   Border border;
-   
+   // panel
+   void *panel;
+
    // 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);   
+   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;
 
 
@@ -83,14 +86,21 @@ typedef struct {
 // draw background and foreground
 void refresh (Area *a);
 
+void size (Area *a);
+
 // set 'redraw' on an area and childs
 void set_redraw (Area *a);
-void draw (Area *a);
-void draw_background (Area *a, cairo_t *c);
+
+// draw pixmap and pixmap_active
+void draw (Area *a, int active);
+void draw_background (Area *a, cairo_t *c, int active);
 
 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