Add new layout options to default config and remove some mouse callbacks I don't...

diff --git a/config.def.h b/config.def.h
index d8d99d601392001998d264dbfe181cc361dc7a42..1f411373a737cb92b6a4d1a973f1cdf2d660eb41 100755 (executable)
--- a/config.def.h
+++ b/config.def.h
@@ -30,11 +30,19 @@ static const float mfact      = 0.55; /* factor of master area size [0.05..0.95]
 static const int nmaster      = 1;    /* number of clients in master area */
 static const Bool resizehints = True; /* True means respect size hints in tiled resizals */
 
+#define LAYOUT_BOOKSHELF 0
+#define LAYOUT_BOOKSTACK 1
+#define LAYOUT_TILE      2
+#define LAYOUT_FLOAT     3
+#define LAYOUT_MONOCLE   4
+
 static const Layout layouts[] = {
        /* symbol     arrange function */
-       { "[]=",      tile },    /* first entry is default */
+       { "|||",      bookshelf }, /* first entry is default */
+       { "===",      bookstack },
+       { "[]=",      tile },
        { "><>",      NULL },    /* no layout function means floating behavior */
-       { "[M]",      monocle },
+       { "[M]",      monocle }
 };
 
 /* key definitions */
@@ -63,12 +71,14 @@ static Key keys[] = {
        { MODKEY,                       XK_s,      incnmaster,     {.i = -1 } },
 /*     { MODKEY,                       XK_h,      setmfact,       {.f = -0.05} },
        { MODKEY,                       XK_l,      setmfact,       {.f = +0.05} },*/
-/*     { MODKEY,                       XK_Return, zoom,           {0} }, */
+       { MODKEY,                       XK_Return, zoom,           {0} },
        { MODKEY,                       XK_Tab,    view,           {0} },
        { MODKEY|ShiftMask,             XK_x,      killclient,     {0} },
-       { MODKEY,                       XK_e,      setlayout,      {.v = &layouts[0]} },
-       { MODKEY,                       XK_r,      setlayout,      {.v = &layouts[1]} },
-       { MODKEY,                       XK_t,      setlayout,      {.v = &layouts[2]} },
+       { MODKEY,                       XK_e,      setlayout,      {.v = &layouts[LAYOUT_BOOKSHELF]} },
+       { MODKEY,                       XK_r,      setlayout,      {.v = &layouts[LAYOUT_BOOKSTACK]} },
+       { MODKEY,                       XK_t,      setlayout,      {.v = &layouts[LAYOUT_TILE]} },
+       { MODKEY,                       XK_y,      setlayout,      {.v = &layouts[LAYOUT_FLOAT]} },
+       { MODKEY,                       XK_u,      setlayout,      {.v = &layouts[LAYOUT_MONOCLE]} },
 /*     { MODKEY,                       XK_space,  setlayout,      {0} },
        { MODKEY|ShiftMask,             XK_space,  togglefloating, {0} }, */
        { MODKEY,                       XK_0,      view,           {.ui = ~0 } },
@@ -94,9 +104,9 @@ static Key keys[] = {
 static Button buttons[] = {
        /* click                event mask      button          function        argument */
        { ClkLtSymbol,          0,              Button1,        setlayout,      {0} },
-       { ClkLtSymbol,          0,              Button3,        setlayout,      {.v = &layouts[2]} },
+       { ClkLtSymbol,          0,              Button3,        setlayout,      {.v = &layouts[LAYOUT_MONOCLE]} },
        { ClkWinTitle,          0,              Button2,        zoom,           {0} },
-       { ClkStatusText,        0,              Button2,        spawn,          {.v = termcmd } },
+/*     { ClkStatusText,        0,              Button2,        spawn,          {.v = termcmd } }, */
        { ClkClientWin,         MODKEY,         Button1,        movemouse,      {0} },
        { ClkClientWin,         MODKEY,         Button2,        togglefloating, {0} },
        { ClkClientWin,         MODKEY,         Button3,        resizemouse,    {0} },