branch merge

.hgtags

@@ -52,3 +52,4 @@ e0ec0d5d8b1ef3ee04a83c7c0fee5853aa2ac6a6 4.3
 bcd7e18e196a00cc2e97ff3a4a58f3cdaba13856 4.6
 d6d3085307d8d98b8b012b669e858fd787befeb1 4.7
 607015ddb091d49cbd3457af41713691aa69f4d6 4.8
+22c669b2dd3673785c3476b9976da21e8783f745 4.9

LICENSE

@@ -12,16 +12,16 @@ 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 
-all copies or substantial portions of the Software. 
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL 
-THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
-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 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+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
 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,100 +1,111 @@
 /* See LICENSE file for copyright and license details. */
 
 /* appearance */
-#define BORDERPX		1
-#define FONT			"-*-terminus-medium-r-normal-*-14-*-*-*-*-*-*-*"
-#define NORMBORDERCOLOR		"#cccccc"
-#define NORMBGCOLOR		"#cccccc"
-#define NORMFGCOLOR		"#000000"
-#define SELBORDERCOLOR		"#0066ff"
-#define SELBGCOLOR		"#0066ff"
-#define SELFGCOLOR		"#ffffff"
+static const char font[]            = "-*-terminus-medium-r-normal-*-14-*-*-*-*-*-*-*";
+static const char normbordercolor[] = "#cccccc";
+static const char normbgcolor[]     = "#cccccc";
+static const char normfgcolor[]     = "#000000";
+static const char selbordercolor[]  = "#0066ff";
+static const char selbgcolor[]      = "#0066ff";
+static const char selfgcolor[]      = "#ffffff";
+static uint borderpx                = 1;        /* border pixel of windows */
+static uint snap                    = 32;       /* snap pixel */
+static Bool showbar                 = True;     /* False means no bar */
+static Bool topbar                  = True;     /* False means bottom bar */
+
+#ifdef XINERAMA
+static uint xidx                    = 0;        /* Xinerama screen index to use */
+#endif
 
 /* tagging */
-const char tags[][MAXTAGLEN] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
+static const char tags[][MAXTAGLEN] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
 
