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 */
@@ -52,15 +53,12 @@ static const MonitorRule monrules[] = {
 };
 
 /* keyboard */
-static const struct xkb_rule_names xkb_rules[] = {
-	{
-		.layout = "us",
-	},
-	/*{
-		.layout = "us",
-		.variant = "dvp",
-		.options = "compose:102,numpad:shift3,kpdl:semi,keypad:atm,caps:super"
-	}*/
+static const struct xkb_rule_names xkb_rules = {
+	/* can specify fields: rules, model, layout, variant, options */
+	/* example:
+	.options = "ctrl:nocaps",
+	*/
+	.options = NULL,
 };
 
 static const int repeat_rate = 25;
@@ -142,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} },
@@ -151,8 +150,6 @@ static const Key keys[] = {
 	{ MODKEY,                    XKB_KEY_period,     focusmon,       {.i = WLR_DIRECTION_RIGHT} },
 	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_less,       tagmon,         {.i = WLR_DIRECTION_LEFT} },
 	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_greater,    tagmon,         {.i = WLR_DIRECTION_RIGHT} },
-	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_A,          incxkbrules,    {.i = +1} },
-	/*{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_E,          setxkbrules,    {.i = +1} },*/
 	TAGKEYS(          XKB_KEY_1, XKB_KEY_exclam,                     0),
 	TAGKEYS(          XKB_KEY_2, XKB_KEY_at,                         1),
 	TAGKEYS(          XKB_KEY_3, XKB_KEY_numbersign,                 2),

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

@@ -246,7 +246,6 @@ static void arrange(Monitor *m);
 static void arrangelayer(Monitor *m, struct wl_list *list,
 		struct wlr_box *usable_area, int exclusive);
 static void arrangelayers(Monitor *m);
-static void assignkeymap(struct wlr_keyboard *keyboard);
 static void axisnotify(struct wl_listener *listener, void *data);
 static void buttonpress(struct wl_listener *listener, void *data);
 static void chvt(const Arg *arg);
@@ -272,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);
@@ -291,7 +291,6 @@ static void fullscreennotify(struct wl_listener *listener, void *data);
 static void gpureset(struct wl_listener *listener, void *data);
 static void handlesig(int signo);
 static void incnmaster(const Arg *arg);
-static void incxkbrules(const Arg *arg);
 static void inputdevice(struct wl_listener *listener, void *data);
 static int keybinding(uint32_t mods, xkb_keysym_t sym);
 static void keypress(struct wl_listener *listener, void *data);
@@ -331,7 +330,6 @@ static void setmon(Client *c, Monitor *m, uint32_t newtags);
 static void setpsel(struct wl_listener *listener, void *data);
 static void setsel(struct wl_listener *listener, void *data);
 static void setup(void);
-static void setxkbrules(const Arg *arg);
 static void spawn(const Arg *arg);
 static void startdrag(struct wl_listener *listener, void *data);
 static void tag(const Arg *arg);
@@ -400,7 +398,6 @@ static struct wlr_session_lock_v1 *cur_lock;
 
 static struct wlr_seat *seat;
 static KeyboardGroup *kb_group;
-static unsigned int kblayout = 0;
 static unsigned int cursor_mode;
 static Client *grabc;
 static int grabcx, grabcy; /* client-relative */
@@ -606,20 +603,6 @@ arrangelayers(Monitor *m)
 	}
 }
 
