diff options
| author | Okan Demirmen <okan@cvs.openbsd.org> | 2013-12-12 21:50:51 +0000 |
|---|---|---|
| committer | Okan Demirmen <okan@cvs.openbsd.org> | 2013-12-12 21:50:51 +0000 |
| commit | b93885b5e8bd6e1a0f7e0c82aeaacc12634e43e2 (patch) | |
| tree | 61a6c12547f895a8bec0935957c3adf2a688d0c4 /app | |
| parent | 57b592530b6844d688f4e7a6d1377f0b3739046e (diff) | |
Make sure we really take work area gap into account with snap calculations;
from Dominik Honnef via Christian Neukirchen.
Diffstat (limited to 'app')
| -rw-r--r-- | app/cwm/kbfunc.c | 6 | ||||
| -rw-r--r-- | app/cwm/mousefunc.c | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/app/cwm/kbfunc.c b/app/cwm/kbfunc.c index 5be178706..5d15f710f 100644 --- a/app/cwm/kbfunc.c +++ b/app/cwm/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 <sys/param.h> @@ -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/app/cwm/mousefunc.c b/app/cwm/mousefunc.c index 7c82f42f4..fe146c0e5 100644 --- a/app/cwm/mousefunc.c +++ b/app/cwm/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 <sys/param.h> @@ -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)) { |