diff options
| author | okan <okan> | 2013-05-11 22:03:17 +0000 |
|---|---|---|
| committer | okan <okan> | 2013-05-11 22:03:17 +0000 |
| commit | 112f616d1d3a6377407071f4327c1a2b31cb6e9f (patch) | |
| tree | 8fda67ea76a60993d3c1920f3243adbbde3abbef /kbfunc.c | |
| parent | 2b926784ba44c5ef28e9cb239e3acbeb866c6d12 (diff) | |
| download | cwm-112f616d1d3a6377407071f4327c1a2b31cb6e9f.tar.gz cwm-112f616d1d3a6377407071f4327c1a2b31cb6e9f.tar.xz cwm-112f616d1d3a6377407071f4327c1a2b31cb6e9f.zip | |
swap x/y calculations in kbd move/resize to match those in the respective mouse functions
Diffstat (limited to 'kbfunc.c')
| -rw-r--r-- | kbfunc.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/kbfunc.c b/kbfunc.c index 7a406ea..79cb49b 100644 --- a/kbfunc.c +++ b/kbfunc.c @@ -88,17 +88,16 @@ kbfunc_moveresize(struct client_ctx *cc, union arg *arg) } switch (flags & TYPEMASK) { case CWM_MOVE: - cc->geom.y += my; - if (cc->geom.y + cc->geom.h < 0) - cc->geom.y = -cc->geom.h; - if (cc->geom.y > sc->view.h - 1) - cc->geom.y = sc->view.h - 1; - cc->geom.x += mx; if (cc->geom.x + cc->geom.w < 0) cc->geom.x = -cc->geom.w; if (cc->geom.x > sc->view.w - 1) cc->geom.x = sc->view.w - 1; + cc->geom.y += my; + if (cc->geom.y + cc->geom.h < 0) + cc->geom.y = -cc->geom.h; + if (cc->geom.y > sc->view.h - 1) + cc->geom.y = sc->view.h - 1; cc->geom.x += client_snapcalc(cc->geom.x, cc->geom.x + cc->geom.w + (cc->bwidth * 2), @@ -109,15 +108,15 @@ kbfunc_moveresize(struct client_ctx *cc, union arg *arg) client_move(cc); xu_ptr_getpos(cc->win, &x, &y); - cc->ptr.y = y + my; cc->ptr.x = x + mx; + cc->ptr.y = y + my; client_ptrwarp(cc); break; case CWM_RESIZE: - if ((cc->geom.h += my) < 1) - cc->geom.h = 1; if ((cc->geom.w += mx) < 1) cc->geom.w = 1; + if ((cc->geom.h += my) < 1) + cc->geom.h = 1; client_resize(cc, 1); /* Make sure the pointer stays within the window. */ |