hyprwm/wlroots-hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/wlroots-hyprland.git synced 2024-11-25 22:25:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

keyboard: add support for resetting the keymap

Browse source
This commit is contained in:
Simon Ser 2023-05-10 20:56:28 +02:00
parent e725f234d7
commit e2647c5151
1 changed files with 22 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
types/wlr_keyboard.c
View file

@ -137,6 +137,20 @@ void wlr_keyboard_init(struct wlr_keyboard *kb,
kb->repeat_info.delay = 600; kb->repeat_info.delay = 600;
} }
static void keyboard_unset_keymap(struct wlr_keyboard *kb) {
xkb_keymap_unref(kb->keymap);
kb->keymap = NULL;
xkb_state_unref(kb->xkb_state);
kb->xkb_state = NULL;
free(kb->keymap_string);
kb->keymap_string = NULL;
kb->keymap_size = 0;
if (kb->keymap_fd >= 0) {
close(kb->keymap_fd);
}
kb->keymap_fd = -1;
}
void wlr_keyboard_finish(struct wlr_keyboard *kb) { void wlr_keyboard_finish(struct wlr_keyboard *kb) {
/* Release pressed keys */ /* Release pressed keys */
size_t orig_num_keycodes = kb->num_keycodes; size_t orig_num_keycodes = kb->num_keycodes;
@ -153,13 +167,7 @@ void wlr_keyboard_finish(struct wlr_keyboard *kb) {
wlr_input_device_finish(&kb->base); wlr_input_device_finish(&kb->base);
/* Finish xkbcommon resources */ keyboard_unset_keymap(kb);
xkb_state_unref(kb->xkb_state);
xkb_keymap_unref(kb->keymap);
free(kb->keymap_string);
if (kb->keymap_fd >= 0) {
close(kb->keymap_fd);
}
} }
void wlr_keyboard_led_update(struct wlr_keyboard *kb, uint32_t leds) { void wlr_keyboard_led_update(struct wlr_keyboard *kb, uint32_t leds) {
@ -175,6 +183,12 @@ void wlr_keyboard_led_update(struct wlr_keyboard *kb, uint32_t leds) {
} }
bool wlr_keyboard_set_keymap(struct wlr_keyboard *kb, struct xkb_keymap *keymap) { bool wlr_keyboard_set_keymap(struct wlr_keyboard *kb, struct xkb_keymap *keymap) {
if (keymap == NULL) {
keyboard_unset_keymap(kb);
wl_signal_emit_mutable(&kb->events.keymap, kb);
return true;
}
struct xkb_state *xkb_state = xkb_state_new(kb->keymap); struct xkb_state *xkb_state = xkb_state_new(kb->keymap);
if (xkb_state == NULL) { if (xkb_state == NULL) {
wlr_log(WLR_ERROR, "Failed to create XKB state"); wlr_log(WLR_ERROR, "Failed to create XKB state");
@ -205,16 +219,11 @@ bool wlr_keyboard_set_keymap(struct wlr_keyboard *kb, struct xkb_keymap *keymap)
memcpy(dst, keymap_str, keymap_size); memcpy(dst, keymap_str, keymap_size);
munmap(dst, keymap_size); munmap(dst, keymap_size);
xkb_keymap_unref(kb->keymap); keyboard_unset_keymap(kb);
kb->keymap = xkb_keymap_ref(keymap); kb->keymap = xkb_keymap_ref(keymap);
xkb_state_unref(kb->xkb_state);
kb->xkb_state = xkb_state; kb->xkb_state = xkb_state;
free(kb->keymap_string);
kb->keymap_string = keymap_str; kb->keymap_string = keymap_str;
kb->keymap_size = keymap_size; kb->keymap_size = keymap_size;
if (kb->keymap_fd >= 0) {
close(kb->keymap_fd);
}
kb->keymap_fd = ro_fd; kb->keymap_fd = ro_fd;
const char *led_names[WLR_LED_COUNT] = { const char *led_names[WLR_LED_COUNT] = {