diff options
| author | Tony Crisci <tony@dubstepdish.com> | 2017-10-24 07:28:04 -0400 |
|---|---|---|
| committer | Tony Crisci <tony@dubstepdish.com> | 2017-10-24 07:57:36 -0400 |
| commit | 1dbe31493708790f6fafb4c9da8d24cbb3fa07b9 (patch) | |
| tree | 42e7dbbe8b77403aa00983befc256f7b7a7742ca /include/backend/wayland.h | |
| parent | 6fcac087fe1d7b7fa3cd0628a6b7818d26222678 (diff) | |
| parent | 1b7918f50e8b22cbaba978c695b7cc5921125c55 (diff) | |
Merge branch 'master' into feature/data-device-selection
Diffstat (limited to 'include/backend/wayland.h')
| -rw-r--r-- | include/backend/wayland.h | 9 |
1 files changed, 5 insertions, 4 deletions
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 { |