implemented setlayout in the way proposed on the ml, split tile() into two functions...

[dwm.git] / config.def.h

diff --git a/config.def.h b/config.def.h
index 9ecdac5..1268e4f 100644 (file)
--- a/config.def.h
+++ b/config.def.h
@@ -1,7 +1,6 @@
 /* See LICENSE file for copyright and license details. */
 
 /* appearance */
 /* 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"
 #define BORDERPX               1
 #define FONT                   "-*-terminus-medium-r-normal-*-14-*-*-*-*-*-*-*"
 #define NORMBORDERCOLOR                "#cccccc"


@@ -11,10 +10,37 @@
 #define SELBGCOLOR             "#0066ff"
 #define SELFGCOLOR             "#ffffff"
 
 #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 };
+/* 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 */
 
 Rule rules[] = {
        /* class:instance:title substr  tags ref        isfloating */


@@ -25,31 +51,36 @@ Rule rules[] = {
 };
 
 /* layout(s) */
 };
 
 /* 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 */
 #define RESIZEHINTS            True    /* False - respect size hints in tiled resizals */
 #define SNAP                   32      /* snap pixel */

+

 Layout layouts[] = {
 Layout layouts[] = {

-       /* symbol               function */
-       { "[]=",                tile }, /* first entry is default */
-       { "><>",                floating },
+       /* symbol               function        isfloating */
+       { "[]=",                tile,           False }, /* first entry is default */
+       { "><>",                floating        True },
+       { "[M]",                monocle         True },

 };
 
 /* key definitions */
 #define MODKEY                 Mod1Mask
 Key keys[] = {
        /* modifier                     key             function        argument */
 };
 
 /* 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"'" },
        { 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|ShiftMask,             XK_Return,      spawn, "exec uxterm" },

-       { MODKEY,                       XK_space,       setlayout,      NULL },
-       { MODKEY,                       XK_b,           togglebar,      NULL },

        { MODKEY,                       XK_j,           focusnext,      NULL },
        { MODKEY,                       XK_k,           focusprev,      NULL },
        { 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_Return,      zoom,           NULL },
        { MODKEY,                       XK_Tab,         viewprevtag,    NULL },
        { MODKEY,                       XK_r,           reapply,        NULL },
        { MODKEY,                       XK_Return,      zoom,           NULL },
        { MODKEY,                       XK_Tab,         viewprevtag,    NULL },

+       { MODKEY,                       XK_m,           setlayout,      "[M]" },
+       { MODKEY,                       XK_f,           setlayout,      "><>" },
+       { MODKEY,                       XK_t,           setlayout,      "[]=" },

        { MODKEY|ShiftMask,             XK_space,       togglefloating, NULL },
        { MODKEY|ShiftMask,             XK_c,           killclient,     NULL },
        { MODKEY,                       XK_0,           view,           NULL },
        { MODKEY|ShiftMask,             XK_space,       togglefloating, NULL },
        { MODKEY|ShiftMask,             XK_c,           killclient,     NULL },
        { MODKEY,                       XK_0,           view,           NULL },