diff --git a/README.org b/README.org index 0c174c9..1f1dc8f 100644 --- a/README.org +++ b/README.org @@ -11,6 +11,7 @@ - [[#auto-start][Auto Start]] - [[#foreign-toplevel-management][Foreign Toplevel Management]] - [[#natural-scroll-trackpad][Natural Scroll Trackpad]] + - [[#numlock-capslock][Numlock Capslock]] - [[#per-tag][Per Tag]] - [[#restore-monitor][Restore Monitor]] - [[#vanity-gaps][Vanity Gaps]] @@ -91,6 +92,14 @@ Set natural scrolling only for trackpads. #define NATURALSCROLLTRACKPAD_PATCH 1 #+END_SRC +** [[https://codeberg.org/dwl/dwl-patches/src/branch/main/patches/numlock-capslock][Numlock Capslock]] + +Allows activating numlock or capslock at startup. + +#+BEGIN_SRC c :tangle patches.def.h +#define NUMLOCK_CAPSLOCK_PATCH 1 +#+END_SRC + ** [[https://codeberg.org/dwl/dwl-patches/src/branch/main/patches/pertag][Per Tag]] Makes layout, mwfact and nmaster individual for every tag. @@ -258,6 +267,12 @@ static const struct xkb_rule_names xkb_rules = { .options = NULL, }; +#if NUMLOCK_CAPSLOCK_PATCH +/* numlock and capslock */ +static const int numlock = 1; +static const int capslock = 0; +#endif // NUMLOCK_CAPSLOCK_PATCH + static const int repeat_rate = 25; static const int repeat_delay = 600; #+END_SRC diff --git a/config.def.h b/config.def.h index fda51a4..a8910dc 100644 --- a/config.def.h +++ b/config.def.h @@ -73,6 +73,12 @@ static const struct xkb_rule_names xkb_rules = { .options = NULL, }; +#if NUMLOCK_CAPSLOCK_PATCH +/* numlock and capslock */ +static const int numlock = 1; +static const int capslock = 0; +#endif // NUMLOCK_CAPSLOCK_PATCH + static const int repeat_rate = 25; static const int repeat_delay = 600; diff --git a/config.h b/config.h index eca130f..c64f281 100644 --- a/config.h +++ b/config.h @@ -92,6 +92,12 @@ static const struct xkb_rule_names xkb_rules = { .options = NULL, }; +#if NUMLOCK_CAPSLOCK_PATCH +/* numlock and capslock */ +static const int numlock = 1; +static const int capslock = 0; +#endif // NUMLOCK_CAPSLOCK_PATCH + static const int repeat_rate = 25; static const int repeat_delay = 600; diff --git a/dwl.c b/dwl.c index 9624bee..d52b2b3 100644 --- a/dwl.c +++ b/dwl.c @@ -15,6 +15,9 @@ #include #include #include +#if NUMLOCK_CAPSLOCK_PATCH +#include +#endif // NUMLOCK_CAPSLOCK_PATCH #include #include #include @@ -417,6 +420,9 @@ static void ffullscreennotify(struct wl_listener *listener, void *data); static const char broken[] = "broken"; static pid_t child_pid = -1; static int locked; +#if NUMLOCK_CAPSLOCK_PATCH +static uint32_t locked_mods = 0; +#endif // NUMLOCK_CAPSLOCK_PATCH static void *exclusive_focus; static struct wl_display *dpy; static struct wl_event_loop *event_loop; @@ -1009,6 +1015,10 @@ createkeyboard(struct wlr_keyboard *keyboard) /* Set the keymap to match the group keymap */ wlr_keyboard_set_keymap(keyboard, kb_group->wlr_group->keyboard.keymap); +#if NUMLOCK_CAPSLOCK_PATCH + wlr_keyboard_notify_modifiers(keyboard, 0, 0, locked_mods, 0); +#endif // NUMLOCK_CAPSLOCK_PATCH + /* Add the new keyboard to the group */ wlr_keyboard_group_add_keyboard(kb_group->wlr_group, keyboard); } @@ -1030,6 +1040,23 @@ createkeyboardgroup(void) die("failed to compile keymap"); wlr_keyboard_set_keymap(&group->wlr_group->keyboard, keymap); +#if NUMLOCK_CAPSLOCK_PATCH + 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); +#endif // NUMLOCK_CAPSLOCK_PATCH + xkb_keymap_unref(keymap); xkb_context_unref(context); diff --git a/patches.def.h b/patches.def.h index 6143c6f..cc19fb3 100644 --- a/patches.def.h +++ b/patches.def.h @@ -6,6 +6,8 @@ #define NATURALSCROLLTRACKPAD_PATCH 1 +#define NUMLOCK_CAPSLOCK_PATCH 1 + #define PERTAG_PATCH 1 #define RESTORE_MONITOR_PATCH 1 diff --git a/patches/numlock-capslock-0.7.patch b/patches/numlock-capslock-0.7.patch new file mode 100644 index 0000000..7b30be3 --- /dev/null +++ b/patches/numlock-capslock-0.7.patch @@ -0,0 +1,84 @@ +From cbacfb5031b91bc6677b0fb7c07dbe79cc2e0177 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 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Signed-off-by: Leonardo Hernández Hernández +--- + config.def.h | 4 ++++ + dwl.c | 19 +++++++++++++++++++ + 2 files changed, 23 insertions(+) + +diff --git a/config.def.h b/config.def.h +index 22d2171d..21dc6201 100644 +--- a/config.def.h ++++ b/config.def.h +@@ -60,6 +60,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 a2711f67..a11f0bcf 100644 +--- a/dwl.c ++++ b/dwl.c +@@ -14,6 +14,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -360,6 +361,7 @@ static void zoom(const Arg *arg); + static const char broken[] = "broken"; + 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; +@@ -877,6 +879,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); + } +@@ -898,6 +902,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.46.0 +