X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Ftaskbar%2Ftaskbar.c;h=87c7bd495dbf80d5e17c828155a69e140eb70e21;hb=515a2f9710c5cc0488bb07b3daa6a1a5c17d1bee;hp=6605b5befcaf93dadeb45799489f0faad4eb6173;hpb=2fe8ce00afa75977d3fd394481b19deaf3d102a5;p=chaz%2Ftint2

diff --git a/src/taskbar/taskbar.c b/src/taskbar/taskbar.c
index 6605b5b..87c7bd4 100644
--- a/src/taskbar/taskbar.c
+++ b/src/taskbar/taskbar.c
@@ -60,13 +60,16 @@ void cleanup_taskbar()
 {
 	Panel *panel;
 	Taskbar *tskbar;
-	int i, j;
+	int i, j, k;
 
 	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);
@@ -99,18 +102,17 @@ void init_taskbar_panel(void *p)
 	Panel *panel =(Panel*)p;
 	int j;
 
-	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.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.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._draw_foreground = draw_taskbar;
 	panel->g_taskbar.area.redraw = 1;
 	panel->g_taskbar.area.on_screen = 1;
 	if (panel_horizontal) {
@@ -158,11 +160,11 @@ void init_taskbar_panel(void *p)
 	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.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.bg->border.width + panel->g_taskbar.area.paddingy;
+		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;
 	}
@@ -200,7 +202,9 @@ void init_taskbar_panel(void *p)
 		memcpy(&tskbar->area, &panel->g_taskbar, sizeof(Area));
 		tskbar->desktop = j;
 		if (j == server.desktop)
-			tskbar->area.bg = panel->g_taskbar.bg_active;
+			tskbar->area.bg = panel->g_taskbar.background[TASKBAR_ACTIVE];
+		else
+			tskbar->area.bg = panel->g_taskbar.background[TASKBAR_NORMAL];
 	}
 }
 
@@ -259,6 +263,15 @@ 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;
@@ -286,6 +299,29 @@ int resize_taskbar(void *obj)
 }
 
 
+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;
+			for (l = tskbar->area.list ; l ; l = l->next)
+				set_task_redraw(l->data);
+		}
+	}
+	panel_refresh = 1;
+}
+
+
 void visible_taskbar(void *p)
 {
 	Panel *panel =(Panel*)p;