-/*
- * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
+/* (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
* See LICENSE file for license details.
*/
#include "dwm.h"
-/* extern */
+/* static */
-void (*arrange)(Arg *) = DEFMODE;
+static Client *
+minclient(void) {
+ Client *c, *min;
-void
-attach(Client *c)
-{
- Client *first = getnext(clients);
-
- if(!first) {
- if(clients) {
- for(first = clients; first->next; first = first->next);
- first->next = c;
- c->prev = first;
+ 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(void) {
+ Client *c, *newclients, *tail;
+
+ newclients = tail = NULL;
+ while((c = minclient())) {
+ detach(c);
+ if(tail) {
+ c->prev = tail;
+ tail->next = c;
+ tail = c;
}
else
- clients = c;
+ tail = newclients = c;
}
- else if(first == clients) {
- c->next = clients;
- clients->prev = c;
- clients = c;
+ 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 {
- first->prev->next = c;
- c->prev = first->prev;
- first->prev = c;
- c->next = first;
+ 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)
}
void
-dofloat(Arg *arg)
-{
+dofloat(Arg *arg) {
Client *c;
for(c = clients; c; c = c->next) {
- c->ismax = False;
if(isvisible(c)) {
resize(c, True, TopLeft);
}
else
ban(c);
}
- if(!sel || !isvisible(sel))
- sel = getnext(clients);
- if(sel)
- focus(sel);
- else
- XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+ 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;
- 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) {
- c->ismax = False;
+ 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))
- sel = getnext(clients);
- if(sel)
- focus(sel);
- else
- XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
restack();
}
void
-focusnext(Arg *arg)
-{
+focusnext(Arg *arg) {
Client *c;
if(!sel)
return;
-
if(!(c = getnext(sel->next)))
c = getnext(clients);
if(c) {
}
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);
}
Bool
-isvisible(Client *c)
-{
+isvisible(Client *c) {
unsigned int i;
for(i = 0; i < ntags; i++)
}
void
-restack()
-{
- static unsigned int nwins = 0;
- static Window *wins = NULL;
- unsigned int f, fi, m, mi, n;
+resizecol(Arg *arg) {
+ unsigned int n;
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))) {
- drawstatus();
+ for(n = 0, c = clients; c; c = c->next)
+ if(isvisible(c) && !c->isfloat)
+ n++;
+ if(!sel || sel->isfloat || n < 2 || (arrange == dofloat))
return;
+ if(sel == getnext(clients)) {
+ if(master + arg->i > 950 || master + arg->i < 50)
+ return;
+ master += arg->i;
}
- if(nwins < n) {
- nwins = n;
- wins = erealloc(wins, nwins * sizeof(Window));
+ else {
+ if(master - arg->i > 950 || master - arg->i < 50)
+ return;
+ master -= arg->i;
}
+ arrange(NULL);
+}
- fi = 0;
- mi = 2 * f;
- if(sel->isfloat || arrange == dofloat) {
- wins[fi++] = sel->twin;
- wins[fi++] = sel->win;
+void
+restack(void) {
+ Client *c;
+ XEvent ev;
+
+ if(!sel) {
+ drawstatus();
+ return;
}
- else {
- wins[mi++] = sel->twin;
- wins[mi++] = sel->win;
+ if(sel->isfloat || arrange == dofloat) {
+ XRaiseWindow(dpy, sel->win);
+ XRaiseWindow(dpy, sel->twin);
}
- 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;
- }
+ 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);
}
- 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);
}
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);
}
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);
}
void
-zoom(Arg *arg)
-{
- Client *c = sel;
+viewall(Arg *arg) {
+ unsigned int i;
- if(!c || (arrange != dotile) || c->isfloat || c->ismax)
- return;
+ for(i = 0; i < ntags; i++)
+ seltag[i] = True;
+ reorder();
+ arrange(NULL);
+}
+
+void
+zoom(Arg *arg) {
+ unsigned int n;
+ Client *c;
- if(c == getnext(clients))
- if(!(c = getnext(c->next)))
+ 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(n < 2 || (arrange == dofloat))
+ return;
+ if((c = sel) == nexttiled(clients))
+ if(!(c = nexttiled(c->next)))
return;
detach(c);
- attach(c);
+ if(clients)
+ clients->prev = c;
+ c->next = clients;
+ clients = c;
focus(c);
arrange(NULL);
}
Got questions, comments, patches, etc.? Contact Jason Woofenden