M config.arg.h → config.arg.h

@@ -3,7 +3,10 @@ * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */
 
-#define ARRANGE 		dotile /* dofloat */
+enum { Tfnord, Tdev, Tnet, Twork, Tmisc, TLast };
+
+#define ARRANGE			dotile /* dofloat */
+#define DEFTAG			Tdev
 #define FONT			"-*-terminus-medium-*-*-*-13-*-*-*-*-*-iso10646-*"
 #define BGCOLOR			"#0a2c2d"
 #define FGCOLOR			"#ddeeee"
@@ -12,7 +15,6 @@ #define MODKEY			Mod1Mask
 #define NUMLOCKMASK		Mod2Mask
 #define MASTERW			52 /* percent */
 
-enum { Tfnord, Tdev, Tnet, Twork, Tmisc, TLast };
 #define TAGS \
 char *tags[TLast] = { \
 	[Tfnord] = "fnord", \
@@ -21,19 +23,15 @@ [Tnet] = "net", \
 	[Twork] = "work", \
 	[Tmisc] = "misc", \
 };
-#define DEFTAG Tdev
 
-
-#define CMDS \
+#define KEYS \
 	const char *browse[] = { "firefox", NULL }; \
 	const char *gimp[] = { "gimp", NULL }; \
 	const char *term[] = { \
 		"urxvt", "-tr", "+sb", "-bg", "black", "-fg", "white", "-cr", "white", \
 		"-fn", "-*-terminus-medium-*-*-*-13-*-*-*-*-*-iso10646-*", NULL \
 	}; \
-	const char *xlock[] = { "xlock", NULL };
-
-#define KEYS \
+	const char *xlock[] = { "xlock", NULL }; \
 static Key key[] = { \
 	/* modifier		key		function	arguments */ \
 	{ MODKEY,		XK_0,		view,		{ .i = Tfnord } }, \

M config.h → config.h

@@ -3,7 +3,9 @@ * (C)opyright MMVI Anselm R. Garbe <garbeam at gmail dot com>
  * See LICENSE file for license details.
  */
 
-#define ARRANGE 		dotile /* dofloat */
+enum { Tfnord, Tdev, Tnet, Twork, Tmisc, TLast };
+#define DEFTAG			Tdev
+#define ARRANGE			dotile /* dofloat */
 #define FONT			"fixed"
 #define BGCOLOR			"#666699"
 #define FGCOLOR			"#eeeeee"
@@ -12,7 +14,6 @@ #define MODKEY			Mod1Mask
 #define NUMLOCKMASK		Mod2Mask
 #define MASTERW			52 /* percent */
 
-enum { Tfnord, Tdev, Tnet, Twork, Tmisc, TLast };
 #define TAGS \
 char *tags[TLast] = { \
 	[Tfnord] = "fnord", \
@@ -21,13 +22,9 @@ [Tnet] = "net", \
 	[Twork] = "work", \
 	[Tmisc] = "misc", \
 };
-#define DEFTAG Tdev
-
-
-#define CMDS \
-	const char *term[] = { "xterm", NULL };
 
 #define KEYS \
+	const char *term[] = { "xterm", NULL }; \
 static Key key[] = { \
 	/* modifier		key		function	arguments */ \
 	{ MODKEY,		XK_0,		view,		{ .i = Tfnord } }, \