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 f286769..6fd4218 100644 (file)
--- a/config.arg.h
+++ b/config.arg.h
@@ -1,24 +1,22 @@
-/* (C)opyright MMVI-MMVII Anselm R. Garbe <garbeam at gmail dot com>
- * See LICENSE file for license details.
- */
+/* See LICENSE file for copyright and license details. */
 
 /* appearance */
+#define BARPOS                 BarTop /* BarBot, BarOff */
 #define BORDERPX               1
-#define FONT                   "-*-proggyclean-medium-r-*-*-13-*-*-*-*-*-*-*"
+#define FONT                   "-*-terminus-medium-r-*-*-14-*-*-*-*-*-iso10646-*"
 #define NORMBORDERCOLOR                "#333"
 #define NORMBGCOLOR            "#222"
 #define NORMFGCOLOR            "#ccc"
-#define SELBORDERCOLOR         "#8c8"
+#define SELBORDERCOLOR         "#59a"
 #define SELBGCOLOR             "#555"
 #define SELFGCOLOR             "#fff"
-#define TOPBAR                 True            /* False */
 
-/* behavior */
+/* tagging */
 #define TAGS \
 const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9", NULL };
 #define RULES \
 static Rule rule[] = { \
-       /* class:instance:title regex   tags regex      isuntiled */ \
+       /* class:instance:title regex   tags regex      isfloating */ \
        { "Firefox",                    "3",            False }, \
        { "Gimp",                       NULL,           True }, \
        { "MPlayer",                    NULL,           True }, \
@@ -26,15 +24,16 @@ static Rule rule[] = { \
 };
 
 /* layout(s) */
+#include "tile.h"
+#include "float.h"
 #define LAYOUTS \
 static Layout layout[] = { \
        /* symbol               function */ \
        { "[]=",                tile }, /* first entry is default */ \
-       { "><>",                untile }, \
+       { "><>",                floating }, \
 };
-#define MASTERWIDTH            600             /* master width per thousand */
-#define NMASTER                        1               /* clients in master area */
-#define SNAP                   32              /* snap pixel */
+#define MASTER                 0.6     /* 0.1 .. 0.9 */
+#define SNAP                   32      /* snap pixel */
 
 /* key definitions */
 #define MODKEY                 Mod1Mask
@@ -42,21 +41,19 @@ static Layout layout[] = { \
 static Key key[] = { \
        /* modifier                     key             function        argument */ \
        { MODKEY,                       XK_p,           spawn, \
-               "exe=\"$(lsx `echo $PATH | sed 's/:/ /g'` | sort -u " \
-               " | dmenu -fn '"FONT"' -nb '"NORMBGCOLOR"' -nf '"NORMFGCOLOR"' " \
-               "-sb '"SELBGCOLOR"' -sf '"SELFGCOLOR"')\" && exec $exe" }, \
+               "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 '#292929' -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_d,           incnmaster,     "-1" }, \
-       { MODKEY,                       XK_i,           incnmaster,     "1" }, \
-       { MODKEY,                       XK_h,           incmasterw,     "-32" }, \
-       { MODKEY,                       XK_l,           incmasterw,     "32" }, \
+       { MODKEY,                       XK_b,           togglebar,      NULL }, \
        { MODKEY,                       XK_j,           focusclient,    "1" }, \
        { MODKEY,                       XK_k,           focusclient,    "-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,       toggletiled,    NULL }, \
+       { MODKEY|ShiftMask,             XK_space,       togglefloating, NULL }, \
        { MODKEY|ShiftMask,             XK_c,           killclient,     NULL }, \
        { MODKEY,                       XK_0,           view,           NULL }, \
        { MODKEY,                       XK_1,           view,           "0" }, \