From b0088891ec08706a92184aff508c2baefe488b54 Mon Sep 17 00:00:00 2001
From: Andreas Fink <andreas.fink85@googlemail.com>
Date: Tue, 22 Dec 2009 13:37:13 +0000
Subject: [PATCH] *fix* calculate right struts for multiple monitors. fixes
 issue 148 and issue 178 *fix* uninstall all timers on reconfiguring

---
 src/config.c          |  2 ++
 src/panel.c           | 13 +++++++++----
 src/tooltip/tooltip.c |  6 ++----
 src/util/timer.c      |  9 +++++++++
 src/util/timer.h      |  3 +++
 5 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/src/config.c b/src/config.c
index d93d2c3..bc54938 100644
--- a/src/config.c
+++ b/src/config.c
@@ -45,6 +45,7 @@
 #include "config.h"
 #include "window.h"
 #include "tooltip.h"
+#include "timer.h"
 
 #ifdef ENABLE_BATTERY
 #include "battery.h"
@@ -74,6 +75,7 @@ void init_config()
 	list_back = g_slist_append(0, calloc(1, sizeof(Area)));
 
 	// tint2 could reload config, so we cleanup objects
+	uninstall_all_timer();
 	cleanup_systray();
 #ifdef ENABLE_BATTERY
 	cleanup_battery();
diff --git a/src/panel.c b/src/panel.c
index 50aa5c3..a5a62dd 100644
--- a/src/panel.c
+++ b/src/panel.c
@@ -427,16 +427,21 @@ void set_panel_properties(Panel *p)
 	XChangeProperty(server.dsp, p->main_win, server.atom.XdndAware, XA_ATOM, 32, PropModeReplace, (unsigned char*)&version, 1);
 
 	// Reserved space
+	unsigned int d1, screen_width, screen_height;
+	Window d2;
+	int d3;
+	XGetGeometry(server.dsp, server.root_win, &d2, &d3, &d3, &screen_width, &screen_height, &d1, &d1);
+	Monitor monitor = server.monitor[p->monitor];
 	long   struts [12] = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 };
 	if (panel_horizontal) {
 		if (panel_position & TOP) {
-			struts[2] = p->area.height + p->marginy;
+			struts[2] = p->area.height + p->marginy + monitor.y;
 			struts[8] = p->posx;
 			// p->area.width - 1 allowed full screen on monitor 2
 			struts[9] = p->posx + p->area.width - 1;
 		}
 		else {
-			struts[3] = p->area.height + p->marginy;
+			struts[3] = p->area.height + p->marginy + screen_height - monitor.y - monitor.height;
 			struts[10] = p->posx;
 			// p->area.width - 1 allowed full screen on monitor 2
 			struts[11] = p->posx + p->area.width - 1;
@@ -444,13 +449,13 @@ void set_panel_properties(Panel *p)
 	}
 	else {
 		if (panel_position & LEFT) {
-			struts[0] = p->area.width + p->marginx;
+			struts[0] = p->area.width + p->marginx + monitor.x;
 			struts[4] = p->posy;
 			// p->area.width - 1 allowed full screen on monitor 2
 			struts[5] = p->posy + p->area.height - 1;
 		}
 		else {
-			struts[1] = p->area.width + p->marginx;
+			struts[1] = p->area.width + p->marginx + screen_width - monitor.x - monitor.width;
 			struts[6] = p->posy;
 			// p->area.width - 1 allowed full screen on monitor 2
 			struts[7] = p->posy + p->area.height - 1;
diff --git a/src/tooltip/tooltip.c b/src/tooltip/tooltip.c
index ba1acfe..8e74972 100644
--- a/src/tooltip/tooltip.c
+++ b/src/tooltip/tooltip.c
@@ -60,10 +60,8 @@ void init_tooltip()
 	if (!g_tooltip.font_desc)
 		g_tooltip.font_desc = pango_font_description_from_string("sans 10");
 
-	if (g_tooltip.show_timer_id == 0)
-		g_tooltip.show_timer_id = install_timer(0, 0, 0, 0, tooltip_show);
-	if (g_tooltip.hide_timer_id == 0)
-		g_tooltip.hide_timer_id = install_timer(0, 0, 0, 0, tooltip_hide);
+	g_tooltip.show_timer_id = install_timer(0, 0, 0, 0, tooltip_show);
+	g_tooltip.hide_timer_id = install_timer(0, 0, 0, 0, tooltip_hide);
 
 	XSetWindowAttributes attr;
 	attr.override_redirect = True;
diff --git a/src/util/timer.c b/src/util/timer.c
index 48529dc..d66fa99 100644
--- a/src/util/timer.c
+++ b/src/util/timer.c
@@ -71,3 +71,12 @@ void uninstall_timer(int id)
 		timer_iter = timer_iter->next;
 	}
 }
+
+
+void uninstall_all_timer()
+{
+	while (timer_list) {
+		struct timer* t = timer_list->data;
+		uninstall_timer(t->id);
+	}
+}
diff --git a/src/util/timer.h b/src/util/timer.h
index fae0203..e938b2f 100644
--- a/src/util/timer.h
+++ b/src/util/timer.h
@@ -45,4 +45,7 @@ void reset_timer(int id, int value_sec, int value_nsec, int interval_sec, int in
 /** uninstalls a timer with the given 'id'. If no timer is installed with this id nothing happens **/
 void uninstall_timer(int id);
 
+/** uninstalls all timer. Calls uninstall_timer for all available id's **/
+void uninstall_all_timer();
+
 #endif // TIMER_H
-- 
2.44.0