X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=view.c;h=ac201e60e13ba39ceafba9fa52cd68cd860f9793;hb=aaad7bfd15a023ab693bb17e2974b57cae7e7e21;hp=4c656f31d31c6df7abfa6b001fb325b739e8232b;hpb=4633fbec616d2f130dfd5d8677e103cf47d26c15;p=dwm.git diff --git a/view.c b/view.c index 4c656f3..ac201e6 100644 --- a/view.c +++ b/view.c @@ -38,6 +38,13 @@ reorder() clients = newclients; } +static Client * +nexttiled(Client *c) +{ + for(c = getnext(c->next); c && c->isfloat; c = getnext(c->next)); + return c; +} + /* extern */ void (*arrange)(Arg *) = DEFMODE; @@ -169,37 +176,42 @@ focusprev(Arg *arg) } } +Bool +isvisible(Client *c) +{ + unsigned int i; + + for(i = 0; i < ntags; i++) + if(c->tags[i] && seltag[i]) + return True; + return False; +} + void -growcol(Arg *arg) +resizecol(Arg *arg) { - Client *c = getnext(clients); + unsigned int n; + Client *c; - if(!sel || !getnext(c->next) || (arrange != dotile)) + 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) + if(mw + arg->i > sw - 100 || mw + arg->i < 100) return; mw += arg->i; } else { - if(mw - arg->i < 100) + if(mw - arg->i > sw - 100 || mw - arg->i < 100) return; mw -= arg->i; } arrange(NULL); } -Bool -isvisible(Client *c) -{ - unsigned int i; - - for(i = 0; i < ntags; i++) - if(c->tags[i] && seltag[i]) - return True; - return False; -} - void restack() { @@ -303,13 +315,17 @@ viewall(Arg *arg) void zoom(Arg *arg) { - Client *c = sel; + unsigned int n; + Client *c; - if(!c || (arrange != dotile) || c->isfloat || maximized) + 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 == getnext(clients)) - if(!(c = getnext(c->next))) + if((c = sel) == nexttiled(clients)) + if(!(c = nexttiled(c))) return; detach(c); c->next = clients;