diff options
| author | emersion <contact@emersion.fr> | 2017-11-12 22:12:50 +0100 |
|---|---|---|
| committer | emersion <contact@emersion.fr> | 2017-11-12 22:12:50 +0100 |
| commit | f8b43940b1a14e78c5365c9c1d17bfc79f523530 (patch) | |
| tree | ad2aa347b862cc7446a1cc80f5932847e1491fbe /rootston/seat.c | |
| parent | 2e312a7e27fac0ef299abbdf5f66cf164992f02f (diff) | |
| parent | a317ecdab8ef8deb184b72db208794daa4c4a3a0 (diff) | |
Merge branch 'master' into cursor-scale
Diffstat (limited to 'rootston/seat.c')
| -rw-r--r-- | rootston/seat.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/rootston/seat.c b/rootston/seat.c index 3ec6f1b7..6d8dc749 100644 --- a/rootston/seat.c +++ b/rootston/seat.c @@ -1,11 +1,9 @@ -#include <wayland-server.h> +#include <assert.h> #include <stdlib.h> #include <string.h> -#include <assert.h> - +#include <wayland-server.h> #include <wlr/types/wlr_xcursor_manager.h> #include <wlr/util/log.h> - #include "rootston/xcursor.h" #include "rootston/input.h" #include "rootston/seat.h" @@ -298,6 +296,8 @@ static void seat_add_keyboard(struct roots_seat *seat, struct wlr_input_device * keyboard->keyboard_modifiers.notify = handle_keyboard_modifiers; wl_signal_add(&keyboard->device->keyboard->events.modifiers, &keyboard->keyboard_modifiers); + + wlr_seat_set_keyboard(seat->seat, device); } static void seat_add_pointer(struct roots_seat *seat, struct wlr_input_device *device) { |