yet another cleanup

.hgtags

@@ -49,3 +49,6 @@ e0ec0d5d8b1ef3ee04a83c7c0fee5853aa2ac6a6 4.3
 408014d2126153d2b0fce26a13ba707db222b7b9 4.4
 7c117df5d202530e85066d8b1ab02cef605c79ad 4.4.1
 2acc60d6dfe28c101a8cd44a8aa710a38ae3607c 4.5
+bcd7e18e196a00cc2e97ff3a4a58f3cdaba13856 4.6
+d6d3085307d8d98b8b012b669e858fd787befeb1 4.7
+607015ddb091d49cbd3457af41713691aa69f4d6 4.8

LICENSE

@@ -1,10 +1,12 @@
 MIT/X Consortium License
 
-© 2006-2007 Anselm R. Garbe <garbeam at gmail dot com>
+© 2006-2008 Anselm R Garbe <garbeam at gmail dot com>
 © 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
 © 2006-2007 Jukka Salmi <jukka at salmi dot ch>
 © 2007 Premysl Hruby <dfenze at gmail dot com>
 © 2007 Szabolcs Nagy <nszabolcs at gmail dot com>
+© 2007 Christof Musik <christof at sendfax dot de>
+© 2007-2008 Enno Gottox Boland <gottox at s01 dot de>
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),

config.def.h

@@ -1,9 +1,8 @@
 /* See LICENSE file for copyright and license details. */
 
 /* appearance */
-#define BARPOS			BarTop /* BarBot, BarOff */
 #define BORDERPX		1
-#define FONT			"-*-terminus-medium-*-*-*-*-*-*-*-*-*-*-*"
+#define FONT			"-*-terminus-medium-r-normal-*-14-*-*-*-*-*-*-*"
 #define NORMBORDERCOLOR		"#cccccc"
 #define NORMBGCOLOR		"#cccccc"
 #define NORMFGCOLOR		"#000000"
@@ -12,82 +11,90 @@
 #define SELFGCOLOR		"#ffffff"
 
 /* tagging */
-const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "www" };
+const char tags[][MAXTAGLEN] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
+
 Rule rules[] = {
-	/* class:instance:title regex	tags regex	isfloating */
+	/* class	instance	title		tags ref	isfloating */
-	{ "Firefox",			"www",		False },
+	{ "Gimp",	NULL,		NULL,		NULL,		True },
-	{ "Gimp",			NULL,		True },
+};
-	{ "MPlayer",			NULL,		True },
+
-	{ "Acroread",			NULL,		True },
+/* geometries, s{x,y,w,h} and bh are already initualized here */
+/*   func name  bx  by  bw  wx  wy  ww     wh  mx  my       mw  mh     tx  ty     tw  th  mox moy mow moh */
+#define MFACT			0.55	/* master width factor [0.1 .. 0.9] */
+DEFGEOM(single,  0,  0, sw,  0, bh, sw, sh-bh, wx, wy, mfact*sw, wh, mx+mw, wy, ww-mw, wh,  wx, wy, ww, wh)
+
+Geom geoms[] = {
+	/* symbol	function */
+	{ "[]",		single },	/* first entry is default */
 };
 
 /* layout(s) */
-#define ISTILE			isarrange(tile) /* || isarrange(<custom>) */
+#define RESIZEHINTS		True	/* False - respect size hints in tiled resizals */
-#define MWFACT			0.6	/* master width factor [0.1 .. 0.9] */
 #define SNAP			32	/* snap pixel */
+
 Layout layouts[] = {
-	/* symbol		function */
+	/* symbol		function	isfloating */
-	{ "[]=",		tile }, /* first entry is default */
+	{ "[]=",		tilev,		False }, /* first entry is default */
-	{ "><>",		floating },
+	{ "[]|",		tileh,		False },
+	{ "><>",		floating,	True },
+	{ "[M]",		monocle,	True },
 };
 
 /* key definitions */
 #define MODKEY			Mod1Mask
