X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fpanel.c;h=85efec96640ca4c4230e5b08850ec40013530000;hb=bd230aca5f0289c9464aa98b29f672c28fc58243;hp=797b96a2c11f8bcca73e7f99037660b001dce01a;hpb=616c9da1e11226d2b98478ee644d12339489813a;p=chaz%2Ftint2

diff --git a/src/panel.c b/src/panel.c
index 797b96a..85efec9 100644
--- a/src/panel.c
+++ b/src/panel.c
@@ -1,7 +1,7 @@
 /**************************************************************************
 *
 * Copyright (C) 2008 PÃ¥l Staurland (staura@gmail.com)
-* Modified (C) 2008 thierry lorthiois (lorthiois@bbsoft.fr)
+* Modified (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
@@ -105,6 +105,8 @@ void cleanup_panel()
 	if (!panel1) return;
 
 	cleanup_taskbar();
+	// taskbarname_font_desc freed here because cleanup_taskbarname() called on _NET_NUMBER_OF_DESKTOPS
+	if (taskbarname_font_desc)	pango_font_description_free(taskbarname_font_desc);
 
 	int i;
 	Panel *p;
@@ -168,10 +170,7 @@ void init_panel()
 		p->area.on_screen = 1;
 		p->area.resize = 1;
 		p->area.size_mode = SIZE_BY_LAYOUT;
-		p->area._resize = resize_by_layout;
-		p->g_taskbar.area.parent = p;
-		p->g_taskbar.area.panel = p;
-		p->g_task.area.panel = p;
+		p->area._resize = resize_panel;
 		init_panel_size_and_position(p);
 		// add childs according to panel_items
 		for (k=0 ; k < strlen(panel_items_order) ; k++) {
@@ -219,9 +218,10 @@ void init_panel()
 
 		if (panel_autohide)
 			add_timeout(panel_autohide_hide_timeout, 0, autohide_hide, p);
+		
+		visible_taskbar(p);
 	}
 
-	visible_object();
 	task_refresh_tasklist();
 	active_task();
 }
@@ -301,29 +301,27 @@ void init_panel_size_and_position(Panel *panel)
 }
 
 
-void visible_object()
+int resize_panel(void *obj)
 {
-	Panel *panel;
-	int i, j;
-
-	for (i=0 ; i < nb_panel ; i++) {
-		panel = &panel1[i];
-
-		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;
-			}
+	resize_by_layout(obj, 0);
+	
+	//printf("resize_panel\n");
+	if (panel_mode != MULTI_DESKTOP && taskbar_enabled) {
+		// propagate width/height on hidden taskbar
+		int i, width, height;
+		Panel *panel = (Panel*)obj;
+		width = panel->taskbar[server.desktop].area.width;
+		height = panel->taskbar[server.desktop].area.height;
+		for (i=0 ; i < panel->nb_desktop ; i++) {
+			panel->taskbar[i].area.width = width;
+			panel->taskbar[i].area.height = height;
+			panel->taskbar[i].area.resize = 1;
 		}
 	}
-	panel_refresh = 1;
+	return 0;
 }
 
+
 void update_strut(Panel* p)
 {
 	if (panel_strut_policy == STRUT_NONE) {
@@ -524,7 +522,6 @@ void set_panel_background(Panel *p)
 	}
 
 	// redraw panel's object
-	//p->area.redraw = 1;
 	GSList *l0;
 	Area *a;
 	for (l0 = p->area.list; l0 ; l0 = l0->next) {
@@ -532,12 +529,22 @@ void set_panel_background(Panel *p)
 		set_redraw(a);
 	}
 	
-	// reset task 'state_pix'
-	int i;
+	// reset task/taskbar 'state_pix'
+	int i, k;
 	Taskbar *tskbar;
 	for (i=0 ; i < p->nb_desktop ; i++) {
 		tskbar = &p->taskbar[i];
-		for (l0 = tskbar->area.list; l0 ; l0 = l0->next) {
+		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;
+			if (tskbar->bar_name.state_pix[k]) XFreePixmap(server.dsp, tskbar->bar_name.state_pix[k]);
+			tskbar->bar_name.state_pix[k] = 0;
+		}
+		tskbar->area.pix = 0;
+		tskbar->bar_name.area.pix = 0;
+		l0 = tskbar->area.list;
+		if (taskbarname_enabled) l0 = l0->next;
+		for (; l0 ; l0 = l0->next) {
 			set_task_redraw((Task *)l0->data);
 		}
 	}
@@ -587,7 +594,9 @@ Task *click_task (Panel *panel, int x, int y)
 	if ( (tskbar = click_taskbar(panel, x, y)) ) {
 		if (panel_horizontal) {
 			Task *tsk;
-			for (l0 = tskbar->area.list; l0 ; l0 = l0->next) {
+			l0 = tskbar->area.list;
+			if (taskbarname_enabled) l0 = l0->next;
+			for (; l0 ; l0 = l0->next) {
 				tsk = l0->data;
 				if (tsk->area.on_screen && x >= tsk->area.posx && x <= (tsk->area.posx + tsk->area.width)) {
 					return tsk;
@@ -596,7 +605,9 @@ Task *click_task (Panel *panel, int x, int y)
 		}
 		else {
 			Task *tsk;
-			for (l0 = tskbar->area.list; l0 ; l0 = l0->next) {
+			l0 = tskbar->area.list;
+			if (taskbarname_enabled) l0 = l0->next;
+			for (; l0 ; l0 = l0->next) {
 				tsk = l0->data;
 				if (tsk->area.on_screen && y >= tsk->area.posy && y <= (tsk->area.posy + tsk->area.height)) {
 					return tsk;