X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=view.c;h=4f42abe4bf06894ab436f6dd5c6ff4e38b8c63c2;hb=2cce4b95cdce5617318fc4fb5d21abe41110c27a;hp=09100779a83f6c7661e069b6f56aa4044024d92f;hpb=ad0da9a571ecbdfa8fe0a397185b314f5654f094;p=dwm.git diff --git a/view.c b/view.c index 0910077..4f42abe 100644 --- a/view.c +++ b/view.c @@ -1,5 +1,4 @@ -/* - * (C)opyright MMVI Anselm R. Garbe +/* (C)opyright MMVI Anselm R. Garbe * See LICENSE file for license details. */ #include "dwm.h" @@ -43,9 +42,12 @@ reorder(void) { } 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; @@ -64,9 +66,7 @@ togglemax(Client *c) /* extern */ -void (*arrange)(Arg *) = DEFMODE; -Bool isvertical = VERTICALSTACK; -StackPos stackpos = STACKPOS; +void (*arrange)(void) = DEFMODE; void detach(Client *c) { @@ -80,7 +80,7 @@ detach(Client *c) { } void -dofloat(Arg *arg) { +dofloat(void) { Client *c; for(c = clients; c; c = c->next) { @@ -97,151 +97,56 @@ 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 i, n, stackw, stackh, tw, th; +dotile(void) { + unsigned int i, n, mpx, stackw, stackh, th; Client *c; for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next)) n++; - - 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) { + mpx = (sw * master) / 1000; + stackw = sw - mpx; + stackh = sh - bh; + th = stackh; + if(n > 1) + th /= (n - 1); + + 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->x = sx; - c->y = sy + bh; c->w = sw - 2 * BORDERPX; c->h = sh - 2 * BORDERPX - 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((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 = sw - c->x - 2 * BORDERPX; - } - break; - } + c->w = mpx - 2 * BORDERPX; + c->h = sh - bh - 2 * BORDERPX; } - else { /* fallback if th < bh resp. tw < MINW */ + else { /* tile window */ + c->x += mpx; 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; + if(th > bh) { + c->y = sy + (i - 1) * th + bh; + if(i + 1 == n) + c->h = sh - c->y - 2 * BORDERPX; + else + c->h = th - 2 * BORDERPX; } + else /* fallback if th < bh */ + c->h = stackh - 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); @@ -255,7 +160,6 @@ focusnext(Arg *arg) { if(!sel) return; - if(!(c = getnext(sel->next))) c = getnext(clients); if(c) { @@ -270,7 +174,6 @@ focusprev(Arg *arg) { if(!sel) return; - if(!(c = getprev(sel->prev))) { for(c = clients; c && c->next; c = c->next); c = getprev(c); @@ -293,26 +196,10 @@ 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)) + if(master + arg->i > 950 || master + arg->i < 50) return; - - if(sel == getnext(clients)) { - if(master + arg->i > sw - MINW || master + arg->i < MINW) - return; - master += arg->i; - } - else { - if(master - arg->i > sw - MINW || master - arg->i < MINW) - return; - master -= arg->i; - } - arrange(NULL); + master += arg->i; + arrange(); } void @@ -328,11 +215,18 @@ 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)); @@ -342,7 +236,7 @@ void togglemode(Arg *arg) { arrange = (arrange == dofloat) ? dotile : dofloat; if(sel) - arrange(NULL); + arrange(); else drawstatus(); } @@ -356,32 +250,7 @@ toggleview(Arg *arg) { if(i == ntags) seltag[arg->i] = True; /* cannot toggle last view */ reorder(); - arrange(NULL); -} - -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; + arrange(); } void @@ -392,7 +261,7 @@ view(Arg *arg) { seltag[i] = False; seltag[arg->i] = True; reorder(); - arrange(NULL); + arrange(); } void @@ -402,11 +271,9 @@ viewall(Arg *arg) { for(i = 0; i < ntags; i++) seltag[i] = True; reorder(); - arrange(NULL); + arrange(); } - - void zoom(Arg *arg) { unsigned int n; @@ -414,18 +281,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; @@ -435,5 +299,5 @@ zoom(Arg *arg) { c->next = clients; clients = c; focus(c); - arrange(NULL); + arrange(); }