diff options
-rw-r--r-- | include/sway/server.h | 17 | ||||
-rw-r--r-- | sway/desktop/layer_shell.c | 3 | ||||
-rw-r--r-- | sway/desktop/output.c | 2 | ||||
-rw-r--r-- | sway/input/cursor.c | 1 | ||||
-rw-r--r-- | sway/lock.c | 1 | ||||
-rw-r--r-- | sway/server.c | 8 | ||||
-rw-r--r-- | sway/tree/container.c | 1 | ||||
-rw-r--r-- | sway/tree/view.c | 2 | ||||
-rw-r--r-- | sway/xdg_activation_v1.c | 1 |
9 files changed, 18 insertions, 18 deletions
diff --git a/include/sway/server.h b/include/sway/server.h index b047e20d..b2eb2c36 100644 --- a/include/sway/server.h +++ b/include/sway/server.h | |||
@@ -2,23 +2,6 @@ | |||
2 | #define _SWAY_SERVER_H | 2 | #define _SWAY_SERVER_H |
3 | #include <stdbool.h> | 3 | #include <stdbool.h> |
4 | #include <wayland-server-core.h> | 4 | #include <wayland-server-core.h> |
5 | #include <wlr/backend.h> | ||
6 | #include <wlr/render/allocator.h> | ||
7 | #include <wlr/render/wlr_renderer.h> | ||
8 | #include <wlr/types/wlr_compositor.h> | ||
9 | #include <wlr/types/wlr_data_device.h> | ||
10 | #include <wlr/types/wlr_ext_foreign_toplevel_list_v1.h> | ||
11 | #include <wlr/types/wlr_input_method_v2.h> | ||
12 | #include <wlr/types/wlr_foreign_toplevel_management_v1.h> | ||
13 | #include <wlr/types/wlr_layer_shell_v1.h> | ||
14 | #include <wlr/types/wlr_output_management_v1.h> | ||
15 | #include <wlr/types/wlr_output_power_management_v1.h> | ||
16 | #include <wlr/types/wlr_presentation_time.h> | ||
17 | #include <wlr/types/wlr_relative_pointer_v1.h> | ||
18 | #include <wlr/types/wlr_session_lock_v1.h> | ||
19 | #include <wlr/types/wlr_server_decoration.h> | ||
20 | #include <wlr/types/wlr_text_input_v3.h> | ||
21 | #include <wlr/types/wlr_xdg_shell.h> | ||
22 | #include "config.h" | 5 | #include "config.h" |
23 | #include "list.h" | 6 | #include "list.h" |
24 | #include "sway/desktop/idle_inhibit_v1.h" | 7 | #include "sway/desktop/idle_inhibit_v1.h" |
diff --git a/sway/desktop/layer_shell.c b/sway/desktop/layer_shell.c index 769d3a86..f0134396 100644 --- a/sway/desktop/layer_shell.c +++ b/sway/desktop/layer_shell.c | |||
@@ -4,7 +4,9 @@ | |||
4 | #include <wayland-server-core.h> | 4 | #include <wayland-server-core.h> |
5 | #include <wlr/types/wlr_layer_shell_v1.h> | 5 | #include <wlr/types/wlr_layer_shell_v1.h> |
6 | #include <wlr/types/wlr_output.h> | 6 | #include <wlr/types/wlr_output.h> |
7 | #include <wlr/types/wlr_scene.h> | ||
7 | #include <wlr/types/wlr_subcompositor.h> | 8 | #include <wlr/types/wlr_subcompositor.h> |
9 | #include <wlr/types/wlr_xdg_shell.h> | ||
8 | #include "log.h" | 10 | #include "log.h" |
9 | #include "sway/scene_descriptor.h" | 11 | #include "sway/scene_descriptor.h" |
10 | #include "sway/desktop/transaction.h" | 12 | #include "sway/desktop/transaction.h" |
@@ -16,7 +18,6 @@ | |||
16 | #include "sway/server.h" | 18 | #include "sway/server.h" |
17 | #include "sway/tree/arrange.h" | 19 | #include "sway/tree/arrange.h" |
18 | #include "sway/tree/workspace.h" | 20 | #include "sway/tree/workspace.h" |
19 | #include <wlr/types/wlr_scene.h> | ||
20 | 21 | ||
21 | struct wlr_layer_surface_v1 *toplevel_layer_surface_from_surface( | 22 | struct wlr_layer_surface_v1 *toplevel_layer_surface_from_surface( |
22 | struct wlr_surface *surface) { | 23 | struct wlr_surface *surface) { |
diff --git a/sway/desktop/output.c b/sway/desktop/output.c index 9c4baafd..81290ccb 100644 --- a/sway/desktop/output.c +++ b/sway/desktop/output.c | |||
@@ -12,6 +12,8 @@ | |||
12 | #include <wlr/types/wlr_gamma_control_v1.h> | 12 | #include <wlr/types/wlr_gamma_control_v1.h> |
13 | #include <wlr/types/wlr_matrix.h> | 13 | #include <wlr/types/wlr_matrix.h> |
14 | #include <wlr/types/wlr_output_layout.h> | 14 | #include <wlr/types/wlr_output_layout.h> |
15 | #include <wlr/types/wlr_output_management_v1.h> | ||
16 | #include <wlr/types/wlr_output_power_management_v1.h> | ||
15 | #include <wlr/types/wlr_output.h> | 17 | #include <wlr/types/wlr_output.h> |
16 | #include <wlr/types/wlr_presentation_time.h> | 18 | #include <wlr/types/wlr_presentation_time.h> |
17 | #include <wlr/types/wlr_compositor.h> | 19 | #include <wlr/types/wlr_compositor.h> |
diff --git a/sway/input/cursor.c b/sway/input/cursor.c index 25fa603e..b00f81a9 100644 --- a/sway/input/cursor.c +++ b/sway/input/cursor.c | |||
@@ -9,6 +9,7 @@ | |||
9 | #include <wlr/types/wlr_cursor.h> | 9 | #include <wlr/types/wlr_cursor.h> |
10 | #include <wlr/types/wlr_cursor_shape_v1.h> | 10 | #include <wlr/types/wlr_cursor_shape_v1.h> |
11 | #include <wlr/types/wlr_pointer.h> | 11 | #include <wlr/types/wlr_pointer.h> |
12 | #include <wlr/types/wlr_relative_pointer_v1.h> | ||
12 | #include <wlr/types/wlr_touch.h> | 13 | #include <wlr/types/wlr_touch.h> |
13 | #include <wlr/types/wlr_tablet_v2.h> | 14 | #include <wlr/types/wlr_tablet_v2.h> |
14 | #include <wlr/types/wlr_tablet_pad.h> | 15 | #include <wlr/types/wlr_tablet_pad.h> |
diff --git a/sway/lock.c b/sway/lock.c index 8ad9c3f6..d267de4f 100644 --- a/sway/lock.c +++ b/sway/lock.c | |||
@@ -1,6 +1,7 @@ | |||
1 | #define _POSIX_C_SOURCE 200809L | 1 | #define _POSIX_C_SOURCE 200809L |
2 | #include <assert.h> | 2 | #include <assert.h> |
3 | #include <wlr/types/wlr_scene.h> | 3 | #include <wlr/types/wlr_scene.h> |
4 | #include <wlr/types/wlr_session_lock_v1.h> | ||
4 | #include "log.h" | 5 | #include "log.h" |
5 | #include "sway/input/cursor.h" | 6 | #include "sway/input/cursor.h" |
6 | #include "sway/input/keyboard.h" | 7 | #include "sway/input/keyboard.h" |
diff --git a/sway/server.c b/sway/server.c index 8b8ccce9..5b389f69 100644 --- a/sway/server.c +++ b/sway/server.c | |||
@@ -8,24 +8,32 @@ | |||
8 | #include <wlr/backend/headless.h> | 8 | #include <wlr/backend/headless.h> |
9 | #include <wlr/backend/multi.h> | 9 | #include <wlr/backend/multi.h> |
10 | #include <wlr/config.h> | 10 | #include <wlr/config.h> |
11 | #include <wlr/render/allocator.h> | ||
11 | #include <wlr/render/wlr_renderer.h> | 12 | #include <wlr/render/wlr_renderer.h> |
12 | #include <wlr/types/wlr_compositor.h> | 13 | #include <wlr/types/wlr_compositor.h> |
13 | #include <wlr/types/wlr_content_type_v1.h> | 14 | #include <wlr/types/wlr_content_type_v1.h> |
14 | #include <wlr/types/wlr_cursor_shape_v1.h> | 15 | #include <wlr/types/wlr_cursor_shape_v1.h> |
15 | #include <wlr/types/wlr_data_control_v1.h> | 16 | #include <wlr/types/wlr_data_control_v1.h> |
17 | #include <wlr/types/wlr_data_device.h> | ||
16 | #include <wlr/types/wlr_drm.h> | 18 | #include <wlr/types/wlr_drm.h> |
17 | #include <wlr/types/wlr_export_dmabuf_v1.h> | 19 | #include <wlr/types/wlr_export_dmabuf_v1.h> |
20 | #include <wlr/types/wlr_ext_foreign_toplevel_list_v1.h> | ||
21 | #include <wlr/types/wlr_foreign_toplevel_management_v1.h> | ||
18 | #include <wlr/types/wlr_fractional_scale_v1.h> | 22 | #include <wlr/types/wlr_fractional_scale_v1.h> |
19 | #include <wlr/types/wlr_gamma_control_v1.h> | 23 | #include <wlr/types/wlr_gamma_control_v1.h> |
20 | #include <wlr/types/wlr_idle_notify_v1.h> | 24 | #include <wlr/types/wlr_idle_notify_v1.h> |
21 | #include <wlr/types/wlr_layer_shell_v1.h> | 25 | #include <wlr/types/wlr_layer_shell_v1.h> |
22 | #include <wlr/types/wlr_linux_dmabuf_v1.h> | 26 | #include <wlr/types/wlr_linux_dmabuf_v1.h> |
27 | #include <wlr/types/wlr_output_management_v1.h> | ||
28 | #include <wlr/types/wlr_output_power_management_v1.h> | ||
23 | #include <wlr/types/wlr_pointer_constraints_v1.h> | 29 | #include <wlr/types/wlr_pointer_constraints_v1.h> |
30 | #include <wlr/types/wlr_presentation_time.h> | ||
24 | #include <wlr/types/wlr_primary_selection_v1.h> | 31 | #include <wlr/types/wlr_primary_selection_v1.h> |
25 | #include <wlr/types/wlr_relative_pointer_v1.h> | 32 | #include <wlr/types/wlr_relative_pointer_v1.h> |
26 | #include <wlr/types/wlr_screencopy_v1.h> | 33 | #include <wlr/types/wlr_screencopy_v1.h> |
27 | #include <wlr/types/wlr_security_context_v1.h> | 34 | #include <wlr/types/wlr_security_context_v1.h> |
28 | #include <wlr/types/wlr_server_decoration.h> | 35 | #include <wlr/types/wlr_server_decoration.h> |
36 | #include <wlr/types/wlr_session_lock_v1.h> | ||
29 | #include <wlr/types/wlr_single_pixel_buffer_v1.h> | 37 | #include <wlr/types/wlr_single_pixel_buffer_v1.h> |
30 | #include <wlr/types/wlr_subcompositor.h> | 38 | #include <wlr/types/wlr_subcompositor.h> |
31 | #include <wlr/types/wlr_tablet_v2.h> | 39 | #include <wlr/types/wlr_tablet_v2.h> |
diff --git a/sway/tree/container.c b/sway/tree/container.c index 30cb97ba..78448090 100644 --- a/sway/tree/container.c +++ b/sway/tree/container.c | |||
@@ -4,6 +4,7 @@ | |||
4 | #include <stdint.h> | 4 | #include <stdint.h> |
5 | #include <stdlib.h> | 5 | #include <stdlib.h> |
6 | #include <wayland-server-core.h> | 6 | #include <wayland-server-core.h> |
7 | #include <wlr/types/wlr_foreign_toplevel_management_v1.h> | ||
7 | #include <wlr/types/wlr_linux_dmabuf_v1.h> | 8 | #include <wlr/types/wlr_linux_dmabuf_v1.h> |
8 | #include <wlr/types/wlr_output_layout.h> | 9 | #include <wlr/types/wlr_output_layout.h> |
9 | #include <wlr/types/wlr_subcompositor.h> | 10 | #include <wlr/types/wlr_subcompositor.h> |
diff --git a/sway/tree/view.c b/sway/tree/view.c index a3ed0af1..5525bf63 100644 --- a/sway/tree/view.c +++ b/sway/tree/view.c | |||
@@ -4,6 +4,8 @@ | |||
4 | #include <wayland-server-core.h> | 4 | #include <wayland-server-core.h> |
5 | #include <wlr/render/wlr_renderer.h> | 5 | #include <wlr/render/wlr_renderer.h> |
6 | #include <wlr/types/wlr_buffer.h> | 6 | #include <wlr/types/wlr_buffer.h> |
7 | #include <wlr/types/wlr_ext_foreign_toplevel_list_v1.h> | ||
8 | #include <wlr/types/wlr_foreign_toplevel_management_v1.h> | ||
7 | #include <wlr/types/wlr_output_layout.h> | 9 | #include <wlr/types/wlr_output_layout.h> |
8 | #include <wlr/types/wlr_server_decoration.h> | 10 | #include <wlr/types/wlr_server_decoration.h> |
9 | #include <wlr/types/wlr_subcompositor.h> | 11 | #include <wlr/types/wlr_subcompositor.h> |
diff --git a/sway/xdg_activation_v1.c b/sway/xdg_activation_v1.c index c26ee19a..47270f73 100644 --- a/sway/xdg_activation_v1.c +++ b/sway/xdg_activation_v1.c | |||
@@ -1,4 +1,5 @@ | |||
1 | #include <wlr/types/wlr_xdg_activation_v1.h> | 1 | #include <wlr/types/wlr_xdg_activation_v1.h> |
2 | #include <wlr/types/wlr_xdg_shell.h> | ||
2 | #include "sway/desktop/launcher.h" | 3 | #include "sway/desktop/launcher.h" |
3 | #include "sway/tree/view.h" | 4 | #include "sway/tree/view.h" |
4 | #include "sway/tree/workspace.h" | 5 | #include "sway/tree/workspace.h" |