mirror of
https://github.com/leahneukirchen/cwm.git
synced 2023-08-10 21:13:12 +03:00
For both kb and mouse move, it is possible to grab a client and move it
completely off the screen/region; instead, if the pointer is outside of the client bounds, warp the pointer to the closest edge before moving.
This commit is contained in:
parent
a8a111dffd
commit
792f85cde9
14
kbfunc.c
14
kbfunc.c
@ -95,12 +95,24 @@ kbfunc_client_move(struct client_ctx *cc, union arg *arg)
|
||||
{
|
||||
struct screen_ctx *sc = cc->sc;
|
||||
struct geom area;
|
||||
int x, y;
|
||||
int x, y, px, py;
|
||||
unsigned int mx = 0, my = 0;
|
||||
|
||||
if (cc->flags & CLIENT_FREEZE)
|
||||
return;
|
||||
|
||||
xu_ptr_getpos(cc->win, &px, &py);
|
||||
if (px < 0)
|
||||
px = 0;
|
||||
else if (px > cc->geom.w)
|
||||
px = cc->geom.w;
|
||||
if (py < 0)
|
||||
py = 0;
|
||||
else if (py > cc->geom.h)
|
||||
py = cc->geom.h;
|
||||
|
||||
xu_ptr_setpos(cc->win, px, py);
|
||||
|
||||
kbfunc_amount(arg->i, Conf.mamount, &mx, &my);
|
||||
|
||||
cc->geom.x += mx;
|
||||
|
18
mousefunc.c
18
mousefunc.c
@ -45,13 +45,13 @@ mousefunc_client_resize(struct client_ctx *cc, union arg *arg)
|
||||
client_raise(cc);
|
||||
client_ptrsave(cc);
|
||||
|
||||
xu_ptr_setpos(cc->win, cc->geom.w, cc->geom.h);
|
||||
|
||||
if (XGrabPointer(X_Dpy, cc->win, False, MOUSEMASK,
|
||||
GrabModeAsync, GrabModeAsync, None, Conf.cursor[CF_RESIZE],
|
||||
CurrentTime) != GrabSuccess)
|
||||
return;
|
||||
|
||||
xu_ptr_setpos(cc->win, cc->geom.w, cc->geom.h);
|
||||
|
||||
for (;;) {
|
||||
XWindowEvent(X_Dpy, cc->win, MOUSEMASK, &ev);
|
||||
|
||||
@ -101,13 +101,23 @@ mousefunc_client_move(struct client_ctx *cc, union arg *arg)
|
||||
if (cc->flags & CLIENT_FREEZE)
|
||||
return;
|
||||
|
||||
xu_ptr_getpos(cc->win, &px, &py);
|
||||
if (px < 0)
|
||||
px = 0;
|
||||
else if (px > cc->geom.w)
|
||||
px = cc->geom.w;
|
||||
if (py < 0)
|
||||
py = 0;
|
||||
else if (py > cc->geom.h)
|
||||
py = cc->geom.h;
|
||||
|
||||
xu_ptr_setpos(cc->win, px, py);
|
||||
|
||||
if (XGrabPointer(X_Dpy, cc->win, False, MOUSEMASK,
|
||||
GrabModeAsync, GrabModeAsync, None, Conf.cursor[CF_MOVE],
|
||||
CurrentTime) != GrabSuccess)
|
||||
return;
|
||||
|
||||
xu_ptr_getpos(cc->win, &px, &py);
|
||||
|
||||
for (;;) {
|
||||
XWindowEvent(X_Dpy, cc->win, MOUSEMASK, &ev);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user