X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=view.c;h=72aa04e075d40253e6ad0384a988a6f1469e0c66;hb=5cc27f1b3c61df4f048cdac9e0feb31a2dd80c63;hp=eddf2dadc0baf79da8afe0ff46a244efc3fbebe5;hpb=a33150eb4b041b243d0493cd4b53bfbcace3299e;p=dwm.git diff --git a/view.c b/view.c index eddf2da..72aa04e 100644 --- a/view.c +++ b/view.c @@ -1,66 +1,14 @@ -/* - * (C)opyright MMVI Anselm R. Garbe +/* (C)opyright MMVI-MMVII Anselm R. Garbe * See LICENSE file for license details. */ #include "dwm.h" -#include - -/* static */ - -static Client * -minclient() -{ - Client *c, *min; - - for(min = c = clients; c; c = c->next) - if(c->weight < min->weight) - min = c; - return min; -} - -static void -pop(Client *c) -{ - detach(c); - if(clients) - clients->prev = c; - c->next = clients; - clients = c; -} - -static void -reorder() -{ - 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 Client * -nexttiled(Client *c) -{ - for(c = getnext(c); c && c->isfloat; c = getnext(c->next)); - return c; -} /* extern */ -void (*arrange)(Arg *) = DEFMODE; +void (*arrange)(void) = DEFMODE; void -detach(Client *c) -{ +detach(Client *c) { if(c->prev) c->prev->next = c->next; if(c->next) @@ -71,96 +19,37 @@ detach(Client *c) } void -dofloat(Arg *arg) -{ +dofloat(void) { Client *c; - maximized = False; - 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)) - focus(getnext(clients)); - restack(); -} - -void -dotile(Arg *arg) -{ - int h, i, n, w; - Client *c; - - maximized = False; - - w = sw - mw; - for(n = 0, c = clients; c; c = c->next) - if(isvisible(c) && !c->isfloat) - n++; - - if(n > 1) - h = (sh - bh) / (n - 1); - else - h = sh - bh; - - for(i = 0, c = clients; c; c = c->next) { - if(isvisible(c)) { - if(c->isfloat) { - resize(c, True, TopLeft); - continue; - } - if(n == 1) { - c->x = sx; - c->y = sy + bh; - c->w = sw - 2; - c->h = sh - 2 - bh; - } - else if(i == 0) { - c->x = sx; - c->y = sy + bh; - c->w = mw - 2; - c->h = sh - 2 - bh; - } - 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; - } - 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)) - focus(getnext(clients)); + if(!sel || !isvisible(sel)) { + for(c = stack; c && !isvisible(c); c = c->snext); + focus(c); + } restack(); } void -focusnext(Arg *arg) -{ +focusnext(Arg *arg) { Client *c; 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(); @@ -168,16 +57,15 @@ focusnext(Arg *arg) } void -focusprev(Arg *arg) -{ +focusprev(Arg *arg) { Client *c; 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); @@ -186,8 +74,7 @@ focusprev(Arg *arg) } Bool -isvisible(Client *c) -{ +isvisible(Client *c) { unsigned int i; for(i = 0; i < ntags; i++) @@ -196,118 +83,71 @@ isvisible(Client *c) return False; } -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 != dotile) || maximized) - return; - - if(sel == getnext(clients)) { - if(mw + arg->i > sw - 100 || mw + arg->i < 100) - return; - mw += arg->i; - } - else { - if(mw - arg->i > sw - 100 || mw - arg->i < 100) - return; - mw -= arg->i; - } - arrange(NULL); +Client * +nextmanaged(Client *c) { + for(; c && (c->isfloat || !isvisible(c)); c = c->next); + return c; } void -restack() -{ +restack(void) { Client *c; XEvent ev; - - if(!sel) { - drawstatus(); + + drawstatus(); + if(!sel) return; - } - if(sel->isfloat || arrange == dofloat) { - pop(sel); + if(sel->isfloat || arrange == dofloat) XRaiseWindow(dpy, sel->win); - XRaiseWindow(dpy, sel->twin); - } - if(arrange != dofloat) - for(c = nexttiled(clients); c; c = nexttiled(c->next)) { - XLowerWindow(dpy, c->twin); + if(arrange != dofloat) { + if(!sel->isfloat) + XLowerWindow(dpy, sel->win); + for(c = nextmanaged(clients); c; c = nextmanaged(c->next)) { + if(c == sel) + continue; XLowerWindow(dpy, c->win); } - drawall(); + } XSync(dpy, False); while(XCheckMaskEvent(dpy, EnterWindowMask, &ev)); } void -togglemode(Arg *arg) -{ +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(); } void -toggleview(Arg *arg) -{ +toggleview(Arg *arg) { unsigned int i; seltag[arg->i] = !seltag[arg->i]; for(i = 0; i < ntags && !seltag[i]; i++); if(i == ntags) seltag[arg->i] = True; /* cannot toggle last view */ - reorder(); - arrange(NULL); + arrange(); } void -view(Arg *arg) -{ +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; - - for(n = 0, c = clients; c; c = c->next) - if(isvisible(c) && !c->isfloat) - n++; - if(!sel || sel->isfloat || n < 2 || (arrange != dotile) || maximized) - return; - - if((c = sel) == nexttiled(clients)) - if(!(c = nexttiled(c->next))) - return; - pop(c); - focus(c); - arrange(NULL); -}