From cce06135af44660039026ea785a5ffdbfc277ea9 Mon Sep 17 00:00:00 2001
From: okan
Date: Mon, 9 Nov 2015 20:03:29 +0000
Subject: Extend region to include both view and work areas; switch to
 region_find() which no longer needs to recalculate gap each time a client (or
 menu) is created or altered. If no RandR, fall back to display dimensions
 while building regions instead of during execution.

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

(limited to 'menu.c')

diff --git a/menu.c b/menu.c
index 3ffc646..a8f4e80 100644
--- a/menu.c
+++ b/menu.c
@@ -16,7 +16,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $OpenBSD: menu.c,v 1.87 2015/07/12 14:21:09 okan Exp $
+ * $OpenBSD: menu.c,v 1.88 2015/11/09 20:03:29 okan Exp $
  */
 
 #include <sys/types.h>
@@ -331,6 +331,7 @@ static void
 menu_draw(struct menu_ctx *mc, struct menu_q *menuq, struct menu_q *resultq)
 {
 	struct screen_ctx	*sc = mc->sc;
+	struct region_ctx	*rc;
 	struct menu		*mi;
 	struct geom		 area;
 	int			 n, xsave, ysave;
@@ -371,7 +372,8 @@ menu_draw(struct menu_ctx *mc, struct menu_q *menuq, struct menu_q *resultq)
 		mc->num++;
 	}
 
-	area = screen_area(sc, mc->geom.x, mc->geom.y, CWM_GAP);
+	rc = region_find(sc, mc->geom.x, mc->geom.y);
+	area = rc->work;
 	area.w += area.x - Conf.bwidth * 2;
 	area.h += area.y - Conf.bwidth * 2;
 
-- 
cgit v1.2.3-2-gb3c3