geom indicator and layout indicator is only displayed if there are several geoms...

[dwm.git] / config.def.h

diff --git a/config.def.h b/config.def.h
index fdf4040..b62e938 100644 (file)
--- a/config.def.h
+++ b/config.def.h
@@ -10,44 +10,27 @@
 #define SELBGCOLOR             "#0066ff"
 #define SELFGCOLOR             "#ffffff"
 
-/* bar position */
-#define BX sx
-#define BY sy
-#define BW sw
-
-/* window area */
-#define WX 0
-#define WY bh
-#define WW sw
-#define WH sh - bh
-
-/* master area */
-#define MX WX
-#define MY WY
-#define MW ((int)(((float)sw) * 0.6))
-#define MH WH
-
-/* tile area, might be on a different screen */
-#define TX MX + MW
-#define TY WY
-#define TW WW - MW
-#define TH WH
-
-/* monocle area, might be restricted to a specific screen */
-#define MOX WX
-#define MOY WY
-#define MOW WW
-#define MOH WH
-
 /* 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 */
+DEFGEOM(single,  0,  0, sw,  0, bh, sw, sh-bh, wx, wy, 0.55*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)
+/* DEFGEOM(growmaster, bx, by, bw, wx, wy, ww, wh, mx, my, mw+20, mh, mx+mw, ty, tw-20, th, mox, moy, mow, moh) */
+/* DEFGEOM(shrinkmaster, bx, by, bw, wx, wy, ww, wh, mx, my, mw-20, mh, mx+mw, ty, tw+20, th, mox, moy, mow, moh) */
+
+Geom geoms[] = {
+       /* symbol       function */
+       { "<>",         single },       /* first entry is default */
+       { ")(",         dual },
+/*     { "+|",         growmaster },*/
+/*     { "|-",         shrinkmaster },*/
 };
 
 /* layout(s) */
@@ -56,8 +39,8 @@ Rule rules[] = {
 
 Layout layouts[] = {
        /* symbol               function        isfloating */
-       { "[]|",                tileh,          False }, /* first entry is default */
-       { "[]=",                tilev,          False },
+       { "[]=",                tilev,          False }, /* first entry is default */
+       { "[]|",                tileh,          False },
        { "><>",                floating,       True },
        { "[M]",                monocle,        True },
 };
@@ -66,13 +49,10 @@ Layout layouts[] = {
 #define MODKEY                 Mod1Mask
 Key keys[] = {
        /* modifier                     key             function        argument */
-#if ANSELM_OFFICE
-       { MODKEY,                       XK_p,           spawn,
-               "exec dmenu_run -fn '"FONT"' -nb '"NORMBGCOLOR"' -nf '"NORMFGCOLOR"' -sb '"SELBGCOLOR"' -sf '"SELFGCOLOR"' -x 0 -y 0 -w 1280" },
-#else
+       { MODKEY,                       XK_a,           setgeom,        ")(" },
+       { MODKEY,                       XK_d,           setgeom,        "<>" },
        { MODKEY,                       XK_p,           spawn,
                "exec dmenu_run -fn '"FONT"' -nb '"NORMBGCOLOR"' -nf '"NORMFGCOLOR"' -sb '"SELBGCOLOR"' -sf '"SELFGCOLOR"'" },
-#endif
        { MODKEY|ShiftMask,             XK_Return,      spawn, "exec uxterm" },
        { MODKEY,                       XK_j,           focusnext,      NULL },
        { MODKEY,                       XK_k,           focusprev,      NULL },