diff options
| -rw-r--r-- | include/wlr/types/wlr_compositor.h | 5 | ||||
| -rw-r--r-- | include/wlr/types/wlr_region.h | 14 | ||||
| -rw-r--r-- | types/wlr_compositor.c | 1 | ||||
| -rw-r--r-- | types/wlr_pointer_constraints_v1.c | 1 | ||||
| -rw-r--r-- | types/wlr_region.c | 2 |
5 files changed, 8 insertions, 15 deletions
diff --git a/include/wlr/types/wlr_compositor.h b/include/wlr/types/wlr_compositor.h index 53e663fd..322e9ed2 100644 --- a/include/wlr/types/wlr_compositor.h +++ b/include/wlr/types/wlr_compositor.h @@ -415,6 +415,11 @@ void wlr_surface_set_preferred_buffer_transform(struct wlr_surface *surface, enum wl_output_transform transform); /** + * Get a Pixman region from a wl_region resource. + */ +const pixman_region32_t *wlr_region_from_resource(struct wl_resource *resource); + +/** * Create the wl_compositor global, which can be used by clients to create * surfaces and regions. * diff --git a/include/wlr/types/wlr_region.h b/include/wlr/types/wlr_region.h index 62ac85c0..483ac968 100644 --- a/include/wlr/types/wlr_region.h +++ b/include/wlr/types/wlr_region.h @@ -1,16 +1,6 @@ /* - * This is a stable interface of wlroots. Future changes will be limited to: - * - * - New functions - * - New struct members - * - New enum members - * - * Note that wlroots does not make an ABI compatibility promise - in the future, - * the layout and size of structs used by wlroots may change, requiring code - * depending on this header to be recompiled (but not edited). - * - * Breaking changes are announced in the release notes and follow a 1-year - * deprecation schedule. + * This is a deprecated interface of wlroots. It will be removed in a future + * version. wlr/types/wlr_compositor.h should be used instead. */ #ifndef WLR_TYPES_WLR_REGION_H diff --git a/types/wlr_compositor.c b/types/wlr_compositor.c index ef05f8bb..d32e73d6 100644 --- a/types/wlr_compositor.c +++ b/types/wlr_compositor.c @@ -5,7 +5,6 @@ #include <wlr/types/wlr_buffer.h> #include <wlr/types/wlr_compositor.h> #include <wlr/types/wlr_matrix.h> -#include <wlr/types/wlr_region.h> #include <wlr/types/wlr_subcompositor.h> #include <wlr/types/wlr_output.h> #include <wlr/util/log.h> diff --git a/types/wlr_pointer_constraints_v1.c b/types/wlr_pointer_constraints_v1.c index 03aea9f5..f22b18f4 100644 --- a/types/wlr_pointer_constraints_v1.c +++ b/types/wlr_pointer_constraints_v1.c @@ -6,7 +6,6 @@ #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> #include <wlr/util/log.h> diff --git a/types/wlr_region.c b/types/wlr_region.c index a8868278..59f6dfc6 100644 --- a/types/wlr_region.c +++ b/types/wlr_region.c @@ -3,7 +3,7 @@ #include <stdio.h> #include <stdlib.h> #include <wayland-server-protocol.h> -#include <wlr/types/wlr_region.h> +#include <wlr/types/wlr_compositor.h> #include "types/wlr_region.h" static const struct wl_region_interface region_impl; |