summary refs log tree commit diff
path: root/kbfunc.c
diff options
context:
space:
mode:
authorokan <okan>2013-12-13 21:51:56 +0000
committerokan <okan>2013-12-13 21:51:56 +0000
commit5732b65139493570e331fbc298eb6920f0878e5f (patch)
tree34123f81edab1104ab1c67e7321f4c092f0d6a9f /kbfunc.c
parent91a29396e84b49fcb942bbe476ad43e727b6cbc3 (diff)
downloadcwm-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.
Diffstat (limited to 'kbfunc.c')
-rw-r--r--kbfunc.c8
1 files changed, 6 insertions, 2 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);