switching to release flags

.hgtags

@@ -53,3 +53,13 @@ bcd7e18e196a00cc2e97ff3a4a58f3cdaba13856 4.6
 d6d3085307d8d98b8b012b669e858fd787befeb1 4.7
 607015ddb091d49cbd3457af41713691aa69f4d6 4.8
 22c669b2dd3673785c3476b9976da21e8783f745 4.9
+06eb9644e2dad7667d97495eb7d7bc62aa0429e8 5.0
+ce355cea9bb89e162f61913737a46908cdfa7e45 5.1
+e4bcaca8e6ef13d2c3b81f1218ad15e5da4d68bd 5.2
+4004d61160355d869a7d2672561caad440751ba0 5.3
+335301ed102fec9b1a15d06bfa0184d53b38fa54 5.3.1
+8b7836a471f8f9ee61bec980df00971888d76343 5.4
+85a78d8afa0fe8b106a8223b5327e5bddb5dd5e3 5.4.1
+deaa276abac17ca08fbeb936916e4c8292d293a4 5.5
+5550702215773aad462f22a774dced9b87437c51 5.6
+e47a47bd3ed42fd3cf023572147b75ebc2adef82 5.6.1

LICENSE

@@ -1,12 +1,16 @@
 MIT/X Consortium License
 
-© 2006-2008 Anselm R Garbe <garbeam at gmail dot com>
+© 2006-2009 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>
+© 2006-2009 Jukka Salmi <jukka at salmi dot ch>
-© 2007 Premysl Hruby <dfenze at gmail dot com>
+© 2007-2009 Premysl Hruby <dfenze at gmail dot com>
-© 2007 Szabolcs Nagy <nszabolcs at gmail dot com>
+© 2007-2009 Szabolcs Nagy <nszabolcs at gmail dot com>
-© 2007 Christof Musik <christof at sendfax dot de>
+© 2007-2009 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>
+© 2008 Neale Pickett <neale dot woozle dot org>
+© 2009 Mate Nagy <mnagy@port70.net>
 
 Permission is hereby granted, free of charge, to any person obtaining a
 copy of this software and associated documentation files (the "Software"),

README

@@ -40,9 +40,10 @@ like this in your .xinitrc:
 
     while true
     do
-        echo `date` `uptime | sed 's/.*,//'`
+        xsetroot -name "`date` `uptime | sed 's/.*,//'`"
         sleep 1
-    done | dwm
+    done &
+    exec dwm
 
 
 Configuration

config.def.h

@@ -1,39 +1,36 @@
 /* See LICENSE file for copyright and license details. */
 
 /* appearance */
-static const char font[]            = "-*-terminus-medium-r-normal-*-14-*-*-*-*-*-*-*";
+static const char font[]            = "-*-*-medium-*-*-*-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 const unsigned int borderpx  = 1;        /* border pixel of windows */
-static uint snap                    = 32;       /* snap pixel */
+static const unsigned int snap      = 32;       /* snap pixel */
-static Bool showbar                 = True;     /* False means no bar */
+static const Bool showbar           = True;     /* False means no bar */
-static Bool topbar                  = True;     /* False means bottom bar */
+static const Bool topbar            = True;     /* False means bottom bar */
-
-#ifdef XINERAMA
-static uint xidx                    = 0;        /* Xinerama screen index to use */
-#endif
 
 /* tagging */
-static const char tags[][MAXTAGLEN] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
+static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
 
