mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-12-28 08:56:32 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move keyboard logic to wlr_{keyboard,seat}

Browse source
This commit is contained in:
Drew DeVault 2017-09-24 14:12:56 -04:00
parent b84d59403f
commit 61e451ea1b
15 changed files with 257 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

2
backend/libinput/keyboard.c
View file

@ -68,5 +68,5 @@ void handle_keyboard_key(struct libinput_event *event,
wlr_event.state = WLR_KEY_PRESSED;
break;
}
wl_signal_emit(&wlr_dev->keyboard->events.key, &wlr_event);
wlr_keyboard_update_state(wlr_dev->keyboard, &wlr_event);
}

6
backend/wayland/wl_seat.c
View file

@ -128,17 +128,15 @@ static const struct wl_pointer_listener pointer_listener = {
static void keyboard_handle_keymap(void *data, struct wl_keyboard *wl_keyboard,
uint32_t format, int32_t fd, uint32_t size) {
// TODO: set keymap
}
static void keyboard_handle_enter(void *data, struct wl_keyboard *wl_keyboard,
uint32_t serial, struct wl_surface *surface, struct wl_array *keys) {
}
static void keyboard_handle_leave(void *data, struct wl_keyboard *wl_keyboard,
uint32_t serial, struct wl_surface *surface) {
}
static void keyboard_handle_key(void *data, struct wl_keyboard *wl_keyboard,
@ -151,7 +149,7 @@ static void keyboard_handle_key(void *data, struct wl_keyboard *wl_keyboard,
wlr_event.state = state;
wlr_event.time_sec = time / 1000;
wlr_event.time_usec = time * 1000;
wl_signal_emit(&dev->keyboard->events.key, &wlr_event);
wlr_keyboard_update_state(dev->keyboard, &wlr_event);
}
static void keyboard_handle_modifiers(void *data, struct wl_keyboard *wl_keyboard,