made the string-based setgeom working

[dwm.git] / config.def.h

diff --git a/config.def.h b/config.def.h
index 88d1002..f6d90d8 100644 (file)
--- a/config.def.h
+++ b/config.def.h
@@ -9,68 +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"
 
-#if ANSELM_OFFICE
+/* 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"
 
-/* bar position */
-#define BX 0
-#define BY 0
-#define BW 1280
-
-/* master area */
-#define MX 0
-#define MY bh
-#define MW 1280
-#define MH 800 - bh
-
-/* tile area, might be on a different screen */
-#define TX 1280
-#define TY 0
-#define TW 1680
-#define TH 1050
-
-/* monocle area, might be restricted to a specific screen */
-#define MOX MX
-#define MOY MY
-#define MOW MW
-#define MOH MH
-
-#else
-
-/* bar position */
-#define BX sx
-#define BY sy
-#define BW sw
-
-/* master area */
-#define MX sx
-#define MY sy + bh
-#define MW ((int)(((float)sw) * 0.6))
-#define MH sh - bh
-
-/* tile area, might be on a different screen */
-#define TX sx + MW
-#define TY MY
-#define TW sw - MW
-#define TH MH
-
-/* monocle area, might be restricted to a specific screen */
-#define MOX sx
-#define MOY MY
-#define MOW sw
-#define MOH MH
-
-#endif
 
 /* 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) */
@@ -78,23 +39,21 @@ Rule rules[] = {
 #define SNAP                   32      /* snap pixel */
 
 Layout layouts[] = {
-       /* symbol               function */
-       { "[]=",                tile }, /* first entry is default */
-       { "><>",                floating },
-       { "[M]",                monocle },
+       /* symbol               function        isfloating */
+       { "[]=",                tilev,          False }, /* first entry is default */
+       { "[]|",                tileh,          False },
+       { "><>",                floating,       True },
+       { "[M]",                monocle,        True },
 };
 
 /* key definitions */
 #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 },
@@ -103,7 +62,8 @@ Key keys[] = {
        { MODKEY,                       XK_Tab,         viewprevtag,    NULL },
        { MODKEY,                       XK_m,           setlayout,      "[M]" },
        { MODKEY,                       XK_f,           setlayout,      "><>" },
-       { MODKEY,                       XK_t,           setlayout,      "[]=" },
+       { MODKEY,                       XK_v,           setlayout,      "[]=" },
+       { MODKEY,                       XK_h,           setlayout,      "[]|" },
        { MODKEY|ShiftMask,             XK_space,       togglefloating, NULL },
        { MODKEY|ShiftMask,             XK_c,           killclient,     NULL },
        { MODKEY,                       XK_0,           view,           NULL },