Gaps und neue layouts

1 files changed, 61 insertions, 6 deletions

diff --git a/config.def.h b/config.def.h
index 9ffadc4..09b32c2 100644
--- a/config.def.h
+++ b/config.def.h
@@ -15,13 +15,17 @@
 
 /* appearance */
 static const unsigned int borderpx  = 2;        /* border pixel of windows */
-static const unsigned int snap      = 32;       /* snap pixel */
+static const unsigned int snap      = 5;        /* snap pixel */
 static const unsigned int systraypinning = 0;   /* 0: sloppy systray follows selected monitor, >0: pin systray to monitor X */
+static const unsigned int gappih    = 5;        /* horiz inner gap between windows */
+static const unsigned int gappiv    = 5;        /* vert inner gap between windows */
+static const unsigned int gappoh    = 5;        /* horiz outer gap between windows and screen edge */
+static const unsigned int gappov    = 5;        /* vert outer gap between windows and screen edge */
+static       int smartgaps          = 0;        /* 1 means no outer gap when there is only one window */
 static const unsigned int systrayonleft = 0;    /* 0: systray in the right corner, >0: systray on left of status text */
 static const unsigned int systrayspacing = 2;   /* systray spacing */
 static const int systraypinningfailfirst = 1;   /* 1: if pinning fails, display systray on the first monitor, False: display systray on the last monitor*/
 static const int showsystray        = 1;        /* 0 means no systray */
-static const unsigned int gappx     = 6;        /* gap pixel between windows */
 static const int showbar            = 1;        /* 0 means no bar */
 static const int topbar             = 1;        /* 0 means bottom bar */
 // static const char *fonts[]          = { "SF Pro Text:size=10" };
@@ -97,11 +101,26 @@ komputer(
 static const int refreshrate = 300;  /* refresh rate (per second) for client move/resize */
 )
 
+#define FORCE_VSPLIT 1  /* nrowgrid layout: force two clients to always split vertically */
+#include "vanitygaps.c"
+
 static const Layout layouts[] = {
 	/* symbol     arrange function */
 	{ "[]=",      tile },    /* first entry is default */
-	{ "><>",      NULL },    /* no layout function means floating behavior */
 	{ "[M]",      monocle },
+	{ "[@]",      spiral },
+	{ "[\\]",     dwindle },
+	{ "H[]",      deck },
+	{ "TTT",      bstack },
+	{ "===",      bstackhoriz },
+	{ "HHH",      grid },
+	{ "###",      nrowgrid },
+	{ "---",      horizgrid },
+	{ ":::",      gaplessgrid },
+	{ "|M|",      centeredmaster },
+	{ ">M>",      centeredfloatingmaster },
+	{ "><>",      NULL },    /* no layout function means floating behavior */
+	{ NULL,       NULL },
 };
 
 /* key definitions */
