prepared 0.4

.hgtags

@@ -1 +1,3 @@
 d31b5ad96b0ba7b5b0a30928fcf000428339a577 0.1
+0a6472e2203994bc5738d40a340d26f7ec9d6062 0.2
+7e66082e5092fb0bccd18a3695a0bec52c80fdb2 0.3

Makefile

@@ -8,10 +8,10 @@ OBJ = ${SRC:.c=.o}
 MAN1 = dwm.1 
 BIN = dwm
 
-all: config dwm
+all: options dwm
 	@echo finished
 
-config:
+options:
 	@echo dwm build options:
 	@echo "LIBS     = ${LIBS}"
 	@echo "CFLAGS   = ${CFLAGS}"
@@ -41,9 +41,15 @@ dist: clean
 install: all
 	@mkdir -p ${DESTDIR}${PREFIX}/bin
 	@cp -f ${BIN} ${DESTDIR}${PREFIX}/bin
+	@for i in ${BIN}; do \
+		chmod 755 ${DESTDIR}${PREFIX}/bin/`basename $$i`; \
+	done
 	@echo installed executable files to ${DESTDIR}${PREFIX}/bin
 	@mkdir -p ${DESTDIR}${MANPREFIX}/man1
 	@cp -f ${MAN1} ${DESTDIR}${MANPREFIX}/man1
+	@for i in ${MAN1}; do \
+		chmod 444 ${DESTDIR}${MANPREFIX}/man1/`basename $$i`; \
+	done
 	@echo installed manual pages to ${DESTDIR}${MANPREFIX}/man1
 
 uninstall:

README

@@ -36,5 +36,5 @@ This will start dwm on display :1 of the host foo.bar.
 
 Configuration
 -------------
-The configuration of dwm is done by customizing the wm.h source file. To
+The configuration of dwm is done by customizing source code,
-customize the key bindings edit dev.c.
+grep for CUSTOMIZE keyword.

TODO

@@ -1 +0,0 @@
-- improve mouse based resizals with quadrant approach (then I think we have feature completeness already)

client.c

@@ -25,7 +25,11 @@ resizetitle(Client *c)
 		c->tw = c->w + 2;
 	c->tx = c->x + c->w - c->tw + 2;
 	c->ty = c->y;
+	if(c->tags[tsel])
 		XMoveResizeWindow(dpy, c->title, c->tx, c->ty, c->tw, c->th);
+	else
+		XMoveResizeWindow(dpy, c->title, c->tx + 2 * sw, c->ty, c->tw, c->th);
+
 }
 
 static int
@@ -66,8 +70,8 @@ focusnext(Arg *arg)
 	if(!sel)
 		return;
 
