X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=dwm.c;h=352e9dbaab802f203711e6bcb3344ad859374f19;hb=0fe2e783e9e6b097bc6529dc286b4b697f7e1fde;hp=66a2cb4712f6cc344c4c68551601dacc5c06a7c6;hpb=39d1ecd5b0b22dbd61ba5206c9f08a187f911b2a;p=dwm.git

diff --git a/dwm.c b/dwm.c
index 66a2cb4..352e9db 100644
--- a/dwm.c
+++ b/dwm.c
@@ -52,6 +52,7 @@
 #define MAXTAGLEN       16
 #define MOUSEMASK       (BUTTONMASK|PointerMotionMask)
 #define TAGMASK         ((int)((1LL << LENGTH(tags)) - 1))
+#define VISIBLE(x)      ((x)->tags & tagset[seltags])
 
 /* enums */
 enum { CurNormal, CurResize, CurMove, CurLast };        /* cursor */
@@ -60,6 +61,8 @@ enum { NetSupported, NetWMName, NetLast };              /* EWMH atoms */
 enum { WMProtocols, WMDelete, WMName, WMState, WMLast };/* default atoms */
 
 /* typedefs */
+typedef unsigned int uint;
+typedef unsigned long ulong;
 typedef struct Client Client;
 struct Client {
 	char name[256];
@@ -67,9 +70,9 @@ struct Client {
 	int basew, baseh, incw, inch, maxw, maxh, minw, minh;
 	int minax, maxax, minay, maxay;
 	long flags;
-	unsigned int bw, oldbw;
-	Bool isbanned, isfixed, isfloating, isurgent;
-	unsigned int tags;
+	int bw, oldbw;
+	Bool isbanned, isfixed, isfloating, ismax, isurgent;
+	uint tags;
 	Client *next;
 	Client *prev;
 	Client *snext;
@@ -78,8 +81,8 @@ struct Client {
 
 typedef struct {
 	int x, y, w, h;
-	unsigned long norm[ColLast];
-	unsigned long sel[ColLast];
+	ulong norm[ColLast];
+	ulong sel[ColLast];
 	Drawable drawable;
 	GC gc;
 	struct {
@@ -92,10 +95,10 @@ typedef struct {
 } DC; /* draw context */
 
 typedef struct {
-	unsigned long mod;
+	uint mod;
 	KeySym keysym;
-	void (*func)(void *arg);
-	void *arg;
+	void (*func)(const void *arg);
+	const void *arg;
 } Key;
 
 typedef struct {
@@ -108,7 +111,7 @@ typedef struct {
 	const char *class;
 	const char *instance;
 	const char *title;
-	unsigned int tags;
+	uint tags;
 	Bool isfloating;
 } Rule;
 
@@ -117,7 +120,6 @@ void applyrules(Client *c);
 void arrange(void);
 void attach(Client *c);
 void attachstack(Client *c);
-void ban(Client *c);
 void buttonpress(XEvent *e);
 void checkotherwm(void);
 void cleanup(void);
@@ -128,56 +130,54 @@ void destroynotify(XEvent *e);
 void detach(Client *c);
 void detachstack(Client *c);
 void drawbar(void);
-void drawsquare(Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]);
-void drawtext(const char *text, unsigned long col[ColLast], Bool invert);
-void *emallocz(unsigned int size);
+void drawsquare(Bool filled, Bool empty, Bool invert, ulong col[ColLast]);
+void drawtext(const char *text, ulong col[ColLast], Bool invert);
 void enternotify(XEvent *e);
 void eprint(const char *errstr, ...);
 void expose(XEvent *e);
 void focus(Client *c);
 void focusin(XEvent *e);
-void focusnext(void *arg);
-void focusprev(void *arg);
+void focusnext(const void *arg);
+void focusprev(const void *arg);
 Client *getclient(Window w);
-unsigned long getcolor(const char *colstr);
+ulong getcolor(const char *colstr);
 long getstate(Window w);
-Bool gettextprop(Window w, Atom atom, char *text, unsigned int size);
+Bool gettextprop(Window w, Atom atom, char *text, uint size);
 void grabbuttons(Client *c, Bool focused);
 void grabkeys(void);
 void initfont(const char *fontstr);
-Bool isoccupied(unsigned int t);
+Bool isoccupied(uint t);
 Bool isprotodel(Client *c);
-Bool isurgent(unsigned int t);
-Bool isvisible(Client *c);
+Bool isurgent(uint t);
 void keypress(XEvent *e);
-void killclient(void *arg);
+void killclient(const void *arg);
 void manage(Window w, XWindowAttributes *wa);
 void mappingnotify(XEvent *e);
 void maprequest(XEvent *e);
 void movemouse(Client *c);
-Client *nextunfloating(Client *c);
+Client *nexttiled(Client *c);
 void propertynotify(XEvent *e);
-void quit(void *arg);
+void quit(const void *arg);
 void resize(Client *c, int x, int y, int w, int h, Bool sizehints);
 void resizemouse(Client *c);
 void restack(void);
 void run(void);
 void scan(void);
 void setclientstate(Client *c, long state);
-void setmfact(void *arg);
+void setmfact(const void *arg);
 void setup(void);
-void spawn(void *arg);
-void tag(void *arg);
-unsigned int textnw(const char *text, unsigned int len);
-unsigned int textw(const char *text);
+void spawn(const void *arg);
+void tag(const void *arg);
+uint textnw(const char *text, uint len);
+uint textw(const char *text);
 void tile(void);
 void tileresize(Client *c, int x, int y, int w, int h);
-void togglebar(void *arg);
-void togglefloating(void *arg);
-void togglelayout(void *arg);
-void toggletag(void *arg);
-void toggleview(void *arg);
-void unban(Client *c);
+void togglebar(const void *arg);
+void togglefloating(const void *arg);
+void togglelayout(const void *arg);
+void togglemax(const void *arg);
+void toggletag(const void *arg);
+void toggleview(const void *arg);
 void unmanage(Client *c);
 void unmapnotify(XEvent *e);
 void updatebar(void);
@@ -186,21 +186,21 @@ void updatesizehints(Client *c);
 void updatetilegeom(void);
 void updatetitle(Client *c);
 void updatewmhints(Client *c);
-void view(void *arg);
-void viewprevtag(void *arg);
+void view(const void *arg);
+void viewprevtag(const void *arg);
 int xerror(Display *dpy, XErrorEvent *ee);
 int xerrordummy(Display *dpy, XErrorEvent *ee);
 int xerrorstart(Display *dpy, XErrorEvent *ee);
-void zoom(void *arg);
+void zoom(const void *arg);
 
 /* variables */
 char stext[256];
 int screen, sx, sy, sw, sh;
 int bx, by, bw, bh, blw, wx, wy, ww, wh;
 int mx, my, mw, mh, tx, ty, tw, th;
-unsigned int seltags = 0;
+uint seltags = 0;
 int (*xerrorxlib)(Display *, XErrorEvent *);
-unsigned int numlockmask = 0;
+uint numlockmask = 0;
 void (*handler[LASTEvent]) (XEvent *) = {
 	[ButtonPress] = buttonpress,
 	[ConfigureRequest] = configurerequest,
@@ -216,9 +216,10 @@ void (*handler[LASTEvent]) (XEvent *) = {
 	[UnmapNotify] = unmapnotify
 };
 Atom wmatom[WMLast], netatom[NetLast];
+Bool domax = False;
 Bool otherwm, readin;
 Bool running = True;
-unsigned int tagset[] = {1, 1}; /* after start, first tag is selected */
+uint tagset[] = {1, 1}; /* after start, first tag is selected */
 Client *clients = NULL;
 Client *sel = NULL;
 Client *stack = NULL;
@@ -232,14 +233,13 @@ Window root, barwin;
 /* configuration, allows nested code to access above variables */
 #include "config.h"
 
-/* check if all tags will fit into a unsigned int bitarray. */
-static char tags_is_a_sign_that_your_IQ[sizeof(int) * 8 < LENGTH(tags) ? -1 : 1];
+/* compile-time check if all tags fit into an uint bit array. */
+struct NumTags { char limitexceeded[sizeof(uint) * 8 < LENGTH(tags) ? -1 : 1]; };
 
 /* function implementations */
-
 void
 applyrules(Client *c) {
-	unsigned int i;
+	uint i;
 	Rule *r;
 	XClassHint ch = { 0 };
 
@@ -267,16 +267,17 @@ arrange(void) {
 	Client *c;
 
 	for(c = clients; c; c = c->next)
-		if(isvisible(c)) {
-			unban(c);
+		if(VISIBLE(c)) {
 			if(!lt->arrange || c->isfloating)
 				resize(c, c->x, c->y, c->w, c->h, True);
 		}
-		else
-			ban(c);
+		else if(!c->isbanned) {
+			XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
+			c->isbanned = True;
+		}
 
 	focus(NULL);
-	if(lt->arrange)
+	if(lt->arrange && !domax)
 		lt->arrange();
 	restack();
 }
@@ -296,16 +297,8 @@ attachstack(Client *c) {
 }
 
 void
-ban(Client *c) {
-	if(c->isbanned)
-		return;
-	XMoveWindow(dpy, c->win, c->x + 2 * sw, c->y);
-	c->isbanned = True;
-}
-
-void
 buttonpress(XEvent *e) {
-	unsigned int i, x, mask;
+	uint i, x, mask;
 	Client *c;
 	XButtonPressedEvent *ev = &e->xbutton;
 
@@ -330,23 +323,23 @@ buttonpress(XEvent *e) {
 				return;
 			}
 		}
-		if((ev->x < x + blw) && ev->button == Button1) 
-			togglelayout(NULL);
+		if(ev->x < x + blw) {
+			if(ev->button == Button1) 
+				togglelayout(NULL);
+			else if(ev->button == Button3) 
+				togglemax(NULL);
+		}
 	}
 	else if((c = getclient(ev->window))) {
 		focus(c);
-		if(CLEANMASK(ev->state) != MODKEY)
+		if(CLEANMASK(ev->state) != MODKEY || domax)
 			return;
-		if(ev->button == Button1) {
-			restack();
+		if(ev->button == Button1)
 			movemouse(c);
-		}
 		else if(ev->button == Button2)
 			togglefloating(NULL);
-		else if(ev->button == Button3 && !c->isfixed) {
-			restack();
+		else if(ev->button == Button3 && !c->isfixed)
 			resizemouse(c);
-		}
 	}
 }
 
@@ -369,10 +362,9 @@ checkotherwm(void) {
 void
 cleanup(void) {
 	close(STDIN_FILENO);
-	while(stack) {
-		unban(stack);
+	view(NULL);
+	while(stack)
 		unmanage(stack);
-	}
 	if(dc.font.set)
 		XFreeFontSet(dpy, dc.font.set);
 	else
@@ -444,7 +436,7 @@ configurerequest(XEvent *e) {
 			if((ev->value_mask & (CWX|CWY))
 			&& !(ev->value_mask & (CWWidth|CWHeight)))
 				configure(c);
-			if(isvisible(c))
+			if(VISIBLE(c))
 				XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
 		}
 		else
@@ -497,7 +489,7 @@ drawbar(void) {
 	Client *c;
 
 	dc.x = 0;
-	for(c = stack; c && !isvisible(c); c = c->snext);
+	for(c = stack; c && !VISIBLE(c); c = c->snext);
 	for(i = 0; i < LENGTH(tags); i++) {
 		dc.w = textw(tags[i]);
 		if(tagset[seltags] & 1 << i) {
@@ -512,7 +504,7 @@ drawbar(void) {
 	}
 	if(blw > 0) {
 		dc.w = blw;
-		drawtext(lt->symbol, dc.norm, False);
+		drawtext(lt->symbol, dc.norm, domax);
 		x = dc.x + dc.w;
 	}
 	else
@@ -538,7 +530,7 @@ drawbar(void) {
 }
 
 void
-drawsquare(Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]) {
+drawsquare(Bool filled, Bool empty, Bool invert, ulong col[ColLast]) {
 	int x;
 	XGCValues gcv;
 	XRectangle r = { dc.x, dc.y, dc.w, dc.h };
@@ -559,9 +551,9 @@ drawsquare(Bool filled, Bool empty, Bool invert, unsigned long col[ColLast]) {
 }
 
 void
-drawtext(const char *text, unsigned long col[ColLast], Bool invert) {
+drawtext(const char *text, ulong col[ColLast], Bool invert) {
 	int x, y, w, h;
-	unsigned int len, olen;
+	uint len, olen;
 	XRectangle r = { dc.x, dc.y, dc.w, dc.h };
 	char buf[256];
 
@@ -595,15 +587,6 @@ drawtext(const char *text, unsigned long col[ColLast], Bool invert) {
 		XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
 }
 
-void *
-emallocz(unsigned int size) {
-	void *res = calloc(1, size);
-
-	if(!res)
-		eprint("fatal: could not malloc() %u bytes\n", size);
-	return res;
-}
-
 void
 enternotify(XEvent *e) {
 	Client *c;
@@ -637,8 +620,8 @@ expose(XEvent *e) {
 
 void
 focus(Client *c) {
-	if(!c || (c && !isvisible(c)))
-		for(c = stack; c && !isvisible(c); c = c->snext);
+	if(!c || (c && !VISIBLE(c)))
+		for(c = stack; c && !VISIBLE(c); c = c->snext);
 	if(sel && sel != c) {
 		grabbuttons(sel, False);
 		XSetWindowBorder(dpy, sel->win, dc.norm[ColBorder]);
@@ -650,6 +633,10 @@ focus(Client *c) {
 	}
 	sel = c;
 	if(c) {
+		if(domax) {
+			XMoveResizeWindow(dpy, c->win, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw);
+			c->ismax = True;
+		}
 		XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]);
 		XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
 	}
@@ -667,14 +654,14 @@ focusin(XEvent *e) { /* there are some broken focus acquiring clients */
 }
 
 void
-focusnext(void *arg) {
+focusnext(const void *arg) {
 	Client *c;
 
 	if(!sel)
 		return;
-	for(c = sel->next; c && !isvisible(c); c = c->next);
+	for(c = sel->next; c && !VISIBLE(c); c = c->next);
 	if(!c)
-		for(c = clients; c && !isvisible(c); c = c->next);
+		for(c = clients; c && !VISIBLE(c); c = c->next);
 	if(c) {
 		focus(c);
 		restack();
@@ -682,15 +669,15 @@ focusnext(void *arg) {
 }
 
 void
-focusprev(void *arg) {
+focusprev(const void *arg) {
 	Client *c;
 
 	if(!sel)
 		return;
-	for(c = sel->prev; c && !isvisible(c); c = c->prev);
+	for(c = sel->prev; c && !VISIBLE(c); c = c->prev);
 	if(!c) {
 		for(c = clients; c && c->next; c = c->next);
-		for(; c && !isvisible(c); c = c->prev);
+		for(; c && !VISIBLE(c); c = c->prev);
 	}
 	if(c) {
 		focus(c);
@@ -706,7 +693,7 @@ getclient(Window w) {
 	return c;
 }
 
-unsigned long
+ulong
 getcolor(const char *colstr) {
 	Colormap cmap = DefaultColormap(dpy, screen);
 	XColor color;
@@ -721,7 +708,7 @@ getstate(Window w) {
 	int format, status;
 	long result = -1;
 	unsigned char *p = NULL;
-	unsigned long n, extra;
+	ulong n, extra;
 	Atom real;
 
 	status = XGetWindowProperty(dpy, w, wmatom[WMState], 0L, 2L, False, wmatom[WMState],
@@ -735,7 +722,7 @@ getstate(Window w) {
 }
 
 Bool
-gettextprop(Window w, Atom atom, char *text, unsigned int size) {
+gettextprop(Window w, Atom atom, char *text, uint size) {
 	char **list = NULL;
 	int n;
 	XTextProperty name;
@@ -763,8 +750,8 @@ gettextprop(Window w, Atom atom, char *text, unsigned int size) {
 void
 grabbuttons(Client *c, Bool focused) {
 	int i, j;
-	unsigned int buttons[]   = { Button1, Button2, Button3 };
-	unsigned int modifiers[] = { MODKEY, MODKEY|LockMask, MODKEY|numlockmask,
+	uint buttons[]   = { Button1, Button2, Button3 };
+	uint modifiers[] = { MODKEY, MODKEY|LockMask, MODKEY|numlockmask,
 				MODKEY|numlockmask|LockMask} ;
 
 	XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
@@ -780,7 +767,7 @@ grabbuttons(Client *c, Bool focused) {
 
 void
 grabkeys(void) {
-	unsigned int i, j;
+	uint i, j;
 	KeyCode code;
 	XModifierKeymap *modmap;
 
@@ -848,7 +835,7 @@ initfont(const char *fontstr) {
 }
 
 Bool
-isoccupied(unsigned int t) {
+isoccupied(uint t) {
 	Client *c;
 
 	for(c = clients; c; c = c->next)
@@ -873,7 +860,7 @@ isprotodel(Client *c) {
 }
 
 Bool
-isurgent(unsigned int t) {
+isurgent(uint t) {
 	Client *c;
 
 	for(c = clients; c; c = c->next)
@@ -882,14 +869,9 @@ isurgent(unsigned int t) {
 	return False;
 }
 
-Bool
-isvisible(Client *c) {
-	return c->tags & tagset[seltags];
-}
-
 void
 keypress(XEvent *e) {
-	unsigned int i;
+	uint i;
 	KeySym keysym;
 	XKeyEvent *ev;
 
@@ -905,7 +887,7 @@ keypress(XEvent *e) {
 }
 
 void
-killclient(void *arg) {
+killclient(const void *arg) {
 	XEvent ev;
 
 	if(!sel)
@@ -930,7 +912,8 @@ manage(Window w, XWindowAttributes *wa) {
 	Window trans;
 	XWindowChanges wc;
 
-	c = emallocz(sizeof(Client));
+	if(!(c = calloc(1, sizeof(Client))))
+		eprint("fatal: could not calloc() %u bytes\n", sizeof(Client));
 	c->win = w;
 
 	/* geometry */
@@ -973,7 +956,6 @@ manage(Window w, XWindowAttributes *wa) {
 	attach(c);
 	attachstack(c);
 	XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h); /* some windows require this */
-	ban(c);
 	XMapWindow(dpy, c->win);
 	setclientstate(c, NormalState);
 	arrange();
@@ -1004,10 +986,11 @@ maprequest(XEvent *e) {
 void
 movemouse(Client *c) {
 	int x1, y1, ocx, ocy, di, nx, ny;
-	unsigned int dui;
+	uint dui;
 	Window dummy;
 	XEvent ev;
 
+	restack();
 	ocx = nx = c->x;
 	ocy = ny = c->y;
 	if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
@@ -1050,8 +1033,8 @@ movemouse(Client *c) {
 }
 
 Client *
-nextunfloating(Client *c) {
-	for(; c && (c->isfloating || !isvisible(c)); c = c->next);
+nexttiled(Client *c) {
+	for(; c && (c->isfloating || !VISIBLE(c)); c = c->next);
 	return c;
 }
 
@@ -1088,7 +1071,7 @@ propertynotify(XEvent *e) {
 }
 
 void
-quit(void *arg) {
+quit(const void *arg) {
 	readin = running = False;
 }
 
@@ -1143,7 +1126,8 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
 		x = sx;
 	if(y + h + 2 * c->bw < sy)
 		y = sy;
-	if(c->x != x || c->y != y || c->w != w || c->h != h) {
+	if(c->x != x || c->y != y || c->w != w || c->h != h || c->isbanned || c->ismax) {
+		c->isbanned = c->ismax = False;
 		c->x = wc.x = x;
 		c->y = wc.y = y;
 		c->w = wc.width = w;
@@ -1162,6 +1146,7 @@ resizemouse(Client *c) {
 	int nw, nh;
 	XEvent ev;
 
+	restack();
 	ocx = c->x;
 	ocy = c->y;
 	if(XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
@@ -1209,13 +1194,13 @@ restack(void) {
 	drawbar();
 	if(!sel)
 		return;
-	if(sel->isfloating || !lt->arrange)
+	if(domax || sel->isfloating || !lt->arrange)
 		XRaiseWindow(dpy, sel->win);
-	if(lt->arrange) {
+	if(!domax && lt->arrange) {
 		wc.stack_mode = Below;
 		wc.sibling = barwin;
 		for(c = stack; c; c = c->snext)
-			if(!c->isfloating && isvisible(c)) {
+			if(!c->isfloating && VISIBLE(c)) {
 				XConfigureWindow(dpy, c->win, CWSibling|CWStackMode, &wc);
 				wc.sibling = c->win;
 			}
@@ -1230,7 +1215,7 @@ run(void) {
 	char sbuf[sizeof stext];
 	fd_set rd;
 	int r, xfd;
-	unsigned int len, offset;
+	uint len, offset;
 	XEvent ev;
 
 	/* main event loop, also reads status text from stdin */
@@ -1286,7 +1271,7 @@ run(void) {
 
 void
 scan(void) {
-	unsigned int i, num;
+	uint i, num;
 	Window *wins, d1, d2;
 	XWindowAttributes wa;
 
@@ -1321,7 +1306,7 @@ setclientstate(Client *c, long state) {
 
 /* arg > 1.0 will set mfact absolutly */
 void
-setmfact(void *arg) {
+setmfact(const void *arg) {
 	double d = *((double*) arg);
 
 	if(!d || lt->arrange != tile)
@@ -1336,7 +1321,7 @@ setmfact(void *arg) {
 
 void
 setup(void) {
-	unsigned int i, w;
+	uint i, w;
 	XSetWindowAttributes wa;
 
 	/* init screen */
@@ -1412,7 +1397,7 @@ setup(void) {
 }
 
 void
-spawn(void *arg) {
+spawn(const void *arg) {
 	static char *shell = NULL;
 
 	if(!shell && !(shell = getenv("SHELL")))
@@ -1434,15 +1419,15 @@ spawn(void *arg) {
 }
 
 void
-tag(void *arg) {
+tag(const void *arg) {
 	if(sel && *(int *)arg & TAGMASK) {
 		sel->tags = *(int *)arg & TAGMASK;
 		arrange();
 	}
 }
 
-unsigned int
-textnw(const char *text, unsigned int len) {
+uint
+textnw(const char *text, uint len) {
 	XRectangle r;
 
 	if(dc.font.set) {
@@ -1452,7 +1437,7 @@ textnw(const char *text, unsigned int len) {
 	return XTextWidth(dc.font.xfont, text, len);
 }
 
-unsigned int
+uint
 textw(const char *text) {
 	return textnw(text, strlen(text)) + dc.font.height;
 }
@@ -1460,15 +1445,15 @@ textw(const char *text) {
 void
 tile(void) {
 	int x, y, h, w;
-	unsigned int i, n;
+	uint i, n;
 	Client *c;
 
-	for(n = 0, c = nextunfloating(clients); c; c = nextunfloating(c->next), n++);
+	for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next), n++);
 	if(n == 0)
 		return;
 
 	/* master */
-	c = nextunfloating(clients);
+	c = nexttiled(clients);
 
 	if(n == 1)
 		tileresize(c, wx, wy, ww - 2 * c->bw, wh - 2 * c->bw);
@@ -1486,7 +1471,7 @@ tile(void) {
 	if(h < bh)
 		h = th;
 
-	for(i = 0, c = nextunfloating(c->next); c; c = nextunfloating(c->next), i++) {
+	for(i = 0, c = nexttiled(c->next); c; c = nexttiled(c->next), i++) {
 		if(i + 1 == n) /* remainder */
 			tileresize(c, x, y, w - 2 * c->bw, (ty + th) - y - 2 * c->bw);
 		else
@@ -1505,7 +1490,7 @@ tileresize(Client *c, int x, int y, int w, int h) {
 }
 
 void
-togglebar(void *arg) {
+togglebar(const void *arg) {
 	showbar = !showbar;
 	updategeom();
 	updatebar();
@@ -1513,7 +1498,7 @@ togglebar(void *arg) {
 }
 
 void
-togglefloating(void *arg) {
+togglefloating(const void *arg) {
 	if(!sel)
 		return;
 	sel->isfloating = !sel->isfloating;
@@ -1523,8 +1508,8 @@ togglefloating(void *arg) {
 }
 
 void
-togglelayout(void *arg) {
-	unsigned int i;
+togglelayout(const void *arg) {
+	uint i;
 
 	if(!arg) {
 		if(++lt == &layouts[LENGTH(layouts)])
@@ -1545,15 +1530,13 @@ togglelayout(void *arg) {
 }
 
 void
-toggletag(void *arg) {
-	int i, m = *(int *)arg;
-	for(i = 0; i < sizeof(int) * 8; i++)
-		fputc(m & 1 << i ? '1' : '0', stdout);
-	puts("");
-	for(i = 0; i < sizeof(int) * 8; i++)
-		fputc(TAGMASK & 1 << i ? '1' : '0', stdout);
-	puts("aaa");
+togglemax(const void *arg) {
+	domax = !domax;
+	arrange();
+}
 
+void
+toggletag(const void *arg) {
 	if(sel && (sel->tags ^ ((*(int *)arg) & TAGMASK))) {
 		sel->tags ^= (*(int *)arg) & TAGMASK;
 		arrange();
@@ -1561,7 +1544,7 @@ toggletag(void *arg) {
 }
 
 void
-toggleview(void *arg) {
+toggleview(const void *arg) {
 	if((tagset[seltags] ^ ((*(int *)arg) & TAGMASK))) {
 		tagset[seltags] ^= (*(int *)arg) & TAGMASK;
 		arrange();
@@ -1569,14 +1552,6 @@ toggleview(void *arg) {
 }
 
 void
-unban(Client *c) {
-	if(!c->isbanned)
-		return;
-	XMoveWindow(dpy, c->win, c->x, c->y);
-	c->isbanned = False;
-}
-
-void
 unmanage(Client *c) {
 	XWindowChanges wc;
 
@@ -1737,7 +1712,7 @@ updatewmhints(Client *c) {
 }
 
 void
-view(void *arg) {
+view(const void *arg) {
 	if(*(int *)arg & TAGMASK) {
 		seltags ^= 1; /* toggle sel tagset */
 		tagset[seltags] = *(int *)arg & TAGMASK;
@@ -1746,7 +1721,7 @@ view(void *arg) {
 }
 
 void
-viewprevtag(void *arg) {
+viewprevtag(const void *arg) {
 	seltags ^= 1; /* toggle sel tagset */
 	arrange();
 }
@@ -1785,17 +1760,17 @@ xerrorstart(Display *dpy, XErrorEvent *ee) {
 }
 
 void
-zoom(void *arg) {
+zoom(const void *arg) {
 	Client *c = sel;
 
-	if(c == nextunfloating(clients))
-		if(!c || !(c = nextunfloating(c->next)))
+	if(!lt->arrange || sel->isfloating)
+		return;
+	if(c == nexttiled(clients))
+		if(!c || !(c = nexttiled(c->next)))
 			return;
-	if(lt->arrange == tile && !sel->isfloating) {
-		detach(c);
-		attach(c);
-		focus(c);
-	}
+	detach(c);
+	attach(c);
+	focus(c);
 	arrange();
 }