RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

video/out/wayland_common: set key state only on keyboard_enter keys 

These keys should be considered "being pressed" instead of an action of
press. This way, the keypress action won't be triggered; it now triggers
only when the key binding is repeatable and after the initial ar delay.
This commit is contained in:
nanahi 2024-09-07 08:16:20 -04:00 committed by Dudemanguy
parent c4ff675198
commit e169302e2d
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
video/out/wayland_common.c
View File

@ -204,7 +204,7 @@ static void add_feedback(struct vo_wayland_feedback_pool *fback_pool,
static void apply_keepaspect(struct vo_wayland_state *wl, int *width, int *height); static void apply_keepaspect(struct vo_wayland_state *wl, int *width, int *height);
static void get_shape_device(struct vo_wayland_state *wl, struct vo_wayland_seat *s); static void get_shape_device(struct vo_wayland_state *wl, struct vo_wayland_seat *s);
static void guess_focus(struct vo_wayland_state *wl); static void guess_focus(struct vo_wayland_state *wl);
static void handle_key_input(struct vo_wayland_seat *s, uint32_t key, uint32_t state); static void handle_key_input(struct vo_wayland_seat *s, uint32_t key, uint32_t state, bool no_emit);
static void prepare_resize(struct vo_wayland_state *wl); static void prepare_resize(struct vo_wayland_state *wl);
static void remove_feedback(struct vo_wayland_feedback_pool *fback_pool, static void remove_feedback(struct vo_wayland_feedback_pool *fback_pool,
struct wp_presentation_feedback *fback); struct wp_presentation_feedback *fback);
@ -557,7 +557,7 @@ static void keyboard_handle_key(void *data, struct wl_keyboard *wl_keyboard,
uint32_t state) uint32_t state)
{ {
struct vo_wayland_seat *s = data; struct vo_wayland_seat *s = data;
handle_key_input(s, key, state); handle_key_input(s, key, state, false);
} }
static void keyboard_handle_modifiers(void *data, struct wl_keyboard *wl_keyboard, static void keyboard_handle_modifiers(void *data, struct wl_keyboard *wl_keyboard,
@ -576,8 +576,11 @@ static void keyboard_handle_modifiers(void *data, struct wl_keyboard *wl_keyboar
// Handle keys pressed during the enter event. // Handle keys pressed during the enter event.
if (s->keyboard_entering) { if (s->keyboard_entering) {
s->keyboard_entering = false; s->keyboard_entering = false;
for (int n = 0; n < s->num_keyboard_entering_keys; n++) // Only handle entering keys if only one key is pressed since
handle_key_input(s, s->keyboard_entering_keys[n], WL_KEYBOARD_KEY_STATE_PRESSED); // Wayland doesn't guarantee that these keys are in order.
if (s->num_keyboard_entering_keys == 1)
for (int n = 0; n < s->num_keyboard_entering_keys; n++)
handle_key_input(s, s->keyboard_entering_keys[n], WL_KEYBOARD_KEY_STATE_PRESSED, true);
s->num_keyboard_entering_keys = 0; s->num_keyboard_entering_keys = 0;
} else if (s->xkb_state && s->mpkey) { } else if (s->xkb_state && s->mpkey) {
mp_input_put_key(wl->vo->input_ctx, s->mpkey | MP_KEY_STATE_DOWN | s->mpmod); mp_input_put_key(wl->vo->input_ctx, s->mpkey | MP_KEY_STATE_DOWN | s->mpmod);
@ -1850,7 +1853,7 @@ static int lookupkey(int key)
} }
static void handle_key_input(struct vo_wayland_seat *s, uint32_t key, static void handle_key_input(struct vo_wayland_seat *s, uint32_t key,
uint32_t state) uint32_t state, bool no_emit)
{ {
struct vo_wayland_state *wl = s->wl; struct vo_wayland_state *wl = s->wl;
@ -1865,6 +1868,9 @@ static void handle_key_input(struct vo_wayland_seat *s, uint32_t key,
return; return;
} }
if (no_emit)
state = state | MP_KEY_STATE_SET_ONLY;
s->keyboard_code = key + 8; s->keyboard_code = key + 8;
xkb_keysym_t sym = xkb_state_key_get_one_sym(s->xkb_state, s->keyboard_code); xkb_keysym_t sym = xkb_state_key_get_one_sym(s->xkb_state, s->keyboard_code);
int mpkey = lookupkey(sym); int mpkey = lookupkey(sym);
@ -1879,16 +1885,16 @@ static void handle_key_input(struct vo_wayland_seat *s, uint32_t key,
// Assume a modifier was pressed and handle it in the mod event instead. // Assume a modifier was pressed and handle it in the mod event instead.
// If a modifier is released before a regular key, also release that // If a modifier is released before a regular key, also release that
// key to not activate it again by accident. // key to not activate it again by accident.
if (state == MP_KEY_STATE_UP) { if (state & MP_KEY_STATE_UP) {
s->mpkey = 0; s->mpkey = 0;
mp_input_put_key(wl->vo->input_ctx, MP_INPUT_RELEASE_ALL); mp_input_put_key(wl->vo->input_ctx, MP_INPUT_RELEASE_ALL);
} }
return; return;
} }
} }
if (state == MP_KEY_STATE_DOWN) if (state & MP_KEY_STATE_DOWN)
s->mpkey = mpkey; s->mpkey = mpkey;
if (mpkey && state == MP_KEY_STATE_UP) if (mpkey && (state & MP_KEY_STATE_UP))
s->mpkey = 0; s->mpkey = 0;
} }