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 | |
parent | build: fix building with basu (diff) | |
download | sway-d6f8820a8b7190a2ce76a0f140e1514e2c32dd50.tar.gz sway-d6f8820a8b7190a2ce76a0f140e1514e2c32dd50.tar.zst sway-d6f8820a8b7190a2ce76a0f140e1514e2c32dd50.zip |
Upgrade for wlroots surface refactoring
See [1] for details.
[1]: https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/3412
-rw-r--r-- | include/sway/desktop.h | 2 | ||||
-rw-r--r-- | include/sway/input/cursor.h | 2 | ||||
-rw-r--r-- | include/sway/input/text_input.h | 2 | ||||
-rw-r--r-- | include/sway/layers.h | 2 | ||||
-rw-r--r-- | include/sway/surface.h | 2 | ||||
-rw-r--r-- | include/sway/tree/container.h | 2 | ||||
-rw-r--r-- | include/sway/tree/view.h | 2 | ||||
-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 |
14 files changed, 16 insertions, 10 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 @@ | |||
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> |
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 @@ | |||
5 | #include <wlr/types/wlr_layer_shell_v1.h> | 5 | #include <wlr/types/wlr_layer_shell_v1.h> |
6 | #include <wlr/types/wlr_output_damage.h> | 6 | #include <wlr/types/wlr_output_damage.h> |
7 | #include <wlr/types/wlr_output.h> | 7 | #include <wlr/types/wlr_output.h> |
8 | #include <wlr/types/wlr_subcompositor.h> | ||
8 | #include "log.h" | 9 | #include "log.h" |
9 | #include "sway/desktop/transaction.h" | 10 | #include "sway/desktop/transaction.h" |
10 | #include "sway/input/cursor.h" | 11 | #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 @@ | |||
14 | #include <wlr/types/wlr_output_layout.h> | 14 | #include <wlr/types/wlr_output_layout.h> |
15 | #include <wlr/types/wlr_output.h> | 15 | #include <wlr/types/wlr_output.h> |
16 | #include <wlr/types/wlr_presentation_time.h> | 16 | #include <wlr/types/wlr_presentation_time.h> |
17 | #include <wlr/types/wlr_surface.h> | 17 | #include <wlr/types/wlr_compositor.h> |
18 | #include <wlr/util/region.h> | 18 | #include <wlr/util/region.h> |
19 | #include "config.h" | 19 | #include "config.h" |
20 | #include "log.h" | 20 | #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 @@ | |||
12 | #include <wlr/types/wlr_output_damage.h> | 12 | #include <wlr/types/wlr_output_damage.h> |
13 | #include <wlr/types/wlr_output_layout.h> | 13 | #include <wlr/types/wlr_output_layout.h> |
14 | #include <wlr/types/wlr_output.h> | 14 | #include <wlr/types/wlr_output.h> |
15 | #include <wlr/types/wlr_surface.h> | 15 | #include <wlr/types/wlr_compositor.h> |
16 | #include <wlr/util/region.h> | 16 | #include <wlr/util/region.h> |
17 | #include "log.h" | 17 | #include "log.h" |
18 | #include "config.h" | 18 | #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 @@ | |||
1 | #define _POSIX_C_SOURCE 200112L | 1 | #define _POSIX_C_SOURCE 200112L |
2 | #include <stdlib.h> | 2 | #include <stdlib.h> |
3 | #include <time.h> | 3 | #include <time.h> |
4 | #include <wlr/types/wlr_surface.h> | 4 | #include <wlr/types/wlr_compositor.h> |
5 | #include "sway/server.h" | 5 | #include "sway/server.h" |
6 | #include "sway/surface.h" | 6 | #include "sway/surface.h" |
7 | 7 | ||
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 @@ | |||
24 | #include <wlr/types/wlr_relative_pointer_v1.h> | 24 | #include <wlr/types/wlr_relative_pointer_v1.h> |
25 | #include <wlr/types/wlr_screencopy_v1.h> | 25 | #include <wlr/types/wlr_screencopy_v1.h> |
26 | #include <wlr/types/wlr_server_decoration.h> | 26 | #include <wlr/types/wlr_server_decoration.h> |
27 | #include <wlr/types/wlr_subcompositor.h> | ||
27 | #include <wlr/types/wlr_tablet_v2.h> | 28 | #include <wlr/types/wlr_tablet_v2.h> |
28 | #include <wlr/types/wlr_viewporter.h> | 29 | #include <wlr/types/wlr_viewporter.h> |
29 | #include <wlr/types/wlr_xcursor_manager.h> | 30 | #include <wlr/types/wlr_xcursor_manager.h> |
@@ -101,6 +102,8 @@ bool server_init(struct sway_server *server) { | |||
101 | wl_signal_add(&server->compositor->events.new_surface, | 102 | wl_signal_add(&server->compositor->events.new_surface, |
102 | &server->compositor_new_surface); | 103 | &server->compositor_new_surface); |
103 | 104 | ||
105 | wlr_subcompositor_create(server->wl_display); | ||
106 | |||
104 | server->data_device_manager = | 107 | server->data_device_manager = |
105 | wlr_data_device_manager_create(server->wl_display); | 108 | wlr_data_device_manager_create(server->wl_display); |
106 | 109 | ||
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 @@ | |||
9 | #include <wayland-server-core.h> | 9 | #include <wayland-server-core.h> |
10 | #include <wlr/types/wlr_linux_dmabuf_v1.h> | 10 | #include <wlr/types/wlr_linux_dmabuf_v1.h> |
11 | #include <wlr/types/wlr_output_layout.h> | 11 | #include <wlr/types/wlr_output_layout.h> |
12 | #include <wlr/types/wlr_subcompositor.h> | ||
12 | #include <wlr/render/drm_format_set.h> | 13 | #include <wlr/render/drm_format_set.h> |
13 | #include "linux-dmabuf-unstable-v1-protocol.h" | 14 | #include "linux-dmabuf-unstable-v1-protocol.h" |
14 | #include "cairo_util.h" | 15 | #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 @@ | |||
6 | #include <wlr/types/wlr_buffer.h> | 6 | #include <wlr/types/wlr_buffer.h> |
7 | #include <wlr/types/wlr_output_layout.h> | 7 | #include <wlr/types/wlr_output_layout.h> |
8 | #include <wlr/types/wlr_server_decoration.h> | 8 | #include <wlr/types/wlr_server_decoration.h> |
9 | #include <wlr/types/wlr_subcompositor.h> | ||
9 | #include <wlr/types/wlr_xdg_decoration_v1.h> | 10 | #include <wlr/types/wlr_xdg_decoration_v1.h> |
10 | #include "config.h" | 11 | #include "config.h" |
11 | #if HAVE_XWAYLAND | 12 | #if HAVE_XWAYLAND |