X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;f=config.def.h;h=d62b1311a7c85afd2f72ab17dc1e55a246896be0;hb=585294ce0f9ec693b5a4315e9ad794fbd0a7584d;hp=289178061f98b86bdae1e325e2260c81f353a003;hpb=a785a0d71213c2ab628778727c4354ad5bb517fb;p=dwm.git

diff --git a/config.def.h b/config.def.h
index 2891780..d62b131 100644
--- 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,13 @@ 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 */
-	{ "[]=",      tilev   }, /* first entry is default */
-	{ "><>",      NULL    }, /* no layout function means floating behavior */
-	{ "<M>",      monocle }, /* TODO: remove this */
+	/* symbol     arrange  geom */
+	{ "[]=",      tile,    updatetilegeom }, /* first entry is default */
+	{ "><>",      NULL,                   }, /* no layout function means floating behavior */
 };
 
 /* key definitions */
@@ -37,13 +36,10 @@ Key keys[] = {
 	{ MODKEY,                       XK_p,      spawn,          "exec dmenu_run -fn '"FONT"' -nb '"NORMBGCOLOR"' -nf '"NORMFGCOLOR"' -sb '"SELBGCOLOR"' -sf '"SELFGCOLOR"'" },
 	{ MODKEY|ShiftMask,             XK_Return, spawn,          "exec uxterm" },
 	{ MODKEY,                       XK_j,      focusnext,      NULL },
-	{ MODKEY|ShiftMask,             XK_j,      focusnext,      "exact" },
 	{ MODKEY,                       XK_k,      focusprev,      NULL },
-	{ MODKEY|ShiftMask,             XK_k,      focusprev,      "exact" },
 	{ MODKEY,                       XK_h,      setmfact,       "-0.05" },
 	{ MODKEY,                       XK_l,      setmfact,       "+0.05" },
 	{ MODKEY,                       XK_Return, zoom,           NULL },
-	{ MODKEY,                       XK_m,      togglelayout,   "<M>" },
 	{ MODKEY,                       XK_Tab,    viewprevtag,    NULL },
 	{ MODKEY|ShiftMask,             XK_c,      killclient,     NULL },
 	{ MODKEY,                       XK_space,  togglelayout,   NULL },