X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=blobdiff_plain;f=view.c;h=24b034945440ec1cd3068d4833dd439c91c79ee6;hp=c005a3343e1e3a4f2704f2261ff5ed40e348ea52;hb=6651dd7fd9e8e95cfc6c472f1adfeff41735d798;hpb=a82e7b765e8da9fedb8fae6b102796f0494a4f5e diff --git a/view.c b/view.c index c005a33..24b0349 100644 --- a/view.c +++ b/view.c @@ -1,27 +1,30 @@ -/* - * (C)opyright MMVI Anselm R. Garbe +/* (C)opyright MMVI Anselm R. Garbe * 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) + 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() -{ +reorder(void) { Client *c, *newclients, *tail; newclients = tail = NULL; @@ -38,13 +41,32 @@ reorder() 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; void -detach(Client *c) -{ +detach(Client *c) { if(c->prev) c->prev->next = c->next; if(c->next) @@ -55,12 +77,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); @@ -68,81 +87,75 @@ 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(); } void -dotile(Arg *arg) -{ - int h, i, n, w; +dotile(Arg *arg) { + 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, i++) 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; + 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(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 if(i == 0) { /* master window */ + c->w = mpx - 2 * BORDERPX; + c->h = sh - bh - 2 * BORDERPX; } - 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); } - if(!sel || !isvisible(sel)) - focus(getnext(clients)); restack(); } void -focusnext(Arg *arg) -{ +focusnext(Arg *arg) { Client *c; if(!sel) return; - if(!(c = getnext(sel->next))) c = getnext(clients); if(c) { @@ -152,13 +165,11 @@ focusnext(Arg *arg) } void -focusprev(Arg *arg) -{ +focusprev(Arg *arg) { Client *c; if(!sel) return; - if(!(c = getprev(sel->prev))) { for(c = clients; c && c->next; c = c->next); c = getprev(c); @@ -170,8 +181,7 @@ focusprev(Arg *arg) } Bool -isvisible(Client *c) -{ +isvisible(Client *c) { unsigned int i; for(i = 0; i < ntags; i++) @@ -181,87 +191,60 @@ 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)) { - 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); } void -restack() -{ - static unsigned int nwins = 0; - static Window *wins = NULL; - unsigned int f, fi, m, mi, n; +restack(void) { Client *c; XEvent ev; - for(f = 0, m = 0, c = clients; c; c = c->next) - if(isvisible(c)) { - if(c->isfloat || arrange == dofloat) - f++; - else - m++; - } - if(!(n = 2 * (f + m))) { + if(!sel) { drawstatus(); return; } - if(nwins < n) { - nwins = n; - wins = erealloc(wins, nwins * sizeof(Window)); + if(sel->isfloat || arrange == dofloat) { + XRaiseWindow(dpy, sel->win); + XRaiseWindow(dpy, sel->twin); } - - fi = 0; - mi = 2 * f; - if(sel) { - if(sel->isfloat || arrange == dofloat) { - wins[fi++] = sel->twin; - wins[fi++] = sel->win; + if(arrange != dofloat) { + if(!sel->isfloat) { + XLowerWindow(dpy, sel->twin); + XLowerWindow(dpy, sel->win); } - else { - wins[mi++] = sel->twin; - wins[mi++] = sel->win; + for(c = nexttiled(clients); c; c = nexttiled(c->next)) { + if(c == sel) + continue; + XLowerWindow(dpy, c->twin); + XLowerWindow(dpy, c->win); } } - for(c = clients; c; c = c->next) - if(isvisible(c) && c != sel) { - if(c->isfloat || arrange == dofloat) { - wins[fi++] = c->twin; - wins[fi++] = c->win; - } - else { - wins[mi++] = c->twin; - wins[mi++] = c->win; - } - } - XRestackWindows(dpy, wins, n); drawall(); XSync(dpy, False); while(XCheckMaskEvent(dpy, EnterWindowMask, &ev)); } void -togglemode(Arg *arg) -{ +togglemode(Arg *arg) { arrange = (arrange == dofloat) ? dotile : dofloat; if(sel) arrange(NULL); @@ -270,8 +253,7 @@ togglemode(Arg *arg) } void -toggleview(Arg *arg) -{ +toggleview(Arg *arg) { unsigned int i; seltag[arg->i] = !seltag[arg->i]; @@ -283,8 +265,7 @@ toggleview(Arg *arg) } void -view(Arg *arg) -{ +view(Arg *arg) { unsigned int i; for(i = 0; i < ntags; i++) @@ -295,8 +276,7 @@ view(Arg *arg) } void -viewall(Arg *arg) -{ +viewall(Arg *arg) { unsigned int i; for(i = 0; i < ntags; i++) @@ -306,23 +286,28 @@ 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) == getnext(clients)) - if(!(c = getnext(c->next))) + if((c = sel) == nexttiled(clients)) + if(!(c = nexttiled(c->next))) return; detach(c); + if(clients) + clients->prev = c; c->next = clients; - clients->prev = c; clients = c; focus(c); arrange(NULL);