From da718c4998111e53672d3874708a665d2f913423 Mon Sep 17 00:00:00 2001
From: Sascha Kruse <knopwob@googlemail.com>
Date: Wed, 15 Aug 2012 21:21:22 +0200
Subject: [PATCH] fix calculation of window position on multihead

Conflicts:
	dunst.c
---
 dunst.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/dunst.c b/dunst.c
index 7d09925..5723168 100644
--- a/dunst.c
+++ b/dunst.c
@@ -587,9 +587,9 @@ void draw_win(void)
         }
 
         if (geometry.mask & YNegative) {
-                y = (scr.dim.h + geometry.y) - dc_height * font_h;
+                y = scr.dim.y + (scr.dim.h + geometry.y) - dc_height * font_h;
         } else {
-                y = 0 + geometry.y;
+                y = scr.dim.y + geometry.y;
         }
 
         /* move and map window */
@@ -1105,8 +1105,6 @@ void update_screen_info()
         int n;
         int screen = scr.scr;
         XineramaScreenInfo *info;
-#endif
-#ifdef XINERAMA
         if ((info = XineramaQueryScreens(dc->dpy, &n))) {
                 screen = select_screen(info, n);
                 if (screen >= n) {