diff options
Diffstat (limited to 'include/backend')
| -rw-r--r-- | include/backend/drm/drm.h | 10 | ||||
| -rw-r--r-- | include/backend/libinput.h | 4 | ||||
| -rw-r--r-- | include/backend/multi.h | 4 | ||||
| -rw-r--r-- | include/backend/wayland.h | 9 | ||||
| -rw-r--r-- | include/backend/x11.h | 2 |
5 files changed, 15 insertions, 14 deletions
diff --git a/include/backend/drm/drm.h b/include/backend/drm/drm.h index 6106a85a..4d23f963 100644 --- a/include/backend/drm/drm.h +++ b/include/backend/drm/drm.h @@ -8,12 +8,13 @@ #include <xf86drmMode.h> #include <EGL/egl.h> #include <gbm.h> +#include <wayland-util.h> #include <wlr/backend/session.h> #include <wlr/backend/drm.h> #include <wlr/types/wlr_output.h> -#include <wlr/egl.h> -#include <wlr/util/list.h> +#include <wlr/render/egl.h> +#include <wlr/types/wlr_list.h> #include "iface.h" #include "properties.h" @@ -30,7 +31,6 @@ struct wlr_drm_plane { // Only used by cursor float matrix[16]; - struct wlr_renderer *wlr_rend; struct wlr_texture *wlr_tex; struct gbm_bo *cursor_bo; @@ -93,7 +93,7 @@ struct wlr_drm_backend { struct wl_listener session_signal; struct wl_listener drm_invalidated; - list_t *outputs; + struct wl_list outputs; struct wlr_drm_renderer renderer; struct wlr_session *session; @@ -113,7 +113,6 @@ struct wlr_drm_mode { struct wlr_drm_connector { struct wlr_output output; - struct wlr_drm_backend *drm; enum wlr_drm_connector_state state; uint32_t id; @@ -130,6 +129,7 @@ struct wlr_drm_connector { bool pageflip_pending; struct wl_event_source *retry_pageflip; + struct wl_list link; }; bool wlr_drm_check_features(struct wlr_drm_backend *drm); diff --git a/include/backend/libinput.h b/include/backend/libinput.h index bb6083a4..93b859a7 100644 --- a/include/backend/libinput.h +++ b/include/backend/libinput.h @@ -5,7 +5,7 @@ #include <wlr/types/wlr_input_device.h> #include <wlr/backend/interface.h> #include <wlr/interfaces/wlr_input_device.h> -#include <wlr/util/list.h> +#include <wlr/types/wlr_list.h> struct wlr_libinput_backend { struct wlr_backend backend; @@ -18,7 +18,7 @@ struct wlr_libinput_backend { struct wl_listener session_signal; - list_t *wlr_device_lists; + struct wlr_list *wlr_device_lists; }; struct wlr_libinput_input_device { diff --git a/include/backend/multi.h b/include/backend/multi.h index 2c409b3a..82f85016 100644 --- a/include/backend/multi.h +++ b/include/backend/multi.h @@ -3,14 +3,14 @@ #include <wlr/backend/interface.h> #include <wlr/backend/multi.h> -#include <wlr/util/list.h> #include <wlr/backend/session.h> +#include <wayland-util.h> struct wlr_multi_backend { struct wlr_backend backend; struct wlr_session *session; - list_t *backends; + struct wl_list backends; }; #endif diff --git a/include/backend/wayland.h b/include/backend/wayland.h index 508a7f52..e1c89b11 100644 --- a/include/backend/wayland.h +++ b/include/backend/wayland.h @@ -5,11 +5,11 @@ #include <wayland-client.h> #include <wayland-server.h> #include <wayland-egl.h> -#include <wlr/egl.h> +#include <wlr/render/egl.h> #include <wlr/backend/wayland.h> #include <wlr/types/wlr_output.h> #include <wlr/types/wlr_input_device.h> -#include <wlr/util/list.h> +#include <wayland-util.h> struct wlr_wl_backend { struct wlr_backend backend; @@ -17,8 +17,8 @@ struct wlr_wl_backend { /* local state */ bool started; struct wl_display *local_display; - list_t *devices; - list_t *outputs; + struct wl_list devices; + struct wl_list outputs; struct wlr_egl egl; size_t requested_outputs; /* remote state */ @@ -51,6 +51,7 @@ struct wlr_wl_backend_output { uint32_t enter_serial; void *egl_surface; + struct wl_list link; }; struct wlr_wl_input_device { diff --git a/include/backend/x11.h b/include/backend/x11.h index b4284b63..f5ec56bc 100644 --- a/include/backend/x11.h +++ b/include/backend/x11.h @@ -5,7 +5,7 @@ #include <xcb/xcb.h> #include <X11/Xlib-xcb.h> #include <wayland-server.h> -#include <wlr/egl.h> +#include <wlr/render/egl.h> #include <wlr/types/wlr_output.h> #include <wlr/types/wlr_input_device.h> |