From 51fbcebb2b9c6d4c58e34e7e90eb2b3d15ee2018 Mon Sep 17 00:00:00 2001 From: ray Date: Sat, 22 Feb 2020 16:05:14 +0000 Subject: [PATCH 1/8] apply bottomstack patch --- config.def.h | 4 ++++ dwm.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 68 insertions(+) diff --git a/config.def.h b/config.def.h index 1c0b587..3d7b73f 100644 --- a/config.def.h +++ b/config.def.h @@ -41,6 +41,8 @@ static const Layout layouts[] = { { "[]=", tile }, /* first entry is default */ { "><>", NULL }, /* no layout function means floating behavior */ { "[M]", monocle }, + { "TTT", bstack }, + { "===", bstackhoriz }, }; /* key definitions */ @@ -76,6 +78,8 @@ 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_u, setlayout, {.v = &layouts[3]} }, + { MODKEY, XK_o, setlayout, {.v = &layouts[4]} }, { 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 4465af1..1947f0a 100644 --- a/dwm.c +++ b/dwm.c @@ -233,6 +233,8 @@ static int xerror(Display *dpy, XErrorEvent *ee); static int xerrordummy(Display *dpy, XErrorEvent *ee); static int xerrorstart(Display *dpy, XErrorEvent *ee); static void zoom(const Arg *arg); +static void bstack(Monitor *m); +static void bstackhoriz(Monitor *m); /* variables */ static const char broken[] = "broken"; @@ -2147,3 +2149,65 @@ main(int argc, char *argv[]) XCloseDisplay(dpy); return EXIT_SUCCESS; } + +static void +bstack(Monitor *m) { + int w, h, mh, mx, tx, ty, tw; + unsigned int i, n; + Client *c; + + for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++); + if (n == 0) + return; + if (n > m->nmaster) { + mh = m->nmaster ? m->mfact * m->wh : 0; + tw = m->ww / (n - m->nmaster); + ty = m->wy + mh; + } else { + mh = m->wh; + tw = m->ww; + ty = m->wy; + } + for (i = mx = 0, tx = m->wx, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) { + if (i < m->nmaster) { + w = (m->ww - mx) / (MIN(n, m->nmaster) - i); + resize(c, m->wx + mx, m->wy, w - (2 * c->bw), mh - (2 * c->bw), 0); + mx += WIDTH(c); + } else { + h = m->wh - mh; + resize(c, tx, ty, tw - (2 * c->bw), h - (2 * c->bw), 0); + if (tw != m->ww) + tx += WIDTH(c); + } + } +} + +static void +bstackhoriz(Monitor *m) { + int w, mh, mx, tx, ty, th; + unsigned int i, n; + Client *c; + + for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++); + if (n == 0) + return; + if (n > m->nmaster) { + mh = m->nmaster ? m->mfact * m->wh : 0; + th = (m->wh - mh) / (n - m->nmaster); + ty = m->wy + mh; + } else { + th = mh = m->wh; + ty = m->wy; + } + for (i = mx = 0, tx = m->wx, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++) { + if (i < m->nmaster) { + w = (m->ww - mx) / (MIN(n, m->nmaster) - i); + resize(c, m->wx + mx, m->wy, w - (2 * c->bw), mh - (2 * c->bw), 0); + mx += WIDTH(c); + } else { + resize(c, tx, ty, m->ww - (2 * c->bw), th - (2 * c->bw), 0); + if (th != m->wh) + ty += HEIGHT(c); + } + } +} From f42df68e9d9912f1d271e3cf7a76e2518c4f72b1 Mon Sep 17 00:00:00 2001 From: ray Date: Sat, 22 Feb 2020 16:06:11 +0000 Subject: [PATCH 2/8] create custom configuration --- README | 8 ++++ config.h | 124 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 132 insertions(+) create mode 100644 config.h diff --git a/README b/README index 95d4fd0..cd6ee14 100644 --- a/README +++ b/README @@ -46,3 +46,11 @@ Configuration ------------- The configuration of dwm is done by creating a custom config.h and (re)compiling the source code. + + + +Customisations +------ + +* Custom configuration of config.h +* Merged patch: https://dwm.suckless.org/patches/bottomstack/dwm-bottomstack-6.1.diff diff --git a/config.h b/config.h new file mode 100644 index 0000000..adac4f2 --- /dev/null +++ b/config.h @@ -0,0 +1,124 @@ +/* See LICENSE file for copyright and license details. */ + +/* appearance */ +static const unsigned int borderpx = 1; /* border pixel of windows */ +static const unsigned int snap = 32; /* snap pixel */ +static const int showbar = 0; /* 0 means no bar */ +static const int topbar = 1; /* 0 means bottom bar */ +static const char *fonts[] = { "xos4 Terminus:size=16" }; +static const char dmenufont[] = "xos4 Terminus:size=14"; +static const char col_bg[] = "#0b0b0b"; +static const char col_fgnorm[] = "#009d00"; +static const char col_fgsel[] = "#55ff55"; +static const char col_border[] = "#ff0000"; +static const char *colors[][3] = { + /* fg bg border */ + [SchemeNorm] = { col_fgnorm, col_bg, col_border }, + [SchemeSel] = { col_fgsel, col_bg, col_bg }, +}; + +/* tagging */ +static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" }; + +static const Rule rules[] = { + /* xprop(1): + * WM_CLASS(STRING) = instance, class + * WM_NAME(STRING) = title + */ + /* class instance title tags mask isfloating monitor */ + { "feh", NULL, NULL, 0, 1, -1 }, + { "Firefox", NULL, NULL, 1 << 8, 0, -1 }, + { "Matplotlib", NULL, NULL, 0, 1, -1 }, + { "mpv", NULL, NULL, 0, 1, -1 }, + { "st", NULL, "terminal-floating", + 0, 1, -1 }, + { NULL, NULL, "wm-force-floating", + 0, 1, -1 }, +}; + +/* layout(s) */ +static const float mfact = 0.50; /* factor of master area size [0.05..0.95] */ +static const int nmaster = 1; /* number of clients in master area */ +static const int resizehints = 1; /* 1 means respect size hints in tiled resizals */ + +static const Layout layouts[] = { + /* symbol arrange function */ + { "::[]=", tile }, /* first entry is default */ + { "::><>", NULL }, /* no layout function means floating behavior */ + { "[M]", monocle }, + { "TTT", bstack }, + { "===", bstackhoriz }, +}; + +/* key definitions */ +#define MODKEY Mod4Mask +#define TAGKEYS(KEY,TAG) \ + { MODKEY, KEY, view, {.ui = 1 << TAG} }, \ + { MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \ + { MODKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \ + { MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} }, + +/* helper for spawning shell commands in the pre dwm-5.0 fashion */ +#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } } + +/* commands */ +static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */ +static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_bg, "-nf", col_fgnorm, "-sb", col_fgsel, "-sf", col_fgsel, NULL }; +static const char *termcmd[] = { "st", NULL }; + +static Key keys[] = { + /* modifier key function argument */ + // { MODKEY, XK_p, spawn, {.v = dmenucmd } }, + // { MODKEY|ShiftMask, XK_Return, spawn, {.v = termcmd } }, + { MODKEY, XK_b, togglebar, {0} }, + { MODKEY, XK_j, focusstack, {.i = +1 } }, + { MODKEY, XK_k, focusstack, {.i = -1 } }, + { MODKEY, XK_i, incnmaster, {.i = +1 } }, + { MODKEY, XK_d, incnmaster, {.i = -1 } }, + { MODKEY, XK_h, setmfact, {.f = -0.05} }, + { MODKEY, XK_l, setmfact, {.f = +0.05} }, + { MODKEY, XK_Return, zoom, {0} }, + { MODKEY, XK_Tab, view, {0} }, + { MODKEY, XK_q, killclient, {0} }, + { MODKEY, XK_t, setlayout, {.v = &layouts[0]} }, + { MODKEY, XK_f, setlayout, {.v = &layouts[1]} }, + { MODKEY, XK_m, setlayout, {.v = &layouts[2]} }, + { MODKEY, XK_v, setlayout, {.v = &layouts[3]} }, + { MODKEY|ShiftMask, XK_v, setlayout, {.v = &layouts[4]} }, + { MODKEY, XK_space, setlayout, {0} }, + { MODKEY|ShiftMask, XK_space, togglefloating, {0} }, + { MODKEY, XK_0, view, {.ui = ~0 } }, + { MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } }, + { MODKEY, XK_comma, focusmon, {.i = -1 } }, + { MODKEY, XK_period, focusmon, {.i = +1 } }, + { MODKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } }, + { MODKEY|ShiftMask, XK_period, tagmon, {.i = +1 } }, + TAGKEYS( XK_1, 0) + TAGKEYS( XK_2, 1) + TAGKEYS( XK_3, 2) + TAGKEYS( XK_4, 3) + TAGKEYS( XK_5, 4) + TAGKEYS( XK_6, 5) + TAGKEYS( XK_7, 6) + TAGKEYS( XK_8, 7) + TAGKEYS( XK_9, 8) + { MODKEY|ShiftMask, XK_q, quit, {0} }, +}; + +/* button definitions */ +/* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */ +static Button buttons[] = { + /* click event mask button function argument */ + { ClkLtSymbol, 0, Button1, setlayout, {0} }, + { ClkLtSymbol, 0, Button3, setlayout, {.v = &layouts[2]} }, + { ClkWinTitle, 0, Button2, zoom, {0} }, + { ClkStatusText, 0, Button2, spawn, {.v = termcmd } }, + { ClkClientWin, MODKEY, Button1, movemouse, {0} }, + { ClkClientWin, MODKEY, Button2, togglefloating, {0} }, + { ClkClientWin, MODKEY, Button3, resizemouse, {0} }, + { ClkTagBar, 0, Button1, view, {0} }, + { ClkTagBar, 0, Button3, toggleview, {0} }, + { ClkTagBar, MODKEY, Button1, tag, {0} }, + { ClkTagBar, MODKEY, Button3, toggletag, {0} }, +}; + From 676e03092dc55d806d64fdf7148d0e78f8f78c8c Mon Sep 17 00:00:00 2001 From: ray Date: Sat, 22 Feb 2020 16:15:18 +0000 Subject: [PATCH 3/8] create .gitignore --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..8f78dcc --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +drw.o +dwm.o +dwm +util.o From 1f638e48b442c3373ccb3e7d9e0748793490b030 Mon Sep 17 00:00:00 2001 From: ray Date: Sat, 22 Feb 2020 16:48:00 +0000 Subject: [PATCH 4/8] change default status --- dwm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dwm.c b/dwm.c index 1947f0a..a862a53 100644 --- a/dwm.c +++ b/dwm.c @@ -1990,7 +1990,7 @@ void updatestatus(void) { if (!gettextprop(root, XA_WM_NAME, stext, sizeof(stext))) - strcpy(stext, "dwm-"VERSION); + strcpy(stext, "⚫"); drawbar(selmon); } From a2cc51412b79383535df5990b259c5a4b760e087 Mon Sep 17 00:00:00 2001 From: ray Date: Sat, 22 Feb 2020 17:04:49 +0000 Subject: [PATCH 5/8] decrease spacing between tag names in tagbar --- dwm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dwm.c b/dwm.c index a862a53..89b21e1 100644 --- a/dwm.c +++ b/dwm.c @@ -1546,7 +1546,7 @@ setup(void) drw = drw_create(dpy, screen, root, sw, sh); if (!drw_fontset_create(drw, fonts, LENGTH(fonts))) die("no fonts could be loaded."); - lrpad = drw->fonts->h; + lrpad = 8; bh = drw->fonts->h + 2; updategeom(); /* init atoms */ From 00245a26336b85315357aeee9ba0669a7ac5c2f7 Mon Sep 17 00:00:00 2001 From: ray Date: Sat, 22 Feb 2020 17:10:01 +0000 Subject: [PATCH 6/8] update colorscheme --- config.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/config.h b/config.h index adac4f2..9686fd2 100644 --- a/config.h +++ b/config.h @@ -5,16 +5,16 @@ static const unsigned int borderpx = 1; /* border pixel of windows */ static const unsigned int snap = 32; /* snap pixel */ static const int showbar = 0; /* 0 means no bar */ static const int topbar = 1; /* 0 means bottom bar */ -static const char *fonts[] = { "xos4 Terminus:size=16" }; +static const char *fonts[] = { "xos4 Terminus:size=12" }; static const char dmenufont[] = "xos4 Terminus:size=14"; -static const char col_bg[] = "#0b0b0b"; +static const char col_bg[] = "#000000"; static const char col_fgnorm[] = "#009d00"; static const char col_fgsel[] = "#55ff55"; -static const char col_border[] = "#ff0000"; +static const char col_border[] = "#717171"; static const char *colors[][3] = { /* fg bg border */ - [SchemeNorm] = { col_fgnorm, col_bg, col_border }, - [SchemeSel] = { col_fgsel, col_bg, col_bg }, + [SchemeNorm] = { col_fgnorm, col_bg, col_bg }, + [SchemeSel] = { col_fgsel, col_bg, col_border }, }; /* tagging */ From 0896904cfe5100342c80e901d5f7c7ac878916ce Mon Sep 17 00:00:00 2001 From: ray Date: Sat, 22 Feb 2020 17:26:02 +0000 Subject: [PATCH 7/8] follow window when moved to different tag --- dwm.c | 1 + 1 file changed, 1 insertion(+) diff --git a/dwm.c b/dwm.c index 89b21e1..341c3fe 100644 --- a/dwm.c +++ b/dwm.c @@ -1661,6 +1661,7 @@ tag(const Arg *arg) selmon->sel->tags = arg->ui & TAGMASK; focus(NULL); arrange(selmon); + view(arg); } } From df3029defebc58d3bb596b6c015a361248a8611d Mon Sep 17 00:00:00 2001 From: ray Date: Sat, 22 Feb 2020 17:28:49 +0000 Subject: [PATCH 8/8] apply dwm-hide-vacant-tags patch --- dwm.c | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/dwm.c b/dwm.c index 341c3fe..c95f60e 100644 --- a/dwm.c +++ b/dwm.c @@ -418,7 +418,7 @@ attachstack(Client *c) void buttonpress(XEvent *e) { - unsigned int i, x, click; + unsigned int i, x, click, occ = 0; Arg arg = {0}; Client *c; Monitor *m; @@ -433,9 +433,14 @@ buttonpress(XEvent *e) } if (ev->window == selmon->barwin) { i = x = 0; - do + for (c = m->clients; c; c = c->next) + occ |= c->tags == 255 ? 0 : c->tags; + do { + /* do not reserve space for vacant tags */ + if (!(occ & 1 << i || m->tagset[m->seltags] & 1 << i)) + continue; x += TEXTW(tags[i]); - while (ev->x >= x && ++i < LENGTH(tags)); + } while (ev->x >= x && ++i < LENGTH(tags)); if (i < LENGTH(tags)) { click = ClkTagBar; arg.ui = 1 << i; @@ -711,19 +716,19 @@ drawbar(Monitor *m) } for (c = m->clients; c; c = c->next) { - occ |= c->tags; + occ |= c->tags == 255 ? 0 : c->tags; if (c->isurgent) urg |= c->tags; } x = 0; for (i = 0; i < LENGTH(tags); i++) { + /* do not draw vacant tags */ + if (!(occ & 1 << i || m->tagset[m->seltags] & 1 << i)) + continue; + w = TEXTW(tags[i]); drw_setscheme(drw, scheme[m->tagset[m->seltags] & 1 << i ? SchemeSel : SchemeNorm]); drw_text(drw, x, 0, w, bh, lrpad / 2, tags[i], urg & 1 << i); - if (occ & 1 << i) - drw_rect(drw, x + boxs, boxs, boxw, boxw, - m == selmon && selmon->sel && selmon->sel->tags & 1 << i, - urg & 1 << i); x += w; } w = blw = TEXTW(m->ltsymbol);