X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=view.c;h=2143d70bde04da6ab4078268b047de7999ee0add;hb=06bae9dfb7902c97877f3493cf4b489ccf531089;hp=0f9cb68138735b3d6f5c4e953f8b0c040ac4ad78;hpb=10885d349a8426f0a55f34e78a2592267e8e55be;p=dwm.git diff --git a/view.c b/view.c index 0f9cb68..2143d70 100644 --- a/view.c +++ b/view.c @@ -1,5 +1,4 @@ -/* - * (C)opyright MMVI Anselm R. Garbe +/* (C)opyright MMVI-MMVII Anselm R. Garbe * See LICENSE file for license details. */ #include "dwm.h" @@ -7,50 +6,57 @@ /* static */ static Client * -minclient(void) { - Client *c, *min; - - if((clients && clients->isfloat) || arrange == dofloat) - return clients; /* don't touch floating order */ - for(min = c = clients; c; c = c->next) - if(c->weight < min->weight) - min = c; - return min; -} - -static Client * nexttiled(Client *c) { for(c = getnext(c); c && c->isfloat; c = getnext(c->next)); return c; } +static Bool +ismaster(Client *c) { + Client *cl; + unsigned int i; + + for(cl = nexttiled(clients), i = 0; cl && cl != c; cl = nexttiled(cl->next), i++); + return i < nmaster; +} + static void -reorder(void) { - Client *c, *newclients, *tail; - - newclients = tail = NULL; - while((c = minclient())) { - detach(c); - if(tail) { - c->prev = tail; - tail->next = c; - tail = c; - } - else - tail = newclients = c; - } - clients = newclients; +pop(Client *c) { + detach(c); + if(clients) + clients->prev = c; + c->next = clients; + clients = c; +} + +static void +swap(Client *c1, Client *c2) { + Client tmp = *c1; + Client *cp = c1->prev; + Client *cn = c1->next; + + *c1 = *c2; + c1->prev = cp; + c1->next = cn; + cp = c2->prev; + cn = c2->next; + *c2 = tmp; + c2->prev = cp; + c2->next = cn; } static void -togglemax(Client *c) -{ +togglemax(Client *c) { XEvent ev; + + if(c->isfixed) + return; + 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; + c->rx = c->x; c->x = wax; + c->ry = c->y; c->y = way; + c->rw = c->w; c->w = waw - 2 * BORDERPX; + c->rh = c->h; c->h = wah - 2 * BORDERPX; } else { c->x = c->rx; @@ -62,9 +68,18 @@ togglemax(Client *c) while(XCheckMaskEvent(dpy, EnterWindowMask, &ev)); } +static Client * +topofstack() { + Client *c; + unsigned int i; + + for(c = nexttiled(clients), i = 0; c && i < nmaster; c = nexttiled(c->next), i++); + return (i < nmaster) ? NULL : c; +} + /* extern */ -void (*arrange)(Arg *) = DEFMODE; +void (*arrange)(void) = DEFMODE; void detach(Client *c) { @@ -78,7 +93,7 @@ detach(Client *c) { } void -dofloat(Arg *arg) { +dofloat(void) { Client *c; for(c = clients; c; c = c->next) { @@ -95,64 +110,49 @@ 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) { - unsigned int i, n, md, stackw, stackh, th; +dotile(void) { + unsigned int i, n, mw, mh, tw, th; Client *c; for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next)) n++; + /* window geoms */ + mw = (n > nmaster) ? (waw * master) / 1000 : waw; + mh = (n > nmaster) ? wah / nmaster : wah / (n > 0 ? n : 1); + tw = waw - mw; + th = (n > nmaster) ? wah / (n - nmaster) : 0; - md = (sw * master) / 1000; - stackw = sw - md; - stackh = sh - bh; - - th = stackh; - if(n > 1) - th /= (n - 1); - - for(i = 0, c = clients; c; c = c->next) { + for(i = 0, c = clients; c; c = c->next) if(isvisible(c)) { if(c->isfloat) { resize(c, True, TopLeft); continue; } 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(i == 0) { /* master window */ - c->w = md - 2 * BORDERPX; - c->h = sh - bh - 2 * BORDERPX; + c->x = wax; + c->y = way; + if(i < nmaster) { + c->y += i * mh; + c->w = mw - 2 * BORDERPX; + c->h = mh - 2 * BORDERPX; } else { /* tile window */ - c->x += md; + c->x += mw; + c->w = tw - 2 * BORDERPX; if(th > bh) { - c->y = sy + (i - 1) * th + bh; - if(i + 1 == n) - c->h = sh - c->y - 2 * BORDERPX; - c->w = stackw - 2 * BORDERPX; + c->y += (i - nmaster) * th; c->h = th - 2 * BORDERPX; } - else { /* fallback if th < bh */ - c->w = stackw - 2 * BORDERPX; - c->h = stackh - 2 * BORDERPX; - } + else /* fallback if th < bh */ + c->h = wah - 2 * BORDERPX; } resize(c, False, TopLeft); i++; } else ban(c); - } + if(!sel || !isvisible(sel)) { for(c = stack; c && !isvisible(c); c = c->snext); focus(c); @@ -166,7 +166,6 @@ focusnext(Arg *arg) { if(!sel) return; - if(!(c = getnext(sel->next))) c = getnext(clients); if(c) { @@ -181,7 +180,6 @@ focusprev(Arg *arg) { if(!sel) return; - if(!(c = getprev(sel->prev))) { for(c = clients; c && c->next; c = c->next); c = getprev(c); @@ -192,6 +190,14 @@ focusprev(Arg *arg) { } } +void +incnmaster(Arg *arg) { + if(nmaster + arg->i < 1) + return; + nmaster += arg->i; + arrange(); +} + Bool isvisible(Client *c) { unsigned int i; @@ -203,27 +209,15 @@ isvisible(Client *c) { } void -resizecol(Arg *arg) { - unsigned int n; - Client *c; - - for(n = 0, c = clients; c; c = c->next) - if(isvisible(c) && !c->isfloat) - n++; - if(!sel || sel->isfloat || n < 2 || (arrange == dofloat)) - return; - - if(sel == getnext(clients)) { +resizemaster(Arg *arg) { + if(arg->i == 0) + master = MASTER; + else { if(master + arg->i > 950 || master + arg->i < 50) return; master += arg->i; } - else { - if(master - arg->i > 950 || master - arg->i < 50) - return; - master -= arg->i; - } - arrange(NULL); + arrange(); } void @@ -257,10 +251,18 @@ restack(void) { } void +togglefloat(Arg *arg) { + if (!sel || arrange == dofloat) + return; + sel->isfloat = !sel->isfloat; + arrange(); +} + +void togglemode(Arg *arg) { arrange = (arrange == dofloat) ? dotile : dofloat; if(sel) - arrange(NULL); + arrange(); else drawstatus(); } @@ -273,8 +275,7 @@ toggleview(Arg *arg) { for(i = 0; i < ntags && !seltag[i]; i++); if(i == ntags) seltag[arg->i] = True; /* cannot toggle last view */ - reorder(); - arrange(NULL); + arrange(); } void @@ -282,24 +283,12 @@ view(Arg *arg) { unsigned int i; for(i = 0; i < ntags; i++) - seltag[i] = False; - seltag[arg->i] = True; - reorder(); - arrange(NULL); -} - -void -viewall(Arg *arg) { - unsigned int i; - - for(i = 0; i < ntags; i++) - seltag[i] = True; - reorder(); - arrange(NULL); + seltag[i] = (arg->i == -1) ? True : False; + if(arg->i >= 0 && arg->i < ntags) + seltag[arg->i] = True; + arrange(); } - - void zoom(Arg *arg) { unsigned int n; @@ -307,26 +296,24 @@ zoom(Arg *arg) { 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(n < 2 || (arrange == dofloat)) + for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next)) + n++; + if(n <= nmaster || (arrange == dofloat)) return; - if((c = sel) == nexttiled(clients)) - if(!(c = nexttiled(c->next))) + if(ismaster((c = sel))) { + if(!(c = topofstack())) return; - detach(c); - if(clients) - clients->prev = c; - c->next = clients; - clients = c; + swap(c, sel); + c = sel; + } + else + pop(c); + focus(c); - arrange(NULL); + arrange(); }