diff options
| author | Simon Ser <contact@emersion.fr> | 2022-01-13 11:15:39 +0100 |
|---|---|---|
| committer | Kirill Primak <vyivel@eclair.cafe> | 2022-01-13 14:01:37 +0300 |
| commit | d6f8820a8b7190a2ce76a0f140e1514e2c32dd50 (patch) | |
| tree | e59e41a785297697c9e8fef7f1a8b1e90efc1699 /sway | |
| parent | dbaf2e4fdb327f05f792b69430fe6f893fc9d879 (diff) | |
Upgrade for wlroots surface refactoring
See [1] for details.
[1]: https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/3412
Diffstat (limited to 'sway')
| -rw-r--r-- | sway/desktop/layer_shell.c | 1 | ||||
| -rw-r--r-- | sway/desktop/output.c | 2 | ||||
| -rw-r--r-- | sway/desktop/render.c | 2 | ||||
| -rw-r--r-- | sway/desktop/surface.c | 2 | ||||
| -rw-r--r-- | sway/server.c | 3 | ||||
| -rw-r--r-- | sway/tree/container.c | 1 | ||||
| -rw-r--r-- | sway/tree/view.c | 1 |
7 files changed, 9 insertions, 3 deletions
diff --git a/sway/desktop/layer_shell.c b/sway/desktop/layer_shell.c index 27e457f1..1250415e 100644 --- a/sway/desktop/layer_shell.c +++ b/sway/desktop/layer_shell.c @@ -5,6 +5,7 @@ #include <wlr/types/wlr_layer_shell_v1.h> #include <wlr/types/wlr_output_damage.h> #include <wlr/types/wlr_output.h> +#include <wlr/types/wlr_subcompositor.h> #include "log.h" #include "sway/desktop/transaction.h" #include "sway/input/cursor.h" diff --git a/sway/desktop/output.c b/sway/desktop/output.c index 68f095c0..852671d2 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c @@ -14,7 +14,7 @@ #include <wlr/types/wlr_output_layout.h> #include <wlr/types/wlr_output.h> #include <wlr/types/wlr_presentation_time.h> -#include <wlr/types/wlr_surface.h> +#include <wlr/types/wlr_compositor.h> #include <wlr/util/region.h> #include "config.h" #include "log.h" diff --git a/sway/desktop/render.c b/sway/desktop/render.c index c088c936..02397c05 100644 --- a/sway/desktop/render.c +++ b/sway/desktop/render.c @@ -12,7 +12,7 @@ #include <wlr/types/wlr_output_damage.h> #include <wlr/types/wlr_output_layout.h> #include <wlr/types/wlr_output.h> -#include <wlr/types/wlr_surface.h> +#include <wlr/types/wlr_compositor.h> #include <wlr/util/region.h> #include "log.h" #include "config.h" diff --git a/sway/desktop/surface.c b/sway/desktop/surface.c index 767b2045..1d7b536d 100644 --- a/sway/desktop/surface.c +++ b/sway/desktop/surface.c @@ -1,7 +1,7 @@ #define _POSIX_C_SOURCE 200112L #include <stdlib.h> #include <time.h> -#include <wlr/types/wlr_surface.h> +#include <wlr/types/wlr_compositor.h> #include "sway/server.h" #include "sway/surface.h" diff --git a/sway/server.c b/sway/server.c index f50a0987..567e6ae4 100644 --- a/sway/server.c +++ b/sway/server.c @@ -24,6 +24,7 @@ #include <wlr/types/wlr_relative_pointer_v1.h> #include <wlr/types/wlr_screencopy_v1.h> #include <wlr/types/wlr_server_decoration.h> +#include <wlr/types/wlr_subcompositor.h> #include <wlr/types/wlr_tablet_v2.h> #include <wlr/types/wlr_viewporter.h> #include <wlr/types/wlr_xcursor_manager.h> @@ -101,6 +102,8 @@ bool server_init(struct sway_server *server) { wl_signal_add(&server->compositor->events.new_surface, &server->compositor_new_surface); + wlr_subcompositor_create(server->wl_display); + server->data_device_manager = wlr_data_device_manager_create(server->wl_display); diff --git a/sway/tree/container.c b/sway/tree/container.c index 79e04ec0..4756028c 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c @@ -9,6 +9,7 @@ #include <wayland-server-core.h> #include <wlr/types/wlr_linux_dmabuf_v1.h> #include <wlr/types/wlr_output_layout.h> +#include <wlr/types/wlr_subcompositor.h> #include <wlr/render/drm_format_set.h> #include "linux-dmabuf-unstable-v1-protocol.h" #include "cairo_util.h" diff --git a/sway/tree/view.c b/sway/tree/view.c index 1318f5fb..7d9e038d 100644 --- a/sway/tree/view.c +++ b/sway/tree/view.c @@ -6,6 +6,7 @@ #include <wlr/types/wlr_buffer.h> #include <wlr/types/wlr_output_layout.h> #include <wlr/types/wlr_server_decoration.h> +#include <wlr/types/wlr_subcompositor.h> #include <wlr/types/wlr_xdg_decoration_v1.h> #include "config.h" #if HAVE_XWAYLAND |