-	if(!(c = getnext(sel->next)))
+	if(!(c = getnext(sel->next, tsel)))
-		c = getnext(clients);
+		c = getnext(clients, tsel);
 	if(c) {
 		higher(c);
 		c->revert = sel;
@@ -129,7 +133,7 @@ gravitate(Client *c, Bool invert)
 	case SouthEastGravity:
 	case SouthGravity:
 	case SouthWestGravity:
-		dy = -c->h;
+		dy = -(c->h);
 		break;
 	default:
 		break;
@@ -192,19 +196,22 @@ lower(Client *c)
 void
 manage(Window w, XWindowAttributes *wa)
 {
+	int diff;
 	Client *c;
 	XSetWindowAttributes twa;
 	Window trans;
 
 	c = emallocz(sizeof(Client));
 	c->win = w;
-	c->tx = c->x = wa->x;
+	c->x = c->tx = wa->x;
-	c->ty = c->y = wa->y;
+	c->y = c->ty = wa->y;
-	if(c->y < bh)
+	c->w = c->tw = wa->width;
-		c->ty = c->y += bh;
-	c->tw = c->w = wa->width;
 	c->h = wa->height;
 	c->th = bh;
+
+	if(c->y < bh)
+		c->y = c->ty = bh;
+
 	c->border = 1;
 	c->proto = getproto(c->win);
 	setsize(c);
@@ -220,7 +227,6 @@ manage(Window w, XWindowAttributes *wa)
 			DefaultVisual(dpy, screen),
 			CWOverrideRedirect | CWBackPixmap | CWEventMask, &twa);
 
-	settitle(c);
 	settags(c);
 
 	c->next = clients;
@@ -228,18 +234,21 @@ manage(Window w, XWindowAttributes *wa)
 
 	XGrabButton(dpy, Button1, ControlMask, c->win, False, ButtonPressMask,
 			GrabModeAsync, GrabModeSync, None, None);
-	XGrabButton(dpy, Button1, Mod1Mask, c->win, False, ButtonPressMask,
+	XGrabButton(dpy, Button1, MODKEY, c->win, False, ButtonPressMask,
 			GrabModeAsync, GrabModeSync, None, None);
-	XGrabButton(dpy, Button2, Mod1Mask, c->win, False, ButtonPressMask,
+	XGrabButton(dpy, Button2, MODKEY, c->win, False, ButtonPressMask,
 			GrabModeAsync, GrabModeSync, None, None);
-	XGrabButton(dpy, Button3, Mod1Mask, c->win, False, ButtonPressMask,
+	XGrabButton(dpy, Button3, MODKEY, c->win, False, ButtonPressMask,
 			GrabModeAsync, GrabModeSync, None, None);
 
 	if(!c->isfloat)
-		c->isfloat = trans
+		c->isfloat = trans || (c->maxw && c->minw &&
-			|| ((c->maxw == c->minw) && (c->maxh == c->minh));
+				(c->maxw == c->minw) && (c->maxh == c->minh));
 
+
+	settitle(c);
 	arrange(NULL);
+
 	/* mapping the window now prevents flicker */
 	if(c->tags[tsel]) {
 		XMapRaised(dpy, c->win);
@@ -247,10 +256,8 @@ manage(Window w, XWindowAttributes *wa)
 		focus(c);
 	}
 	else {
-		ban(c);
 		XMapRaised(dpy, c->win);
 		XMapRaised(dpy, c->title);
-		XSync(dpy, False);
 	}
 }
 
@@ -264,13 +271,27 @@ maximize(Arg *arg)
 	sel->w = sw - 2 * sel->border;
 	sel->h = sh - 2 * sel->border - bh;
 	higher(sel);
-	resize(sel, False);
+	resize(sel, False, TopLeft);
 }
 
 void
-resize(Client *c, Bool inc)
+pop(Client *c)
+{
+	Client **l;
+	for(l = &clients; *l && *l != c; l = &(*l)->next);
+	*l = c->next;
+
+	c->next = clients; /* pop */
+	clients = c;
+	arrange(NULL);
+}
+
+void
+resize(Client *c, Bool inc, Corner sticky)
 {
 	XConfigureEvent e;
+	int right = c->x + c->w;
+	int bottom = c->y + c->h;
 
 	if(inc) {
 		if(c->incw)
@@ -281,7 +302,7 @@ resize(Client *c, Bool inc)
 	if(c->x > sw) /* might happen on restart */
 		c->x = sw - c->w;
 	if(c->y > sh)
-		c->ty = c->y = sh - c->h;
+		c->y = sh - c->h;
 	if(c->minw && c->w < c->minw)
 		c->w = c->minw;
 	if(c->minh && c->h < c->minh)
@@ -290,9 +311,15 @@ resize(Client *c, Bool inc)
 		c->w = c->maxw;
 	if(c->maxh && c->h > c->maxh)
 		c->h = c->maxh;
+	if(sticky == TopRight || sticky == BotRight)
+		c->x = right - c->w;
+	if(sticky == BotLeft || sticky == BotRight)
+		c->y = bottom - c->h;
+
 	resizetitle(c);
 	XSetWindowBorderWidth(dpy, c->win, 1);
 	XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
+
 	e.type = ConfigureNotify;
 	e.event = c->win;
 	e.window = c->win;
@@ -405,21 +432,16 @@ unmanage(Client *c)
 void
 zoom(Arg *arg)
 {
-	Client **l, *c;
+	Client *c;
 
 	if(!sel)
 		return;
 
-	if(sel == getnext(clients) && sel->next)  {
+	if(sel == getnext(clients, tsel) && sel->next)  {
-		if((c = getnext(sel->next)))
+		if((c = getnext(sel->next, tsel)))
 			sel = c;
 	}
 
-	for(l = &clients; *l && *l != sel; l = &(*l)->next);
+	pop(sel);
-	*l = sel->next;
-
-	sel->next = clients; /* pop */
-	clients = sel;
-	arrange(NULL);
 	focus(sel);
 }

config.mk

@@ -2,24 +2,23 @@
 
 # paths
 PREFIX = /usr/local
-CONFPREFIX = ${PREFIX}/etc
 MANPREFIX = ${PREFIX}/share/man
 
 X11INC = /usr/X11R6/include
 X11LIB = /usr/X11R6/lib
 
-VERSION = 0.2
+VERSION = 0.4
 
 # includes and libs
 LIBS = -L${PREFIX}/lib -L/usr/lib -lc -L${X11LIB} -lX11
 
 # Linux/BSD
-#CFLAGS = -Os -I. -I${PREFIX}/include -I/usr/include -I${X11INC} \
+CFLAGS = -O3 -I. -I${PREFIX}/include -I/usr/include -I${X11INC} \
-#	-DVERSION=\"${VERSION}\"
-#LDFLAGS = ${LIBS}
-CFLAGS = -g -Wall -O2 -I. -I${PREFIX}/include -I/usr/include -I${X11INC} \
 	-DVERSION=\"${VERSION}\"
-LDFLAGS = -g ${LIBS}
+LDFLAGS = ${LIBS}
+#CFLAGS = -g -Wall -O2 -I. -I${PREFIX}/include -I/usr/include -I${X11INC} \
+#	-DVERSION=\"${VERSION}\"
+#LDFLAGS = -g ${LIBS}
 
 
 # Solaris

draw.c

@@ -97,7 +97,7 @@ drawall()
 {
 	Client *c;
 
-	for(c = clients; c; c = getnext(c->next))
+	for(c = clients; c; c = getnext(c->next, tsel))
 		drawtitle(c);
 	drawstatus();
 }

dwm.1

@@ -1,4 +1,4 @@
-.TH DWM 1 dwm-0.2
+.TH DWM 1 dwm-0.4
 .SH NAME
 dwm \- dynamic window manager
 .SH SYNOPSIS
@@ -90,7 +90,15 @@ Lock
 .B Control-[0..n]
 Append
 .B nth
-tag to cureent
+tag to current
+.B window
+.TP
+.B Control-Shift-[0..n]
+Replace current
+.B window
+of
+.B nth
+tag with current tag.
 .B window
 .TP
 .B Control-Button1

dwm.h

@@ -11,6 +11,7 @@
 #define BGCOLOR				"#0a2c2d"
 #define FGCOLOR				"#ddeeee"
 #define BORDERCOLOR			"#176164"
+#define MODKEY				 Mod1Mask /* Mod4Mask */
 /*
 #define BGCOLOR				"#666699"
 #define FGCOLOR				"#eeeeee"
@@ -25,11 +26,10 @@ enum { Tscratch, Tdev, Twww, Twork, TLast };
 /********** CUSTOMIZE **********/
 
 typedef union Arg Arg;
-typedef struct DC DC;
 typedef struct Client Client;
+typedef enum Corner Corner;
+typedef struct DC DC;
 typedef struct Fnt Fnt;
-typedef struct Key Key;
-typedef struct Rule Rule;
 
 union Arg {
 	const char **argv;
@@ -43,6 +43,8 @@ enum { WMProtocols, WMDelete, WMLast };
 /* cursor */
 enum { CurNormal, CurResize, CurMove, CurLast };
 
+enum Corner { TopLeft, TopRight, BotLeft, BotRight };
+
 struct Fnt {
 	int ascent;
 	int descent;
@@ -66,7 +68,7 @@ struct Client {
 	char *tags[TLast];
 	int proto;
 	int x, y, w, h;
-	int tx, ty, tw, th;
+	int tx, ty, tw, th; /* title */
 	int basew, baseh, incw, inch, maxw, maxh, minw, minh;
 	int grav;
 	unsigned int border;
@@ -78,20 +80,6 @@ struct Client {
 	Window title;
 };
 
-struct Rule {
-	const char *class;
-	const char *instance;
-	char *tags[TLast];
-	Bool isfloat;
-};
-
-struct Key {
-	unsigned long mod;
-	KeySym keysym;
-	void (*func)(Arg *arg);
-	Arg arg;
-};
-
 extern char *tags[TLast], stext[1024];
 extern int tsel, screen, sx, sy, sw, sh, bx, by, bw, bh, mw;
 extern void (*handler[LASTEvent])(XEvent *);
@@ -102,7 +90,6 @@ extern Client *clients, *sel;
 extern Cursor cursor[CurLast];
 extern DC dc;
 extern Display *dpy;
-extern Key key[];
 extern Window root, barwin;
 
 /* client.c */
@@ -118,7 +105,8 @@ extern void killclient(Arg *arg);
 extern void lower(Client *c);
 extern void manage(Window w, XWindowAttributes *wa);
 extern void maximize(Arg *arg);
-extern void resize(Client *c, Bool inc);
+extern void pop(Client *c);
+extern void resize(Client *c, Bool inc, Corner sticky);
 extern void setsize(Client *c);
 extern void settitle(Client *c);
 extern void unmanage(Client *c);
@@ -145,7 +133,8 @@ extern int xerror(Display *dsply, XErrorEvent *ee);
 extern void appendtag(Arg *arg);
 extern void dofloat(Arg *arg);
 extern void dotile(Arg *arg);
-extern Client *getnext(Client *c);
+extern Client *getnext(Client *c, unsigned int t);
+extern void heretag(Arg *arg);
 extern void replacetag(Arg *arg);
 extern void settags(Client *c);
 extern void view(Arg *arg);

dwm.html

@@ -21,85 +21,98 @@
 		<p>
 		dwm is a dynamic window manager for X11.
 		</p>
-		<h3>Philosophy</h3>
+		<h4>Philosophy</h4>
 		<p>
 		As founder and main developer of wmii I came to the conclusion that
 		wmii is too clunky for my needs. I don't need so many funky features
 		and all this hype about remote control through a 9P service, I only
 		want to manage my windows in a simple, but dynamic way. wmii never got
 		finished because I listened to users, who proposed arbitrary ideas I
-		considered useful. This resulted in an extreme <a href="http://www.jwz.org/doc/cadt.html">CADT</a>
+		considered useful. This resulted in an extreme <a
-		development model, which was a mistake. Thus the philosophy of
+		href="http://www.jwz.org/doc/cadt.html">CADT</a> development model,
-		dwm is simply <i>to fit my needs</i> (maybe yours as well). That's it.
+		which was a mistake. Thus the philosophy of dwm is simply <i>to fit my
+		needs</i> (maybe yours as well). That's it.
 		</p>
-		<h3>Differences to wmii</h3	
+		<h4>Differences to ion, larswm, and wmii</h4>
 		<p>
-		In contrast to wmii, dwm is only a window manager, and nothing else.
+		In contrast to ion, larswm, and wmii, dwm is much smaller, faster and simpler.
-		Hence, it is much smaller, faster and simpler.
 		</p>
 		<ul>
 			<li>
-			dwm has no 9P support, no editable tagbars, no shell-based
+			dwm has no Lua integration, no 9P support, no menu, no editable
-			configuration and remote control and comes without any additional
+			tagbars, no shell-based configuration, no remote control, and comes
-			tools like printing the selection or warping the mouse.
+			without any additional tools like printing the selection or warping
+			the mouse.
 			</li>
 			<li>
 			dwm is only a single binary, it's source code is intended to never
 			exceed 2000 SLOC.
 			</li>
 			<li>
-			dwm is customized through editing its source code, that makes it
+			dwm is based on tagging and dynamic window management (however
-			extremely fast and secure - it does not process any input data which
+			simpler than ion, wmii or larswm). It manages windows in
-			hasn't been known at compile time, except window title names.
+			tiling and floating modes. Either mode can be applied dynamically,
-			</li>
+			depending on the application in use and the task performed.
-			<li>
-			dwm is based on tagging and dynamic window management (however simpler
-			than wmii or larswm).
 			</li>
 			<li>
 			dwm don't distinguishes between layers, there is no floating or
-			managed layer. Wether the clients of currently selected tag are
+			tiled layer. Wether the clients of currently selected tag are in
-			managed or not, you can re-arrange all clients on the fly. Popup-
+			tiled mode or not, you can re-arrange all clients on the fly.
-			and fixed-size windows are treated unmanaged. 
+			Popup- and fixed-size windows are treated floating, however. 
+			</li>
+			<li>
+			dwm is customized through editing its source code, that makes it
+			extremely fast and secure - it does not process any input data
+			which hasn't been known at compile time, except window title names
+			and status text read from standard input. You don't have to learn
+			Lua/sh/ruby or some weird configuration file format (like X
+			resource files), beside C to customize it for your needs,
+			you <b>only</b> have to learn C.
+			</li>
+			<li>
+			Because dwm is customized through editing its source code, it's
+			pointless to make binary packages of it. This keeps its userbase
+			small and elitist. No novices asking stupid questions.
 			</li>
 			<li>
 			dwm uses 1-pixel borders to provide the maximum of screen real
-			estate to clients. Small titlebars are only drawn in front of unfocused
+			estate to clients. Small titlebars are only drawn in front of
-			clients.
+			unfocused clients.
 			</li>
 			<li>
-			dwm reads from <b>stdin</b> to print arbitrary status text (like the
+			dwm reads from standard input to print arbitrary status text (like
-			date, load, battery charge). That's much simpler than larsremote,
+			the date, load, battery charge). That's much simpler than
-			wmiir and what not...
+			larsremote, wmiir and what not...
 			</li>
 			<li>
-			Anselm <b>does not</b> want any feedback to dwm. If you ask for support,
+			It can be downloaded and distributed under the conditions
-			feature requests, or if you report bugs, they will be <b>ignored</b>
+			of the <a href="http://10kloc.org/cgi-bin/hgwebdir.cgi/dwm?f=f10eb1139362;file=LICENSE;style=raw">MIT/X Consortium license</a>.
-			with a high chance. dwm is only intended to fit Anselms needs.
-			However you are free to download and distribute/relicense it, with the
-			conditions of the <a href="http://wmii.de/cgi-bin/hgwebdir.cgi/dwm?f=f10eb1139362;file=LICENSE;style=raw">MIT/X Consortium license</a>.
 			</li>
 		</ul>
-		<h3>Screenshot</h3>
+		<h4>Links</h4>
-		<p>
+		<ul>
-		<a href="http://wmii.de/shots/dwm-20060714.png">Click here for a screenshot</a> (20060714)
+			<li><a href="http://10kloc.org/cgi-bin/man/man2html?query=dwm">Man page</a></li>
-		</p>
+			<li><a href="http://10kloc.org/shots/dwm-20060714.png">Screenshot</a> (20060714)</li>
+			<li><a href="http://10kloc.org/download/poster.ps">A4 poster (PostScript)</a></li>
+			<li>Mailing List: <a href="http://10kloc.org/cgi-bin/mailman/listinfo/dwm">dwm at wmii dot de</a> <a href="http://10kloc.org/pipermail/dwm/">(Archives)</a></li>
+			<li>IRC channel: <code>#dwm</code> at <code>irc.oftc.net</code></li>
+		</ul>
 		<h3>Development</h3>
 		<p>
-		dwm is actively developed in parallel to wmii. You can <a href="http://wmii.de/cgi-bin/hgwebdir.cgi/dwm">browse</a> its source code repository or get a copy using <a href="http://www.selenic.com/mercurial/">Mercurial</a> with following command:
+		dwm is actively developed in parallel to wmii. You can <a href="http://10kloc.org/cgi-bin/hgwebdir.cgi/dwm">browse</a> its source code repository or get a copy using <a href="http://www.selenic.com/mercurial/">Mercurial</a> with following command:
 		</p>
 		<p>
-		<code>hg clone http://wmii.de/cgi-bin/hgwebdir.cgi/dwm</code>
+		<code>hg clone http://10kloc.org/cgi-bin/hgwebdir.cgi/dwm</code>
 		</p>
 		<h3>Download</h3>
 		<ul>
-			<li><a href="http://wmii.de/download/dwm-0.2.tar.gz">dwm 0.2</a> (13kb) (20060717)</li>
+			<li><a href="http://10kloc.org/download/dwm-0.4.tar.gz">dwm 0.4</a> (13kb) (20060720)</li>
 		</ul>
 		<h3>Miscellaneous</h3>
 		<p>
 		You can purchase this <a href="https://www.spreadshirt.net/shop.php?op=article&article_id=3298632&view=403">tricot</a>
 		if you like dwm and the dwm logo, which has been designed by Anselm.
 		</p>
-		<p><small>--Anselm (20060714)</small></p>
+		<p><small>--Anselm (20060719)</small></p>
 	</body>
 </html>

event.c

@@ -12,40 +12,58 @@
 #define MouseMask       (ButtonMask | PointerMotionMask)
 
 /* CUSTOMIZE */
+
+typedef struct {
+	unsigned long mod;
+	KeySym keysym;
+	void (*func)(Arg *arg);
+	Arg arg;
+} Key;
+
+/*
 const char *browse[] = { "firefox", NULL };
 const char *gimp[] = { "gimp", NULL };
-const char *term[] = { 
+*/
+const char *term[] = { "xterm", NULL };
+/*
 	"urxvtc", "-tr", "+sb", "-bg", "black", "-fg", "white", "-cr", "white",
 	"-fn", "-*-terminus-medium-*-*-*-13-*-*-*-*-*-iso10646-*", NULL
 };
-const char *xlock[] = { "xlock", NULL };
+coonst char *xlock[] = { "xlock", NULL };
+*/
 
-Key key[] = {
+static Key key[] = {
 	/* modifier				key			function	arguments */
 	{ ControlMask,			XK_0,		appendtag,	{ .i = Tscratch } }, 
 	{ ControlMask,			XK_1,		appendtag,	{ .i = Tdev } }, 
 	{ ControlMask,			XK_2,		appendtag,	{ .i = Twww } }, 
 	{ ControlMask,			XK_3,		appendtag,	{ .i = Twork } }, 
-	{ Mod1Mask,				XK_0,		view,		{ .i = Tscratch } }, 
+	{ MODKEY,				XK_0,		view,		{ .i = Tscratch } }, 
-	{ Mod1Mask,				XK_1,		view,		{ .i = Tdev } }, 
+	{ MODKEY,				XK_1,		view,		{ .i = Tdev } }, 
-	{ Mod1Mask,				XK_2,		view,		{ .i = Twww } }, 
+	{ MODKEY,				XK_2,		view,		{ .i = Twww } }, 
-	{ Mod1Mask,				XK_3,		view,		{ .i = Twork } }, 
+	{ MODKEY,				XK_3,		view,		{ .i = Twork } }, 
-	{ Mod1Mask,				XK_j,		focusnext,		{ 0 } }, 
+	{ MODKEY,				XK_j,		focusnext,		{ 0 } }, 
-	{ Mod1Mask,				XK_k,		focusprev,		{ 0 } },
+	{ MODKEY,				XK_k,		focusprev,		{ 0 } },
-	{ Mod1Mask,				XK_m,		maximize,		{ 0 } }, 
+	{ MODKEY,				XK_m,		maximize,		{ 0 } }, 
-	{ Mod1Mask,				XK_space,	dotile,		{ 0 } }, 
+	{ MODKEY,				XK_space,	dotile,		{ 0 } }, 
-	{ Mod1Mask,				XK_Return,	zoom,		{ 0 } },
+	{ MODKEY,				XK_Return,	zoom,		{ 0 } },
-	{ Mod1Mask|ShiftMask,	XK_0,		replacetag,		{ .i = Tscratch } }, 
+	{ ControlMask|ShiftMask,XK_0,		heretag,	{ .i = Tscratch } }, 
-	{ Mod1Mask|ShiftMask,	XK_1,		replacetag,		{ .i = Tdev } }, 
+	{ ControlMask|ShiftMask,XK_1,		heretag,	{ .i = Tdev } }, 
-	{ Mod1Mask|ShiftMask,	XK_2,		replacetag,		{ .i = Twww } }, 
+	{ ControlMask|ShiftMask,XK_2,		heretag,	{ .i = Twww } }, 
-	{ Mod1Mask|ShiftMask,	XK_3,		replacetag,		{ .i = Twork } }, 
+	{ ControlMask|ShiftMask,XK_3,		heretag,	{ .i = Twork } }, 
-	{ Mod1Mask|ShiftMask,	XK_c,		killclient,		{ 0 } }, 
+	{ MODKEY|ShiftMask,		XK_0,		replacetag,		{ .i = Tscratch } }, 
-	{ Mod1Mask|ShiftMask,	XK_g,		spawn,		{ .argv = gimp } },
+	{ MODKEY|ShiftMask,		XK_1,		replacetag,		{ .i = Tdev } }, 
-	{ Mod1Mask|ShiftMask,	XK_l,		spawn,		{ .argv = xlock } },
+	{ MODKEY|ShiftMask,		XK_2,		replacetag,		{ .i = Twww } }, 
-	{ Mod1Mask|ShiftMask,	XK_q,		quit,		{ 0 } },
+	{ MODKEY|ShiftMask,		XK_3,		replacetag,		{ .i = Twork } }, 
-	{ Mod1Mask|ShiftMask,	XK_space,	dofloat,	{ 0 } }, 
+	{ MODKEY|ShiftMask,		XK_c,		killclient,		{ 0 } }, 
-	{ Mod1Mask|ShiftMask,	XK_w,		spawn,		{ .argv = browse } },
+	/*
-	{ Mod1Mask|ShiftMask,	XK_Return,	spawn,		{ .argv = term } },
+	{ MODKEY|ShiftMask,		XK_g,		spawn,		{ .argv = gimp } },
+	{ MODKEY|ShiftMask,		XK_l,		spawn,		{ .argv = xlock } },
+	*/
+	{ MODKEY|ShiftMask,		XK_q,		quit,		{ 0 } },
+	{ MODKEY|ShiftMask,		XK_space,	dofloat,	{ 0 } }, 
+	/*{ MODKEY|ShiftMask,		XK_w,		spawn,		{ .argv = browse } },*/
+	{ MODKEY|ShiftMask,		XK_Return,	spawn,		{ .argv = term } },
 };
 
 /* static */
@@ -75,7 +93,7 @@ movemouse(Client *c)
 			XSync(dpy, False);
 			c->x = ocx + (ev.xmotion.x - x1);
 			c->y = ocy + (ev.xmotion.y - y1);
-			resize(c, False);
+			resize(c, False, TopLeft);
 			break;
 		case ButtonRelease:
 			XUngrabPointer(dpy, CurrentTime);
@@ -89,6 +107,7 @@ resizemouse(Client *c)
 {
 	XEvent ev;
 	int ocx, ocy;
+	Corner sticky;
 
 	ocx = c->x;
 	ocy = c->y;
@@ -109,7 +128,11 @@ resizemouse(Client *c)
 			c->h = abs(ocy - ev.xmotion.y);
 			c->x = (ocx <= ev.xmotion.x) ? ocx : ocx - c->w;
 			c->y = (ocy <= ev.xmotion.y) ? ocy : ocy - c->h;
-			resize(c, True);
+			if(ocx <= ev.xmotion.x)
+				sticky = (ocy <= ev.xmotion.y) ? TopLeft : BotLeft;
+			else
+				sticky = (ocy <= ev.xmotion.y) ? TopRight : BotRight;
+			resize(c, True, sticky);
 			break;
 		case ButtonRelease:
 			XUngrabPointer(dpy, CurrentTime);
@@ -149,24 +172,27 @@ buttonpress(XEvent *e)
 		}
 	}
 	else if((c = getclient(ev->window))) {
-		if(arrange == dotile && !c->isfloat) {
-			if((ev->state & ControlMask) && (ev->button == Button1))
-				zoom(NULL);
-			return;
-		}
-		/* floating windows */
-		higher(c);
 		switch(ev->button) {
 		default:
 			break;
 		case Button1:
+			if(arrange == dotile && !c->isfloat) {
+				if((ev->state & ControlMask) && (ev->button == Button1))
+					zoom(NULL);
+			}
+			else {
+				higher(c);
 				movemouse(c);
+			}
 			break;
 		case Button2:
 			lower(c);
 			break;
 		case Button3:
+			if(arrange == dofloat || c->isfloat) {
+				higher(c);
 				resizemouse(c);
+			}
 			break;
 		}
 	}
@@ -193,7 +219,7 @@ configurerequest(XEvent *e)
 		if(ev->value_mask & CWBorderWidth)
 			c->border = 1;
 		gravitate(c, False);
-		resize(c, True);
+		resize(c, True, TopLeft);
 	}
 
 	wc.x = ev->x;

main.c

@@ -24,7 +24,7 @@ static void
 cleanup()
 {
 	while(sel) {
-		resize(sel, True);
+		resize(sel, True, TopLeft);
 		unmanage(sel);
 	}
 	XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
@@ -179,14 +179,13 @@ main(int argc, char *argv[])
 
 	for(i = 1; (i < argc) && (argv[i][0] == '-'); i++) {
 		switch (argv[i][1]) {
-		case 'v':
-			fprintf(stdout, "%s",
-					"dwm-"VERSION", (C)opyright MMVI Anselm R. Garbe\n");
-			exit(0);
-			break;
 		default:
 			eprint("usage: dwm [-v]\n");
 			break;
+		case 'v':
+			fputs("dwm-"VERSION", (C)opyright MMVI Anselm R. Garbe\n", stdout);
+			exit(EXIT_SUCCESS);
+			break;
 		}
 	}
 
@@ -262,6 +261,7 @@ main(int argc, char *argv[])
 	XChangeWindowAttributes(dpy, root, CWEventMask | CWCursor, &wa);
 
 	strcpy(stext, "dwm-"VERSION);
+
 	scan();
 
 	/* main event loop, reads status text from stdin as well */

tag.c

@@ -4,15 +4,25 @@
  */
 #include "dwm.h"
 
+#include <regex.h>
+#include <stdio.h>
 #include <string.h>
+#include <sys/types.h>
 #include <X11/Xutil.h>
 
 /* static */
 
+typedef struct {
+	const char *pattern;
+	char *tags[TLast];
+	Bool isfloat;
+} Rule;
+
 /* CUSTOMIZE */ 
 static Rule rule[] = {
 	/* class			instance	tags		isfloat */
-	{ "Firefox-bin",	"Gecko",	{ [Twww] = "www" },			False },
+	{ "Firefox.*",	{ [Twww] = "www" },			False },
+	{ "Gimp.*",		{ 0 },						True},
 };
 
 /* extern */
@@ -43,13 +53,14 @@ dofloat(Arg *arg)
 
 	arrange = dofloat;
 	for(c = clients; c; c = c->next) {
-		if(c->tags[tsel])
+		if(c->tags[tsel]) {
-			resize(c, True);
+			resize(c, True, TopLeft);
+		}
 		else
 			ban(c);
 	}
 	if(sel && !sel->tags[tsel]) {
-		if((sel = getnext(clients))) {
+		if((sel = getnext(clients, tsel))) {
 			higher(sel);
 			focus(sel);
 		}
@@ -78,7 +89,7 @@ dotile(Arg *arg)
 		if(c->tags[tsel]) {
 			if(c->isfloat) {
 				higher(c);
-				resize(c, True);
+				resize(c, True, TopLeft);
 				continue;
 			}
 			if(n == 1) {
@@ -93,20 +104,26 @@ dotile(Arg *arg)
 				c->w = mw - 2 * c->border;
 				c->h = sh - 2 * c->border - bh;
 			}
-			else {
+			else if(h > bh) {
 				c->x = sx + mw;
 				c->y = sy + (i - 1) * h + bh;
 				c->w = w - 2 * c->border;
 				c->h = h - 2 * c->border;
 			}
-			resize(c, False);
+			else { /* fallback if h < bh */
+				c->x = sx + mw;
+				c->y = sy + bh;
+				c->w = w - 2 * c->border;
+				c->h = sh - 2 * c->border - bh;
+			}
+			resize(c, False, TopLeft);
 			i++;
 		}
 		else
 			ban(c);
 	}
 	if(!sel || (sel && !sel->tags[tsel])) {
-		if((sel = getnext(clients))) {
+		if((sel = getnext(clients, tsel))) {
 			higher(sel);
 			focus(sel);
 		}
@@ -115,12 +132,31 @@ dotile(Arg *arg)
 }
 
 Client *
-getnext(Client *c)
+getnext(Client *c, unsigned int t)
 {
-	for(; c && !c->tags[tsel]; c = c->next);
+	for(; c && !c->tags[t]; c = c->next);
 	return c;
 }
 
+void
+heretag(Arg *arg)
+{
+	int i;
+	Client *c;
+
+	if(arg->i == tsel)
+		return;
+
+	if(!(c = getnext(clients, arg->i)))
+		return;
+
+	for(i = 0; i < TLast; i++)
+		c->tags[i] = NULL;
+	c->tags[tsel] = tags[tsel];
+	pop(c);
+	focus(c);
+}
+
 void
 replacetag(Arg *arg)
 {
@@ -136,10 +172,13 @@ replacetag(Arg *arg)
 void
 settags(Client *c)
 {
-	XClassHint ch;
+	char classinst[256];
 	static unsigned int len = rule ? sizeof(rule) / sizeof(rule[0]) : 0;
 	unsigned int i, j;
+	regex_t regex;
+	regmatch_t tmp;
 	Bool matched = False;
+	XClassHint ch;
 
 	if(!len) {
 		c->tags[tsel] = tags[tsel];
@@ -147,16 +186,20 @@ settags(Client *c)
 	}
 
 	if(XGetClassHint(dpy, c->win, &ch)) {
-		if(ch.res_class && ch.res_name) {
+		snprintf(classinst, sizeof(classinst), "%s:%s",
-			for(i = 0; i < len; i++)
+				ch.res_class ? ch.res_class : "",
-				if(!strncmp(rule[i].class, ch.res_class, sizeof(rule[i].class))
+				ch.res_name ? ch.res_name : "");
-					&& !strncmp(rule[i].instance, ch.res_name, sizeof(rule[i].instance)))
+		for(i = 0; !matched && i < len; i++) {
-				{
+			if(!regcomp(&regex, rule[i].pattern, 0)) {
-					for(j = 0; j < TLast; j++)
+				if(!regexec(&regex, classinst, 1, &tmp, 0)) {
-						c->tags[j] = rule[i].tags[j];
+					for(j = 0; j < TLast; j++) {
-					c->isfloat = rule[i].isfloat;
+						if(rule[i].tags[j])
 							matched = True;
-					break;
+						c->tags[j] = rule[i].tags[j];
+					}
+					c->isfloat = rule[i].isfloat;
+				}
+				regfree(&regex);
 			}
 		}
 		if(ch.res_class)
@@ -164,7 +207,6 @@ settags(Client *c)
 		if(ch.res_name)
 			XFree(ch.res_name);
 	}
-
 	if(!matched)
 		c->tags[tsel] = tags[tsel];
 }

util.c

@@ -17,7 +17,7 @@ bad_malloc(unsigned int size)
 {
 	fprintf(stderr, "fatal: could not malloc() %d bytes\n",
 			(int) size);
-	exit(1);
+	exit(EXIT_FAILURE);
 }
 
 /* extern */
@@ -37,7 +37,7 @@ eprint(const char *errstr, ...) {
 	va_start(ap, errstr);
 	vfprintf(stderr, errstr, ap);
 	va_end(ap);
-	exit(1);
+	exit(EXIT_FAILURE);
 }
 
 void
@@ -55,7 +55,7 @@ spawn(Arg *arg)
 			fprintf(stderr, "dwm: execvp %s", argv[0]);
 			perror(" failed");
 		}
-		exit (0);
+		exit(EXIT_FAILURE);
 	}
 	wait(0);
 }