X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=src%2Fpanel.c;h=b136ff34bf11404194f75c1c1b7853111fef8be2;hb=0fcdb76da25111d74fdbd6df0be3c9b4f45fc4bc;hp=21604e4a94c2365c32cce976680565423ec72349;hpb=ac96fe8050ff0f5c4d0cb4b794eeee875e1d4bfd;p=chaz%2Ftint2

diff --git a/src/panel.c b/src/panel.c
index 21604e4..b136ff3 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
@@ -58,6 +58,7 @@ int panel_autohide_show_timeout;
 int panel_autohide_hide_timeout;
 int panel_autohide_height;
 int panel_strut_policy;
+char *panel_items_order;
 
 int  max_tick_urgent;
 
@@ -79,6 +80,7 @@ void default_panel()
 	task_dragged = 0;
 	panel_horizontal = 1;
 	panel_position = CENTER;
+	panel_items_order = 0;
 	panel_autohide = 0;
 	panel_autohide_show_timeout = 0;
 	panel_autohide_hide_timeout = 0;
@@ -103,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;
@@ -115,6 +119,7 @@ void cleanup_panel()
 		if (p->main_win) XDestroyWindow(server.dsp, p->main_win);
 	}
 
+	if (panel_items_order) g_free(panel_items_order);
 	if (panel1) free(panel1);
 	if (backgrounds)
 		g_array_free(backgrounds, 1);
