mirror of
https://codeberg.org/dwl/dwl-patches.git
synced 2025-10-28 02:34:22 +00:00
update numlock-capslock patch
488c815b
This commit is contained in:
parent
17b7dc6494
commit
04ac286b05
@ -3,7 +3,7 @@ Allows activating numlock or capslock at startup
|
|||||||
|
|
||||||
### Download
|
### Download
|
||||||
- [git branch](https://codeberg.org/sevz/dwl/src/branch/numlock-capslock)
|
- [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
|
### Authors
|
||||||
- [sevz](https://codeberg.org/sevz)
|
- [sevz](https://codeberg.org/sevz)
|
||||||
|
|||||||
@ -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?=
|
From: =?UTF-8?q?Leonardo=20Hern=C3=A1ndez=20Hern=C3=A1ndez?=
|
||||||
<leohdz172@protonmail.com>
|
<leohdz172@proton.me>
|
||||||
Date: Sun, 4 Apr 2021 19:56:09 -0500
|
Date: Sun, 4 Apr 2021 19:56:09 -0500
|
||||||
Subject: [PATCH] add option to enable numlock/capslock
|
Subject: [PATCH] add option to enable numlock/capslock
|
||||||
MIME-Version: 1.0
|
MIME-Version: 1.0
|
||||||
@ -10,14 +10,14 @@ Content-Transfer-Encoding: 8bit
|
|||||||
Signed-off-by: Leonardo Hernández Hernández <leohdz172@proton.me>
|
Signed-off-by: Leonardo Hernández Hernández <leohdz172@proton.me>
|
||||||
---
|
---
|
||||||
config.def.h | 4 ++++
|
config.def.h | 4 ++++
|
||||||
dwl.c | 31 ++++++++++++++++++++++++++-----
|
dwl.c | 19 +++++++++++++++++++
|
||||||
2 files changed, 30 insertions(+), 5 deletions(-)
|
2 files changed, 23 insertions(+)
|
||||||
|
|
||||||
diff --git a/config.def.h b/config.def.h
|
diff --git a/config.def.h b/config.def.h
|
||||||
index a8ed61d..87f91d7 100644
|
index a784eb4f..04792167 100644
|
||||||
--- a/config.def.h
|
--- a/config.def.h
|
||||||
+++ b/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,
|
.options = NULL,
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -29,7 +29,7 @@ index a8ed61d..87f91d7 100644
|
|||||||
static const int repeat_delay = 600;
|
static const int repeat_delay = 600;
|
||||||
|
|
||||||
diff --git a/dwl.c b/dwl.c
|
diff --git a/dwl.c b/dwl.c
|
||||||
index 10d5a5b..962748b 100644
|
index 6f041a0d..7da38ce1 100644
|
||||||
--- a/dwl.c
|
--- a/dwl.c
|
||||||
+++ b/dwl.c
|
+++ b/dwl.c
|
||||||
@@ -13,6 +13,7 @@
|
@@ -13,6 +13,7 @@
|
||||||
@ -40,7 +40,7 @@ index 10d5a5b..962748b 100644
|
|||||||
#include <wlr/render/allocator.h>
|
#include <wlr/render/allocator.h>
|
||||||
#include <wlr/render/wlr_renderer.h>
|
#include <wlr/render/wlr_renderer.h>
|
||||||
#include <wlr/types/wlr_compositor.h>
|
#include <wlr/types/wlr_compositor.h>
|
||||||
@@ -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 const char broken[] = "broken";
|
||||||
static pid_t child_pid = -1;
|
static pid_t child_pid = -1;
|
||||||
static int locked;
|
static int locked;
|
||||||
@ -48,34 +48,19 @@ index 10d5a5b..962748b 100644
|
|||||||
static void *exclusive_focus;
|
static void *exclusive_focus;
|
||||||
static struct wl_display *dpy;
|
static struct wl_display *dpy;
|
||||||
static struct wlr_backend *backend;
|
static struct wlr_backend *backend;
|
||||||
@@ -768,6 +770,8 @@ createkeyboard(struct wlr_keyboard *keyboard)
|
@@ -806,6 +808,8 @@ createkeyboard(struct wlr_keyboard *keyboard)
|
||||||
wlr_keyboard_set_keymap(keyboard, kb_group.wlr_group->keyboard.keymap);
|
/* Set the keymap to match the group keymap */
|
||||||
wlr_keyboard_set_repeat_info(keyboard, repeat_rate, repeat_delay);
|
wlr_keyboard_set_keymap(keyboard, kb_group->wlr_group->keyboard.keymap);
|
||||||
|
|
||||||
+ wlr_keyboard_notify_modifiers(keyboard, 0, 0, locked_mods, 0);
|
+ wlr_keyboard_notify_modifiers(keyboard, 0, 0, locked_mods, 0);
|
||||||
+
|
+
|
||||||
/* Add the new keyboard to the group */
|
/* 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)
|
@@ -827,6 +831,21 @@ createkeyboardgroup(void)
|
||||||
XKB_KEYMAP_COMPILE_NO_FLAGS)))
|
|
||||||
die("failed to compile keymap");
|
die("failed to compile keymap");
|
||||||
|
|
||||||
+ wlr_seat_set_keyboard(seat, &kb_group.wlr_group->keyboard);
|
wlr_keyboard_set_keymap(&group->wlr_group->keyboard, keymap);
|
||||||
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);
|
|
||||||
|
|
||||||
+ if (numlock) {
|
+ if (numlock) {
|
||||||
+ xkb_mod_index_t mod_index = xkb_keymap_mod_get_index(keymap, XKB_MOD_NAME_NUM);
|
+ xkb_mod_index_t mod_index = xkb_keymap_mod_get_index(keymap, XKB_MOD_NAME_NUM);
|
||||||
+ if (mod_index != XKB_MOD_INVALID)
|
+ if (mod_index != XKB_MOD_INVALID)
|
||||||
@ -89,17 +74,11 @@ index 10d5a5b..962748b 100644
|
|||||||
+ }
|
+ }
|
||||||
+
|
+
|
||||||
+ if (locked_mods)
|
+ 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_keymap_unref(keymap);
|
||||||
+ xkb_context_unref(context);
|
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);
|
2.45.2
|
||||||
+
|
|
||||||
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(
|
|
||||||
--
|
|
||||||
2.43.0
|
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user