-/*
- * (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;
+nexttiled(Client *c) {
+ for(c = getnext(c); c && c->isfloat; c = getnext(c->next));
+ return c;
}
-
static void
-reorder()
-{
- Client *c, *newclients, *tail;
+togglemax(Client *c) {
+ XEvent ev;
+
+ if(c->isfixed)
+ return;
- newclients = tail = NULL;
- while((c = minclient())) {
- detach(c);
- if(tail) {
- c->prev = tail;
- tail->next = c;
- tail = c;
- }
- else
- tail = newclients = c;
+ if((c->ismax = !c->ismax)) {
+ c->rx = c->x; c->x = wax;
+ c->ry = c->y; c->y = way;
+ c->rw = c->w; c->w = waw - 2 * BORDERPX;
+ c->rh = c->h; c->h = wah - 2 * BORDERPX;
}
- clients = newclients;
-}
-
-static Client *
-nexttiled(Client *c)
-{
- for(c = getnext(c); c && c->isfloat; c = getnext(c->next));
- return c;
+ 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)
-{
+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);
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(void) {
+ unsigned int i, n, mpw, 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++;
+ mpw = (waw * master) / 1000;
- if(n > 1)
- h = (sh - bh) / (n - 1);
- else
- h = sh - bh;
-
- 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 = wax;
+ c->y = way;
+ if(n == 1) { /* only 1 window */
+ c->w = waw - 2 * BORDERPX;
+ c->h = wah - 2 * BORDERPX;
}
- 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 = mpw - 2 * BORDERPX;
+ c->h = wah - 2 * BORDERPX;
+ th = wah / (n - 1);
}
- 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 += mpw;
+ c->w = (waw - mpw) - 2 * BORDERPX;
+ if(th > bh) {
+ c->y += (i - 1) * th;
+ c->h = th - 2 * BORDERPX;
+ }
+ else /* fallback if th < bh */
+ c->h = wah - 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) {
}
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
-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;
- }
+resizemaster(Arg *arg) {
+ if(arg->i == 0)
+ master = MASTER;
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;
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));
}
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);
-}
-
-void
-view(Arg *arg)
-{
- unsigned int i;
-
- for(i = 0; i < ntags; i++)
- seltag[i] = False;
- seltag[arg->i] = True;
- reorder();
- arrange(NULL);
+ arrange();
}
void
-viewall(Arg *arg)
-{
+view(Arg *arg) {
unsigned int i;
for(i = 0; i < ntags; i++)
- seltag[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
-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))
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);
+ arrange();
}
Got questions, comments, patches, etc.? Contact Jason Woofenden