add number to deck layout

config.def.h

@@ -12,7 +12,7 @@ static const float bordercolor[]           = COLOR(0x444444ff);
 static const float focuscolor[]            = COLOR(0x005577ff);
 static const 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.1f, 0.1f, 0.1f, 0.0f}; /* You can also use glsl colors */
+static const float fullscreen_bg[]         = {0.1f, 0.1f, 0.1f, 1.0f}; /* You can also use glsl colors */
 
 /* tagging - TAGCOUNT must be no greater than 31 */
 #define TAGCOUNT (9)
@@ -34,6 +34,7 @@ static const Layout layouts[] = {
 	{ "[]=",      tile },
 	{ "><>",      NULL },    /* no layout function means floating behavior */
 	{ "[M]",      monocle },
+	{ "[D]",      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_r,          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} },

deck.patch

@@ -0,0 +1,87 @@
+From d56f732d3b5bba4ea0bdf56a91d0992b0cb25bfb Mon Sep 17 00:00:00 2001
+From: anabasis <anabasis@noreply.codeberg.org>
+Date: Fri, 10 May 2024 13:45:33 -0400
+Subject: [PATCH] add deck layout
+
+---
+ config.def.h |  2 ++
+ dwl.c        | 36 ++++++++++++++++++++++++++++++++++++
+ 2 files changed, 38 insertions(+)
+
+diff --git a/config.def.h b/config.def.h
+index 8f498d2..9238da0 100644
+--- a/config.def.h
++++ b/config.def.h
+@@ -33,6 +33,7 @@ static const Layout layouts[] = {
+ 	{ "[]=",      tile },
+ 	{ "><>",      NULL },    /* no layout function means floating behavior */
+ 	{ "[M]",      monocle },
++	{ "[D]",      deck },
+ };
+ 
+ /* monitors */
+@@ -134,6 +135,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_r,          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 bf763df..1a7ce8e 100644
+--- a/dwl.c
++++ b/dwl.c
+@@ -267,6 +267,7 @@ static void createpointerconstraint(struct wl_listener *listener, void *data);
+ static void cursorconstrain(struct wlr_pointer_constraint_v1 *constraint);
+ static void cursorframe(struct wl_listener *listener, void *data);
+ static void cursorwarptohint(void);
++static void deck(Monitor *m);
+ static void destroydecoration(struct wl_listener *listener, void *data);
+ static void destroydragicon(struct wl_listener *listener, void *data);
+ static void destroyidleinhibitor(struct wl_listener *listener, void *data);
+@@ -1080,6 +1081,41 @@ cursorwarptohint(void)
+ 	}
+ }
+ 
++void
++deck(Monitor *m)
++{
++	unsigned int mw, my;
++	int i, n = 0;
++	Client *c;
++
++	wl_list_for_each(c, &clients, link)
++		if (VISIBLEON(c, m) && !c->isfloating && !c->isfullscreen)
++			n++;
++	if (n == 0)
++		return;
++
++	if (n > m->nmaster)
++		mw = m->nmaster ? ROUND(m->w.width * m->mfact) : 0;
++	else
++		mw = m->w.width;
++	i = my = 0;
++	wl_list_for_each(c, &clients, link) {
++		if (!VISIBLEON(c, m) || c->isfloating || c->isfullscreen)
++			continue;
++		if (i < m->nmaster) {
++			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 {
++			resize(c, (struct wlr_box){.x = m->w.x + mw, .y = m->w.y,
++				.width = m->w.width - mw, .height = m->w.height}, 0);
++			if (c == focustop(m))
++				wlr_scene_node_raise_to_top(&c->scene->node);
++		}
++		i++;
++	}
++}
++
+ void
+ destroydecoration(struct wl_listener *listener, void *data)
+ {
+-- 
+2.45.0
+

dwl.c

@@ -271,6 +271,7 @@ static void createpopup(struct wl_listener *listener, void *data);
 static void cursorconstrain(struct wlr_pointer_constraint_v1 *constraint);
 static void cursorframe(struct wl_listener *listener, void *data);
 static void cursorwarptohint(void);
+static void deck(Monitor *m);
 static void destroydecoration(struct wl_listener *listener, void *data);
 static void destroydragicon(struct wl_listener *listener, void *data);
 static void destroyidleinhibitor(struct wl_listener *listener, void *data);
@@ -505,9 +506,7 @@ applyrules(Client *c)
 void
 arrange(Monitor *m)
 {
-	LayerSurface *l;
-	Client *c, *sel = focustop(m);
-	int i;
+	Client *c;
 
 	if (!m->wlr_output->enabled)
 		return;
@@ -538,26 +537,6 @@ arrange(Monitor *m)
 								: c->scene->node.parent);
 	}
 
-	if (sel && sel->isfullscreen && VISIBLEON(sel, m)) {
-		for (i = 2; i > ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND; i--) {
-			wl_list_for_each(l, &sel->mon->layers[i], link)
-				wlr_scene_node_set_enabled(&l->scene->node, 0);
-		}
-
-		wl_list_for_each(c, &clients, link) {
-			if (c->mon != m)
-				continue;
-			wlr_scene_node_set_enabled(&c->scene->node, (sel->isfullscreen && c == sel)
-					|| !sel->isfullscreen);
-		}
-	}
-	if (!sel || (!sel->isfullscreen && VISIBLEON(sel, m))) {
-		for (i = 2; i > ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND; i--) {
-			wl_list_for_each(l, &m->layers[i], link)
-				wlr_scene_node_set_enabled(&l->scene->node, 1);
-		}
-	}
-
 	if (m->lt[m->sellt]->arrange)
 		m->lt[m->sellt]->arrange(m);
 	motionnotify(0, NULL, 0, 0, 0, 0);
@@ -1256,6 +1235,42 @@ cursorwarptohint(void)
 	}
 }
 
