From 2f199b5ad84adda4a8b7d72b78529d68ec037786 Mon Sep 17 00:00:00 2001 From: okan Date: Fri, 13 Dec 2013 22:39:13 +0000 Subject: Teach screen_find_xinerama() to apply gap only when told to do so; adjust callers. Needed for an upcoming feature. --- client.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'client.c') diff --git a/client.c b/client.c index 1dc6c28..a8e6934 100644 --- a/client.c +++ b/client.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: client.c,v 1.162 2013/12/13 15:56:44 okan Exp $ + * $OpenBSD: client.c,v 1.163 2013/12/13 22:39:13 okan Exp $ */ #include @@ -261,7 +261,7 @@ client_maximize(struct client_ctx *cc) */ xine = screen_find_xinerama(sc, cc->geom.x + cc->geom.w / 2, - cc->geom.y + cc->geom.h / 2); + cc->geom.y + cc->geom.h / 2, CWM_GAP); cc->geom = xine; cc->bwidth = 0; @@ -302,7 +302,7 @@ client_vmaximize(struct client_ctx *cc) xine = screen_find_xinerama(sc, cc->geom.x + cc->geom.w / 2, - cc->geom.y + cc->geom.h / 2); + cc->geom.y + cc->geom.h / 2, CWM_GAP); cc->geom.y = xine.y; cc->geom.h = xine.h - (cc->bwidth * 2); @@ -343,7 +343,7 @@ client_hmaximize(struct client_ctx *cc) xine = screen_find_xinerama(sc, cc->geom.x + cc->geom.w / 2, - cc->geom.y + cc->geom.h / 2); + cc->geom.y + cc->geom.h / 2, CWM_GAP); cc->geom.x = xine.x; cc->geom.w = xine.w - (cc->bwidth * 2); @@ -691,7 +691,7 @@ client_placecalc(struct client_ctx *cc) int xmouse, ymouse; xu_ptr_getpos(sc->rootwin, &xmouse, &ymouse); - xine = screen_find_xinerama(sc, xmouse, ymouse); + xine = screen_find_xinerama(sc, xmouse, ymouse, CWM_GAP); xine.w += xine.x; xine.h += xine.y; xmouse = MAX(xmouse, xine.x) - cc->geom.w / 2; @@ -906,7 +906,7 @@ client_htile(struct client_ctx *cc) xine = screen_find_xinerama(sc, cc->geom.x + cc->geom.w / 2, - cc->geom.y + cc->geom.h / 2); + cc->geom.y + cc->geom.h / 2, CWM_GAP); if (cc->flags & CLIENT_VMAXIMIZED || cc->geom.h + (cc->bwidth * 2) >= xine.h) @@ -965,7 +965,7 @@ client_vtile(struct client_ctx *cc) xine = screen_find_xinerama(sc, cc->geom.x + cc->geom.w / 2, - cc->geom.y + cc->geom.h / 2); + cc->geom.y + cc->geom.h / 2, CWM_GAP); if (cc->flags & CLIENT_HMAXIMIZED || cc->geom.w + (cc->bwidth * 2) >= xine.w) -- cgit v1.2.3-2-gb3c3