summaryrefslogtreecommitdiff
path: root/app/cwm/kbfunc.c
diff options
context:
space:
mode:
authorOkan Demirmen <okan@cvs.openbsd.org>2013-12-13 21:51:57 +0000
committerOkan Demirmen <okan@cvs.openbsd.org>2013-12-13 21:51:57 +0000
commit6704f56526350b6108d6418c5cc80e2df7e59fae (patch)
tree599feda1195c10cf703ae1971c65ff4b8d4a5b50 /app/cwm/kbfunc.c
parent0bcb5859c5c2edd890c32bab5da509281742983a (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/kbfunc.c')
-rw-r--r--app/cwm/kbfunc.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/app/cwm/kbfunc.c b/app/cwm/kbfunc.c
index 5d15f710f..aa1c304be 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.82 2013/12/12 21:50:50 okan Exp $
+ * $OpenBSD: kbfunc.c,v 1.83 2013/12/13 21:51:56 okan Exp $
*/
#include <sys/param.h>
@@ -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);