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. --- kbfunc.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'kbfunc.c') diff --git a/kbfunc.c b/kbfunc.c index 038834b..546f236 100644 --- a/kbfunc.c +++ b/kbfunc.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: kbfunc.c,v 1.118 2015/09/16 17:58:25 okan Exp $ + * $OpenBSD: kbfunc.c,v 1.119 2015/11/09 20:03:29 okan Exp $ */ #include @@ -57,7 +57,7 @@ void kbfunc_client_moveresize(struct client_ctx *cc, union arg *arg) { struct screen_ctx *sc = cc->sc; - struct geom area; + struct region_ctx *rc; int x, y, flags, amt; unsigned int mx, my; @@ -101,15 +101,15 @@ kbfunc_client_moveresize(struct client_ctx *cc, union arg *arg) if (cc->geom.y > sc->view.h - 1) cc->geom.y = sc->view.h - 1; - area = screen_area(sc, + rc = region_find(sc, cc->geom.x + cc->geom.w / 2, - cc->geom.y + cc->geom.h / 2, CWM_GAP); + cc->geom.y + cc->geom.h / 2); cc->geom.x += client_snapcalc(cc->geom.x, cc->geom.x + cc->geom.w + (cc->bwidth * 2), - area.x, area.x + area.w, sc->snapdist); + rc->work.x, rc->work.x + rc->work.w, sc->snapdist); cc->geom.y += client_snapcalc(cc->geom.y, cc->geom.y + cc->geom.h + (cc->bwidth * 2), - area.y, area.y + area.h, sc->snapdist); + rc->work.y, rc->work.y + rc->work.h, sc->snapdist); client_move(cc); xu_ptr_getpos(cc->win, &x, &y); -- cgit v1.2.3-2-gb3c3