X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Ftaskbar%2Ftaskbar.c;h=bb351fe1792096f87c5b92d74018e8aed52706f9;hb=ac96fe8050ff0f5c4d0cb4b794eeee875e1d4bfd;hp=34f49b0a52accebe6e2230d33376c04b930c4ea3;hpb=f8bebb561d52fa25b320904bb0c6a08347d05611;p=chaz%2Ftint2

diff --git a/src/taskbar/taskbar.c b/src/taskbar/taskbar.c
index 34f49b0..bb351fe 100644
--- a/src/taskbar/taskbar.c
+++ b/src/taskbar/taskbar.c
@@ -39,6 +39,9 @@
 */
 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)); }
 void free_ptr_array(gpointer data) { g_ptr_array_free(data, 1); }
@@ -51,14 +54,12 @@ 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;
@@ -69,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;
@@ -82,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;
@@ -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,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);
 		}
 	}
 }
@@ -218,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;
 }
 
 
@@ -230,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) {
@@ -254,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;
@@ -297,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--;
@@ -335,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--;
@@ -343,4 +346,5 @@ void resize_taskbar(void *obj)
 			y += tsk->area.height + panel->g_taskbar.area.paddingx;
 		}
 	}
+	return 0;
 }