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

17
backend/session/meson.build
View file

@ -3,5 +3,20 @@ libseat = dependency('libseat',
fallback: 'seatd',
default_options: ['server=disabled', 'man-pages=disabled'],
)
wlr_files += files('session.c', 'dev_udev.c')
wlr_files += files('session.c')
wlr_deps += libseat
# libudev
if get_option('enum-backend') == 'auto'
udev = dependency('libudev', required: false)
if udev.found()
wlr_files += files('dev_udev.c')
wlr_deps += udev
features += { 'udev': true }
endif
elif get_option('enum-backend') == 'udev'
wlr_files += files('dev_udev.c')
wlr_deps += dependency('libudev')
features += { 'udev': true }
endif

10
backend/session/session.c
View file

@ -144,10 +144,12 @@ struct wlr_session *wlr_session_create(struct wl_display *disp) {
goto error_open;
}
#if WLR_HAS_UDEV
if (dev_init(session, disp) == -1) {
wlr_log(WLR_ERROR, "Failed to initialize dev backend");
goto error_session;
}
#endif
session->display = disp;
@ -156,8 +158,10 @@ struct wlr_session *wlr_session_create(struct wl_display *disp) {
return session;
#if WLR_HAS_UDEV
error_session:
libseat_session_finish(session);
#endif
error_open:
free(session);
return NULL;
@ -171,7 +175,9 @@ void wlr_session_destroy(struct wlr_session *session) {
wlr_signal_emit_safe(&session->events.destroy, session);
wl_list_remove(&session->display_destroy.link);
#if WLR_HAS_UDEV
dev_finish(session);
#endif
struct wlr_device *dev, *tmp_dev;
wl_list_for_each_safe(dev, tmp_dev, &session->devices, link) {
@ -293,5 +299,9 @@ ssize_t wlr_session_find_gpus(struct wlr_session *session,
return explicit_find_gpus(session, ret_len, ret, explicit);
}
#if WLR_HAS_UDEV
return dev_find_gpus(session, ret_len, ret);
#endif
return -1;
}