diff options
author | okan | 2013-01-02 21:41:14 +0000 |
---|---|---|
committer | okan | 2013-01-02 21:41:14 +0000 |
commit | 1f61f7e4a9bf381aa66667f07087d1161436eae8 (patch) | |
tree | cdc2f8c96e421e775003aaff92a1a03d978efb29 | |
parent | 97779c379983abeabc495ed29518853dd455422a (diff) | |
download | cwm-1f61f7e4a9bf381aa66667f07087d1161436eae8.tar.gz |
pass the screen workarea, as opposed to viewarea, allowing client
snapping to honor gap.
-rw-r--r-- | kbfunc.c | 6 | ||||
-rw-r--r-- | mousefunc.c | 6 |
2 files changed, 6 insertions, 6 deletions
@@ -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.73 2013/01/02 21:37:21 okan Exp $ + * $OpenBSD: kbfunc.c,v 1.74 2013/01/02 21:41:14 okan Exp $ */ #include <sys/param.h> @@ -102,10 +102,10 @@ kbfunc_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->view.x, sc->view.w, Conf.snapdist); + sc->work.x, sc->work.w, Conf.snapdist); cc->geom.y += client_snapcalc(cc->geom.y, cc->geom.y + cc->geom.h + (cc->bwidth * 2), - sc->view.y, sc->view.h, Conf.snapdist); + sc->work.y, sc->work.h, Conf.snapdist); client_move(cc); xu_ptr_getpos(cc->win, &x, &y); diff --git a/mousefunc.c b/mousefunc.c index 36ed8ab..745a304 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.43 2013/01/02 21:37:21 okan Exp $ + * $OpenBSD: mousefunc.c,v 1.44 2013/01/02 21:41:14 okan Exp $ */ #include <sys/param.h> @@ -163,10 +163,10 @@ mousefunc_window_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->view.x, sc->view.w, Conf.snapdist); + sc->work.x, sc->work.w, Conf.snapdist); cc->geom.y += client_snapcalc(cc->geom.y, cc->geom.y + cc->geom.h + (cc->bwidth * 2), - sc->view.y, sc->view.h, Conf.snapdist); + sc->work.y, sc->work.h, Conf.snapdist); /* don't move more than 60 times / second */ if ((ev.xmotion.time - ltime) > (1000 / 60)) { |