X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Ftaskbar%2Ftaskbar.c;h=60a74060bd5d59682dada024e499cd9e61dbc2c2;hb=b1cdb484a3b06d20e0b9b14ae0c98721ad3fead0;hp=2b505dfeab06a32837eebf3fb4145b4020b01b1e;hpb=928fc258ac46f2cc098f714921c028351b07ec31;p=chaz%2Ftint2

diff --git a/src/taskbar/taskbar.c b/src/taskbar/taskbar.c
index 2b505df..60a7406 100644
--- a/src/taskbar/taskbar.c
+++ b/src/taskbar/taskbar.c
@@ -41,6 +41,7 @@ GHashTable* win_to_task_table;
 
 Task *task_active;
 Task *task_drag;
+int taskbar_enabled;
 
 guint win_hash(gconstpointer key) { return (guint)*((Window*)key); }
 gboolean win_compare(gconstpointer a, gconstpointer b) { return (*((Window*)a) == *((Window*)b)); }
@@ -52,6 +53,7 @@ void default_taskbar()
 	win_to_task_table = 0;
 	urgent_timeout = 0;
 	urgent_list = 0;
+	taskbar_enabled = 0;
 }
 
 void cleanup_taskbar()
@@ -123,6 +125,7 @@ void init_taskbar_panel(void *p)
 	// task
 	panel->g_task.area.size_mode = SIZE_BY_LAYOUT;
 	panel->g_task.area._draw_foreground = draw_task;
+	panel->g_task.area._on_change_layout = on_change_task;
 	panel->g_task.area.redraw = 1;
 	panel->g_task.area.on_screen = 1;
 	if ((panel->g_task.config_asb_mask & (1<<TASK_NORMAL)) == 0) {
@@ -196,7 +199,7 @@ void init_taskbar_panel(void *p)
 		tskbar = &panel->taskbar[j];
 		memcpy(&tskbar->area, &panel->g_taskbar, sizeof(Area));
 		tskbar->desktop = j;
-		if (j == server.desktop && panel->g_taskbar.use_active)
+		if (j == server.desktop)
 			tskbar->area.bg = panel->g_taskbar.bg_active;
 	}
 }
@@ -220,7 +223,7 @@ Task *task_get_task (Window win)
 
 GPtrArray* task_get_tasks(Window win)
 {
-	if (win_to_task_table)
+	if (win_to_task_table && taskbar_enabled)
 		return g_hash_table_lookup(win_to_task_table, &win);
 	else
 		return 0;
@@ -232,6 +235,7 @@ void task_refresh_tasklist ()
 	Window *win;
 	int num_results, i;
 
+	if (!taskbar_enabled) return;
 	win = server_get_property (server.root_win, server.atom._NET_CLIENT_LIST, XA_WINDOW, &num_results);
 	if (!win) return;
 
@@ -257,20 +261,25 @@ void task_refresh_tasklist ()
 
 int resize_taskbar(void *obj)
 {
+	//int ret = resize_by_layout(obj);
+	// on_changed
+	// taskbar->text_width = pixel_width - panel->g_task.text_posx - panel->g_task.area.bg->border.width - panel->g_task.area.paddingx;
+	//taskbar->text_width = taskbar->area.width - (2 * panel->g_taskbar.area.paddingy) - panel->g_task.text_posx - panel->g_task.area.bg->border.width - panel->g_task.area.paddingx;
+	//return ret;
+	
 	Taskbar *taskbar = (Taskbar*)obj;
 	Panel *panel = (Panel*)taskbar->area.panel;
 	Task *tsk;
 	GSList *l;
 	int  task_count, border_width;
 
-	//printf("resize_taskbar : posx et width des taches\n");
-	taskbar->area.redraw = 1;
-
+	//printf("resize_taskbar %d %d\n", taskbar->area.posx, taskbar->area.posy);
+//	taskbar->area.redraw = 1;
 	border_width = taskbar->area.bg->border.width;
 
 	if (panel_horizontal) {
 		int  pixel_width, modulo_width=0;
-		int  taskbar_width;
+		int  taskbar_width, old_width;
 
 		// new task width for 'desktop'
 		task_count = g_slist_length(taskbar->area.list);
@@ -294,21 +303,19 @@ int resize_taskbar(void *obj)
 		for (l = taskbar->area.list; l ; l = l->next) {
 			tsk = l->data;
 			if (!tsk->area.on_screen) continue;
-			set_task_redraw(tsk);  // always redraw task, because the background could have changed (taskbar_active_id)
+			old_width = tsk->area.width;
 			tsk->area.width = pixel_width;
-// TODO : move later (when posx is known)
-//			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--;
 			}
+			if (tsk->area.width != old_width)
+				tsk->area.on_changed = 1;
 		}
 	}
 	else {
 		int  pixel_height, modulo_height=0;
-		int  taskbar_height;
+		int  taskbar_height, old_height;
 
 		// new task width for 'desktop'
 		task_count = g_slist_length(taskbar->area.list);
@@ -332,18 +339,37 @@ int resize_taskbar(void *obj)
 		for (l = taskbar->area.list; l ; l = l->next) {
 			tsk = l->data;
 			if (!tsk->area.on_screen) continue;
-			set_task_redraw(tsk);  // always redraw task, because the background could have changed (taskbar_active_id)
+			old_height = tsk->area.height;
 			tsk->area.height = pixel_height;
-// TODO : move later (when posy is known)
-//			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--;
 			}
+			if (tsk->area.height != old_height)
+				tsk->area.on_changed = 1;
 		}
 	}
+	
 	return 0;
 }
 
+
+void visible_taskbar(void *p)
+{
+	Panel *panel =(Panel*)p;
+	int j;
+
+	Taskbar *taskbar;
+	for (j=0 ; j < panel->nb_desktop ; j++) {
+		taskbar = &panel->taskbar[j];
+		if (panel_mode != MULTI_DESKTOP && taskbar->desktop != server.desktop) {
+			// SINGLE_DESKTOP and not current desktop
+			taskbar->area.on_screen = 0;
+		}
+		else {
+			taskbar->area.on_screen = 1;
+		}
+	}
+	panel_refresh = 1;
+}
+