X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=view.c;h=1ca10275f6d004b51ce9fe2970b87f9b9ecd100a;hb=0384faeee5308d992e60084dd6565c78e6e11af4;hp=80d483ae4392e8c921f826e2c7a724ff55fab02f;hpb=ca68975ff8fc1c7166c8d1f811e3dd52c735d19f;p=dwm.git diff --git a/view.c b/view.c index 80d483a..1ca1027 100644 --- a/view.c +++ b/view.c @@ -7,7 +7,7 @@ /* static */ static Client * -minclient() { +minclient(void) { Client *c, *min; if((clients && clients->isfloat) || arrange == dofloat) @@ -18,8 +18,14 @@ minclient() { return min; } +static Client * +nexttiled(Client *c) { + for(c = getnext(c); c && c->isfloat; c = getnext(c->next)); + return c; +} + static void -reorder() { +reorder(void) { Client *c, *newclients, *tail; newclients = tail = NULL; @@ -36,15 +42,30 @@ reorder() { clients = newclients; } -static Client * -nexttiled(Client *c) { - for(c = getnext(c); c && c->isfloat; c = getnext(c->next)); - return c; +static void +togglemax(Client *c) +{ + XEvent ev; + 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 - 2 * BORDERPX; + c->rh = c->h; c->h = sh - bh - 2 * BORDERPX; + } + else { + c->x = c->rx; + c->y = c->ry; + c->w = c->rw; + c->h = c->rh; + } + resize(c, True, TopLeft); + while(XCheckMaskEvent(dpy, EnterWindowMask, &ev)); } /* extern */ void (*arrange)(Arg *) = DEFMODE; +StackPos stackpos = STACKPOS; void detach(Client *c) { @@ -61,8 +82,6 @@ void dofloat(Arg *arg) { Client *c; - maximized = False; - for(c = clients; c; c = c->next) { if(isvisible(c)) { resize(c, True, TopLeft); @@ -77,22 +96,35 @@ dofloat(Arg *arg) { restack(); } +/* This algorithm is based on a (M)aster area and a (S)tacking area. + * It supports following arrangements: + * SSMMM MMMMM MMMSS + * SSMMM SSSSS MMMSS + */ void dotile(Arg *arg) { - int h, i, n, w; + unsigned int i, n, md, stackw, stackh, tw, th; Client *c; - maximized = False; + for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next)) + n++; - w = sw - mw; - for(n = 0, c = clients; c; c = c->next) - if(isvisible(c) && !c->isfloat) - n++; + if(stackpos == StackBottom) { + md = ((sh - bh) * master) / 1000; + stackw = sw; + stackh = sh - bh - md; + } + else { + md = (sw * master) / 1000; + stackw = sw - md; + stackh = sh - bh; + } + tw = stackw; if(n > 1) - h = (sh - bh) / (n - 1); + th = stackh / (n - 1); else - h = sh - bh; + th = stackh; for(i = 0, c = clients; c; c = c->next) { if(isvisible(c)) { @@ -100,32 +132,54 @@ dotile(Arg *arg) { resize(c, True, TopLeft); continue; } - if(n == 1) { - c->x = sx; - c->y = sy + bh; - c->w = sw - 2; - c->h = sh - 2 - bh; - } - else if(i == 0) { - c->x = sx; - c->y = sy + bh; - c->w = mw - 2; - c->h = sh - 2 - bh; + c->ismax = False; + c->x = sx; + c->y = sy + bh; + if(n == 1) { /* only 1 window */ + c->w = sw - 2 * BORDERPX; + c->h = sh - 2 * BORDERPX - bh; } - else if(h > bh) { - c->x = sx + mw; - c->y = sy + (i - 1) * h + bh; - c->w = w - 2; - if(i + 1 == n) - c->h = sh - c->y - 2; - else - c->h = h - 2; + else if(i == 0) { /* master window */ + if(stackpos == StackLeft) + c->x += stackw; + switch(stackpos) { + case StackLeft: + case StackRight: + c->w = md - 2 * BORDERPX; + c->h = sh - bh - 2 * BORDERPX; + break; + case StackBottom: + c->w = sw - 2 * BORDERPX; + c->h = md - 2 * BORDERPX; + break; + } } - else { /* fallback if h < bh */ - c->x = sx + mw; - c->y = sy + bh; - c->w = w - 2; - c->h = sh - 2 - bh; + else { /* tile window */ + if(stackpos == StackRight) + c->x += md; + if(th > bh) { + switch(stackpos) { + case StackLeft: + case StackRight: + c->y = sy + (i - 1) * th + bh; + if(i + 1 == n) + c->h = sh - c->y - 2 * BORDERPX; + break; + case StackBottom: + c->y = sy + md + (i - 1) * th + bh; + if(i + 1 == n) + c->h = sh - c->y - 2 * BORDERPX; + break; + } + c->w = tw - 2 * BORDERPX; + c->h = th - 2 * BORDERPX; + } + else { /* fallback if th < bh */ + if(stackpos == StackBottom) + c->y += md; + c->w = stackw - 2 * BORDERPX; + c->h = stackh - 2 * BORDERPX; + } } resize(c, False, TopLeft); i++; @@ -190,27 +244,27 @@ resizecol(Arg *arg) { for(n = 0, c = clients; c; c = c->next) if(isvisible(c) && !c->isfloat) n++; - if(!sel || sel->isfloat || n < 2 || (arrange != dotile) || maximized) + if(!sel || sel->isfloat || n < 2 || (arrange == dofloat)) return; if(sel == getnext(clients)) { - if(mw + arg->i > sw - 100 || mw + arg->i < 100) + if(master + arg->i > 95 || master + arg->i < 5) return; - mw += arg->i; + master += arg->i; } else { - if(mw - arg->i > sw - 100 || mw - arg->i < 100) + if(master - arg->i > 95 || master - arg->i < 5) return; - mw -= arg->i; + master -= arg->i; } arrange(NULL); } void -restack() { +restack(void) { Client *c; XEvent ev; - + if(!sel) { drawstatus(); return; @@ -219,11 +273,18 @@ restack() { XRaiseWindow(dpy, sel->win); XRaiseWindow(dpy, sel->twin); } - if(arrange != dofloat) + if(arrange != dofloat) { + if(!sel->isfloat) { + XLowerWindow(dpy, sel->twin); + XLowerWindow(dpy, sel->win); + } for(c = nexttiled(clients); c; c = nexttiled(c->next)) { + if(c == sel) + continue; XLowerWindow(dpy, c->twin); XLowerWindow(dpy, c->win); } + } drawall(); XSync(dpy, False); while(XCheckMaskEvent(dpy, EnterWindowMask, &ev)); @@ -251,6 +312,17 @@ toggleview(Arg *arg) { } void +togglestackpos(Arg *arg) { + if(arrange == dofloat) + return; + if(stackpos == StackBottom) + stackpos = STACKPOS; + else + stackpos = StackBottom; + arrange(NULL); +} + +void view(Arg *arg) { unsigned int i; @@ -271,15 +343,25 @@ viewall(Arg *arg) { arrange(NULL); } + + void zoom(Arg *arg) { unsigned int n; Client *c; + if(!sel) + return; + + if(sel->isfloat || (arrange == dofloat)) { + togglemax(sel); + return; + } + for(n = 0, c = clients; c; c = c->next) if(isvisible(c) && !c->isfloat) n++; - if(!sel || sel->isfloat || n < 2 || (arrange != dotile) || maximized) + if(n < 2 || (arrange == dofloat)) return; if((c = sel) == nexttiled(clients))