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 541d8767e2c8deb75fe671fdc981cd3af103b62d..bb351fe1792096f87c5b92d74018e8aed52706f9 100644 (file)
--- a/src/taskbar/taskbar.c
+++ b/src/taskbar/taskbar.c
@@ -37,7 +37,10 @@
    element. However for omnipresent windows (windows which are visible in every taskbar) the array
    contains to every Task* on each panel a pointer (i.e. GPtrArray.len == server.nb_desktop)
 */
-GHashTable* win_to_task_table = 0;
+GHashTable* win_to_task_table;
+
+Task *task_active;
+Task *task_drag;
 
 guint win_hash(gconstpointer key) { return (guint)*((Window*)key); }
 gboolean win_compare(gconstpointer a, gconstpointer b) { return (*((Window*)a) == *((Window*)b)); }
@@ -51,24 +54,23 @@ void init_taskbar()
        if (win_to_task_table == 0)
                win_to_task_table = g_hash_table_new_full(win_hash, win_compare, free, free_ptr_array);
 
+       task_active = 0;
+       task_drag = 0;
+
        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;
                }
                if (panel->g_taskbar.bg_active == 0)
-                       panel->g_taskbar.bg_active = &g_array_index(backgrounds, Background, 0);
+                       panel->g_taskbar.bg_active = panel->g_taskbar.bg;
                if (panel->g_task.area.bg == 0)
                        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;
@@ -82,11 +84,12 @@ 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;
-               if (panel->g_task.config_asb_mask & (1<<TASK_NORMAL)) {
-                       panel->g_task.alpha[TASK_NORMAL] = 0;
+               if ((panel->g_task.config_asb_mask & (1<<TASK_NORMAL)) == 0) {
+                       panel->g_task.alpha[TASK_NORMAL] = 100;
                        panel->g_task.saturation[TASK_NORMAL] = 0;
                        panel->g_task.brightness[TASK_NORMAL] = 0;
                }
@@ -142,7 +145,7 @@ void init_taskbar()
                        panel->g_task.maximum_width = server.monitor[panel->monitor].width;
 
                panel->g_task.text_posx = panel->g_task.background[0]->border.width + panel->g_task.area.paddingxlr;
-               panel->g_task.text_posy = (panel->g_task.area.height - height) / 2.0;
+               panel->g_task.text_height = panel->g_task.area.height - (2 * panel->g_task.area.paddingy);
                if (panel->g_task.icon) {
                        panel->g_task.icon_size1 = panel->g_task.area.height - (2 * panel->g_task.area.paddingy);
                        panel->g_task.text_posx += panel->g_task.icon_size1;
@@ -151,22 +154,28 @@ 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);
                }
        }
 }
 
-void taskbar_remove_task(gpointer key, gpointer value, gpointer user_data) {remove_task(task_get_task(*(Window*)key)); }
+void taskbar_remove_task(gpointer key, gpointer value, gpointer user_data)
+{
+       remove_task(task_get_task(*(Window*)key));
+}
+
+void default_taskbar()
+{
+       win_to_task_table = 0;
+       urgent_timeout = 0;
+       urgent_list = 0;
+}
+
 void cleanup_taskbar()
 {
        Panel *panel;
@@ -207,7 +216,10 @@ Task *task_get_task (Window win)
 
 GPtrArray* task_get_tasks(Window win)
 {
-       return g_hash_table_lookup(win_to_task_table, &win);
+       if (win_to_task_table)
+               return g_hash_table_lookup(win_to_task_table, &win);
+       else
+               return 0;
 }
 
 
@@ -219,10 +231,6 @@ void task_refresh_tasklist ()
        win = server_get_property (server.root_win, server.atom._NET_CLIENT_LIST, XA_WINDOW, &num_results);
        if (!win) return;
 
-       // Remove any old and set active win
-       // remark from Andreas: This seems unneccessary...
-//     active_task();
-
        GList* win_list = g_hash_table_get_keys(win_to_task_table);
        GList* it;
        for (it=win_list; it; it=it->next) {
@@ -243,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;
@@ -286,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--;
@@ -324,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--;
@@ -332,4 +346,5 @@ void resize_taskbar(void *obj)
                        y += tsk->area.height + panel->g_taskbar.area.paddingx;
                }
        }
+       return 0;
 }