-#define KEYS \
+Key keys[] = {
-Key keys[] = { \
+	/* modifier			key		function	argument */
-	/* modifier			key		function	argument */ \
+	{ MODKEY,			XK_p,		spawn,
-	{ MODKEY,			XK_p,		spawn, \
+		"exec dmenu_run -fn '"FONT"' -nb '"NORMBGCOLOR"' -nf '"NORMFGCOLOR"' -sb '"SELBGCOLOR"' -sf '"SELFGCOLOR"'" },
-		"exe=`dmenu_path | dmenu -fn '"FONT"' -nb '"NORMBGCOLOR"' -nf '"NORMFGCOLOR"'" \
+	{ MODKEY|ShiftMask,		XK_Return,	spawn,		"exec uxterm" },
-		" -sb '"SELBGCOLOR"' -sf '"SELFGCOLOR"'` && exec $exe" }, \
+	{ MODKEY,			XK_j,		focusnext,	NULL },
-	{ MODKEY|ShiftMask,		XK_Return,	spawn, "exec uxterm" }, \
+	{ MODKEY,			XK_k,		focusprev,	NULL },
-	{ MODKEY,			XK_space,	setlayout,	NULL }, \
+	{ MODKEY,			XK_r,		reapply,	NULL },
-	{ MODKEY,			XK_b,		togglebar,	NULL }, \
+	{ MODKEY,			XK_h,		setmfact,	"-0.05" },
-	{ MODKEY,			XK_j,		focusnext,	NULL }, \
+	{ MODKEY,			XK_l,		setmfact,	"+0.05" },
-	{ MODKEY,			XK_k,		focusprev,	NULL }, \
+	{ MODKEY,			XK_Return,	zoom,		NULL },
-	{ MODKEY,			XK_h,		setmwfact,	"-0.05" }, \
+	{ MODKEY,			XK_Tab,		viewprevtag,	NULL },
-	{ MODKEY,			XK_l,		setmwfact,	"+0.05" }, \
+	{ MODKEY|ShiftMask,		XK_c,		killclient,	NULL },
-	{ MODKEY,			XK_m,		togglemax,	NULL }, \
+	{ MODKEY,			XK_space,	setlayout,	NULL },
-	{ MODKEY,			XK_Return,	zoom,		NULL }, \
+	{ MODKEY|ShiftMask,		XK_space,	togglefloating,	NULL },
-	{ MODKEY,			XK_Tab,		viewprevtag,	NULL }, \
+	{ MODKEY|ControlMask,		XK_space,	setgeom,	NULL },
-	{ MODKEY|ShiftMask,		XK_space,	togglefloating,	NULL }, \
+	{ MODKEY,			XK_0,		view,		NULL },
-	{ MODKEY|ShiftMask,		XK_c,		killclient,	NULL }, \
+	{ MODKEY,			XK_1,		view,		tags[0] },
-	{ MODKEY,			XK_0,		view,		NULL }, \
+	{ MODKEY,			XK_2,		view,		tags[1] },
-	{ MODKEY,			XK_1,		view,		tags[0] }, \
+	{ MODKEY,			XK_3,		view,		tags[2] },
-	{ MODKEY,			XK_2,		view,		tags[1] }, \
+	{ MODKEY,			XK_4,		view,		tags[3] },
-	{ MODKEY,			XK_3,		view,		tags[2] }, \
+	{ MODKEY,			XK_5,		view,		tags[4] },
-	{ MODKEY,			XK_4,		view,		tags[3] }, \
+	{ MODKEY,			XK_6,		view,		tags[5] },
-	{ MODKEY,			XK_5,		view,		tags[4] }, \
+	{ MODKEY,			XK_7,		view,		tags[6] },
-	{ MODKEY,			XK_6,		view,		tags[5] }, \
+	{ MODKEY,			XK_8,		view,		tags[7] },
-	{ MODKEY,			XK_7,		view,		tags[6] }, \
+	{ MODKEY,			XK_9,		view,		tags[8] },
-	{ MODKEY,			XK_8,		view,		tags[7] }, \
+	{ MODKEY|ControlMask,		XK_1,		toggleview,	tags[0] },
-	{ MODKEY,			XK_9,		view,		tags[8] }, \
+	{ MODKEY|ControlMask,		XK_2,		toggleview,	tags[1] },
-	{ MODKEY|ControlMask,		XK_1,		toggleview,	tags[0] }, \
+	{ MODKEY|ControlMask,		XK_3,		toggleview,	tags[2] },
-	{ MODKEY|ControlMask,		XK_2,		toggleview,	tags[1] }, \
+	{ MODKEY|ControlMask,		XK_4,		toggleview,	tags[3] },
-	{ MODKEY|ControlMask,		XK_3,		toggleview,	tags[2] }, \
+	{ MODKEY|ControlMask,		XK_5,		toggleview,	tags[4] },
-	{ MODKEY|ControlMask,		XK_4,		toggleview,	tags[3] }, \
+	{ MODKEY|ControlMask,		XK_6,		toggleview,	tags[5] },
-	{ MODKEY|ControlMask,		XK_5,		toggleview,	tags[4] }, \
+	{ MODKEY|ControlMask,		XK_7,		toggleview,	tags[6] },
-	{ MODKEY|ControlMask,		XK_6,		toggleview,	tags[5] }, \
+	{ MODKEY|ControlMask,		XK_8,		toggleview,	tags[7] },
-	{ MODKEY|ControlMask,		XK_7,		toggleview,	tags[6] }, \
+	{ MODKEY|ControlMask,		XK_9,		toggleview,	tags[8] },
-	{ MODKEY|ControlMask,		XK_8,		toggleview,	tags[7] }, \
+	{ MODKEY|ShiftMask,		XK_0,		tag,		NULL },
-	{ MODKEY|ControlMask,		XK_9,		toggleview,	tags[8] }, \
+	{ MODKEY|ShiftMask,		XK_1,		tag,		tags[0] },
-	{ MODKEY|ShiftMask,		XK_0,		tag,		NULL }, \
+	{ MODKEY|ShiftMask,		XK_2,		tag,		tags[1] },
-	{ MODKEY|ShiftMask,		XK_1,		tag,		tags[0] }, \
+	{ MODKEY|ShiftMask,		XK_3,		tag,		tags[2] },
-	{ MODKEY|ShiftMask,		XK_2,		tag,		tags[1] }, \
+	{ MODKEY|ShiftMask,		XK_4,		tag,		tags[3] },
-	{ MODKEY|ShiftMask,		XK_3,		tag,		tags[2] }, \
+	{ MODKEY|ShiftMask,		XK_5,		tag,		tags[4] },
-	{ MODKEY|ShiftMask,		XK_4,		tag,		tags[3] }, \
+	{ MODKEY|ShiftMask,		XK_6,		tag,		tags[5] },
-	{ MODKEY|ShiftMask,		XK_5,		tag,		tags[4] }, \
+	{ MODKEY|ShiftMask,		XK_7,		tag,		tags[6] },
-	{ MODKEY|ShiftMask,		XK_6,		tag,		tags[5] }, \
+	{ MODKEY|ShiftMask,		XK_8,		tag,		tags[7] },
-	{ MODKEY|ShiftMask,		XK_7,		tag,		tags[6] }, \
+	{ MODKEY|ShiftMask,		XK_9,		tag,		tags[8] },
-	{ MODKEY|ShiftMask,		XK_8,		tag,		tags[7] }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_1,		toggletag,	tags[0] },
-	{ MODKEY|ShiftMask,		XK_9,		tag,		tags[8] }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_2,		toggletag,	tags[1] },
-	{ MODKEY|ControlMask|ShiftMask,	XK_1,		toggletag,	tags[0] }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_3,		toggletag,	tags[2] },
-	{ MODKEY|ControlMask|ShiftMask,	XK_2,		toggletag,	tags[1] }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_4,		toggletag,	tags[3] },
-	{ MODKEY|ControlMask|ShiftMask,	XK_3,		toggletag,	tags[2] }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_5,		toggletag,	tags[4] },
-	{ MODKEY|ControlMask|ShiftMask,	XK_4,		toggletag,	tags[3] }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_6,		toggletag,	tags[5] },
-	{ MODKEY|ControlMask|ShiftMask,	XK_5,		toggletag,	tags[4] }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_7,		toggletag,	tags[6] },
-	{ MODKEY|ControlMask|ShiftMask,	XK_6,		toggletag,	tags[5] }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_8,		toggletag,	tags[7] },
-	{ MODKEY|ControlMask|ShiftMask,	XK_7,		toggletag,	tags[6] }, \
+	{ MODKEY|ControlMask|ShiftMask,	XK_9,		toggletag,	tags[8] },
-	{ MODKEY|ControlMask|ShiftMask,	XK_8,		toggletag,	tags[7] }, \
+	{ MODKEY|ShiftMask,		XK_q,		quit,		NULL },
-	{ MODKEY|ControlMask|ShiftMask,	XK_9,		toggletag,	tags[8] }, \
-	{ MODKEY|ShiftMask,		XK_q,		quit,		NULL }, \
 };

