diff options
| author | Kirill Primak <vyivel@eclair.cafe> | 2022-01-13 11:55:09 +0300 |
|---|---|---|
| committer | Simon Ser <contact@emersion.fr> | 2022-01-13 10:06:41 +0000 |
| commit | 617eb4fb9338c6960feb95b1a734c9cdd6bc5c46 (patch) | |
| tree | 973e6b8403cfacd6b8c545cda07dd115a47a945c /include/wlr | |
| parent | e94e16ba5dd95e1fb27cdf46da9e3b42b4869521 (diff) | |
| download | wlroots-617eb4fb9338c6960feb95b1a734c9cdd6bc5c46.tar.xz | |
surface: deprecate wlr_surface.h
Diffstat (limited to 'include/wlr')
| -rw-r--r-- | include/wlr/types/wlr_layer_shell_v1.h | 2 | ||||
| -rw-r--r-- | include/wlr/types/wlr_pointer_gestures_v1.h | 3 | ||||
| -rw-r--r-- | include/wlr/types/wlr_scene.h | 2 | ||||
| -rw-r--r-- | include/wlr/types/wlr_seat.h | 3 | ||||
| -rw-r--r-- | include/wlr/types/wlr_surface.h | 2 | ||||
| -rw-r--r-- | include/wlr/types/wlr_text_input_v3.h | 3 | ||||
| -rw-r--r-- | include/wlr/types/wlr_xdg_shell.h | 1 |
7 files changed, 11 insertions, 5 deletions
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" |