Upgrade for wlroots surface refactoring

See [1] for details. [1]: https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/3412
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 /include
parent: build: fix building with basu (diff)
download: sway-d6f8820a8b7190a2ce76a0f140e1514e2c32dd50.tar.gz
sway-d6f8820a8b7190a2ce76a0f140e1514e2c32dd50.tar.zst
sway-d6f8820a8b7190a2ce76a0f140e1514e2c32dd50.zip
7 files changed, 7 insertions, 7 deletions
diff --git a/include/sway/desktop.h b/include/sway/desktop.h
index c969a76b..7f2f5b3e 100644
--- a/include/sway/desktop.h
+++ b/include/sway/desktop.h
@@ -1,4 +1,4 @@
-#include <wlr/types/wlr_surface.h>
+#include <wlr/types/wlr_compositor.h>
 struct sway_container;
 struct sway_view;
diff --git a/include/sway/input/cursor.h b/include/sway/input/cursor.h
index 7d66e699..853f8838 100644
--- a/include/sway/input/cursor.h
+++ b/include/sway/input/cursor.h
@@ -4,7 +4,7 @@
 #include <stdint.h>
 #include <wlr/types/wlr_pointer_constraints_v1.h>
 #include <wlr/types/wlr_pointer_gestures_v1.h>
-#include <wlr/types/wlr_surface.h>
+#include <wlr/types/wlr_compositor.h>
 #include "sway/input/seat.h"
 #include "config.h"
diff --git a/include/sway/input/text_input.h b/include/sway/input/text_input.h
index 37744266..c70fd935 100644
--- a/include/sway/input/text_input.h
+++ b/include/sway/input/text_input.h
@@ -3,7 +3,7 @@
 #include <wlr/types/wlr_text_input_v3.h>
 #include <wlr/types/wlr_input_method_v2.h>
