diff options
| -rw-r--r-- | calmwm.h | 1 | ||||
| -rw-r--r-- | conf.c | 1 | ||||
| -rw-r--r-- | kbfunc.c | 4 | ||||
| -rw-r--r-- | mousefunc.c | 4 |
4 files changed, 6 insertions, 4 deletions
diff --git a/calmwm.h b/calmwm.h index e3cedd1..8ceba9e 100644 --- a/calmwm.h +++ b/calmwm.h @@ -216,6 +216,7 @@ struct screen_ctx { Window rootwin; Window menuwin; int cycling; + int snapdist; struct geom view; /* viewable area */ struct geom work; /* workable area, gap-applied */ struct gap gap; diff --git a/conf.c b/conf.c index 895b681..970b0ce 100644 --- a/conf.c +++ b/conf.c @@ -103,6 +103,7 @@ conf_screen(struct screen_ctx *sc) XftColor xc; sc->gap = Conf.gap; + sc->snapdist = Conf.snapdist; sc->xftfont = XftFontOpenXlfd(X_Dpy, sc->which, Conf.font); if (sc->xftfont == NULL) { diff --git a/kbfunc.c b/kbfunc.c index 4c28a2b..9c0effc 100644 --- a/kbfunc.c +++ b/kbfunc.c @@ -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, Conf.snapdist); + 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, Conf.snapdist); + sc->work.y, sc->work.h, sc->snapdist); client_move(cc); xu_ptr_getpos(cc->win, &x, &y); diff --git a/mousefunc.c b/mousefunc.c index 34e39ff..fbcc764 100644 --- a/mousefunc.c +++ b/mousefunc.c @@ -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, Conf.snapdist); + 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, Conf.snapdist); + sc->work.y, sc->work.h, sc->snapdist); /* don't move more than 60 times / second */ if ((ev.xmotion.time - ltime) > (1000 / 60)) { |