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

diff --git a/src/taskbar/taskbar.c b/src/taskbar/taskbar.c
index 89267f6..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
@@ -54,19 +54,24 @@ void default_taskbar()
 	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);
@@ -103,29 +108,50 @@ void init_taskbar_panel(void *p)
 		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.redraw = 1;
+	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.redraw = 1;
+	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;
@@ -196,13 +222,14 @@ void init_taskbar_panel(void *p)
 	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, sizeof(Area));
+		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);
 }
 
 
@@ -274,16 +301,16 @@ int resize_taskbar(void *obj)
 	Taskbar *taskbar = (Taskbar*)obj;
 	Panel *panel = (Panel*)taskbar->area.panel;
 	int text_width;
-	Task *tsk;
 
 	//printf("resize_taskbar %d %d\n", taskbar->area.posx, taskbar->area.posy);
 	if (panel_horizontal) {
 		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;
+		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;
 	}
@@ -296,15 +323,40 @@ int resize_taskbar(void *obj)
 }
 
 
+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;
+	}
+	tskbar->area.pix = 0;
+	tskbar->area.redraw = 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;
+	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;
 }