order of panel items : position of each object is update by layering engine (area)

[chaz/tint2] / src / taskbar / taskbar.c

diff --git a/src/taskbar/taskbar.c b/src/taskbar/taskbar.c
index 7f000eefbff541a1f49d0e5ea77a6e58c4f3fb46..02cfbb0d076279c136ac83bfde13ca86eae4bb78 100644 (file)
--- a/src/taskbar/taskbar.c
+++ b/src/taskbar/taskbar.c
@@ -60,11 +60,6 @@ void init_taskbar()
        for (i=0 ; i < nb_panel ; i++) {
                panel = &panel1[i];
 
-               if (panel->taskbar) {
-                       free(panel->taskbar);
-                       panel->taskbar = 0;
-               }
-
                if (panel->g_taskbar.bg == 0) {
                        panel->g_taskbar.bg = &g_array_index(backgrounds, Background, 0);
                        panel->g_taskbar.area.bg = panel->g_taskbar.bg;
@@ -159,17 +154,12 @@ void init_taskbar()
                //printf("monitor %d, task_maximum_width %d\n", panel->monitor, panel->g_task.maximum_width);
 
                Taskbar *tskbar;
-               panel->nb_desktop = server.nb_desktop;
-               panel->taskbar = calloc(panel->nb_desktop, sizeof(Taskbar));
                for (j=0 ; j < panel->nb_desktop ; j++) {
                        tskbar = &panel->taskbar[j];
                        memcpy(&tskbar->area, &panel->g_taskbar, sizeof(Area));
                        tskbar->desktop = j;
                        if (j == server.desktop && panel->g_taskbar.use_active)
                                tskbar->area.bg = panel->g_taskbar.bg_active;
-
-                       // add taskbar to the panel
-                       panel->area.list = g_slist_append(panel->area.list, tskbar);
                }
        }
 }
@@ -261,7 +251,7 @@ void task_refresh_tasklist ()
 }
 
 
-void resize_taskbar(void *obj)
+int resize_taskbar(void *obj)
 {
        Taskbar *taskbar = (Taskbar*)obj;
        Panel *panel = (Panel*)taskbar->area.panel;
@@ -276,7 +266,7 @@ void resize_taskbar(void *obj)
 
        if (panel_horizontal) {
                int  pixel_width, modulo_width=0;
-               int  x, taskbar_width;
+               int  taskbar_width;
 
                // new task width for 'desktop'
                task_count = g_slist_length(taskbar->area.list);
@@ -297,27 +287,24 @@ void resize_taskbar(void *obj)
                taskbar->text_width = pixel_width - panel->g_task.text_posx - panel->g_task.area.bg->border.width - panel->g_task.area.paddingx;
 
                // change pos_x and width for all tasks
-               x = taskbar->area.posx + border_width + taskbar->area.paddingxlr;
                for (l = taskbar->area.list; l ; l = l->next) {
                        tsk = l->data;
                        if (!tsk->area.on_screen) continue;
-                       tsk->area.posx = x;
                        set_task_redraw(tsk);  // always redraw task, because the background could have changed (taskbar_active_id)
                        tsk->area.width = pixel_width;
-                       long value[] = { panel->posx+x, panel->posy, pixel_width, panel->area.height };
-                       XChangeProperty (server.dsp, tsk->win, server.atom._NET_WM_ICON_GEOMETRY, XA_CARDINAL, 32, PropModeReplace, (unsigned char*)value, 4);
+// TODO : move later (when posx is known)
+//                     long value[] = { panel->posx+x, panel->posy, pixel_width, panel->area.height };
+//                     XChangeProperty (server.dsp, tsk->win, server.atom._NET_WM_ICON_GEOMETRY, XA_CARDINAL, 32, PropModeReplace, (unsigned char*)value, 4);
 
                        if (modulo_width) {
                                tsk->area.width++;
                                modulo_width--;
                        }
-
-                       x += tsk->area.width + panel->g_taskbar.area.paddingx;
                }
        }
        else {
                int  pixel_height, modulo_height=0;
-               int  y, taskbar_height;
+               int  taskbar_height;
 
                // new task width for 'desktop'
                task_count = g_slist_length(taskbar->area.list);
@@ -338,22 +325,21 @@ void resize_taskbar(void *obj)
                taskbar->text_width = taskbar->area.width - (2 * panel->g_taskbar.area.paddingy) - panel->g_task.text_posx - panel->g_task.area.bg->border.width - panel->g_task.area.paddingx;
 
                // change pos_y and height for all tasks
-               y = taskbar->area.posy + border_width + taskbar->area.paddingxlr;
                for (l = taskbar->area.list; l ; l = l->next) {
                        tsk = l->data;
                        if (!tsk->area.on_screen) continue;
-                       tsk->area.posy = y;
                        set_task_redraw(tsk);  // always redraw task, because the background could have changed (taskbar_active_id)
                        tsk->area.height = pixel_height;
-                       long value[] = { panel->posx, panel->posy+y, panel->area.width, pixel_height };
-                       XChangeProperty (server.dsp, tsk->win, server.atom._NET_WM_ICON_GEOMETRY, XA_CARDINAL, 32, PropModeReplace, (unsigned char*)value, 4);
+// TODO : move later (when posy is known)
+//                     long value[] = { panel->posx, panel->posy+y, panel->area.width, pixel_height };
+//                     XChangeProperty (server.dsp, tsk->win, server.atom._NET_WM_ICON_GEOMETRY, XA_CARDINAL, 32, PropModeReplace, (unsigned char*)value, 4);
 
                        if (modulo_height) {
                                tsk->area.height++;
                                modulo_height--;
                        }
-
-                       y += tsk->area.height + panel->g_taskbar.area.paddingx;
                }
        }
+       return 0;
 }
+