blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update libinput backend with new state design

This commit is contained in:
Drew DeVault 2017-08-12 13:51:47 -04:00
parent 81cd90297d
commit c95a108d2f
4 changed files with 80 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

100
backend/libinput/backend.c
View File

@ -8,14 +8,14 @@
#include "backend/libinput.h" #include "backend/libinput.h"
static int wlr_libinput_open_restricted(const char *path, static int wlr_libinput_open_restricted(const char *path,
int flags, void *_state) { int flags, void *_backend) {
struct wlr_backend_state *state = _state; struct wlr_libinput_backend *backend = _backend;
return wlr_session_open_file(state->session, path); return wlr_session_open_file(backend->session, path);
} }
static void wlr_libinput_close_restricted(int fd, void *_state) { static void wlr_libinput_close_restricted(int fd, void *_backend) {
struct wlr_backend_state *state = _state; struct wlr_libinput_backend *backend = _backend;
wlr_session_close_file(state->session, fd); wlr_session_close_file(backend->session, fd);
} }
static const struct libinput_interface libinput_impl = { static const struct libinput_interface libinput_impl = {
@ -23,16 +23,16 @@ static const struct libinput_interface libinput_impl = {
.close_restricted = wlr_libinput_close_restricted .close_restricted = wlr_libinput_close_restricted
}; };
static int wlr_libinput_readable(int fd, uint32_t mask, void *_state) { static int wlr_libinput_readable(int fd, uint32_t mask, void *_backend) {
struct wlr_backend_state *state = _state; struct wlr_libinput_backend *backend = _backend;
if (libinput_dispatch(state->libinput) != 0) { if (libinput_dispatch(backend->libinput) != 0) {
wlr_log(L_ERROR, "Failed to dispatch libinput"); wlr_log(L_ERROR, "Failed to dispatch libinput");
// TODO: some kind of abort? // TODO: some kind of abort?
return 0; return 0;
} }
struct libinput_event *event; struct libinput_event *event;
while ((event = libinput_get_event(state->libinput))) { while ((event = libinput_get_event(backend->libinput))) {
wlr_libinput_event(state, event); wlr_libinput_event(backend, event);
libinput_event_destroy(event); libinput_event_destroy(event);
} }
return 0; return 0;
@ -43,34 +43,35 @@ static void wlr_libinput_log(struct libinput *libinput,
_wlr_vlog(L_ERROR, fmt, args); _wlr_vlog(L_ERROR, fmt, args);
} }
static bool wlr_libinput_backend_init(struct wlr_backend_state *state) { static bool wlr_libinput_backend_init(struct wlr_backend *_backend) {
struct wlr_libinput_backend *backend = (struct wlr_libinput_backend *)_backend;
wlr_log(L_DEBUG, "Initializing libinput"); wlr_log(L_DEBUG, "Initializing libinput");
state->libinput = libinput_udev_create_context(&libinput_impl, state, backend->libinput = libinput_udev_create_context(&libinput_impl, backend,
state->udev->udev); backend->udev->udev);
if (!state->libinput) { if (!backend->libinput) {
wlr_log(L_ERROR, "Failed to create libinput context"); wlr_log(L_ERROR, "Failed to create libinput context");
return false; return false;
} }
// TODO: Let user customize seat used // TODO: Let user customize seat used
if (libinput_udev_assign_seat(state->libinput, "seat0") != 0) { if (libinput_udev_assign_seat(backend->libinput, "seat0") != 0) {
wlr_log(L_ERROR, "Failed to assign libinput seat"); wlr_log(L_ERROR, "Failed to assign libinput seat");
return false; return false;
} }
// TODO: More sophisticated logging // TODO: More sophisticated logging
libinput_log_set_handler(state->libinput, wlr_libinput_log); libinput_log_set_handler(backend->libinput, wlr_libinput_log);
libinput_log_set_priority(state->libinput, LIBINPUT_LOG_PRIORITY_ERROR); libinput_log_set_priority(backend->libinput, LIBINPUT_LOG_PRIORITY_ERROR);
struct wl_event_loop *event_loop = struct wl_event_loop *event_loop =
wl_display_get_event_loop(state->display); wl_display_get_event_loop(backend->display);
if (state->input_event) { if (backend->input_event) {
wl_event_source_remove(state->input_event); wl_event_source_remove(backend->input_event);
} }
state->input_event = wl_event_loop_add_fd(event_loop, backend->input_event = wl_event_loop_add_fd(event_loop,
libinput_get_fd(state->libinput), WL_EVENT_READABLE, libinput_get_fd(backend->libinput), WL_EVENT_READABLE,
wlr_libinput_readable, state); wlr_libinput_readable, backend);
if (!state->input_event) { if (!backend->input_event) {
wlr_log(L_ERROR, "Failed to create input event on event loop"); wlr_log(L_ERROR, "Failed to create input event on event loop");
return false; return false;
} }
@ -78,22 +79,23 @@ static bool wlr_libinput_backend_init(struct wlr_backend_state *state) {
return true; return true;
} }
static void wlr_libinput_backend_destroy(struct wlr_backend_state *state) { static void wlr_libinput_backend_destroy(struct wlr_backend *_backend) {
if (!state) { if (!_backend) {
return; return;
} }
for (size_t i = 0; i < state->devices->length; i++) { struct wlr_libinput_backend *backend = (struct wlr_libinput_backend *)_backend;
list_t *wlr_devices = state->devices->items[i]; for (size_t i = 0; i < backend->devices->length; i++) {
list_t *wlr_devices = backend->devices->items[i];
for (size_t j = 0; j < wlr_devices->length; j++) { for (size_t j = 0; j < wlr_devices->length; j++) {
struct wlr_input_device *wlr_device = wlr_devices->items[j]; struct wlr_input_device *wlr_device = wlr_devices->items[j];
wl_signal_emit(&state->backend->events.input_remove, wlr_device); wl_signal_emit(&backend->backend.events.input_remove, wlr_device);
wlr_input_device_destroy(wlr_device); wlr_input_device_destroy(wlr_device);
} }
list_free(wlr_devices); list_free(wlr_devices);
} }
list_free(state->devices); list_free(backend->devices);
libinput_unref(state->libinput); libinput_unref(backend->libinput);
free(state); free(backend);
} }
static struct wlr_backend_impl backend_impl = { static struct wlr_backend_impl backend_impl = {
@ -102,7 +104,7 @@ static struct wlr_backend_impl backend_impl = {
}; };
static void session_signal(struct wl_listener *listener, void *data) { static void session_signal(struct wl_listener *listener, void *data) {
struct wlr_backend_state *backend = wl_container_of(listener, backend, session_signal); struct wlr_libinput_backend *backend = wl_container_of(listener, backend, session_signal);
struct wlr_session *session = data; struct wlr_session *session = data;
if (!backend->libinput) { if (!backend->libinput) {
@ -120,35 +122,27 @@ struct wlr_backend *wlr_libinput_backend_create(struct wl_display *display,
struct wlr_session *session, struct wlr_udev *udev) { struct wlr_session *session, struct wlr_udev *udev) {
assert(display && session && udev); assert(display && session && udev);
struct wlr_backend_state *state = calloc(1, sizeof(struct wlr_backend_state)); struct wlr_libinput_backend *backend = calloc(1, sizeof(struct wlr_libinput_backend));
if (!state) { if (!backend) {
wlr_log(L_ERROR, "Allocation failed: %s", strerror(errno)); wlr_log(L_ERROR, "Allocation failed: %s", strerror(errno));
return NULL; return NULL;
} }
wlr_backend_create(&backend->backend, &backend_impl);
struct wlr_backend *backend = wlr_backend_create(&backend_impl, state); if (!(backend->devices = list_create())) {
if (!backend) {
wlr_log(L_ERROR, "Allocation failed: %s", strerror(errno));
goto error_state;
}
if (!(state->devices = list_create())) {
wlr_log(L_ERROR, "Allocation failed: %s", strerror(errno)); wlr_log(L_ERROR, "Allocation failed: %s", strerror(errno));
goto error_backend; goto error_backend;
} }
state->backend = backend; backend->session = session;
state->session = session; backend->udev = udev;
state->udev = udev; backend->display = display;
state->display = display;
state->session_signal.notify = session_signal; backend->session_signal.notify = session_signal;
wl_signal_add(&session->session_signal, &state->session_signal); wl_signal_add(&session->session_signal, &backend->session_signal);
return backend; return &backend->backend;
error_state:
free(state);
error_backend: error_backend:
wlr_backend_destroy(backend); free(backend);
return NULL; return NULL;
} }

46
backend/libinput/events.c
View File

@ -33,7 +33,7 @@ static struct wlr_input_device_impl input_device_impl = {
}; };
static struct wlr_input_device *allocate_device( static struct wlr_input_device *allocate_device(
struct wlr_backend_state *state, struct libinput_device *device, struct wlr_libinput_backend *backend, struct libinput_device *device,
list_t *devices, enum wlr_input_device_type type) { list_t *devices, enum wlr_input_device_type type) {
int vendor = libinput_device_get_id_vendor(device); int vendor = libinput_device_get_id_vendor(device);
int product = libinput_device_get_id_product(device); int product = libinput_device_get_id_product(device);
@ -49,9 +49,9 @@ static struct wlr_input_device *allocate_device(
return wlr_device; return wlr_device;
} }
static void handle_device_added(struct wlr_backend_state *state, static void handle_device_added(struct wlr_libinput_backend *backend,
struct libinput_device *device) { struct libinput_device *device) {
assert(state && device); assert(backend && device);
/* /*
* Note: the wlr API exposes only devices with a single capability, because * Note: the wlr API exposes only devices with a single capability, because
* that meshes better with how Wayland does things and is a bit simpler. * that meshes better with how Wayland does things and is a bit simpler.
@ -65,34 +65,34 @@ static void handle_device_added(struct wlr_backend_state *state,
wlr_log(L_DEBUG, "Added %s [%d:%d]", name, vendor, product); wlr_log(L_DEBUG, "Added %s [%d:%d]", name, vendor, product);
if (libinput_device_has_capability(device, LIBINPUT_DEVICE_CAP_KEYBOARD)) { if (libinput_device_has_capability(device, LIBINPUT_DEVICE_CAP_KEYBOARD)) {
struct wlr_input_device *wlr_device = allocate_device(state, struct wlr_input_device *wlr_device = allocate_device(backend,
device, devices, WLR_INPUT_DEVICE_KEYBOARD); device, devices, WLR_INPUT_DEVICE_KEYBOARD);
wlr_device->keyboard = wlr_libinput_keyboard_create(device); wlr_device->keyboard = wlr_libinput_keyboard_create(device);
wl_signal_emit(&state->backend->events.input_add, wlr_device); wl_signal_emit(&backend->backend.events.input_add, wlr_device);
} }
if (libinput_device_has_capability(device, LIBINPUT_DEVICE_CAP_POINTER)) { if (libinput_device_has_capability(device, LIBINPUT_DEVICE_CAP_POINTER)) {
struct wlr_input_device *wlr_device = allocate_device(state, struct wlr_input_device *wlr_device = allocate_device(backend,
device, devices, WLR_INPUT_DEVICE_POINTER); device, devices, WLR_INPUT_DEVICE_POINTER);
wlr_device->pointer = wlr_libinput_pointer_create(device); wlr_device->pointer = wlr_libinput_pointer_create(device);
wl_signal_emit(&state->backend->events.input_add, wlr_device); wl_signal_emit(&backend->backend.events.input_add, wlr_device);
} }
if (libinput_device_has_capability(device, LIBINPUT_DEVICE_CAP_TOUCH)) { if (libinput_device_has_capability(device, LIBINPUT_DEVICE_CAP_TOUCH)) {
struct wlr_input_device *wlr_device = allocate_device(state, struct wlr_input_device *wlr_device = allocate_device(backend,
device, devices, WLR_INPUT_DEVICE_TOUCH); device, devices, WLR_INPUT_DEVICE_TOUCH);
wlr_device->touch = wlr_libinput_touch_create(device); wlr_device->touch = wlr_libinput_touch_create(device);
wl_signal_emit(&state->backend->events.input_add, wlr_device); wl_signal_emit(&backend->backend.events.input_add, wlr_device);
} }
if (libinput_device_has_capability(device, LIBINPUT_DEVICE_CAP_TABLET_TOOL)) { if (libinput_device_has_capability(device, LIBINPUT_DEVICE_CAP_TABLET_TOOL)) {
struct wlr_input_device *wlr_device = allocate_device(state, struct wlr_input_device *wlr_device = allocate_device(backend,
device, devices, WLR_INPUT_DEVICE_TABLET_TOOL); device, devices, WLR_INPUT_DEVICE_TABLET_TOOL);
wlr_device->tablet_tool = wlr_libinput_tablet_tool_create(device); wlr_device->tablet_tool = wlr_libinput_tablet_tool_create(device);
wl_signal_emit(&state->backend->events.input_add, wlr_device); wl_signal_emit(&backend->backend.events.input_add, wlr_device);
} }
if (libinput_device_has_capability(device, LIBINPUT_DEVICE_CAP_TABLET_PAD)) { if (libinput_device_has_capability(device, LIBINPUT_DEVICE_CAP_TABLET_PAD)) {
struct wlr_input_device *wlr_device = allocate_device(state, struct wlr_input_device *wlr_device = allocate_device(backend,
device, devices, WLR_INPUT_DEVICE_TABLET_PAD); device, devices, WLR_INPUT_DEVICE_TABLET_PAD);
wlr_device->tablet_pad = wlr_libinput_tablet_pad_create(device); wlr_device->tablet_pad = wlr_libinput_tablet_pad_create(device);
wl_signal_emit(&state->backend->events.input_add, wlr_device); wl_signal_emit(&backend->backend.events.input_add, wlr_device);
} }
if (libinput_device_has_capability(device, LIBINPUT_DEVICE_CAP_GESTURE)) { if (libinput_device_has_capability(device, LIBINPUT_DEVICE_CAP_GESTURE)) {
// TODO // TODO
@ -103,13 +103,13 @@ static void handle_device_added(struct wlr_backend_state *state,
if (devices->length > 0) { if (devices->length > 0) {
libinput_device_set_user_data(device, devices); libinput_device_set_user_data(device, devices);
list_add(state->devices, devices); list_add(backend->devices, devices);
} else { } else {
list_free(devices); list_free(devices);
} }
} }
static void handle_device_removed(struct wlr_backend_state *state, static void handle_device_removed(struct wlr_libinput_backend *backend,
struct libinput_device *device) { struct libinput_device *device) {
list_t *devices = libinput_device_get_user_data(device); list_t *devices = libinput_device_get_user_data(device);
if (!devices) { if (!devices) {
@ -119,31 +119,31 @@ static void handle_device_removed(struct wlr_backend_state *state,
struct wlr_input_device *wlr_device = devices->items[i]; struct wlr_input_device *wlr_device = devices->items[i];
wlr_log(L_DEBUG, "Removing %s [%d:%d]", wlr_device->name, wlr_log(L_DEBUG, "Removing %s [%d:%d]", wlr_device->name,
wlr_device->vendor, wlr_device->product); wlr_device->vendor, wlr_device->product);
wl_signal_emit(&state->backend->events.input_remove, wlr_device); wl_signal_emit(&backend->backend.events.input_remove, wlr_device);
wlr_input_device_destroy(wlr_device); wlr_input_device_destroy(wlr_device);
} }
for (size_t i = 0; i < state->devices->length; i++) { for (size_t i = 0; i < backend->devices->length; i++) {
if (state->devices->items[i] == devices) { if (backend->devices->items[i] == devices) {
list_del(state->devices, i); list_del(backend->devices, i);
break; break;
} }
} }
list_free(devices); list_free(devices);
} }
void wlr_libinput_event(struct wlr_backend_state *state, void wlr_libinput_event(struct wlr_libinput_backend *backend,
struct libinput_event *event) { struct libinput_event *event) {
assert(state && event); assert(backend && event);
struct libinput *context = libinput_event_get_context(event); struct libinput *context = libinput_event_get_context(event);
struct libinput_device *device = libinput_event_get_device(event); struct libinput_device *device = libinput_event_get_device(event);
enum libinput_event_type event_type = libinput_event_get_type(event); enum libinput_event_type event_type = libinput_event_get_type(event);
(void)context; (void)context;
switch (event_type) { switch (event_type) {
case LIBINPUT_EVENT_DEVICE_ADDED: case LIBINPUT_EVENT_DEVICE_ADDED:
handle_device_added(state, device); handle_device_added(backend, device);
break; break;
case LIBINPUT_EVENT_DEVICE_REMOVED: case LIBINPUT_EVENT_DEVICE_REMOVED:
handle_device_removed(state, device); handle_device_removed(backend, device);
break; break;
case LIBINPUT_EVENT_KEYBOARD_KEY: case LIBINPUT_EVENT_KEYBOARD_KEY:
handle_keyboard_key(event, device); handle_keyboard_key(event, device);

14
backend/meson.build
View File

@ -10,13 +10,13 @@ backend_files = files(
#'drm/drm-legacy.c', #'drm/drm-legacy.c',
#'drm/drm-properties.c', #'drm/drm-properties.c',
#'drm/drm-util.c', #'drm/drm-util.c',
#'libinput/backend.c', 'libinput/backend.c',
#'libinput/events.c', 'libinput/events.c',
#'libinput/keyboard.c', 'libinput/keyboard.c',
#'libinput/pointer.c', 'libinput/pointer.c',
#'libinput/tablet_pad.c', 'libinput/tablet_pad.c',
#'libinput/tablet_tool.c', 'libinput/tablet_tool.c',
#'libinput/touch.c', 'libinput/touch.c',
'multi/backend.c', 'multi/backend.c',
'wayland/backend.c', 'wayland/backend.c',
'wayland/output.c', 'wayland/output.c',

4
include/backend/libinput.h
View File

@ -7,7 +7,7 @@
#include <wlr/util/list.h> #include <wlr/util/list.h>
#include "backend/udev.h" #include "backend/udev.h"
struct wlr_libinput_backend_state { struct wlr_libinput_backend {
struct wlr_backend backend; struct wlr_backend backend;
struct wlr_session *session; struct wlr_session *session;
@ -26,7 +26,7 @@ struct wlr_input_device_state {
struct libinput_device *handle; struct libinput_device *handle;
}; };
void wlr_libinput_event(struct wlr_backend_state *state, void wlr_libinput_event(struct wlr_libinput_backend *state,
struct libinput_event *event); struct libinput_event *event);
struct wlr_input_device *get_appropriate_device( struct wlr_input_device *get_appropriate_device(