From 04ac286b053459cb0a6e136adf19efba78a6e3a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Hern=C3=A1ndez=20Hern=C3=A1ndez?= Date: Fri, 7 Jun 2024 15:34:58 -0600 Subject: [PATCH] update numlock-capslock patch 488c815b --- patches/numlock-capslock/README.md | 2 +- .../numlock-capslock/numlock-capslock.patch | 59 ++++++------------- 2 files changed, 20 insertions(+), 41 deletions(-) diff --git a/patches/numlock-capslock/README.md b/patches/numlock-capslock/README.md index 4023edb..45173ad 100644 --- a/patches/numlock-capslock/README.md +++ b/patches/numlock-capslock/README.md @@ -3,7 +3,7 @@ Allows activating numlock or capslock at startup ### Download - [git branch](https://codeberg.org/sevz/dwl/src/branch/numlock-capslock) -- [2023-11-25](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/numlock-capslock/numlock-capslock.patch) +- [2024-06-07](https://codeberg.org/dwl/dwl-patches/raw/branch/main/patches/numlock-capslock/numlock-capslock.patch) ### Authors - [sevz](https://codeberg.org/sevz) diff --git a/patches/numlock-capslock/numlock-capslock.patch b/patches/numlock-capslock/numlock-capslock.patch index eb4ccda..8371c11 100644 --- a/patches/numlock-capslock/numlock-capslock.patch +++ b/patches/numlock-capslock/numlock-capslock.patch @@ -1,6 +1,6 @@ -From f8761928cc1eb5c9c694cf43cf6442579ea40150 Mon Sep 17 00:00:00 2001 +From 488c815beb51352138e51e885ba7967222156450 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Leonardo=20Hern=C3=A1ndez=20Hern=C3=A1ndez?= - + Date: Sun, 4 Apr 2021 19:56:09 -0500 Subject: [PATCH] add option to enable numlock/capslock MIME-Version: 1.0 @@ -10,14 +10,14 @@ Content-Transfer-Encoding: 8bit Signed-off-by: Leonardo Hernández Hernández --- config.def.h | 4 ++++ - dwl.c | 31 ++++++++++++++++++++++++++----- - 2 files changed, 30 insertions(+), 5 deletions(-) + dwl.c | 19 +++++++++++++++++++ + 2 files changed, 23 insertions(+) diff --git a/config.def.h b/config.def.h -index a8ed61d..87f91d7 100644 +index a784eb4f..04792167 100644 --- a/config.def.h +++ b/config.def.h -@@ -56,6 +56,10 @@ static const struct xkb_rule_names xkb_rules = { +@@ -57,6 +57,10 @@ static const struct xkb_rule_names xkb_rules = { .options = NULL, }; @@ -29,7 +29,7 @@ index a8ed61d..87f91d7 100644 static const int repeat_delay = 600; diff --git a/dwl.c b/dwl.c -index 10d5a5b..962748b 100644 +index 6f041a0d..7da38ce1 100644 --- a/dwl.c +++ b/dwl.c @@ -13,6 +13,7 @@ @@ -40,7 +40,7 @@ index 10d5a5b..962748b 100644 #include #include #include -@@ -336,6 +337,7 @@ static void zoom(const Arg *arg); +@@ -355,6 +356,7 @@ static void zoom(const Arg *arg); static const char broken[] = "broken"; static pid_t child_pid = -1; static int locked; @@ -48,34 +48,19 @@ index 10d5a5b..962748b 100644 static void *exclusive_focus; static struct wl_display *dpy; static struct wlr_backend *backend; -@@ -768,6 +770,8 @@ createkeyboard(struct wlr_keyboard *keyboard) - wlr_keyboard_set_keymap(keyboard, kb_group.wlr_group->keyboard.keymap); - wlr_keyboard_set_repeat_info(keyboard, repeat_rate, repeat_delay); +@@ -806,6 +808,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); + wlr_keyboard_group_add_keyboard(kb_group->wlr_group, keyboard); } -@@ -2354,13 +2358,9 @@ setup(void) - XKB_KEYMAP_COMPILE_NO_FLAGS))) +@@ -827,6 +831,21 @@ createkeyboardgroup(void) die("failed to compile keymap"); -+ wlr_seat_set_keyboard(seat, &kb_group.wlr_group->keyboard); - wlr_keyboard_set_keymap(&kb_group.wlr_group->keyboard, keymap); - wlr_keyboard_set_keymap(&vkb_group.wlr_group->keyboard, keymap); -- xkb_keymap_unref(keymap); -- xkb_context_unref(context); -- -- wlr_keyboard_set_repeat_info(&kb_group.wlr_group->keyboard, repeat_rate, repeat_delay); -- wlr_keyboard_set_repeat_info(&vkb_group.wlr_group->keyboard, repeat_rate, repeat_delay); - - /* Set up listeners for keyboard events */ - LISTEN(&kb_group.wlr_group->keyboard.events.key, &kb_group.key, keypress); -@@ -2368,6 +2368,27 @@ setup(void) - LISTEN(&vkb_group.wlr_group->keyboard.events.key, &vkb_group.key, keypress); - LISTEN(&vkb_group.wlr_group->keyboard.events.modifiers, &vkb_group.modifiers, keypressmod); - + 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) @@ -89,17 +74,11 @@ index 10d5a5b..962748b 100644 + } + + if (locked_mods) -+ wlr_keyboard_notify_modifiers(&kb_group.wlr_group->keyboard, 0, 0, locked_mods, 0); ++ wlr_keyboard_notify_modifiers(&group->wlr_group->keyboard, 0, 0, locked_mods, 0); + -+ xkb_keymap_unref(keymap); -+ xkb_context_unref(context); -+ -+ wlr_keyboard_set_repeat_info(&kb_group.wlr_group->keyboard, repeat_rate, repeat_delay); -+ wlr_keyboard_set_repeat_info(&vkb_group.wlr_group->keyboard, repeat_rate, repeat_delay); -+ - kb_group.key_repeat_source = wl_event_loop_add_timer( - wl_display_get_event_loop(dpy), keyrepeat, &kb_group); - vkb_group.key_repeat_source = wl_event_loop_add_timer( + xkb_keymap_unref(keymap); + xkb_context_unref(context); + -- -2.43.0 +2.45.2