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

unify various max routines to match client placement and partially menu ones

Browse Source 
when calculating screen dimensions.
This commit is contained in:
okan 2012-07-16 01:53:14 +00:00
parent 57af364a21
commit 3f956098d9
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
client.c
View File

@ -256,8 +256,7 @@ void
client_maximize(struct client_ctx *cc) client_maximize(struct client_ctx *cc)
{ {
struct screen_ctx *sc = cc->sc; struct screen_ctx *sc = cc->sc;
int xmax = sc->view.w, ymax = sc->view.h; int x_org, y_org, xmax, ymax;
int x_org = 0, y_org = 0;
XineramaScreenInfo *xine; XineramaScreenInfo *xine;
if (cc->flags & CLIENT_FREEZE) if (cc->flags & CLIENT_FREEZE)
@ -293,6 +292,10 @@ client_maximize(struct client_ctx *cc)
y_org = xine->y_org; y_org = xine->y_org;
xmax = xine->width; xmax = xine->width;
ymax = xine->height; ymax = xine->height;
} else {
x_org = y_org = 0;
xmax = sc->view.w;
ymax = sc->view.h;
} }
cc->geom.x = x_org + sc->gap.left; cc->geom.x = x_org + sc->gap.left;
@ -310,7 +313,7 @@ void
client_vertmaximize(struct client_ctx *cc) client_vertmaximize(struct client_ctx *cc)
{ {
struct screen_ctx *sc = cc->sc; struct screen_ctx *sc = cc->sc;
int y_org = 0, ymax = sc->view.h; int y_org, ymax;
XineramaScreenInfo *xine; XineramaScreenInfo *xine;
if (cc->flags & CLIENT_FREEZE) if (cc->flags & CLIENT_FREEZE)
@ -341,6 +344,9 @@ client_vertmaximize(struct client_ctx *cc)
if (xine) { if (xine) {
y_org = xine->y_org; y_org = xine->y_org;
ymax = xine->height; ymax = xine->height;
} else {
y_org = 0;
ymax = sc->view.h;
} }
cc->geom.y = y_org + sc->gap.top; cc->geom.y = y_org + sc->gap.top;
@ -356,7 +362,7 @@ void
client_horizmaximize(struct client_ctx *cc) client_horizmaximize(struct client_ctx *cc)
{ {
struct screen_ctx *sc = cc->sc; struct screen_ctx *sc = cc->sc;
int x_org = 0, xmax = sc->view.w; int x_org, xmax;
XineramaScreenInfo *xine; XineramaScreenInfo *xine;
if (cc->flags & CLIENT_FREEZE) if (cc->flags & CLIENT_FREEZE)
@ -387,6 +393,9 @@ client_horizmaximize(struct client_ctx *cc)
if (xine) { if (xine) {
x_org = xine->x_org; x_org = xine->x_org;
xmax = xine->width; xmax = xine->width;
} else {
x_org = 0;
xmax = sc->view.w;
} }
cc->geom.x = x_org + sc->gap.left; cc->geom.x = x_org + sc->gap.left;