order of panel items : partial implementation. expect crash/instability

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

diff --git a/src/taskbar/taskbar.c b/src/taskbar/taskbar.c
index 4bf6db5d095dd27ced81aa729b50033976b3e994..bb351fe1792096f87c5b92d74018e8aed52706f9 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;
@@ -75,6 +70,7 @@ void init_taskbar()
                        panel->g_task.area.bg = &g_array_index(backgrounds, Background, 0);
 
                // taskbar
+               panel->g_taskbar.area.size_mode = SIZE_BY_LAYOUT;
                panel->g_taskbar.area._resize = resize_taskbar;
                panel->g_taskbar.area.redraw = 1;
                panel->g_taskbar.area.on_screen = 1;
@@ -88,6 +84,7 @@ void init_taskbar()
                }
 
                // task
+               panel->g_task.area.size_mode = SIZE_BY_LAYOUT;
                panel->g_task.area._draw_foreground = draw_task;
                panel->g_task.area.redraw = 1;
                panel->g_task.area.on_screen = 1;
@@ -157,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);
                }
        }
 }
@@ -259,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;
@@ -302,6 +294,9 @@ void resize_taskbar(void *obj)
                        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);
+
                        if (modulo_width) {
                                tsk->area.width++;
                                modulo_width--;
@@ -340,6 +335,9 @@ void resize_taskbar(void *obj)
                        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);
+
                        if (modulo_height) {
                                tsk->area.height++;
                                modulo_height--;
@@ -348,4 +346,5 @@ void resize_taskbar(void *obj)
                        y += tsk->area.height + panel->g_taskbar.area.paddingx;
                }
        }
+       return 0;
 }