X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Ftaskbar%2Ftaskbar.c;h=4bf6db5d095dd27ced81aa729b50033976b3e994;hb=5987929085564f4e42b3985d939d1af3f8c3231a;hp=38d1f09d29ab2dd4ca731adf6d6e36c21b048d3f;hpb=0caca7524827e38c9d076f33dc66416d189184e8;p=chaz%2Ftint2

diff --git a/src/taskbar/taskbar.c b/src/taskbar/taskbar.c
index 38d1f09..4bf6db5 100644
--- 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];
 
@@ -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;
@@ -171,6 +177,13 @@ 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;
@@ -211,7 +224,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;
 }
 
 
@@ -223,10 +239,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) {