Instead of using work area, use the Xinerama area for snap calculations;

based on a patch from Thomas Adam with appropriate adjustments for gap.
This commit is contained in:
okan 2013-12-13 21:51:56 +00:00
parent 91a29396e8
commit 5732b65139
2 changed files with 12 additions and 4 deletions

View File

@ -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);

View File

@ -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)) {