separated layout-specific stuff into separate .h and .c files which are included...

[dwm.git] / config.arg.h

diff --git a/config.arg.h b/config.arg.h
index de3a623..6fd4218 100644 (file)
--- a/config.arg.h
+++ b/config.arg.h
@@ -7,7 +7,7 @@
 #define NORMBORDERCOLOR                "#333"
 #define NORMBGCOLOR            "#222"
 #define NORMFGCOLOR            "#ccc"
 #define NORMBORDERCOLOR                "#333"
 #define NORMBGCOLOR            "#222"
 #define NORMFGCOLOR            "#ccc"

-#define SELBORDERCOLOR         "#8c8"
+#define SELBORDERCOLOR         "#59a"

 #define SELBGCOLOR             "#555"
 #define SELFGCOLOR             "#fff"
 
 #define SELBGCOLOR             "#555"
 #define SELFGCOLOR             "#fff"
 


@@ -24,15 +24,15 @@ static Rule rule[] = { \
 };
 
 /* layout(s) */
 };
 
 /* layout(s) */

+#include "tile.h"
+#include "float.h"

 #define LAYOUTS \
 static Layout layout[] = { \
        /* symbol               function */ \
        { "[]=",                tile }, /* first entry is default */ \
        { "><>",                floating }, \
 };
 #define LAYOUTS \
 static Layout layout[] = { \
        /* symbol               function */ \
        { "[]=",                tile }, /* first entry is default */ \
        { "><>",                floating }, \
 };

-#define NMASTER                        1       /* clients in master area */
-#define HRATIO                 .8      /* horizontal ratio of tile */
-#define VRATIO                 .9      /* vertical ratio of tile */
+#define MASTER                 0.6     /* 0.1 .. 0.9 */

 #define SNAP                   32      /* snap pixel */
 
 /* key definitions */
 #define SNAP                   32      /* snap pixel */
 
 /* key definitions */


@@ -44,17 +44,13 @@ static Key key[] = { \
                "exe=`dmenu_path | dmenu -fn '"FONT"' -nb '"NORMBGCOLOR"' -nf '"NORMFGCOLOR"'" \
                " -sb '"SELBGCOLOR"' -sf '"SELFGCOLOR"'` && exec $exe" }, \
        { MODKEY|ShiftMask,             XK_Return,      spawn, \
                "exe=`dmenu_path | dmenu -fn '"FONT"' -nb '"NORMBGCOLOR"' -nf '"NORMFGCOLOR"'" \
                " -sb '"SELBGCOLOR"' -sf '"SELFGCOLOR"'` && exec $exe" }, \
        { MODKEY|ShiftMask,             XK_Return,      spawn, \

-               "exec urxvtcd -tr -bg '#222' -fg '#eee' -cr '#eee' +sb -fn '"FONT"'" }, \
+               "exec urxvtcd -tr -bg '#111' -fg '#eee' -cr '#eee' +sb -fn '"FONT"'" }, \

        { MODKEY,                       XK_space,       setlayout,      NULL }, \
        { MODKEY,                       XK_b,           togglebar,      NULL }, \
        { MODKEY,                       XK_space,       setlayout,      NULL }, \
        { MODKEY,                       XK_b,           togglebar,      NULL }, \

-       { MODKEY,                       XK_h,           incnmaster,     "1" }, \
-       { MODKEY,                       XK_l,           incnmaster,     "-1" }, \

        { MODKEY,                       XK_j,           focusclient,    "1" }, \
        { MODKEY,                       XK_k,           focusclient,    "-1" }, \
        { MODKEY,                       XK_j,           focusclient,    "1" }, \
        { MODKEY,                       XK_k,           focusclient,    "-1" }, \

-       { MODKEY|ShiftMask,             XK_h,           inchratio,      ".1" }, \
-       { MODKEY|ShiftMask,             XK_l,           inchratio,      "-.1" }, \
-       { MODKEY|ShiftMask,             XK_j,           incvratio,      "-.1" }, \
-       { MODKEY|ShiftMask,             XK_k,           incvratio,      ".1" }, \
+       { MODKEY,                       XK_h,           incmaster,      "-0.05" }, \
+       { MODKEY,                       XK_l,           incmaster,      "0.05" }, \

        { MODKEY,                       XK_m,           togglemax,      NULL }, \
        { MODKEY,                       XK_Return,      zoom,           NULL }, \
        { MODKEY|ShiftMask,             XK_space,       togglefloating, NULL }, \
        { MODKEY,                       XK_m,           togglemax,      NULL }, \
        { MODKEY,                       XK_Return,      zoom,           NULL }, \
        { MODKEY|ShiftMask,             XK_space,       togglefloating, NULL }, \