mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2026-04-22 06:47:12 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

backend/libinput/backend.c, backend/libinput/tablet_pad.c, backend/libinput/tablet_tool.c, backend/session/session.c: make udev optional

Browse source
This commit is contained in:
illiliti 2022-03-13 22:45:09 +03:00
parent 68652158b7
commit 3468395cba
8 changed files with 65 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

22
backend/libinput/backend.c
View file

@ -5,10 +5,16 @@
#include <wlr/backend/interface.h>
#include <wlr/backend/session.h>
#include <wlr/util/log.h>
#include <wlr/config.h>
#include "backend/libinput.h"
#include "backend/session/dev_udev.h"
#include "util/signal.h"
#if WLR_HAS_UDEV
#include "backend/session/dev_udev.h"
#endif
#define NETLINK_BITMASK 4
static struct wlr_libinput_backend *get_libinput_backend_from_backend(
struct wlr_backend *wlr_backend) {
assert(wlr_backend_is_libinput(wlr_backend));
@ -87,15 +93,29 @@ static bool backend_start(struct wlr_backend *wlr_backend) {
get_libinput_backend_from_backend(wlr_backend);
wlr_log(WLR_DEBUG, "Starting libinput backend");
#if WLR_HAS_UDEV
backend->libinput_context = libinput_udev_create_context(&libinput_impl,
backend, backend->session->dev->udev);
#elif defined(__linux__)
backend->libinput_context = libinput_netlink_create_context(&libinput_impl,
backend, NETLINK_BITMASK);
#else
#error Unsupported platform
#endif
if (!backend->libinput_context) {
wlr_log(WLR_ERROR, "Failed to create libinput context");
return false;
}
#if WLR_HAS_UDEV
if (libinput_udev_assign_seat(backend->libinput_context,
backend->session->seat) != 0) {
#elif defined(__linux__)
if (libinput_netlink_assign_seat(backend->libinput_context,
backend->session->seat) != 0) {
#else
#error Unsupported platform
#endif
wlr_log(WLR_ERROR, "Failed to assign libinput seat");
return false;
}

8
backend/libinput/tablet_pad.c
View file

@ -3,12 +3,16 @@
#include <string.h>
#include <libinput.h>
#include <stdlib.h>
#include <libudev.h>
#include <wlr/interfaces/wlr_tablet_pad.h>
#include <wlr/util/log.h>
#include <wlr/config.h>
#include "backend/libinput.h"
#include "util/signal.h"
#if WLR_HAS_UDEV
#include <libudev.h>
#endif
const struct wlr_tablet_pad_impl libinput_tablet_pad_impl = {
.name = "libinput-tablet-pad",
};
@ -107,9 +111,11 @@ void init_device_tablet_pad(struct wlr_libinput_input_device *dev) {
wlr_tablet_pad->strip_count =
libinput_device_tablet_pad_get_num_strips(handle);
#if WLR_HAS_UDEV
struct udev_device *udev = libinput_device_get_udev_device(handle);
char **dst = wl_array_add(&wlr_tablet_pad->paths, sizeof(char *));
*dst = strdup(udev_device_get_syspath(udev));
#endif
int groups = libinput_device_tablet_pad_get_num_mode_groups(handle);
for (int i = 0; i < groups; ++i) {

8
backend/libinput/tablet_tool.c
View file

@ -3,12 +3,16 @@
#include <assert.h>
#include <libinput.h>
#include <stdlib.h>
#include <libudev.h>
#include <wlr/interfaces/wlr_tablet_tool.h>
#include <wlr/util/log.h>
#include <wlr/config.h>
#include "backend/libinput.h"
#include "util/signal.h"
#if WLR_HAS_UDEV
#include <libudev.h>
#endif
struct tablet_tool {
struct wlr_tablet_tool wlr_tool;
struct libinput_tablet_tool *handle;
@ -29,9 +33,11 @@ void init_device_tablet(struct wlr_libinput_input_device *dev) {
libinput_device_get_size(dev->handle, &wlr_tablet->width_mm,
&wlr_tablet->height_mm);
#if WLR_HAS_UDEV
struct udev_device *udev = libinput_device_get_udev_device(dev->handle);
char **dst = wl_array_add(&wlr_tablet->paths, sizeof(char *));
*dst = strdup(udev_device_get_syspath(udev));
#endif
wl_list_init(&dev->tablet_tools);
}