aboutsummaryrefslogtreecommitdiff
path: root/config.default.h
diff options
context:
space:
mode:
authorarg@10ksloc.org <unknown>2006-08-03 12:12:26 +0200
committerarg@10ksloc.org <unknown>2006-08-03 12:12:26 +0200
commitb35575574be53a1b3be42d7037d2f432a19a3890 (patch)
tree6be2344c68ec6590fa816bbd578e0f36fe21c0b8 /config.default.h
parent666b4563a0064dd7aa27159813124837d306f81c (diff)
removed TLast tag enum, now tags is simple defined as char *[] array, the rest is calculated correctly, rules take an int array for the tags
Diffstat (limited to 'config.default.h')
-rw-r--r--config.default.h48
1 files changed, 21 insertions, 27 deletions
diff --git a/config.default.h b/config.default.h
index ec1804f..ce3773e 100644
--- a/config.default.h
+++ b/config.default.h
@@ -3,18 +3,11 @@
* See LICENSE file for license details.
*/
-enum { Tfnord, Tdev, Tnet, Twork, Tmisc, TLast };
#define TAGS \
-const char *tags[TLast] = { \
- [Tfnord] = "fnord", \
- [Tdev] = "dev", \
- [Tnet] = "net", \
- [Twork] = "work", \
- [Tmisc] = "misc", \
-};
+const char *tags[] = { "0", "1", "2", "3", "4", NULL };
#define DEFMODE dotile /* dofloat */
-#define DEFTAG Tdev
+#define DEFTAG 1 /* index */
#define FONT "fixed"
#define BGCOLOR "#666699"
#define FGCOLOR "#eeeeee"
@@ -27,11 +20,11 @@ const char *tags[TLast] = { \
const char *term[] = { "xterm", NULL }; \
static Key key[] = { \
/* modifier key function arguments */ \
- { MODKEY, XK_0, view, { .i = Tfnord } }, \
- { MODKEY, XK_1, view, { .i = Tdev } }, \
- { MODKEY, XK_2, view, { .i = Tnet } }, \
- { MODKEY, XK_3, view, { .i = Twork } }, \
- { MODKEY, XK_4, view, { .i = Tmisc} }, \
+ { MODKEY, XK_0, view, { .i = 0 } }, \
+ { MODKEY, XK_1, view, { .i = 1 } }, \
+ { MODKEY, XK_2, view, { .i = 2 } }, \
+ { MODKEY, XK_3, view, { .i = 3 } }, \
+ { MODKEY, XK_4, view, { .i = 4 } }, \
{ MODKEY, XK_h, viewprev, { 0 } }, \
{ MODKEY, XK_j, focusnext, { 0 } }, \
{ MODKEY, XK_k, focusprev, { 0 } }, \
@@ -39,24 +32,25 @@ static Key key[] = { \
{ MODKEY, XK_m, togglemax, { 0 } }, \
{ MODKEY, XK_space, togglemode, { 0 } }, \
{ MODKEY, XK_Return, zoom, { 0 } }, \
- { MODKEY|ControlMask, XK_0, appendtag, { .i = Tfnord } }, \
- { MODKEY|ControlMask, XK_1, appendtag, { .i = Tdev } }, \
- { MODKEY|ControlMask, XK_2, appendtag, { .i = Tnet } }, \
- { MODKEY|ControlMask, XK_3, appendtag, { .i = Twork } }, \
- { MODKEY|ControlMask, XK_4, appendtag, { .i = Tmisc } }, \
- { MODKEY|ShiftMask, XK_0, replacetag, { .i = Tfnord } }, \
- { MODKEY|ShiftMask, XK_1, replacetag, { .i = Tdev } }, \
- { MODKEY|ShiftMask, XK_2, replacetag, { .i = Tnet } }, \
- { MODKEY|ShiftMask, XK_3, replacetag, { .i = Twork } }, \
- { MODKEY|ShiftMask, XK_4, replacetag, { .i = Tmisc } }, \
+ { MODKEY|ControlMask, XK_0, appendtag, { .i = 0 } }, \
+ { MODKEY|ControlMask, XK_1, appendtag, { .i = 1 } }, \
+ { MODKEY|ControlMask, XK_2, appendtag, { .i = 2 } }, \
+ { MODKEY|ControlMask, XK_3, appendtag, { .i = 3 } }, \
+ { MODKEY|ControlMask, XK_4, appendtag, { .i = 4 } }, \
+ { MODKEY|ShiftMask, XK_0, replacetag, { .i = 0 } }, \
+ { MODKEY|ShiftMask, XK_1, replacetag, { .i = 1 } }, \
+ { MODKEY|ShiftMask, XK_2, replacetag, { .i = 2 } }, \
+ { MODKEY|ShiftMask, XK_3, replacetag, { .i = 3 } }, \
+ { MODKEY|ShiftMask, XK_4, replacetag, { .i = 4 } }, \
{ MODKEY|ShiftMask, XK_c, killclient, { 0 } }, \
{ MODKEY|ShiftMask, XK_q, quit, { 0 } }, \
{ MODKEY|ShiftMask, XK_Return, spawn, { .argv = term } }, \
};
#define RULES \
+ const unsigned int firefox[] = { 2 }; \
static Rule rule[] = { \
- /* class:instance tags isfloat */ \
- { "Firefox.*", { [Tnet] = True }, False }, \
- { "Gimp.*", { 0 }, True}, \
+ /* class:instance tags isfloat */ \
+ { "Firefox.*", firefox, False }, \
+ { "Gimp.*", NULL, True}, \
};