small change to achieve Jukka's last proposal

This commit is contained in:
arg@mmvi 2006-09-22 13:53:28 +02:00
parent 05c10c5776
commit 346bdea946
2 changed files with 34 additions and 14 deletions

3
dwm.h
View File

@ -77,12 +77,13 @@ struct Client {
char name[256]; char name[256];
int proto; int proto;
int x, y, w, h; int x, y, w, h;
int rx, ry, rw, rh; /* revert geometry */
int tx, ty, tw, th; /* title window geometry */ int tx, ty, tw, th; /* title window geometry */
int basew, baseh, incw, inch, maxw, maxh, minw, minh; int basew, baseh, incw, inch, maxw, maxh, minw, minh;
int grav; int grav;
long flags; long flags;
unsigned int border, weight; unsigned int border, weight;
Bool isfloat; Bool isfloat, ismax;
Bool *tags; Bool *tags;
Client *next; Client *next;
Client *prev; Client *prev;

43
view.c
View File

@ -18,6 +18,12 @@ minclient() {
return min; return min;
} }
static Client *
nexttiled(Client *c) {
for(c = getnext(c); c && c->isfloat; c = getnext(c->next));
return c;
}
static void static void
reorder() { reorder() {
Client *c, *newclients, *tail; Client *c, *newclients, *tail;
@ -36,10 +42,23 @@ reorder() {
clients = newclients; clients = newclients;
} }
static Client * static void
nexttiled(Client *c) { togglemax(Client *c)
for(c = getnext(c); c && c->isfloat; c = getnext(c->next)); {
return c; if((c->ismax = !c->ismax)) {
c->rx = c->x; c->x = sx;
c->ry = c->y; c->y = bh;
c->rw = c->w; c->w = sw;
c->rh = c->h; c->h = sh;
}
else {
c->x = c->rx;
c->y = c->ry;
c->w = c->w;
c->h = c->h;
}
resize(c, True, TopLeft);
while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
} }
/* extern */ /* extern */
@ -82,8 +101,14 @@ dotile(Arg *arg) {
w = sw - mw; w = sw - mw;
for(n = 0, c = clients; c; c = c->next) for(n = 0, c = clients; c; c = c->next)
if(isvisible(c) && !c->isfloat) if(isvisible(c)) {
if(c->isfloat) {
if(c->ismax)
togglemax(c);
}
else
n++; n++;
}
if(n > 1) if(n > 1)
h = (sh - bh) / (n - 1); h = (sh - bh) / (n - 1);
@ -269,7 +294,6 @@ viewall(Arg *arg) {
void void
zoom(Arg *arg) { zoom(Arg *arg) {
int tmp;
unsigned int n; unsigned int n;
Client *c; Client *c;
XEvent ev; XEvent ev;
@ -278,12 +302,7 @@ zoom(Arg *arg) {
return; return;
if(sel->isfloat || (arrange == dofloat)) { if(sel->isfloat || (arrange == dofloat)) {
sel->x = sx; togglemax(sel);
sel->y = bh;
sel->w = sw;
sel->h = sh - bh;
resize(sel, True, TopLeft);
while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
return; return;
} }