X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=view.c;h=d3378ffdb4c884b0e79edfffc9e68399fe041ef4;hb=a118a57fe3fd13036f24ebe093a5c329608a0600;hp=9ee4c7898e0b9702588262b3ab665215122caa9c;hpb=d22abeee867397c366f69cf89524b94e01c2e0e2;p=dwm.git diff --git a/view.c b/view.c index 9ee4c78..d3378ff 100644 --- a/view.c +++ b/view.c @@ -3,13 +3,11 @@ * See LICENSE file for license details. */ #include "dwm.h" -#include /* static */ static Client * -minclient() -{ +minclient(void) { Client *c, *min; if((clients && clients->isfloat) || arrange == dofloat) @@ -20,9 +18,14 @@ minclient() return min; } +static Client * +nexttiled(Client *c) { + for(c = getnext(c); c && c->isfloat; c = getnext(c->next)); + return c; +} + static void -reorder() -{ +reorder(void) { Client *c, *newclients, *tail; newclients = tail = NULL; @@ -39,11 +42,24 @@ reorder() clients = newclients; } -static Client * -nexttiled(Client *c) +static void +togglemax(Client *c) { - for(c = getnext(c); c && c->isfloat; c = getnext(c->next)); - return 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 */ @@ -51,8 +67,7 @@ nexttiled(Client *c) void (*arrange)(Arg *) = DEFMODE; void -detach(Client *c) -{ +detach(Client *c) { if(c->prev) c->prev->next = c->next; if(c->next) @@ -63,12 +78,9 @@ detach(Client *c) } void -dofloat(Arg *arg) -{ +dofloat(Arg *arg) { Client *c; - maximized = False; - for(c = clients; c; c = c->next) { if(isvisible(c)) { resize(c, True, TopLeft); @@ -76,23 +88,39 @@ dofloat(Arg *arg) 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(); } +/* This algorithm is based on a (M)aster area and a (S)tacking area. + * It supports following arrangements: + * + * MMMS MMMM + * MMMS MMMM + * MMMS SSSS + * + * The stacking area can be set to arrange clients vertically or horizontally. + * Through inverting the algorithm it can be used to achieve following setup in + * a dual head environment (due to running two dwm instances concurrently on + * the specific screen): + * + * SMM MMS MMM MMM + * SMM MMS MMM MMM + * SMM MMS SSS SSS + * + * This uses the center of the two screens for master areas. + */ void -dotile(Arg *arg) -{ +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++; + for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next)) + n++; if(n > 1) h = (sh - bh) / (n - 1); @@ -105,32 +133,33 @@ dotile(Arg *arg) 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->w = sw - 2 * BORDERPX; + c->h = sh - 2 * BORDERPX - bh; } else if(i == 0) { c->x = sx; c->y = sy + bh; - c->w = mw - 2; - c->h = sh - 2 - bh; + c->w = mw - 2 * BORDERPX; + c->h = sh - 2 * BORDERPX - bh; } else if(h > bh) { c->x = sx + mw; c->y = sy + (i - 1) * h + bh; - c->w = w - 2; + c->w = w - 2 * BORDERPX; if(i + 1 == n) - c->h = sh - c->y - 2; + c->h = sh - c->y - 2 * BORDERPX; else - c->h = h - 2; + c->h = h - 2 * BORDERPX; } else { /* fallback if h < bh */ c->x = sx + mw; c->y = sy + bh; - c->w = w - 2; - c->h = sh - 2 - bh; + c->w = w - 2 * BORDERPX; + c->h = sh - 2 * BORDERPX - bh; } resize(c, False, TopLeft); i++; @@ -138,14 +167,15 @@ dotile(Arg *arg) 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) @@ -160,8 +190,7 @@ focusnext(Arg *arg) } void -focusprev(Arg *arg) -{ +focusprev(Arg *arg) { Client *c; if(!sel) @@ -178,8 +207,7 @@ focusprev(Arg *arg) } Bool -isvisible(Client *c) -{ +isvisible(Client *c) { unsigned int i; for(i = 0; i < ntags; i++) @@ -189,15 +217,14 @@ isvisible(Client *c) } void -resizecol(Arg *arg) -{ +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) + if(!sel || sel->isfloat || n < 2 || (arrange == dofloat)) return; if(sel == getnext(clients)) { @@ -214,11 +241,10 @@ resizecol(Arg *arg) } void -restack() -{ +restack(void) { Client *c; XEvent ev; - + if(!sel) { drawstatus(); return; @@ -227,7 +253,7 @@ restack() XRaiseWindow(dpy, sel->win); XRaiseWindow(dpy, sel->twin); } - if(arrange != dofloat) + if(arrange != dofloat) for(c = nexttiled(clients); c; c = nexttiled(c->next)) { XLowerWindow(dpy, c->twin); XLowerWindow(dpy, c->win); @@ -238,8 +264,7 @@ restack() } void -togglemode(Arg *arg) -{ +togglemode(Arg *arg) { arrange = (arrange == dofloat) ? dotile : dofloat; if(sel) arrange(NULL); @@ -248,8 +273,7 @@ togglemode(Arg *arg) } void -toggleview(Arg *arg) -{ +toggleview(Arg *arg) { unsigned int i; seltag[arg->i] = !seltag[arg->i]; @@ -261,8 +285,7 @@ toggleview(Arg *arg) } void -view(Arg *arg) -{ +view(Arg *arg) { unsigned int i; for(i = 0; i < ntags; i++) @@ -273,8 +296,7 @@ view(Arg *arg) } void -viewall(Arg *arg) -{ +viewall(Arg *arg) { unsigned int i; for(i = 0; i < ntags; i++) @@ -284,15 +306,22 @@ viewall(Arg *arg) } void -zoom(Arg *arg) -{ +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(!sel || sel->isfloat || n < 2 || (arrange != dotile) || maximized) + if(n < 2 || (arrange == dofloat)) return; if((c = sel) == nexttiled(clients))