-void
-assignkeymap(struct wlr_keyboard *keyboard) {
-	struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
-	struct xkb_keymap *keymap = xkb_keymap_new_from_names(context, &xkb_rules[kblayout],
-					XKB_KEYMAP_COMPILE_NO_FLAGS);
-
-	if (!keymap)
-		die("failed to compile keymap");
-
-	wlr_keyboard_set_keymap(keyboard, keymap);
-	xkb_keymap_unref(keymap);
-	xkb_context_unref(context);
-}
-
 void
 axisnotify(struct wl_listener *listener, void *data)
 {
@@ -966,11 +949,21 @@ KeyboardGroup *
 createkeyboardgroup(void)
 {
 	KeyboardGroup *group = ecalloc(1, sizeof(*group));
+	struct xkb_context *context;
+	struct xkb_keymap *keymap;
 
 	group->wlr_group = wlr_keyboard_group_create();
 	group->wlr_group->data = group;
 
-	assignkeymap(&group->wlr_group->keyboard);
+	/* Prepare an XKB keymap and assign it to the keyboard group. */
+	context = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
+	if (!(keymap = xkb_keymap_new_from_names(context, &xkb_rules,
+				XKB_KEYMAP_COMPILE_NO_FLAGS)))
+		die("failed to compile keymap");
+
+	wlr_keyboard_set_keymap(&group->wlr_group->keyboard, keymap);
+	xkb_keymap_unref(keymap);
+	xkb_context_unref(context);
 
 	wlr_keyboard_set_repeat_info(&group->wlr_group->keyboard, repeat_rate, repeat_delay);
 
@@ -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)
 {
@@ -1580,13 +1609,6 @@ incnmaster(const Arg *arg)
 	arrange(selmon);
 }
 
-void
-incxkbrules(const Arg *arg)
-{
-	kblayout = (kblayout + arg->i) % LENGTH(xkb_rules);
-	assignkeymap(&kb_group->wlr_group->keyboard);
-}
-
 void
 inputdevice(struct wl_listener *listener, void *data)
 {
@@ -2676,13 +2698,6 @@ setup(void)
 #endif
 }
 
-void
-setxkbrules(const Arg *arg)
-{
-	kblayout = arg->i;
-	assignkeymap(&kb_group->wlr_group->keyboard);
-}
-
 void
 spawn(const Arg *arg)
 {

togglekblayoutandoptions.patch

@@ -1,160 +0,0 @@
-From 9ee76adc7c6567650e7b34273f953fed03191c05 Mon Sep 17 00:00:00 2001
-From: LaKato <lakato@noreply.codeberg.org>
-Date: Sat, 8 Mar 2025 12:14:41 -0500
-Subject: [PATCH] Update for v0.7
-
-Additional changes:
-- incxkbrules now uses its argument
-- A new setxkbrules function has been added
-- Keyboard groups are no longer looped over because only one is created
----
- config.def.h | 17 +++++++++++------
- dwl.c        | 44 +++++++++++++++++++++++++++++++++-----------
- 2 files changed, 44 insertions(+), 17 deletions(-)
-
-diff --git a/config.def.h b/config.def.h
-index 22d2171..b3b4699 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -52,12 +52,15 @@ static const MonitorRule monrules[] = {
- };
- 
- /* keyboard */
--static const struct xkb_rule_names xkb_rules = {
--	/* can specify fields: rules, model, layout, variant, options */
--	/* example:
--	.options = "ctrl:nocaps",
--	*/
--	.options = NULL,
-+static const struct xkb_rule_names xkb_rules[] = {
-+	{
-+		.layout = "us",
-+	},
-+	/*{
-+		.layout = "us",
-+		.variant = "dvp",
-+		.options = "compose:102,numpad:shift3,kpdl:semi,keypad:atm,caps:super"
-+	}*/
- };
- 
- static const int repeat_rate = 25;
-@@ -148,6 +151,8 @@ static const Key keys[] = {
- 	{ MODKEY,                    XKB_KEY_period,     focusmon,       {.i = WLR_DIRECTION_RIGHT} },
- 	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_less,       tagmon,         {.i = WLR_DIRECTION_LEFT} },
- 	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_greater,    tagmon,         {.i = WLR_DIRECTION_RIGHT} },
-+	{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_A,          incxkbrules,    {.i = +1} },
-+	/*{ MODKEY|WLR_MODIFIER_SHIFT, XKB_KEY_E,          setxkbrules,    {.i = +1} },*/
- 	TAGKEYS(          XKB_KEY_1, XKB_KEY_exclam,                     0),
- 	TAGKEYS(          XKB_KEY_2, XKB_KEY_at,                         1),
- 	TAGKEYS(          XKB_KEY_3, XKB_KEY_numbersign,                 2),
-diff --git a/dwl.c b/dwl.c
-index a2711f6..a2413e9 100644
---- a/dwl.c
-+++ b/dwl.c
-@@ -249,6 +249,7 @@ static void arrange(Monitor *m);
- static void arrangelayer(Monitor *m, struct wl_list *list,
- 		struct wlr_box *usable_area, int exclusive);
- static void arrangelayers(Monitor *m);
-+static void assignkeymap(struct wlr_keyboard *keyboard);
- static void axisnotify(struct wl_listener *listener, void *data);
- static void buttonpress(struct wl_listener *listener, void *data);
- static void chvt(const Arg *arg);
-@@ -293,6 +294,7 @@ static void fullscreennotify(struct wl_listener *listener, void *data);
- static void gpureset(struct wl_listener *listener, void *data);
- static void handlesig(int signo);
- static void incnmaster(const Arg *arg);
-+static void incxkbrules(const Arg *arg);
- static void inputdevice(struct wl_listener *listener, void *data);
- static int keybinding(uint32_t mods, xkb_keysym_t sym);
- static void keypress(struct wl_listener *listener, void *data);
-@@ -333,6 +335,7 @@ static void setmon(Client *c, Monitor *m, uint32_t newtags);
- static void setpsel(struct wl_listener *listener, void *data);
- static void setsel(struct wl_listener *listener, void *data);
- static void setup(void);
-+static void setxkbrules(const Arg *arg);
- static void spawn(const Arg *arg);
- static void startdrag(struct wl_listener *listener, void *data);
- static void tag(const Arg *arg);
-@@ -404,6 +407,7 @@ static struct wl_listener lock_listener = {.notify = locksession};
- 
- static struct wlr_seat *seat;
- static KeyboardGroup *kb_group;
-+static unsigned int kblayout = 0;
- static unsigned int cursor_mode;
- static Client *grabc;
- static int grabcx, grabcy; /* client-relative */
-@@ -580,6 +584,20 @@ arrangelayers(Monitor *m)
- 	}
- }
- 
-+void
-+assignkeymap(struct wlr_keyboard *keyboard) {
-+	struct xkb_context *context = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
-+	struct xkb_keymap *keymap = xkb_keymap_new_from_names(context, &xkb_rules[kblayout],
-+					XKB_KEYMAP_COMPILE_NO_FLAGS);
-+
-+	if (!keymap)
-+		die("failed to compile keymap");
-+
-+	wlr_keyboard_set_keymap(keyboard, keymap);
-+	xkb_keymap_unref(keymap);
-+	xkb_context_unref(context);
-+}
-+
- void
- axisnotify(struct wl_listener *listener, void *data)
- {
-@@ -885,21 +903,11 @@ KeyboardGroup *
- createkeyboardgroup(void)
- {
- 	KeyboardGroup *group = ecalloc(1, sizeof(*group));
--	struct xkb_context *context;
--	struct xkb_keymap *keymap;
- 
- 	group->wlr_group = wlr_keyboard_group_create();
- 	group->wlr_group->data = group;
- 
--	/* Prepare an XKB keymap and assign it to the keyboard group. */
--	context = xkb_context_new(XKB_CONTEXT_NO_FLAGS);
--	if (!(keymap = xkb_keymap_new_from_names(context, &xkb_rules,
--				XKB_KEYMAP_COMPILE_NO_FLAGS)))
--		die("failed to compile keymap");
--
--	wlr_keyboard_set_keymap(&group->wlr_group->keyboard, keymap);
--	xkb_keymap_unref(keymap);
--	xkb_context_unref(context);
-+	assignkeymap(&group->wlr_group->keyboard);
- 
- 	wlr_keyboard_set_repeat_info(&group->wlr_group->keyboard, repeat_rate, repeat_delay);
- 
-@@ -1524,6 +1532,13 @@ incnmaster(const Arg *arg)
- 	arrange(selmon);
- }
- 
-+void
-+incxkbrules(const Arg *arg)
-+{
-+	kblayout = (kblayout + arg->i) % LENGTH(xkb_rules);
-+	assignkeymap(&kb_group->wlr_group->keyboard);
-+}
-+
- void
- inputdevice(struct wl_listener *listener, void *data)
- {
-@@ -2645,6 +2660,13 @@ setup(void)
- #endif
- }
- 
-+void
-+setxkbrules(const Arg *arg)
-+{
-+	kblayout = arg->i;
-+	assignkeymap(&kb_group->wlr_group->keyboard);
-+}
-+
- void
- spawn(const Arg *arg)
- {
--- 
-2.48.1
-