X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=view.c;h=72aa04e075d40253e6ad0384a988a6f1469e0c66;hb=5d9146ff372ae0c5196e290fb2c1f828d4137e20;hp=d37933a953043016b669922448a1359f9ce6171e;hpb=7c052b37c8578a8d759bc761afaf7b676781b537;p=dwm.git diff --git a/view.c b/view.c index d37933a..72aa04e 100644 --- a/view.c +++ b/view.c @@ -1,71 +1,11 @@ -/* - * (C)opyright MMVI Anselm R. Garbe +/* (C)opyright MMVI-MMVII Anselm R. Garbe * See LICENSE file for license details. */ #include "dwm.h" -/* 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) -{ - 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 (*arrange)(void) = DEFMODE; void detach(Client *c) { @@ -79,134 +19,20 @@ detach(Client *c) { } void -dofloat(Arg *arg) { +dofloat(void) { Client *c; for(c = clients; c; c = c->next) { if(isvisible(c)) { - resize(c, True, TopLeft); + if(c->isbanned) + XMoveWindow(dpy, c->win, c->x, c->y); + c->isbanned = False; + resize(c, c->x, c->y, c->w, c->h, True); } - else - ban(c); - } - if(!sel || !isvisible(sel)) { - for(c = stack; c && !isvisible(c); c = c->snext); - focus(c); - } - 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; - 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; - } - - tw = stackw; - if(n > 1) - th = stackh / (n - 1); - else - th = stackh; - - 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) { /* 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(th > bh) { - /* tile window */ - c->w = tw - 2 * BORDERPX; - c->h = th - 2 * BORDERPX; - switch(stackpos) { - case StackLeft: - c->x = sx; - c->y = sy + (i - 1) * th + bh; - if(i + 1 == n) - c->h = sh - c->y - 2 * BORDERPX; - break; - case StackBottom: - c->x = sx; - c->y = sy + master + (i - 1) * th + bh; - if(i + 1 == n) - c->h = sh - c->y - 2 * BORDERPX; - break; - case StackRight: - c->x = sx + master; - c->y = sy + (i - 1) * th + bh; - if(i + 1 == n) - c->h = sh - c->y - 2 * BORDERPX; - break; - } - } - else { /* fallback if th < bh */ - 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 + bh; - break; - case StackRight: - c->x = sx + master; - c->y = sy + bh; - break; - } - } - resize(c, False, TopLeft); - i++; + else { + c->isbanned = True; + XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y); } - else - ban(c); } if(!sel || !isvisible(sel)) { for(c = stack; c && !isvisible(c); c = c->snext); @@ -221,9 +47,9 @@ focusnext(Arg *arg) { if(!sel) return; - - if(!(c = getnext(sel->next))) - c = getnext(clients); + for(c = sel->next; c && !isvisible(c); c = c->next); + if(!c) + for(c = clients; c && !isvisible(c); c = c->next); if(c) { focus(c); restack(); @@ -236,10 +62,10 @@ focusprev(Arg *arg) { if(!sel) return; - - if(!(c = getprev(sel->prev))) { + for(c = sel->prev; c && !isvisible(c); c = c->prev); + if(!c) { for(c = clients; c && c->next; c = c->next); - c = getprev(c); + for(; c && !isvisible(c); c = c->prev); } if(c) { focus(c); @@ -257,30 +83,10 @@ isvisible(Client *c) { return False; } -void -resizecol(Arg *arg) { - int s; - 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; - - s = stackpos == StackBottom ? sh - bh : sw; - if(sel == getnext(clients)) { - if(master + arg->i > s - MINW || master + arg->i < MINW) - return; - master += arg->i; - } - else { - if(master - arg->i > s - MINW || master - arg->i < MINW) - return; - master -= arg->i; - } - arrange(NULL); +Client * +nextmanaged(Client *c) { + for(; c && (c->isfloat || !isvisible(c)); c = c->next); + return c; } void @@ -288,36 +94,37 @@ restack(void) { Client *c; XEvent ev; - if(!sel) { - drawstatus(); + drawstatus(); + if(!sel) return; - } - if(sel->isfloat || arrange == dofloat) { + if(sel->isfloat || arrange == dofloat) XRaiseWindow(dpy, sel->win); - XRaiseWindow(dpy, sel->twin); - } if(arrange != dofloat) { - if(!sel->isfloat) { - XLowerWindow(dpy, sel->twin); + if(!sel->isfloat) XLowerWindow(dpy, sel->win); - } - for(c = nexttiled(clients); c; c = nexttiled(c->next)) { + for(c = nextmanaged(clients); c; c = nextmanaged(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(); } @@ -330,20 +137,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); -} - -void -togglestackpos(Arg *arg) { - if(arrange == dofloat) - return; - if(stackpos == StackBottom) - stackpos = STACKPOS; - else - stackpos = StackBottom; - master = ((stackpos == StackBottom ? sh - bh : sw) * MASTER) / 100; - arrange(NULL); + arrange(); } void @@ -351,51 +145,9 @@ view(Arg *arg) { unsigned int i; for(i = 0; i < ntags; i++) - seltag[i] = False; - seltag[arg->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 -viewall(Arg *arg) { - unsigned int i; - - for(i = 0; i < ntags; i++) - seltag[i] = True; - reorder(); - 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(n < 2 || (arrange == dofloat)) - return; - - if((c = sel) == nexttiled(clients)) - if(!(c = nexttiled(c->next))) - return; - detach(c); - if(clients) - clients->prev = c; - c->next = clients; - clients = c; - focus(c); - arrange(NULL); -}