From a4c958a3f89733566a15f47d5ddc0167fe5e85d4 Mon Sep 17 00:00:00 2001
From: okan
Date: Fri, 13 Jul 2012 15:21:35 +0000
Subject: convert xmax/ymax uses to view geometry.

---
 xutil.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'xutil.c')

diff --git a/xutil.c b/xutil.c
index c89b215..15e648a 100644
--- a/xutil.c
+++ b/xutil.c
@@ -15,7 +15,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $OpenBSD: xutil.c,v 1.43 2012/07/08 02:55:01 okan Exp $
+ * $OpenBSD: xutil.c,v 1.44 2012/07/13 15:21:35 okan Exp $
  */
 
 #include <sys/param.h>
@@ -298,7 +298,7 @@ xu_ewmh_net_supported_wm_check(struct screen_ctx *sc)
 void
 xu_ewmh_net_desktop_geometry(struct screen_ctx *sc)
 {
-	long	 geom[2] = { sc->xmax, sc->ymax };
+	long	 geom[2] = { sc->view.w, sc->view.h };
 
 	XChangeProperty(X_Dpy, sc->rootwin, ewmh[_NET_DESKTOP_GEOMETRY].atom,
 	    XA_CARDINAL, 32, PropModeReplace, (unsigned char *)geom , 2);
@@ -311,10 +311,10 @@ xu_ewmh_net_workarea(struct screen_ctx *sc)
 	int	 i;
 
 	for (i = 0; i < CALMWM_NGROUPS; i++) {
-		workareas[i][0] = sc->gap.left;
-		workareas[i][1] = sc->gap.top;
-		workareas[i][2] = sc->xmax - (sc->gap.left + sc->gap.right);
-		workareas[i][3] = sc->ymax - (sc->gap.top + sc->gap.bottom);
+		workareas[i][0] = sc->work.x;
+		workareas[i][1] = sc->work.y;
+		workareas[i][2] = sc->work.w;
+		workareas[i][3] = sc->work.h;
 	}
 
 	XChangeProperty(X_Dpy, sc->rootwin, ewmh[_NET_WORKAREA].atom,
-- 
cgit v1.2.3-2-gb3c3