diff options
| author | Scott Anderson <ascent12@hotmail.com> | 2017-08-26 14:02:04 +1200 |
|---|---|---|
| committer | Scott Anderson <ascent12@hotmail.com> | 2017-08-26 14:02:04 +1200 |
| commit | fb93628bda0cb7750628e227213a1ddc2ae34be9 (patch) | |
| tree | fbf3e2aa08594ad6f30dfdc51089a5309ad1a597 /backend/libinput/backend.c | |
| parent | 46823152ea5e2d0f888fa25ba6b4b1896e4e89b9 (diff) | |
Merge wlr_udev into wlr_session
Diffstat (limited to 'backend/libinput/backend.c')
| -rw-r--r-- | backend/libinput/backend.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/backend/libinput/backend.c b/backend/libinput/backend.c index 5dd93f47..3d3c90ce 100644 --- a/backend/libinput/backend.c +++ b/backend/libinput/backend.c @@ -4,7 +4,6 @@ #include <wlr/backend/session.h> #include <wlr/backend/interface.h> #include <wlr/util/log.h> -#include "backend/udev.h" #include "backend/libinput.h" static int wlr_libinput_open_restricted(const char *path, @@ -47,7 +46,7 @@ static bool wlr_libinput_backend_start(struct wlr_backend *_backend) { struct wlr_libinput_backend *backend = (struct wlr_libinput_backend *)_backend; wlr_log(L_DEBUG, "Initializing libinput"); backend->libinput_context = libinput_udev_create_context(&libinput_impl, backend, - backend->udev->udev); + backend->session->udev); if (!backend->libinput_context) { wlr_log(L_ERROR, "Failed to create libinput context"); return false; @@ -139,8 +138,8 @@ static void session_signal(struct wl_listener *listener, void *data) { } struct wlr_backend *wlr_libinput_backend_create(struct wl_display *display, - struct wlr_session *session, struct wlr_udev *udev) { - assert(display && session && udev); + struct wlr_session *session) { + assert(display && session); struct wlr_libinput_backend *backend = calloc(1, sizeof(struct wlr_libinput_backend)); if (!backend) { @@ -155,7 +154,6 @@ struct wlr_backend *wlr_libinput_backend_create(struct wl_display *display, } backend->session = session; - backend->udev = udev; backend->display = display; backend->session_signal.notify = session_signal; |