ryan/cwm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cvsimport

Browse Source
This commit is contained in:
okan
2013-01-13 13:55:12 +00:00
parent 104c7d5de3 47aa485fa2
commit 9c6226faa8
8 changed files with 175 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

153
client.c
View File

@@ -286,10 +286,7 @@ client_maximize(struct client_ctx *cc)
cc->geom.x + cc->geom.w / 2,
cc->geom.y + cc->geom.h / 2);
cc->geom.x = xine.x + sc->gap.left;
cc->geom.y = xine.y + sc->gap.top;
cc->geom.h = xine.h - (sc->gap.top + sc->gap.bottom);
cc->geom.w = xine.w - (sc->gap.left + sc->gap.right);
cc->geom = xine;
cc->bwidth = 0;
cc->flags |= CLIENT_MAXIMIZED;
@@ -329,9 +326,8 @@ client_vmaximize(struct client_ctx *cc)
cc->geom.x + cc->geom.w / 2,
cc->geom.y + cc->geom.h / 2);
cc->geom.y = xine.y + sc->gap.top;
cc->geom.h = xine.h - (cc->bwidth * 2) - (sc->gap.top +
sc->gap.bottom);
cc->geom.y = xine.y;
cc->geom.h = xine.h - (cc->bwidth * 2);
cc->flags |= CLIENT_VMAXIMIZED;
resize:
@@ -370,9 +366,8 @@ client_hmaximize(struct client_ctx *cc)
cc->geom.x + cc->geom.w / 2,
cc->geom.y + cc->geom.h / 2);
cc->geom.x = xine.x + sc->gap.left;
cc->geom.w = xine.w - (cc->bwidth * 2) - (sc->gap.left +
sc->gap.right);
cc->geom.x = xine.x;
cc->geom.w = xine.w - (cc->bwidth * 2);
cc->flags |= CLIENT_HMAXIMIZED;
resize:
@@ -660,6 +655,8 @@ client_placecalc(struct client_ctx *cc)
xu_ptr_getpos(sc->rootwin, &xmouse, &ymouse);
xine = screen_find_xinerama(sc, xmouse, ymouse);
xine.w += xine.x;
xine.h += xine.y;
xmouse = MAX(xmouse, xine.x) - cc->geom.w / 2;
ymouse = MAX(ymouse, xine.y) - cc->geom.h / 2;
@@ -670,22 +667,16 @@ client_placecalc(struct client_ctx *cc)
yslack = xine.h - cc->geom.h - cc->bwidth * 2;
if (xslack >= xine.x) {
cc->geom.x = MAX(MIN(xmouse, xslack),
xine.x + sc->gap.left);
if (cc->geom.x > (xslack - sc->gap.right))
cc->geom.x -= sc->gap.right;
cc->geom.x = MAX(MIN(xmouse, xslack), xine.x);
} else {
cc->geom.x = xine.x + sc->gap.left;
cc->geom.w = xine.w - sc->gap.left;
cc->geom.x = xine.x;
cc->geom.w = xine.w;
}
if (yslack >= xine.y) {
cc->geom.y = MAX(MIN(ymouse, yslack),
xine.y + sc->gap.top);
if (cc->geom.y > (yslack - sc->gap.bottom))
cc->geom.y -= sc->gap.bottom;
cc->geom.y = MAX(MIN(ymouse, yslack), xine.y);
} else {
cc->geom.y = xine.y + sc->gap.top;
cc->geom.h = xine.h - sc->gap.top;
cc->geom.y = xine.y;
cc->geom.h = xine.h;
}
}
}
@@ -875,3 +866,121 @@ client_snapcalc(int n0, int n1, int e0, int e1, int snapdist)
else
return (0);
}
void
client_htile(struct client_ctx *cc)
{
struct client_ctx *ci;
struct group_ctx *gc = cc->group;
struct screen_ctx *sc = cc->sc;
struct geom xine;
int i, n, mh, x, h, w;
if (!gc)
return;
i = n = 0;
TAILQ_FOREACH(ci, &gc->clients, group_entry) {
if (ci->flags & CLIENT_HIDDEN ||
ci->flags & CLIENT_IGNORE || (ci == cc))
continue;
n++;
}
if (n == 0)
return;
xine = screen_find_xinerama(sc,
cc->geom.x + cc->geom.w / 2,
cc->geom.y + cc->geom.h / 2);
if (cc->flags & CLIENT_VMAXIMIZED ||
cc->geom.h + (cc->bwidth * 2) >= xine.h)
return;
cc->flags &= ~CLIENT_HMAXIMIZED;
cc->geom.x = xine.x;
cc->geom.y = xine.y;
cc->geom.w = xine.w - (cc->bwidth * 2);
client_resize(cc, 1);
client_ptrwarp(cc);
mh = cc->geom.h + (cc->bwidth * 2);
x = xine.x;
w = xine.w / n;
h = xine.h - mh;
TAILQ_FOREACH(ci, &gc->clients, group_entry) {
if (ci->flags & CLIENT_HIDDEN ||
ci->flags & CLIENT_IGNORE || (ci == cc))
continue;
ci->bwidth = Conf.bwidth;
ci->geom.y = xine.y + mh;
ci->geom.x = x;
ci->geom.h = h - (ci->bwidth * 2);
ci->geom.w = w - (ci->bwidth * 2);
if (i + 1 == n)
ci->geom.w = xine.x + xine.w -
ci->geom.x - (ci->bwidth * 2);
x += w;
client_resize(ci, 1);
i++;
}
}
void
client_vtile(struct client_ctx *cc)
{
struct client_ctx *ci;
struct group_ctx *gc = cc->group;
struct screen_ctx *sc = cc->sc;
struct geom xine;
int i, n, mw, y, h, w;
if (!gc)
return;
i = n = 0;
TAILQ_FOREACH(ci, &gc->clients, group_entry) {
if (ci->flags & CLIENT_HIDDEN ||
ci->flags & CLIENT_IGNORE || (ci == cc))
continue;
n++;
}
if (n == 0)
return;
xine = screen_find_xinerama(sc,
cc->geom.x + cc->geom.w / 2,
cc->geom.y + cc->geom.h / 2);
if (cc->flags & CLIENT_HMAXIMIZED ||
cc->geom.w + (cc->bwidth * 2) >= xine.w)
return;
cc->flags &= ~CLIENT_VMAXIMIZED;
cc->geom.x = xine.x;
cc->geom.y = xine.y;
cc->geom.h = xine.h - (cc->bwidth * 2);
client_resize(cc, 1);
client_ptrwarp(cc);
mw = cc->geom.w + (cc->bwidth * 2);
y = xine.y;
h = xine.h / n;
w = xine.w - mw;
TAILQ_FOREACH(ci, &gc->clients, group_entry) {
if (ci->flags & CLIENT_HIDDEN ||
ci->flags & CLIENT_IGNORE || (ci == cc))
continue;
ci->bwidth = Conf.bwidth;
ci->geom.y = y;
ci->geom.x = xine.x + mw;
ci->geom.h = h - (ci->bwidth * 2);
ci->geom.w = w - (ci->bwidth * 2);
if (i + 1 == n)
ci->geom.h = xine.y + xine.h -
ci->geom.y - (ci->bwidth * 2);
y += h;
client_resize(ci, 1);
i++;
}
}