+void
+deck(Monitor *m)
+{
+	unsigned int mw, my;
+	int i, n = 0;
+	Client *c;
+
+	wl_list_for_each(c, &clients, link)
+		if (VISIBLEON(c, m) && !c->isfloating && !c->isfullscreen)
+			n++;
+	if (n == 0)
+		return;
+
+	if (n > m->nmaster)
+		mw = m->nmaster ? round(m->w.width * m->mfact) : 0;
+	else
+		mw = m->w.width;
+	i = my = 0;
+	wl_list_for_each(c, &clients, link) {
+		if (!VISIBLEON(c, m) || c->isfloating || c->isfullscreen)
+			continue;
+		if (i < m->nmaster) {
+			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 {
+			resize(c, (struct wlr_box){.x = m->w.x + mw, .y = m->w.y,
+				.width = m->w.width - mw, .height = m->w.height}, 0);
+		        snprintf(m->ltsymbol, LENGTH(m->ltsymbol), "%d", n-1);
+			if (c == focustop(m))
+				wlr_scene_node_raise_to_top(&c->scene->node);
+		}
+		i++;
+	}
+}
+
 void
 destroydecoration(struct wl_listener *listener, void *data)
 {

hide-behind-fullscreen.patch

@@ -1,73 +0,0 @@
-From ac1537f068ea626f1984803ed8db08faf7943b18 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Leonardo=20Hern=C3=A1ndez=20Hern=C3=A1ndez?=
- <leohdz172@proton.me>
-Date: Sun, 10 Apr 2022 22:38:53 -0500
-Subject: [PATCH] hide-behind-fullscreen
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Leonardo Hernández Hernández <leohdz172@proton.me>
----
- config.def.h |  2 +-
- dwl.c        | 24 +++++++++++++++++++++++-
- 2 files changed, 24 insertions(+), 2 deletions(-)
-
-diff --git a/config.def.h b/config.def.h
-index 22d2171d..1d5a4c84 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -12,7 +12,7 @@ static const float bordercolor[]           = COLOR(0x444444ff);
- static const float focuscolor[]            = COLOR(0x005577ff);
- static const 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.1f, 0.1f, 0.1f, 1.0f}; /* You can also use glsl colors */
-+static const float fullscreen_bg[]         = {0.1f, 0.1f, 0.1f, 0.0f}; /* You can also use glsl colors */
- 
- /* tagging - TAGCOUNT must be no greater than 31 */
- #define TAGCOUNT (9)
-diff --git a/dwl.c b/dwl.c
-index ad21e1ba..f5395fe6 100644
---- a/dwl.c
-+++ b/dwl.c
-@@ -505,7 +505,9 @@ applyrules(Client *c)
- void
- arrange(Monitor *m)
- {
--	Client *c;
-+	LayerSurface *l;
-+	Client *c, *sel = focustop(m);
-+	int i;
- 
- 	if (!m->wlr_output->enabled)
- 		return;
-@@ -536,6 +538,26 @@ arrange(Monitor *m)
- 								: c->scene->node.parent);
- 	}
- 
-+	if (sel && sel->isfullscreen && VISIBLEON(sel, m)) {
-+		for (i = 2; i > ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND; i--) {
-+			wl_list_for_each(l, &sel->mon->layers[i], link)
-+				wlr_scene_node_set_enabled(&l->scene->node, 0);
-+		}
-+
-+		wl_list_for_each(c, &clients, link) {
-+			if (c->mon != m)
-+				continue;
-+			wlr_scene_node_set_enabled(&c->scene->node, (sel->isfullscreen && c == sel)
-+					|| !sel->isfullscreen);
-+		}
-+	}
-+	if (!sel || (!sel->isfullscreen && VISIBLEON(sel, m))) {
-+		for (i = 2; i > ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND; i--) {
-+			wl_list_for_each(l, &m->layers[i], link)
-+				wlr_scene_node_set_enabled(&l->scene->node, 1);
-+		}
-+	}
-+
- 	if (m->lt[m->sellt]->arrange)
- 		m->lt[m->sellt]->arrange(m);
- 	motionnotify(0, NULL, 0, 0, 0, 0);
--- 
-2.48.0
-