From 97359bcccc89afc804a6ae3112b0e03b9cc3e9a5 Mon Sep 17 00:00:00 2001
From: A Frederick Christensen <dwl@ivories.org>
Date: Sun, 13 Sep 2026 19:42:36 -0500
Subject: [PATCH] numlock-capslock: update filename structure and add version

---
 patches/numlock-capslock/README.md            |  5 +-
 ...k-0.8.patch => numlock-capslock_0.8.patch} |  0
 .../numlock-capslock_main-5fd19fe.patch       | 66 +++++++++++++++++++
 ...mlock-capslock_wlroots-next-f4249db.patch} |  0
 4 files changed, 69 insertions(+), 2 deletions(-)
 rename patches/numlock-capslock/{numlock-capslock-0.8.patch => numlock-capslock_0.8.patch} (100%)
 create mode 100644 patches/numlock-capslock/numlock-capslock_main-5fd19fe.patch
 rename patches/numlock-capslock/{numlock-capslock-wlroots-next-f4249db.patch => numlock-capslock_wlroots-next-f4249db.patch} (100%)

diff --git a/patches/numlock-capslock/README.md b/patches/numlock-capslock/README.md
index c1ba717..2815f93 100644
--- a/patches/numlock-capslock/README.md
+++ b/patches/numlock-capslock/README.md
@@ -2,8 +2,9 @@
 Allows activating numlock or capslock at startup.
 
 ### Download
-- [numlock-capslock-wlroots-next-f4249db.patch](/dwl/dwl-patches/raw/branch/main/patches/numlock-capslock/numlock-capslock-wlroots-next-f4249db.patch)
-- [numlock-capslock-0.8.patch](/dwl/dwl-patches/raw/branch/main/patches/numlock-capslock/numlock-capslock-0.8.patch)
+- [numlock-capslock_main-5fd19fe.patch](/dwl/dwl-patches/raw/branch/main/patches/numlock-capslock/numlock-capslock_main-5fd19fe.patch)
+- [numlock-capslock_wlroots-next-f4249db.patch](/dwl/dwl-patches/raw/branch/main/patches/numlock-capslock/numlock-capslock_wlroots-next-f4249db.patch)
+- [numlock-capslock_0.8.patch](/dwl/dwl-patches/raw/branch/main/patches/numlock-capslock/numlock-capslock_0.8.patch)
 
 ### Authors
 - [fauxmight](https://codeberg.org/fauxmight)
diff --git a/patches/numlock-capslock/numlock-capslock-0.8.patch b/patches/numlock-capslock/numlock-capslock_0.8.patch
similarity index 100%
rename from patches/numlock-capslock/numlock-capslock-0.8.patch
rename to patches/numlock-capslock/numlock-capslock_0.8.patch
diff --git a/patches/numlock-capslock/numlock-capslock_main-5fd19fe.patch b/patches/numlock-capslock/numlock-capslock_main-5fd19fe.patch
new file mode 100644
index 0000000..c78b354
--- /dev/null
+++ b/patches/numlock-capslock/numlock-capslock_main-5fd19fe.patch
@@ -0,0 +1,66 @@
+diff --git a/config.def.h b/config.def.h
+index 572984b..5dae6d3 100644
+--- a/config.def.h
++++ b/config.def.h
+@@ -56,6 +56,10 @@ static const struct xkb_rule_names xkb_rules = {
+ 	.options = NULL,
+ };
+ 
++/* numlock and capslock */
++static const int numlock = 1;
++static const int capslock = 0;
++
+ static const int repeat_rate = 25;
+ static const int repeat_delay = 600;
+ 
+diff --git a/dwl.c b/dwl.c
+index f902ace..7023cab 100644
+--- a/dwl.c
++++ b/dwl.c
+@@ -14,6 +14,7 @@
+ #include <wayland-server-core.h>
+ #include <wlr/backend.h>
+ #include <wlr/backend/libinput.h>
++#include <wlr/interfaces/wlr_keyboard.h>
+ #include <wlr/render/allocator.h>
+ #include <wlr/render/wlr_renderer.h>
+ #include <wlr/types/wlr_alpha_modifier_v1.h>
+@@ -373,6 +374,7 @@ static void zoom(const Arg *arg);
+ /* variables */
+ static pid_t child_pid = -1;
+ static int locked;
++static uint32_t locked_mods = 0;
+ static void *exclusive_focus;
+ static struct wl_display *dpy;
+ static struct wl_event_loop *event_loop;
+@@ -1019,6 +1021,8 @@ createkeyboard(struct wlr_keyboard *keyboard)
+ 	/* Set the keymap to match the group keymap */
+ 	wlr_keyboard_set_keymap(keyboard, kb_group->wlr_group->keyboard.keymap);
+ 
++	wlr_keyboard_notify_modifiers(keyboard, 0, 0, locked_mods, 0);
++
+ 	/* Add the new keyboard to the group */
+ 	wlr_keyboard_group_add_keyboard(kb_group->wlr_group, keyboard);
+ }
+@@ -1040,6 +1044,21 @@ createkeyboardgroup(void)
+ 		die("failed to compile keymap");
+ 
+ 	wlr_keyboard_set_keymap(&group->wlr_group->keyboard, keymap);
++	if (numlock) {
++		xkb_mod_index_t mod_index = xkb_keymap_mod_get_index(keymap, XKB_MOD_NAME_NUM);
++		if (mod_index != XKB_MOD_INVALID)
++			locked_mods |= (uint32_t)1 << mod_index;
++	}
++
++	if (capslock) {
++		xkb_mod_index_t mod_index = xkb_keymap_mod_get_index(keymap, XKB_MOD_NAME_CAPS);
++		if (mod_index != XKB_MOD_INVALID)
++			locked_mods |= (uint32_t)1 << mod_index;
++	}
++
++	if (locked_mods)
++		wlr_keyboard_notify_modifiers(&group->wlr_group->keyboard, 0, 0, locked_mods, 0);
++
+ 	xkb_keymap_unref(keymap);
+ 	xkb_context_unref(context);
+ 
diff --git a/patches/numlock-capslock/numlock-capslock-wlroots-next-f4249db.patch b/patches/numlock-capslock/numlock-capslock_wlroots-next-f4249db.patch
similarity index 100%
rename from patches/numlock-capslock/numlock-capslock-wlroots-next-f4249db.patch
rename to patches/numlock-capslock/numlock-capslock_wlroots-next-f4249db.patch