using malloc() instead of calloc() and sticking to static initializer and struct assignment, not using *c = (Client){}; right now to avoid some ugly gcc warning, possibly a gcc bug since we are using -std=c99

.hgtags

@@ -50,3 +50,8 @@ e0ec0d5d8b1ef3ee04a83c7c0fee5853aa2ac6a6 4.3
 7c117df5d202530e85066d8b1ab02cef605c79ad 4.4.1
 2acc60d6dfe28c101a8cd44a8aa710a38ae3607c 4.5
 bcd7e18e196a00cc2e97ff3a4a58f3cdaba13856 4.6
+d6d3085307d8d98b8b012b669e858fd787befeb1 4.7
+607015ddb091d49cbd3457af41713691aa69f4d6 4.8
+22c669b2dd3673785c3476b9976da21e8783f745 4.9
+06eb9644e2dad7667d97495eb7d7bc62aa0429e8 5.0
+ce355cea9bb89e162f61913737a46908cdfa7e45 5.1

LICENSE

@@ -1,25 +1,29 @@
 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>
+© 2007-2008 Peter Hartlich <sgkkr at hartlich dot com>
+© 2008 Martin Hurton <martin dot hurton at gmail dot com>
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),
 to deal in the Software without restriction, including without limitation
 the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the 
+and/or sell copies of the Software, and to permit persons to whom the
 Software is furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in 
+The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software. 
+all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL 
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING 
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER 
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
 DEALINGS IN THE SOFTWARE.

Makefile

@@ -1,5 +1,5 @@
 # dwm - dynamic window manager
-# © 2006-2007 Anselm R. Garbe, Sander van Dijk
+# See LICENSE file for copyright and license details.
 
 include config.mk
 

config.def.h

@@ -1,93 +1,101 @@
 /* See LICENSE file for copyright and license details. */
 
 /* appearance */
-#define BARPOS			BarTop /* BarBot, BarOff */
+static const char font[]            = "-*-terminus-medium-r-normal-*-14-*-*-*-*-*-*-*";
-#define BORDERPX		1
+static const char normbordercolor[] = "#cccccc";
-#define FONT			"-*-terminus-medium-*-*-*-*-*-*-*-*-*-*-*"
+static const char normbgcolor[]     = "#cccccc";
-#define NORMBORDERCOLOR		"#cccccc"
+static const char normfgcolor[]     = "#000000";
-#define NORMBGCOLOR		"#cccccc"
+static const char selbordercolor[]  = "#0066ff";
-#define NORMFGCOLOR		"#000000"
+static const char selbgcolor[]      = "#0066ff";
-#define SELBORDERCOLOR		"#0066ff"
+static const char selfgcolor[]      = "#ffffff";
-#define SELBGCOLOR		"#0066ff"
+static unsigned int borderpx        = 1;        /* border pixel of windows */
-#define SELFGCOLOR		"#ffffff"
+static unsigned int snap            = 32;       /* snap pixel */
+static Bool showbar                 = True;     /* False means no bar */
+static Bool topbar                  = True;     /* False means bottom bar */
+static Bool readin                  = True;     /* False means do not read stdin */
 
 /* tagging */
