like gap, make snapdist per screen

4 files changed, 10 insertions, 8 deletions

diff --git a/app/cwm/calmwm.h b/app/cwm/calmwm.h
index 00239b981..71e0eea54 100644
--- a/app/cwm/calmwm.h
+++ b/app/cwm/calmwm.h
@@ -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: calmwm.h,v 1.229 2013/11/27 00:01:23 okan Exp $
+ * $OpenBSD: calmwm.h,v 1.230 2013/11/27 18:34:34 okan Exp $
  */
 
 #ifndef _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/app/cwm/conf.c b/app/cwm/conf.c
index 60c92933c..15375c841 100644
--- a/app/cwm/conf.c
+++ b/app/cwm/conf.c
@@ -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: conf.c,v 1.149 2013/11/27 16:24:17 okan Exp $
+ * $OpenBSD: conf.c,v 1.150 2013/11/27 18:34:34 okan Exp $
  */
 
 #include <sys/param.h>
@@ -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/app/cwm/kbfunc.c b/app/cwm/kbfunc.c
index 4072a4536..5be178706 100644
--- a/app/cwm/kbfunc.c
+++ b/app/cwm/kbfunc.c
@@ -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.80 2013/10/17 13:59:10 okan Exp $
+ * $OpenBSD: kbfunc.c,v 1.81 2013/11/27 18:34:34 okan Exp $
  */
 
 #include <sys/param.h>
@@ -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/app/cwm/mousefunc.c b/app/cwm/mousefunc.c
index 1bec15396..6de0e140c 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.58 2013/11/27 14:20:32 okan Exp $
+ * $OpenBSD: mousefunc.c,v 1.59 2013/11/27 18:34:34 okan Exp $
  */
 
 #include <sys/param.h>
@@ -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)) {