|
 |
e54a86 |
From b11dfd761181ab5005fe3f5527faa4faf6b56112 Mon Sep 17 00:00:00 2001
|
|
|
e54a86 |
From: Weng Xuetian <wengxt@gmail.com>
|
|
|
e54a86 |
Date: Tue, 1 Feb 2022 14:43:26 -0800
|
|
|
e54a86 |
Subject: [PATCH 11/11] Only generate key repetition for keys that should
|
|
|
e54a86 |
repeat on wayland.
|
|
|
e54a86 |
|
|
|
e54a86 |
This fix repetition on modifier keys, e.g. Control.
|
|
|
e54a86 |
---
|
|
|
e54a86 |
src/video/wayland/SDL_waylandevents.c | 4 +++-
|
|
|
e54a86 |
src/video/wayland/SDL_waylandsym.h | 1 +
|
|
|
e54a86 |
2 files changed, 4 insertions(+), 1 deletion(-)
|
|
|
e54a86 |
|
|
|
e54a86 |
diff --git a/src/video/wayland/SDL_waylandevents.c b/src/video/wayland/SDL_waylandevents.c
|
|
|
e54a86 |
index 85d4edfc8..55893201b 100644
|
|
|
e54a86 |
--- a/src/video/wayland/SDL_waylandevents.c
|
|
|
e54a86 |
+++ b/src/video/wayland/SDL_waylandevents.c
|
|
|
e54a86 |
@@ -987,7 +987,9 @@ keyboard_handle_key(void *data, struct wl_keyboard *keyboard,
|
|
|
e54a86 |
SDL_SendKeyboardText(text);
|
|
|
e54a86 |
}
|
|
|
e54a86 |
}
|
|
|
e54a86 |
- keyboard_repeat_set(&input->keyboard_repeat, time, scancode, has_text, text);
|
|
|
e54a86 |
+ if (input->xkb.keymap && WAYLAND_xkb_keymap_key_repeats(input->xkb.keymap, key + 8)) {
|
|
|
e54a86 |
+ keyboard_repeat_set(&input->keyboard_repeat, time, scancode, has_text, text);
|
|
|
e54a86 |
+ }
|
|
|
e54a86 |
}
|
|
|
e54a86 |
}
|
|
|
e54a86 |
|
|
|
e54a86 |
diff --git a/src/video/wayland/SDL_waylandsym.h b/src/video/wayland/SDL_waylandsym.h
|
|
|
e54a86 |
index 366ce9e94..fa29bedb1 100644
|
|
|
e54a86 |
--- a/src/video/wayland/SDL_waylandsym.h
|
|
|
e54a86 |
+++ b/src/video/wayland/SDL_waylandsym.h
|
|
|
e54a86 |
@@ -122,6 +122,7 @@ SDL_WAYLAND_SYM(int, xkb_state_key_get_syms, (struct xkb_state *, xkb_keycode_t,
|
|
|
e54a86 |
SDL_WAYLAND_SYM(int, xkb_keysym_to_utf8, (xkb_keysym_t, char *, size_t) )
|
|
|
e54a86 |
SDL_WAYLAND_SYM(struct xkb_keymap *, xkb_keymap_new_from_string, (struct xkb_context *, const char *, enum xkb_keymap_format, enum xkb_keymap_compile_flags))
|
|
|
e54a86 |
SDL_WAYLAND_SYM(struct xkb_state *, xkb_state_new, (struct xkb_keymap *) )
|
|
|
e54a86 |
+SDL_WAYLAND_SYM(int, xkb_keymap_key_repeats, (struct xkb_keymap *keymap, xkb_keycode_t key) );
|
|
|
e54a86 |
SDL_WAYLAND_SYM(void, xkb_keymap_unref, (struct xkb_keymap *) )
|
|
|
e54a86 |
SDL_WAYLAND_SYM(void, xkb_state_unref, (struct xkb_state *) )
|
|
|
e54a86 |
SDL_WAYLAND_SYM(void, xkb_context_unref, (struct xkb_context *) )
|
|
|
e54a86 |
--
|
|
|
e54a86 |
2.34.1
|
|
|
e54a86 |
|