having monocle on Mod1-m

[dwm.git] / config.def.h

diff --git a/config.def.h b/config.def.h
index ddecedd..f7bb36a 100644 (file)
--- a/config.def.h
+++ b/config.def.h
@@ -18,28 +18,16 @@ Rule rules[] = {
        { "Gimp",       NULL,           NULL,           NULL,           True },
 };
 
-/* geometries, s{x,y,w,h} and bh are already initualized here */
-/*   func name  bx  by  bw  wx  wy  ww     wh  mx  my       mw  mh     tx  ty     tw  th  mox moy mow moh */
-double mfact = 0.55;
-DEFGEOM(single,  0,  0, sw,  0, bh, sw, sh-bh, wx, wy, mfact*sw, wh, mx+mw, wy, ww-mw, wh,  wx, wy, ww, wh)
-DEFGEOM(dual,    0,  0,1280, 0, bh, ww, wh-bh, wx, wy, 1280,800-bh,  1280,  0, ww-mw, sh,  mx, my, mw, mh)
-
-Geom geoms[] = {
-       /* symbol       function */
-       { "[]",         single },       /* first entry is default */
-       { "[][]",       dual },
-};
-
 /* layout(s) */
+#define MFACT                  0.55    /* master width factor [0.1 .. 0.9] */
 #define RESIZEHINTS            True    /* False - respect size hints in tiled resizals */
 #define SNAP                   32      /* snap pixel */
 
 Layout layouts[] = {
        /* symbol               function        isfloating */
        { "[]=",                tilev,          False }, /* first entry is default */
-       { "[]|",                tileh,          False },
-       { "><>",                floating,       True },
-       { "[M]",                monocle,        True },
+       { "><>",                NULL,           True },
+       { "<M>",                monocle,        True },
 };
 
 /* key definitions */
@@ -50,16 +38,18 @@ Key keys[] = {
                "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_r,           reapply,        NULL },
        { MODKEY,                       XK_h,           setmfact,       "-0.05" },
        { MODKEY,                       XK_l,           setmfact,       "+0.05" },
        { MODKEY,                       XK_Return,      zoom,           NULL },
+       { MODKEY,                       XK_m,           setlayout,      "<M>" },
        { MODKEY,                       XK_Tab,         viewprevtag,    NULL },
        { MODKEY|ShiftMask,             XK_c,           killclient,     NULL },
        { MODKEY,                       XK_space,       setlayout,      NULL },
        { MODKEY|ShiftMask,             XK_space,       togglefloating, NULL },
-       { MODKEY|ControlMask,           XK_space,       setgeom,        NULL },
        { MODKEY,                       XK_0,           view,           NULL },
        { MODKEY,                       XK_1,           view,           tags[0] },
        { MODKEY,                       XK_2,           view,           tags[1] },