config.mk

@@ -1,5 +1,5 @@
 # dwm version
-VERSION = 4.6
+VERSION = 4.9
 
 # Customize below to fit your system
 
@@ -23,7 +23,6 @@ LDFLAGS = -s ${LIBS}
 # Solaris
 #CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
 #LDFLAGS = ${LIBS}
-#CFLAGS += -xtarget=ultra
 
 # compiler and linker
 CC = cc

dwm.1

@@ -5,22 +5,23 @@ dwm \- dynamic window manager
 .B dwm
 .RB [ \-v ]
 .SH DESCRIPTION
-dwm is a dynamic window manager for X. It manages windows in tiled and
+dwm is a dynamic window manager for X. It manages windows in tiled, monocle
-floating layouts. Either layout can be applied dynamically, optimizing the
+and floating layouts. Either layout can be applied dynamically, optimising the
 environment for the application in use and the task performed.
 .P
-In tiled layout windows are managed in a master and stacking area. The master
+In tiled layouts windows are managed in a master and stacking area. The master
 area contains the window which currently needs most attention, whereas the
-stacking area contains all other windows. In floating layout windows can be
+stacking area contains all other windows. In monocle layout all windows are
-resized and moved freely. Dialog windows are always managed floating,
+maximised to the screen size. In floating layout windows can be resized and
-regardless of the layout applied.
+moved freely. Dialog windows are always managed floating, regardless of the
+layout applied.
 .P
 Windows are grouped by tags. Each window can be tagged with one or multiple
 tags. Selecting certain tags displays all windows with these tags.
 .P
 dwm contains a small status bar which displays all available tags, the layout,
 the title of the focused window, and the text read from standard input. A
