X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=view.c;h=72a49913dc4fe937b97e971d7ddc1c535ef3ae7c;hp=e799094a8f0c79acb2c645e1f6b985d1f543be47;hb=ac24f132dba7e59d9d9ff98d984f5e0b0d20fd09;hpb=7d7cde0fd6ceae2f7d759b924afd8df279a4ddde diff --git a/view.c b/view.c index e799094..72a4991 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,23 @@ /* 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 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; -} - -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; - c->rh = c->h; c->h = sh - bh - 2; + 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; @@ -64,7 +36,7 @@ togglemax(Client *c) /* extern */ -void (*arrange)(Arg *) = DEFMODE; +void (*arrange)(void) = DEFMODE; void detach(Client *c) { @@ -78,7 +50,7 @@ detach(Client *c) { } void -dofloat(Arg *arg) { +dofloat(void) { Client *c; for(c = clients; c; c = c->next) { @@ -96,59 +68,48 @@ dofloat(Arg *arg) { } void -dotile(Arg *arg) { - int h, i, n, w; +dotile(void) { + unsigned int i, n, mpw, th; Client *c; - w = sw - mw; for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next)) n++; + mpw = (waw * master) / 1000; - if(n > 1) - h = (sh - bh) / (n - 1); - else - h = sh - bh; - - 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; - if(n == 1) { - c->x = sx; - c->y = sy + bh; - c->w = sw - 2; - c->h = sh - 2 - bh; + c->x = wax; + c->y = way; + if(n == 1) { /* only 1 window */ + c->w = waw - 2 * BORDERPX; + c->h = wah - 2 * BORDERPX; } - 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 */ + c->w = mpw - 2 * BORDERPX; + c->h = wah - 2 * BORDERPX; + th = wah / (n - 1); } - 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 { /* fallback if h < bh */ - c->x = sx + mw; - c->y = sy + bh; - c->w = w - 2; - c->h = sh - 2 - bh; + else { /* tile window */ + c->x += mpw; + c->w = (waw - mpw) - 2 * BORDERPX; + if(th > bh) { + c->y += (i - 1) * th; + c->h = th - 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); @@ -162,7 +123,6 @@ focusnext(Arg *arg) { if(!sel) return; - if(!(c = getnext(sel->next))) c = getnext(clients); if(c) { @@ -177,7 +137,6 @@ focusprev(Arg *arg) { if(!sel) return; - if(!(c = getprev(sel->prev))) { for(c = clients; c && c->next; c = c->next); c = getprev(c); @@ -199,27 +158,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)) { - if(mw + arg->i > sw - 100 || mw + arg->i < 100) - return; - mw += arg->i; - } +resizemaster(Arg *arg) { + if(arg->i == 0) + master = MASTER; else { - if(mw - arg->i > sw - 100 || mw - arg->i < 100) + if(master + arg->i > 950 || master + arg->i < 50) return; - mw -= arg->i; + master += arg->i; } - arrange(NULL); + arrange(); } void @@ -235,21 +182,36 @@ restack(void) { 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)); } 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(); } @@ -262,8 +224,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 @@ -271,20 +232,10 @@ 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 @@ -294,18 +245,15 @@ 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)) return; - if((c = sel) == nexttiled(clients)) if(!(c = nexttiled(c->next))) return; @@ -315,5 +263,5 @@ zoom(Arg *arg) { c->next = clients; clients = c; focus(c); - arrange(NULL); + arrange(); }