From 1262f1400c6f443a1460e168c7adc25997247cde Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Fri, 9 Jun 2017 11:28:10 -0400 Subject: [PATCH] Initial pass on libinput backend --- backend/CMakeLists.txt | 6 +- backend/libinput/backend.c | 97 ++++++++++++++++++++++++++++++ include/backend/libinput/backend.h | 21 +++++++ include/wlr/session.h | 2 +- include/wlr/session/interface.h | 2 +- session/logind.c | 3 +- 6 files changed, 126 insertions(+), 5 deletions(-) create mode 100644 backend/libinput/backend.c create mode 100644 include/backend/libinput/backend.h diff --git a/backend/CMakeLists.txt b/backend/CMakeLists.txt index 91f0f06e..bca615fb 100644 --- a/backend/CMakeLists.txt +++ b/backend/CMakeLists.txt @@ -9,11 +9,15 @@ add_library(wlr-backend #wayland/registry.c #wayland/wl_seat.c #wayland/wl_output.c + drm/backend.c drm/drm.c - udev.c + + libinput/backend.c + backend.c egl.c + udev.c ) target_link_libraries(wlr-backend diff --git a/backend/libinput/backend.c b/backend/libinput/backend.c new file mode 100644 index 00000000..6142bde3 --- /dev/null +++ b/backend/libinput/backend.c @@ -0,0 +1,97 @@ +#include +#include +#include +#include +#include +#include "backend/udev.h" +#include "backend/libinput/backend.h" +#include "common/log.h" + +static int wlr_libinput_open_restricted(const char *path, + int flags, void *_state) { + struct wlr_backend_state *state = _state; + return wlr_session_open_file(state->session, path); +} + +static void wlr_libinput_close_restricted(int fd, void *_state) { + struct wlr_backend_state *state = _state; + wlr_session_close_file(state->session, fd); +} + +static const struct libinput_interface libinput_impl = { + .open_restricted = wlr_libinput_open_restricted, + .close_restricted = wlr_libinput_close_restricted +}; + +static int wlr_libinput_handle_event(int fd, uint32_t mask, void *_state) { + // TODO + return 0; +} + +static void wlr_libinput_log(struct libinput *libinput, + enum libinput_log_priority priority, const char *fmt, va_list args) { + _wlr_vlog(L_ERROR, fmt, args); +} + +static bool wlr_libinput_backend_init(struct wlr_backend_state *state) { + state->handle = libinput_udev_create_context(&libinput_impl, state, + state->udev->udev); + if (!state->handle) { + return false; + } + + // TODO: Let user customize seat used + if (!libinput_udev_assign_seat(state->handle, "seat0")) { + return false; + } + + // TODO: More sophisticated logging + libinput_log_set_handler(state->handle, wlr_libinput_log); + libinput_log_set_priority(state->handle, LIBINPUT_LOG_PRIORITY_ERROR); + + struct wl_event_loop *event_loop = + wl_display_get_event_loop(state->display); + if (state->input_event) { + wl_event_source_remove(state->input_event); + } + state->input_event = wl_event_loop_add_fd(event_loop, + libinput_get_fd(state->handle), WL_EVENT_READABLE, + wlr_libinput_handle_event, state); + if (!state->input_event) { + return false; + } + return true; +} + +static void wlr_libinput_backend_destroy(struct wlr_backend_state *state) { + // TODO +} + +static struct wlr_backend_impl backend_impl = { + .init = wlr_libinput_backend_init, + .destroy = wlr_libinput_backend_destroy +}; + +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_backend_state *state = calloc(1, sizeof(struct wlr_backend_state)); + if (!state) { + wlr_log(L_ERROR, "Allocation failed: %s", strerror(errno)); + return NULL; + } + + struct wlr_backend *backend = wlr_backend_create(&backend_impl, state); + if (!backend) { + wlr_log(L_ERROR, "Allocation failed: %s", strerror(errno)); + return NULL; + } + + state->backend = backend; + state->session = session; + state->udev = udev; + state->display = display; + + return backend; +} diff --git a/include/backend/libinput/backend.h b/include/backend/libinput/backend.h new file mode 100644 index 00000000..bafe76ed --- /dev/null +++ b/include/backend/libinput/backend.h @@ -0,0 +1,21 @@ +#ifndef _WLR_BACKEND_LIBINPUT_INTERNAL_H +#define _WLR_BACKEND_LIBINPUT_INTERNAL_H +#include +#include +#include +#include +#include "backend/udev.h" + +struct wlr_backend_state { + struct wlr_backend *backend; + struct wlr_session *session; + struct wlr_udev *udev; + struct wl_display *display; + + struct libinput *handle; + struct wl_event_source *input_event; + + list_t *devices; +}; + +#endif diff --git a/include/wlr/session.h b/include/wlr/session.h index bd5a96c0..28ccb526 100644 --- a/include/wlr/session.h +++ b/include/wlr/session.h @@ -22,7 +22,7 @@ struct wlr_session { struct wlr_session *wlr_session_start(struct wl_display *disp); void wlr_session_finish(struct wlr_session *session); int wlr_session_open_file(struct wlr_session *restrict session, - const char *restrict path); + const char *restrict path); void wlr_session_close_file(struct wlr_session *session, int fd); bool wlr_session_change_vt(struct wlr_session *session, int vt); diff --git a/include/wlr/session/interface.h b/include/wlr/session/interface.h index 78256dd6..f75acfa4 100644 --- a/include/wlr/session/interface.h +++ b/include/wlr/session/interface.h @@ -7,7 +7,7 @@ struct session_impl { struct wlr_session *(*start)(struct wl_display *disp); void (*finish)(struct wlr_session *session); int (*open)(struct wlr_session *restrict session, - const char *restrict path); + const char *restrict path); void (*close)(struct wlr_session *session, int fd); bool (*change_vt)(struct wlr_session *session, int vt); }; diff --git a/session/logind.c b/session/logind.c index 6ce7e4c2..73cd70f2 100644 --- a/session/logind.c +++ b/session/logind.c @@ -28,8 +28,7 @@ struct logind_session { }; static int logind_take_device(struct wlr_session *restrict base, - const char *restrict path) { - + const char *restrict path) { struct logind_session *session = wl_container_of(base, session, base); int ret;