-Rule rules[] = {
-	/* class	instance	title		tags ref	isfloating */
-	{ "Gimp",	NULL,		NULL,		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 */
+static Rule rules[] = {
+	/* class      instance    title       tags mask     isfloating */
+	{ "Gimp",     NULL,       NULL,       0,            True },
+	{ "Firefox",  NULL,       NULL,       1 << 8,       True },
 };
 
 /* layout(s) */
-#define RESIZEHINTS		True	/* False - respect size hints in tiled resizals */
-#define SNAP			32	/* snap pixel */
+static float mfact      = 0.55;
+static Bool resizehints = True; /* False means respect size hints in tiled resizals */
 
-Layout layouts[] = {
-	/* symbol		function	isfloating */
-	{ "[]=",		tilev,		False }, /* first entry is default */
-	{ "[]|",		tileh,		False },
-	{ "><>",		floating,	True },
-	{ "[M]",		monocle,	True },
+static Layout layouts[] = {
+	/* symbol     arrange function */
+	{ "[]=",      tile }, /* first entry is default */
+	{ "><>",      NULL }, /* no layout function means floating behavior */
 };
 
 /* key definitions */
-#define MODKEY			Mod1Mask
-Key keys[] = {
-	/* modifier			key		function	argument */
-	{ MODKEY,			XK_p,		spawn,
-		"exec dmenu_run -fn '"FONT"' -nb '"NORMBGCOLOR"' -nf '"NORMFGCOLOR"' -sb '"SELBGCOLOR"' -sf '"SELFGCOLOR"'" },
-	{ MODKEY|ShiftMask,		XK_Return,	spawn,		"exec uxterm" },
-	{ MODKEY,			XK_j,		focusnext,	NULL },
-	{ MODKEY,			XK_k,		focusprev,	NULL },
-	{ MODKEY,			XK_r,		reapply,	NULL },
-	{ MODKEY,			XK_h,		setmfact,	"-0.05" },
-	{ MODKEY,			XK_l,		setmfact,	"+0.05" },
-	{ MODKEY,			XK_Return,	zoom,		NULL },
-	{ MODKEY,			XK_Tab,		viewprevtag,	NULL },
-	{ MODKEY|ShiftMask,		XK_c,		killclient,	NULL },
-	{ MODKEY,			XK_space,	setlayout,	NULL },
-	{ MODKEY|ShiftMask,		XK_space,	togglefloating,	NULL },
-	{ MODKEY|ControlMask,		XK_space,	setgeom,	NULL },
-	{ MODKEY,			XK_0,		view,		NULL },
-	{ MODKEY,			XK_1,		view,		tags[0] },
-	{ MODKEY,			XK_2,		view,		tags[1] },
-	{ MODKEY,			XK_3,		view,		tags[2] },
-	{ MODKEY,			XK_4,		view,		tags[3] },
-	{ MODKEY,			XK_5,		view,		tags[4] },
-	{ MODKEY,			XK_6,		view,		tags[5] },
-	{ MODKEY,			XK_7,		view,		tags[6] },
-	{ MODKEY,			XK_8,		view,		tags[7] },
-	{ MODKEY,			XK_9,		view,		tags[8] },
-	{ MODKEY|ControlMask,		XK_1,		toggleview,	tags[0] },
-	{ MODKEY|ControlMask,		XK_2,		toggleview,	tags[1] },
-	{ MODKEY|ControlMask,		XK_3,		toggleview,	tags[2] },
-	{ MODKEY|ControlMask,		XK_4,		toggleview,	tags[3] },
-	{ MODKEY|ControlMask,		XK_5,		toggleview,	tags[4] },
-	{ MODKEY|ControlMask,		XK_6,		toggleview,	tags[5] },
-	{ MODKEY|ControlMask,		XK_7,		toggleview,	tags[6] },
-	{ MODKEY|ControlMask,		XK_8,		toggleview,	tags[7] },
-	{ MODKEY|ControlMask,		XK_9,		toggleview,	tags[8] },
-	{ MODKEY|ShiftMask,		XK_0,		tag,		NULL },
-	{ MODKEY|ShiftMask,		XK_1,		tag,		tags[0] },
-	{ MODKEY|ShiftMask,		XK_2,		tag,		tags[1] },
-	{ MODKEY|ShiftMask,		XK_3,		tag,		tags[2] },
-	{ MODKEY|ShiftMask,		XK_4,		tag,		tags[3] },
-	{ MODKEY|ShiftMask,		XK_5,		tag,		tags[4] },
-	{ 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 },
+#define MODKEY Mod1Mask
+#define TAGKEYS(KEY,TAG) \
+	{ MODKEY,                       KEY,      view,           {.ui = 1 << TAG} }, \
+	{ MODKEY|ControlMask,           KEY,      toggleview,     {.ui = 1 << TAG} }, \
+	{ MODKEY|ShiftMask,             KEY,      tag,            {.ui = 1 << TAG} }, \
+	{ MODKEY|ControlMask|ShiftMask, KEY,      toggletag,      {.ui = 1 << TAG} },
+
+/* helper for spawning shell commands in the pre dwm-5.0 fashion */
+#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
+
+/* commands */
+static const char *dmenucmd[] = { "dmenu_run", "-fn", font, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbgcolor, "-sf", selfgcolor, NULL };
+static const char *termcmd[]  = { "uxterm", NULL };
+
+static Key keys[] = {
+	/* modifier                     key        function        argument */
+	{ MODKEY,                       XK_p,      spawn,          {.v = dmenucmd } },
+	{ MODKEY|ShiftMask,             XK_Return, spawn,          {.v = termcmd } },
+	{ MODKEY,                       XK_b,      togglebar,      {0} },
+	{ MODKEY,                       XK_j,      focusstack,     {.i = +1 } },
+	{ MODKEY,                       XK_k,      focusstack,     {.i = -1 } },
+	{ MODKEY,                       XK_h,      setmfact,       {.f = -0.05} },
+	{ MODKEY,                       XK_l,      setmfact,       {.f = +0.05} },
+	{ MODKEY,                       XK_m,      togglemax,      {0} },
+	{ MODKEY,                       XK_Return, zoom,           {0} },
+	{ MODKEY,                       XK_Tab,    view,           {0} },
+	{ MODKEY|ShiftMask,             XK_c,      killclient,     {0} },
+	{ MODKEY,                       XK_space,  togglelayout,   {0} },
+	{ MODKEY|ShiftMask,             XK_space,  togglefloating, {0} },
+	{ MODKEY,                       XK_0,      view,           {.ui = ~0 } },
+	{ MODKEY|ShiftMask,             XK_0,      tag,            {.ui = ~0 } },
+	TAGKEYS(                        XK_1,                      0)
+	TAGKEYS(                        XK_2,                      1)
+	TAGKEYS(                        XK_3,                      2)
+	TAGKEYS(                        XK_4,                      3)
+	TAGKEYS(                        XK_5,                      4)
+	TAGKEYS(                        XK_6,                      5)
+	TAGKEYS(                        XK_7,                      6)
+	TAGKEYS(                        XK_8,                      7)
+	TAGKEYS(                        XK_9,                      8)
+	{ MODKEY|ShiftMask,             XK_q,      quit,           {0} },
 };
+
+/* button definitions */
+#define TAGBUTTONS(TAG) \
+	{ TAG,                  0,              Button1,        view,           {.ui = 1 << TAG} }, \
+	{ TAG,                  0,              Button3,        toggleview,     {.ui = 1 << TAG} }, \
+	{ TAG,                  MODKEY,         Button1,        tag,            {.ui = 1 << TAG} }, \
+	{ TAG,                  MODKEY,         Button3,        toggletag,      {.ui = 1 << TAG} },
+
+/* 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,        togglelayout,   {0} },
+	{ ClkLtSymbol,          0,              Button3,        togglemax,      {0} },
+	{ 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} },
+	TAGBUTTONS(0)
+	TAGBUTTONS(1)
+	TAGBUTTONS(2)
+	TAGBUTTONS(3)
+	TAGBUTTONS(4)
+	TAGBUTTONS(5)
+	TAGBUTTONS(6)
+	TAGBUTTONS(7)
+	TAGBUTTONS(8)
+};
+

config.mk

@@ -1,5 +1,5 @@
 # dwm version
-VERSION = 4.9
+VERSION = 5.0
 
 # Customize below to fit your system
 
@@ -10,15 +10,18 @@ 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}\"

dwm.1

@@ -57,12 +57,12 @@ click on a tag label adds/removes that tag to/from the focused window.
 Start
 .BR xterm.
 .TP
+.B Mod1\-b
+Toggles bar on and off.
+.TP
 .B Mod1\-space
 Toggles between layouts.
 .TP
-.B Mod1\-Control\-space
-Toggles between geometries.
-.TP
 .B Mod1\-j
 Focus next window.
 .TP
@@ -75,6 +75,9 @@ Decrease master area size.
 .B Mod1\-l
 Increase master area size.
 .TP
+.B Mod1\-m
+Toggle between maximisation meta-layout and active layout.
+.TP
 .B Mod1\-Return
 Zooms/cycles focused window to/from master area (tiled layouts only).
 .TP
@@ -87,9 +90,6 @@ Toggle focused window between tiled and floating state.
 .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
@@ -124,7 +124,7 @@ Quit dwm.
 Move focused window while dragging. Tiled windows will be toggled to the floating state.
 .TP
 .B Mod1\-Button2
-Zooms/cycles focused 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 focused window while dragging. Tiled windows will be toggled to the floating state.