add number to deck layout

config.def.h

@@ -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);
@@ -436,11 +437,6 @@ static struct wl_listener request_start_drag = {.notify = requeststartdrag};
 static struct wl_listener start_drag = {.notify = startdrag};
 static struct wl_listener new_session_lock = {.notify = locksession};
 
-static const struct xkb_rule_names en_rules = {.layout = "de"};
-static struct xkb_context *en_context;
-static struct xkb_keymap *en_keymap;
-static struct xkb_state *en_state;
-
 #ifdef XWAYLAND
 static void activatex11(struct wl_listener *listener, void *data);
 static void associatex11(struct wl_listener *listener, void *data);
@@ -722,9 +718,6 @@ cleanup(void)
 	wlr_backend_destroy(backend);
 
 	wl_display_destroy(dpy);
-	xkb_state_unref(en_state);
-	xkb_keymap_unref(en_keymap);
-	xkb_context_unref(en_context);
 	/* Destroy after the wayland display (when the monitors are already destroyed)
 	   to avoid destroying them with an invalid scene output. */
 	wlr_scene_node_destroy(&scene->tree.node);
@@ -1242,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)
 {
@@ -1636,19 +1665,16 @@ keypress(struct wl_listener *listener, void *data)
 	/* This event is raised when a key is pressed or released. */
 	KeyboardGroup *group = wl_container_of(listener, group, key);
 	struct wlr_keyboard_key_event *event = data;
-	int nsyms, handled;
 
 	/* Translate libinput keycode -> xkbcommon */
 	uint32_t keycode = event->keycode + 8;
 	/* Get a list of keysyms based on the keymap for this keyboard */
 	const xkb_keysym_t *syms;
-	uint32_t mods = wlr_keyboard_get_modifiers(&group->wlr_group->keyboard);
-	xkb_state_update_key(en_state, keycode,
-			(event->state == WL_KEYBOARD_KEY_STATE_PRESSED)
-			? XKB_KEY_DOWN : XKB_KEY_UP);
-	nsyms = xkb_state_key_get_syms(en_state, keycode, &syms);
+	int nsyms = xkb_state_key_get_syms(
+			group->wlr_group->keyboard.xkb_state, keycode, &syms);
 
-	handled = 0;
+	int handled = 0;
+	uint32_t mods = wlr_keyboard_get_modifiers(&group->wlr_group->keyboard);
 
 	wlr_idle_notifier_v1_notify_activity(idle_notifier, seat);
 
@@ -2630,10 +2656,6 @@ setup(void)
 	 * pointer, touch, and drawing tablet device. We also rig up a listener to
 	 * let us know when new input devices are available on the backend.
 	 */
-        en_context = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
-        en_keymap = xkb_keymap_new_from_names(en_context, &en_rules,
-        	XKB_KEYMAP_COMPILE_NO_FLAGS);
-        en_state = xkb_state_new(en_keymap);
 	wl_signal_add(&backend->events.new_input, &new_input_device);
 	virtual_keyboard_mgr = wlr_virtual_keyboard_manager_v1_create(dpy);
 	wl_signal_add(&virtual_keyboard_mgr->events.new_virtual_keyboard,

en-keycodes.patch

@@ -1,73 +0,0 @@
-From cd61fac9cb6e9d0172e2f7a01e6a514d676ba5f0 Mon Sep 17 00:00:00 2001
-From: Nikita Ivanov <nikita.vyach.ivanov@gmail.com>
-Date: Tue, 4 Feb 2025 23:53:11 +0100
-Subject: [PATCH] Always use the English keymap to get keycodes
-
----
- dwl.c | 23 +++++++++++++++++++----
- 1 file changed, 19 insertions(+), 4 deletions(-)
-
-diff --git a/dwl.c b/dwl.c
-index def2562..c299365 100644
---- a/dwl.c
-+++ b/dwl.c
-@@ -413,6 +413,11 @@ static struct wlr_box sgeom;
- static struct wl_list mons;
- static Monitor *selmon;
- 
-+static const struct xkb_rule_names en_rules = {.layout = "us"};
-+static struct xkb_context *en_context;
-+static struct xkb_keymap *en_keymap;
-+static struct xkb_state *en_state;
-+
- #ifdef XWAYLAND
- static void activatex11(struct wl_listener *listener, void *data);
- static void associatex11(struct wl_listener *listener, void *data);
-@@ -694,6 +699,9 @@ cleanup(void)
- 	wlr_backend_destroy(backend);
- 
- 	wl_display_destroy(dpy);
-+	xkb_state_unref(en_state);
-+	xkb_keymap_unref(en_keymap);
-+	xkb_context_unref(en_context);
- 	/* Destroy after the wayland display (when the monitors are already destroyed)
- 	   to avoid destroying them with an invalid scene output. */
- 	wlr_scene_node_destroy(&scene->tree.node);
-@@ -1582,16 +1590,19 @@ keypress(struct wl_listener *listener, void *data)
- 	/* This event is raised when a key is pressed or released. */
- 	KeyboardGroup *group = wl_container_of(listener, group, key);
- 	struct wlr_keyboard_key_event *event = data;
-+	int nsyms, handled;
- 
- 	/* Translate libinput keycode -> xkbcommon */
- 	uint32_t keycode = event->keycode + 8;
- 	/* Get a list of keysyms based on the keymap for this keyboard */
- 	const xkb_keysym_t *syms;
--	int nsyms = xkb_state_key_get_syms(
--			group->wlr_group->keyboard.xkb_state, keycode, &syms);
--
--	int handled = 0;
- 	uint32_t mods = wlr_keyboard_get_modifiers(&group->wlr_group->keyboard);
-+	xkb_state_update_key(en_state, keycode,
-+			(event->state == WL_KEYBOARD_KEY_STATE_PRESSED)
-+			? XKB_KEY_DOWN : XKB_KEY_UP);
-+	nsyms = xkb_state_key_get_syms(en_state, keycode, &syms);
-+
-+	handled = 0;
- 
- 	wlr_idle_notifier_v1_notify_activity(idle_notifier, seat);
- 
-@@ -2607,6 +2618,10 @@ setup(void)
- 	 * pointer, touch, and drawing tablet device. We also rig up a listener to
- 	 * let us know when new input devices are available on the backend.
- 	 */
-+	en_context = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
-+	en_keymap = xkb_keymap_new_from_names(en_context, &en_rules,
-+		XKB_KEYMAP_COMPILE_NO_FLAGS);
-+	en_state = xkb_state_new(en_keymap);
- 	LISTEN_STATIC(&backend->events.new_input, inputdevice);
- 	virtual_keyboard_mgr = wlr_virtual_keyboard_manager_v1_create(dpy);
- 	LISTEN_STATIC(&virtual_keyboard_mgr->events.new_virtual_keyboard, virtualkeyboard);
--- 
-2.48.1
-