little cleanup

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

diff --git a/src/taskbar/taskbar.c b/src/taskbar/taskbar.c
index a883523e124a004a3de0af00f82f97a8e1480721..ab6b11d3f029fdf3a7a3354b01a84f9002263d43 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,6 +54,9 @@ 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];
 
@@ -64,7 +70,7 @@ void init_taskbar()
                        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);
 
@@ -85,7 +91,7 @@ void init_taskbar()
                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)) {
+               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 +148,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;
@@ -166,7 +172,18 @@ void init_taskbar()
        }
 }
 
-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;