-const char tags[][MAXTAGLEN] = { "1", "2", "3", "4", "5", "6", "7", "8", "www" };
+static const char tags[][MAXTAGLEN] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
-Bool seltags[LENGTH(tags)] = {[0] = True};
+static unsigned int tagset[] = {1, 1}; /* after start, first tag is selected */
-Rule rules[] = {
+
-	/* class:instance:title regex	tags regex	isfloating */
+static Rule rules[] = {
-	{ "Firefox",			"www",		False },
+	/* class      instance    title       tags mask     isfloating */
-	{ "Gimp",			NULL,		True },
+	{ "Gimp",     NULL,       NULL,       0,            True },
-	{ "MPlayer",			NULL,		True },
+	{ "Firefox",  NULL,       NULL,       1 << 8,       True },
-	{ "Acroread",			NULL,		True },
 };
 
 /* layout(s) */
-#define MWFACT			0.6	/* master width factor [0.1 .. 0.9] */
+static float mfact      = 0.55; /* factor of master area size [0.05..0.95] */
-#define RESIZEHINTS		True	/* False - respect size hints in tiled resizals */
+static Bool resizehints = True; /* False means respect size hints in tiled resizals */
-#define SNAP			32	/* snap pixel */
+
-Layout layouts[] = {
+static Layout layouts[] = {
-	/* symbol		function */
+	/* symbol     arrange function */
-	{ "[]=",		tile }, /* first entry is default */
+	{ "[]=",      tile },    /* first entry is default */
-	{ "><>",		floating },
+	{ "><>",      NULL },    /* no layout function means floating behavior */
+	{ "[M]",      monocle },
 };
 
 /* key definitions */
-#define MODKEY			Mod1Mask
+#define MODKEY Mod1Mask
-Key keys[] = {
+#define TAGKEYS(KEY,TAG) \
-	/* modifier			key		function	argument */
+	{ MODKEY,                       KEY,      view,           {.ui = 1 << TAG} }, \
-	{ MODKEY,			XK_p,		spawn,
+	{ MODKEY|ControlMask,           KEY,      toggleview,     {.ui = 1 << TAG} }, \
-		"exe=`dmenu_path | dmenu -fn '"FONT"' -nb '"NORMBGCOLOR"' -nf '"NORMFGCOLOR"'"
+	{ MODKEY|ShiftMask,             KEY,      tag,            {.ui = 1 << TAG} }, \
-		" -sb '"SELBGCOLOR"' -sf '"SELFGCOLOR"'` && exec $exe" },
+	{ MODKEY|ControlMask|ShiftMask, KEY,      toggletag,      {.ui = 1 << TAG} },
-	{ MODKEY|ShiftMask,		XK_Return,	spawn, "exec uxterm" },
+
-	{ MODKEY,			XK_space,	setlayout,	NULL },
+/* helper for spawning shell commands in the pre dwm-5.0 fashion */
-	{ MODKEY,			XK_b,		togglebar,	NULL },
+#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
-	{ MODKEY,			XK_j,		focusnext,	NULL },
+
-	{ MODKEY,			XK_k,		focusprev,	NULL },
+/* commands */
-	{ MODKEY,			XK_h,		setmwfact,	"-0.05" },
+static const char *dmenucmd[] = { "dmenu_run", "-fn", font, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbgcolor, "-sf", selfgcolor, NULL };
-	{ MODKEY,			XK_l,		setmwfact,	"+0.05" },
+static const char *termcmd[]  = { "uxterm", NULL };
-	{ MODKEY,			XK_m,		togglemax,	NULL },
+
-	{ MODKEY,			XK_Return,	zoom,		NULL },
+static Key keys[] = {
-	{ MODKEY,			XK_Tab,		viewprevtag,	NULL },
+	/* modifier                     key        function        argument */
-	{ MODKEY|ShiftMask,		XK_space,	togglefloating,	NULL },
+	{ MODKEY,                       XK_p,      spawn,          {.v = dmenucmd } },
-	{ MODKEY|ShiftMask,		XK_c,		killclient,	NULL },
+	{ MODKEY|ShiftMask,             XK_Return, spawn,          {.v = termcmd } },
-	{ MODKEY,			XK_0,		view,		NULL },
+	{ MODKEY,                       XK_b,      togglebar,      {0} },
-	{ MODKEY,			XK_1,		view,		tags[0] },
+	{ MODKEY,                       XK_j,      focusstack,     {.i = +1 } },
-	{ MODKEY,			XK_2,		view,		tags[1] },
+	{ MODKEY,                       XK_k,      focusstack,     {.i = -1 } },
-	{ MODKEY,			XK_3,		view,		tags[2] },
+	{ MODKEY,                       XK_h,      setmfact,       {.f = -0.05} },
-	{ MODKEY,			XK_4,		view,		tags[3] },
+	{ MODKEY,                       XK_l,      setmfact,       {.f = +0.05} },
-	{ MODKEY,			XK_5,		view,		tags[4] },
+	{ MODKEY,                       XK_Return, zoom,           {0} },
-	{ MODKEY,			XK_6,		view,		tags[5] },
+	{ MODKEY,                       XK_Tab,    view,           {0} },
-	{ MODKEY,			XK_7,		view,		tags[6] },
+	{ MODKEY|ShiftMask,             XK_c,      killclient,     {0} },
-	{ MODKEY,			XK_8,		view,		tags[7] },
+	{ MODKEY,                       XK_t,      setlayout,      {.v = &layouts[0]} },
-	{ MODKEY,			XK_9,		view,		tags[8] },
+	{ MODKEY,                       XK_f,      setlayout,      {.v = &layouts[1]} },
-	{ MODKEY|ControlMask,		XK_1,		toggleview,	tags[0] },
+	{ MODKEY,                       XK_m,      setlayout,      {.v = &layouts[2]} },
-	{ MODKEY|ControlMask,		XK_2,		toggleview,	tags[1] },
+	{ MODKEY,                       XK_space,  setlayout,      {0} },
-	{ MODKEY|ControlMask,		XK_3,		toggleview,	tags[2] },
+	{ MODKEY|ShiftMask,             XK_space,  togglefloating, {0} },
-	{ MODKEY|ControlMask,		XK_4,		toggleview,	tags[3] },
+	{ MODKEY,                       XK_0,      view,           {.ui = ~0 } },
-	{ MODKEY|ControlMask,		XK_5,		toggleview,	tags[4] },
+	{ MODKEY|ShiftMask,             XK_0,      tag,            {.ui = ~0 } },
-	{ MODKEY|ControlMask,		XK_6,		toggleview,	tags[5] },
+	TAGKEYS(                        XK_1,                      0)
-	{ MODKEY|ControlMask,		XK_7,		toggleview,	tags[6] },
+	TAGKEYS(                        XK_2,                      1)
-	{ MODKEY|ControlMask,		XK_8,		toggleview,	tags[7] },
+	TAGKEYS(                        XK_3,                      2)
-	{ MODKEY|ControlMask,		XK_9,		toggleview,	tags[8] },
+	TAGKEYS(                        XK_4,                      3)
-	{ MODKEY|ShiftMask,		XK_0,		tag,		NULL },
+	TAGKEYS(                        XK_5,                      4)
-	{ MODKEY|ShiftMask,		XK_1,		tag,		tags[0] },
+	TAGKEYS(                        XK_6,                      5)
-	{ MODKEY|ShiftMask,		XK_2,		tag,		tags[1] },
+	TAGKEYS(                        XK_7,                      6)
-	{ MODKEY|ShiftMask,		XK_3,		tag,		tags[2] },
+	TAGKEYS(                        XK_8,                      7)
-	{ MODKEY|ShiftMask,		XK_4,		tag,		tags[3] },
+	TAGKEYS(                        XK_9,                      8)
-	{ MODKEY|ShiftMask,		XK_5,		tag,		tags[4] },
+	{ MODKEY|ShiftMask,             XK_q,      quit,           {0} },
-	{ MODKEY|ShiftMask,		XK_6,		tag,		tags[5] },
-	{ MODKEY|ShiftMask,		XK_7,		tag,		tags[6] },
-	{ MODKEY|ShiftMask,		XK_8,		tag,		tags[7] },
-	{ MODKEY|ShiftMask,		XK_9,		tag,		tags[8] },
-	{ MODKEY|ControlMask|ShiftMask,	XK_1,		toggletag,	tags[0] },
-	{ MODKEY|ControlMask|ShiftMask,	XK_2,		toggletag,	tags[1] },
-	{ MODKEY|ControlMask|ShiftMask,	XK_3,		toggletag,	tags[2] },
-	{ MODKEY|ControlMask|ShiftMask,	XK_4,		toggletag,	tags[3] },
-	{ MODKEY|ControlMask|ShiftMask,	XK_5,		toggletag,	tags[4] },
-	{ MODKEY|ControlMask|ShiftMask,	XK_6,		toggletag,	tags[5] },
-	{ MODKEY|ControlMask|ShiftMask,	XK_7,		toggletag,	tags[6] },
-	{ MODKEY|ControlMask|ShiftMask,	XK_8,		toggletag,	tags[7] },
-	{ MODKEY|ControlMask|ShiftMask,	XK_9,		toggletag,	tags[8] },
-	{ MODKEY|ShiftMask,		XK_q,		quit,		NULL },
 };
+
+/* button definitions */
+/* click can be a tag number (starting at 0),
+ * ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */
+static Button buttons[] = {
+	/* click                event mask      button          function        argument */
+	{ ClkLtSymbol,          0,              Button1,        setlayout,      {0} },
+	{ ClkLtSymbol,          0,              Button3,        setlayout,      {.v = &layouts[2]} },
+	{ ClkWinTitle,          0,              Button2,        zoom,           {0} },
+	{ ClkStatusText,        0,              Button2,        spawn,          {.v = termcmd } },
+	{ ClkClientWin,         MODKEY,         Button1,        movemouse,      {0} },
+	{ ClkClientWin,         MODKEY,         Button2,        togglefloating, {0} },
+	{ ClkClientWin,         MODKEY,         Button3,        resizemouse,    {0} },
+	{ ClkTagBar,            0,              Button1,        view,           {0} },
+	{ ClkTagBar,            0,              Button3,        toggleview,     {0} },
+	{ ClkTagBar,            MODKEY,         Button1,        tag,            {0} },
+	{ ClkTagBar,            MODKEY,         Button3,        toggletag,      {0} },
+};
+

config.mk

@@ -1,5 +1,5 @@
 # dwm version
-VERSION = 4.7
+VERSION = 5.2
 
 # Customize below to fit your system
 
@@ -10,20 +10,22 @@ MANPREFIX = ${PREFIX}/share/man
 X11INC = /usr/X11R6/include
 X11LIB = /usr/X11R6/lib
 
+# Xinerama, comment if you don't want it
+XINERAMALIBS = -L${X11LIB} -lXinerama
+XINERAMAFLAGS = -DXINERAMA
+
 # includes and libs
 INCS = -I. -I/usr/include -I${X11INC}
-LIBS = -L/usr/lib -lc -L${X11LIB} -lX11
+LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 ${XINERAMALIBS}
 
 # flags
-CFLAGS = -Os ${INCS} -DVERSION=\"${VERSION}\"
+CPPFLAGS = -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
+CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
 LDFLAGS = -s ${LIBS}
-#CFLAGS = -g -std=c99 -pedantic -Wall -O2 ${INCS} -DVERSION=\"${VERSION}\"
-#LDFLAGS = -g ${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,20 @@ click on a tag label adds/removes that tag to/from the focused window.
 Start
 .BR xterm.
 .TP
-.B Mod1\-Return
-Zooms/cycles current window to/from master area (tiled layout only).
-.TP
-.B Mod1\-Tab
-Toggles to the previously selected tags.
-.TP
 .B Mod1\-b
-Shows/hides the status bar.
+Toggles bar on and off.
 .TP
-.B Mod1\-h
+.B Mod1\-t
-Decreases the master area width about 5% (tiled layout only).
+Sets tiled layout.
+.TP
+.B Mod1\-f
+Sets floating layout.
+.TP
+.B Mod1\-m
+Sets monocle layout.
+.TP
+.B Mod1\-space
+Toggles between current and previous layout.
 .TP
 .B Mod1\-j
 Focus next window.
@@ -74,34 +78,37 @@ 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\-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 +127,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.
+Toggles focused window between floating and tiled state.
 .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 +154,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