X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Futil%2Farea.c;h=460abd94e0f7ffc258c981f14ee2c317eefa2519;hb=9daa525aab5dfb62788865e4cbe4d92ddf055e93;hp=dd50c9e10e9e6a933c421c0bc9940bdc377bc07a;hpb=c803db3d16c62949428b4e0e2fcd85b8889a7ff3;p=chaz%2Ftint2 diff --git a/src/util/area.c b/src/util/area.c index dd50c9e..460abd9 100644 --- a/src/util/area.c +++ b/src/util/area.c @@ -32,121 +32,149 @@ /************************************************************ - * Layering & drawing loop of tint2 + * !!! This design is experimental and not yet fully implemented !!!!!!!!!!!!! * + * DATA ORGANISATION : * Areas in tint2 are similar to widgets in a GUI. - * Areas (task, clock, systray, taskbar,...) are nodes in a tree. - * The position of each Area is defined by parent's position and brothers on the left. + * All graphical objects (panel, taskbar, task, systray, clock, ...) 'inherit' an abstract class 'Area'. + * This class 'Area' manage the background, border, size, position and padding. + * Area is at the begining of each object (&object == &area). * - * !!! This design is experimental and not yet complete !!!!!!!!!!!!! + * tint2 define one panel per monitor. And each panel have a tree of Area. + * The root of the tree is Panel.Area. And task, clock, systray, taskbar,... are nodes. * - * 1) browse tree and resize SIZE_BY_CONTENT node - * - children node are resized before its parent + * The tree give the localisation of each object : + * - tree's root is in the background while tree's leafe are foreground objects + * - position of a node/Area depend on the layout : parent's position (posx, posy), size of previous brothers and parent's padding + * - size of a node/Area depend on the content (SIZE_BY_CONTENT objects) or on the layout (SIZE_BY_LAYOUT objects) + * + * DRAWING AND LAYERING ENGINE : + * Redrawing an object (like the clock) could come from an 'external event' (date change) + * or from a 'layering event' (position change). + * The following 'drawing engine' take care of all 'layering event'. + * 1) browse tree SIZE_BY_CONTENT + * - resize SIZE_BY_CONTENT node : children are resized before parent * - if 'size' changed then 'resize = 1' on the parent - * 2) browse tree and resize SIZE_BY_LAYOUT node - * - parent node is resized before its children + * 2) browse tree SIZE_BY_LAYOUT and POSITION + * - resize SIZE_BY_LAYOUT node : parent is resized before children * - if 'size' changed then 'resize = 1' on childs with SIZE_BY_LAYOUT - * 3) calculate posx of all objects - * - parent's position is calculated before children's position - * 4) redraw needed objects + * - calculate position (posx,posy) : parent is calculated before children + * - if 'position' changed then 'redraw = 1' + * 3) browse tree REDRAW + * - redraw needed objects : parent is drawn before children + * + * CONFIGURE PANEL'S LAYOUT : + * '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 tree 'Panel.Area' will have 2 childs (Systray and Clock). + * ************************************************************/ -void size_by_content (Area *a); -void size_by_layout (Area *a); - - -void refresh (Area *a) -{ - // don't draw and resize hide objects - if (!a->on_screen) return; - - //size(a); - size_by_content(a); - size_by_layout(a); - - // don't draw transparent objects (without foreground and without background) - if (a->redraw) { - a->redraw = 0; - // force redraw of child - GSList *l; - for (l = a->list ; l ; l = l->next) - set_redraw(l->data); - - //printf("draw area posx %d, width %d\n", a->posx, a->width); - draw(a); - } - - // draw current Area - 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; - for (l = a->list; l ; l = l->next) - refresh(l->data); -} - - -void size (Area *a) +void rendering(void *obj) { - GSList *l; - - if (a->resize) { - 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); - } - - // resize can generate a redraw - if (a->_resize) - a->_resize(a); - } + Panel *panel = (Panel*)obj; + + size_by_content(&panel->area); + size_by_layout(&panel->area, 0, 0); + + refresh(&panel->area); } void size_by_content (Area *a) { + // don't resize hiden objects + if (!a->on_screen) return; + // 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 + // calculate area's size if (a->resize && a->size_mode == SIZE_BY_CONTENT) { a->resize = 0; - // if 'size' changed then 'resize = 1' on the parent if (a->_resize) { - a->_resize(a); - ((Area*)a->parent)->resize = 1; + if (a->_resize(a)) { + // 'size' changed => 'resize = 1' on the parent and redraw object + ((Area*)a->parent)->resize = 1; + a->redraw = 1; + } } } } -void size_by_layout (Area *a) +void size_by_layout (Area *a, int pos, int level) { + // don't resize hiden objects + if (!a->on_screen) return; + // parent node is resized before its children - // calculate current area's size + // calculate 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; + if (a->_resize(a)) { + // if 'size' changed then 'resize = 1' on childs with SIZE_BY_LAYOUT + for (l = a->list; l ; l = l->next) { + if (((Area*)l->data)->size_mode == SIZE_BY_LAYOUT) + ((Area*)l->data)->resize = 1; + } } } } + // update position of childs + pos += a->paddingxlr + a->bg->border.width; + int i=0; + for (l = a->list; l ; l = l->next) { + Area *child = ((Area*)l->data); + i++; + + if (pos != child->posx) { + // pos changed => redraw + child->posx = pos; + child->redraw = 1; + } + //printf("level %d, object %d, pos %d\n", level, i, pos); + + size_by_layout(child, pos, level+1); + + pos += child->width + a->paddingx; + } +} + + +void refresh (Area *a) +{ + // don't draw and resize hide objects + if (!a->on_screen) return; + + // don't draw transparent objects (without foreground and without background) + if (a->redraw) { + a->redraw = 0; + // force redraw of child + GSList *l; + for (l = a->list ; l ; l = l->next) + ((Area*)l->data)->redraw = 1; +// set_redraw(l->data); + + //printf("draw area posx %d, width %d\n", a->posx, a->width); + draw(a); + } + + // draw current Area + 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; for (l = a->list; l ; l = l->next) - size_by_layout(l->data); + refresh(l->data); }