X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=view.c;h=6697c9092182241128513778ac60fa74bf9ed7a5;hb=fee8df6ccf3ab1494421d422af252f7b3da3a811;hp=682e3317d2ac91f091089e4b27bbd04c57717035;hpb=67986e81eed4a76cb4c50aed62ddb1fd14c4659d;p=dwm.git diff --git a/view.c b/view.c index 682e331..6697c90 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) @@ -25,7 +25,7 @@ nexttiled(Client *c) { } static void -reorder() { +reorder(void) { Client *c, *newclients, *tail; newclients = tail = NULL; @@ -49,8 +49,8 @@ togglemax(Client *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 - 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; @@ -65,6 +65,8 @@ togglemax(Client *c) /* extern */ void (*arrange)(Arg *) = DEFMODE; +Bool isvertical = VERTICALSTACK; +StackPos stackpos = STACKPOS; void detach(Client *c) { @@ -95,26 +97,42 @@ 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; + int i, n, stackw, stackh, tw, th; Client *c; - w = sw - mw; - for(n = 0, c = clients; c; c = c->next) - if(isvisible(c)) { - if(c->isfloat) { - if(c->ismax) - togglemax(c); - } - else - n++; - } + for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next)) + n++; - if(n > 1) - h = (sh - bh) / (n - 1); - else - h = sh - bh; + if(stackpos == StackBottom) { + stackw = sw; + stackh = sh - bh - master; + } + else { + stackw = sw - master; + stackh = sh - bh; + } + + if(isvertical) { + tw = stackw; + if(n > 1) + th = stackh / (n - 1); + else + th = stackh; + } + else { + th = stackh; + if(n > 1) + tw = stackw / (n - 1); + else + tw = stackw; + } for(i = 0, c = clients; c; c = c->next) { if(isvisible(c)) { @@ -122,32 +140,101 @@ dotile(Arg *arg) { resize(c, True, TopLeft); continue; } - if(n == 1) { + c->ismax = False; + if(n == 1) { /* only 1 window */ c->x = sx; c->y = sy + bh; - c->w = sw - 2; - c->h = sh - 2 - bh; + c->w = sw - 2 * BORDERPX; + c->h = sh - 2 * BORDERPX - bh; } - else if(i == 0) { - c->x = sx; - c->y = sy + bh; - c->w = mw - 2; - c->h = sh - 2 - bh; + else if(i == 0) { /* master window */ + switch(stackpos) { + case StackLeft: + c->x = sx + stackw; + c->y = sy + bh; + c->w = master - 2 * BORDERPX; + c->h = sh - bh - 2 * BORDERPX; + break; + case StackBottom: + c->x = sx; + c->y = sy + bh; + c->w = sw - 2 * BORDERPX; + c->h = master - 2 * BORDERPX; + break; + case StackRight: + c->x = sx; + c->y = sy + bh; + c->w = master - 2 * BORDERPX; + c->h = sh - bh - 2 * BORDERPX; + break; + } } - 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((isvertical && th > bh) || (!isvertical && tw > MINW)) { + /* tile window */ + c->w = tw - 2 * BORDERPX; + c->h = th - 2 * BORDERPX; + switch(stackpos) { + case StackLeft: + if(isvertical) { + c->x = sx; + c->y = sy + (i - 1) * th + bh; + if(i + 1 == n) + c->h = sh - c->y - 2 * BORDERPX; + } + else { + c->x = sx + (i - 1) * tw; + c->y = sy + bh; + if(i + 1 == n) + c->w = sx + stackw - c->x - 2 * BORDERPX; + } + break; + case StackBottom: + if(isvertical) { + c->x = sx; + c->y = sy + master + (i - 1) * th + bh; + if(i + 1 == n) + c->h = sh - c->y - 2 * BORDERPX; + } + else { + c->x = sx + (i - 1) * tw; + c->y = sy + bh + master; + if(i + 1 == n) + c->w = sw - c->x - 2 * BORDERPX; + } + break; + case StackRight: + if(isvertical) { + c->x = sx + master; + c->y = sy + (i - 1) * th + bh; + if(i + 1 == n) + c->h = sh - c->y - 2 * BORDERPX; + } + else { + c->x = sx + master + (i - 1) * tw; + c->y = sy + bh; + if(i + 1 == n) + c->w = sx + stackw - c->x - 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 { /* fallback if th < bh resp. tw < MINW */ + c->w = stackw - 2 * BORDERPX; + c->h = stackh - 2 * BORDERPX; + switch(stackpos) { + case StackLeft: + c->x = sx; + c->y = sy + bh; + break; + case StackBottom: + c->x = sx; + c->y = sy + master; + break; + case StackRight: + c->x = sx + master; + c->y = sy + bh; + break; + } } resize(c, False, TopLeft); i++; @@ -212,24 +299,24 @@ 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)) + 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 > sw - MINW || master + arg->i < MINW) return; - mw += arg->i; + master += arg->i; } else { - if(mw - arg->i > sw - 100 || mw - arg->i < 100) + if(master - arg->i > sw - MINW || master - arg->i < MINW) return; - mw -= arg->i; + master -= arg->i; } arrange(NULL); } void -restack() { +restack(void) { Client *c; XEvent ev; @@ -273,6 +360,31 @@ toggleview(Arg *arg) { } void +togglestackdir(Arg *arg) { + if(arrange == dofloat) + return; + isvertical = !isvertical; + arrange(NULL); +} + +void +togglestackpos(Arg *arg) { + if(arrange == dofloat) + return; + if(stackpos == StackBottom) + stackpos = STACKPOS; + else + stackpos = StackBottom; + updatemaster(); + arrange(NULL); +} + +void +updatemaster(void) { + master = ((stackpos == StackBottom ? sh - bh : sw) * MASTER) / 100; +} + +void view(Arg *arg) { unsigned int i; @@ -293,6 +405,8 @@ viewall(Arg *arg) { arrange(NULL); } + + void zoom(Arg *arg) { unsigned int n; @@ -309,7 +423,7 @@ zoom(Arg *arg) { for(n = 0, c = clients; c; c = c->next) if(isvisible(c) && !c->isfloat) n++; - if(n < 2 || (arrange != dotile)) + if(n < 2 || (arrange == dofloat)) return; if((c = sel) == nexttiled(clients))