-#include <wlr/types/wlr_surface.h>
+#include <wlr/types/wlr_compositor.h>
 #include "sway/input/seat.h"
 /**
diff --git a/include/sway/layers.h b/include/sway/layers.h
index 14816861..f8508493 100644
--- a/include/sway/layers.h
+++ b/include/sway/layers.h
@@ -1,7 +1,7 @@
 #ifndef _SWAY_LAYERS_H
 #define _SWAY_LAYERS_H
 #include <stdbool.h>
-#include <wlr/types/wlr_surface.h>
+#include <wlr/types/wlr_compositor.h>
 #include <wlr/types/wlr_layer_shell_v1.h>
 enum layer_parent {
diff --git a/include/sway/surface.h b/include/sway/surface.h
index 4da96c02..fb1cd775 100644
--- a/include/sway/surface.h
+++ b/include/sway/surface.h
@@ -1,6 +1,6 @@
 #ifndef _SWAY_SURFACE_H
 #define _SWAY_SURFACE_H
-#include <wlr/types/wlr_surface.h>
+#include <wlr/types/wlr_compositor.h>
 struct sway_surface {
        struct wlr_surface *wlr_surface;
diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h
index 05761150..a5f74de9 100644
--- a/include/sway/tree/container.h
+++ b/include/sway/tree/container.h
@@ -2,7 +2,7 @@
 #define _SWAY_CONTAINER_H
 #include <stdint.h>
 #include <sys/types.h>
-#include <wlr/types/wlr_surface.h>
+#include <wlr/types/wlr_compositor.h>
 #include "list.h"
 #include "sway/tree/node.h"
diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h
index 008361f7..789a67c0 100644
--- a/include/sway/tree/view.h
+++ b/include/sway/tree/view.h
@@ -1,7 +1,7 @@
 #ifndef _SWAY_VIEW_H
 #define _SWAY_VIEW_H
 #include <wayland-server-core.h>
-#include <wlr/types/wlr_surface.h>
+#include <wlr/types/wlr_compositor.h>
 #include "config.h"
 #if HAVE_XWAYLAND
 #include <wlr/xwayland.h>
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 /include
parent	build: fix building with basu (diff)
download	sway-d6f8820a8b7190a2ce76a0f140e1514e2c32dd50.tar.gz sway-d6f8820a8b7190a2ce76a0f140e1514e2c32dd50.tar.zst sway-d6f8820a8b7190a2ce76a0f140e1514e2c32dd50.zip

diff --git a/include/sway/desktop.h b/include/sway/desktop.h index c969a76b..7f2f5b3e 100644 --- a/include/sway/desktop.h +++ b/include/sway/desktop.h
@@ -1,4 +1,4 @@
1	#include <wlr/types/wlr_surface.h>	1	#include <wlr/types/wlr_compositor.h>
2		2
3	struct sway_container;	3	struct sway_container;
4	struct sway_view;	4	struct sway_view;


diff --git a/include/sway/input/cursor.h b/include/sway/input/cursor.h index 7d66e699..853f8838 100644 --- a/include/sway/input/cursor.h +++ b/include/sway/input/cursor.h
@@ -4,7 +4,7 @@
4	#include <stdint.h>	4	#include <stdint.h>
5	#include <wlr/types/wlr_pointer_constraints_v1.h>	5	#include <wlr/types/wlr_pointer_constraints_v1.h>
6	#include <wlr/types/wlr_pointer_gestures_v1.h>	6	#include <wlr/types/wlr_pointer_gestures_v1.h>
7	#include <wlr/types/wlr_surface.h>	7	#include <wlr/types/wlr_compositor.h>
8	#include "sway/input/seat.h"	8	#include "sway/input/seat.h"
9	#include "config.h"	9	#include "config.h"
10		10


diff --git a/include/sway/input/text_input.h b/include/sway/input/text_input.h index 37744266..c70fd935 100644 --- a/include/sway/input/text_input.h +++ b/include/sway/input/text_input.h
@@ -3,7 +3,7 @@
3		3
4	#include <wlr/types/wlr_text_input_v3.h>	4	#include <wlr/types/wlr_text_input_v3.h>
5	#include <wlr/types/wlr_input_method_v2.h>	5	#include <wlr/types/wlr_input_method_v2.h>
6	#include <wlr/types/wlr_surface.h>	6	#include <wlr/types/wlr_compositor.h>
7	#include "sway/input/seat.h"	7	#include "sway/input/seat.h"
8		8
9	/**	9	/**


diff --git a/include/sway/layers.h b/include/sway/layers.h index 14816861..f8508493 100644 --- a/include/sway/layers.h +++ b/include/sway/layers.h
@@ -1,7 +1,7 @@
1	#ifndef _SWAY_LAYERS_H	1	#ifndef _SWAY_LAYERS_H
2	#define _SWAY_LAYERS_H	2	#define _SWAY_LAYERS_H
3	#include <stdbool.h>	3	#include <stdbool.h>
4	#include <wlr/types/wlr_surface.h>	4	#include <wlr/types/wlr_compositor.h>
5	#include <wlr/types/wlr_layer_shell_v1.h>	5	#include <wlr/types/wlr_layer_shell_v1.h>
6		6
7	enum layer_parent {	7	enum layer_parent {


diff --git a/include/sway/surface.h b/include/sway/surface.h index 4da96c02..fb1cd775 100644 --- a/include/sway/surface.h +++ b/include/sway/surface.h
@@ -1,6 +1,6 @@
1	#ifndef _SWAY_SURFACE_H	1	#ifndef _SWAY_SURFACE_H
2	#define _SWAY_SURFACE_H	2	#define _SWAY_SURFACE_H
3	#include <wlr/types/wlr_surface.h>	3	#include <wlr/types/wlr_compositor.h>
4		4
5	struct sway_surface {	5	struct sway_surface {
6	struct wlr_surface *wlr_surface;	6	struct wlr_surface *wlr_surface;


diff --git a/include/sway/tree/container.h b/include/sway/tree/container.h index 05761150..a5f74de9 100644 --- a/include/sway/tree/container.h +++ b/include/sway/tree/container.h
@@ -2,7 +2,7 @@
2	#define _SWAY_CONTAINER_H	2	#define _SWAY_CONTAINER_H
3	#include <stdint.h>	3	#include <stdint.h>
4	#include <sys/types.h>	4	#include <sys/types.h>
5	#include <wlr/types/wlr_surface.h>	5	#include <wlr/types/wlr_compositor.h>
6	#include "list.h"	6	#include "list.h"
7	#include "sway/tree/node.h"	7	#include "sway/tree/node.h"
8		8


diff --git a/include/sway/tree/view.h b/include/sway/tree/view.h index 008361f7..789a67c0 100644 --- a/include/sway/tree/view.h +++ b/include/sway/tree/view.h
@@ -1,7 +1,7 @@
1	#ifndef _SWAY_VIEW_H	1	#ifndef _SWAY_VIEW_H
2	#define _SWAY_VIEW_H	2	#define _SWAY_VIEW_H
3	#include <wayland-server-core.h>	3	#include <wayland-server-core.h>
4	#include <wlr/types/wlr_surface.h>	4	#include <wlr/types/wlr_compositor.h>
5	#include "config.h"	5	#include "config.h"
6	#if HAVE_XWAYLAND	6	#if HAVE_XWAYLAND
7	#include <wlr/xwayland.h>	7	#include <wlr/xwayland.h>