-static Rule rules[] = {
+static const Rule rules[] = {
-	/* class      instance    title       tags mask     isfloating */
+	/* class      instance    title       tags mask     isfloating   monitor */
-	{ "Gimp",     NULL,       NULL,       0,            True },
+	{ "Gimp",     NULL,       NULL,       0,            True,        -1 },
-	{ "Firefox",  NULL,       NULL,       1 << 8,       True },
+	{ "Firefox",  NULL,       NULL,       1 << 8,       False,       -1 },
 };
 
 /* layout(s) */
-static float mfact      = 0.55;
+static const float mfact      = 0.55; /* factor of master area size [0.05..0.95] */
-static Bool resizehints = True; /* False means respect size hints in tiled resizals */
+static const Bool resizehints = True; /* True means respect size hints in tiled resizals */
 
-static Layout layouts[] = {
+static const Layout layouts[] = {
 	/* symbol     arrange function */
-	{ "[]=",      tile }, /* first entry is default */
+	{ "[]=",      tile },    /* first entry is default */
-	{ "><>",      NULL }, /* no layout function means floating behavior */
+	{ "><>",      NULL },    /* no layout function means floating behavior */
+	{ "[M]",      monocle },
 };
 
 /* key definitions */
@@ -60,14 +57,20 @@ static Key keys[] = {
 	{ 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,                       XK_t,      setlayout,      {.v = &layouts[0]} },
+	{ MODKEY,                       XK_f,      setlayout,      {.v = &layouts[1]} },
+	{ MODKEY,                       XK_m,      setlayout,      {.v = &layouts[2]} },
+	{ MODKEY,                       XK_space,  setlayout,      {0} },
 	{ MODKEY|ShiftMask,             XK_space,  togglefloating, {0} },
 	{ MODKEY,                       XK_0,      view,           {.ui = ~0 } },
 	{ MODKEY|ShiftMask,             XK_0,      tag,            {.ui = ~0 } },
+	{ MODKEY,                       XK_comma,  focusmon,       {.i = -1 } },
+	{ MODKEY,                       XK_period, focusmon,       {.i = +1 } },
+	{ MODKEY|ShiftMask,             XK_comma,  tagmon,         {.i = -1 } },
+	{ MODKEY|ShiftMask,             XK_period, tagmon,         {.i = +1 } },
 	TAGKEYS(                        XK_1,                      0)
 	TAGKEYS(                        XK_2,                      1)
 	TAGKEYS(                        XK_3,                      2)
@@ -81,31 +84,19 @@ static Key keys[] = {
 };
 
 /* button definitions */
-#define TAGBUTTONS(TAG) \
+/* click can be ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */
-	{ 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,              Button1,        setlayout,      {0} },
-	{ ClkLtSymbol,          0,              Button3,        togglemax,      {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} },
-	TAGBUTTONS(0)
+	{ ClkTagBar,            0,              Button1,        view,           {0} },
-	TAGBUTTONS(1)
+	{ ClkTagBar,            0,              Button3,        toggleview,     {0} },
-	TAGBUTTONS(2)
+	{ ClkTagBar,            MODKEY,         Button1,        tag,            {0} },
-	TAGBUTTONS(3)
+	{ ClkTagBar,            MODKEY,         Button3,        toggletag,      {0} },
-	TAGBUTTONS(4)
-	TAGBUTTONS(5)
-	TAGBUTTONS(6)
-	TAGBUTTONS(7)
-	TAGBUTTONS(8)
 };
 

config.mk

@@ -1,5 +1,5 @@
 # dwm version
-VERSION = 5.0
+VERSION = 5.7
 
 # Customize below to fit your system
 
@@ -10,7 +10,7 @@ MANPREFIX = ${PREFIX}/share/man
 X11INC = /usr/X11R6/include
 X11LIB = /usr/X11R6/lib
 
-# Xinerama, comment if you don't want it
+# Xinerama, un-comment if you want it
 XINERAMALIBS = -L${X11LIB} -lXinerama
 XINERAMAFLAGS = -DXINERAMA
 
@@ -20,7 +20,9 @@ LIBS = -L/usr/lib -lc -L${X11LIB} -lX11 ${XINERAMALIBS}
 
 # flags
 CPPFLAGS = -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
+#CFLAGS = -g -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS}
 CFLAGS = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
+#LDFLAGS = -g ${LIBS}
 LDFLAGS = -s ${LIBS}
 
 # Solaris

dwm.1

@@ -19,14 +19,14 @@ layout applied.
 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,
+Each screen contains a small status bar which displays all available tags, the
-the title of the focused window, and the text read from standard input. A
+layout, the title of the focused window, and the text read from the root window
-floating window is indicated with an empty square and a maximised
+name property, if the screen is focused. A floating window is indicated with an
-floating window is indicated with a filled square before the windows
+empty square and a maximised floating window is indicated with a filled square
-title.  The selected tags are indicated with a different color. The tags of
+before the windows title.  The selected tags are indicated with a different
-the focused window are indicated with a filled square in the top left
+color. The tags of the focused window are indicated with a filled square in the
-corner.  The tags which are applied to one or more windows are indicated
+top left corner.  The tags which are applied to one or more windows are
-with an empty square in the top left corner.
+indicated with an empty square in the top left corner.
 .P
 dwm draws a small border around windows to indicate the focus state.
 .SH OPTIONS
@@ -36,8 +36,10 @@ prints version information to standard output, then exits.
 .SH USAGE
 .SS Status bar
 .TP
-.B Standard input
+.B X root window name
-is read and displayed in the status text area.
+is read and displayed in the status text area. It can be set with the
+.BR xsetroot (1)
+command.
 .TP
 .B Button1
 click on a tag label to display all windows with that tag, click on the layout
@@ -55,13 +57,34 @@ click on a tag label adds/removes that tag to/from the focused window.
 .TP
 .B Mod1\-Shift\-Return
 Start
-.BR xterm.
+.BR uxterm (1).
+.TP
+.B Mod1\-,
+Focus previous screen, if any.
+.TP
+.B Mod1\-.
+Focus next screen, if any.
+.TP
+.B Mod1\-Shift\-,
+Send focused window to previous screen, if any.
+.TP
+.B Mod1\-Shift\-.
+Send focused window to next screen, if any.
 .TP
 .B Mod1\-b
 Toggles bar on and off.
 .TP
+.B Mod1\-t
+Sets tiled layout.
+.TP
+.B Mod1\-f
+Sets floating layout.
+.TP
+.B Mod1\-m
+Sets monocle layout.
+.TP
 .B Mod1\-space
-Toggles between layouts.
+Toggles between current and previous layout.
 .TP
 .B Mod1\-j
 Focus next window.
@@ -75,9 +98,6 @@ 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
@@ -91,30 +111,22 @@ Toggle focused window between tiled and floating state.
 Toggles to the previously selected tags.
 .TP
 .B Mod1\-Shift\-[1..n]
-Apply
+Apply nth tag to focused window.
-.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
+Add/remove nth tag to/from focused window.
-.B nth
-tag to/from focused window.
 .TP
 .B Mod1\-[1..n]
-View all windows with
+View all windows with nth tag.
-.BR nth
-tag.
 .TP
 .B Mod1\-0
 View all windows with any tag.
 .TP
 .B Mod1\-Control\-[1..n]
-Add/remove all windows with
+Add/remove all windows with nth tag to/from the view.
-.BR nth
-tag to/from the view.
 .TP
 .B Mod1\-Shift\-q
 Quit dwm.
@@ -134,19 +146,19 @@ code. This keeps it fast, secure and simple.
 .SH SEE ALSO
 .BR dmenu (1)
 .SH BUGS
-The status bar may display
-.BR "EOF"
-when dwm has been started by an X session manager like
-.BR xdm (1),
-because those close standard output before executing dwm.
-.P
 Java applications which use the XToolkit/XAWT backend may draw grey windows
 only. The XToolkit/XAWT backend breaks ICCCM-compliance in recent JDK 1.5 and early
-JDK 1.6 versions, because it assumes a reparenting window manager. As a workaround
+JDK 1.6 versions, because it assumes a reparenting window manager. Possible workarounds
-you can use JDK 1.4 (which doesn't contain the XToolkit/XAWT backend) or you
+are using JDK 1.4 (which doesn't contain the XToolkit/XAWT backend) or setting the
-can set the following environment variable (to use the older Motif
+environment variable
-backend instead):
+.BR AWT_TOOLKIT=MToolkit
-.BR AWT_TOOLKIT=MToolkit .
+(to use the older Motif backend instead) or running
+.B xprop -root -f _NET_WM_NAME 32a -set _NET_WM_NAME LG3D
+or
+.B wmname LG3D
+(to pretend that a non-reparenting window manager is running that the
+XToolkit/XAWT backend can recognize) or when using OpenJDK setting the environment variable
+.BR _JAVA_AWT_WM_NONREPARENTING=1 .
 .P
 GTK 2.10.9+ versions contain a broken
 .BR Save\-As