From 5c838a427318a1feb3a7b8f72184d887ff821a02 Mon Sep 17 00:00:00 2001 From: Bryson Steck Date: Wed, 26 Oct 2022 11:43:53 -0600 Subject: add columns view, nerd font --- config.def.h | 2 ++ config.h | 6 ++++-- dwm.c | 27 +++++++++++++++++++++++++++ 3 files changed, 33 insertions(+), 2 deletions(-) diff --git a/config.def.h b/config.def.h index a2ac963..d9ebdba 100644 --- a/config.def.h +++ b/config.def.h @@ -42,6 +42,7 @@ static const Layout layouts[] = { { "[]=", tile }, /* first entry is default */ { "><>", NULL }, /* no layout function means floating behavior */ { "[M]", monocle }, + { "|||", col }, }; /* key definitions */ @@ -77,6 +78,7 @@ static Key keys[] = { { MODKEY, XK_t, setlayout, {.v = &layouts[0]} }, { MODKEY, XK_f, setlayout, {.v = &layouts[1]} }, { MODKEY, XK_m, setlayout, {.v = &layouts[2]} }, + { MODKEY, XK_c, setlayout, {.v = &layouts[3]} }, { MODKEY, XK_space, setlayout, {0} }, { MODKEY|ShiftMask, XK_space, togglefloating, {0} }, { MODKEY, XK_0, view, {.ui = ~0 } }, diff --git a/config.h b/config.h index 38815b1..9fad82e 100644 --- a/config.h +++ b/config.h @@ -6,8 +6,8 @@ static const unsigned int gappx = 8; /* gaps between windows */ static const unsigned int snap = 32; /* snap pixel */ static const int showbar = 1; /* 0 means no bar */ static const int topbar = 1; /* 0 means bottom bar */ -static const char *fonts[] = { "JetBrains Mono:style=medium:size=11" }; -static const char dmenufont[] = "JetBrains Mono:stlye=medium:size=11"; +static const char *fonts[] = { "JetBrains Mono NF:style=medium:size=11" }; +static const char dmenufont[] = "JetBrains Mono NF:stlye=medium:size=11"; // gruvbox static const char fg[] = "#ebdbb2"; static const char bg_normal[] = "#3c3836"; @@ -56,6 +56,7 @@ static const Layout layouts[] = { { "[]=", tile }, /* first entry is default */ { "><>", NULL }, /* no layout function means floating behavior */ { "[M]", monocle }, + { "|||", col }, }; /* key definitions */ @@ -109,6 +110,7 @@ static Key keys[] = { { MODKEY, XK_t, setlayout, {.v = &layouts[0]} }, { MODKEY, XK_f, setlayout, {.v = &layouts[1]} }, { MODKEY, XK_m, setlayout, {.v = &layouts[2]} }, + { MODKEY, XK_c, setlayout, {.v = &layouts[3]} }, { MODKEY, XK_space, setlayout, {0} }, { MODKEY|ShiftMask, XK_space, togglefloating, {0} }, { MODKEY, XK_0, view, {.ui = ~0 } }, diff --git a/dwm.c b/dwm.c index e4f75a7..dbf29cb 100644 --- a/dwm.c +++ b/dwm.c @@ -154,6 +154,7 @@ static void checkotherwm(void); static void cleanup(void); static void cleanupmon(Monitor *mon); static void clientmessage(XEvent *e); +static void col(Monitor *); static void configure(Client *c); static void configurenotify(XEvent *e); static void configurerequest(XEvent *e); @@ -1693,6 +1694,32 @@ tagmon(const Arg *arg) sendmon(selmon->sel, dirtomon(arg->i)); } +void +col(Monitor *m) +{ + unsigned int i, n, h, w, x, y, mw; + Client *c; + + for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++); + if (n == 0) + return; + + if (n > m->nmaster) + mw = m->nmaster ? m->ww * m->mfact : 0; + else + mw = m->ww; + for (i = x = y = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) + if (i < m->nmaster) { + w = (mw - x) / (MIN(n, m->nmaster) - i); + resize(c, x + m->wx, m->wy, w - (2 * c->bw), m->wh - (2 * c->bw), 0); + x += WIDTH(c); + } else { + h = (m->wh - y) / (n - i); + resize(c, x + m->wx, m->wy + y, m->ww - x - (2 * c->bw), h - (2 * c->bw), 0); + y += HEIGHT(c); + } +} + void tile(Monitor *m) { -- cgit v1.2.3