summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--config.arg.h14
-rw-r--r--config.h11
2 files changed, 10 insertions, 15 deletions
diff --git a/config.arg.h b/config.arg.h
index 3b44fd7..180b890 100644
--- a/config.arg.h
+++ b/config.arg.h
@@ -3,7 +3,10 @@
* 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 NUMLOCKMASK Mod2Mask
#define MASTERW 52 /* percent */
-enum { Tfnord, Tdev, Tnet, Twork, Tmisc, TLast };
#define TAGS \
char *tags[TLast] = { \
[Tfnord] = "fnord", \
@@ -21,19 +23,15 @@ char *tags[TLast] = { \
[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 } }, \
diff --git a/config.h b/config.h
index bc60bd0..36213c0 100644
--- a/config.h
+++ b/config.h
@@ -3,7 +3,9 @@
* 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 NUMLOCKMASK Mod2Mask
#define MASTERW 52 /* percent */
-enum { Tfnord, Tdev, Tnet, Twork, Tmisc, TLast };
#define TAGS \
char *tags[TLast] = { \
[Tfnord] = "fnord", \
@@ -21,13 +22,9 @@ char *tags[TLast] = { \
[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 } }, \