remove gaps, change bindings

2 files changed, 12 insertions, 34 deletions

diff --git a/config.h b/config.h
index 9e00f92..e9a8aff 100644
--- a/config.h
+++ b/config.h
@@ -7,8 +7,6 @@
 /* appearance */
 static const unsigned int borderpx  = 2;        /* border pixel of windows */
 static const unsigned int snap      = 16;       /* snap pixel */
-static unsigned int gappx           = 4;        /* gaps between windows */
-static const int gaplesscount       = 3;        /* how many windows spawned before gaps appear */
 static const int swallowfloating    = 1;        /* 1 means swallow floating windows by default */
 static const int showbar            = 1;        /* 0 means no bar */
 static const int topbar             = 1;        /* 0 means bottom bar */
@@ -98,8 +96,8 @@ static const Key keys[] = {
     { MODKEY,             XK_b,               togglebar,      {0} },
     { MODKEY,             XK_j,               focusstackvis,  {.i = +1 } },
     { MODKEY,             XK_k,               focusstackvis,  {.i = -1 } },
-    { MODKEY|ShiftMask,   XK_Left,            incnmaster,     {.i = +1 } },
-    { MODKEY|ShiftMask,   XK_Right,           incnmaster,     {.i = -1 } },
+    { MODKEY,             XK_i,               incnmaster,     {.i = +1 } },
+    { MODKEY,             XK_u,               incnmaster,     {.i = -1 } },
     { MODKEY|ControlMask, XK_h,               setmfact,       {.f = -0.05} },
     { MODKEY|ControlMask, XK_l,               setmfact,       {.f = +0.05} },
     { Mod1Mask,           XK_Tab,             zoom,           {0} },
@@ -125,9 +123,6 @@ static const Key keys[] = {
 
   /* Non-default commands i.e. commands added in by me and patches */
     { MODKEY|ShiftMask,             XK_space,                     spawn,          {.v = sutermcmd } },
-    { MODKEY,                       XK_minus,                     setgaps,        {.i = -1 } },
-    { MODKEY,                       XK_equal,                     setgaps,        {.i = +1 } },
-    { MODKEY|ShiftMask,             XK_equal,                     setgaps,        {.i = 0  } },
     { MODKEY|ShiftMask,             XK_j,                         movestack,      {.i = +1 } },
     { MODKEY|ShiftMask,             XK_k,                         movestack,      {.i = -1 } },
     { MODKEY,                       XK_f,                         togglefullscr,  {0} },
diff --git a/dwm.c b/dwm.c
index 5cb4a91..8cbede4 100644
--- a/dwm.c
+++ b/dwm.c
@@ -129,7 +129,6 @@ struct Monitor {
 	int bt;               /* number of tasks */
 	int mx, my, mw, mh;   /* screen size */
 	int wx, wy, ww, wh;   /* window area  */
-	int gappx;            /* gaps between windows */
 	unsigned int seltags;
 	unsigned int sellt;
 	unsigned int tagset[2];
@@ -225,7 +224,6 @@ static void sendmon(Client *c, Monitor *m);
 static void setclientstate(Client *c, long state);
 static void setfocus(Client *c);
 static void setfullscreen(Client *c, int fullscreen);
-static void setgaps(const Arg *arg);
 static void setlayout(const Arg *arg);
 static void setmfact(const Arg *arg);
 static void setup(void);
@@ -745,7 +743,6 @@ createmon(void)
 	m->nmaster = nmaster;
 	m->showbar = showbar;
 	m->topbar = topbar;
-	m->gappx = gappx;
 	m->lt[0] = &layouts[0];
 	m->lt[1] = &layouts[1 % LENGTH(layouts)];
 	strncpy(m->ltsymbol, layouts[0].symbol, sizeof m->ltsymbol);
@@ -1918,16 +1915,6 @@ setlayout(const Arg *arg)
 		drawbar(selmon);
 }
 
-void
-setgaps(const Arg *arg)
-{
-	if ((arg->i == 0) || (selmon->gappx + arg->i < 0))
-		selmon->gappx = 0;
-	else
-		selmon->gappx += arg->i;
-	arrange(selmon);
-}
-
 /* arg > 1.0 will set mfact absolutely */
 void
 setmfact(const Arg *arg)
@@ -2143,10 +2130,6 @@ tile(Monitor *m)
 	Client *c;
 
 	for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);
-    if (n <= gaplesscount)
-        m->gappx = 0;
-    else
-     m->gappx = gappx;
 
 	if (n == 0)
 		return;
@@ -2154,18 +2137,18 @@ tile(Monitor *m)
 	if (n > m->nmaster)
 		mw = m->nmaster ? m->ww * m->mfact : 0;
 	else
-		mw = m->ww - m->gappx;
-	for (i = 0, my = ty = m->gappx, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
+		mw = m->ww;
+	for (i = my = ty = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
 			if (i < m->nmaster) {
-			h = (m->wh - my) / (MIN(n, m->nmaster) - i) - m->gappx;
-			resize(c, m->wx + m->gappx, m->wy + my, mw - (2*c->bw) - m->gappx, h - (2*c->bw), 0);
-			if (my + HEIGHT(c) + m->gappx < m->wh)
-				my += HEIGHT(c) + m->gappx;
+			h = (m->wh - my) / (MIN(n, m->nmaster) - i);
+			resize(c, m->wx, m->wy + my, mw - (2*c->bw), h - (2*c->bw), 0);
+			if (my + HEIGHT(c) < m->wh)
+				my += HEIGHT(c);
 		} else {
-			h = (m->wh - ty) / (n - i) - m->gappx;
-			resize(c, m->wx + mw + m->gappx, m->wy + ty, m->ww - mw - (2*c->bw) - 2*m->gappx, h - (2*c->bw), 0);
-			if (ty + HEIGHT(c) + m->gappx < m->wh)
-				ty += HEIGHT(c) + m->gappx;
+			h = (m->wh - ty) / (n - i);
+			resize(c, m->wx + mw, m->wy + ty, m->ww - mw - (2*c->bw), h - (2*c->bw), 0);
+			if (ty + HEIGHT(c) < m->wh)
+				ty += HEIGHT(c);
 		}
 }