moved all tile()-related stuff into tile.c which is included from config.def.h, the...

[dwm.git] / config.def.h

diff --git a/config.def.h b/config.def.h
index 1c704c3..f35769c 100644 (file)
--- a/config.def.h
+++ b/config.def.h
@@ -9,6 +9,7 @@
 #define SELBORDERCOLOR  "#0066ff"
 #define SELBGCOLOR      "#0066ff"
 #define SELFGCOLOR      "#ffffff"
+#define SNAP            32    /* snap pixel */
 
 /* tagging */
 const char tags[][MAXTAGLEN] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
@@ -19,15 +20,14 @@ Rule rules[] = {
 };
 
 /* layout(s) */
-#define MFACT       0.55  /* master factor [0.1 .. 0.9] */
 #define RESIZEHINTS True  /* False - respect size hints in tiled resizals */
-#define SNAP        32    /* snap pixel */
-
+#define MFACT       0.55  /* master factor [0.1 .. 0.9] */
+#include "tile.c"
 Layout layouts[] = {
-       /* symbol     function    isfloating */
-       { "[]=",      tilev,      False }, /* first entry is default */
-       { "><>",      NULL,       True },
-       { "<M>",      monocle,    True },
+       /* symbol     arrange  geom */
+       { "[]=",      tile,    tilegeom }, /* first entry is default */
+       { "><>",      NULL,             }, /* no layout function means floating behavior */
+       { "<M>",      monocle, NULL     }, /* TODO: remove this */
 };
 
 /* key definitions */
@@ -40,7 +40,6 @@ Key keys[] = {
        { MODKEY|ShiftMask,             XK_j,      focusnext,      "exact" },
        { MODKEY,                       XK_k,      focusprev,      NULL },
        { MODKEY|ShiftMask,             XK_k,      focusprev,      "exact" },
-       { MODKEY,                       XK_r,      reapply,        NULL },
        { MODKEY,                       XK_h,      setmfact,       "-0.05" },
        { MODKEY,                       XK_l,      setmfact,       "+0.05" },
        { MODKEY,                       XK_Return, zoom,           NULL },