X-Git-Url: https://git.xinqibao.xyz/dwm.git/blobdiff_plain/d1ce3eac33a636e03a1f5a887897ae8046065ff7..5473e763f6ed7f2f248bc980c0b210edbcc1393c:/dwm.c?ds=sidebyside

diff --git a/dwm.c b/dwm.c
index 164b5ef..862ec24 100644
--- a/dwm.c
+++ b/dwm.c
@@ -21,26 +21,25 @@
  * creates a small title window, which is resized whenever the (_NET_)WM_NAME
  * properties are updated or the client is moved/resized.
  *
- * Keys and tagging rules are organized as arrays and defined in the config.h
- * file. These arrays are kept static in event.o and tag.o respectively,
- * because no other part of dwm needs access to them.  The current layout is
- * represented by the lt pointer.
+ * Keys and tagging rules are organized as arrays and defined in config.h.
  *
  * To understand everything else, start reading main().
  */
 #include <errno.h>
 #include <locale.h>
-#include <regex.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 #include <sys/select.h>
+#include <sys/types.h>
 #include <sys/wait.h>
+#include <regex.h>
 #include <X11/cursorfont.h>
 #include <X11/keysym.h>
 #include <X11/Xatom.h>
+#include <X11/Xlib.h>
 #include <X11/Xproto.h>
 #include <X11/Xutil.h>
 
