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

diff --git a/src/taskbar/taskbar.c b/src/taskbar/taskbar.c
index bb351fe..f05f067 100644
--- a/src/taskbar/taskbar.c
+++ b/src/taskbar/taskbar.c
@@ -2,7 +2,7 @@
 *
 * Tint2 : taskbar
 *
-* Copyright (C) 2008 thierry lorthiois (lorthiois@bbsoft.fr)
+* Copyright (C) 2008 thierry lorthiois (lorthiois@bbsoft.fr) from Omega distribution
 *
 * This program is free software; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License version 2
@@ -41,152 +41,37 @@ 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)); }
 void free_ptr_array(gpointer data) { g_ptr_array_free(data, 1); }
 
-void init_taskbar()
-{
-	Panel *panel;
-	int i, j;
-
-	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->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 = 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;
-		if (panel_horizontal) {
-			panel->g_taskbar.area.posy = panel->area.bg->border.width + panel->area.paddingy;
-			panel->g_taskbar.area.height = panel->area.height - (2 * panel->g_taskbar.area.posy);
-		}
-		else {
-			panel->g_taskbar.area.posx = panel->area.bg->border.width + panel->area.paddingy;
-			panel->g_taskbar.area.width = panel->area.width - (2 * panel->g_taskbar.area.posx);
-		}
-
-		// 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)) == 0) {
-			panel->g_task.alpha[TASK_NORMAL] = 100;
-			panel->g_task.saturation[TASK_NORMAL] = 0;
-			panel->g_task.brightness[TASK_NORMAL] = 0;
-		}
-		if ((panel->g_task.config_asb_mask & (1<<TASK_ACTIVE)) == 0) {
-			panel->g_task.alpha[TASK_ACTIVE] = panel->g_task.alpha[TASK_NORMAL];
-			panel->g_task.saturation[TASK_ACTIVE] = panel->g_task.saturation[TASK_NORMAL];
-			panel->g_task.brightness[TASK_ACTIVE] = panel->g_task.brightness[TASK_NORMAL];
-		}
-		if ((panel->g_task.config_asb_mask & (1<<TASK_ICONIFIED)) == 0) {
-			panel->g_task.alpha[TASK_ICONIFIED] = panel->g_task.alpha[TASK_NORMAL];
-			panel->g_task.saturation[TASK_ICONIFIED] = panel->g_task.saturation[TASK_NORMAL];
-			panel->g_task.brightness[TASK_ICONIFIED] = panel->g_task.brightness[TASK_NORMAL];
-		}
-		if ((panel->g_task.config_asb_mask & (1<<TASK_URGENT)) == 0) {
-			panel->g_task.alpha[TASK_URGENT] = panel->g_task.alpha[TASK_ACTIVE];
-			panel->g_task.saturation[TASK_URGENT] = panel->g_task.saturation[TASK_ACTIVE];
-			panel->g_task.brightness[TASK_URGENT] = panel->g_task.brightness[TASK_ACTIVE];
-		}
-		if ((panel->g_task.config_font_mask & (1<<TASK_NORMAL)) == 0) panel->g_task.font[TASK_NORMAL] = (Color){{0, 0, 0}, 0};
-		if ((panel->g_task.config_font_mask & (1<<TASK_ACTIVE)) == 0) panel->g_task.font[TASK_ACTIVE] = panel->g_task.font[TASK_NORMAL];
-		if ((panel->g_task.config_font_mask & (1<<TASK_ICONIFIED)) == 0) panel->g_task.font[TASK_ICONIFIED] = panel->g_task.font[TASK_NORMAL];
-		if ((panel->g_task.config_font_mask & (1<<TASK_URGENT)) == 0) panel->g_task.font[TASK_URGENT] = panel->g_task.font[TASK_ACTIVE];
-		if ((panel->g_task.config_font_mask & (1<<TASK_NORMAL)) == 0) panel->g_task.background[TASK_NORMAL] = &g_array_index(backgrounds, Background, 0);
-		if ((panel->g_task.config_background_mask & (1<<TASK_ACTIVE)) == 0) panel->g_task.background[TASK_ACTIVE] = panel->g_task.background[TASK_NORMAL];
-		if ((panel->g_task.config_background_mask & (1<<TASK_ICONIFIED)) == 0) panel->g_task.background[TASK_ICONIFIED] = panel->g_task.background[TASK_NORMAL];
-		if ((panel->g_task.config_background_mask & (1<<TASK_URGENT)) == 0) panel->g_task.background[TASK_URGENT] = panel->g_task.background[TASK_ACTIVE];
-
-		if (panel_horizontal) {
-			panel->g_task.area.posy = panel->g_taskbar.area.posy + panel->g_taskbar.bg->border.width + panel->g_taskbar.area.paddingy;
-			panel->g_task.area.height = panel->area.height - (2 * panel->g_task.area.posy);
-		}
-		else {
-			panel->g_task.area.posx = panel->g_taskbar.area.posx + panel->g_taskbar.bg->border.width + panel->g_taskbar.area.paddingy;
-			panel->g_task.area.width = panel->area.width - (2 * panel->g_task.area.posx);
-			panel->g_task.area.height = panel->g_task.maximum_height;
-		}
-
-		int k;
-		for (k=0; k<TASK_STATE_COUNT; ++k) {
-			if (panel->g_task.background[k]->border.rounded > panel->g_task.area.height/2) {
-				printf("task%sbackground_id has a too large rounded value. Please fix your tint2rc\n", k==0 ? "_" : k==1 ? "_active_" : k==2 ? "_iconified_" : "_urgent_");
-				g_array_append_val(backgrounds, *panel->g_task.background[k]);
-				panel->g_task.background[k] = &g_array_index(backgrounds, Background, backgrounds->len-1);
-				panel->g_task.background[k]->border.rounded = panel->g_task.area.height/2;
-			}
-		}
-
-		// compute vertical position : text and icon
-		int height_ink, height;
-		get_text_size(panel->g_task.font_desc, &height_ink, &height, panel->area.height, "TAjpg", 5);
-
-		if (!panel->g_task.maximum_width && panel_horizontal)
-			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_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;
-			panel->g_task.icon_posy = (panel->g_task.area.height - panel->g_task.icon_size1) / 2;
-		}
-		//printf("monitor %d, task_maximum_width %d\n", panel->monitor, panel->g_task.maximum_width);
-
-		Taskbar *tskbar;
-		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;
-		}
-	}
-}
-
-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;
+	taskbar_enabled = 0;
+	default_taskbarname();
 }
 
 void cleanup_taskbar()
 {
 	Panel *panel;
 	Taskbar *tskbar;
-	int i, j;
+	int i, j, k;
 
+	cleanup_taskbarname();
 	if (win_to_task_table) g_hash_table_foreach(win_to_task_table, taskbar_remove_task, 0);
 	for (i=0 ; i < nb_panel ; i++) {
 		panel = &panel1[i];
 		for (j=0 ; j < panel->nb_desktop ; j++) {
 			tskbar = &panel->taskbar[j];
+			for (k=0; k<TASKBAR_STATE_COUNT; ++k) {
+				if (tskbar->state_pix[k]) XFreePixmap(server.dsp, tskbar->state_pix[k]);
+			}
 			free_area (&tskbar->area);
 			// remove taskbar from the panel
 			panel->area.list = g_slist_remove(panel->area.list, tskbar);
@@ -204,6 +89,156 @@ void cleanup_taskbar()
 }
 
 
+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;
+}
+
+
+void init_taskbar_panel(void *p)
+{
+	Panel *panel =(Panel*)p;
+	int j;
+
+	if (panel->g_taskbar.background[TASKBAR_NORMAL] == 0) {
+		panel->g_taskbar.background[TASKBAR_NORMAL] = &g_array_index(backgrounds, Background, 0);
+		panel->g_taskbar.background[TASKBAR_ACTIVE] = &g_array_index(backgrounds, Background, 0);
+	}
+	if (panel->g_taskbar.background_name[TASKBAR_NORMAL] == 0) {
+		panel->g_taskbar.background_name[TASKBAR_NORMAL] = &g_array_index(backgrounds, Background, 0);
+		panel->g_taskbar.background_name[TASKBAR_ACTIVE] = &g_array_index(backgrounds, Background, 0);
+	}
+	if (panel->g_task.area.bg == 0)
+		panel->g_task.area.bg = &g_array_index(backgrounds, Background, 0);
+
+	// taskbar name
+	panel->g_taskbar.area_name.panel = panel;
+	panel->g_taskbar.area_name.size_mode = SIZE_BY_CONTENT;
+	panel->g_taskbar.area_name._resize = resize_taskbarname;
+	panel->g_taskbar.area_name._draw_foreground = draw_taskbarname;
+	panel->g_taskbar.area_name._on_change_layout = 0;
+	panel->g_taskbar.area_name.resize = 1;
+	panel->g_taskbar.area_name.on_screen = 1;
+
+	// taskbar
+	panel->g_taskbar.area.parent = panel;
+	panel->g_taskbar.area.panel = panel;
+	panel->g_taskbar.area.size_mode = SIZE_BY_LAYOUT;
+	panel->g_taskbar.area._resize = resize_taskbar;
+	panel->g_taskbar.area._draw_foreground = draw_taskbar;
+	panel->g_taskbar.area._on_change_layout = on_change_taskbar;
+	panel->g_taskbar.area.resize = 1;
+	panel->g_taskbar.area.on_screen = 1;
+	if (panel_horizontal) {
+		panel->g_taskbar.area.posy = panel->area.bg->border.width + panel->area.paddingy;
+		panel->g_taskbar.area.height = panel->area.height - (2 * panel->g_taskbar.area.posy);
+		panel->g_taskbar.area_name.posy = panel->g_taskbar.area.posy;
+		panel->g_taskbar.area_name.height = panel->g_taskbar.area.height;
+	}
+	else {
+		panel->g_taskbar.area.posx = panel->area.bg->border.width + panel->area.paddingy;
+		panel->g_taskbar.area.width = panel->area.width - (2 * panel->g_taskbar.area.posx);
+		panel->g_taskbar.area_name.posx = panel->g_taskbar.area.posx;
+		panel->g_taskbar.area_name.width = panel->g_taskbar.area.width;
+	}
+
+	// task
+	panel->g_task.area.panel = panel;
+	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.resize = 1;
+	panel->g_task.area.on_screen = 1;
+	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;
+	}
+	if ((panel->g_task.config_asb_mask & (1<<TASK_ACTIVE)) == 0) {
+		panel->g_task.alpha[TASK_ACTIVE] = panel->g_task.alpha[TASK_NORMAL];
+		panel->g_task.saturation[TASK_ACTIVE] = panel->g_task.saturation[TASK_NORMAL];
+		panel->g_task.brightness[TASK_ACTIVE] = panel->g_task.brightness[TASK_NORMAL];
+	}
+	if ((panel->g_task.config_asb_mask & (1<<TASK_ICONIFIED)) == 0) {
+		panel->g_task.alpha[TASK_ICONIFIED] = panel->g_task.alpha[TASK_NORMAL];
+		panel->g_task.saturation[TASK_ICONIFIED] = panel->g_task.saturation[TASK_NORMAL];
+		panel->g_task.brightness[TASK_ICONIFIED] = panel->g_task.brightness[TASK_NORMAL];
+	}
+	if ((panel->g_task.config_asb_mask & (1<<TASK_URGENT)) == 0) {
+		panel->g_task.alpha[TASK_URGENT] = panel->g_task.alpha[TASK_ACTIVE];
+		panel->g_task.saturation[TASK_URGENT] = panel->g_task.saturation[TASK_ACTIVE];
+		panel->g_task.brightness[TASK_URGENT] = panel->g_task.brightness[TASK_ACTIVE];
+	}
+	if ((panel->g_task.config_font_mask & (1<<TASK_NORMAL)) == 0) panel->g_task.font[TASK_NORMAL] = (Color){{0, 0, 0}, 0};
+	if ((panel->g_task.config_font_mask & (1<<TASK_ACTIVE)) == 0) panel->g_task.font[TASK_ACTIVE] = panel->g_task.font[TASK_NORMAL];
+	if ((panel->g_task.config_font_mask & (1<<TASK_ICONIFIED)) == 0) panel->g_task.font[TASK_ICONIFIED] = panel->g_task.font[TASK_NORMAL];
+	if ((panel->g_task.config_font_mask & (1<<TASK_URGENT)) == 0) panel->g_task.font[TASK_URGENT] = panel->g_task.font[TASK_ACTIVE];
+	if ((panel->g_task.config_font_mask & (1<<TASK_NORMAL)) == 0) panel->g_task.background[TASK_NORMAL] = &g_array_index(backgrounds, Background, 0);
+	if ((panel->g_task.config_background_mask & (1<<TASK_ACTIVE)) == 0) panel->g_task.background[TASK_ACTIVE] = panel->g_task.background[TASK_NORMAL];
+	if ((panel->g_task.config_background_mask & (1<<TASK_ICONIFIED)) == 0) panel->g_task.background[TASK_ICONIFIED] = panel->g_task.background[TASK_NORMAL];
+	if ((panel->g_task.config_background_mask & (1<<TASK_URGENT)) == 0) panel->g_task.background[TASK_URGENT] = panel->g_task.background[TASK_ACTIVE];
+
+	if (panel_horizontal) {
+		panel->g_task.area.posy = panel->g_taskbar.area.posy + panel->g_taskbar.background[TASKBAR_NORMAL]->border.width + panel->g_taskbar.area.paddingy;
+		panel->g_task.area.height = panel->area.height - (2 * panel->g_task.area.posy);
+	}
+	else {
+		panel->g_task.area.posx = panel->g_taskbar.area.posx + panel->g_taskbar.background[TASKBAR_NORMAL]->border.width + panel->g_taskbar.area.paddingy;
+		panel->g_task.area.width = panel->area.width - (2 * panel->g_task.area.posx);
+		panel->g_task.area.height = panel->g_task.maximum_height;
+	}
+
+	for (j=0; j<TASK_STATE_COUNT; ++j) {
+		if (panel->g_task.background[j]->border.rounded > panel->g_task.area.height/2) {
+			printf("task%sbackground_id has a too large rounded value. Please fix your tint2rc\n", j==0 ? "_" : j==1 ? "_active_" : j==2 ? "_iconified_" : "_urgent_");
+			g_array_append_val(backgrounds, *panel->g_task.background[j]);
+			panel->g_task.background[j] = &g_array_index(backgrounds, Background, backgrounds->len-1);
+			panel->g_task.background[j]->border.rounded = panel->g_task.area.height/2;
+		}
+	}
+
+	// compute vertical position : text and icon
+	int height_ink, height;
+	get_text_size(panel->g_task.font_desc, &height_ink, &height, panel->area.height, "TAjpg", 5);
+
+	if (!panel->g_task.maximum_width && panel_horizontal)
+		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_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;
+		panel->g_task.icon_posy = (panel->g_task.area.height - panel->g_task.icon_size1) / 2;
+	}
+	//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(server.nb_desktop, sizeof(Taskbar));
+	for (j=0 ; j < panel->nb_desktop ; j++) {
+		tskbar = &panel->taskbar[j];
+		memcpy(&tskbar->area, &panel->g_taskbar.area, sizeof(Area));
+		tskbar->desktop = j;
+		if (j == server.desktop)
+			tskbar->area.bg = panel->g_taskbar.background[TASKBAR_ACTIVE];
+		else
+			tskbar->area.bg = panel->g_taskbar.background[TASKBAR_NORMAL];
+	}
+	init_taskbarname_panel(panel);
+}
+
+
+void taskbar_remove_task(gpointer key, gpointer value, gpointer user_data)
+{
+	remove_task(task_get_task(*(Window*)key));
+}
+
+
 Task *task_get_task (Window win)
 {
 	GPtrArray* task_group = task_get_tasks(win);
@@ -216,7 +251,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;
@@ -228,6 +263,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;
 
@@ -251,100 +287,97 @@ void task_refresh_tasklist ()
 }
 
 
