add gridall patch

patches/decklayout/README.md

@@ -0,0 +1,9 @@
+### Description
+Deck is a dwl-layout which is inspired by the dwm Deck layout (which is inspired by TTWM window manager). It applies the monocle-layout to the clients in the stack. The master-client is still visible. The stacked clients are like a deck of cards, hence the name.
+
+### Download
+- [git branch](https://codeberg.org/Kana/dwl/src/branch/decklayout)
+- [main 2025-10-08](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/decklayout/decklayout.patch)
+
+### Authors
+- [André Desgualdo Pereira](https://codeberg.org/Kana)

patches/decklayout/decklayout.patch

@@ -0,0 +1,112 @@
+From 095439425e64f2567f141d5d941178b148ef0d3a Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andr=C3=A9=20Desgualdo=20Pereira?= <desgua@gmail.com>
+Date: Sun, 12 Oct 2025 11:44:26 -0300
+Subject: [PATCH] decklayout
+
+---
+ config.def.h |  2 ++
+ dwl.c        | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 2 files changed, 63 insertions(+)
+
+diff --git a/config.def.h b/config.def.h
+index 95c2afa..cc846eb 100644
+--- a/config.def.h
++++ b/config.def.h
+@@ -34,6 +34,7 @@ static const Layout layouts[] = {
+ 	{ "[]=",      tile },
+ 	{ "><>",      NULL },    /* no layout function means floating behavior */
+ 	{ "[M]",      monocle },
++	{ "[E]",      deck },
+ };
+ 
+ /* monitors */
+@@ -139,6 +140,7 @@ static const Key keys[] = {
+ 	{ MODKEY,                    XKB_KEY_t,          setlayout,      {.v = &layouts[0]} },
+ 	{ MODKEY,                    XKB_KEY_f,          setlayout,      {.v = &layouts[1]} },
+ 	{ MODKEY,                    XKB_KEY_m,          setlayout,      {.v = &layouts[2]} },
++	{ MODKEY,                    XKB_KEY_a,          setlayout,      {.v = &layouts[3]} },
+ 	{ MODKEY,                    XKB_KEY_space,      setlayout,      {0} },
+ 	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_space,      togglefloating, {0} },
+ 	{ MODKEY,                    XKB_KEY_e,         togglefullscreen, {0} },
+diff --git a/dwl.c b/dwl.c
+index 12f441e..227004f 100644
+--- a/dwl.c
++++ b/dwl.c
+@@ -278,6 +278,7 @@ static void destroylayersurfacenotify(struct wl_listener *listener, void *data);
+ static void destroylock(SessionLock *lock, int unlocked);
+ static void destroylocksurface(struct wl_listener *listener, void *data);
+ static void destroynotify(struct wl_listener *listener, void *data);
++static void deck(Monitor *m);
+ static void destroypointerconstraint(struct wl_listener *listener, void *data);
+ static void destroysessionlock(struct wl_listener *listener, void *data);
+ static void destroykeyboardgroup(struct wl_listener *listener, void *data);
+@@ -1837,6 +1838,66 @@ monocle(Monitor *m)
+ 		wlr_scene_node_raise_to_top(&c->scene->node);
+ }
+ 
++void
++deck(Monitor *m)
++{
++	unsigned int mw, my;
++	int i, n = 0;
++	Client *c;
++
++	/* count tiled clients */
++	wl_list_for_each(c, &clients, link)
++
++		/* if (VISIBLEON(c, m) && !c->isfloating && !c->isfullscreen) */
++		if (VISIBLEON(c, m) && !c->isfloating)
++			n++;
++	if (n == 0)
++		return;
++
++	/* set master width */
++	if (n > m->nmaster)
++		mw = m->nmaster ? (int)roundf(m->w.width * m->mfact) : 0;
++	else
++		mw = m->w.width;
++
++	/* update layout symbol with number of stack windows */
++	/* use the following rules to count only the windows on the deck
++	if (n > m->nmaster)
++		snprintf(m->ltsymbol, sizeof m->ltsymbol, "[%d]", n - m->nmaster);
++	else
++		snprintf(m->ltsymbol, sizeof m->ltsymbol, "[%d]", n);  */
++
++	/* or this one to count all windows on the tag */
++	snprintf(m->ltsymbol, sizeof m->ltsymbol, "[%d]", n);
++
++	i = my = 0;
++	wl_list_for_each(c, &clients, link) {
++		/* if (!VISIBLEON(c, m) || c->isfloating || c->isfullscreen) */
++		if (!VISIBLEON(c, m) || c->isfloating)
++			continue;
++
++		if (i < m->nmaster) {
++			/* master clients */
++			resize(c, (struct wlr_box){
++				.x = m->w.x,
++				.y = m->w.y + my,
++				.width = mw,
++				.height = (m->w.height - my) / (MIN(n, m->nmaster) - i)
++			}, 0);
++			my += c->geom.height;
++		} else {
++			/* deck clients: overlap in stack area */
++			resize(c, (struct wlr_box){
++				.x = m->w.x + mw,
++				.y = m->w.y,
++				.width = m->w.width - mw,
++				.height = m->w.height
++			}, 0);
++		}
++		i++;
++	}
++}
++
+ void
+ motionabsolute(struct wl_listener *listener, void *data)
+ {
+-- 
+2.51.0
+

patches/gridall/README.md

@@ -0,0 +1,31 @@
+### Description
+
+This patch introduces a new way to view and focus on a client:
+
+1. Press the shortcut defined on config.h once to view all windows across all tags using the gaplessgrid layout.
+
+2. Press it again to view the selected window in its original tag using the monocle layout.
+
+The idea is to press a shortcut (e.g., `Mod+g`) to display all windows, then after
+selecting one, press it again to jump to that window's tag and focus on it.
+
+This patch depends on two other patches: [gaplessgrid](https://codeberg.org/dwl/dwl-patches/src/branch/main/patches/gaplessgrid)
+and [winview](https://codeberg.org/dwl/dwl-patches/src/branch/main/patches/winview).
+
+If you already have the other two patches added to your `dwl` build, you can simply
+apply `gridall.diff`. If not, I've also created a combined patch
+that includes winview, gaplessgrid, and gridall `winview+gaplessgrid+gridall.diff`.
+
+Additionally, this patch serves as an example of how to combine two functions
+under a single shortcut, allowing users to further customize their `dwl` setup.
+
+**Note:** Sometimes a window may get "lost" in one of the tags. This patch helps
+you quickly find and focus on it without having to move it or change its tag.
+
+### Download
+- [git branch](https://codeberg.org/Kana/dwl/src/branch/gridall)
+- [main gridall 2025-10-08](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/gridall/gridall.diff)
+- [main winview+gaplessgrid+gridall 2025-10-08](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/gridall/winview+gaplessgrid+gridall.diff)
+
+### Authors
+- [André Desgualdo Pereira](https://codeberg.org/Kana)

patches/gridall/gridall.diff

@@ -0,0 +1,67 @@
+diff -up ../dwl_winview_gaplessgrid/config.def.h ./config.def.h
+--- ../dwl_winview_gaplessgrid/config.def.h	2025-10-09 09:00:33.058449462 -0300
++++ ./config.def.h	2025-10-09 08:52:57.021707301 -0300
+@@ -144,6 +144,7 @@ static const Key keys[] = {
+ 	{ MODKEY,                    XKB_KEY_space,      setlayout,      {0} },
+ 	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_space,      togglefloating, {0} },
+ 	{ MODKEY,                    XKB_KEY_e,         togglefullscreen, {0} },
++	{ MODKEY,                    XKB_KEY_a,          togglegridall,  {0} },
+ 	{ MODKEY,                    XKB_KEY_0,          view,           {.ui = ~0} },
+ 	{ MODKEY,                    XKB_KEY_o,          winview,        {0}},
+ 	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_parenright, tag,            {.ui = ~0} },
+diff -up ../dwl_winview_gaplessgrid/dwl.c ./dwl.c
+--- ../dwl_winview_gaplessgrid/dwl.c	2025-10-09 09:00:56.123374462 -0300
++++ ./dwl.c	2025-10-09 08:55:16.022929525 -0300
+@@ -353,6 +353,7 @@ static Monitor *xytomon(double x, double
+ static void xytonode(double x, double y, struct wlr_surface **psurface,
+ 		Client **pc, LayerSurface **pl, double *nx, double *ny);
+ static void zoom(const Arg *arg);
++static void togglegridall(const Arg *arg);
+ 
+ /* variables */
+ static pid_t child_pid = -1;
+@@ -407,6 +408,7 @@ static struct wlr_output_layout *output_
+ static struct wlr_box sgeom;
+ static struct wl_list mons;
+ static Monitor *selmon;
++static int togglegridallstate = 0;
+ 
+ /* global event handlers */
+ static struct wl_listener cursor_axis = {.notify = axisnotify};
+@@ -3066,6 +3068,36 @@ winview(const Arg *a) {
+ 	return;
+ }
+ 
++void
++togglegridall(const Arg *arg)
++{
++	if (togglegridallstate == 0) {
++		/* hide the statusbar when activating the gridall
++		const char *dwlb_hide_cmd[] = { "dwlb", "-hide", "eDP-1", NULL };
++		if (fork() == 0) {
++			setsid();
++			execvp(dwlb_hide_cmd[0], (char *const *)dwlb_hide_cmd);
++			perror("execvp");
++			_exit(1);
++		} */
++		setlayout(&(const Arg){.v = &layouts[3]});
++		view(&(Arg){.ui = ~0});
++	} else {
++		/*const char *dwlb_show_cmd[] = { "dwlb", "-show", "eDP-1", NULL };*/
++		winview(&(const Arg){0});
++		setlayout(&(const Arg){.v = &layouts[0]});
++		/* show the statusbar again after choosing the client window to focus
++		if (fork() == 0) {
++			setsid();
++			execvp(dwlb_show_cmd[0], (char *const *)dwlb_show_cmd);
++			perror("execvp");
++			_exit(1);
++		} */
++	}
++	togglegridallstate = !togglegridallstate;
++}
++
++
+ Monitor *
+ xytomon(double x, double y)
+ {

patches/gridall/winview+gaplessgrid+gridall.diff

@@ -0,0 +1,162 @@
+diff -up ../../dwl_my_contribution/dwl/config.def.h ./config.def.h
+--- ../../dwl_my_contribution/dwl/config.def.h	2025-10-09 08:47:04.900053193 -0300
++++ ./config.def.h	2025-10-09 08:52:57.021707301 -0300
+@@ -34,6 +34,7 @@ static const Layout layouts[] = {
+ 	{ "[]=",      tile },
+ 	{ "><>",      NULL },    /* no layout function means floating behavior */
+ 	{ "[M]",      monocle },
++	{ "###",      gaplessgrid },
+ };
+ 
+ /* monitors */
+@@ -139,10 +140,13 @@ static const Key keys[] = {
+ 	{ MODKEY,                    XKB_KEY_t,          setlayout,      {.v = &layouts[0]} },
+ 	{ MODKEY,                    XKB_KEY_f,          setlayout,      {.v = &layouts[1]} },
+ 	{ MODKEY,                    XKB_KEY_m,          setlayout,      {.v = &layouts[2]} },
++	{ MODKEY,                    XKB_KEY_g,          setlayout,      {.v = &layouts[3]} },
+ 	{ MODKEY,                    XKB_KEY_space,      setlayout,      {0} },
+ 	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_space,      togglefloating, {0} },
+ 	{ MODKEY,                    XKB_KEY_e,         togglefullscreen, {0} },
++	{ MODKEY,                    XKB_KEY_a,          togglegridall,  {0} },
+ 	{ MODKEY,                    XKB_KEY_0,          view,           {.ui = ~0} },
++	{ MODKEY,                    XKB_KEY_o,          winview,        {0}},
+ 	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_parenright, tag,            {.ui = ~0} },
+ 	{ MODKEY,                    XKB_KEY_comma,      focusmon,       {.i = WLR_DIRECTION_LEFT} },
+ 	{ MODKEY,                    XKB_KEY_period,     focusmon,       {.i = WLR_DIRECTION_RIGHT} },
+diff -up ../../dwl_my_contribution/dwl/dwl.c ./dwl.c
+--- ../../dwl_my_contribution/dwl/dwl.c	2025-10-09 08:47:04.900053193 -0300
++++ ./dwl.c	2025-10-09 08:55:16.022929525 -0300
+@@ -288,6 +288,7 @@ static void focusstack(const Arg *arg);
+ static Client *focustop(Monitor *m);
+ static void fullscreennotify(struct wl_listener *listener, void *data);
+ static void gpureset(struct wl_listener *listener, void *data);
++static void gaplessgrid(Monitor *m);
+ static void handlesig(int signo);
+ static void incnmaster(const Arg *arg);
+ static void inputdevice(struct wl_listener *listener, void *data);
+@@ -347,10 +348,12 @@ static void urgent(struct wl_listener *l
+ static void view(const Arg *arg);
+ static void virtualkeyboard(struct wl_listener *listener, void *data);
+ static void virtualpointer(struct wl_listener *listener, void *data);
++static void winview(const Arg *a);
+ static Monitor *xytomon(double x, double y);
+ static void xytonode(double x, double y, struct wlr_surface **psurface,
+ 		Client **pc, LayerSurface **pl, double *nx, double *ny);
+ static void zoom(const Arg *arg);
++static void togglegridall(const Arg *arg);
+ 
+ /* variables */
+ static pid_t child_pid = -1;
+@@ -405,6 +408,7 @@ static struct wlr_output_layout *output_
+ static struct wlr_box sgeom;
+ static struct wl_list mons;
+ static Monitor *selmon;
++static int togglegridallstate = 0;
+ 
+ /* global event handlers */
+ static struct wl_listener cursor_axis = {.notify = axisnotify};
+@@ -1567,6 +1571,56 @@ handlesig(int signo)
+ }
+ 
+ void
++gaplessgrid(Monitor *m)
++{
++	unsigned int n = 0, i = 0, ch, cw, cn, rn, rows, cols;
++	Client *c;
++
++	wl_list_for_each(c, &clients, link)
++		if (VISIBLEON(c, m) && !c->isfloating)
++			n++;
++	if (n == 0)
++		return;
++
++	/* grid dimensions */
++	for (cols = 0; cols <= (n / 2); cols++)
++		if ((cols * cols) >= n)
++			break;
++
++	if (n == 5) /* set layout against the general calculation: not 1:2:2, but 2:3 */
++		cols = 2;
++
++    /* widescreen is better if 3 columns */
++    if (n >= 3 && n <= 6 && (m->w.width / m->w.height) > 1)
++        cols = 3;
++
++	rows = n / cols;
++   
++	/* window geometries */
++	cw = cols ? m->w.width / cols : m->w.width;
++	cn = 0; /* current column number */
++	rn = 0; /* current row number */
++	wl_list_for_each(c, &clients, link) {
++		unsigned int cx, cy;
++		if (!VISIBLEON(c, m) || c->isfloating || c->isfullscreen)
++			continue;
++
++		if ((i / rows + 1) > (cols - n % cols))
++			rows = n / cols + 1;
++		ch = rows ? m->w.height / rows : m->w.height;
++		cx = m->w.x + cn * cw;
++		cy = m->w.y + rn * ch;
++		resize(c, (struct wlr_box) { cx, cy, cw, ch}, 0);
++		rn++;
++		if (rn >= rows) {
++			rn = 0;
++			cn++;
++		}
++		i++;
++	}
++}
++
++void
+ incnmaster(const Arg *arg)
+ {
+ 	if (!arg || !selmon)
+@@ -3003,6 +3057,47 @@ virtualpointer(struct wl_listener *liste
+ 		wlr_cursor_map_input_to_output(cursor, device, event->suggested_output);
+ }
+ 
++void
++winview(const Arg *a) {
++	Arg b = {0};
++	Client *sel = focustop(selmon);
++	if(!sel)
++		return;
++	b.ui = sel -> tags;
++	view(&b);
++	return;
++}
++
++void
++togglegridall(const Arg *arg)
++{
++	if (togglegridallstate == 0) {
++		/* hide the statusbar when activating the gridall
++		const char *dwlb_hide_cmd[] = { "dwlb", "-hide", "eDP-1", NULL };
++		if (fork() == 0) {
++			setsid();
++			execvp(dwlb_hide_cmd[0], (char *const *)dwlb_hide_cmd);
++			perror("execvp");
++			_exit(1);
++		} */
++		setlayout(&(const Arg){.v = &layouts[3]});
++		view(&(Arg){.ui = ~0});
++	} else {
++		/*const char *dwlb_show_cmd[] = { "dwlb", "-show", "eDP-1", NULL };*/
++		winview(&(const Arg){0});
++		setlayout(&(const Arg){.v = &layouts[0]});
++		/* show the statusbar again after choosing the client window to focus
++		if (fork() == 0) {
++			setsid();
++			execvp(dwlb_show_cmd[0], (char *const *)dwlb_show_cmd);
++			perror("execvp");
++			_exit(1);
++		} */
++	}
++	togglegridallstate = !togglegridallstate;
++}
++
++
+ Monitor *
+ xytomon(double x, double y)
+ {

patches/riverctl/riverctl.patch

@@ -1,17 +1,20 @@
-From 735440660fd2bccdde982f9c3d758e189ba35e40 Mon Sep 17 00:00:00 2001
+From 672df57ab7d5b52f91a712eaf3954d580cdf8ba3 Mon Sep 17 00:00:00 2001
 From: Zuki Air <zukirust@gmail.com>
 Date: Thu, 7 Aug 2025 13:19:59 +0100
 Subject: [PATCH] riverctl patch
 
+make setborderpx apply instantly
+
+add setting border colors via dwlctl
 ---
  .gitignore                              |   1 +
  Makefile                                |  22 +-
- config.def.h                            |  36 +-
+ config.def.h                            |  42 +-
  dwl.c                                   |  47 +-
- dwlctl.c                                | 133 +++++
+ dwlctl.c                                | 133 ++++
  protocols/river-control-unstable-v1.xml |  85 +++
- river-control.h                         | 753 ++++++++++++++++++++++++
+ river-control.h                         | 789 ++++++++++++++++++++++++
- 7 files changed, 1055 insertions(+), 22 deletions(-)
+ 7 files changed, 1094 insertions(+), 25 deletions(-)
  create mode 100644 dwlctl.c
  create mode 100644 protocols/river-control-unstable-v1.xml
  create mode 100644 river-control.h
@@ -75,18 +78,25 @@ index 578194f..029dfad 100644
  dist: clean
  	mkdir -p dwl-$(VERSION)
 diff --git a/config.def.h b/config.def.h
-index 95c2afa..72afbd6 100644
+index 95c2afa..ccc3edb 100644
 --- a/config.def.h
 +++ b/config.def.h
-@@ -6,7 +6,7 @@
+@@ -6,11 +6,11 @@
  /* appearance */
  static const int sloppyfocus               = 1;  /* focus follows mouse */
  static const int bypass_surface_visibility = 0;  /* 1 means idle inhibitors will disable idle tracking even if it's surface isn't visible  */
 -static const unsigned int borderpx         = 1;  /* border pixel of windows */
 +static unsigned int borderpx         = 1;  /* border pixel of windows */
  static const float rootcolor[]             = COLOR(0x222222ff);
- static const float bordercolor[]           = COLOR(0x444444ff);
+-static const float bordercolor[]           = COLOR(0x444444ff);
- static const float focuscolor[]            = COLOR(0x005577ff);
+-static const float focuscolor[]            = COLOR(0x005577ff);
+-static const float urgentcolor[]           = COLOR(0xff0000ff);
++static float bordercolor[]           = COLOR(0x444444ff);
++static float focuscolor[]            = COLOR(0x005577ff);
++static float urgentcolor[]           = COLOR(0xff0000ff);
+ /* This conforms to the xdg-protocol. Set the alpha to zero to restore the old behavior */
+ static const float fullscreen_bg[]         = {0.0f, 0.0f, 0.0f, 1.0f}; /* You can also use glsl colors */
+ 
 @@ -21,7 +21,14 @@ static const float fullscreen_bg[]         = {0.0f, 0.0f, 0.0f, 1.0f}; /* You ca
  static int log_level = WLR_ERROR;
  
@@ -480,10 +490,10 @@ index 0000000..aa5fc4d
 +</protocol>
 diff --git a/river-control.h b/river-control.h
 new file mode 100644
-index 0000000..59561b6
+index 0000000..599cffe
 --- /dev/null
 +++ b/river-control.h
-@@ -0,0 +1,753 @@
+@@ -0,0 +1,789 @@
 +#include "river-control-unstable-v1-private-protocol.c"
 +#include "river-control-unstable-v1-protocol.h"
 +#ifdef KEYS_USED
@@ -495,6 +505,9 @@ index 0000000..59561b6
 +void clear_rules(const Arg*);
 +void clear_binds(const Arg*);
 +void setborderpx(const Arg*);
++void setfocuscolor(const Arg*);
++void setbordercolor(const Arg*);
++void seturgentcolor(const Arg*);
 +struct wl_list arg_str_store;
 +struct wl_list rule_str_store;
 +struct wl_list rules_list;
@@ -534,6 +547,7 @@ index 0000000..59561b6
 +    FUNC_STR_ARG_TYPE_INT,
 +    FUNC_STR_ARG_TYPE_UINT,
 +    FUNC_STR_ARG_TYPE_FLOAT,
++    FUNC_STR_ARG_TYPE_COLOR,
 +    FUNC_STR_ARG_TYPE_STRING_ARRAY,
 +    FUNC_STR_ARG_TYPE_WLR_DIRECTION,
 +    FUNC_STR_ARG_TYPE_LAYOUT,
@@ -552,6 +566,9 @@ index 0000000..59561b6
 +    { enter_mode, FUNC_STR_ARG_TYPE_STRING_ARRAY, "enter-mode"},
 +    { oneshot_mode, FUNC_STR_ARG_TYPE_STRING_ARRAY, "oneshot-mode"},
 +    { create_mode_user, FUNC_STR_ARG_TYPE_STRING_ARRAY, "create-mode"},
++    STR(setfocuscolor,FUNC_STR_ARG_TYPE_COLOR),
++    STR(setbordercolor,FUNC_STR_ARG_TYPE_COLOR),
++    STR(seturgentcolor,FUNC_STR_ARG_TYPE_COLOR),
 +    STR(setborderpx,FUNC_STR_ARG_TYPE_UINT),
 +    STR(setlayout,FUNC_STR_ARG_TYPE_LAYOUT),
 +    STR(spawn,FUNC_STR_ARG_TYPE_STRING_ARRAY),
@@ -641,10 +658,36 @@ index 0000000..59561b6
 +
 +void setborderpx(const Arg *arg) {
 +	Client *c;
++    Monitor *m;
 +    borderpx = arg->ui;
 +	wl_list_for_each(c, &clients, link) {
 +	    c->bw = borderpx;
 +    }
++    wl_list_for_each(m, &mons,link) {
++        arrange(m);
++    }
++}
++
++void setfocuscolor(const Arg *arg) {
++    const float color[4] = COLOR(arg->i);
++    int i;
++	for (i = 0; i < 4; i++) {
++        focuscolor[i] = color[i];
++    }
++}
++void setbordercolor(const Arg *arg) {
++    const float color[4] = COLOR(arg->i);
++    int i;
++	for (i = 0; i < 4; i++) {
++        bordercolor[i] = color[i];
++    }
++}
++void seturgentcolor(const Arg *arg) {
++    const float color[4] = COLOR(arg->i);
++    int i;
++	for (i = 0; i < 4; i++) {
++        urgentcolor[i] = color[i];
++    }
 +}
 +
 +void zriver_control_destroy(struct wl_client *client,
@@ -1098,7 +1141,10 @@ index 0000000..59561b6
 +                        args->error = true;
 +                        args->error_msg = zriver_error_out_of_range;
 +                    }
-+
++                    break;
++                case(FUNC_STR_ARG_TYPE_COLOR):
++                    arg->i = strtol(argument,NULL,16);
++                    break;
 +            }
 +    }
 +    args->argc++;
@@ -1238,5 +1284,5 @@ index 0000000..59561b6
 +        zriver_arg_list_resource, zriver_control_handle_destory);
 +}
 -- 
-2.49.1
+2.51.0