diff options
| author | Okan Demirmen <okan@cvs.openbsd.org> | 2013-12-13 21:51:57 +0000 |
|---|---|---|
| committer | Okan Demirmen <okan@cvs.openbsd.org> | 2013-12-13 21:51:57 +0000 |
| commit | 6704f56526350b6108d6418c5cc80e2df7e59fae (patch) | |
| tree | 599feda1195c10cf703ae1971c65ff4b8d4a5b50 /app/cwm/mousefunc.c | |
| parent | 0bcb5859c5c2edd890c32bab5da509281742983a (diff) | |
Instead of using work area, use the Xinerama area for snap calculations;
based on a patch from Thomas Adam with appropriate adjustments for gap.
Diffstat (limited to 'app/cwm/mousefunc.c')
| -rw-r--r-- | app/cwm/mousefunc.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/app/cwm/mousefunc.c b/app/cwm/mousefunc.c index fe146c0e5..18d0a4c0d 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.62 2013/12/12 21:50:50 okan Exp $ + * $OpenBSD: mousefunc.c,v 1.63 2013/12/13 21:51:56 okan Exp $ */ #include <sys/param.h> @@ -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)) { |