1.1 --- a/config.arg.h	Tue Aug 01 16:14:17 2006 +0200
     1.2 +++ b/config.arg.h	Tue Aug 01 16:20:03 2006 +0200
     1.3 @@ -3,7 +3,10 @@
     1.4   * See LICENSE file for license details.
     1.5   */
     1.6  
     1.7 -#define ARRANGE 		dotile /* dofloat */
     1.8 +enum { Tfnord, Tdev, Tnet, Twork, Tmisc, TLast };
     1.9 +
    1.10 +#define ARRANGE			dotile /* dofloat */
    1.11 +#define DEFTAG			Tdev
    1.12  #define FONT			"-*-terminus-medium-*-*-*-13-*-*-*-*-*-iso10646-*"
    1.13  #define BGCOLOR			"#0a2c2d"
    1.14  #define FGCOLOR			"#ddeeee"
    1.15 @@ -12,7 +15,6 @@
    1.16  #define NUMLOCKMASK		Mod2Mask
    1.17  #define MASTERW			52 /* percent */
    1.18  
    1.19 -enum { Tfnord, Tdev, Tnet, Twork, Tmisc, TLast };
    1.20  #define TAGS \
    1.21  char *tags[TLast] = { \
    1.22  	[Tfnord] = "fnord", \
    1.23 @@ -21,19 +23,15 @@
    1.24  	[Twork] = "work", \
    1.25  	[Tmisc] = "misc", \
    1.26  };
    1.27 -#define DEFTAG Tdev
    1.28  
    1.29 -
    1.30 -#define CMDS \
    1.31 +#define KEYS \
    1.32  	const char *browse[] = { "firefox", NULL }; \
    1.33  	const char *gimp[] = { "gimp", NULL }; \
    1.34  	const char *term[] = { \
    1.35  		"urxvt", "-tr", "+sb", "-bg", "black", "-fg", "white", "-cr", "white", \
    1.36  		"-fn", "-*-terminus-medium-*-*-*-13-*-*-*-*-*-iso10646-*", NULL \
    1.37  	}; \
    1.38 -	const char *xlock[] = { "xlock", NULL };
    1.39 -
    1.40 -#define KEYS \
    1.41 +	const char *xlock[] = { "xlock", NULL }; \
    1.42  static Key key[] = { \
    1.43  	/* modifier		key		function	arguments */ \
    1.44  	{ MODKEY,		XK_0,		view,		{ .i = Tfnord } }, \

     2.1 --- a/config.h	Tue Aug 01 16:14:17 2006 +0200
     2.2 +++ b/config.h	Tue Aug 01 16:20:03 2006 +0200
     2.3 @@ -3,7 +3,9 @@
     2.4   * See LICENSE file for license details.
     2.5   */
     2.6  
     2.7 -#define ARRANGE 		dotile /* dofloat */
     2.8 +enum { Tfnord, Tdev, Tnet, Twork, Tmisc, TLast };
     2.9 +#define DEFTAG			Tdev
    2.10 +#define ARRANGE			dotile /* dofloat */
    2.11  #define FONT			"fixed"
    2.12  #define BGCOLOR			"#666699"
    2.13  #define FGCOLOR			"#eeeeee"
    2.14 @@ -12,7 +14,6 @@
    2.15  #define NUMLOCKMASK		Mod2Mask
    2.16  #define MASTERW			52 /* percent */
    2.17  
    2.18 -enum { Tfnord, Tdev, Tnet, Twork, Tmisc, TLast };
    2.19  #define TAGS \
    2.20  char *tags[TLast] = { \
    2.21  	[Tfnord] = "fnord", \
    2.22 @@ -21,13 +22,9 @@
    2.23  	[Twork] = "work", \
    2.24  	[Tmisc] = "misc", \
    2.25  };
    2.26 -#define DEFTAG Tdev
    2.27 -
    2.28 -
    2.29 -#define CMDS \
    2.30 -	const char *term[] = { "xterm", NULL };
    2.31  
    2.32  #define KEYS \
    2.33 +	const char *term[] = { "xterm", NULL }; \
    2.34  static Key key[] = { \
    2.35  	/* modifier		key		function	arguments */ \
    2.36  	{ MODKEY,		XK_0,		view,		{ .i = Tfnord } }, \