changed some odering in config*.h

[dwm.git] / config.arg.h

diff --git a/config.arg.h b/config.arg.h
index 2b94fd6..0e044bf 100644 (file)
--- a/config.arg.h
+++ b/config.arg.h
@@ -2,14 +2,7 @@
  * See LICENSE file for license details.
  */
 
-#define TAGS \
-const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9", NULL };
-
 #define BORDERPX               1
-#define DEFMODE                        dotile          /* dofloat */
-#define FLOATSYMBOL            "><>"
-#define TILESYMBOL             "[]="
-
 #define FONT                   "-*-terminus-medium-r-*-*-14-*-*-*-*-*-*-*"
 #define NORMBORDERCOLOR                "#333"
 #define NORMBGCOLOR            "#222"
@@ -24,6 +17,16 @@ const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9", NULL };
 #define SNAP                   40              /* pixel */
 #define TOPBAR                 True            /* False */
 
+#define TAGS \
+const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9", NULL };
+
+#define LAYOUTS \
+static Layout layout[] = { \
+       /* symbol               function */ \
+       { "[]=",                tile }, /* first entry is default */ \
+       { "><>",                versatile }, \
+};
+
 #define KEYS \
 static Key key[] = { \
        /* modifier                     key             function        argument */ \
@@ -60,8 +63,8 @@ static Key key[] = { \
        { MODKEY|ControlMask|ShiftMask, XK_8,           toggletag,      { .i = 7 } }, \
        { MODKEY|ControlMask|ShiftMask, XK_9,           toggletag,      { .i = 8 } }, \
        { MODKEY|ShiftMask,             XK_c,           killclient,     { 0 } }, \
-       { MODKEY,                       XK_space,       togglemode,     { 0 } }, \
-       { MODKEY|ShiftMask,             XK_space,       togglefloat,    { 0 } }, \
+       { MODKEY,                       XK_space,       togglelayout,   { 0 } }, \
+       { MODKEY|ShiftMask,             XK_space,       toggleversatile,{ 0 } }, \
        { MODKEY,                       XK_0,           view,           { .i = -1 } }, \
        { MODKEY,                       XK_1,           view,           { .i = 0 } }, \
        { MODKEY,                       XK_2,           view,           { .i = 1 } }, \
@@ -86,7 +89,7 @@ static Key key[] = { \
 
 #define RULES \
 static Rule rule[] = { \
-       /* class:instance:title regex   tags regex      isfloat */ \
+       /* class:instance:title regex   tags regex      isversatile */ \
        { "Firefox",                    "3",            False }, \
        { "Gimp",                       NULL,           True }, \
        { "MPlayer",                    NULL,           True }, \