numlock-capslock: fauxmight adopted abandoned patch and updated for 0.8 and wlroots-next

2026-06-11 10:23:19 +00:00 · 2026-02-25 20:07:02 -06:00
parent e1fa126693
commit d36b83b31e
3 changed files with 25 additions and 35 deletions
@@ -0,0 +1,79 @@
+From d889704df0b5957379c2819111afaeee0301cb8d Mon Sep 17 00:00:00 2001
+From: A Frederick Christensen <dwl@ivories.org>
+Date: Wed, 25 Feb 2026 20:03:14 -0600
+Subject: [PATCH] Apply numlock-capslock patch
+
+---
+ config.def.h |  4 ++++
+ dwl.c        | 19 +++++++++++++++++++
+ 2 files changed, 23 insertions(+)
+
+diff --git a/config.def.h b/config.def.h
+index 8a6eda0..074fb88 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 8a9715d..296e31d 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>
+@@ -357,6 +358,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;
+@@ -945,6 +947,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);
+ }
+@@ -966,6 +970,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);
+ 
+-- 
+2.52.0
+