merged tile.c again into dwm.c

[dwm.git] / config.def.h

diff --git a/config.def.h b/config.def.h
index f35769c..63c8c06 100644 (file)
--- a/config.def.h
+++ b/config.def.h
@@ -1,7 +1,6 @@
 /* See LICENSE file for copyright and license details. */
 
 /* appearance */
-#define BORDERPX        1
 #define FONT            "-*-terminus-medium-r-normal-*-14-*-*-*-*-*-*-*"
 #define NORMBORDERCOLOR "#cccccc"
 #define NORMBGCOLOR     "#cccccc"
@@ -9,7 +8,10 @@
 #define SELBORDERCOLOR  "#0066ff"
 #define SELBGCOLOR      "#0066ff"
 #define SELFGCOLOR      "#ffffff"
-#define SNAP            32    /* snap pixel */
+unsigned int borderpx  = 1;        /* border pixel of windows */
+unsigned int snap      = 32;       /* snap pixel */
+Bool showbar           = True;     /* False means no bar */
+Bool topbar            = True;     /* False means bottom bar */
 
 /* tagging */
 const char tags[][MAXTAGLEN] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
@@ -20,14 +22,13 @@ Rule rules[] = {
 };
 
 /* layout(s) */
-#define RESIZEHINTS True  /* False - respect size hints in tiled resizals */
-#define MFACT       0.55  /* master factor [0.1 .. 0.9] */
-#include "tile.c"
+double mfact           = 0.55;
+Bool resizehints       = True;     /* False means respect size hints in tiled resizals */
+
 Layout layouts[] = {
        /* symbol     arrange  geom */
-       { "[]=",      tile,    tilegeom }, /* first entry is default */
-       { "><>",      NULL,             }, /* no layout function means floating behavior */
-       { "<M>",      monocle, NULL     }, /* TODO: remove this */
+       { "[]=",      tile,    updatetilegeom }, /* first entry is default */
+       { "><>",      NULL,    NULL           }, /* no layout function means floating behavior */
 };
 
 /* key definitions */
@@ -36,14 +37,12 @@ Key keys[] = {
        /* modifier                     key        function        argument */
        { MODKEY,                       XK_p,      spawn,          "exec dmenu_run -fn '"FONT"' -nb '"NORMBGCOLOR"' -nf '"NORMFGCOLOR"' -sb '"SELBGCOLOR"' -sf '"SELFGCOLOR"'" },
        { MODKEY|ShiftMask,             XK_Return, spawn,          "exec uxterm" },
+       { MODKEY,                       XK_b,      togglebar,      NULL },
        { MODKEY,                       XK_j,      focusnext,      NULL },
-       { MODKEY|ShiftMask,             XK_j,      focusnext,      "exact" },
        { MODKEY,                       XK_k,      focusprev,      NULL },
-       { MODKEY|ShiftMask,             XK_k,      focusprev,      "exact" },
        { MODKEY,                       XK_h,      setmfact,       "-0.05" },
        { MODKEY,                       XK_l,      setmfact,       "+0.05" },
        { MODKEY,                       XK_Return, zoom,           NULL },
-       { MODKEY,                       XK_m,      togglelayout,   "<M>" },
        { MODKEY,                       XK_Tab,    viewprevtag,    NULL },
        { MODKEY|ShiftMask,             XK_c,      killclient,     NULL },
        { MODKEY,                       XK_space,  togglelayout,   NULL },