From cd61fac9cb6e9d0172e2f7a01e6a514d676ba5f0 Mon Sep 17 00:00:00 2001 From: Nikita Ivanov Date: Tue, 4 Feb 2025 23:53:11 +0100 Subject: [PATCH] Always use the English keymap to get keycodes --- dwl.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/dwl.c b/dwl.c index def2562..c299365 100644 --- a/dwl.c +++ b/dwl.c @@ -413,6 +413,11 @@ static struct wlr_box sgeom; static struct wl_list mons; static Monitor *selmon; +static const struct xkb_rule_names en_rules = {.layout = "us"}; +static struct xkb_context *en_context; +static struct xkb_keymap *en_keymap; +static struct xkb_state *en_state; + #ifdef XWAYLAND static void activatex11(struct wl_listener *listener, void *data); static void associatex11(struct wl_listener *listener, void *data); @@ -694,6 +699,9 @@ cleanup(void) wlr_backend_destroy(backend); wl_display_destroy(dpy); + xkb_state_unref(en_state); + xkb_keymap_unref(en_keymap); + xkb_context_unref(en_context); /* Destroy after the wayland display (when the monitors are already destroyed) to avoid destroying them with an invalid scene output. */ wlr_scene_node_destroy(&scene->tree.node); @@ -1582,16 +1590,19 @@ keypress(struct wl_listener *listener, void *data) /* This event is raised when a key is pressed or released. */ KeyboardGroup *group = wl_container_of(listener, group, key); struct wlr_keyboard_key_event *event = data; + int nsyms, handled; /* Translate libinput keycode -> xkbcommon */ uint32_t keycode = event->keycode + 8; /* Get a list of keysyms based on the keymap for this keyboard */ const xkb_keysym_t *syms; - int nsyms = xkb_state_key_get_syms( - group->wlr_group->keyboard.xkb_state, keycode, &syms); - - int handled = 0; uint32_t mods = wlr_keyboard_get_modifiers(&group->wlr_group->keyboard); + xkb_state_update_key(en_state, keycode, + (event->state == WL_KEYBOARD_KEY_STATE_PRESSED) + ? XKB_KEY_DOWN : XKB_KEY_UP); + nsyms = xkb_state_key_get_syms(en_state, keycode, &syms); + + handled = 0; wlr_idle_notifier_v1_notify_activity(idle_notifier, seat); @@ -2607,6 +2618,10 @@ setup(void) * pointer, touch, and drawing tablet device. We also rig up a listener to * let us know when new input devices are available on the backend. */ + en_context = xkb_context_new(XKB_CONTEXT_NO_FLAGS); + en_keymap = xkb_keymap_new_from_names(en_context, &en_rules, + XKB_KEYMAP_COMPILE_NO_FLAGS); + en_state = xkb_state_new(en_keymap); LISTEN_STATIC(&backend->events.new_input, inputdevice); virtual_keyboard_mgr = wlr_virtual_keyboard_manager_v1_create(dpy); LISTEN_STATIC(&virtual_keyboard_mgr->events.new_virtual_keyboard, virtualkeyboard); -- 2.48.1