@@ -123,7 +128,7 @@ void cleanup_panel()
 
 void init_panel()
 {
-	int i, j;
+	int i, k;
 	Panel *p;
 
 	if (panel_config.monitor > (server.nb_monitor-1)) {
@@ -139,6 +144,7 @@ void init_panel()
 #ifdef ENABLE_BATTERY
 	init_battery();
 #endif
+	init_taskbar();
 
 	// number of panels (one monitor or 'all' monitors)
 	if (panel_config.monitor >= 0)
@@ -165,37 +171,27 @@ void init_panel()
 		p->area.resize = 1;
 		p->area.size_mode = SIZE_BY_LAYOUT;
 		p->area._resize = resize_panel;
-		p->g_taskbar.area.parent = p;
-		p->g_taskbar.area.panel = p;
-		p->g_task.area.panel = p;
 		init_panel_size_and_position(p);
-		// add childs
-		// TODO : should respect the order of 'panel_items' config parameter
-		if (launcher_enabled) {
-			init_launcher_panel(p);
-			p->area.list = g_slist_append(p->area.list, &p->launcher);
-		}
-		p->nb_desktop = server.nb_desktop;
-		p->taskbar = calloc(p->nb_desktop, sizeof(Taskbar));
-		for (j=0 ; j < p->nb_desktop ; j++) {
-			p->area.list = g_slist_append(p->area.list, &p->taskbar[j]);
-		}
+		// add childs according to panel_items
+		for (k=0 ; k < strlen(panel_items_order) ; k++) {
+			if (panel_items_order[k] == 'L') 
+				init_launcher_panel(p);
+			if (panel_items_order[k] == 'T')
+				init_taskbar_panel(p);
 #ifdef ENABLE_BATTERY
-		if (battery_enabled) {
-			init_battery_panel(p);
-			p->area.list = g_slist_append(p->area.list, &p->battery);
-		}
+			if (panel_items_order[k] == 'B')
+				init_battery_panel(p);
 #endif
-		// systray only on first panel
-		if (systray.area.on_screen && i == 0) {
-			init_systray_panel(p);
-			p->area.list = g_slist_append(p->area.list, &systray);
-			refresh_systray = 1;
-		}
-		if (clock_enabled) {
-			init_clock_panel(p);
-			p->area.list = g_slist_append(p->area.list, &p->clock);
+			if (panel_items_order[k] == 'S' && i==0) {
+				// TODO : check systray is only on 1 panel
+				// at the moment only on panel1[0] allowed
+				init_systray_panel(p);
+				refresh_systray = 1;
+			}
+			if (panel_items_order[k] == 'C')
+				init_clock_panel(p);
 		}
+		set_panel_items_order(p);
 
 		// catch some events
 		XSetWindowAttributes att = { .colormap=server.colormap, .background_pixel=0, .border_pixel=0 };
@@ -203,7 +199,7 @@ void init_panel()
 		p->main_win = XCreateWindow(server.dsp, server.root_win, p->posx, p->posy, p->area.width, p->area.height, 0, server.depth, InputOutput, server.visual, mask, &att);
 
 		long event_mask = ExposureMask|ButtonPressMask|ButtonReleaseMask|ButtonMotionMask;
-		if (g_tooltip.enabled)
+		if (p->g_task.tooltip_enabled || p->clock.area._get_tooltip_text || (launcher_enabled && launcher_tooltip_enabled))
 			event_mask |= PointerMotionMask|LeaveWindowMask;
 		if (panel_autohide)
 			event_mask |= LeaveWindowMask|EnterWindowMask;
@@ -223,11 +219,10 @@ void init_panel()
 
 		if (panel_autohide)
 			add_timeout(panel_autohide_hide_timeout, 0, autohide_hide, p);
+		
+		visible_taskbar(p);
 	}
 
-	panel_refresh = 1;
-	init_taskbar();
-	visible_object();
 	task_refresh_tasklist();
 	active_task();
 }
@@ -241,6 +236,8 @@ void init_panel_size_and_position(Panel *panel)
 			panel->area.width = (float)server.monitor[panel->monitor].width * panel->area.width / 100;
 		if (panel->pourcenty)
 			panel->area.height = (float)server.monitor[panel->monitor].height * panel->area.height / 100;
+		if (panel->area.width + panel->marginx > server.monitor[panel->monitor].width)
+			panel->area.width = server.monitor[panel->monitor].width - panel->marginx;
 		if (panel->area.bg->border.rounded > panel->area.height/2) {
 			printf("panel_background_id rounded is too big... please fix your tint2rc\n");
 			g_array_append_val(backgrounds, *panel->area.bg);
@@ -258,6 +255,8 @@ void init_panel_size_and_position(Panel *panel)
 			panel->area.width = (float)server.monitor[panel->monitor].width * old_panel_height / 100;
 		else
 			panel->area.width = old_panel_height;
+		if (panel->area.height + panel->marginy > server.monitor[panel->monitor].height)
+			panel->area.height = server.monitor[panel->monitor].height - panel->marginy;
 		if (panel->area.bg->border.rounded > panel->area.width/2) {
 			printf("panel_background_id rounded is too big... please fix your tint2rc\n");
 			g_array_append_val(backgrounds, *panel->area.bg);
@@ -309,117 +308,25 @@ void init_panel_size_and_position(Panel *panel)
 
 int resize_panel(void *obj)
 {
-	Panel *panel = (Panel*)obj;
-	int size, nb_by_content=0, nb_by_layout=0;
-	Area *a = (Area*)obj;
-	int paddingx = a->paddingx;;
-
-	if (panel_horizontal) {		
-		// detect free size for SIZE_BY_LAYOUT's Area
-		size = a->width - (2 * a->paddingxlr) - (2 * a->bg->border.width);
-		GSList *l;
-		for (l = ((Area*)obj)->list ; l ; l = l->next) {
-			a = (Area*)l->data;
-			if (a->on_screen && a->width && a->size_mode == SIZE_BY_CONTENT) {
-				size -= a->width;
-				nb_by_content++;
-			}
-			if (a->on_screen && a->size_mode == SIZE_BY_LAYOUT)
-				nb_by_layout++;
-		}
-		if (nb_by_content+nb_by_layout)
-			size -= ((nb_by_content+nb_by_layout-1) * paddingx);
-		//printf("resize_panel : size_panel %d, size_layout %d\n", panel->area.width, size);
-
-		int width=0, modulo=0;
-		if (nb_by_layout) {
-			width = size / nb_by_layout;
-			modulo = size % nb_by_layout;
-		}
-		//printf("   content %d, layout %d, width %d, modulo %d\n", nb_by_content, nb_by_layout, width, modulo);
-
-		// change posx and width for all taskbar
-		int i, posx;
-		posx = panel->area.bg->border.width + panel->area.paddingxlr;
-		if (panel->launcher.area.on_screen && panel->launcher.area.width)
-			posx += (panel->launcher.area.width + panel->area.paddingx);
+	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.posx = posx;
 			panel->taskbar[i].area.width = width;
+			panel->taskbar[i].area.height = height;
 			panel->taskbar[i].area.resize = 1;
-			if (modulo) {
-				panel->taskbar[i].area.width++;
-				modulo--;
-			}
-			//printf("   width %d\n", panel->taskbar[i].area.width);
-			//printf("taskbar %d : posx %d, width, %d, posy %d\n", i, posx, panel->taskbar[i].area.width, posx + panel->taskbar[i].area.width);
-			if (panel_mode == MULTI_DESKTOP)
-				posx += panel->taskbar[i].area.width + panel->area.paddingx;
 		}
 	}
-	else {
-		// detect free size for SIZE_BY_LAYOUT's Area
-		size = a->height - (2 * a->paddingxlr) - (2 * a->bg->border.width);
-		GSList *l;
-		for (l = ((Area*)obj)->list ; l ; l = l->next) {
-			a = (Area*)l->data;
-			if (a->on_screen && a->height && a->size_mode == SIZE_BY_CONTENT) {
-				size -= a->height;
-				nb_by_content++;
-			}
-			if (a->on_screen && a->size_mode == SIZE_BY_LAYOUT)
-				nb_by_layout++;
-		}
-		if (nb_by_content+nb_by_layout)
-			size -= ((nb_by_content+nb_by_layout-1) * paddingx);
-
-		int width=0, modulo=0;
-		if (nb_by_layout) {
-			width = size / nb_by_layout;
-			modulo = size % nb_by_layout;
-		}
-
-		// change posy and height for all taskbar
-		int i, posy;
-		for (i=0 ; i < panel->nb_desktop ; i++) {
-			panel->taskbar[i].area.posy = posy;
-			panel->taskbar[i].area.height = width;
-			panel->taskbar[i].area.resize = 1;
-			if (modulo) {
-				panel->taskbar[i].area.height++;
-				modulo--;
-			}
-			if (panel_mode == MULTI_DESKTOP)
-				posy += panel->taskbar[i].area.height + panel->area.paddingx;
-		}
-	}
-	return 1;
+	return 0;
 }
 
 
-void visible_object()
-{
-	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;
-			}
-		}
-	}
-	panel_refresh = 1;
-}
-
 void update_strut(Panel* p)
 {
 	if (panel_strut_policy == STRUT_NONE) {
@@ -475,6 +382,38 @@ void update_strut(Panel* p)
 }
 
 
+void set_panel_items_order(Panel *p)
+{
+	int k, j;
+	
+	if (p->area.list) {
+		g_slist_free(p->area.list);
+		p->area.list = 0;
+	}
+
+	for (k=0 ; k < strlen(panel_items_order) ; k++) {
+		if (panel_items_order[k] == 'L') 
+			p->area.list = g_slist_append(p->area.list, &p->launcher);
+		if (panel_items_order[k] == 'T') {
+			for (j=0 ; j < p->nb_desktop ; j++)
+				p->area.list = g_slist_append(p->area.list, &p->taskbar[j]);
+		}
+#ifdef ENABLE_BATTERY
+		if (panel_items_order[k] == 'B') 
+			p->area.list = g_slist_append(p->area.list, &p->battery);
+#endif
+		if (panel_items_order[k] == 'S' && p == panel1) {
+			// TODO : check systray is only on 1 panel
+			// at the moment only on panel1[0] allowed
+			p->area.list = g_slist_append(p->area.list, &systray);
+		}
+		if (panel_items_order[k] == 'C')
+			p->area.list = g_slist_append(p->area.list, &p->clock);
+	}
+	init_rendering(&p->area, 0);
+}
+
+
 void set_panel_properties(Panel *p)
 {
 	XStoreName (server.dsp, p->main_win, "tint2");
@@ -589,7 +528,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) {
@@ -597,12 +535,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);
 		}
 	}
@@ -652,7 +600,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;
@@ -661,7 +611,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;
@@ -747,16 +699,10 @@ Area* click_area(Panel *panel, int x, int y)
 		GSList* it = result->list;
 		while (it) {
 			Area* a = it->data;
-			if (panel_horizontal) {
-				if (a->on_screen && x >= a->posx && x <= (a->posx + a->width)) {
-					new_result = a;
-					break;
-				}
-			} else {
-				if (a->on_screen && y >= a->posy && y <= (a->posy + a->height)) {
-					new_result = a;
-					break;
-				}
+			if (a->on_screen && x >= a->posx && x <= (a->posx + a->width)
+					&& y >= a->posy && y <= (a->posy + a->height)) {
+				new_result = a;
+				break;
 			}
 			it = it->next;
 		}