/************************************************************
* !!! This design is experimental and not yet fully implemented !!!!!!!!!!!!!
*
- * AREA :
+ * DATA ORGANISATION :
* 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.
+ * 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).
*
- * DATA ORGANISATION :
- * tint2 define one panel per monitor. And each panel have a tree of Area (nodes).
+ * 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.
*
- * '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 :
+ * 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)
*
- * 1) browse tree and resize SIZE_BY_CONTENT node
- * - children node are resized before its parent
+ * 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 :
+ * - posx/posy of all Area
+ * - 'layering event' propagation between object
+ * 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 objects
- * - parent's position is calculated before children's position
+ * - calculate position (posx,posy) : parent is calculated before children
* - if 'position' changed then 'redraw = 1'
- * 4) redraw needed objects
- * - parent node is drawn before its children
- *
- * perhaps 2) and 3) can be merged...
+ * 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 refresh (Area *a)
+void init_rendering(void *obj, int pos)
{
- // 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)
- set_redraw(l->data);
-
- //printf("draw area posx %d, width %d\n", a->posx, a->width);
- draw(a);
+ Area *a = (Area*)obj;
+
+ // initialize fixed position/size
+ GSList *l;
+ for (l = a->list; l ; l = l->next) {
+ Area *child = ((Area*)l->data);
+ if (panel_horizontal) {
+ child->posy = pos + a->bg->border.width + a->paddingy;
+ child->height = a->height - (2 * (a->bg->border.width + a->paddingy));
+ init_rendering(child, child->posy);
+ }
+ else {
+ child->posx = pos + a->bg->border.width + a->paddingy;
+ child->width = a->width - (2 * (a->bg->border.width + a->paddingy));
+ init_rendering(child, child->posx);
+ }
}
+}
- // 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 rendering(void *obj)
+{
+ 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 draw and resize hide objects
+ // don't resize hiden objects
if (!a->on_screen) return;
// children node are resized before its parent
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 draw and resize hide objects
+ // 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);
+ if (!child->on_screen) continue;
+ i++;
+
+ if (panel_horizontal) {
+ if (pos != child->posx) {
+ // pos changed => redraw
+ child->posx = pos;
+ child->redraw = 1;
+ }
+ }
+ else {
+ if (pos != child->posy) {
+ // pos changed => redraw
+ child->posy = pos;
+ child->redraw = 1;
+ }
+ }
+ //printf("level %d, object %d, pos %d\n", level, i, pos);
+
+ size_by_layout(child, pos, level+1);
+
+ if (panel_horizontal)
+ pos += child->width + a->paddingx;
+ else
+ pos += child->height + 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);
+}
+
+
+int resize_by_layout(void *obj)
+{
+ Area *child, *a = (Area*)obj;
+ int size, nb_by_content=0, nb_by_layout=0;
+
+ if (panel_horizontal) {
+ // detect free size for SIZE_BY_LAYOUT's Area
+ size = a->width - (2 * (a->paddingxlr + a->bg->border.width));
+ GSList *l;
+ for (l = a->list ; l ; l = l->next) {
+ child = (Area*)l->data;
+ if (child->on_screen && child->size_mode == SIZE_BY_CONTENT) {
+ size -= child->width;
+ nb_by_content++;
+ }
+ if (child->on_screen && child->size_mode == SIZE_BY_LAYOUT)
+ nb_by_layout++;
+ }
+ if (nb_by_content+nb_by_layout)
+ size -= ((nb_by_content+nb_by_layout-1) * a->paddingx);
+ //printf("resize_panel : size_panel %d, size_layout %d\n", panel->area.width, size);
+
+ int width=0, modulo=0;
+ if (nb_by_layout) {
+ width = size / nb_by_layout;
+ modulo = size % nb_by_layout;
+ }
+
+ // resize SIZE_BY_LAYOUT objects
+ for (l = a->list ; l ; l = l->next) {
+ child = (Area*)l->data;
+ if (child->on_screen && child->size_mode == SIZE_BY_LAYOUT) {
+ child->width = width;
+ child->resize = 1;
+ if (modulo) {
+ child->width++;
+ modulo--;
+ }
+ }
+ }
+ }
+ else {
+ // detect free size for SIZE_BY_LAYOUT's Area
+ size = a->height - (2 * (a->paddingxlr + a->bg->border.width));
+ GSList *l;
+ for (l = a->list ; l ; l = l->next) {
+ child = (Area*)l->data;
+ if (child->on_screen && child->size_mode == SIZE_BY_CONTENT) {
+ size -= child->height;
+ nb_by_content++;
+ }
+ if (child->on_screen && child->size_mode == SIZE_BY_LAYOUT)
+ nb_by_layout++;
+ }
+ if (nb_by_content+nb_by_layout)
+ size -= ((nb_by_content+nb_by_layout-1) * a->paddingx);
+
+ int height=0, modulo=0;
+ if (nb_by_layout) {
+ height = size / nb_by_layout;
+ modulo = size % nb_by_layout;
+ }
+
+ // resize SIZE_BY_LAYOUT objects
+ for (l = a->list ; l ; l = l->next) {
+ child = (Area*)l->data;
+ if (child->on_screen && child->size_mode == SIZE_BY_LAYOUT) {
+ child->height = height;
+ child->resize = 1;
+ if (modulo) {
+ child->height++;
+ modulo--;
+ }
+ }
+ }
+ }
+ return 0;
}
set_redraw(l->data);
}
+void hide(Area *a)
+{
+ Area *parent = (Area*)a->parent;
+
+ a->on_screen = 0;
+ parent->resize = 1;
+ if (panel_horizontal)
+ a->width = 0;
+ else
+ a->height = 0;
+}
+
+void show(Area *a)
+{
+ Area *parent = (Area*)a->parent;
+
+ a->on_screen = 1;
+ parent->resize = 1;
+ a->resize = 1;
+}
void draw (Area *a)
{
projects / chaz / tint2 / blobdiff