From fb93628bda0cb7750628e227213a1ddc2ae34be9 Mon Sep 17 00:00:00 2001 From: Scott Anderson Date: Sat, 26 Aug 2017 14:02:04 +1200 Subject: Merge wlr_udev into wlr_session --- include/backend/drm.h | 3 --- include/backend/libinput.h | 2 -- include/backend/multi.h | 2 -- include/backend/udev.h | 29 ----------------------------- include/wlr/backend/drm.h | 3 +-- include/wlr/backend/libinput.h | 3 +-- include/wlr/backend/multi.h | 4 +--- include/wlr/backend/session.h | 11 +++++++++++ include/wlr/backend/udev.h | 9 --------- 9 files changed, 14 insertions(+), 52 deletions(-) delete mode 100644 include/backend/udev.h delete mode 100644 include/wlr/backend/udev.h (limited to 'include') diff --git a/include/backend/drm.h b/include/backend/drm.h index 25bbd1f7..342a980c 100644 --- a/include/backend/drm.h +++ b/include/backend/drm.h @@ -7,7 +7,6 @@ #include #include #include -#include #include #include @@ -16,7 +15,6 @@ #include #include -#include #include "drm-properties.h" struct wlr_drm_plane { @@ -124,7 +122,6 @@ struct wlr_drm_backend { struct wlr_drm_renderer renderer; struct wlr_session *session; - struct wlr_udev *udev; }; enum wlr_drm_output_state { diff --git a/include/backend/libinput.h b/include/backend/libinput.h index e0f762a7..f484ea8d 100644 --- a/include/backend/libinput.h +++ b/include/backend/libinput.h @@ -6,13 +6,11 @@ #include #include #include -#include "backend/udev.h" struct wlr_libinput_backend { struct wlr_backend backend; struct wlr_session *session; - struct wlr_udev *udev; struct wl_display *display; struct libinput *libinput_context; diff --git a/include/backend/multi.h b/include/backend/multi.h index af747332..c7a2198e 100644 --- a/include/backend/multi.h +++ b/include/backend/multi.h @@ -3,7 +3,6 @@ #include #include -#include #include #include @@ -11,7 +10,6 @@ struct wlr_multi_backend { struct wlr_backend backend; struct wlr_session *session; - struct wlr_udev *udev; list_t *backends; }; diff --git a/include/backend/udev.h b/include/backend/udev.h deleted file mode 100644 index 080422c0..00000000 --- a/include/backend/udev.h +++ /dev/null @@ -1,29 +0,0 @@ -#ifndef _WLR_INTERNAL_UDEV_H -#define _WLR_INTERNAL_UDEV_H - -#include -#include -#include -#include -#include - -struct wlr_udev_dev { - dev_t dev; - struct wl_signal invalidate; - - struct wl_list link; -}; - -struct wlr_udev { - struct udev *udev; - struct udev_monitor *mon; - struct wl_event_source *event; - - struct wl_list devices; -}; - -int wlr_udev_find_gpu(struct wlr_udev *udev, struct wlr_session *session); -bool wlr_udev_signal_add(struct wlr_udev *udev, dev_t dev, struct wl_listener *listener); -void wlr_udev_signal_remove(struct wlr_udev *udev, struct wl_listener *listener); - -#endif diff --git a/include/wlr/backend/drm.h b/include/wlr/backend/drm.h index fe1cc5a7..fa63df0a 100644 --- a/include/wlr/backend/drm.h +++ b/include/wlr/backend/drm.h @@ -4,10 +4,9 @@ #include #include #include -#include struct wlr_backend *wlr_drm_backend_create(struct wl_display *display, - struct wlr_session *session, struct wlr_udev *udev, int gpu_fd); + struct wlr_session *session, int gpu_fd); bool wlr_backend_is_drm(struct wlr_backend *backend); diff --git a/include/wlr/backend/libinput.h b/include/wlr/backend/libinput.h index b227a7ad..95b8829d 100644 --- a/include/wlr/backend/libinput.h +++ b/include/wlr/backend/libinput.h @@ -5,11 +5,10 @@ #include #include #include -#include #include struct wlr_backend *wlr_libinput_backend_create(struct wl_display *display, - struct wlr_session *session, struct wlr_udev *udev); + struct wlr_session *session); struct libinput_device *wlr_libinput_get_device_handle(struct wlr_input_device *dev); bool wlr_backend_is_libinput(struct wlr_backend *backend); diff --git a/include/wlr/backend/multi.h b/include/wlr/backend/multi.h index e8e46bed..3fcaaf1e 100644 --- a/include/wlr/backend/multi.h +++ b/include/wlr/backend/multi.h @@ -2,11 +2,9 @@ #define _WLR_BACKEND_MULTI_H #include -#include #include -struct wlr_backend *wlr_multi_backend_create(struct wlr_session *session, - struct wlr_udev *udev); +struct wlr_backend *wlr_multi_backend_create(struct wlr_session *session); void wlr_multi_backend_add(struct wlr_backend *multi, struct wlr_backend *backend); diff --git a/include/wlr/backend/session.h b/include/wlr/backend/session.h index 24854431..fbdc97fc 100644 --- a/include/wlr/backend/session.h +++ b/include/wlr/backend/session.h @@ -3,6 +3,7 @@ #include #include +#include #include struct session_impl; @@ -19,6 +20,12 @@ struct wlr_session { int drm_fd; unsigned vtnr; char seat[8]; + + struct udev *udev; + struct udev_monitor *mon; + struct wl_event_source *udev_event; + + struct wl_list devices; }; /* @@ -57,9 +64,13 @@ int wlr_session_open_file(struct wlr_session *session, const char *path); */ void wlr_session_close_file(struct wlr_session *session, int fd); +void wlr_session_signal_add(struct wlr_session *session, int fd, + struct wl_listener *listener); /* * Changes the virtual terminal. */ bool wlr_session_change_vt(struct wlr_session *session, unsigned vt); +int wlr_session_find_gpu(struct wlr_session *session); + #endif diff --git a/include/wlr/backend/udev.h b/include/wlr/backend/udev.h deleted file mode 100644 index 387a63e6..00000000 --- a/include/wlr/backend/udev.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef _WLR_BACKEND_UDEV_H -#define _WLR_BACKEND_UDEV_H - -struct wlr_udev; - -struct wlr_udev *wlr_udev_create(struct wl_display *display); -void wlr_udev_destroy(struct wlr_udev *udev); - -#endif -- cgit v1.2.3