+void draw_taskbar (void *obj, cairo_t *c)
+{
+	Taskbar *taskbar = obj;
+	int state = (taskbar->desktop == server.desktop) ? TASKBAR_ACTIVE : TASKBAR_NORMAL;
+	
+	taskbar->state_pix[state] = taskbar->area.pix;
+}
+
+
 int resize_taskbar(void *obj)
 {
 	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;
-
-	border_width = taskbar->area.bg->border.width;
+	int text_width;
 
+	//printf("resize_taskbar %d %d\n", taskbar->area.posx, taskbar->area.posy);
 	if (panel_horizontal) {
-		int  pixel_width, modulo_width=0;
-		int  x, taskbar_width;
-
-		// new task width for 'desktop'
-		task_count = g_slist_length(taskbar->area.list);
-		if (!task_count) pixel_width = panel->g_task.maximum_width;
-		else {
-			taskbar_width = taskbar->area.width - (2 * border_width) - (2 * panel->g_taskbar.area.paddingxlr);
-			if (task_count>1) taskbar_width -= ((task_count-1) * panel->g_taskbar.area.paddingx);
-
-			pixel_width = taskbar_width / task_count;
-			if (pixel_width > panel->g_task.maximum_width)
-				pixel_width = panel->g_task.maximum_width;
-			else
-				modulo_width = taskbar_width % task_count;
+		resize_by_layout(obj, panel->g_task.maximum_width);
+		
+		text_width = panel->g_task.maximum_width;
+		GSList *l = taskbar->area.list;
+		if (taskbarname_enabled) l = l->next;
+		if (l != NULL) {
+			text_width = ((Task *)l->data)->area.width;
 		}
+		taskbar->text_width = text_width - panel->g_task.text_posx - panel->g_task.area.bg->border.width - panel->g_task.area.paddingx;
+	}
+	else {
+		resize_by_layout(obj, panel->g_task.maximum_height);
+		
+		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 0;
+}
 
-		taskbar->task_width = pixel_width;
-		taskbar->task_modulo = modulo_width;
-		taskbar->text_width = pixel_width - panel->g_task.text_posx - panel->g_task.area.bg->border.width - panel->g_task.area.paddingx;
-
-		// change pos_x and width for all tasks
-		x = taskbar->area.posx + border_width + taskbar->area.paddingxlr;
-		for (l = taskbar->area.list; l ; l = l->next) {
-			tsk = l->data;
-			if (!tsk->area.on_screen) continue;
-			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--;
-			}
 
-			x += tsk->area.width + panel->g_taskbar.area.paddingx;
-		}
+void on_change_taskbar (void *obj)
+{
+	Taskbar *tskbar = obj;
+	int k;
+
+	// reset Pixmap when position/size changed
+	for (k=0; k<TASKBAR_STATE_COUNT; ++k) {
+		if (tskbar->state_pix[k]) XFreePixmap(server.dsp, tskbar->state_pix[k]);
+		tskbar->state_pix[k] = 0;
 	}
-	else {
-		int  pixel_height, modulo_height=0;
-		int  y, taskbar_height;
+	tskbar->area.pix = 0;
+	tskbar->area.redraw = 1;
+}
 
-		// new task width for 'desktop'
-		task_count = g_slist_length(taskbar->area.list);
-		if (!task_count) pixel_height = panel->g_task.maximum_height;
-		else {
-			taskbar_height = taskbar->area.height - (2 * border_width) - (2 * panel->g_taskbar.area.paddingxlr);
-			if (task_count>1) taskbar_height -= ((task_count-1) * panel->g_taskbar.area.paddingx);
-
-			pixel_height = taskbar_height / task_count;
-			if (pixel_height > panel->g_task.maximum_height)
-				pixel_height = panel->g_task.maximum_height;
-			else
-				modulo_height = taskbar_height % task_count;
+
+void set_taskbar_state(Taskbar *tskbar, int state)
+{
+	tskbar->area.bg = panel1[0].g_taskbar.background[state];
+	tskbar->area.pix = tskbar->state_pix[state];
+	if (panel_mode != MULTI_DESKTOP) { 
+		if (state == TASKBAR_NORMAL)
+			tskbar->area.on_screen = 0;
+		else
+			tskbar->area.on_screen = 1;
+	}
+	if (tskbar->area.on_screen == 1) {
+		if (tskbar->state_pix[state] == 0)
+			tskbar->area.redraw = 1;
+		if (panel_mode == MULTI_DESKTOP && panel1[0].g_taskbar.background[TASKBAR_NORMAL] != panel1[0].g_taskbar.background[TASKBAR_ACTIVE]) {
+			GSList *l = tskbar->area.list;
+			if (taskbarname_enabled) l = l->next;
+			for ( ; l ; l = l->next)
+				set_task_redraw(l->data);
 		}
+	}
+	panel_refresh = 1;
+}
 
-		taskbar->task_width = pixel_height;
-		taskbar->task_modulo = modulo_height;
-		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;
-
-		// change pos_y and height for all tasks
-		y = taskbar->area.posy + border_width + taskbar->area.paddingxlr;
-		for (l = taskbar->area.list; l ; l = l->next) {
-			tsk = l->data;
-			if (!tsk->area.on_screen) continue;
-			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--;
-			}
 
-			y += tsk->area.height + panel->g_taskbar.area.paddingx;
+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;
 		}
 	}
-	return 0;
+	panel_refresh = 1;
 }
+