applied Peter Hartlich's simplification patch of setmfact and his revival of MFACT...

[dwm.git] / config.def.h

diff --git a/config.def.h b/config.def.h
index 9ecdac5..541e405 100644 (file)
--- a/config.def.h
+++ b/config.def.h
@@ -1,7 +1,6 @@
 /* See LICENSE file for copyright and license details. */
 
 /* appearance */
-#define BARPOS                 BarTop /* BarBot, BarOff */
 #define BORDERPX               1
 #define FONT                   "-*-terminus-medium-r-normal-*-14-*-*-*-*-*-*-*"
 #define NORMBORDERCOLOR                "#cccccc"
@@ -11,27 +10,36 @@
 #define SELBGCOLOR             "#0066ff"
 #define SELFGCOLOR             "#ffffff"
 
-/* old */
-const char tags[][MAXTAGLEN]     = { "1", "2", "3", "4", "nil", "6", "7", "8", "www" };
-unsigned int vtags[LENGTH(tags)] = {  0 ,  0 ,  0 ,  0 ,   0  ,  1 ,  1 ,  1 ,   1   };
-Bool initags[LENGTH(tags)]       = { [0] = True, [5] = True };
+/* tagging */
+const char tags[][MAXTAGLEN] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
 
 Rule rules[] = {
-       /* class:instance:title substr  tags ref        isfloating */
-       { "Firefox",                    tags[8],        False },
-       { "Gimp",                       NULL,           True },
-       { "MPlayer",                    NULL,           True },
-       { "Acroread",                   NULL,           True },
+       /* class        instance        title           tags ref        isfloating */
+       { "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 */
+#define MFACT                  0.55    /* master width factor [0.1 .. 0.9] */
+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 MWFACT                 0.6     /* 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 */
-       { "[]=",                tile }, /* first entry is default */
-       { "><>",                floating },
+       /* symbol               function        isfloating */
+       { "[]=",                tilev,          False }, /* first entry is default */
+       { "[]|",                tileh,          False },
+       { "><>",                floating,       True },
+       { "[M]",                monocle,        True },
 };
 
 /* key definitions */
@@ -40,18 +48,18 @@ Key keys[] = {
        /* modifier                     key             function        argument */
        { 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_space,       setlayout,      NULL },
-       { MODKEY,                       XK_b,           togglebar,      NULL },
+       { MODKEY|ShiftMask,             XK_Return,      spawn,          "exec uxterm" },
        { MODKEY,                       XK_j,           focusnext,      NULL },
        { MODKEY,                       XK_k,           focusprev,      NULL },
-       { MODKEY,                       XK_h,           setmwfact,      "-0.05" },
-       { MODKEY,                       XK_l,           setmwfact,      "+0.05" },
        { MODKEY,                       XK_r,           reapply,        NULL },
+       { MODKEY,                       XK_h,           setmfact,       "-0.05" },
+       { MODKEY,                       XK_l,           setmfact,       "+0.05" },
        { MODKEY,                       XK_Return,      zoom,           NULL },
        { MODKEY,                       XK_Tab,         viewprevtag,    NULL },
-       { MODKEY|ShiftMask,             XK_space,       togglefloating, 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] },