mirror/cwm
1
0
Fork 0
mirror of https://github.com/leahneukirchen/cwm.git synced 2023-08-10 21:13:12 +03:00
Code Issues Projects Releases Wiki Activity

simplify screen 'area' usage for initial client placement

Browse Source
This commit is contained in:
okan 2019-02-23 19:17:17 +00:00
parent 953cf1ce89
commit 43cd19378e
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
client.c
View File

@ -754,7 +754,6 @@ static void
client_placecalc(struct client_ctx *cc) client_placecalc(struct client_ctx *cc)
{ {
struct screen_ctx *sc = cc->sc; struct screen_ctx *sc = cc->sc;
int xslack, yslack;
if (cc->hint.flags & (USPosition | PPosition)) { if (cc->hint.flags & (USPosition | PPosition)) {
if (cc->geom.x >= sc->view.w) if (cc->geom.x >= sc->view.w)
@ -772,33 +771,29 @@ client_placecalc(struct client_ctx *cc)
cc->geom.y += cc->obwidth * 2; cc->geom.y += cc->obwidth * 2;
} }
} else { } else {
struct geom area; struct geom area;
int xmouse, ymouse; int xmouse, ymouse, xslack, yslack;
xu_ptr_getpos(sc->rootwin, &xmouse, &ymouse); xu_ptr_getpos(sc->rootwin, &xmouse, &ymouse);
area = screen_area(sc, xmouse, ymouse, CWM_GAP); area = screen_area(sc, xmouse, ymouse, CWM_GAP);
area.w += area.x;
area.h += area.y;
xmouse = MAX(xmouse, area.x) - cc->geom.w / 2;
ymouse = MAX(ymouse, area.y) - cc->geom.h / 2;
xmouse = MAX(xmouse, area.x); xmouse = MAX(MAX(xmouse, area.x) - cc->geom.w / 2, area.x);
ymouse = MAX(ymouse, area.y); ymouse = MAX(MAX(ymouse, area.y) - cc->geom.h / 2, area.y);
xslack = area.w - cc->geom.w - cc->bwidth * 2; xslack = area.x + area.w - cc->geom.w - cc->bwidth * 2;
yslack = area.h - cc->geom.h - cc->bwidth * 2; yslack = area.y + area.h - cc->geom.h - cc->bwidth * 2;
if (xslack >= area.x) { if (xslack >= area.x) {
cc->geom.x = MAX(MIN(xmouse, xslack), area.x); cc->geom.x = MAX(MIN(xmouse, xslack), area.x);
} else { } else {
cc->geom.x = area.x; cc->geom.x = area.x;
cc->geom.w = area.w; cc->geom.w = area.x + area.w;
} }
if (yslack >= area.y) { if (yslack >= area.y) {
cc->geom.y = MAX(MIN(ymouse, yslack), area.y); cc->geom.y = MAX(MIN(ymouse, yslack), area.y);
} else { } else {
cc->geom.y = area.y; cc->geom.y = area.y;
cc->geom.h = area.h; cc->geom.h = area.y + area.h;
} }
} }
} }