diff options
| author | okan <okan> | 2017-01-05 21:18:20 +0000 |
|---|---|---|
| committer | okan <okan> | 2017-01-05 21:18:20 +0000 |
| commit | b6a5b876e7d92d0ff4ef7928b83f740c2dbcc35d (patch) | |
| tree | 81df962f2df5de617ab966fecf9c670f7c914ced | |
| parent | 44216b65c95ea5e93467bb5c923010fc44519ee2 (diff) | |
| parent | 96918a06e68bc9940a9205b2c312707f09c415bf (diff) | |
| download | cwm-b6a5b876e7d92d0ff4ef7928b83f740c2dbcc35d.tar.gz cwm-b6a5b876e7d92d0ff4ef7928b83f740c2dbcc35d.tar.xz cwm-b6a5b876e7d92d0ff4ef7928b83f740c2dbcc35d.zip | |
cvsimport
* refs/heads/master: Ensure client stays inbound on key-based resize; based on logic existing in key-based client move; from Vadim Vygonets. When a window has a user or program specified position, ensure the edge of the final position is at least viewable and warp'able by the difference of bwidth; prevents mapping windows completely off the virtual screen.
| -rw-r--r-- | client.c | 24 | ||||
| -rw-r--r-- | kbfunc.c | 4 |
2 files changed, 17 insertions, 11 deletions
diff --git a/client.c b/client.c index 377abdb..208c101 100644 --- a/client.c +++ b/client.c @@ -736,17 +736,19 @@ client_placecalc(struct client_ctx *cc) int xslack, yslack; if (cc->hint.flags & (USPosition | PPosition)) { - /* - * Ignore XINERAMA screens, just make sure it's somewhere - * in the virtual desktop. else it stops people putting xterms - * at startup in the screen the mouse doesn't start in *sigh*. - * XRandR bits mean that {x,y}max shouldn't be outside what's - * currently there. - */ - xslack = sc->view.w - cc->geom.w - cc->bwidth * 2; - yslack = sc->view.h - cc->geom.h - cc->bwidth * 2; - cc->geom.x = MIN(cc->geom.x, xslack); - cc->geom.y = MIN(cc->geom.y, yslack); + int wmax, hmax; + + wmax = DisplayWidth(X_Dpy, sc->which); + hmax = DisplayHeight(X_Dpy, sc->which); + + if (cc->geom.x + ((int)cc->bwidth * 2) >= wmax) + cc->geom.x = wmax - (cc->bwidth * 2); + if (cc->geom.x + cc->geom.w - ((int)cc->bwidth * 2) < 0) + cc->geom.x = -cc->geom.w; + if (cc->geom.y + ((int)cc->bwidth * 2) >= hmax) + cc->geom.y = hmax - (cc->bwidth * 2); + if (cc->geom.y + cc->geom.h - ((int)cc->bwidth * 2) < 0) + cc->geom.y = -cc->geom.h; } else { struct geom area; int xmouse, ymouse; diff --git a/kbfunc.c b/kbfunc.c index f105e6b..58b3e18 100644 --- a/kbfunc.c +++ b/kbfunc.c @@ -156,6 +156,10 @@ kbfunc_client_resize(void *ctx, union arg *arg, enum xev xev) cc->geom.w = cc->hint.minw; if ((cc->geom.h += my * cc->hint.inch) < cc->hint.minh) cc->geom.h = cc->hint.minh; + if (cc->geom.x + cc->geom.w < 0) + cc->geom.x = -cc->geom.w; + if (cc->geom.y + cc->geom.h < 0) + cc->geom.y = -cc->geom.h; client_resize(cc, 1); /* Make sure the pointer stays within the window. */ |