X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=dwm.c;h=8ae4c0e8fc7c0573a661140ced2463d751b01aae;hb=f25cc5678fcc405a55df7f49e7b3189241933a97;hp=9746c1d532a534aa3bcbc296599f154fb88e9158;hpb=fde58d5e637d700981eaed69d172d3dbfcaee215;p=dwm.git

diff --git a/dwm.c b/dwm.c
index 9746c1d..8ae4c0e 100644
--- a/dwm.c
+++ b/dwm.c
@@ -59,22 +59,38 @@ enum { CurNormal, CurResize, CurMove, CurLast };        /* cursor */
 enum { ColBorder, ColFG, ColBG, ColLast };              /* color */
 enum { NetSupported, NetWMName, NetLast };              /* EWMH atoms */
 enum { WMProtocols, WMDelete, WMName, WMState, WMLast };/* default atoms */
+enum { ClkLtSymbol = 64, ClkStatusText, ClkWinTitle,
+       ClkClientWin, ClkRootWin, ClkLast };             /* clicks */
 
 /* typedefs */
 typedef unsigned int uint;
 typedef unsigned long ulong;
+
+typedef union {
+	int i;
+	uint ui;
+	float f;
+	void *v;
+} Arg;
+
+typedef struct {
+	uint click;
+	uint mask;
+	uint button;
+	void (*func)(const Arg *arg);
+	const Arg arg;
+} Button;
+
 typedef struct Client Client;
 struct Client {
 	char name[256];
+	float mina, maxa;
 	int x, y, w, h;
 	int basew, baseh, incw, inch, maxw, maxh, minw, minh;
-	int minax, maxax, minay, maxay;
-	long flags;
 	int bw, oldbw;
-	Bool isbanned, isfixed, isfloating, ismoved, isurgent;
 	uint tags;
+	Bool isbanned, isfixed, isfloating, ismoved, isurgent;
 	Client *next;
-	Client *prev;
 	Client *snext;
 	Window win;
 };