@@ -64,9 +63,9 @@ struct Client {
 	int rx, ry, rw, rh; /* revert geometry */
 	int basew, baseh, incw, inch, maxw, maxh, minw, minh;
 	int minax, maxax, minay, maxay;
-	long flags; 
+	long flags;
 	unsigned int border, oldborder;
-	Bool isbanned, isfixed, ismax, isfloating;
+	Bool isbanned, isfixed, ismax, isfloating, wasfloating;
 	Bool *tags;
 	Client *next;
 	Client *prev;
@@ -112,97 +111,98 @@ typedef struct {
 	regex_t *tagregex;
 } Regs;
 
-/* forward declarations */
-static void applyrules(Client *c);
-static void arrange(void);
-static void attach(Client *c);
-static void attachstack(Client *c);
-static void ban(Client *c);
-static void buttonpress(XEvent *e);
-static void checkotherwm(void);
-static void cleanup(void);
-static void compileregs(void);
-static void configure(Client *c);
-static void configurenotify(XEvent *e);
-static void configurerequest(XEvent *e);
-static void destroynotify(XEvent *e);
-static void detach(Client *c);
-static void detachstack(Client *c);
-static void drawbar(void);
-static void drawsquare(Bool filled, Bool empty, unsigned long col[ColLast]);
-static void drawtext(const char *text, unsigned long col[ColLast]);
-static void *emallocz(unsigned int size);
-static void enternotify(XEvent *e);
-static void eprint(const char *errstr, ...);
-static void expose(XEvent *e);
-static void floating(void); /* default floating layout */
-static void focus(Client *c);
-static void focusnext(const char *arg);
-static void focusprev(const char *arg);
-static Client *getclient(Window w);
-static unsigned long getcolor(const char *colstr);
-static long getstate(Window w);
-static Bool gettextprop(Window w, Atom atom, char *text, unsigned int size);
-static void grabbuttons(Client *c, Bool focused);
-static unsigned int idxoftag(const char *tag);
-static void initfont(const char *fontstr);
-static Bool isarrange(void (*func)());
-static Bool isoccupied(unsigned int t);
-static Bool isprotodel(Client *c);
-static Bool isvisible(Client *c);
-static void keypress(XEvent *e);
-static void killclient(const char *arg);
-static void leavenotify(XEvent *e);
-static void manage(Window w, XWindowAttributes *wa);
-static void mappingnotify(XEvent *e);
-static void maprequest(XEvent *e);
-static void movemouse(Client *c);
-static Client *nexttiled(Client *c);
-static void propertynotify(XEvent *e);
-static void quit(const char *arg);
-static void resize(Client *c, int x, int y, int w, int h, Bool sizehints);
-static void resizemouse(Client *c);
-static void restack(void);
-static void run(void);
-static void scan(void);
-static void setclientstate(Client *c, long state);
-static void setlayout(const char *arg);
-static void setmwfact(const char *arg);
-static void setup(void);
-static void spawn(const char *arg);
-static void tag(const char *arg);
-static unsigned int textnw(const char *text, unsigned int len);
-static unsigned int textw(const char *text);
-static void tile(void);
-static void togglebar(const char *arg);
-static void togglefloating(const char *arg);
-static void togglemax(const char *arg);
-static void toggletag(const char *arg);
-static void toggleview(const char *arg);
-static void unban(Client *c);
-static void unmanage(Client *c);
-static void unmapnotify(XEvent *e);
-static void updatebarpos(void);
-static void updatesizehints(Client *c);
-static void updatetitle(Client *c);
-static void view(const char *arg);
-static int xerror(Display *dpy, XErrorEvent *ee);
-static int xerrordummy(Display *dsply, XErrorEvent *ee);
-static int xerrorstart(Display *dsply, XErrorEvent *ee);
-static void zoom(const char *arg);
+/* function declarations */
+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);
+void compileregs(void);
+void configure(Client *c);
+void configurenotify(XEvent *e);
+void configurerequest(XEvent *e);
+void destroynotify(XEvent *e);
+void detach(Client *c);
+void detachstack(Client *c);
+void drawbar(void);
+void drawsquare(Bool filled, Bool empty, unsigned long col[ColLast]);
+void drawtext(const char *text, unsigned long col[ColLast]);
+void *emallocz(unsigned int size);
+void enternotify(XEvent *e);
+void eprint(const char *errstr, ...);
+void expose(XEvent *e);
+void floating(void); /* default floating layout */
+void focus(Client *c);
+void focusnext(const char *arg);
+void focusprev(const char *arg);
+Client *getclient(Window w);
+unsigned long getcolor(const char *colstr);
+long getstate(Window w);
+Bool gettextprop(Window w, Atom atom, char *text, unsigned int size);
+void grabbuttons(Client *c, Bool focused);
+unsigned int idxoftag(const char *tag);
+void initfont(const char *fontstr);
+Bool isarrange(void (*func)());
+Bool isoccupied(unsigned int t);
+Bool isprotodel(Client *c);
+Bool isvisible(Client *c);
+void keypress(XEvent *e);
+void killclient(const char *arg);
+void leavenotify(XEvent *e);
+void manage(Window w, XWindowAttributes *wa);
+void mappingnotify(XEvent *e);
+void maprequest(XEvent *e);
+void movemouse(Client *c);
+Client *nexttiled(Client *c);
+void propertynotify(XEvent *e);
+void quit(const char *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 setlayout(const char *arg);
+void setmwfact(const char *arg);
+void setup(void);
+void spawn(const char *arg);
+void tag(const char *arg);
+unsigned int textnw(const char *text, unsigned int len);
+unsigned int textw(const char *text);
+void tile(void);
+void togglebar(const char *arg);
+void togglefloating(const char *arg);
+void togglemax(const char *arg);
+void toggletag(const char *arg);
+void toggleview(const char *arg);
+void unban(Client *c);
+void unmanage(Client *c);
+void unmapnotify(XEvent *e);
+void updatebarpos(void);
+void updatesizehints(Client *c);
+void updatetitle(Client *c);
+void view(const char *arg);
+void viewprevtag(const char *arg);	/* views previous selected tags */
+int xerror(Display *dpy, XErrorEvent *ee);
+int xerrordummy(Display *dsply, XErrorEvent *ee);
+int xerrorstart(Display *dsply, XErrorEvent *ee);
+void zoom(const char *arg);
 
 /* variables */
-static char stext[256];
-static double mwfact;
-static int screen, sx, sy, sw, sh, wax, way, waw, wah;
-static int (*xerrorxlib)(Display *, XErrorEvent *);
-static unsigned int bh, bpos, ntags;
-static unsigned int blw = 0;
-static unsigned int ltidx = 0; /* default */
-static unsigned int nlayouts = 0;
-static unsigned int nrules = 0;
-static unsigned int numlockmask = 0;
-static void (*handler[LASTEvent]) (XEvent *) = {
+char stext[256];
+double mwfact;
+int screen, sx, sy, sw, sh, wax, way, waw, wah;
+int (*xerrorxlib)(Display *, XErrorEvent *);
+unsigned int bh, bpos;
+unsigned int blw = 0;
+unsigned int ltidx = 0; /* default */
+unsigned int nlayouts = 0;
+unsigned int nrules = 0;
+unsigned int numlockmask = 0;
+void (*handler[LASTEvent]) (XEvent *) = {
 	[ButtonPress] = buttonpress,
 	[ConfigureRequest] = configurerequest,
 	[ConfigureNotify] = configurenotify,
@@ -216,25 +216,28 @@ static void (*handler[LASTEvent]) (XEvent *) = {
 	[PropertyNotify] = propertynotify,
 	[UnmapNotify] = unmapnotify
 };
-static Atom wmatom[WMLast], netatom[NetLast];
-static Bool otherwm, readin;
-static Bool running = True;
-static Bool *seltags;
-static Bool selscreen = True;
-static Client *clients = NULL;
-static Client *sel = NULL;
-static Client *stack = NULL;
-static Cursor cursor[CurLast];
-static Display *dpy;
-static DC dc = {0};
-static Window barwin, root;
-static Regs *regs = NULL;
+Atom wmatom[WMLast], netatom[NetLast];
+Bool otherwm, readin;
+Bool running = True;
+Bool selscreen = True;
+Client *clients = NULL;
+Client *sel = NULL;
+Client *stack = NULL;
+Cursor cursor[CurLast];
+Display *dpy;
+DC dc = {0};
+Window barwin, root;
+Regs *regs = NULL;
 
 /* configuration, allows nested code to access above variables */
 #include "config.h"
 
-/* functions*/
-static void
+#define NTAGS (sizeof tags / sizeof tags[0])
+Bool seltags[NTAGS] = {[0] = True};
+Bool prevtags[NTAGS] = {[0] = True};
+
+/* function implementations */
+void
 applyrules(Client *c) {
 	static char buf[512];
 	unsigned int i, j;
@@ -250,7 +253,7 @@ applyrules(Client *c) {
 	for(i = 0; i < nrules; i++)
 		if(regs[i].propregex && !regexec(regs[i].propregex, buf, 1, &tmp, 0)) {
 			c->isfloating = rules[i].isfloating;
-			for(j = 0; regs[i].tagregex && j < ntags; j++) {
+			for(j = 0; regs[i].tagregex && j < NTAGS; j++) {
 				if(!regexec(regs[i].tagregex, tags[j], 1, &tmp, 0)) {
 					matched = True;
 					c->tags[j] = True;
@@ -262,11 +265,10 @@ applyrules(Client *c) {
 	if(ch.res_name)
 		XFree(ch.res_name);
 	if(!matched)
-		for(i = 0; i < ntags; i++)
-			c->tags[i] = seltags[i];
+		memcpy(c->tags, seltags, sizeof seltags);
 }
 
-static void
+void
 arrange(void) {
 	Client *c;
 
@@ -280,7 +282,7 @@ arrange(void) {
 	restack();
 }
 
-static void
+void
 attach(Client *c) {
 	if(clients)
 		clients->prev = c;
@@ -288,13 +290,13 @@ attach(Client *c) {
 	clients = c;
 }
 
-static void
+void
 attachstack(Client *c) {
 	c->snext = stack;
 	stack = c;
 }
 
-static void
+void
 ban(Client *c) {
 	if(c->isbanned)
 		return;
@@ -302,7 +304,7 @@ ban(Client *c) {
 	c->isbanned = True;
 }
 
-static void
+void
 buttonpress(XEvent *e) {
 	unsigned int i, x;
 	Client *c;
@@ -310,7 +312,7 @@ buttonpress(XEvent *e) {
 
 	if(barwin == ev->window) {
 		x = 0;
-		for(i = 0; i < ntags; i++) {
+		for(i = 0; i < NTAGS; i++) {
 			x += textw(tags[i]);
 			if(ev->x < x) {
 				if(ev->button == Button1) {
@@ -336,25 +338,29 @@ buttonpress(XEvent *e) {
 		if(CLEANMASK(ev->state) != MODKEY)
 			return;
 		if(ev->button == Button1) {
-			if(!isarrange(floating) && !c->isfloating)
-				togglefloating(NULL);
-			else
+			if(isarrange(floating) || c->isfloating)
 				restack();
+			else
+				togglefloating(NULL);
 			movemouse(c);
 		}
-		else if(ev->button == Button2)
-			zoom(NULL);
-		else if(ev->button == Button3 && !c->isfixed) {
-			if(!isarrange(floating) && !c->isfloating)
+		else if(ev->button == Button2) {
+			if((ISTILE) && !c->isfixed && c->isfloating)
 				togglefloating(NULL);
 			else
+				zoom(NULL);
+		}
+		else if(ev->button == Button3 && !c->isfixed) {
+			if(isarrange(floating) || c->isfloating)
 				restack();
+			else
+				togglefloating(NULL);
 			resizemouse(c);
 		}
 	}
 }
 
-static void
+void
 checkotherwm(void) {
 	otherwm = False;
 	XSetErrorHandler(xerrorstart);
@@ -370,7 +376,7 @@ checkotherwm(void) {
 	XSync(dpy, False);
 }
 
-static void
+void
 cleanup(void) {
 	close(STDIN_FILENO);
 	while(stack) {
@@ -390,10 +396,9 @@ cleanup(void) {
 	XFreeCursor(dpy, cursor[CurMove]);
 	XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
 	XSync(dpy, False);
-	free(seltags);
 }
 
-static void
+void
 compileregs(void) {
 	unsigned int i;
 	regex_t *reg;
@@ -420,7 +425,7 @@ compileregs(void) {
 	}
 }
 
-static void
+void
 configure(Client *c) {
 	XConfigureEvent ce;
 
@@ -438,11 +443,11 @@ configure(Client *c) {
 	XSendEvent(dpy, c->win, False, StructureNotifyMask, (XEvent *)&ce);
 }
 
-static void
+void
 configurenotify(XEvent *e) {
 	XConfigureEvent *ev = &e->xconfigure;
 
-	if (ev->window == root && (ev->width != sw || ev->height != sh)) {
+	if(ev->window == root && (ev->width != sw || ev->height != sh)) {
 		sw = ev->width;
 		sh = ev->height;
 		XFreePixmap(dpy, dc.drawable);
@@ -453,7 +458,7 @@ configurenotify(XEvent *e) {
 	}
 }
 
-static void
+void
 configurerequest(XEvent *e) {
 	Client *c;
 	XConfigureRequestEvent *ev = &e->xconfigurerequest;
@@ -498,7 +503,7 @@ configurerequest(XEvent *e) {
 	XSync(dpy, False);
 }
 
-static void
+void
 destroynotify(XEvent *e) {
 	Client *c;
 	XDestroyWindowEvent *ev = &e->xdestroywindow;
@@ -507,7 +512,7 @@ destroynotify(XEvent *e) {
 		unmanage(c);
 }
 
-static void
+void
 detach(Client *c) {
 	if(c->prev)
 		c->prev->next = c->next;
@@ -518,7 +523,7 @@ detach(Client *c) {
 	c->next = c->prev = NULL;
 }
 
-static void
+void
 detachstack(Client *c) {
 	Client **tc;
 
@@ -526,12 +531,12 @@ detachstack(Client *c) {
 	*tc = c->snext;
 }
 
-static void
+void
 drawbar(void) {
 	int i, x;
 
 	dc.x = dc.y = 0;
-	for(i = 0; i < ntags; i++) {
+	for(i = 0; i < NTAGS; i++) {
 		dc.w = textw(tags[i]);
 		if(seltags[i]) {
 			drawtext(tags[i], dc.sel);
@@ -566,7 +571,7 @@ drawbar(void) {
 	XSync(dpy, False);
 }
 
-static void
+void
 drawsquare(Bool filled, Bool empty, unsigned long col[ColLast]) {
 	int x;
 	XGCValues gcv;
@@ -587,7 +592,7 @@ drawsquare(Bool filled, Bool empty, unsigned long col[ColLast]) {
 	}
 }
 
-static void
+void
 drawtext(const char *text, unsigned long col[ColLast]) {
 	int x, y, w, h;
 	static char buf[256];
@@ -627,7 +632,7 @@ drawtext(const char *text, unsigned long col[ColLast]) {
 		XDrawString(dpy, dc.drawable, dc.gc, x, y, buf, len);
 }
 
-static void *
+void *
 emallocz(unsigned int size) {
 	void *res = calloc(1, size);
 
@@ -636,7 +641,7 @@ emallocz(unsigned int size) {
 	return res;
 }
 
-static void
+void
 enternotify(XEvent *e) {
 	Client *c;
 	XCrossingEvent *ev = &e->xcrossing;
@@ -651,7 +656,7 @@ enternotify(XEvent *e) {
 	}
 }
 
-static void
+void
 eprint(const char *errstr, ...) {
 	va_list ap;
 
@@ -661,7 +666,7 @@ eprint(const char *errstr, ...) {
 	exit(EXIT_FAILURE);
 }
 
-static void
+void
 expose(XEvent *e) {
 	XExposeEvent *ev = &e->xexpose;
 
@@ -671,7 +676,7 @@ expose(XEvent *e) {
 	}
 }
 
-static void
+void
 floating(void) { /* default floating layout */
 	Client *c;
 
@@ -680,7 +685,7 @@ floating(void) { /* default floating layout */
 			resize(c, c->x, c->y, c->w, c->h, True);
 }
 
-static void
+void
 focus(Client *c) {
 	if((!c && selscreen) || (c && !isvisible(c)))
 		for(c = stack; c && !isvisible(c); c = c->snext);
@@ -705,7 +710,7 @@ focus(Client *c) {
 		XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
 }
 
-static void
+void
 focusnext(const char *arg) {
 	Client *c;
 
@@ -720,7 +725,7 @@ focusnext(const char *arg) {
 	}
 }
 
-static void
+void
 focusprev(const char *arg) {
 	Client *c;
 
@@ -737,7 +742,7 @@ focusprev(const char *arg) {
 	}
 }
 
-static Client *
+Client *
 getclient(Window w) {
 	Client *c;
 
@@ -745,7 +750,7 @@ getclient(Window w) {
 	return c;
 }
 
-static unsigned long
+unsigned long
 getcolor(const char *colstr) {
 	Colormap cmap = DefaultColormap(dpy, screen);
 	XColor color;
@@ -755,7 +760,7 @@ getcolor(const char *colstr) {
 	return color.pixel;
 }
 
-static long
+long
 getstate(Window w) {
 	int format, status;
 	long result = -1;
@@ -773,7 +778,7 @@ getstate(Window w) {
 	return result;
 }
 
-static Bool
+Bool
 gettextprop(Window w, Atom atom, char *text, unsigned int size) {
 	char **list = NULL;
 	int n;
@@ -800,7 +805,7 @@ gettextprop(Window w, Atom atom, char *text, unsigned int size) {
 	return True;
 }
 
-static void
+void
 grabbuttons(Client *c, Bool focused) {
 	XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
 
@@ -837,17 +842,15 @@ grabbuttons(Client *c, Bool focused) {
 				GrabModeAsync, GrabModeSync, None, None);
 }
 
-static unsigned int
+unsigned int
 idxoftag(const char *tag) {
 	unsigned int i;
 
-	for(i = 0; i < ntags; i++)
-		if(tags[i] == tag)
-			return i;
-	return 0;
+	for(i = 0; (i < NTAGS) && (tags[i] != tag); i++);
+	return (i < NTAGS) ? i : 0;
 }
 
-static void
+void
 initfont(const char *fontstr) {
 	char *def, **missing;
 	int i, n;
@@ -881,7 +884,7 @@ initfont(const char *fontstr) {
 			XFreeFont(dpy, dc.font.xfont);
 		dc.font.xfont = NULL;
 		if(!(dc.font.xfont = XLoadQueryFont(dpy, fontstr))
-		|| !(dc.font.xfont = XLoadQueryFont(dpy, "fixed")))
+		&& !(dc.font.xfont = XLoadQueryFont(dpy, "fixed")))
 			eprint("error, cannot load font: '%s'\n", fontstr);
 		dc.font.ascent = dc.font.xfont->ascent;
 		dc.font.descent = dc.font.xfont->descent;
@@ -889,13 +892,13 @@ initfont(const char *fontstr) {
 	dc.font.height = dc.font.ascent + dc.font.descent;
 }
 
-static Bool
+Bool
 isarrange(void (*func)())
 {
 	return func == layouts[ltidx].arrange;
 }
 
-static Bool
+Bool
 isoccupied(unsigned int t) {
 	Client *c;
 
@@ -905,7 +908,7 @@ isoccupied(unsigned int t) {
 	return False;
 }
 
-static Bool
+Bool
 isprotodel(Client *c) {
 	int i, n;
 	Atom *protocols;
@@ -920,17 +923,17 @@ isprotodel(Client *c) {
 	return ret;
 }
 
-static Bool
+Bool
 isvisible(Client *c) {
 	unsigned int i;
 
-	for(i = 0; i < ntags; i++)
+	for(i = 0; i < NTAGS; i++)
 		if(c->tags[i] && seltags[i])
 			return True;
 	return False;
 }
 
-static void
+void
 keypress(XEvent *e) {
 	KEYS
 	unsigned int len = sizeof keys / sizeof keys[0];
@@ -965,7 +968,7 @@ keypress(XEvent *e) {
 		}
 }
 
-static void
+void
 killclient(const char *arg) {
 	XEvent ev;
 
@@ -984,7 +987,7 @@ killclient(const char *arg) {
 		XKillClient(dpy, sel->win);
 }
 
-static void
+void
 leavenotify(XEvent *e) {
 	XCrossingEvent *ev = &e->xcrossing;
 
@@ -994,16 +997,15 @@ leavenotify(XEvent *e) {
 	}
 }
 
-static void
+void
 manage(Window w, XWindowAttributes *wa) {
-	unsigned int i;
 	Client *c, *t = NULL;
 	Window trans;
 	Status rettrans;
 	XWindowChanges wc;
 
 	c = emallocz(sizeof(Client));
-	c->tags = emallocz(ntags * sizeof(Bool));
+	c->tags = emallocz(sizeof seltags);
 	c->win = w;
 	c->x = wa->x;
 	c->y = wa->y;
@@ -1038,8 +1040,7 @@ manage(Window w, XWindowAttributes *wa) {
 	if((rettrans = XGetTransientForHint(dpy, w, &trans) == Success))
 		for(t = clients; t && t->win != trans; t = t->next);
 	if(t)
-		for(i = 0; i < ntags; i++)
-			c->tags[i] = t->tags[i];
+		memcpy(c->tags, t->tags, sizeof seltags);
 	applyrules(c);
 	if(!c->isfloating)
 		c->isfloating = (rettrans == Success) || c->isfixed;
@@ -1052,7 +1053,7 @@ manage(Window w, XWindowAttributes *wa) {
 	arrange();
 }
 
-static void
+void
 mappingnotify(XEvent *e) {
 	XMappingEvent *ev = &e->xmapping;
 
@@ -1061,7 +1062,7 @@ mappingnotify(XEvent *e) {
 		keypress(NULL);
 }
 
-static void
+void
 maprequest(XEvent *e) {
 	static XWindowAttributes wa;
 	XMapRequestEvent *ev = &e->xmaprequest;
@@ -1074,7 +1075,7 @@ maprequest(XEvent *e) {
 		manage(ev->window, &wa);
 }
 
-static void
+void
 movemouse(Client *c) {
 	int x1, y1, ocx, ocy, di, nx, ny;
 	unsigned int dui;
@@ -1117,13 +1118,13 @@ movemouse(Client *c) {
 	}
 }
 
-static Client *
+Client *
 nexttiled(Client *c) {
 	for(; c && (c->isfloating || !isvisible(c)); c = c->next);
 	return c;
 }
 
-static void
+void
 propertynotify(XEvent *e) {
 	Client *c;
 	Window trans;
@@ -1136,7 +1137,7 @@ propertynotify(XEvent *e) {
 			default: break;
 			case XA_WM_TRANSIENT_FOR:
 				XGetTransientForHint(dpy, c->win, &trans);
-				if(!c->isfloating && (c->isfloating = (getclient(trans) != NULL)))
+				if(!c->isfloating && (c->isfloating = (NULL != getclient(trans))))
 					arrange();
 				break;
 			case XA_WM_NORMAL_HINTS:
@@ -1151,50 +1152,52 @@ propertynotify(XEvent *e) {
 	}
 }
 
-static void
+void
 quit(const char *arg) {
 	readin = running = False;
 }
 
-static void
+void
 resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
-	double dx, dy, max, min, ratio;
-	XWindowChanges wc; 
+	XWindowChanges wc;
 
 	if(sizehints) {
-		if(c->minay > 0 && c->maxay > 0 && (h - c->baseh) > 0 && (w - c->basew) > 0) {
-			dx = (double)(w - c->basew);
-			dy = (double)(h - c->baseh);
-			min = (double)(c->minax) / (double)(c->minay);
-			max = (double)(c->maxax) / (double)(c->maxay);
-			ratio = dx / dy;
-			if(max > 0 && min > 0 && ratio > 0) {
-				if(ratio < min) {
-					dy = (dx * min + dy) / (min * min + 1);
-					dx = dy * min;
-					w = (int)dx + c->basew;
-					h = (int)dy + c->baseh;
-				}
-				else if(ratio > max) {
-					dy = (dx * min + dy) / (max * max + 1);
-					dx = dy * min;
-					w = (int)dx + c->basew;
-					h = (int)dy + c->baseh;
-				}
-			}
+		/* set minimum possible */
+		if (w < 1)
+			w = 1;
+		if (h < 1)
+			h = 1;
+
+		/* temporarily remove base dimensions */
+		w -= c->basew;
+		h -= c->baseh;
+
+		/* adjust for aspect limits */
+		if (c->minay > 0 && c->maxay > 0 && c->minax > 0 && c->maxax > 0) {
+			if (w * c->maxay > h * c->maxax)
+				w = h * c->maxax / c->maxay;
+			else if (w * c->minay < h * c->minax)
+				h = w * c->minay / c->minax;
 		}
-		if(c->minw && w < c->minw)
+
+		/* adjust for increment value */
+		if(c->incw)
+			w -= w % c->incw;
+		if(c->inch)
+			h -= h % c->inch;
+
+		/* restore base dimensions */
+		w += c->basew;
+		h += c->baseh;
+
+		if(c->minw > 0 && w < c->minw)
 			w = c->minw;
-		if(c->minh && h < c->minh)
+		if(c->minh > 0 && h < c->minh)
 			h = c->minh;
-		if(c->maxw && w > c->maxw)
+		if(c->maxw > 0 && w > c->maxw)
 			w = c->maxw;
-		if(c->maxh && h > c->maxh)
+		if(c->maxh > 0 && h > c->maxh)
 			h = c->maxh;
-		if(c->incw)
-			w -= (w - c->basew) % c->incw;
-		if(c->inch)
-			h -= (h - c->baseh) % c->inch;
 	}
 	if(w <= 0 || h <= 0)
 		return;
@@ -1219,7 +1222,7 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
 	}
 }
 
-static void
+void
 resizemouse(Client *c) {
 	int ocx, ocy;
 	int nw, nh;
@@ -1258,7 +1261,7 @@ resizemouse(Client *c) {
 	}
 }
 
-static void
+void
 restack(void) {
 	Client *c;
 	XEvent ev;
@@ -1287,7 +1290,7 @@ restack(void) {
 	while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }
 
-static void
+void
 run(void) {
 	char *p;
 	int r, xfd;
@@ -1335,7 +1338,7 @@ run(void) {
 	}
 }
 
-static void
+void
 scan(void) {
 	unsigned int i, num;
 	Window *wins, d1, d2;
@@ -1362,7 +1365,7 @@ scan(void) {
 		XFree(wins);
 }
 
-static void
+void
 setclientstate(Client *c, long state) {
 	long data[] = {state, None};
 
@@ -1370,7 +1373,7 @@ setclientstate(Client *c, long state) {
 			PropModeReplace, (unsigned char *)data, 2);
 }
 
-static void
+void
 setlayout(const char *arg) {
 	unsigned int i;
 
@@ -1392,20 +1395,20 @@ setlayout(const char *arg) {
 		drawbar();
 }
 
-static void
+void
 setmwfact(const char *arg) {
 	double delta;
 
-	if(!isarrange(tile))
+	if(!(ISTILE))
 		return;
 	/* arg handling, manipulate mwfact */
 	if(arg == NULL)
 		mwfact = MWFACT;
 	else if(1 == sscanf(arg, "%lf", &delta)) {
-		if(arg[0] != '+' && arg[0] != '-')
-			mwfact = delta;
-		else
+		if(arg[0] == '+' || arg[0] == '-')
 			mwfact += delta;
+		else
+			mwfact = delta;
 		if(mwfact < 0.1)
 			mwfact = 0.1;
 		else if(mwfact > 0.9)
@@ -1414,8 +1417,9 @@ setmwfact(const char *arg) {
 	arrange();
 }
 
-static void
+void
 setup(void) {
+	int d;
 	unsigned int i, j, mask;
 	Window w;
 	XModifierKeymap *modmap;
@@ -1463,9 +1467,6 @@ setup(void) {
 
 	/* init tags */
 	compileregs();
-	for(ntags = 0; tags[ntags]; ntags++);
-	seltags = emallocz(sizeof(Bool) * ntags);
-	seltags[0] = True;
 
 	/* init appearance */
 	dc.norm[ColBorder] = getcolor(NORMBORDERCOLOR);
@@ -1505,10 +1506,10 @@ setup(void) {
 		XSetFont(dpy, dc.gc, dc.font.xfont->fid);
 
 	/* multihead support */
-	selscreen = XQueryPointer(dpy, root, &w, &w, &i, &i, &i, &i, &mask);
+	selscreen = XQueryPointer(dpy, root, &w, &w, &d, &d, &d, &d, &mask);
 }
 
-static void
+void
 spawn(const char *arg) {
 	static char *shell = NULL;
 
@@ -1532,21 +1533,19 @@ spawn(const char *arg) {
 	wait(0);
 }
 
-static void
+void
 tag(const char *arg) {
 	unsigned int i;
 
 	if(!sel)
 		return;
-	for(i = 0; i < ntags; i++)
-		sel->tags[i] = arg == NULL;
-	i = idxoftag(arg);
-	if(i >= 0 && i < ntags)
-		sel->tags[i] = True;
+	for(i = 0; i < NTAGS; i++)
+		sel->tags[i] = (NULL == arg);
+	sel->tags[idxoftag(arg)] = True;
 	arrange();
 }
 
-static unsigned int
+unsigned int
 textnw(const char *text, unsigned int len) {
 	XRectangle r;
 
@@ -1557,15 +1556,15 @@ textnw(const char *text, unsigned int len) {
 	return XTextWidth(dc.font.xfont, text, len);
 }
 
-static unsigned int
+unsigned int
 textw(const char *text) {
 	return textnw(text, strlen(text)) + dc.font.height;
 }
 
-static void
+void
 tile(void) {
 	unsigned int i, n, nx, ny, nw, nh, mw, th;
-	Client *c;
+	Client *c, *mc;
 
 	for(n = 0, c = nexttiled(clients); c; c = nexttiled(c->next))
 		n++;
@@ -1578,7 +1577,8 @@ tile(void) {
 
 	nx = wax;
 	ny = way;
-	for(i = 0, c = nexttiled(clients); c; c = nexttiled(c->next), i++) {
+	nw = 0; /* gcc stupidity requires this */
+	for(i = 0, c = mc = nexttiled(clients); c; c = nexttiled(c->next), i++) {
 		c->ismax = False;
 		if(i == 0) { /* master */
 			nw = mw - 2 * c->border;
@@ -1587,21 +1587,24 @@ tile(void) {
 		else {  /* tile window */
 			if(i == 1) {
 				ny = way;
-				nx += mw;
+				nx += mc->w + 2 * mc->border;
+				nw = waw - nx - 2 * c->border;
 			}
-			nw = waw - mw - 2 * c->border;
 			if(i + 1 == n) /* remainder */
 				nh = (way + wah) - ny - 2 * c->border;
 			else
 				nh = th - 2 * c->border;
 		}
-		resize(c, nx, ny, nw, nh, RESIZEHINTS);
+		resize(c, nx, ny, nw, nh, True);
+		if((c->h < bh) || (c->h > nh) || (c->w < bh) || (c->w > nw))
+			/* client doesn't accept geometry, so enforce it */
+			resize(c, nx, ny, nw, nh, False);
 		if(n > 1 && th != wah)
-			ny += nh + 2 * c->border;
+			ny = c->y + c->h + 2 * c->border;
 	}
 }
 
-static void
+void
 togglebar(const char *arg) {
 	if(bpos == BarOff)
 		bpos = (BARPOS == BarOff) ? BarTop : BARPOS;
@@ -1611,7 +1614,7 @@ togglebar(const char *arg) {
 	arrange();
 }
 
-static void
+void
 togglefloating(const char *arg) {
 	if(!sel)
 		return;
@@ -1621,26 +1624,35 @@ togglefloating(const char *arg) {
 	arrange();
 }
 
-static void
+void
 togglemax(const char *arg) {
 	XEvent ev;
 
-	if(!sel || (!isarrange(floating) && !sel->isfloating) || sel->isfixed)
+	if(!sel || sel->isfixed)
 		return;
 	if((sel->ismax = !sel->ismax)) {
+		if(isarrange(floating) || sel->isfloating)
+			sel->wasfloating = True;
+		else {
+			togglefloating(NULL);
+			sel->wasfloating = False;
+		}
 		sel->rx = sel->x;
 		sel->ry = sel->y;
 		sel->rw = sel->w;
 		sel->rh = sel->h;
 		resize(sel, wax, way, waw - 2 * sel->border, wah - 2 * sel->border, True);
 	}
-	else
+	else {
 		resize(sel, sel->rx, sel->ry, sel->rw, sel->rh, True);
+		if(!sel->wasfloating)
+			togglefloating(NULL);
+	}
 	drawbar();
 	while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }
 
-static void
+void
 toggletag(const char *arg) {
 	unsigned int i, j;
 
@@ -1648,25 +1660,25 @@ toggletag(const char *arg) {
 		return;
 	i = idxoftag(arg);
 	sel->tags[i] = !sel->tags[i];
-	for(j = 0; j < ntags && !sel->tags[j]; j++);
-	if(j == ntags)
-		sel->tags[i] = True;
+	for(j = 0; j < NTAGS && !sel->tags[j]; j++);
+	if(j == NTAGS)
+		sel->tags[i] = True; /* at least one tag must be enabled */
 	arrange();
 }
 
-static void
+void
 toggleview(const char *arg) {
 	unsigned int i, j;
 
 	i = idxoftag(arg);
 	seltags[i] = !seltags[i];
-	for(j = 0; j < ntags && !seltags[j]; j++);
-	if(j == ntags)
-		seltags[i] = True; /* cannot toggle last view */
+	for(j = 0; j < NTAGS && !seltags[j]; j++);
+	if(j == NTAGS)
+		seltags[i] = True; /* at least one tag must be viewed */
 	arrange();
 }
 
-static void
+void
 unban(Client *c) {
 	if(!c->isbanned)
 		return;
@@ -1674,7 +1686,7 @@ unban(Client *c) {
 	c->isbanned = False;
 }
 
-static void
+void
 unmanage(Client *c) {
 	XWindowChanges wc;
 
@@ -1697,7 +1709,7 @@ unmanage(Client *c) {
 	arrange();
 }
 
-static void
+void
 unmapnotify(XEvent *e) {
 	Client *c;
 	XUnmapEvent *ev = &e->xunmap;
@@ -1706,7 +1718,7 @@ unmapnotify(XEvent *e) {
 		unmanage(c);
 }
 
-static void
+void
 updatebarpos(void) {
 	XEvent ev;
 
@@ -1732,7 +1744,7 @@ updatebarpos(void) {
 	while(XCheckMaskEvent(dpy, EnterWindowMask, &ev));
 }
 
-static void
+void
 updatesizehints(Client *c) {
 	long msize;
 	XSizeHints size;
@@ -1784,7 +1796,7 @@ updatesizehints(Client *c) {
 			&& c->maxw == c->minw && c->maxh == c->minh);
 }
 
-static void
+void
 updatetitle(Client *c) {
 	if(!gettextprop(c->win, netatom[NetWMName], c->name, sizeof c->name))
 		gettextprop(c->win, wmatom[WMName], c->name, sizeof c->name);
@@ -1793,7 +1805,7 @@ updatetitle(Client *c) {
 /* There's no way to check accesses to destroyed windows, thus those cases are
  * ignored (especially on UnmapNotify's).  Other types of errors call Xlibs
  * default error handler, which may call exit.  */
-static int
+int
 xerror(Display *dpy, XErrorEvent *ee) {
 	if(ee->error_code == BadWindow
 	|| (ee->request_code == X_SetInputFocus && ee->error_code == BadMatch)
@@ -1809,36 +1821,45 @@ xerror(Display *dpy, XErrorEvent *ee) {
 	return xerrorxlib(dpy, ee); /* may call exit */
 }
 
-static int
+int
 xerrordummy(Display *dsply, XErrorEvent *ee) {
 	return 0;
 }
 
 /* Startup Error handler to check if another window manager
  * is already running. */
-static int
+int
 xerrorstart(Display *dsply, XErrorEvent *ee) {
 	otherwm = True;
 	return -1;
 }
 
-static void
+void
 view(const char *arg) {
 	unsigned int i;
 
-	for(i = 0; i < ntags; i++)
+	memcpy(prevtags, seltags, sizeof seltags);
+	for(i = 0; i < NTAGS; i++)
 		seltags[i] = arg == NULL;
-	i = idxoftag(arg);
-	if(i >= 0 && i < ntags)
-		seltags[i] = True;
+	seltags[idxoftag(arg)] = True;
+	arrange();
+}
+
+void
+viewprevtag(const char *arg) {
+	static Bool tmptags[sizeof tags / sizeof tags[0]];
+
+	memcpy(tmptags, seltags, sizeof seltags);
+	memcpy(seltags, prevtags, sizeof seltags);
+	memcpy(prevtags, tmptags, sizeof seltags);
 	arrange();
 }
 
-static void
+void
 zoom(const char *arg) {
 	Client *c;
 
-	if(!sel || !isarrange(tile) || sel->isfloating)
+	if(!sel || !(ISTILE) || sel->isfloating)
 		return;
 	if((c = sel) == nexttiled(clients))
 		if(!(c = nexttiled(c->next)))