From 754e61eb263aa34c713a1854a432f4fc979453d7 Mon Sep 17 00:00:00 2001 From: okan Date: Thu, 12 Dec 2013 21:50:50 +0000 Subject: Make sure we really take work area gap into account with snap calculations; from Dominik Honnef via Christian Neukirchen. --- kbfunc.c | 6 +++--- mousefunc.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/kbfunc.c b/kbfunc.c index 5be1787..5d15f71 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.81 2013/11/27 18:34:34 okan Exp $ + * $OpenBSD: kbfunc.c,v 1.82 2013/12/12 21:50:50 okan Exp $ */ #include @@ -101,10 +101,10 @@ kbfunc_client_moveresize(struct client_ctx *cc, union arg *arg) cc->geom.x += client_snapcalc(cc->geom.x, cc->geom.x + cc->geom.w + (cc->bwidth * 2), - sc->work.x, sc->work.w, sc->snapdist); + sc->work.x, sc->work.x + sc->work.w, sc->snapdist); cc->geom.y += client_snapcalc(cc->geom.y, cc->geom.y + cc->geom.h + (cc->bwidth * 2), - sc->work.y, sc->work.h, sc->snapdist); + sc->work.y, sc->work.y + sc->work.h, sc->snapdist); client_move(cc); xu_ptr_getpos(cc->win, &x, &y); diff --git a/mousefunc.c b/mousefunc.c index 7c82f42..fe146c0 100644 --- a/mousefunc.c +++ b/mousefunc.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: mousefunc.c,v 1.61 2013/12/08 13:51:38 okan Exp $ + * $OpenBSD: mousefunc.c,v 1.62 2013/12/12 21:50:50 okan Exp $ */ #include @@ -147,10 +147,10 @@ mousefunc_client_move(struct client_ctx *cc, void *arg) cc->geom.x += client_snapcalc(cc->geom.x, cc->geom.x + cc->geom.w + (cc->bwidth * 2), - sc->work.x, sc->work.w, sc->snapdist); + sc->work.x, sc->work.x + sc->work.w, sc->snapdist); cc->geom.y += client_snapcalc(cc->geom.y, cc->geom.y + cc->geom.h + (cc->bwidth * 2), - sc->work.y, sc->work.h, sc->snapdist); + sc->work.y, sc->work.y + sc->work.h, sc->snapdist); /* don't move more than 60 times / second */ if ((ev.xmotion.time - ltime) > (1000 / 60)) { -- cgit v1.2.3-2-gb3c3