From bf9d9815976c0afae2e87afeebaa57b02b1d911c Mon Sep 17 00:00:00 2001
From: okan <okan>
Date: Tue, 8 Jan 2013 04:12:51 +0000
Subject: teach screen_find_xinerama() about gap and adjust (simplify) callers;
 menu becomes gap-aware for free.

---
 screen.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'screen.c')

diff --git a/screen.c b/screen.c
index 01c2f73..6b7de6b 100644
--- a/screen.c
+++ b/screen.c
@@ -132,7 +132,7 @@ screen_find_xinerama(struct screen_ctx *sc, int x, int y)
 	struct geom		 geom;
 	int			 i;
 
-	geom = sc->view;
+	geom = sc->work;
 
 	if (sc->xinerama == NULL)
 		return (geom);
@@ -141,10 +141,10 @@ screen_find_xinerama(struct screen_ctx *sc, int x, int y)
 		info = &sc->xinerama[i];
 		if (x >= info->x_org && x < info->x_org + info->width &&
 		    y >= info->y_org && y < info->y_org + info->height) {
-			geom.x = info->x_org;
-			geom.y = info->y_org;
-			geom.w = info->width;
-			geom.h = info->height;
+			geom.x = info->x_org + sc->gap.left;
+			geom.y = info->y_org + sc->gap.top;
+			geom.w = info->width - (sc->gap.left + sc->gap.right);
+			geom.h = info->height - (sc->gap.top + sc->gap.bottom);
 			break;
 		}
 	}
-- 
cgit 1.4.1