mirror of https://github.com/Horhik/dotfiles.git
89 lines
3.1 KiB
Plaintext
89 lines
3.1 KiB
Plaintext
--- dwm.c
|
|
+++ dwm.c
|
|
@@ -119,6 +119,10 @@ struct Monitor {
|
|
int by; /* bar geometry */
|
|
int mx, my, mw, mh; /* screen size */
|
|
int wx, wy, ww, wh; /* window area */
|
|
+ int gappih; /* horizontal gap between windows */
|
|
+ int gappiv; /* vertical gap between windows */
|
|
+ int gappoh; /* horizontal outer gaps */
|
|
+ int gappov; /* vertical outer gaps */
|
|
unsigned int seltags;
|
|
unsigned int sellt;
|
|
unsigned int tagset[2];
|
|
@@ -200,6 +204,16 @@ 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(int oh, int ov, int ih, int iv);
|
|
+static void incrgaps(const Arg *arg);
|
|
+static void incrigaps(const Arg *arg);
|
|
+static void incrogaps(const Arg *arg);
|
|
+static void incrohgaps(const Arg *arg);
|
|
+static void incrovgaps(const Arg *arg);
|
|
+static void incrihgaps(const Arg *arg);
|
|
+static void incrivgaps(const Arg *arg);
|
|
+static void togglegaps(const Arg *arg);
|
|
+static void defaultgaps(const Arg *arg);
|
|
static void setlayout(const Arg *arg);
|
|
static void setmfact(const Arg *arg);
|
|
static void setup(void);
|
|
@@ -640,6 +655,10 @@ createmon(void)
|
|
m->nmaster = nmaster;
|
|
m->showbar = showbar;
|
|
m->topbar = topbar;
|
|
+ m->gappih = gappih;
|
|
+ m->gappiv = gappiv;
|
|
+ m->gappoh = gappoh;
|
|
+ m->gappov = gappov;
|
|
m->lt[0] = &layouts[0];
|
|
m->lt[1] = &layouts[1 % LENGTH(layouts)];
|
|
strncpy(m->ltsymbol, layouts[0].symbol, sizeof m->ltsymbol);
|
|
@@ -1780,28 +1904,34 @@ tagmon(const Arg *arg)
|
|
void
|
|
tile(Monitor *m)
|
|
{
|
|
- unsigned int i, n, h, mw, my, ty;
|
|
+ unsigned int i, n, h, r, oe = enablegaps, ie = enablegaps, mw, my, ty;
|
|
Client *c;
|
|
|
|
for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);
|
|
if (n == 0)
|
|
return;
|
|
|
|
+ if (smartgaps == n) {
|
|
+ oe = 0; // outer gaps disabled
|
|
+ }
|
|
+
|
|
if (n > m->nmaster)
|
|
- mw = m->nmaster ? m->ww * m->mfact : 0;
|
|
+ mw = m->nmaster ? (m->ww + m->gappiv*ie) * m->mfact : 0;
|
|
else
|
|
- mw = m->ww;
|
|
- for (i = my = ty = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
|
|
+ mw = m->ww - 2*m->gappov*oe + m->gappiv*ie;
|
|
+ for (i = 0, my = ty = m->gappoh*oe, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
|
|
if (i < m->nmaster) {
|
|
- 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);
|
|
+ r = MIN(n, m->nmaster) - i;
|
|
+ h = (m->wh - my - m->gappoh*oe - m->gappih*ie * (r - 1)) / r;
|
|
+ resize(c, m->wx + m->gappov*oe, m->wy + my, mw - (2*c->bw) - m->gappiv*ie, h - (2*c->bw), 0);
|
|
+ if (my + HEIGHT(c) + m->gappih*ie < m->wh)
|
|
+ my += HEIGHT(c) + m->gappih*ie;
|
|
} else {
|
|
- 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);
|
|
+ r = n - i;
|
|
+ h = (m->wh - ty - m->gappoh*oe - m->gappih*ie * (r - 1)) / r;
|
|
+ resize(c, m->wx + mw + m->gappov*oe, m->wy + ty, m->ww - mw - (2*c->bw) - 2*m->gappov*oe, h - (2*c->bw), 0);
|
|
+ if (ty + HEIGHT(c) + m->gappih*ie < m->wh)
|
|
+ ty += HEIGHT(c) + m->gappih*ie;
|
|
}
|
|
}
|
|
|