@@ -197,9 +216,22 @@ static const Key keys[] = {
 	{ MODKEY|ShiftMask,             XK_Return,                  zoom,           {0} },
 	{ MODKEY,                       XK_Tab,                     view,           {0} },
 	{ MODKEY,                       XK_q,                       killclient,     {0} },
-	{ MODKEY,                       XK_t,                       setlayout,      {.v = &layouts[0]} },
-	{ MODKEY,                       XK_v,                       setlayout,      {.v = &layouts[1]} },
-	{ MODKEY,                       XK_m,                       setlayout,      {.v = &layouts[2]} },
+	/* Layouts */
+	{ MODKEY,                       XK_t,                       setlayout,      {.v = &layouts[0]} },/*tile*/
+	{ MODKEY,                       XK_m,                       setlayout,      {.v = &layouts[1]} },/*monocle*/
+	{ MODKEY|ShiftMask,             XK_m,                       setlayout,      {.v = &layouts[2]} },/*spiral*/
+	{ MODKEY,                       XK_a,                       setlayout,      {.v = &layouts[3]} },/*dwindle*/
+	{ MODKEY|ShiftMask,             XK_a,                       setlayout,      {.v = &layouts[4]} },/*deck*/
+	{ MODKEY|Mod1Mask,              XK_a,                       setlayout,      {.v = &layouts[5]} },/*bstack*/
+	{ MODKEY|Mod1Mask|ShiftMask,    XK_a,                       setlayout,      {.v = &layouts[6]} },/*bstackhoriz*/
+	{ MODKEY,                       XK_y,                       setlayout,      {.v = &layouts[7]} },/*grid*/
+	{ MODKEY|ShiftMask,             XK_y,                       setlayout,      {.v = &layouts[8]} },/*nrowgrid*/
+	{ MODKEY|Mod1Mask,              XK_y,                       setlayout,      {.v = &layouts[9]} },/*horizgrid*/
+	{ MODKEY|Mod1Mask|ShiftMask,    XK_y,                       setlayout,      {.v = &layouts[10]} },/*gaplessgrid*/
+	{ MODKEY|ShiftMask,             XK_t,                       setlayout,      {.v = &layouts[11]} },/*centeredmaster*/
+	{ MODKEY|Mod1Mask,              XK_t,                       setlayout,      {.v = &layouts[12]} },/*centeredfloatingmaster*/
+	{ MODKEY,                       XK_v,                       setlayout,      {.v = &layouts[13]} },/*float*/
+
 	{ MODKEY,                       XK_space,                   setlayout,      {0} },
 	{ MODKEY|ShiftMask,             XK_space,                   togglefloating, {0} },
 	{ MODKEY|ShiftMask,             XK_f,                       togglefullscr,  {0} },
@@ -209,6 +241,29 @@ static const Key keys[] = {
 	{ MODKEY,                       XK_period,                  focusmon,       {.i = +1 } },
 	{ MODKEY|ShiftMask,             XK_comma,                   tagmon,         {.i = -1 } },
 	{ MODKEY|ShiftMask,             XK_period,                  tagmon,         {.i = +1 } },
+
+	/* gaps */
+	{ MODKEY|ShiftMask,             XK_h,                       setcfact,       {.f = +0.25} },
+	{ MODKEY|ShiftMask,             XK_l,                       setcfact,       {.f = -0.25} },
+	{ MODKEY|ShiftMask,             XK_o,                       setcfact,       {.f =  0.00} },
+	{ MODKEY|Mod1Mask,              XK_u,                       incrgaps,       {.i = +1 } },
+	{ MODKEY|Mod1Mask|ShiftMask,    XK_u,                       incrgaps,       {.i = -1 } },
+	{ MODKEY|Mod1Mask,              XK_i,                       incrigaps,      {.i = +1 } },
+	{ MODKEY|Mod1Mask|ShiftMask,    XK_i,                       incrigaps,      {.i = -1 } },
+	{ MODKEY|Mod1Mask,              XK_o,                       incrogaps,      {.i = +1 } },
+	{ MODKEY|Mod1Mask|ShiftMask,    XK_o,                       incrogaps,      {.i = -1 } },
+	{ MODKEY|Mod1Mask,              XK_6,                       incrihgaps,     {.i = +1 } },
+	{ MODKEY|Mod1Mask|ShiftMask,    XK_6,                       incrihgaps,     {.i = -1 } },
+	{ MODKEY|Mod1Mask,              XK_7,                       incrivgaps,     {.i = +1 } },
+	{ MODKEY|Mod1Mask|ShiftMask,    XK_7,                       incrivgaps,     {.i = -1 } },
+	{ MODKEY|Mod1Mask,              XK_8,                       incrohgaps,     {.i = +1 } },
+	{ MODKEY|Mod1Mask|ShiftMask,    XK_8,                       incrohgaps,     {.i = -1 } },
+	{ MODKEY|Mod1Mask,              XK_9,                       incrovgaps,     {.i = +1 } },
+	{ MODKEY|Mod1Mask|ShiftMask,    XK_9,                       incrovgaps,     {.i = -1 } },
+	{ MODKEY|Mod1Mask,              XK_0,                       togglegaps,     {0} },
+	{ MODKEY|Mod1Mask|ShiftMask,    XK_0,                       defaultgaps,    {0} },
+
+
 	{ 0,                            XF86XK_AudioLowerVolume,    spawn,          {.v = downvol } },
 	{ 0,                            XF86XK_AudioRaiseVolume,    spawn,          {.v = upvol } },
 	{ 0,                            XF86XK_AudioMute,           spawn,          {.v = mutevol } },