#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/Xatom.h>
+#include <X11/extensions/Xrender.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "server.h"
#include "panel.h"
-// QUESTION: Why do we need Pixmaps for drawing? Can't we draw directly in the Window???
-// Parent could pass a cairo_surface_t to the children, and children use it, for drawing...
+
+/************************************************************
+ * !!! This design is experimental and not yet fully implemented !!!!!!!!!!!!!
+ *
+ * AREA :
+ * Areas in tint2 are similar to widgets in a GUI.
+ * Graphical objects (panel, taskbar, task, systray, clock, ...) in tint2 'inherit' an Area class.
+ * Area is an abstract class of objects. It's at the begining of each object (&object == &area).
+ * Area manage the background and border drawing, size and padding.
+ *
+ * DATA ORGANISATION :
+ * tint2 define one panel per monitor. And each panel have a tree of Area (nodes).
+ * The root of the tree is Panel.Area. And task, clock, systray, taskbar,... are nodes.
+ *
+ * 'panel_items' parameter (in config) define the list and the order of nodes in tree's panel.
+ * 'panel_items = SC' define a panel with just Systray and Clock.
+ * So the root Panel.Area will have 2 childs (Systray and Clock).
+ *
+ * The tree allow to browse panel's objects from background to foreground and from left to right.
+ * The position of each node/Area depend on parent's position and brothers on the left.
+ *
+ * DRAWING EVENT :
+ * In the end, redrawing an object (like the clock) could come from an external event (date change)
+ * or from a layering event (size or position change).
+ *
+ * DRAWING LOOP :
+ * 1) browse tree and resize SIZE_BY_CONTENT node
+ * - children node are resized before its parent
+ * - if 'size' changed then 'redraw = 1' and 'resize = 1' on the parent
+ * 2) browse tree and resize SIZE_BY_LAYOUT node
+ * - parent node is resized before its children
+ * - if 'size' changed then 'redraw = 1' and 'resize = 1' on childs with SIZE_BY_LAYOUT
+ * 3) calculate posx of objects
+ * - parent's position is calculated before children's position
+ * - if 'position' changed then 'redraw = 1'
+ * 4) redraw needed objects
+ * - parent node is drawn before its children
+ *
+ * perhaps 2) and 3) can be merged...
+ * répartition entre niveau global et niveau local ??
+ * size_by_content peut-il modifier redraw=1 en cas de changement ? ou est ce géré par chaque composant ?
+ * size_by_layout peut-il modifier redraw ?
+ *
+ ************************************************************/
-// 1) resize child
-// 2) resize parent
-// 3) redraw parent
-// 4) redraw child
void refresh (Area *a)
{
// don't draw and resize hide objects
if (!a->on_screen) return;
- size(a);
-
// don't draw transparent objects (without foreground and without background)
if (a->redraw) {
a->redraw = 0;
set_redraw(l->data);
//printf("draw area posx %d, width %d\n", a->posx, a->width);
- draw(a, 0);
- if (a->use_active)
- draw(a, 1);
+ draw(a);
}
// draw current Area
- Pixmap pmap = (a->is_active == 0) ? (a->pix.pmap) : (a->pix_active.pmap);
- if (pmap == 0) printf("empty area posx %d, width %d\n", a->posx, a->width);
- XCopyArea (server.dsp, pmap, ((Panel *)a->panel)->temp_pmap, server.gc, 0, 0, a->width, a->height, a->posx, a->posy);
+ if (a->pix == 0) printf("empty area posx %d, width %d\n", a->posx, a->width);
+ XCopyArea (server.dsp, a->pix, ((Panel *)a->panel)->temp_pmap, server.gc, 0, 0, a->width, a->height, a->posx, a->posy);
// and then refresh child object
GSList *l;
}
-void size (Area *a)
+void size_by_content (Area *a)
{
- GSList *l;
+ // don't draw and resize hide objects
+ if (!a->on_screen) return;
- if (a->resize) {
+ // children node are resized before its parent
+ GSList *l;
+ for (l = a->list; l ; l = l->next)
+ size_by_content(l->data);
+
+ // calculate current area's size
+ if (a->resize && a->size_mode == SIZE_BY_CONTENT) {
a->resize = 0;
- // force the resize of childs
- for (l = a->list; l ; l = l->next) {
- Area *area = (Area*)l->data;
- area->resize = 1;
- size(area);
+
+ // if 'size' changed then 'resize = 1' on the parent
+ if (a->_resize) {
+ a->_resize(a);
+ a->redraw = 1;
+ ((Area*)a->parent)->resize = 1;
}
+ }
+}
+
+
+void size_by_layout (Area *a)
+{
+ // don't draw and resize hide objects
+ if (!a->on_screen) return;
- // resize can generate a redraw
- if (a->_resize)
+ // parent node is resized before its children
+ // calculate current area's size
+ GSList *l;
+ if (a->resize && a->size_mode == SIZE_BY_LAYOUT) {
+ a->resize = 0;
+
+ // if 'size' changed then 'resize = 1' on childs with SIZE_BY_LAYOUT
+ if (a->_resize) {
a->_resize(a);
+ for (l = a->list; l ; l = l->next) {
+ if (((Area*)l->data)->size_mode == SIZE_BY_LAYOUT)
+ ((Area*)l->data)->resize = 1;
+ }
+ }
}
+
+ for (l = a->list; l ; l = l->next)
+ size_by_layout(l->data);
}
}
-void draw (Area *a, int active)
+void draw (Area *a)
{
- Pixmap *pmap = (active == 0) ? (&a->pix.pmap) : (&a->pix_active.pmap);
-
- if (*pmap) XFreePixmap (server.dsp, *pmap);
- *pmap = XCreatePixmap (server.dsp, server.root_win, a->width, a->height, server.depth);
+ if (a->pix) XFreePixmap (server.dsp, a->pix);
+ a->pix = XCreatePixmap (server.dsp, server.root_win, a->width, a->height, server.depth);
// add layer of root pixmap (or clear pixmap if real_transparency==true)
- if (real_transparency)
- clear_pixmap(*pmap, 0 ,0, a->width, a->height);
- XCopyArea (server.dsp, ((Panel *)a->panel)->temp_pmap, *pmap, server.gc, a->posx, a->posy, a->width, a->height, 0, 0);
+ if (server.real_transparency)
+ clear_pixmap(a->pix, 0 ,0, a->width, a->height);
+ XCopyArea (server.dsp, ((Panel *)a->panel)->temp_pmap, a->pix, server.gc, a->posx, a->posy, a->width, a->height, 0, 0);
cairo_surface_t *cs;
cairo_t *c;
- cs = cairo_xlib_surface_create (server.dsp, *pmap, server.visual, a->width, a->height);
+ cs = cairo_xlib_surface_create (server.dsp, a->pix, server.visual, a->width, a->height);
c = cairo_create (cs);
- draw_background (a, c, active);
+ draw_background (a, c);
if (a->_draw_foreground)
- a->_draw_foreground(a, c, active);
+ a->_draw_foreground(a, c);
cairo_destroy (c);
cairo_surface_destroy (cs);
}
-void draw_background (Area *a, cairo_t *c, int active)
+void draw_background (Area *a, cairo_t *c)
{
- Pmap *pix = (active == 0) ? (&a->pix) : (&a->pix_active);
-
- if (pix->back.alpha > 0.0) {
+ if (a->bg->back.alpha > 0.0) {
//printf(" draw_background (%d %d) RGBA (%lf, %lf, %lf, %lf)\n", a->posx, a->posy, pix->back.color[0], pix->back.color[1], pix->back.color[2], pix->back.alpha);
- draw_rect(c, pix->border.width, pix->border.width, a->width-(2.0 * pix->border.width), a->height-(2.0*pix->border.width), pix->border.rounded - pix->border.width/1.571);
- cairo_set_source_rgba(c, pix->back.color[0], pix->back.color[1], pix->back.color[2], pix->back.alpha);
-
+ draw_rect(c, a->bg->border.width, a->bg->border.width, a->width-(2.0 * a->bg->border.width), a->height-(2.0*a->bg->border.width), a->bg->border.rounded - a->bg->border.width/1.571);
+ cairo_set_source_rgba(c, a->bg->back.color[0], a->bg->back.color[1], a->bg->back.color[2], a->bg->back.alpha);
cairo_fill(c);
}
- if (pix->border.width > 0 && pix->border.alpha > 0.0) {
- cairo_set_line_width (c, pix->border.width);
+ if (a->bg->border.width > 0 && a->bg->border.alpha > 0.0) {
+ cairo_set_line_width (c, a->bg->border.width);
// draw border inside (x, y, width, height)
- draw_rect(c, pix->border.width/2.0, pix->border.width/2.0, a->width - pix->border.width, a->height - pix->border.width, pix->border.rounded);
+ draw_rect(c, a->bg->border.width/2.0, a->bg->border.width/2.0, a->width - a->bg->border.width, a->height - a->bg->border.width, a->bg->border.rounded);
/*
// convert : radian = degre * M_PI/180
- // définir le dégradé dans un carré de (0,0) (100,100)
- // ensuite ce dégradé est extrapolé selon le ratio width/height
- // dans repère (0, 0) (100, 100)
+ // definir le degrade dans un carre de (0,0) (100,100)
+ // ensuite ce degrade est extrapoler selon le ratio width/height
+ // dans repere (0, 0) (100, 100)
double X0, Y0, X1, Y1, degre;
// x = X * (a->width / 100), y = Y * (a->height / 100)
double x0, y0, x1, y1;
X1 = 100;
Y1 = 0;
degre = 45;
- // et ensuite faire la changement d'unité du repère
- // car ce qui doit resté inchangée est les traits et pas la direction
+ // et ensuite faire la changement d'unite du repere
+ // car ce qui doit reste inchangee est les traits et pas la direction
- // il faut d'abord appliquer une rotation de 90° (et -180° si l'angle est supérieur à 180°)
- // ceci peut être appliqué une fois pour toute au départ
- // ensuite calculer l'angle dans le nouveau repère
- // puis faire une rotation de 90°
+ // il faut d'abord appliquer une rotation de 90 (et -180 si l'angle est superieur a 180)
+ // ceci peut etre applique une fois pour toute au depart
+ // ensuite calculer l'angle dans le nouveau repare
+ // puis faire une rotation de 90
x0 = X0 * ((double)a->width / 100);
x1 = X1 * ((double)a->width / 100);
y0 = Y0 * ((double)a->height / 100);
cairo_pattern_add_color_stop_rgba (linpat, 1, a->border.color[0], a->border.color[1], a->border.color[2], 0);
cairo_set_source (c, linpat);
*/
- cairo_set_source_rgba (c, pix->border.color[0], pix->border.color[1], pix->border.color[2], pix->border.alpha);
+ cairo_set_source_rgba (c, a->bg->border.color[0], a->bg->border.color[1], a->bg->border.color[2], a->bg->border.alpha);
cairo_stroke (c);
//cairo_pattern_destroy (linpat);
g_slist_free(a->list);
a->list = 0;
}
- if (a->pix.pmap) {
- XFreePixmap (server.dsp, a->pix.pmap);
- a->pix.pmap = 0;
- }
- if (a->pix_active.pmap) {
- XFreePixmap (server.dsp, a->pix_active.pmap);
- a->pix_active.pmap = 0;
+ if (a->pix) {
+ XFreePixmap (server.dsp, a->pix);
+ a->pix = 0;
}
}
void clear_pixmap(Pixmap p, int x, int y, int w, int h)
{
- cairo_surface_t *tmp = cairo_xlib_surface_create (server.dsp, p, server.visual, w, h);
- cairo_t *cr = cairo_create(tmp);
- cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
- cairo_rectangle(cr, x, y, w, h);
- cairo_set_source_rgba(cr, 1, 1, 1, 0);
- cairo_fill(cr);
- cairo_destroy(cr);
- cairo_surface_destroy (tmp);
+ Picture pict = XRenderCreatePicture(server.dsp, p, XRenderFindVisualFormat(server.dsp, server.visual), 0, 0);
+ XRenderColor col = { .red=0, .green=0, .blue=0, .alpha=0 };
+ XRenderFillRectangle(server.dsp, PictOpSrc, pict, &col, x, y, w, h);
+ XRenderFreePicture(server.dsp, pict);
}
projects / chaz / tint2 / blobdiff