mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-03 09:01:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

virtual_keyboard: Require keymap before accepting keycodes

Browse source
This commit is contained in:
Dorota Czaplejewicz 2019-06-24 13:59:03 +00:00 • committed by Simon Ser
parent 46dc4100d6
commit 0b1f9439ba
2 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/wlr/types/wlr_virtual_keyboard_v1.h
View file

@ -30,6 +30,7 @@ struct wlr_virtual_keyboard_v1 {
struct wl_resource *resource; struct wl_resource *resource;
struct wlr_input_device input_device; struct wlr_input_device input_device;
struct wlr_seat *seat; struct wlr_seat *seat;
bool has_keymap;
struct wl_list link; struct wl_list link;

13
types/wlr_virtual_keyboard_v1.c
View file

@ -61,6 +61,7 @@ static void virtual_keyboard_keymap(struct wl_client *client,
goto keymap_fail; goto keymap_fail;
} }
wlr_keyboard_set_keymap(keyboard->input_device.keyboard, keymap); wlr_keyboard_set_keymap(keyboard->input_device.keyboard, keymap);
keyboard->has_keymap = true;
xkb_keymap_unref(keymap); xkb_keymap_unref(keymap);
xkb_context_unref(context); xkb_context_unref(context);
return; return;
@ -76,6 +77,12 @@ static void virtual_keyboard_key(struct wl_client *client,
uint32_t state) { uint32_t state) {
struct wlr_virtual_keyboard_v1 *keyboard = struct wlr_virtual_keyboard_v1 *keyboard =
virtual_keyboard_from_resource(resource); virtual_keyboard_from_resource(resource);
if (!keyboard->has_keymap) {
wl_resource_post_error(resource,
ZWP_VIRTUAL_KEYBOARD_V1_ERROR_NO_KEYMAP,
"Cannot send a keypress before defining a keymap");
return;
}
struct wlr_event_keyboard_key event = { struct wlr_event_keyboard_key event = {
.time_msec = time, .time_msec = time,
.keycode = key, .keycode = key,
@ -90,6 +97,12 @@ static void virtual_keyboard_modifiers(struct wl_client *client,
uint32_t mods_latched, uint32_t mods_locked, uint32_t group) { uint32_t mods_latched, uint32_t mods_locked, uint32_t group) {
struct wlr_virtual_keyboard_v1 *keyboard = struct wlr_virtual_keyboard_v1 *keyboard =
virtual_keyboard_from_resource(resource); virtual_keyboard_from_resource(resource);
if (!keyboard->has_keymap) {
wl_resource_post_error(resource,
ZWP_VIRTUAL_KEYBOARD_V1_ERROR_NO_KEYMAP,
"Cannot send a modifier state before defining a keymap");
return;
}
wlr_keyboard_notify_modifiers(keyboard->input_device.keyboard, wlr_keyboard_notify_modifiers(keyboard->input_device.keyboard,
mods_depressed, mods_latched, mods_locked, group); mods_depressed, mods_latched, mods_locked, group);
} }