-floating window is indicated with an empty square and a maximized
+floating window is indicated with an empty square and a maximised
 floating window is indicated with a filled square before the windows
 title.  The selected tags are indicated with a different color. The tags of
 the focused window are indicated with a filled square in the top left
@@ -56,17 +57,11 @@ click on a tag label adds/removes that tag to/from the focused window.
 Start
 .BR xterm.
 .TP
-.B Mod1\-Return
+.B Mod1\-space
-Zooms/cycles current window to/from master area (tiled layout only).
+Toggles between layouts.
 .TP
-.B Mod1\-Tab
+.B Mod1\-Control\-space
-Toggles to the previously selected tags.
+Toggles between geometries.
-.TP
-.B Mod1\-b
-Shows/hides the status bar.
-.TP
-.B Mod1\-h
-Decreases the master area width about 5% (tiled layout only).
 .TP
 .B Mod1\-j
 Focus next window.
@@ -74,34 +69,40 @@ Focus next window.
 .B Mod1\-k
 Focus previous window.
 .TP
+.B Mod1\-h
+Decrease master area size.
+.TP
 .B Mod1\-l
-Increases the master area width about 5% (tiled layout only).
+Increase master area size.
 .TP
-.B Mod1\-m
+.B Mod1\-Return
-Toggles maximization of current window.
+Zooms/cycles focused window to/from master area (tiled layouts only).
-.TP
-.B Mod1\-Shift\-[1..n]
-Apply
-.RB nth
-tag to current window.
-.TP
-.B Mod1\-Shift\-0
-Apply all tags to current window.
-.TP
-.B Mod1\-Control\-Shift\-[1..n]
-Add/remove
-.B nth
-tag to/from current window.
 .TP
 .B Mod1\-Shift\-c
 Close focused window.
 .TP
-.B Mod1\-space
-Toggle between tiled and floating layout (affects all windows).
-.TP
 .B Mod1\-Shift\-space
 Toggle focused window between tiled and floating state.
 .TP
+.B Mod1\-Tab
+Toggles to the previously selected tags.
+.TP
+.B Mod1\-r
+Re-applies tagging rules to all windows.
+.TP
+.B Mod1\-Shift\-[1..n]
+Apply
+.RB nth
+tag to focused window.
+.TP
+.B Mod1\-Shift\-0
+Apply all tags to focused window.
+.TP
+.B Mod1\-Control\-Shift\-[1..n]
+Add/remove
+.B nth
+tag to/from focused window.
+.TP
 .B Mod1\-[1..n]
 View all windows with
 .BR nth
@@ -120,13 +121,13 @@ Quit dwm.
 .SS Mouse commands
 .TP
 .B Mod1\-Button1
-Move current window while dragging. Tiled windows will be toggled to the floating state.
+Move focused window while dragging. Tiled windows will be toggled to the floating state.
 .TP
 .B Mod1\-Button2
-Zooms/cycles current window to/from master area. If it is floating (but not fixed) it will be toggled to the tiled state instead.
+Zooms/cycles focused window to/from master area. If it is floating (but not fixed) it will be toggled to the tiled state instead.
 .TP
 .B Mod1\-Button3
-Resize current window while dragging. Tiled windows will be toggled to the floating state.
+Resize focused window while dragging. Tiled windows will be toggled to the floating state.
 .SH CUSTOMIZATION
 dwm is customized by creating a custom config.h and (re)compiling the source
 code. This keeps it fast, secure and simple.
@@ -147,7 +148,7 @@ can set the following environment variable (to use the older Motif
 backend instead):
 .BR AWT_TOOLKIT=MToolkit .
 .P
-Recent GTK 2.10.9+ versions contain a broken
+GTK 2.10.9+ versions contain a broken
 .BR Save\-As
 file dialog implementation,
 which requests to reconfigure its window size in an endless loop. However, its