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

diff --git a/src/taskbar/taskbar.c b/src/taskbar/taskbar.c
index 60a7406..89267f6 100644
--- a/src/taskbar/taskbar.c
+++ b/src/taskbar/taskbar.c
@@ -99,18 +99,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 +157,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 +199,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,98 +260,53 @@ void task_refresh_tasklist ()
 }
 
 
-int resize_taskbar(void *obj)
+void draw_taskbar (void *obj, cairo_t *c)
 {
-	//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 = 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;
+	int text_width;
 	Task *tsk;
-	GSList *l;
-	int  task_count, border_width;
 
 	//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, old_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;
-		}
-
-		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
-		for (l = taskbar->area.list; l ; l = l->next) {
-			tsk = l->data;
-			if (!tsk->area.on_screen) continue;
-			old_width = tsk->area.width;
-			tsk->area.width = pixel_width;
-			if (modulo_width) {
-				tsk->area.width++;
-				modulo_width--;
-			}
-			if (tsk->area.width != old_width)
-				tsk->area.on_changed = 1;
+		resize_by_layout(obj, panel->g_task.maximum_width);
+		
+		text_width = panel->g_task.maximum_width;
+		if (taskbar->area.list != NULL) {
+			tsk = taskbar->area.list->data;
+			text_width = tsk->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 {
-		int  pixel_height, modulo_height=0;
-		int  taskbar_height, old_height;
+		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;
+}
 
-		// 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;
-		}
 
-		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
-		for (l = taskbar->area.list; l ; l = l->next) {
-			tsk = l->data;
-			if (!tsk->area.on_screen) continue;
-			old_height = tsk->area.height;
-			tsk->area.height = pixel_height;
-			if (modulo_height) {
-				tsk->area.height++;
-				modulo_height--;
-			}
-			if (tsk->area.height != old_height)
-				tsk->area.on_changed = 1;
-		}
+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 (tskbar->state_pix[state] == 0) {
+		tskbar->area.redraw = 1;
+		GSList *l;
+		for (l = tskbar->area.list ; l ; l = l->next)
+			((Area*)l->data)->redraw = 1;
 	}
-	
-	return 0;
+	panel_refresh = 1;
 }