changed config.def.h

[dwm.git] / config.def.h

diff --git a/config.def.h b/config.def.h
index c87553f..4118d68 100644 (file)
--- a/config.def.h
+++ b/config.def.h
@@ -10,57 +10,34 @@
 #define SELBGCOLOR             "#0066ff"
 #define SELFGCOLOR             "#ffffff"
 
-#if WORK
-
-/* 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
 
+/* window area */
+#define WX 0
+#define WY bh
+#define WW sw
+#define WH sh - bh
+
 /* master area */
-#define MX sx
-#define MY sy + bh
+#define MX WX
+#define MY WY
 #define MW ((int)(((float)sw) * 0.6))
-#define MH sh - bh
+#define MH WH
 
 /* tile area, might be on a different screen */
-#define TX sx + MW
-#define TY MY
-#define TW sw - MW
-#define TH MH
+#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 sx
-#define MOY MY
-#define MOW sw
-#define MOH MH
-
-#endif
+#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" };
@@ -78,18 +55,24 @@ 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_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 },
@@ -98,7 +81,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 },