Index: third_party/wayland-protocols/include/protocol/secure-output-unstable-v1-client-protocol.h |
diff --git a/third_party/wayland-protocols/include/protocol/secure-output-unstable-v1-client-protocol.h b/third_party/wayland-protocols/include/protocol/secure-output-unstable-v1-client-protocol.h |
index aa81b99a7028da614dcdf17584440e9b5d2ba259..8ef529acd05ba4a707ba87c4fa7e42e5314d77e2 100644 |
--- a/third_party/wayland-protocols/include/protocol/secure-output-unstable-v1-client-protocol.h |
+++ b/third_party/wayland-protocols/include/protocol/secure-output-unstable-v1-client-protocol.h |
@@ -41,8 +41,6 @@ extern "C" { |
* @section page_ifaces_secure_output_unstable_v1 Interfaces |
* - @subpage page_iface_zcr_secure_output_v1 - secure output |
* - @subpage page_iface_zcr_security_v1 - security interface to a wl_surface |
- * - @subpage page_iface_zwp_secure_output_v1 - DEPRECATED |
- * - @subpage page_iface_zwp_security_v1 - DEPRECATED |
* @section page_copyright_secure_output_unstable_v1 Copyright |
* <pre> |
* |
@@ -71,8 +69,6 @@ extern "C" { |
struct wl_surface; |
struct zcr_secure_output_v1; |
struct zcr_security_v1; |
-struct zwp_secure_output_v1; |
-struct zwp_security_v1; |
/** |
* @page page_iface_zcr_secure_output_v1 zcr_secure_output_v1 |
@@ -126,58 +122,6 @@ extern const struct wl_interface zcr_secure_output_v1_interface; |
* wl_surface.commit. |
*/ |
extern const struct wl_interface zcr_security_v1_interface; |
-/** |
- * @page page_iface_zwp_secure_output_v1 zwp_secure_output_v1 |
- * @section page_iface_zwp_secure_output_v1_desc Description |
- * |
- * The global interface exposing secure output capabilities is used |
- * to instantiate an interface extension for a wl_surface object. |
- * This extended interface will then allow surfaces to be marked as |
- * as only visible on secure outputs. |
- * @section page_iface_zwp_secure_output_v1_api API |
- * See @ref iface_zwp_secure_output_v1. |
- */ |
-/** |
- * @defgroup iface_zwp_secure_output_v1 The zwp_secure_output_v1 interface |
- * |
- * The global interface exposing secure output capabilities is used |
- * to instantiate an interface extension for a wl_surface object. |
- * This extended interface will then allow surfaces to be marked as |
- * as only visible on secure outputs. |
- */ |
-extern const struct wl_interface zwp_secure_output_v1_interface; |
-/** |
- * @page page_iface_zwp_security_v1 zwp_security_v1 |
- * @section page_iface_zwp_security_v1_desc Description |
- * |
- * An additional interface to a wl_surface object, which allows the |
- * client to specify that a surface should not appear in screenshots |
- * or be visible on non-secure outputs. |
- * |
- * If the wl_surface associated with the security object is destroyed, |
- * the security object becomes inert. |
- * |
- * If the security object is destroyed, the security state is removed |
- * from the wl_surface. The change will be applied on the next |
- * wl_surface.commit. |
- * @section page_iface_zwp_security_v1_api API |
- * See @ref iface_zwp_security_v1. |
- */ |
-/** |
- * @defgroup iface_zwp_security_v1 The zwp_security_v1 interface |
- * |
- * An additional interface to a wl_surface object, which allows the |
- * client to specify that a surface should not appear in screenshots |
- * or be visible on non-secure outputs. |
- * |
- * If the wl_surface associated with the security object is destroyed, |
- * the security object becomes inert. |
- * |
- * If the security object is destroyed, the security state is removed |
- * from the wl_surface. The change will be applied on the next |
- * wl_surface.commit. |
- */ |
-extern const struct wl_interface zwp_security_v1_interface; |
#ifndef ZCR_SECURE_OUTPUT_V1_ERROR_ENUM |
#define ZCR_SECURE_OUTPUT_V1_ERROR_ENUM |
@@ -319,146 +263,6 @@ zcr_security_v1_only_visible_on_secure_output(struct zcr_security_v1 *zcr_securi |
ZCR_SECURITY_V1_ONLY_VISIBLE_ON_SECURE_OUTPUT); |
} |
-#ifndef ZWP_SECURE_OUTPUT_V1_ERROR_ENUM |
-#define ZWP_SECURE_OUTPUT_V1_ERROR_ENUM |
-enum zwp_secure_output_v1_error { |
- /** |
- * the surface already has a security object associated |
- */ |
- ZWP_SECURE_OUTPUT_V1_ERROR_SECURITY_EXISTS = 0, |
-}; |
-#endif /* ZWP_SECURE_OUTPUT_V1_ERROR_ENUM */ |
- |
-#define ZWP_SECURE_OUTPUT_V1_DESTROY 0 |
-#define ZWP_SECURE_OUTPUT_V1_GET_SECURITY 1 |
- |
-/** |
- * @ingroup iface_zwp_secure_output_v1 |
- */ |
-#define ZWP_SECURE_OUTPUT_V1_DESTROY_SINCE_VERSION 1 |
-/** |
- * @ingroup iface_zwp_secure_output_v1 |
- */ |
-#define ZWP_SECURE_OUTPUT_V1_GET_SECURITY_SINCE_VERSION 1 |
- |
-/** @ingroup iface_zwp_secure_output_v1 */ |
-static inline void |
-zwp_secure_output_v1_set_user_data(struct zwp_secure_output_v1 *zwp_secure_output_v1, void *user_data) |
-{ |
- wl_proxy_set_user_data((struct wl_proxy *) zwp_secure_output_v1, user_data); |
-} |
- |
-/** @ingroup iface_zwp_secure_output_v1 */ |
-static inline void * |
-zwp_secure_output_v1_get_user_data(struct zwp_secure_output_v1 *zwp_secure_output_v1) |
-{ |
- return wl_proxy_get_user_data((struct wl_proxy *) zwp_secure_output_v1); |
-} |
- |
-static inline uint32_t |
-zwp_secure_output_v1_get_version(struct zwp_secure_output_v1 *zwp_secure_output_v1) |
-{ |
- return wl_proxy_get_version((struct wl_proxy *) zwp_secure_output_v1); |
-} |
- |
-/** |
- * @ingroup iface_zwp_secure_output_v1 |
- * |
- * Informs the server that the client will not be using this |
- * protocol object anymore. This does not affect any other objects, |
- * security objects included. |
- */ |
-static inline void |
-zwp_secure_output_v1_destroy(struct zwp_secure_output_v1 *zwp_secure_output_v1) |
-{ |
- wl_proxy_marshal((struct wl_proxy *) zwp_secure_output_v1, |
- ZWP_SECURE_OUTPUT_V1_DESTROY); |
- |
- wl_proxy_destroy((struct wl_proxy *) zwp_secure_output_v1); |
-} |
- |
-/** |
- * @ingroup iface_zwp_secure_output_v1 |
- * |
- * Instantiate an interface extension for the given wl_surface to |
- * provide surface security. If the given wl_surface already has |
- * a security object associated, the security_exists protocol error |
- * is raised. |
- */ |
-static inline struct zwp_security_v1 * |
-zwp_secure_output_v1_get_security(struct zwp_secure_output_v1 *zwp_secure_output_v1, struct wl_surface *surface) |
-{ |
- struct wl_proxy *id; |
- |
- id = wl_proxy_marshal_constructor((struct wl_proxy *) zwp_secure_output_v1, |
- ZWP_SECURE_OUTPUT_V1_GET_SECURITY, &zwp_security_v1_interface, NULL, surface); |
- |
- return (struct zwp_security_v1 *) id; |
-} |
- |
-#define ZWP_SECURITY_V1_DESTROY 0 |
-#define ZWP_SECURITY_V1_ONLY_VISIBLE_ON_SECURE_OUTPUT 1 |
- |
-/** |
- * @ingroup iface_zwp_security_v1 |
- */ |
-#define ZWP_SECURITY_V1_DESTROY_SINCE_VERSION 1 |
-/** |
- * @ingroup iface_zwp_security_v1 |
- */ |
-#define ZWP_SECURITY_V1_ONLY_VISIBLE_ON_SECURE_OUTPUT_SINCE_VERSION 1 |
- |
-/** @ingroup iface_zwp_security_v1 */ |
-static inline void |
-zwp_security_v1_set_user_data(struct zwp_security_v1 *zwp_security_v1, void *user_data) |
-{ |
- wl_proxy_set_user_data((struct wl_proxy *) zwp_security_v1, user_data); |
-} |
- |
-/** @ingroup iface_zwp_security_v1 */ |
-static inline void * |
-zwp_security_v1_get_user_data(struct zwp_security_v1 *zwp_security_v1) |
-{ |
- return wl_proxy_get_user_data((struct wl_proxy *) zwp_security_v1); |
-} |
- |
-static inline uint32_t |
-zwp_security_v1_get_version(struct zwp_security_v1 *zwp_security_v1) |
-{ |
- return wl_proxy_get_version((struct wl_proxy *) zwp_security_v1); |
-} |
- |
-/** |
- * @ingroup iface_zwp_security_v1 |
- * |
- * The associated wl_surface's security state is removed. |
- * The change is applied on the next wl_surface.commit. |
- */ |
-static inline void |
-zwp_security_v1_destroy(struct zwp_security_v1 *zwp_security_v1) |
-{ |
- wl_proxy_marshal((struct wl_proxy *) zwp_security_v1, |
- ZWP_SECURITY_V1_DESTROY); |
- |
- wl_proxy_destroy((struct wl_proxy *) zwp_security_v1); |
-} |
- |
-/** |
- * @ingroup iface_zwp_security_v1 |
- * |
- * Constrain visibility of wl_surface contents to secure outputs. |
- * See wp_secure_output for the description. |
- * |
- * The only visible on secure output state is double-buffered state, |
- * and will be applied on the next wl_surface.commit. |
- */ |
-static inline void |
-zwp_security_v1_only_visible_on_secure_output(struct zwp_security_v1 *zwp_security_v1) |
-{ |
- wl_proxy_marshal((struct wl_proxy *) zwp_security_v1, |
- ZWP_SECURITY_V1_ONLY_VISIBLE_ON_SECURE_OUTPUT); |
-} |
- |
#ifdef __cplusplus |
} |
#endif |