made the string-based setgeom working

[dwm.git] / config.def.h

diff --git a/config.def.h b/config.def.h
index 4118d68..f6d90d8 100644 (file)
--- a/config.def.h
+++ b/config.def.h
@@ -9,45 +9,29 @@
 #define SELBORDERCOLOR         "#0066ff"
 #define SELBGCOLOR             "#0066ff"
 #define SELFGCOLOR             "#ffffff"
+#define GEOMETRY               "0 0 W B " \
+                               "0 B W H-B " \
+                               "0 B W*0.55 H-B " \
+                               "W*0.55 B W*0.45 H-B " \
+                               "0 B W H-B"
 
-/* bar position */
-#define BX sx
-#define BY sy
-#define BW sw
+/* Anselm's dual head geometry in the office */
+#define DUALGEOMETRY           "0 0 1280 B " \
+                               "0 B W H-B " \
+                               "0 B 1280 800-B " \
+                               "1280 0 W-1280 H " \
+                               "0 B 1280 800-B"
 
-/* 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 */
+       { NULL,         NULL,           "Firefox",      tags[8],        False },
+       { NULL,         NULL,           "Gimp",         NULL,           True },
+       { NULL,         NULL,           "MPlayer",      NULL,           True },
+       { NULL,         NULL,           "Acroread",     NULL,           True },
 };
 
 /* layout(s) */
@@ -66,13 +50,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,        DUALGEOMETRY },
+       { MODKEY,                       XK_d,           setgeom,        GEOMETRY },
        { 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 },