diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..567609b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+build/
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..9b97398
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "dwm-src"]
+ path = dwm-src
+ url = https://git.suckless.org/dwm
diff --git a/build.sh b/build.sh
new file mode 100755
index 0000000..dfcf5c1
--- /dev/null
+++ b/build.sh
@@ -0,0 +1,23 @@
+#!/usr/bin/env sh
+
+echo 'Cleaning up previous builds...'
+rm -rf build
+mkdir build
+
+echo 'Copying fresh sources'
+cp -rf dwm-src/* build
+
+echo 'Enumerating patches...'
+cd patches
+find * | sort -n | tee ../build/patches.lst
+
+echo 'Applying patches...'
+cd ../build
+cat patches.lst | while read p;
+do
+ echo "Applying patch \"${p}\"..."
+ if ! patch -sp1 < ../patches/$p; then
+ echo "Patch ${p} failed!!! Aborting."
+ exit 1
+ fi
+done
diff --git a/dwm-src b/dwm-src
new file mode 160000
+Subproject 348f6559ab0d4793db196ffa56ba96ab95a594a
diff --git a/patches/10-dwm-alpha-6.4.diff b/patches/10-dwm-alpha-6.4.diff
new file mode 100644
index 0000000..ad4b2b7
--- /dev/null
+++ b/patches/10-dwm-alpha-6.4.diff
@@ -0,0 +1,282 @@
+From 4ee637701f1144e07338d5990fecb3dc44982223 Mon Sep 17 00:00:00 2001
+From: NekoCWD <nekodevelopper@gmail.com>
+Date: Fri, 27 Jan 2023 21:59:15 +0300
+Subject: [PATCH] [dwm] update 'alpha' path for dwm6.4
+
+---
+ config.def.h | 2 ++
+ config.mk | 2 +-
+ drw.c | 27 +++++++++++-----------
+ drw.h | 9 +++++---
+ dwm.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++-----
+ 5 files changed, 80 insertions(+), 23 deletions(-)
+
+diff --git a/config.def.h b/config.def.h
+index 061ad66..3a4236d 100644
+--- a/config.def.h
++++ b/config.def.h
+@@ -7,6 +7,8 @@ static const int showbar = 1; /* 0 means no bar */
+ static const int topbar = 1; /* 0 means bottom bar */
+ static const char *fonts[] = { "monospace:size=10" };
+ static const char dmenufont[] = "monospace:size=10";
++static unsigned int baralpha = 0xd0;
++static unsigned int borderalpha = OPAQUE;
+ static const char col_gray1[] = "#222222";
+ static const char col_gray2[] = "#444444";
+ static const char col_gray3[] = "#bbbbbb";
+diff --git a/config.mk b/config.mk
+index ef8acf7..6d41560 100644
+--- a/config.mk
++++ b/config.mk
+@@ -23,7 +23,7 @@ FREETYPEINC = /usr/include/freetype2
+
+ # includes and libs
+ INCS = -I${X11INC} -I${FREETYPEINC}
+-LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS}
++LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} -lXrender
+
+ # flags
+ CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
+diff --git a/drw.c b/drw.c
+index a58a2b4..10e39f9 100644
+--- a/drw.c
++++ b/drw.c
+@@ -61,7 +61,7 @@ utf8decode(const char *c, long *u, size_t clen)
+ }
+
+ Drw *
+-drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h)
++drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h, Visual *visual, unsigned int depth, Colormap cmap)
+ {
+ Drw *drw = ecalloc(1, sizeof(Drw));
+
+@@ -70,8 +70,11 @@ drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h
+ drw->root = root;
+ drw->w = w;
+ drw->h = h;
+- drw->drawable = XCreatePixmap(dpy, root, w, h, DefaultDepth(dpy, screen));
+- drw->gc = XCreateGC(dpy, root, 0, NULL);
++ drw->visual = visual;
++ drw->depth = depth;
++ drw->cmap = cmap;
++ drw->drawable = XCreatePixmap(dpy, root, w, h, depth);
++ drw->gc = XCreateGC(dpy, drw->drawable, 0, NULL);
+ XSetLineAttributes(dpy, drw->gc, 1, LineSolid, CapButt, JoinMiter);
+
+ return drw;
+@@ -87,7 +90,7 @@ drw_resize(Drw *drw, unsigned int w, unsigned int h)
+ drw->h = h;
+ if (drw->drawable)
+ XFreePixmap(drw->dpy, drw->drawable);
+- drw->drawable = XCreatePixmap(drw->dpy, drw->root, w, h, DefaultDepth(drw->dpy, drw->screen));
++ drw->drawable = XCreatePixmap(drw->dpy, drw->root, w, h, drw->depth);
+ }
+
+ void
+@@ -181,21 +184,20 @@ drw_fontset_free(Fnt *font)
+ }
+
+ void
+-drw_clr_create(Drw *drw, Clr *dest, const char *clrname)
++drw_clr_create(Drw *drw, Clr *dest, const char *clrname, unsigned int alpha)
+ {
+ if (!drw || !dest || !clrname)
+ return;
+-
+- if (!XftColorAllocName(drw->dpy, DefaultVisual(drw->dpy, drw->screen),
+- DefaultColormap(drw->dpy, drw->screen),
++ if (!XftColorAllocName(drw->dpy, drw->visual, drw->cmap,
+ clrname, dest))
+ die("error, cannot allocate color '%s'", clrname);
++ dest->pixel = (dest->pixel & 0x00ffffffU) | (alpha << 24);
+ }
+
+ /* Wrapper to create color schemes. The caller has to call free(3) on the
+ * returned color scheme when done using it. */
+ Clr *
+-drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount)
++drw_scm_create(Drw *drw, const char *clrnames[], unsigned int clralphas[], size_t clrcount)
+ {
+ size_t i;
+ Clr *ret;
+@@ -205,7 +207,7 @@ drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount)
+ return NULL;
+
+ for (i = 0; i < clrcount; i++)
+- drw_clr_create(drw, &ret[i], clrnames[i]);
++ drw_clr_create(drw, &ret[i], clrnames[i], clralphas[i]);
+ return ret;
+ }
+
+@@ -263,9 +265,8 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lp
+ } else {
+ XSetForeground(drw->dpy, drw->gc, drw->scheme[invert ? ColFg : ColBg].pixel);
+ XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
+- d = XftDrawCreate(drw->dpy, drw->drawable,
+- DefaultVisual(drw->dpy, drw->screen),
+- DefaultColormap(drw->dpy, drw->screen));
++ d = XftDrawCreate(drw->dpy, drw->drawable, drw->visual, drw->cmap);
++
+ x += lpad;
+ w -= lpad;
+ }
+diff --git a/drw.h b/drw.h
+index 6471431..51dc017 100644
+--- a/drw.h
++++ b/drw.h
+@@ -20,6 +20,9 @@ typedef struct {
+ Display *dpy;
+ int screen;
+ Window root;
++ Visual *visual;
++ unsigned int depth;
++ Colormap cmap;
+ Drawable drawable;
+ GC gc;
+ Clr *scheme;
+@@ -27,7 +30,7 @@ typedef struct {
+ } Drw;
+
+ /* Drawable abstraction */
+-Drw *drw_create(Display *dpy, int screen, Window win, unsigned int w, unsigned int h);
++Drw *drw_create(Display *dpy, int screen, Window win, unsigned int w, unsigned int h, Visual*, unsigned int, Colormap);
+ void drw_resize(Drw *drw, unsigned int w, unsigned int h);
+ void drw_free(Drw *drw);
+
+@@ -39,8 +42,8 @@ unsigned int drw_fontset_getwidth_clamp(Drw *drw, const char *text, unsigned int
+ void drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h);
+
+ /* Colorscheme abstraction */
+-void drw_clr_create(Drw *drw, Clr *dest, const char *clrname);
+-Clr *drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount);
++void drw_clr_create(Drw *drw, Clr *dest, const char *clrname, unsigned int alpha);
++Clr *drw_scm_create(Drw *drw, const char *clrnames[], unsigned int clralphas[], size_t clrcount);
+
+ /* Cursor abstraction */
+ Cur *drw_cur_create(Drw *drw, int shape);
+diff --git a/dwm.c b/dwm.c
+index e5efb6a..708ca43 100644
+--- a/dwm.c
++++ b/dwm.c
+@@ -57,6 +57,10 @@
+ #define TAGMASK ((1 << LENGTH(tags)) - 1)
+ #define TEXTW(X) (drw_fontset_getwidth(drw, (X)) + lrpad)
+
++#define OPAQUE 0xffU
++
++#define OPAQUE 0xffU
++
+ /* enums */
+ enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
+ enum { SchemeNorm, SchemeSel }; /* color schemes */
+@@ -233,6 +237,7 @@ static Monitor *wintomon(Window w);
+ static int xerror(Display *dpy, XErrorEvent *ee);
+ static int xerrordummy(Display *dpy, XErrorEvent *ee);
+ static int xerrorstart(Display *dpy, XErrorEvent *ee);
++static void xinitvisual();
+ static void zoom(const Arg *arg);
+
+ /* variables */
+@@ -269,6 +274,11 @@ static Drw *drw;
+ static Monitor *mons, *selmon;
+ static Window root, wmcheckwin;
+
++static int useargb = 0;
++static Visual *visual;
++static int depth;
++static Colormap cmap;
++
+ /* configuration, allows nested code to access above variables */
+ #include "config.h"
+
+@@ -1542,7 +1552,8 @@ setup(void)
+ sw = DisplayWidth(dpy, screen);
+ sh = DisplayHeight(dpy, screen);
+ root = RootWindow(dpy, screen);
+- drw = drw_create(dpy, screen, root, sw, sh);
++ xinitvisual();
++ drw = drw_create(dpy, screen, root, sw, sh, visual, depth, cmap);
+ if (!drw_fontset_create(drw, fonts, LENGTH(fonts)))
+ die("no fonts could be loaded.");
+ lrpad = drw->fonts->h;
+@@ -1569,8 +1580,9 @@ setup(void)
+ cursor[CurMove] = drw_cur_create(drw, XC_fleur);
+ /* init appearance */
+ scheme = ecalloc(LENGTH(colors), sizeof(Clr *));
++ unsigned int alphas[] = {borderalpha, baralpha, OPAQUE};
+ for (i = 0; i < LENGTH(colors); i++)
+- scheme[i] = drw_scm_create(drw, colors[i], 3);
++ scheme[i] = drw_scm_create(drw, colors[i], alphas, 3);
+ /* init bars */
+ updatebars();
+ updatestatus();
+@@ -1803,16 +1815,18 @@ updatebars(void)
+ Monitor *m;
+ XSetWindowAttributes wa = {
+ .override_redirect = True,
+- .background_pixmap = ParentRelative,
++ .background_pixel = 0,
++ .border_pixel = 0,
++ .colormap = cmap,
+ .event_mask = ButtonPressMask|ExposureMask
+ };
+ XClassHint ch = {"dwm", "dwm"};
+ for (m = mons; m; m = m->next) {
+ if (m->barwin)
+ continue;
+- m->barwin = XCreateWindow(dpy, root, m->wx, m->by, m->ww, bh, 0, DefaultDepth(dpy, screen),
+- CopyFromParent, DefaultVisual(dpy, screen),
+- CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
++ m->barwin = XCreateWindow(dpy, root, m->wx, m->by, m->ww, bh, 0, depth,
++ InputOutput, visual,
++ CWOverrideRedirect|CWBackPixel|CWBorderPixel|CWColormap|CWEventMask, &wa);
+ XDefineCursor(dpy, m->barwin, cursor[CurNormal]->cursor);
+ XMapRaised(dpy, m->barwin);
+ XSetClassHint(dpy, m->barwin, &ch);
+@@ -2110,6 +2124,43 @@ xerrorstart(Display *dpy, XErrorEvent *ee)
+ return -1;
+ }
+
++void
++xinitvisual()
++{
++ XVisualInfo *infos;
++ XRenderPictFormat *fmt;
++ int nitems;
++ int i;
++
++ XVisualInfo tpl = {
++ .screen = screen,
++ .depth = 32,
++ .class = TrueColor
++ };
++ long masks = VisualScreenMask | VisualDepthMask | VisualClassMask;
++
++ infos = XGetVisualInfo(dpy, masks, &tpl, &nitems);
++ visual = NULL;
++ for(i = 0; i < nitems; i ++) {
++ fmt = XRenderFindVisualFormat(dpy, infos[i].visual);
++ if (fmt->type == PictTypeDirect && fmt->direct.alphaMask) {
++ visual = infos[i].visual;
++ depth = infos[i].depth;
++ cmap = XCreateColormap(dpy, root, visual, AllocNone);
++ useargb = 1;
++ break;
++ }
++ }
++
++ XFree(infos);
++
++ if (! visual) {
++ visual = DefaultVisual(dpy, screen);
++ depth = DefaultDepth(dpy, screen);
++ cmap = DefaultColormap(dpy, screen);
++ }
++}
++
+ void
+ zoom(const Arg *arg)
+ {
+--
+2.39.1
+
diff --git a/patches/100-a b/patches/100-a
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/patches/100-a
diff --git a/patches/20-dwm-awesomebar-20220925-6.3.diff b/patches/20-dwm-awesomebar-20220925-6.3.diff
new file mode 100644
index 0000000..b1efc4d
--- /dev/null
+++ b/patches/20-dwm-awesomebar-20220925-6.3.diff
@@ -0,0 +1,446 @@
+diff --git a/config.def.h b/config.def.h
+index a2ac963..6dad2f1 100644
+--- a/config.def.h
++++ b/config.def.h
+@@ -16,6 +16,7 @@ static const char *colors[][3] = {
+ /* fg bg border */
+ [SchemeNorm] = { col_gray3, col_gray1, col_gray2 },
+ [SchemeSel] = { col_gray4, col_cyan, col_cyan },
++ [SchemeHid] = { col_cyan, col_gray1, col_cyan },
+ };
+
+ /* tagging */
+@@ -65,8 +66,10 @@ static Key keys[] = {
+ { 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_j, focusstackvis, {.i = +1 } },
++ { MODKEY, XK_k, focusstackvis, {.i = -1 } },
++ { MODKEY|ShiftMask, XK_j, focusstackhid, {.i = +1 } },
++ { MODKEY|ShiftMask, XK_k, focusstackhid, {.i = -1 } },
+ { MODKEY, XK_i, incnmaster, {.i = +1 } },
+ { MODKEY, XK_d, incnmaster, {.i = -1 } },
+ { MODKEY, XK_h, setmfact, {.f = -0.05} },
+@@ -85,6 +88,9 @@ static Key keys[] = {
+ { MODKEY, XK_period, focusmon, {.i = +1 } },
+ { MODKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } },
+ { MODKEY|ShiftMask, XK_period, tagmon, {.i = +1 } },
++ { MODKEY, XK_s, show, {0} },
++ { MODKEY|ShiftMask, XK_s, showall, {0} },
++ { MODKEY, XK_h, hide, {0} },
+ TAGKEYS( XK_1, 0)
+ TAGKEYS( XK_2, 1)
+ TAGKEYS( XK_3, 2)
+@@ -103,6 +109,7 @@ static Button buttons[] = {
+ /* click event mask button function argument */
+ { ClkLtSymbol, 0, Button1, setlayout, {0} },
+ { ClkLtSymbol, 0, Button3, setlayout, {.v = &layouts[2]} },
++ { ClkWinTitle, 0, Button1, togglewin, {0} },
+ { ClkWinTitle, 0, Button2, zoom, {0} },
+ { ClkStatusText, 0, Button2, spawn, {.v = termcmd } },
+ { ClkClientWin, MODKEY, Button1, movemouse, {0} },
+diff --git a/dwm.c b/dwm.c
+index a96f33c..c375ba3 100644
+--- a/dwm.c
++++ b/dwm.c
+@@ -50,6 +50,7 @@
+ #define INTERSECT(x,y,w,h,m) (MAX(0, MIN((x)+(w),(m)->wx+(m)->ww) - MAX((x),(m)->wx)) \
+ * MAX(0, MIN((y)+(h),(m)->wy+(m)->wh) - MAX((y),(m)->wy)))
+ #define ISVISIBLE(C) ((C->tags & C->mon->tagset[C->mon->seltags]))
++#define HIDDEN(C) ((getstate(C->win) == IconicState))
+ #define LENGTH(X) (sizeof X / sizeof X[0])
+ #define MOUSEMASK (BUTTONMASK|PointerMotionMask)
+ #define WIDTH(X) ((X)->w + 2 * (X)->bw)
+@@ -59,7 +60,7 @@
+
+ /* enums */
+ enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
+-enum { SchemeNorm, SchemeSel }; /* color schemes */
++enum { SchemeNorm, SchemeSel, SchemeHid }; /* color schemes */
+ enum { NetSupported, NetWMName, NetWMState, NetWMCheck,
+ NetWMFullscreen, NetActiveWindow, NetWMWindowType,
+ NetWMWindowTypeDialog, NetClientList, NetLast }; /* EWMH atoms */
+@@ -117,6 +118,8 @@ struct Monitor {
+ int nmaster;
+ int num;
+ int by; /* bar geometry */
++ int btw; /* width of tasks portion of bar */
++ int bt; /* number of tasks */
+ int mx, my, mw, mh; /* screen size */
+ int wx, wy, ww, wh; /* window area */
+ unsigned int seltags;
+@@ -124,6 +127,7 @@ struct Monitor {
+ unsigned int tagset[2];
+ int showbar;
+ int topbar;
++ int hidsel;
+ Client *clients;
+ Client *sel;
+ Client *stack;
+@@ -168,13 +172,17 @@ static void expose(XEvent *e);
+ static void focus(Client *c);
+ static void focusin(XEvent *e);
+ static void focusmon(const Arg *arg);
+-static void focusstack(const Arg *arg);
++static void focusstackvis(const Arg *arg);
++static void focusstackhid(const Arg *arg);
++static void focusstack(int inc, int vis);
+ static Atom getatomprop(Client *c, Atom prop);
+ static int getrootptr(int *x, int *y);
+ static long getstate(Window w);
+ static int gettextprop(Window w, Atom atom, char *text, unsigned int size);
+ static void grabbuttons(Client *c, int focused);
+ static void grabkeys(void);
++static void hide(const Arg *arg);
++static void hidewin(Client *c);
+ static void incnmaster(const Arg *arg);
+ static void keypress(XEvent *e);
+ static void killclient(const Arg *arg);
+@@ -204,6 +212,9 @@ static void setlayout(const Arg *arg);
+ static void setmfact(const Arg *arg);
+ static void setup(void);
+ static void seturgent(Client *c, int urg);
++static void show(const Arg *arg);
++static void showall(const Arg *arg);
++static void showwin(Client *c);
+ static void showhide(Client *c);
+ static void sigchld(int unused);
+ static void spawn(const Arg *arg);
+@@ -214,6 +225,7 @@ static void togglebar(const Arg *arg);
+ static void togglefloating(const Arg *arg);
+ static void toggletag(const Arg *arg);
+ static void toggleview(const Arg *arg);
++static void togglewin(const Arg *arg);
+ static void unfocus(Client *c, int setfocus);
+ static void unmanage(Client *c, int destroyed);
+ static void unmapnotify(XEvent *e);
+@@ -440,10 +452,25 @@ buttonpress(XEvent *e)
+ arg.ui = 1 << i;
+ } else if (ev->x < x + blw)
+ click = ClkLtSymbol;
+- else if (ev->x > selmon->ww - (int)TEXTW(stext))
++ /* 2px right padding */
++ else if (ev->x > selmon->ww - TEXTW(stext) + lrpad - 2)
+ click = ClkStatusText;
+- else
+- click = ClkWinTitle;
++ else {
++ x += blw;
++ c = m->clients;
++
++ if (c) {
++ do {
++ if (!ISVISIBLE(c))
++ continue;
++ else
++ x +=(1.0 / (double)m->bt) * m->btw;
++ } while (ev->x > x && (c = c->next));
++
++ click = ClkWinTitle;
++ arg.v = c;
++ }
++ }
+ } else if ((c = wintoclient(ev->window))) {
+ focus(c);
+ restack(selmon);
+@@ -453,7 +480,7 @@ buttonpress(XEvent *e)
+ for (i = 0; i < LENGTH(buttons); i++)
+ if (click == buttons[i].click && buttons[i].func && buttons[i].button == ev->button
+ && CLEANMASK(buttons[i].mask) == CLEANMASK(ev->state))
+- buttons[i].func(click == ClkTagBar && buttons[i].arg.i == 0 ? &arg : &buttons[i].arg);
++ buttons[i].func((click == ClkTagBar || click == ClkWinTitle) && buttons[i].arg.i == 0 ? &arg : &buttons[i].arg);
+ }
+
+ void
+@@ -696,7 +723,7 @@ dirtomon(int dir)
+ void
+ drawbar(Monitor *m)
+ {
+- int x, w, tw = 0;
++ int x, w, tw = 0, n = 0, scm;
+ int boxs = drw->fonts->h / 9;
+ int boxw = drw->fonts->h / 6 + 2;
+ unsigned int i, occ = 0, urg = 0;
+@@ -713,6 +740,8 @@ drawbar(Monitor *m)
+ }
+
+ for (c = m->clients; c; c = c->next) {
++ if (ISVISIBLE(c))
++ n++;
+ occ |= c->tags;
+ if (c->isurgent)
+ urg |= c->tags;
+@@ -733,16 +762,36 @@ drawbar(Monitor *m)
+ x = drw_text(drw, x, 0, w, bh, lrpad / 2, m->ltsymbol, 0);
+
+ if ((w = m->ww - tw - x) > bh) {
+- if (m->sel) {
+- drw_setscheme(drw, scheme[m == selmon ? SchemeSel : SchemeNorm]);
+- drw_text(drw, x, 0, w, bh, lrpad / 2, m->sel->name, 0);
+- if (m->sel->isfloating)
+- drw_rect(drw, x + boxs, boxs, boxw, boxw, m->sel->isfixed, 0);
++ if (n > 0) {
++ int remainder = w % n;
++ int tabw = (1.0 / (double)n) * w + 1;
++ for (c = m->clients; c; c = c->next) {
++ if (!ISVISIBLE(c))
++ continue;
++ if (m->sel == c)
++ scm = SchemeSel;
++ else if (HIDDEN(c))
++ scm = SchemeHid;
++ else
++ scm = SchemeNorm;
++ drw_setscheme(drw, scheme[scm]);
++
++ if (remainder >= 0) {
++ if (remainder == 0) {
++ tabw--;
++ }
++ remainder--;
++ }
++ drw_text(drw, x, 0, tabw, bh, lrpad / 2, c->name, 0);
++ x += tabw;
++ }
+ } else {
+ drw_setscheme(drw, scheme[SchemeNorm]);
+ drw_rect(drw, x, 0, w, bh, 1, 1);
+ }
+ }
++ m->bt = n;
++ m->btw = w;
+ drw_map(drw, m->barwin, 0, 0, m->ww, bh);
+ }
+
+@@ -788,9 +837,17 @@ void
+ focus(Client *c)
+ {
+ if (!c || !ISVISIBLE(c))
+- for (c = selmon->stack; c && !ISVISIBLE(c); c = c->snext);
+- if (selmon->sel && selmon->sel != c)
++ for (c = selmon->stack; c && (!ISVISIBLE(c) || HIDDEN(c)); c = c->snext);
++ if (selmon->sel && selmon->sel != c) {
+ unfocus(selmon->sel, 0);
++
++ if (selmon->hidsel) {
++ hidewin(selmon->sel);
++ if (c)
++ arrange(c->mon);
++ selmon->hidsel = 0;
++ }
++ }
+ if (c) {
+ if (c->mon != selmon)
+ selmon = c->mon;
+@@ -834,28 +891,52 @@ focusmon(const Arg *arg)
+ }
+
+ void
+-focusstack(const Arg *arg)
++focusstackvis(const Arg *arg) {
++ focusstack(arg->i, 0);
++}
++
++void
++focusstackhid(const Arg *arg) {
++ focusstack(arg->i, 1);
++}
++
++void
++focusstack(int inc, int hid)
+ {
+ Client *c = NULL, *i;
+-
+- if (!selmon->sel || (selmon->sel->isfullscreen && lockfullscreen))
++ // if no client selected AND exclude hidden client; if client selected but fullscreened
++ if ((!selmon->sel && !hid) || (selmon->sel && selmon->sel->isfullscreen && lockfullscreen))
+ return;
+- if (arg->i > 0) {
+- for (c = selmon->sel->next; c && !ISVISIBLE(c); c = c->next);
++ if (!selmon->clients)
++ return;
++ if (inc > 0) {
++ if (selmon->sel)
++ for (c = selmon->sel->next;
++ c && (!ISVISIBLE(c) || (!hid && HIDDEN(c)));
++ c = c->next);
+ if (!c)
+- for (c = selmon->clients; c && !ISVISIBLE(c); c = c->next);
++ for (c = selmon->clients;
++ c && (!ISVISIBLE(c) || (!hid && HIDDEN(c)));
++ c = c->next);
+ } else {
+- for (i = selmon->clients; i != selmon->sel; i = i->next)
+- if (ISVISIBLE(i))
+- c = i;
++ if (selmon->sel) {
++ for (i = selmon->clients; i != selmon->sel; i = i->next)
++ if (ISVISIBLE(i) && !(!hid && HIDDEN(i)))
++ c = i;
++ } else
++ c = selmon->clients;
+ if (!c)
+ for (; i; i = i->next)
+- if (ISVISIBLE(i))
++ if (ISVISIBLE(i) && !(!hid && HIDDEN(i)))
+ c = i;
+ }
+ if (c) {
+ focus(c);
+ restack(selmon);
++ if (HIDDEN(c)) {
++ showwin(c);
++ c->mon->hidsel = 1;
++ }
+ }
+ }
+
+@@ -967,6 +1048,36 @@ grabkeys(void)
+ }
+ }
+
++void
++hide(const Arg *arg)
++{
++ hidewin(selmon->sel);
++ focus(NULL);
++ arrange(selmon);
++}
++
++void
++hidewin(Client *c) {
++ if (!c || HIDDEN(c))
++ return;
++
++ Window w = c->win;
++ static XWindowAttributes ra, ca;
++
++ // more or less taken directly from blackbox's hide() function
++ XGrabServer(dpy);
++ XGetWindowAttributes(dpy, root, &ra);
++ XGetWindowAttributes(dpy, w, &ca);
++ // prevent UnmapNotify events
++ XSelectInput(dpy, root, ra.your_event_mask & ~SubstructureNotifyMask);
++ XSelectInput(dpy, w, ca.your_event_mask & ~StructureNotifyMask);
++ XUnmapWindow(dpy, w);
++ setclientstate(c, IconicState);
++ XSelectInput(dpy, root, ra.your_event_mask);
++ XSelectInput(dpy, w, ca.your_event_mask);
++ XUngrabServer(dpy);
++}
++
+ void
+ incnmaster(const Arg *arg)
+ {
+@@ -1071,12 +1182,14 @@ manage(Window w, XWindowAttributes *wa)
+ XChangeProperty(dpy, root, netatom[NetClientList], XA_WINDOW, 32, PropModeAppend,
+ (unsigned char *) &(c->win), 1);
+ XMoveResizeWindow(dpy, c->win, c->x + 2 * sw, c->y, c->w, c->h); /* some windows require this */
+- setclientstate(c, NormalState);
++ if (!HIDDEN(c))
++ setclientstate(c, NormalState);
+ if (c->mon == selmon)
+ unfocus(selmon->sel, 0);
+ c->mon->sel = c;
+ arrange(c->mon);
+- XMapWindow(dpy, c->win);
++ if (!HIDDEN(c))
++ XMapWindow(dpy, c->win);
+ focus(NULL);
+ }
+
+@@ -1199,7 +1312,7 @@ movemouse(const Arg *arg)
+ Client *
+ nexttiled(Client *c)
+ {
+- for (; c && (c->isfloating || !ISVISIBLE(c)); c = c->next);
++ for (; c && (c->isfloating || !ISVISIBLE(c) || HIDDEN(c)); c = c->next);
+ return c;
+ }
+
+@@ -1252,6 +1365,16 @@ propertynotify(XEvent *e)
+ void
+ quit(const Arg *arg)
+ {
++ // fix: reloading dwm keeps all the hidden clients hidden
++ Monitor *m;
++ Client *c;
++ for (m = mons; m; m = m->next) {
++ if (m) {
++ for (c = m->stack; c; c = c->next)
++ if (c && HIDDEN(c)) showwin(c);
++ }
++ }
++
+ running = 0;
+ }
+
+@@ -1614,6 +1737,42 @@ seturgent(Client *c, int urg)
+ XFree(wmh);
+ }
+
++void
++show(const Arg *arg)
++{
++ if (selmon->hidsel)
++ selmon->hidsel = 0;
++ showwin(selmon->sel);
++}
++
++void
++showall(const Arg *arg)
++{
++ Client *c = NULL;
++ selmon->hidsel = 0;
++ for (c = selmon->clients; c; c = c->next) {
++ if (ISVISIBLE(c))
++ showwin(c);
++ }
++ if (!selmon->sel) {
++ for (c = selmon->clients; c && !ISVISIBLE(c); c = c->next);
++ if (c)
++ focus(c);
++ }
++ restack(selmon);
++}
++
++void
++showwin(Client *c)
++{
++ if (!c || !HIDDEN(c))
++ return;
++
++ XMapWindow(dpy, c->win);
++ setclientstate(c, NormalState);
++ arrange(c->mon);
++}
++
+ void
+ showhide(Client *c)
+ {
+@@ -1752,6 +1911,23 @@ toggleview(const Arg *arg)
+ }
+ }
+
++void
++togglewin(const Arg *arg)
++{
++ Client *c = (Client*)arg->v;
++
++ if (c == selmon->sel) {
++ hidewin(c);
++ focus(NULL);
++ arrange(c->mon);
++ } else {
++ if (HIDDEN(c))
++ showwin(c);
++ focus(c);
++ restack(selmon);
++ }
++}
++
+ void
+ unfocus(Client *c, int setfocus)
+ {
diff --git a/patches/30-dwm-fancybar-20220527-d3f93c7.diff b/patches/30-dwm-fancybar-20220527-d3f93c7.diff
new file mode 100644
index 0000000..e2a4e2a
--- /dev/null
+++ b/patches/30-dwm-fancybar-20220527-d3f93c7.diff
@@ -0,0 +1,73 @@
+diff --git a/dwm.c b/dwm.c
+--- a/dwm.c
++++ b/dwm.c
+@@ -699,10 +699,10 @@ dirtomon(int dir)
+ void
+ drawbar(Monitor *m)
+ {
+- int x, w, tw = 0;
++ int x, w, tw = 0, mw, ew = 0;
+ int boxs = drw->fonts->h / 9;
+ int boxw = drw->fonts->h / 6 + 2;
+- unsigned int i, occ = 0, urg = 0;
++ unsigned int i, occ = 0, urg = 0, n = 0;
+ Client *c;
+
+ if (!m->showbar)
+@@ -716,6 +716,8 @@ drawbar(Monitor *m)
+ }
+
+ for (c = m->clients; c; c = c->next) {
++ if (ISVISIBLE(c))
++ n++;
+ occ |= c->tags;
+ if (c->isurgent)
+ urg |= c->tags;
+@@ -736,15 +738,39 @@ drawbar(Monitor *m)
+ x = drw_text(drw, x, 0, w, bh, lrpad / 2, m->ltsymbol, 0);
+
+ if ((w = m->ww - tw - x) > bh) {
+- if (m->sel) {
+- drw_setscheme(drw, scheme[m == selmon ? SchemeSel : SchemeNorm]);
+- drw_text(drw, x, 0, w, bh, lrpad / 2, m->sel->name, 0);
+- if (m->sel->isfloating)
+- drw_rect(drw, x + boxs, boxs, boxw, boxw, m->sel->isfixed, 0);
+- } else {
+- drw_setscheme(drw, scheme[SchemeNorm]);
+- drw_rect(drw, x, 0, w, bh, 1, 1);
++ if (n > 0) {
++ tw = TEXTW(m->sel->name) + lrpad;
++ mw = (tw >= w || n == 1) ? 0 : (w - tw) / (n - 1);
++
++ i = 0;
++ for (c = m->clients; c; c = c->next) {
++ if (!ISVISIBLE(c) || c == m->sel)
++ continue;
++ tw = TEXTW(c->name);
++ if(tw < mw)
++ ew += (mw - tw);
++ else
++ i++;
++ }
++ if (i > 0)
++ mw += ew / i;
++
++ for (c = m->clients; c; c = c->next) {
++ if (!ISVISIBLE(c))
++ continue;
++ tw = MIN(m->sel == c ? w : mw, TEXTW(c->name));
++
++ drw_setscheme(drw, scheme[m == selmon && m->sel == c ? SchemeSel : SchemeNorm]);
++ if (tw > lrpad / 2)
++ drw_text(drw, x, 0, tw, bh, lrpad / 2, c->name, 0);
++ if (c->isfloating)
++ drw_rect(drw, x + boxs, boxs, boxw, boxw, c->isfixed, 0);
++ x += tw;
++ w -= tw;
++ }
+ }
++ drw_setscheme(drw, scheme[SchemeNorm]);
++ drw_rect(drw, x, 0, w, bh, 1, 1);
+ }
+ drw_map(drw, m->barwin, 0, 0, m->ww, bh);
+ }
|