X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/ca68975ff8fc1c7166c8d1f811e3dd52c735d19f..b76561a21258f69f7be946dc6a722843a4a42fab:/view.c?ds=inline diff --git a/view.c b/view.c index 80d483a..85bfabf 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" @@ -7,7 +6,7 @@ /* static */ static Client * -minclient() { +minclient(void) { Client *c, *min; if((clients && clients->isfloat) || arrange == dofloat) @@ -18,8 +17,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; @@ -36,15 +41,32 @@ reorder() { clients = newclients; } -static Client * -nexttiled(Client *c) { - for(c = getnext(c); c && c->isfloat; c = getnext(c->next)); - return c; +static void +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; + 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; +void (*arrange)(void) = DEFMODE; void detach(Client *c) { @@ -58,11 +80,9 @@ 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); @@ -78,61 +98,55 @@ dofloat(Arg *arg) { } void -dotile(Arg *arg) { - int h, i, n, w; +dotile(void) { + unsigned int i, n, mpx, stackw, stackh, th; 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++; + mpx = (sw * master) / 1000; + stackw = sw - mpx; + stackh = sh - bh; + th = stackh; if(n > 1) - h = (sh - bh) / (n - 1); - else - h = sh - bh; + th /= (n - 1); - for(i = 0, c = clients; c; c = c->next) { + 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; + c->ismax = False; + c->x = sx; + c->y = sy + bh; + if(n == 1) { /* only 1 window */ + 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; + else if(i == 0) { /* master window */ + c->w = mpx - 2 * BORDERPX; + c->h = sh - bh - 2 * BORDERPX; } - 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; + else { /* tile window */ + c->x += mpx; + c->w = stackw - 2 * BORDERPX; + 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); @@ -146,7 +160,6 @@ focusnext(Arg *arg) { if(!sel) return; - if(!(c = getnext(sel->next))) c = getnext(clients); if(c) { @@ -161,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); @@ -190,27 +202,26 @@ resizecol(Arg *arg) { 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)) { - if(mw + arg->i > sw - 100 || mw + arg->i < 100) + if(master + arg->i > 950 || master + arg->i < 50) return; - mw += arg->i; + master += arg->i; } else { - if(mw - arg->i > sw - 100 || mw - arg->i < 100) + if(master - arg->i > 950 || master - arg->i < 50) return; - mw -= arg->i; + master -= arg->i; } - arrange(NULL); + arrange(); } void -restack() { +restack(void) { Client *c; XEvent ev; - + if(!sel) { drawstatus(); return; @@ -219,11 +230,18 @@ restack() { 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)); @@ -233,7 +251,7 @@ void togglemode(Arg *arg) { arrange = (arrange == dofloat) ? dotile : dofloat; if(sel) - arrange(NULL); + arrange(); else drawstatus(); } @@ -247,7 +265,7 @@ toggleview(Arg *arg) { if(i == ntags) seltag[arg->i] = True; /* cannot toggle last view */ reorder(); - arrange(NULL); + arrange(); } void @@ -258,7 +276,7 @@ view(Arg *arg) { seltag[i] = False; seltag[arg->i] = True; reorder(); - arrange(NULL); + arrange(); } void @@ -268,7 +286,7 @@ viewall(Arg *arg) { for(i = 0; i < ntags; i++) seltag[i] = True; reorder(); - arrange(NULL); + arrange(); } void @@ -276,12 +294,17 @@ 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)) if(!(c = nexttiled(c->next))) return; @@ -291,5 +314,5 @@ zoom(Arg *arg) { c->next = clients; clients = c; focus(c); - arrange(NULL); + arrange(); }