diff options
38 files changed, 39 insertions, 22 deletions
diff --git a/examples/fullscreen-shell.c b/examples/fullscreen-shell.c index 5a9d4c92..bc4bb7a8 100644 --- a/examples/fullscreen-shell.c +++ b/examples/fullscreen-shell.c @@ -14,7 +14,6 @@ #include <wlr/types/wlr_matrix.h> #include <wlr/types/wlr_output_layout.h> #include <wlr/types/wlr_output.h> -#include <wlr/types/wlr_surface.h> #include <wlr/util/box.h> #include <wlr/util/log.h> diff --git a/examples/scene-graph.c b/examples/scene-graph.c index bd2003f5..aa542996 100644 --- a/examples/scene-graph.c +++ b/examples/scene-graph.c @@ -13,7 +13,6 @@ #include <wlr/types/wlr_compositor.h> #include <wlr/types/wlr_output.h> #include <wlr/types/wlr_scene.h> -#include <wlr/types/wlr_surface.h> #include <wlr/types/wlr_xdg_shell.h> #include <wlr/util/log.h> diff --git a/include/wlr/types/wlr_layer_shell_v1.h b/include/wlr/types/wlr_layer_shell_v1.h index 79e435a0..370fad83 100644 --- a/include/wlr/types/wlr_layer_shell_v1.h +++ b/include/wlr/types/wlr_layer_shell_v1.h @@ -12,7 +12,7 @@ #include <stdbool.h> #include <stdint.h> #include <wayland-server-core.h> -#include <wlr/types/wlr_surface.h> +#include <wlr/types/wlr_compositor.h> #include "wlr-layer-shell-unstable-v1-protocol.h" /** diff --git a/include/wlr/types/wlr_pointer_gestures_v1.h b/include/wlr/types/wlr_pointer_gestures_v1.h index 0d91a517..b05b1a30 100644 --- a/include/wlr/types/wlr_pointer_gestures_v1.h +++ b/include/wlr/types/wlr_pointer_gestures_v1.h @@ -11,7 +11,8 @@ #include <wayland-server-core.h> #include <wlr/types/wlr_seat.h> -#include <wlr/types/wlr_surface.h> + +struct wlr_surface; struct wlr_pointer_gestures_v1 { struct wl_global *global; diff --git a/include/wlr/types/wlr_scene.h b/include/wlr/types/wlr_scene.h index e0b370ad..7dfccbf9 100644 --- a/include/wlr/types/wlr_scene.h +++ b/include/wlr/types/wlr_scene.h @@ -21,7 +21,7 @@ #include <pixman.h> #include <wayland-server-core.h> -#include <wlr/types/wlr_surface.h> +#include <wlr/types/wlr_compositor.h> struct wlr_output; struct wlr_output_layout; diff --git a/include/wlr/types/wlr_seat.h b/include/wlr/types/wlr_seat.h index 631b7dd3..41f3918b 100644 --- a/include/wlr/types/wlr_seat.h +++ b/include/wlr/types/wlr_seat.h @@ -14,7 +14,8 @@ #include <wlr/types/wlr_input_device.h> #include <wlr/types/wlr_keyboard.h> #include <wlr/types/wlr_pointer.h> -#include <wlr/types/wlr_surface.h> + +struct wlr_surface; #define WLR_SERIAL_RINGSET_SIZE 128 diff --git a/include/wlr/types/wlr_surface.h b/include/wlr/types/wlr_surface.h index 4a6801e8..9612dc08 100644 --- a/include/wlr/types/wlr_surface.h +++ b/include/wlr/types/wlr_surface.h @@ -1,2 +1,4 @@ +#warning "wlr/types/wlr_surface.h has been deprecated and will be removed in the future. Use wlr/types/wlr_compositor.h and wlr/types/wlr_subcompositor.h." + #include <wlr/types/wlr_compositor.h> #include <wlr/types/wlr_subcompositor.h> diff --git a/include/wlr/types/wlr_text_input_v3.h b/include/wlr/types/wlr_text_input_v3.h index c9ee0b22..5bac69a6 100644 --- a/include/wlr/types/wlr_text_input_v3.h +++ b/include/wlr/types/wlr_text_input_v3.h @@ -11,9 +11,10 @@ #include <wayland-server-core.h> #include <wlr/types/wlr_seat.h> -#include <wlr/types/wlr_surface.h> #include <wlr/util/box.h> +struct wlr_surface; + enum wlr_text_input_v3_features { WLR_TEXT_INPUT_V3_FEATURE_SURROUNDING_TEXT = 1 << 0, WLR_TEXT_INPUT_V3_FEATURE_CONTENT_TYPE = 1 << 1, diff --git a/include/wlr/types/wlr_xdg_shell.h b/include/wlr/types/wlr_xdg_shell.h index cf42e82a..8d1a6fce 100644 --- a/include/wlr/types/wlr_xdg_shell.h +++ b/include/wlr/types/wlr_xdg_shell.h @@ -10,6 +10,7 @@ #define WLR_TYPES_WLR_XDG_SHELL_H #include <wayland-server-core.h> +#include <wlr/types/wlr_compositor.h> #include <wlr/types/wlr_seat.h> #include <wlr/util/box.h> #include "xdg-shell-protocol.h" diff --git a/types/data_device/wlr_data_device.c b/types/data_device/wlr_data_device.c index 6cd84ec0..ceaf80e7 100644 --- a/types/data_device/wlr_data_device.c +++ b/types/data_device/wlr_data_device.c @@ -4,6 +4,7 @@ #include <strings.h> #include <unistd.h> #include <wayland-server-core.h> +#include <wlr/types/wlr_compositor.h> #include <wlr/types/wlr_data_device.h> #include <wlr/types/wlr_seat.h> #include <wlr/util/log.h> diff --git a/types/data_device/wlr_drag.c b/types/data_device/wlr_drag.c index 1952dcb8..9865d930 100644 --- a/types/data_device/wlr_drag.c +++ b/types/data_device/wlr_drag.c @@ -4,6 +4,7 @@ #include <strings.h> #include <unistd.h> #include <wayland-server-core.h> +#include <wlr/types/wlr_compositor.h> #include <wlr/types/wlr_data_device.h> #include <wlr/types/wlr_seat.h> #include <wlr/util/log.h> diff --git a/types/output/cursor.c b/types/output/cursor.c index efbf6503..f3055c5c 100644 --- a/types/output/cursor.c +++ b/types/output/cursor.c @@ -3,8 +3,8 @@ #include <stdlib.h> #include <wlr/interfaces/wlr_output.h> #include <wlr/render/wlr_renderer.h> +#include <wlr/types/wlr_compositor.h> #include <wlr/types/wlr_matrix.h> -#include <wlr/types/wlr_surface.h> #include <wlr/util/log.h> #include "render/allocator/allocator.h" #include "render/swapchain.h" diff --git a/types/output/output.c b/types/output/output.c index 85590ab6..0062013f 100644 --- a/types/output/output.c +++ b/types/output/output.c @@ -4,8 +4,8 @@ #include <drm_fourcc.h> #include <stdlib.h> #include <wlr/interfaces/wlr_output.h> +#include <wlr/types/wlr_compositor.h> #include <wlr/types/wlr_matrix.h> -#include <wlr/types/wlr_surface.h> #include <wlr/util/log.h> #include "render/allocator/allocator.h" #include "render/swapchain.h" diff --git a/types/scene/subsurface_tree.c b/types/scene/subsurface_tree.c index bb3c7ff7..8384db8f 100644 --- a/types/scene/subsurface_tree.c +++ b/types/scene/subsurface_tree.c @@ -1,6 +1,7 @@ #include <assert.h> #include <stdlib.h> #include <wlr/types/wlr_scene.h> +#include <wlr/types/wlr_subcompositor.h> #include <wlr/util/addon.h> /** diff --git a/types/scene/wlr_scene.c b/types/scene/wlr_scene.c index a0c06b6b..9353fef5 100644 --- a/types/scene/wlr_scene.c +++ b/types/scene/wlr_scene.c @@ -3,11 +3,11 @@ #include <string.h> #include <wlr/backend.h> #include <wlr/render/wlr_renderer.h> +#include <wlr/types/wlr_compositor.h> #include <wlr/types/wlr_matrix.h> #include <wlr/types/wlr_output_damage.h> #include <wlr/types/wlr_presentation_time.h> #include <wlr/types/wlr_scene.h> -#include <wlr/types/wlr_surface.h> #include <wlr/util/log.h> #include <wlr/util/region.h> #include "util/signal.h" diff --git a/types/seat/wlr_seat_keyboard.c b/types/seat/wlr_seat_keyboard.c index 57dbfe2f..9ed5fb34 100644 --- a/types/seat/wlr_seat_keyboard.c +++ b/types/seat/wlr_seat_keyboard.c @@ -3,6 +3,7 @@ #include <stdlib.h> #include <time.h> #include <wayland-server-core.h> +#include <wlr/types/wlr_compositor.h> #include <wlr/types/wlr_data_device.h> #include <wlr/types/wlr_input_device.h> #include <wlr/util/log.h> diff --git a/types/seat/wlr_seat_pointer.c b/types/seat/wlr_seat_pointer.c index 2fa911ee..ce4ca54e 100644 --- a/types/seat/wlr_seat_pointer.c +++ b/types/seat/wlr_seat_pointer.c @@ -4,6 +4,7 @@ #include <string.h> #include <time.h> #include <wayland-server-core.h> +#include <wlr/types/wlr_compositor.h> #include <wlr/types/wlr_input_device.h> #include <wlr/util/log.h> #include "types/wlr_seat.h" diff --git a/types/seat/wlr_seat_touch.c b/types/seat/wlr_seat_touch.c index 195928a3..99c50cf8 100644 --- a/types/seat/wlr_seat_touch.c +++ b/types/seat/wlr_seat_touch.c @@ -4,6 +4,7 @@ #include <string.h> #include <time.h> #include <wayland-server-core.h> +#include <wlr/types/wlr_compositor.h> #include <wlr/types/wlr_input_device.h> #include <wlr/util/log.h> #include "types/wlr_seat.h" diff --git a/types/tablet_v2/wlr_tablet_v2_pad.c b/types/tablet_v2/wlr_tablet_v2_pad.c index 020cba57..58094f57 100644 --- a/types/tablet_v2/wlr_tablet_v2_pad.c +++ b/types/tablet_v2/wlr_tablet_v2_pad.c @@ -7,6 +7,7 @@ #include <stdlib.h> #include <types/wlr_tablet_v2.h> #include <wayland-util.h> +#include <wlr/types/wlr_compositor.h> #include <wlr/types/wlr_tablet_tool.h> #include <wlr/types/wlr_tablet_pad.h> #include <wlr/types/wlr_tablet_v2.h> diff --git a/types/tablet_v2/wlr_tablet_v2_tablet.c b/types/tablet_v2/wlr_tablet_v2_tablet.c index bf2a9159..1d3c08fd 100644 --- a/types/tablet_v2/wlr_tablet_v2_tablet.c +++ b/types/tablet_v2/wlr_tablet_v2_tablet.c @@ -6,6 +6,7 @@ #include <stdlib.h> #include <types/wlr_tablet_v2.h> #include <wayland-util.h> +#include <wlr/types/wlr_compositor.h> #include <wlr/types/wlr_tablet_tool.h> #include <wlr/types/wlr_tablet_v2.h> #include <wlr/util/log.h> diff --git a/types/tablet_v2/wlr_tablet_v2_tool.c b/types/tablet_v2/wlr_tablet_v2_tool.c index 51efc1e8..9e5b9658 100644 --- a/types/tablet_v2/wlr_tablet_v2_tool.c +++ b/types/tablet_v2/wlr_tablet_v2_tool.c @@ -9,6 +9,7 @@ #include <stdlib.h> #include <types/wlr_tablet_v2.h> #include <wayland-util.h> +#include <wlr/types/wlr_compositor.h> #include <wlr/types/wlr_tablet_tool.h> #include <wlr/types/wlr_tablet_v2.h> #include <wlr/util/log.h> diff --git a/types/wlr_compositor.c b/types/wlr_compositor.c index 4b4b34f9..96122c1c 100644 --- a/types/wlr_compositor.c +++ b/types/wlr_compositor.c @@ -7,7 +7,6 @@ #include <wlr/types/wlr_matrix.h> #include <wlr/types/wlr_region.h> #include <wlr/types/wlr_subcompositor.h> -#include <wlr/types/wlr_surface.h> #include <wlr/types/wlr_output.h> #include <wlr/util/log.h> #include <wlr/util/region.h> diff --git a/types/wlr_foreign_toplevel_management_v1.c b/types/wlr_foreign_toplevel_management_v1.c index 49805ef9..9bf811a4 100644 --- a/types/wlr_foreign_toplevel_management_v1.c +++ b/types/wlr_foreign_toplevel_management_v1.c @@ -3,6 +3,7 @@ #include <assert.h> #include <string.h> #include <stdlib.h> +#include <wlr/types/wlr_compositor.h> #include <wlr/types/wlr_foreign_toplevel_management_v1.h> #include <wlr/types/wlr_seat.h> #include <wlr/util/log.h> diff --git a/types/wlr_fullscreen_shell_v1.c b/types/wlr_fullscreen_shell_v1.c index 59636e4c..7e9f8553 100644 --- a/types/wlr_fullscreen_shell_v1.c +++ b/types/wlr_fullscreen_shell_v1.c @@ -1,8 +1,8 @@ #include <assert.h> #include <stdlib.h> +#include <wlr/types/wlr_compositor.h> #include <wlr/types/wlr_fullscreen_shell_v1.h> #include <wlr/types/wlr_output.h> -#include <wlr/types/wlr_surface.h> #include <wlr/util/log.h> #include "util/signal.h" diff --git a/types/wlr_idle_inhibit_v1.c b/types/wlr_idle_inhibit_v1.c index 5acf740e..61a66dc1 100644 --- a/types/wlr_idle_inhibit_v1.c +++ b/types/wlr_idle_inhibit_v1.c @@ -3,8 +3,8 @@ #include <util/signal.h> #include <wayland-server-core.h> #include <wayland-util.h> +#include <wlr/types/wlr_compositor.h> #include <wlr/types/wlr_idle_inhibit_v1.h> -#include <wlr/types/wlr_surface.h> #include <wlr/util/log.h> #include "idle-inhibit-unstable-v1-protocol.h" diff --git a/types/wlr_input_method_v2.c b/types/wlr_input_method_v2.c index 7ccd31ee..c9390e97 100644 --- a/types/wlr_input_method_v2.c +++ b/types/wlr_input_method_v2.c @@ -6,8 +6,8 @@ #include <sys/mman.h> #include <unistd.h> #include <wayland-util.h> +#include <wlr/types/wlr_compositor.h> #include <wlr/types/wlr_input_method_v2.h> -#include <wlr/types/wlr_surface.h> #include <wlr/util/log.h> #include <xkbcommon/xkbcommon.h> #include "input-method-unstable-v2-protocol.h" diff --git a/types/wlr_keyboard_shortcuts_inhibit_v1.c b/types/wlr_keyboard_shortcuts_inhibit_v1.c index fe4e64b0..247d350d 100644 --- a/types/wlr_keyboard_shortcuts_inhibit_v1.c +++ b/types/wlr_keyboard_shortcuts_inhibit_v1.c @@ -1,6 +1,7 @@ #include <assert.h> #include <stdlib.h> #include <util/signal.h> +#include <wlr/types/wlr_compositor.h> #include <wlr/types/wlr_keyboard_shortcuts_inhibit_v1.h> #include "keyboard-shortcuts-inhibit-unstable-v1-protocol.h" diff --git a/types/wlr_layer_shell_v1.c b/types/wlr_layer_shell_v1.c index d7a2123e..983f2186 100644 --- a/types/wlr_layer_shell_v1.c +++ b/types/wlr_layer_shell_v1.c @@ -3,9 +3,9 @@ #include <stdlib.h> #include <string.h> #include <wayland-server-core.h> +#include <wlr/types/wlr_compositor.h> #include <wlr/types/wlr_layer_shell_v1.h> #include <wlr/types/wlr_output.h> -#include <wlr/types/wlr_surface.h> #include <wlr/types/wlr_xdg_shell.h> #include <wlr/util/log.h> #include "util/signal.h" diff --git a/types/wlr_linux_dmabuf_v1.c b/types/wlr_linux_dmabuf_v1.c index ae9bfeb9..5138e469 100644 --- a/types/wlr_linux_dmabuf_v1.c +++ b/types/wlr_linux_dmabuf_v1.c @@ -5,8 +5,8 @@ #include <sys/mman.h> #include <unistd.h> #include <wlr/render/wlr_renderer.h> +#include <wlr/types/wlr_compositor.h> #include <wlr/types/wlr_linux_dmabuf_v1.h> -#include <wlr/types/wlr_surface.h> #include <wlr/util/log.h> #include "linux-dmabuf-unstable-v1-protocol.h" #include "render/drm_format_set.h" diff --git a/types/wlr_pointer_constraints_v1.c b/types/wlr_pointer_constraints_v1.c index d608b778..e90daf72 100644 --- a/types/wlr_pointer_constraints_v1.c +++ b/types/wlr_pointer_constraints_v1.c @@ -4,6 +4,7 @@ #include <stdbool.h> #include <stdlib.h> #include <wayland-server-core.h> +#include <wlr/types/wlr_compositor.h> #include <wlr/types/wlr_pointer_constraints_v1.h> #include <wlr/types/wlr_region.h> #include <wlr/util/box.h> diff --git a/types/wlr_pointer_gestures_v1.c b/types/wlr_pointer_gestures_v1.c index 6b09a764..b8229dfc 100644 --- a/types/wlr_pointer_gestures_v1.c +++ b/types/wlr_pointer_gestures_v1.c @@ -5,6 +5,7 @@ #include <assert.h> #include <stdlib.h> #include <wayland-server-core.h> +#include <wlr/types/wlr_compositor.h> #include <wlr/types/wlr_pointer.h> #include <wlr/types/wlr_pointer_gestures_v1.h> #include <wlr/util/log.h> diff --git a/types/wlr_presentation_time.c b/types/wlr_presentation_time.c index 36b7fe95..a6facbdb 100644 --- a/types/wlr_presentation_time.c +++ b/types/wlr_presentation_time.c @@ -3,8 +3,8 @@ #include <stdlib.h> #include <string.h> #include <wlr/backend.h> +#include <wlr/types/wlr_compositor.h> #include <wlr/types/wlr_presentation_time.h> -#include <wlr/types/wlr_surface.h> #include <wlr/util/addon.h> #include "presentation-time-protocol.h" #include "util/signal.h" diff --git a/types/wlr_server_decoration.c b/types/wlr_server_decoration.c index 39ba624a..a8079393 100644 --- a/types/wlr_server_decoration.c +++ b/types/wlr_server_decoration.c @@ -1,7 +1,7 @@ #include <assert.h> #include <stdlib.h> +#include <wlr/types/wlr_compositor.h> #include <wlr/types/wlr_server_decoration.h> -#include <wlr/types/wlr_surface.h> #include <wlr/util/log.h> #include "server-decoration-protocol.h" #include "util/signal.h" diff --git a/types/wlr_subcompositor.c b/types/wlr_subcompositor.c index 45d0349d..8a9e6207 100644 --- a/types/wlr_subcompositor.c +++ b/types/wlr_subcompositor.c @@ -1,8 +1,8 @@ #include <assert.h> #include <stdlib.h> #include <wayland-server-core.h> +#include <wlr/types/wlr_compositor.h> #include <wlr/types/wlr_subcompositor.h> -#include <wlr/types/wlr_surface.h> #include "types/wlr_region.h" #include "util/signal.h" diff --git a/types/wlr_text_input_v3.c b/types/wlr_text_input_v3.c index f5267b35..65a8ebd6 100644 --- a/types/wlr_text_input_v3.c +++ b/types/wlr_text_input_v3.c @@ -4,6 +4,7 @@ #include <assert.h> #include <stdlib.h> #include <stddef.h> +#include <wlr/types/wlr_compositor.h> #include <wlr/types/wlr_text_input_v3.h> #include <wlr/util/log.h> #include "text-input-unstable-v3-protocol.h" diff --git a/types/wlr_viewporter.c b/types/wlr_viewporter.c index f07c18fe..097af857 100644 --- a/types/wlr_viewporter.c +++ b/types/wlr_viewporter.c @@ -1,6 +1,6 @@ #include <assert.h> #include <stdlib.h> -#include <wlr/types/wlr_surface.h> +#include <wlr/types/wlr_compositor.h> #include <wlr/types/wlr_viewporter.h> #include <wlr/util/log.h> #include "util/signal.h" diff --git a/types/wlr_xdg_activation_v1.c b/types/wlr_xdg_activation_v1.c index 208ada28..02ba9e07 100644 --- a/types/wlr_xdg_activation_v1.c +++ b/types/wlr_xdg_activation_v1.c @@ -2,8 +2,8 @@ #include <assert.h> #include <stdlib.h> #include <string.h> +#include <wlr/types/wlr_compositor.h> #include <wlr/types/wlr_seat.h> -#include <wlr/types/wlr_surface.h> #include <wlr/types/wlr_xdg_activation_v1.h> #include <wlr/util/log.h> #include "util/signal.h" diff --git a/xwayland/xwm.c b/xwayland/xwm.c index 313bfc0a..f0a010d9 100644 --- a/xwayland/xwm.c +++ b/xwayland/xwm.c @@ -5,9 +5,9 @@ #include <stdlib.h> #include <unistd.h> #include <wlr/config.h> +#include <wlr/types/wlr_compositor.h> #include <wlr/types/wlr_data_device.h> #include <wlr/types/wlr_primary_selection.h> -#include <wlr/types/wlr_surface.h> #include <wlr/util/edges.h> #include <wlr/util/log.h> #include <wlr/xcursor.h> |