@@ -97,8 +113,8 @@ typedef struct {
 typedef struct {
 	uint mod;
 	KeySym keysym;
-	void (*func)(const void *arg);
-	const void *arg;
+	void (*func)(const Arg *);
+	const Arg arg;
 } Key;
 
 typedef struct {
@@ -115,88 +131,86 @@ typedef struct {
 } Rule;
 
 /* function declarations */
-void applyrules(Client *c);
-void arrange(void);
-void attach(Client *c);
-void attachstack(Client *c);
-void buttonpress(XEvent *e);
-void checkotherwm(void);
-void cleanup(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, 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(const void *arg);
-void focusprev(const void *arg);
-Client *getclient(Window w);
-ulong getcolor(const char *colstr);
-long getstate(Window w);
-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(uint t);
-Bool isprotodel(Client *c);
-Bool isurgent(uint t);
-void keypress(XEvent *e);
-void killclient(const void *arg);
-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 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(const void *arg);
-void setup(void);
-void spawn(const void *arg);
-void tag(const void *arg);
-uint textnw(const char *text, uint len);
-void tile(void);
-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);
-void updategeom(void);
-void updatesizehints(Client *c);
-void updatetitle(Client *c);
-void updatewmhints(Client *c);
-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(const void *arg);
+static void applyrules(Client *c);
+static void arrange(void);
+static void attach(Client *c);
+static void attachstack(Client *c);
+static void buttonpress(XEvent *e);
+static void checkotherwm(void);
+static void cleanup(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, Bool invert, ulong col[ColLast]);
+static void drawtext(const char *text, ulong col[ColLast], Bool invert);
+static void enternotify(XEvent *e);
+static void eprint(const char *errstr, ...);
+static void expose(XEvent *e);
+static void focus(Client *c);
+static void focusin(XEvent *e);
+static void focusstack(const Arg *arg);
+static Client *getclient(Window w);
+static ulong getcolor(const char *colstr);
+static long getstate(Window w);
+static Bool gettextprop(Window w, Atom atom, char *text, uint size);
+static void grabbuttons(Client *c, Bool focused);
+static void grabkeys(void);
+static void initfont(const char *fontstr);
+static Bool isoccupied(uint t);
+static Bool isprotodel(Client *c);
+static Bool isurgent(uint t);
+static void keypress(XEvent *e);
+static void killclient(const Arg *arg);
+static void manage(Window w, XWindowAttributes *wa);
+static void mappingnotify(XEvent *e);
+static void maprequest(XEvent *e);
+static void movemouse(const Arg *arg);
+static Client *nexttiled(Client *c);
+static void propertynotify(XEvent *e);
+static void quit(const Arg *arg);
+static void resize(Client *c, int x, int y, int w, int h, Bool sizehints);
+static void resizemouse(const Arg *arg);
+static void restack(void);
+static void run(void);
+static void scan(void);
+static void setclientstate(Client *c, long state);
+static void setmfact(const Arg *arg);
+static void setup(void);
+static void spawn(const Arg *arg);
+static void tag(const Arg *arg);
+static int textnw(const char *text, uint len);
+static void tile(void);
+static void togglebar(const Arg *arg);
+static void togglefloating(const Arg *arg);
+static void togglelayout(const Arg *arg);
+static void togglemax(const Arg *arg);
+static void toggletag(const Arg *arg);
+static void toggleview(const Arg *arg);
+static void unmanage(Client *c);
+static void unmapnotify(XEvent *e);
+static void updatebar(void);
+static void updategeom(void);
+static void updatesizehints(Client *c);
+static void updatetitle(Client *c);
+static void updatewmhints(Client *c);
+static void view(const Arg *arg);
+static int xerror(Display *dpy, XErrorEvent *ee);
+static int xerrordummy(Display *dpy, XErrorEvent *ee);
+static int xerrorstart(Display *dpy, XErrorEvent *ee);
+static void zoom(const Arg *arg);
 
 /* variables */
-char stext[256];
-int screen, sx, sy, sw, sh;
-int by, bh, blw, wx, wy, ww, wh;
-uint seltags = 0;
-int (*xerrorxlib)(Display *, XErrorEvent *);
-uint numlockmask = 0;
-void (*handler[LASTEvent]) (XEvent *) = {
+static char stext[256];
+static int screen, sx, sy, sw, sh;
+static int by, bh, blw, wx, wy, ww, wh;
+static uint seltags = 0;
+static int (*xerrorxlib)(Display *, XErrorEvent *);
+static uint numlockmask = 0;
+static void (*handler[LASTEvent]) (XEvent *) = {
 	[ButtonPress] = buttonpress,
 	[ConfigureRequest] = configurerequest,
 	[ConfigureNotify] = configurenotify,
@@ -210,21 +224,19 @@ void (*handler[LASTEvent]) (XEvent *) = {
 	[PropertyNotify] = propertynotify,
 	[UnmapNotify] = unmapnotify
 };
-Atom wmatom[WMLast], netatom[NetLast];
-Bool ismax = False;
-Bool otherwm, readin;
-Bool running = True;
-uint tagset[] = {1, 1}; /* after start, first tag is selected */
-Client *clients = NULL;
-Client *sel = NULL;
-Client *stack = NULL;
-Cursor cursor[CurLast];
-Display *dpy;
-DC dc = {0};
-Layout layouts[];
-Layout *lt = layouts;
-Window root, barwin;
-
+static Atom wmatom[WMLast], netatom[NetLast];
+static Bool ismax = False;
+static Bool otherwm, readin;
+static Bool running = True;
+static uint tagset[] = {1, 1}; /* after start, first tag is selected */
+static Client *clients = NULL;
+static Client *sel = NULL;
+static Client *stack = NULL;
+static Cursor cursor[CurLast];
+static Display *dpy;
+static DC dc = {0};
+static Layout *lt = NULL;
+static Window root, barwin;
 /* configuration, allows nested code to access above variables */
 #include "config.h"
 
@@ -284,8 +296,6 @@ arrange(void) {
 
 void
 attach(Client *c) {
-	if(clients)
-		clients->prev = c;
 	c->next = clients;
 	clients = c;
 }
@@ -298,49 +308,34 @@ attachstack(Client *c) {
 
 void
 buttonpress(XEvent *e) {
-	uint i, x, mask;
+	uint i, x, click;
 	Client *c;
 	XButtonPressedEvent *ev = &e->xbutton;
 
+	click = ClkRootWin;
 	if(ev->window == barwin) {
-		x = 0;
-		for(i = 0; i < LENGTH(tags); i++) {
+		i = x = 0;
+		do
 			x += TEXTW(tags[i]);
-			if(ev->x < x) {
-				mask = 1 << i;
-				if(ev->button == Button1) {
-					if(ev->state & MODKEY)
-						tag(&mask);
-					else
-						view(&mask);
-				}
-				else if(ev->button == Button3) {
-					if(ev->state & MODKEY)
-						toggletag(&mask);
-					else
-						toggleview(&mask);
-				}
-				return;
-			}
-		}
-		if(ev->x < x + blw) {
-			if(ev->button == Button1) 
-				togglelayout(NULL);
-			else if(ev->button == Button3) 
-				togglemax(NULL);
-		}
+		while(ev->x >= x && ++i < LENGTH(tags));
+		if(i < LENGTH(tags))
+			click = i;
+		else if(ev->x < x + blw)
+			click = ClkLtSymbol;
+		else if(ev->x > wx + ww - TEXTW(stext))
+			click = ClkStatusText;
+		else
+			click = ClkWinTitle;
 	}
 	else if((c = getclient(ev->window))) {
 		focus(c);
-		if(CLEANMASK(ev->state) != MODKEY || (ismax && !c->isfixed))
-			return;
-		if(ev->button == Button1)
-			movemouse(c);
-		else if(ev->button == Button2)
-			togglefloating(NULL);
-		else if(ev->button == Button3 && !c->isfixed)
-			resizemouse(c);
+		click = ClkClientWin;
 	}
+
+	for(i = 0; i < LENGTH(buttons); i++)
+		if(click == buttons[i].click && buttons[i].func && buttons[i].button == ev->button
+		   && CLEANMASK(buttons[i].mask) == CLEANMASK(ev->state))
+			buttons[i].func(&buttons[i].arg);
 }
 
 void
@@ -360,8 +355,12 @@ checkotherwm(void) {
 
 void
 cleanup(void) {
+	Arg a = {.i = ~0};
+	Layout foo = { "", NULL };
+
 	close(STDIN_FILENO);
-	view((uint[]){~0});
+	view(&a);
+	lt = &foo;
 	while(stack)
 		unmanage(stack);
 	if(dc.font.set)
@@ -419,7 +418,9 @@ configurerequest(XEvent *e) {
 	if((c = getclient(ev->window))) {
 		if(ev->value_mask & CWBorderWidth)
 			c->bw = ev->border_width;
-		if(c->isfixed || c->isfloating || !lt->arrange) {
+		if(ismax && !c->isbanned && !c->isfixed)
+			XMoveResizeWindow(dpy, c->win, wx, wy, ww - 2 * c->bw, wh + 2 * c->bw);
+		else if(c->isfloating || !lt->arrange) {
 			if(ev->value_mask & CWX)
 				c->x = sx + ev->x;
 			if(ev->value_mask & CWY)
@@ -465,13 +466,16 @@ destroynotify(XEvent *e) {
 
 void
 detach(Client *c) {
-	if(c->prev)
-		c->prev->next = c->next;
-	if(c->next)
-		c->next->prev = c->prev;
-	if(c == clients)
+	Client *i;
+
+	if (c != clients) {
+		for(i = clients; i->next != c; i = i->next);
+		i->next = c->next;
+	}
+	else {
 		clients = c->next;
-	c->next = c->prev = NULL;
+	}
+	c->next =  NULL;
 }
 
 void
@@ -551,8 +555,7 @@ drawsquare(Bool filled, Bool empty, Bool invert, ulong col[ColLast]) {
 
 void
 drawtext(const char *text, ulong col[ColLast], Bool invert) {
-	int x, y, w, h;
-	uint len, olen;
+	int i, x, y, h, len, olen;
 	XRectangle r = { dc.x, dc.y, dc.w, dc.h };
 	char buf[256];
 
@@ -563,22 +566,15 @@ drawtext(const char *text, ulong col[ColLast], Bool invert) {
 	olen = strlen(text);
 	len = MIN(olen, sizeof buf);
 	memcpy(buf, text, len);
-	w = 0;
 	h = dc.font.ascent + dc.font.descent;
 	y = dc.y + (dc.h / 2) - (h / 2) + dc.font.ascent;
 	x = dc.x + (h / 2);
 	/* shorten text if necessary */
-	for(; len && (w = textnw(buf, len)) > dc.w - h; len--);
+	for(; len && (i = textnw(buf, len)) > dc.w - h; len--);
 	if(!len)
 		return;
-	if(len < olen) {
-		if(len > 1)
-			buf[len - 1] = '.';
-		if(len > 2)
-			buf[len - 2] = '.';
-		if(len > 3)
-			buf[len - 3] = '.';
-	}
+	if(len < olen)
+		for(i = len; i && i > len - 3; buf[--i] = '.');
 	XSetForeground(dpy, dc.gc, col[invert ? ColBG : ColFG]);
 	if(dc.font.set)
 		XmbDrawString(dpy, dc.drawable, dc.font.set, dc.gc, x, y, buf, len);
@@ -619,7 +615,7 @@ expose(XEvent *e) {
 
 void
 focus(Client *c) {
-	if(!c || (c && c->isbanned))
+	if(!c || c->isbanned)
 		for(c = stack; c && c->isbanned; c = c->snext);
 	if(sel && sel != c) {
 		grabbuttons(sel, False);
@@ -629,14 +625,12 @@ focus(Client *c) {
 		detachstack(c);
 		attachstack(c);
 		grabbuttons(c, True);
-	}
-	sel = c;
-	if(c) {
 		XSetWindowBorder(dpy, c->win, dc.sel[ColBorder]);
 		XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
 	}
 	else
 		XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
+	sel = c;
 	drawbar();
 }
 
@@ -649,30 +643,24 @@ focusin(XEvent *e) { /* there are some broken focus acquiring clients */
 }
 
 void
-focusnext(const void *arg) {
-	Client *c;
+focusstack(const Arg *arg) {
+	Client *c = NULL, *i;
 
 	if(!sel)
 		return;
-	for(c = sel->next; c && c->isbanned; c = c->next);
-	if(!c)
-		for(c = clients; c && c->isbanned; c = c->next);
-	if(c) {
-		focus(c);
-		restack();
+	if (arg->i > 0) {
+		for(c = sel->next; c && c->isbanned; c = c->next);
+		if(!c)
+			for(c = clients; c && c->isbanned; c = c->next);
 	}
-}
-
-void
-focusprev(const void *arg) {
-	Client *c;
-
-	if(!sel)
-		return;
-	for(c = sel->prev; c && c->isbanned; c = c->prev);
-	if(!c) {
-		for(c = clients; c && c->next; c = c->next);
-		for(; c && c->isbanned; c = c->prev);
+	else {
+		for(i = clients; i != sel; i = i->next)
+			if (!i->isbanned)
+				c = i;
+		if(!c)
+			for(; i; i = i->next)
+				if (!i->isbanned)
+					c = i;
 	}
 	if(c) {
 		focus(c);
@@ -746,8 +734,7 @@ void
 grabbuttons(Client *c, Bool focused) {
 	int i, j;
 	uint buttons[]   = { Button1, Button2, Button3 };
-	uint modifiers[] = { MODKEY, MODKEY|LockMask, MODKEY|numlockmask,
-				MODKEY|numlockmask|LockMask} ;
+	uint modifiers[] = { MODKEY, MODKEY|LockMask, MODKEY|numlockmask, MODKEY|numlockmask|LockMask };
 
 	XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
 	if(focused)
@@ -876,11 +863,11 @@ keypress(XEvent *e) {
 		if(keysym == keys[i].keysym
 		   && CLEANMASK(keys[i].mod) == CLEANMASK(ev->state)
 		   && keys[i].func)
-			keys[i].func(keys[i].arg);
+			keys[i].func(&(keys[i].arg));
 }
 
 void
-killclient(const void *arg) {
+killclient(const Arg *arg) {
 	XEvent ev;
 
 	if(!sel)
@@ -926,7 +913,8 @@ manage(Window w, XWindowAttributes *wa) {
 		if(c->y + c->h + 2 * c->bw > sy + sh)
 			c->y = sy + sh - c->h - 2 * c->bw;
 		c->x = MAX(c->x, sx);
-		c->y = MAX(c->y, by == 0 ? bh : sy);
+		/* only fix client y-offset, if the client center might cover the bar */
+		c->y = MAX(c->y, ((by == 0) && (c->x + (c->w / 2) >= wx) && (c->x + (c->w / 2) < wx + ww)) ? bh : sy);
 		c->bw = borderpx;
 	}
 
@@ -946,6 +934,8 @@ manage(Window w, XWindowAttributes *wa) {
 		applyrules(c);
 	if(!c->isfloating)
 		c->isfloating = (rettrans == Success) || c->isfixed;
+	if(c->isfloating)
+		XRaiseWindow(dpy, c->win);
 	attach(c);
 	attachstack(c);
 	XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h); /* some windows require this */
@@ -977,12 +967,15 @@ maprequest(XEvent *e) {
 }
 
 void
-movemouse(Client *c) {
+movemouse(const Arg *arg) {
 	int x1, y1, ocx, ocy, di, nx, ny;
 	uint dui;
+	Client *c;
 	Window dummy;
 	XEvent ev;
 
+	if(!(c = sel))
+		return;
 	restack();
 	ocx = nx = c->x;
 	ocy = ny = c->y;
@@ -1064,7 +1057,7 @@ propertynotify(XEvent *e) {
 }
 
 void
-quit(const void *arg) {
+quit(const Arg *arg) {
 	readin = running = False;
 }
 
@@ -1082,12 +1075,11 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
 		h -= c->baseh;
 
 		/* adjust for aspect limits */
-		if(c->minax != c->maxax && c->minay != c->maxay 
-		&& c->minax > 0 && c->maxax > 0 && c->minay > 0 && c->maxay > 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->mina > 0 && c->maxa > 0) {
+			if(c->maxa < (float) w/h)
+				w = h * c->maxa;
+			else if(c->mina > (float) h/w)
+				h = w * c->mina;
 		}
 
 		/* adjust for increment value */
@@ -1102,11 +1094,11 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
 
 		w = MAX(w, c->minw);
 		h = MAX(h, c->minh);
-		
-		if (c->maxw)
+
+		if(c->maxw)
 			w = MIN(w, c->maxw);
 
-		if (c->maxh)
+		if(c->maxh)
 			h = MIN(h, c->maxh);
 	}
 	if(w <= 0 || h <= 0)
@@ -1124,7 +1116,7 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
 	if(w < bh)
 		w = bh;
 	if(c->x != x || c->y != y || c->w != w || c->h != h || c->ismoved) {
-		c->isbanned = c->ismoved = False;
+		c->ismoved = False;
 		c->x = wc.x = x;
 		c->y = wc.y = y;
 		c->w = wc.width = w;
@@ -1138,11 +1130,14 @@ resize(Client *c, int x, int y, int w, int h, Bool sizehints) {
 }
 
 void
-resizemouse(Client *c) {
+resizemouse(const Arg *arg) {
 	int ocx, ocy;
 	int nw, nh;
+	Client *c;
 	XEvent ev;
 
+	if(!(c = sel))
+		return;
 	restack();
 	ocx = c->x;
 	ocy = c->y;
@@ -1303,32 +1298,34 @@ setclientstate(Client *c, long state) {
 
 /* arg > 1.0 will set mfact absolutly */
 void
-setmfact(const void *arg) {
-	double d = *((double*) arg);
+setmfact(const Arg *arg) {
+	float f;
 
-	if(!d || lt->arrange != tile)
+	if(!arg || !lt->arrange)
 		return;
-	d = d < 1.0 ? d + mfact : d - 1.0;
-	if(d < 0.1 || d > 0.9)
+	f = arg->f < 1.0 ? arg->f + mfact : arg->f - 1.0;
+	if(f < 0.1 || f > 0.9)
 		return;
-	mfact = d;
+	mfact = f;
 	arrange();
 }
 
 void
 setup(void) {
-	uint i, w;
+	uint i;
+	int w;
 	XSetWindowAttributes wa;
 
 	/* init screen */
 	screen = DefaultScreen(dpy);
 	root = RootWindow(dpy, screen);
-	initfont(FONT);
+	initfont(font);
 	sx = 0;
 	sy = 0;
 	sw = DisplayWidth(dpy, screen);
 	sh = DisplayHeight(dpy, screen);
-	bh = dc.font.height + 2;
+	bh = dc.h = dc.font.height + 2;
+	lt = layouts;
 	updategeom();
 
 	/* init atoms */
@@ -1345,14 +1342,12 @@ setup(void) {
 	cursor[CurMove] = XCreateFontCursor(dpy, XC_fleur);
 
 	/* init appearance */
-	dc.norm[ColBorder] = getcolor(NORMBORDERCOLOR);
-	dc.norm[ColBG] = getcolor(NORMBGCOLOR);
-	dc.norm[ColFG] = getcolor(NORMFGCOLOR);
-	dc.sel[ColBorder] = getcolor(SELBORDERCOLOR);
-	dc.sel[ColBG] = getcolor(SELBGCOLOR);
-	dc.sel[ColFG] = getcolor(SELFGCOLOR);
-	initfont(FONT);
-	dc.h = bh;
+	dc.norm[ColBorder] = getcolor(normbordercolor);
+	dc.norm[ColBG] = getcolor(normbgcolor);
+	dc.norm[ColFG] = getcolor(normfgcolor);
+	dc.sel[ColBorder] = getcolor(selbordercolor);
+	dc.sel[ColBG] = getcolor(selbgcolor);
+	dc.sel[ColFG] = getcolor(selfgcolor);
 	dc.drawable = XCreatePixmap(dpy, root, DisplayWidth(dpy, screen), bh, DefaultDepth(dpy, screen));
 	dc.gc = XCreateGC(dpy, root, 0, 0);
 	XSetLineAttributes(dpy, dc.gc, 1, LineSolid, CapButt, JoinMiter);
@@ -1382,7 +1377,7 @@ setup(void) {
 			PropModeReplace, (unsigned char *) netatom, NetLast);
 
 	/* select for events */
-	wa.event_mask = SubstructureRedirectMask|SubstructureNotifyMask
+	wa.event_mask = SubstructureRedirectMask|SubstructureNotifyMask|ButtonPressMask
 			|EnterWindowMask|LeaveWindowMask|StructureNotifyMask;
 	XChangeWindowAttributes(dpy, root, CWEventMask|CWCursor, &wa);
 	XSelectInput(dpy, root, wa.event_mask);
@@ -1393,11 +1388,7 @@ setup(void) {
 }
 
 void
-spawn(const void *arg) {
-	static char *shell = NULL;
-
-	if(!shell && !(shell = getenv("SHELL")))
-		shell = "/bin/sh";
+spawn(const Arg *arg) {
 	/* The double-fork construct avoids zombie processes and keeps the code
 	 * clean from stupid signal handlers. */
 	if(fork() == 0) {
@@ -1405,8 +1396,8 @@ spawn(const void *arg) {
 			if(dpy)
 				close(ConnectionNumber(dpy));
 			setsid();
-			execl(shell, shell, "-c", (char *)arg, (char *)NULL);
-			fprintf(stderr, "dwm: execl '%s -c %s'", shell, (char *)arg);
+			execvp(((char **)arg->v)[0], (char **)arg->v);
+			fprintf(stderr, "dwm: execvp %s", ((char **)arg->v)[0]);
 			perror(" failed");
 		}
 		exit(0);
@@ -1415,14 +1406,14 @@ spawn(const void *arg) {
 }
 
 void
-tag(const void *arg) {
-	if(sel && *(int *)arg & TAGMASK) {
-		sel->tags = *(int *)arg & TAGMASK;
+tag(const Arg *arg) {
+	if(sel && arg->ui & TAGMASK) {
+		sel->tags = arg->ui & TAGMASK;
 		arrange();
 	}
 }
 
-uint
+int
 textnw(const char *text, uint len) {
 	XRectangle r;
 
@@ -1446,13 +1437,13 @@ tile(void) {
 	/* master */
 	c = nexttiled(clients);
 	mw = mfact * ww;
-	resize(c, wx, wy, ((n == 1) ? ww : mw) - 2 * c->bw, wh - 2 * c->bw, resizehints);
+	resize(c, wx, wy, (n == 1 ? ww : mw) - 2 * c->bw, wh - 2 * c->bw, resizehints);
 
 	if(--n == 0)
 		return;
 
 	/* tile stack */
-	x = (wx + mw > c->x + c->w) ? c->x + c->w + 2 * c->bw : ww - mw;
+	x = (wx + mw > c->x + c->w) ? c->x + c->w + 2 * c->bw : wx + mw;
 	y = wy;
 	w = (wx + mw > c->x + c->w) ? wx + ww - x : ww - mw;
 	h = wh / n;
@@ -1468,7 +1459,7 @@ tile(void) {
 }
 
 void
-togglebar(const void *arg) {
+togglebar(const Arg *arg) {
 	showbar = !showbar;
 	updategeom();
 	updatebar();
@@ -1476,7 +1467,7 @@ togglebar(const void *arg) {
 }
 
 void
-togglefloating(const void *arg) {
+togglefloating(const Arg *arg) {
 	if(!sel)
 		return;
 	sel->isfloating = !sel->isfloating || sel->isfixed;
@@ -1486,21 +1477,11 @@ togglefloating(const void *arg) {
 }
 
 void
-togglelayout(const void *arg) {
-	uint i;
-
-	if(!arg) {
-		if(++lt == &layouts[LENGTH(layouts)])
-			lt = &layouts[0];
-	}
-	else {
-		for(i = 0; i < LENGTH(layouts); i++)
-			if(!strcmp((char *)arg, layouts[i].symbol))
-				break;
-		if(i == LENGTH(layouts))
-			return;
-		lt = &layouts[i];
-	}
+togglelayout(const Arg *arg) {
+	if(arg && arg->v)
+		lt = (Layout *)arg->v;
+	else if(++lt == &layouts[LENGTH(layouts)])
+		lt = &layouts[0];
 	if(sel)
 		arrange();
 	else
@@ -1508,25 +1489,21 @@ togglelayout(const void *arg) {
 }
 
 void
-togglemax(const void *arg) {
+togglemax(const Arg *arg) {
 	ismax = !ismax;
 	arrange();
 }
 
 void
-toggletag(const void *arg) {
-	if(sel && (sel->tags ^ ((*(int *)arg) & TAGMASK))) {
-		sel->tags ^= (*(int *)arg) & TAGMASK;
+toggletag(const Arg *arg) {
+	if(sel && (sel->tags ^= (arg->ui & TAGMASK)))
 		arrange();
-	}
 }
 
 void
-toggleview(const void *arg) {
-	if((tagset[seltags] ^ ((*(int *)arg) & TAGMASK))) {
-		tagset[seltags] ^= (*(int *)arg) & TAGMASK;
+toggleview(const Arg *arg) {
+	if((tagset[seltags] ^= (arg->ui & TAGMASK)))
 		arrange();
-	}
 }
 
 void
@@ -1570,17 +1547,17 @@ updatebar(void) {
 
 void
 updategeom(void) {
-	int i;
 #ifdef XINERAMA
+	int i;
 	XineramaScreenInfo *info = NULL;
 
 	/* window area geometry */
 	if(XineramaIsActive(dpy)) {
 		info = XineramaQueryScreens(dpy, &i);
-		wx = info[0].x_org;
-		wy = showbar && topbar ? info[0].y_org + bh : info[0].y_org;
-		ww = info[0].width;
-		wh = showbar ? info[0].height - bh : info[0].height;
+		wx = info[xidx].x_org;
+		wy = showbar && topbar ?  info[xidx].y_org + bh : info[xidx].y_org;
+		ww = info[xidx].width;
+		wh = showbar ? info[xidx].height - bh : info[xidx].height;
 		XFree(info);
 	}
 	else
@@ -1601,49 +1578,45 @@ updatesizehints(Client *c) {
 	long msize;
 	XSizeHints size;
 
-	if(!XGetWMNormalHints(dpy, c->win, &size, &msize) || !size.flags)
-		size.flags = PSize;
-	c->flags = size.flags;
-	if(c->flags & PBaseSize) {
+	XGetWMNormalHints(dpy, c->win, &size, &msize);
+	if(size.flags & PBaseSize) {
 		c->basew = size.base_width;
 		c->baseh = size.base_height;
 	}
-	else if(c->flags & PMinSize) {
+	else if(size.flags & PMinSize) {
 		c->basew = size.min_width;
 		c->baseh = size.min_height;
 	}
 	else
 		c->basew = c->baseh = 0;
-	if(c->flags & PResizeInc) {
+	if(size.flags & PResizeInc) {
 		c->incw = size.width_inc;
 		c->inch = size.height_inc;
 	}
 	else
 		c->incw = c->inch = 0;
-	if(c->flags & PMaxSize) {
+	if(size.flags & PMaxSize) {
 		c->maxw = size.max_width;
 		c->maxh = size.max_height;
 	}
 	else
 		c->maxw = c->maxh = 0;
-	if(c->flags & PMinSize) {
+	if(size.flags & PMinSize) {
 		c->minw = size.min_width;
 		c->minh = size.min_height;
 	}
-	else if(c->flags & PBaseSize) {
+	else if(size.flags & PBaseSize) {
 		c->minw = size.base_width;
 		c->minh = size.base_height;
 	}
 	else
 		c->minw = c->minh = 0;
-	if(c->flags & PAspect) {
-		c->minax = size.min_aspect.x;
-		c->maxax = size.max_aspect.x;
-		c->minay = size.min_aspect.y;
-		c->maxay = size.max_aspect.y;
+	if(size.flags & PAspect) {
+		c->mina = (float)size.min_aspect.y / (float)size.min_aspect.x;
+		c->maxa = (float)size.max_aspect.x / (float)size.max_aspect.y;
 	}
 	else
-		c->minax = c->maxax = c->minay = c->maxay = 0;
+		c->maxa = c->mina = 0.0;
 	c->isfixed = (c->maxw && c->minw && c->maxh && c->minh
 			&& c->maxw == c->minw && c->maxh == c->minh);
 }
@@ -1668,17 +1641,10 @@ updatewmhints(Client *c) {
 }
 
 void
-view(const void *arg) {
-	if(*(int *)arg & TAGMASK) {
-		seltags ^= 1; /* toggle sel tagset */
-		tagset[seltags] = *(int *)arg & TAGMASK;
-		arrange();
-	}
-}
-
-void
-viewprevtag(const void *arg) {
+view(const Arg *arg) {
 	seltags ^= 1; /* toggle sel tagset */
+	if(arg && (arg->ui & TAGMASK))
+		tagset[seltags] = arg->i & TAGMASK;
 	arrange();
 }
 
@@ -1716,10 +1682,10 @@ xerrorstart(Display *dpy, XErrorEvent *ee) {
 }
 
 void
-zoom(const void *arg) {
+zoom(const Arg *arg) {
 	Client *c = sel;
 
-	if(!lt->arrange || sel->isfloating)
+	if(ismax || !lt->arrange || (sel && sel->isfloating))
 		return;
 	if(c == nexttiled(clients))
 		if(!c || !(c = nexttiled(c->next)))