diff options
| author | okan <okan> | 2013-12-13 21:51:56 +0000 |
|---|---|---|
| committer | okan <okan> | 2013-12-13 21:51:56 +0000 |
| commit | 5732b65139493570e331fbc298eb6920f0878e5f (patch) | |
| tree | 34123f81edab1104ab1c67e7321f4c092f0d6a9f | |
| parent | 91a29396e84b49fcb942bbe476ad43e727b6cbc3 (diff) | |
| download | cwm-5732b65139493570e331fbc298eb6920f0878e5f.tar.gz cwm-5732b65139493570e331fbc298eb6920f0878e5f.tar.xz cwm-5732b65139493570e331fbc298eb6920f0878e5f.zip | |
Instead of using work area, use the Xinerama area for snap calculations;
based on a patch from Thomas Adam with appropriate adjustments for gap.
| -rw-r--r-- | kbfunc.c | 8 | ||||
| -rw-r--r-- | mousefunc.c | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/kbfunc.c b/kbfunc.c index 47d4857..9b4e6f2 100644 --- a/kbfunc.c +++ b/kbfunc.c @@ -56,6 +56,7 @@ void kbfunc_client_moveresize(struct client_ctx *cc, union arg *arg) { struct screen_ctx *sc = cc->sc; + struct geom xine; int x, y, flags, amt; u_int mx, my; @@ -99,12 +100,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; + xine = screen_find_xinerama(sc, + cc->geom.x + cc->geom.w / 2, + cc->geom.y + cc->geom.h / 2); cc->geom.x += client_snapcalc(cc->geom.x, cc->geom.x + cc->geom.w + (cc->bwidth * 2), - sc->work.x, sc->work.x + sc->work.w, sc->snapdist); + xine.x, xine.x + xine.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.y + sc->work.h, sc->snapdist); + xine.y, xine.y + xine.h, sc->snapdist); client_move(cc); xu_ptr_getpos(cc->win, &x, &y); diff --git a/mousefunc.c b/mousefunc.c index e9be42d..6097a59 100644 --- a/mousefunc.c +++ b/mousefunc.c @@ -125,6 +125,7 @@ mousefunc_client_move(struct client_ctx *cc, void *arg) XEvent ev; Time ltime = 0; struct screen_ctx *sc = cc->sc; + struct geom xine; int px, py; client_raise(cc); @@ -145,12 +146,15 @@ mousefunc_client_move(struct client_ctx *cc, void *arg) cc->geom.x = ev.xmotion.x_root - px - cc->bwidth; cc->geom.y = ev.xmotion.y_root - py - cc->bwidth; + xine = screen_find_xinerama(sc, + cc->geom.x + cc->geom.w / 2, + cc->geom.y + cc->geom.h / 2); cc->geom.x += client_snapcalc(cc->geom.x, cc->geom.x + cc->geom.w + (cc->bwidth * 2), - sc->work.x, sc->work.x + sc->work.w, sc->snapdist); + xine.x, xine.x + xine.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.y + sc->work.h, sc->snapdist); + xine.y, xine.y + xine.h, sc->snapdist); /* don't move more than 60 times / second */ if ((ev.xmotion.time - ltime) > (1000 / 60)) { |