aboutsummaryrefslogtreecommitdiff
path: root/backend/libinput/backend.c
diff options
context:
space:
mode:
authorDrew DeVault <sir@cmpwn.com>2017-06-09 17:31:21 -0400
committerDrew DeVault <sir@cmpwn.com>2017-06-13 08:10:36 -0400
commit0e75d157f52db45a1af350574bd95cccbd09fa57 (patch)
treedfc6134d419cab1798707f6b072c7be6730085dd /backend/libinput/backend.c
parent019fff06be1ad460ac427bea070fbe7a61c09ea8 (diff)
Initialize keyboards from libinput
Diffstat (limited to 'backend/libinput/backend.c')
-rw-r--r--backend/libinput/backend.c13
1 files changed, 5 insertions, 8 deletions
diff --git a/backend/libinput/backend.c b/backend/libinput/backend.c
index f6dce58e..3af08875 100644
--- a/backend/libinput/backend.c
+++ b/backend/libinput/backend.c
@@ -23,7 +23,7 @@ static const struct libinput_interface libinput_impl = {
.close_restricted = wlr_libinput_close_restricted
};
-static int wlr_libinput_handle_event(int fd, uint32_t mask, void *_state) {
+static int wlr_libinput_readable(int fd, uint32_t mask, void *_state) {
struct wlr_backend_state *state = _state;
if (libinput_dispatch(state->libinput) != 0) {
wlr_log(L_ERROR, "Failed to dispatch libinput");
@@ -32,12 +32,7 @@ static int wlr_libinput_handle_event(int fd, uint32_t mask, void *_state) {
}
struct libinput_event *event;
while ((event = libinput_get_event(state->libinput))) {
- struct libinput *context = libinput_event_get_context(event);
- struct libinput_device *device = libinput_event_get_device(event);
- enum libinput_event_type event_type = libinput_event_get_type(event);
- wlr_log(L_DEBUG, "libinput event: %d", event_type);
- (void)device; (void)context;
- // TODO: dispatch event
+ wlr_libinput_event(state, event);
}
return 0;
}
@@ -73,7 +68,7 @@ static bool wlr_libinput_backend_init(struct wlr_backend_state *state) {
}
state->input_event = wl_event_loop_add_fd(event_loop,
libinput_get_fd(state->libinput), WL_EVENT_READABLE,
- wlr_libinput_handle_event, state);
+ wlr_libinput_readable, state);
if (!state->input_event) {
wlr_log(L_ERROR, "Failed to create input event on event loop");
return false;
@@ -112,5 +107,7 @@ struct wlr_backend *wlr_libinput_backend_create(struct wl_display *display,
state->udev = udev;
state->display = display;
+ state->keyboards = list_create();
+
return backend;
}