gappx from xresources

[dwm.git] / config.def.h

diff --git a/config.def.h b/config.def.h
index 50d01a3..49dc7bd 100644 (file)
--- a/config.def.h
+++ b/config.def.h
@@ -2,10 +2,13 @@
 
 /* appearance */
 static unsigned int borderpx  = 1;        /* border pixel of windows */
-static const unsigned int gappx     = 5;        /* gaps between windows */
+static unsigned int gappx     = 5;        /* gaps between windows */
 static unsigned int snap      = 32;       /* snap pixel */
+static const int swallowfloating    = 1;        /* 1 means swallow floating windows by default */
 static int showbar            = 1;        /* 0 means no bar */
 static int topbar             = 1;        /* 0 means bottom bar */
+static const int vertpad            = 5;       /* vertical padding of bar */
+static const int sidepad            = 5;       /* horizontal padding of bar */
 static const char *fonts[]          = { "Source Code Pro:size=12" };
 static const char dmenufont[]       = "Source Code Pro:size=12";
 static char normbgcolor[]           = "#222222";
@@ -28,15 +31,17 @@ static const Rule rules[] = {
         *      WM_CLASS(STRING) = instance, class
         *      WM_NAME(STRING) = title
         */
-       /* class      instance    title       tags mask     isfloating   monitor */
-       { "Gimp",     NULL,       NULL,       0,            1,           -1 },
-       { "Firefox",  NULL,       NULL,       1 << 8,       0,           -1 },
+       /* class     instance  title           tags mask  isfloating  isterminal  noswallow  monitor */
+       { "Gimp",    NULL,     NULL,           0,         1,          0,           0,        -1 },
+       { "Firefox", NULL,     NULL,           1 << 8,    0,          0,          -1,        -1 },
+       { "St",      NULL,     NULL,           0,         0,          1,           0,        -1 },
+       { NULL,      NULL,     "Event Tester", 0,         0,          0,           1,        -1 }, /* xev */
 };
 
 /* layout(s) */
 static float mfact     = 0.55; /* factor of master area size [0.05..0.95] */
 static int nmaster     = 1;    /* number of clients in master area */
-static int resizehints = 1;    /* 1 means respect size hints in tiled resizals */
+static int resizehints = 0;    /* 1 means respect size hints in tiled resizals */
 
 static const Layout layouts[] = {
        /* symbol     arrange function */
@@ -58,7 +63,7 @@ static const Layout layouts[] = {
 
 /* commands */
 static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
-static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbordercolor, "-sf", selfgcolor, NULL };
+static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon };
 static const char *termcmd[]  = { "st", NULL };
 
 /*
@@ -78,6 +83,7 @@ ResourcePref resources[] = {
                { "nmaster",            INTEGER, &nmaster },
                { "resizehints",        INTEGER, &resizehints },
                { "mfact",                      FLOAT,   &mfact },
+               { "gappx",                      INTEGER, &gappx },
 };
 
 static Key keys[] = {
@@ -91,23 +97,20 @@ static Key keys[] = {
        { MODKEY,                       XK_d,      incnmaster,     {.i = -1 } },
        { MODKEY,                       XK_h,      setmfact,       {.f = -0.05} },
        { MODKEY,                       XK_l,      setmfact,       {.f = +0.05} },
-       { MODKEY,                       XK_Return, zoom,           {0} },
+       { MODKEY,                       XK_space,  zoom,           {0} },
        { MODKEY,                       XK_Tab,    view,           {0} },
        { MODKEY|ShiftMask,             XK_c,      killclient,     {0} },
        { MODKEY,                       XK_t,      setlayout,      {.v = &layouts[0]} },
        { MODKEY,                       XK_f,      setlayout,      {.v = &layouts[1]} },
        { MODKEY,                       XK_m,      setlayout,      {.v = &layouts[2]} },
-       { MODKEY,                       XK_space,  setlayout,      {0} },
-       { MODKEY|ShiftMask,             XK_space,  togglefloating, {0} },
+       /* { MODKEY,                       XK_space,  setlayout,      {0} }, */
+       { MODKEY|ShiftMask,             XK_f,      togglefloating, {0} },
        { MODKEY,                       XK_0,      view,           {.ui = ~0 } },
        { MODKEY|ShiftMask,             XK_0,      tag,            {.ui = ~0 } },
        { MODKEY,                       XK_comma,  focusmon,       {.i = -1 } },
        { MODKEY,                       XK_period, focusmon,       {.i = +1 } },
        { MODKEY|ShiftMask,             XK_comma,  tagmon,         {.i = -1 } },
        { MODKEY|ShiftMask,             XK_period, tagmon,         {.i = +1 } },
-       { MODKEY,                       XK_minus,  setgaps,        {.i = -1 } },
-       { MODKEY,                       XK_equal,  setgaps,        {.i = +1 } },
-       { MODKEY|ShiftMask,             XK_equal,  setgaps,        {.i = 0  } },
        TAGKEYS(                        XK_1,                      0)
        TAGKEYS(                        XK_2,                      1)
        TAGKEYS(                        XK_3,                      2)