-/*
- * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
+/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>
* See LICENSE file for license details.
*/
#include "dwm.h"
-#include <stdio.h>
-
-/* static */
-
-static Client *
-minclient()
-{
- Client *c, *min;
-
- for(min = c = clients; c; c = c->next)
- if(c->weight < min->weight)
- min = c;
- return min;
-}
-
-
-static void
-reorder()
-{
- Client *c, *newclients, *tail;
-
- newclients = tail = NULL;
- while((c = minclient())) {
- detach(c);
- if(tail) {
- c->prev = tail;
- tail->next = c;
- tail = c;
- }
- else
- tail = newclients = c;
- }
- clients = newclients;
-}
/* extern */
-void (*arrange)(Arg *) = DEFMODE;
+void (*arrange)(void) = DEFMODE;
void
-detach(Client *c)
-{
+detach(Client *c) {
if(c->prev)
c->prev->next = c->next;
if(c->next)
}
void
-dofloat(Arg *arg)
-{
+dofloat(void) {
Client *c;
- maximized = False;
-
for(c = clients; c; c = c->next) {
if(isvisible(c)) {
- resize(c, True, TopLeft);
+ if(c->isbanned)
+ XMoveWindow(dpy, c->win, c->x, c->y);
+ c->isbanned = False;
+ resize(c, c->x, c->y, c->w, c->h, True);
}
- else
- ban(c);
- }
- if(!sel || !isvisible(sel))
- focus(getnext(clients));
- restack();
-}
-
-void
-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++;
-
- if(n > 1)
- h = (sh - bh) / (n - 1);
- else
- h = sh - bh;
-
- 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;
- }
- else if(i == 0) {
- c->x = sx;
- c->y = sy + bh;
- c->w = mw - 2;
- c->h = sh - 2 - 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 { /* fallback if h < bh */
- c->x = sx + mw;
- c->y = sy + bh;
- c->w = w - 2;
- c->h = sh - 2 - bh;
- }
- resize(c, False, TopLeft);
- i++;
+ else {
+ c->isbanned = True;
+ XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
}
- 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)
return;
-
- if(!(c = getnext(sel->next)))
- c = getnext(clients);
+ for(c = sel->next; c && !isvisible(c); c = c->next);
+ if(!c)
+ for(c = clients; c && !isvisible(c); c = c->next);
if(c) {
focus(c);
restack();
}
void
-focusprev(Arg *arg)
-{
+focusprev(Arg *arg) {
Client *c;
if(!sel)
return;
-
- if(!(c = getprev(sel->prev))) {
+ for(c = sel->prev; c && !isvisible(c); c = c->prev);
+ if(!c) {
for(c = clients; c && c->next; c = c->next);
- c = getprev(c);
+ for(; c && !isvisible(c); c = c->prev);
}
if(c) {
focus(c);
}
Bool
-isvisible(Client *c)
-{
+isvisible(Client *c) {
unsigned int i;
for(i = 0; i < ntags; i++)
return False;
}
-void
-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)
- return;
-
- if(sel == getnext(clients)) {
- if(mw + arg->i > sw - 100 || mw + arg->i < 100)
- return;
- mw += arg->i;
- }
- else {
- if(mw - arg->i > sw - 100 || mw - arg->i < 100)
- return;
- mw -= arg->i;
- }
- arrange(NULL);
+Client *
+nextmanaged(Client *c) {
+ for(; c && (c->isfloat || !isvisible(c)); c = c->next);
+ return c;
}
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))) {
- drawstatus();
+ drawstatus();
+ if(!sel)
return;
- }
- if(nwins < n) {
- nwins = n;
- wins = erealloc(wins, nwins * sizeof(Window));
- }
-
- fi = 0;
- mi = 2 * f;
- if(sel) {
- if(sel->isfloat || arrange == dofloat) {
- wins[fi++] = sel->twin;
- wins[fi++] = sel->win;
- }
- else {
- wins[mi++] = sel->twin;
- wins[mi++] = sel->win;
+ if(sel->isfloat || arrange == dofloat)
+ XRaiseWindow(dpy, sel->win);
+ if(arrange != dofloat) {
+ if(!sel->isfloat)
+ XLowerWindow(dpy, sel->win);
+ for(c = nextmanaged(clients); c; c = nextmanaged(c->next)) {
+ if(c == sel)
+ continue;
+ 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)
-{
+togglefloat(Arg *arg) {
+ if(!sel || arrange == dofloat)
+ return;
+ sel->isfloat = !sel->isfloat;
+ arrange();
+}
+
+void
+togglemode(Arg *arg) {
arrange = (arrange == dofloat) ? dotile : dofloat;
if(sel)
- arrange(NULL);
+ arrange();
else
drawstatus();
}
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);
+ arrange();
}
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);
+ seltag[i] = (arg->i == -1) ? True : False;
+ if(arg->i >= 0 && arg->i < ntags)
+ seltag[arg->i] = True;
+ arrange();
}
-void
-viewall(Arg *arg)
-{
- unsigned int i;
-
- for(i = 0; i < ntags; i++)
- seltag[i] = True;
- reorder();
- arrange(NULL);
-}
-
-void
-zoom(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)
- return;
-
- /* this is somewhat tricky, it asserts to only zoom tiled clients */
- for(c = getnext(clients); c && c->isfloat; c = getnext(c->next));
- if(c) {
- if(c == sel)
- for(c = getnext(c->next); c && c->isfloat; c = getnext(c->next));
- else
- c = sel;
- }
- if(!c)
- return;
- detach(c);
- c->next = clients;
- clients->prev = c;
- clients = c;
- focus(c);
- arrange(NULL);
-}
Got questions, comments, patches, etc.? Contact Jason Woofenden