| Index: third_party/wayland-protocols/include/protocol/remote-shell-unstable-v1-client-protocol.h
|
| diff --git a/third_party/wayland-protocols/include/protocol/remote-shell-unstable-v1-client-protocol.h b/third_party/wayland-protocols/include/protocol/remote-shell-unstable-v1-client-protocol.h
|
| index 7d180c789f56d29c79bc4ab0370c38eca76889b7..e537817a8ea37096a402188311ccf1937f983a66 100644
|
| --- a/third_party/wayland-protocols/include/protocol/remote-shell-unstable-v1-client-protocol.h
|
| +++ b/third_party/wayland-protocols/include/protocol/remote-shell-unstable-v1-client-protocol.h
|
| @@ -258,7 +258,7 @@ struct zcr_remote_shell_v1_listener {
|
| };
|
|
|
| /**
|
| - * @ingroup iface_zcr_remote_shell_v1
|
| + * @ingroup zcr_remote_shell_v1_iface
|
| */
|
| static inline int
|
| zcr_remote_shell_v1_add_listener(struct zcr_remote_shell_v1 *zcr_remote_shell_v1,
|
| @@ -268,31 +268,22 @@ zcr_remote_shell_v1_add_listener(struct zcr_remote_shell_v1 *zcr_remote_shell_v1
|
| (void (**)(void)) listener, data);
|
| }
|
|
|
| -#define ZCR_REMOTE_SHELL_V1_DESTROY 0
|
| -#define ZCR_REMOTE_SHELL_V1_GET_REMOTE_SURFACE 1
|
| -#define ZCR_REMOTE_SHELL_V1_GET_NOTIFICATION_SURFACE 2
|
| -
|
| -/**
|
| - * @ingroup iface_zcr_remote_shell_v1
|
| - */
|
| -#define ZCR_REMOTE_SHELL_V1_ACTIVATED_SINCE_VERSION 1
|
| -/**
|
| - * @ingroup iface_zcr_remote_shell_v1
|
| - */
|
| -#define ZCR_REMOTE_SHELL_V1_CONFIGURATION_CHANGED_SINCE_VERSION 1
|
| +#define ZCR_REMOTE_SHELL_V1_DESTROY 0
|
| +#define ZCR_REMOTE_SHELL_V1_GET_REMOTE_SURFACE 1
|
| +#define ZCR_REMOTE_SHELL_V1_GET_NOTIFICATION_SURFACE 2
|
|
|
| /**
|
| * @ingroup iface_zcr_remote_shell_v1
|
| */
|
| -#define ZCR_REMOTE_SHELL_V1_DESTROY_SINCE_VERSION 1
|
| +#define ZCR_REMOTE_SHELL_V1_DESTROY_SINCE_VERSION 1
|
| /**
|
| * @ingroup iface_zcr_remote_shell_v1
|
| */
|
| -#define ZCR_REMOTE_SHELL_V1_GET_REMOTE_SURFACE_SINCE_VERSION 1
|
| +#define ZCR_REMOTE_SHELL_V1_GET_REMOTE_SURFACE_SINCE_VERSION 1
|
| /**
|
| * @ingroup iface_zcr_remote_shell_v1
|
| */
|
| -#define ZCR_REMOTE_SHELL_V1_GET_NOTIFICATION_SURFACE_SINCE_VERSION 1
|
| +#define ZCR_REMOTE_SHELL_V1_GET_NOTIFICATION_SURFACE_SINCE_VERSION 1
|
|
|
| /** @ingroup iface_zcr_remote_shell_v1 */
|
| static inline void
|
| @@ -423,7 +414,7 @@ struct zcr_remote_surface_v1_listener {
|
| * If the client receives multiple configure events before it can
|
| * respond to one, it is free to discard all but the last event it
|
| * received.
|
| - * @since 2
|
| + * @since 3
|
| */
|
| void (*configure)(void *data,
|
| struct zcr_remote_surface_v1 *zcr_remote_surface_v1,
|
| @@ -433,7 +424,7 @@ struct zcr_remote_surface_v1_listener {
|
| };
|
|
|
| /**
|
| - * @ingroup iface_zcr_remote_surface_v1
|
| + * @ingroup zcr_remote_surface_v1_iface
|
| */
|
| static inline int
|
| zcr_remote_surface_v1_add_listener(struct zcr_remote_surface_v1 *zcr_remote_surface_v1,
|
| @@ -443,125 +434,117 @@ zcr_remote_surface_v1_add_listener(struct zcr_remote_surface_v1 *zcr_remote_surf
|
| (void (**)(void)) listener, data);
|
| }
|
|
|
| -#define ZCR_REMOTE_SURFACE_V1_DESTROY 0
|
| -#define ZCR_REMOTE_SURFACE_V1_SET_APP_ID 1
|
| -#define ZCR_REMOTE_SURFACE_V1_SET_WINDOW_GEOMETRY 2
|
| -#define ZCR_REMOTE_SURFACE_V1_SET_SCALE 3
|
| -#define ZCR_REMOTE_SURFACE_V1_SET_RECTANGULAR_SHADOW 4
|
| -#define ZCR_REMOTE_SURFACE_V1_SET_RECTANGULAR_SHADOW_BACKGROUND_OPACITY 5
|
| -#define ZCR_REMOTE_SURFACE_V1_SET_TITLE 6
|
| -#define ZCR_REMOTE_SURFACE_V1_SET_TOP_INSET 7
|
| -#define ZCR_REMOTE_SURFACE_V1_ACTIVATE 8
|
| -#define ZCR_REMOTE_SURFACE_V1_MAXIMIZE 9
|
| -#define ZCR_REMOTE_SURFACE_V1_MINIMIZE 10
|
| -#define ZCR_REMOTE_SURFACE_V1_RESTORE 11
|
| -#define ZCR_REMOTE_SURFACE_V1_FULLSCREEN 12
|
| -#define ZCR_REMOTE_SURFACE_V1_UNFULLSCREEN 13
|
| -#define ZCR_REMOTE_SURFACE_V1_PIN 14
|
| -#define ZCR_REMOTE_SURFACE_V1_UNPIN 15
|
| -#define ZCR_REMOTE_SURFACE_V1_SET_SYSTEM_MODAL 16
|
| -#define ZCR_REMOTE_SURFACE_V1_UNSET_SYSTEM_MODAL 17
|
| -#define ZCR_REMOTE_SURFACE_V1_ACK_CONFIGURE 18
|
| -#define ZCR_REMOTE_SURFACE_V1_SET_MOVING 19
|
| -#define ZCR_REMOTE_SURFACE_V1_UNSET_MOVING 20
|
| +#define ZCR_REMOTE_SURFACE_V1_DESTROY 0
|
| +#define ZCR_REMOTE_SURFACE_V1_SET_APP_ID 1
|
| +#define ZCR_REMOTE_SURFACE_V1_SET_WINDOW_GEOMETRY 2
|
| +#define ZCR_REMOTE_SURFACE_V1_SET_SCALE 3
|
| +#define ZCR_REMOTE_SURFACE_V1_SET_RECTANGULAR_SHADOW 4
|
| +#define ZCR_REMOTE_SURFACE_V1_SET_RECTANGULAR_SHADOW_BACKGROUND_OPACITY 5
|
| +#define ZCR_REMOTE_SURFACE_V1_SET_TITLE 6
|
| +#define ZCR_REMOTE_SURFACE_V1_SET_TOP_INSET 7
|
| +#define ZCR_REMOTE_SURFACE_V1_ACTIVATE 8
|
| +#define ZCR_REMOTE_SURFACE_V1_MAXIMIZE 9
|
| +#define ZCR_REMOTE_SURFACE_V1_MINIMIZE 10
|
| +#define ZCR_REMOTE_SURFACE_V1_RESTORE 11
|
| +#define ZCR_REMOTE_SURFACE_V1_FULLSCREEN 12
|
| +#define ZCR_REMOTE_SURFACE_V1_UNFULLSCREEN 13
|
| +#define ZCR_REMOTE_SURFACE_V1_PIN 14
|
| +#define ZCR_REMOTE_SURFACE_V1_UNPIN 15
|
| +#define ZCR_REMOTE_SURFACE_V1_SET_SYSTEM_MODAL 16
|
| +#define ZCR_REMOTE_SURFACE_V1_UNSET_SYSTEM_MODAL 17
|
| +#define ZCR_REMOTE_SURFACE_V1_SET_RECTANGULAR_SURFACE_SHADOW 18
|
| +#define ZCR_REMOTE_SURFACE_V1_ACK_CONFIGURE 19
|
| +#define ZCR_REMOTE_SURFACE_V1_SET_MOVING 20
|
| +#define ZCR_REMOTE_SURFACE_V1_UNSET_MOVING 21
|
|
|
| /**
|
| * @ingroup iface_zcr_remote_surface_v1
|
| */
|
| -#define ZCR_REMOTE_SURFACE_V1_CLOSE_SINCE_VERSION 1
|
| -/**
|
| - * @ingroup iface_zcr_remote_surface_v1
|
| - */
|
| -#define ZCR_REMOTE_SURFACE_V1_STATE_TYPE_CHANGED_SINCE_VERSION 1
|
| -/**
|
| - * @ingroup iface_zcr_remote_surface_v1
|
| - */
|
| -#define ZCR_REMOTE_SURFACE_V1_CONFIGURE_SINCE_VERSION 2
|
| -
|
| +#define ZCR_REMOTE_SURFACE_V1_DESTROY_SINCE_VERSION 1
|
| /**
|
| * @ingroup iface_zcr_remote_surface_v1
|
| */
|
| -#define ZCR_REMOTE_SURFACE_V1_DESTROY_SINCE_VERSION 1
|
| +#define ZCR_REMOTE_SURFACE_V1_SET_APP_ID_SINCE_VERSION 1
|
| /**
|
| * @ingroup iface_zcr_remote_surface_v1
|
| */
|
| -#define ZCR_REMOTE_SURFACE_V1_SET_APP_ID_SINCE_VERSION 1
|
| +#define ZCR_REMOTE_SURFACE_V1_SET_WINDOW_GEOMETRY_SINCE_VERSION 1
|
| /**
|
| * @ingroup iface_zcr_remote_surface_v1
|
| */
|
| -#define ZCR_REMOTE_SURFACE_V1_SET_WINDOW_GEOMETRY_SINCE_VERSION 1
|
| +#define ZCR_REMOTE_SURFACE_V1_SET_SCALE_SINCE_VERSION 1
|
| /**
|
| * @ingroup iface_zcr_remote_surface_v1
|
| */
|
| -#define ZCR_REMOTE_SURFACE_V1_SET_SCALE_SINCE_VERSION 1
|
| +#define ZCR_REMOTE_SURFACE_V1_SET_RECTANGULAR_SHADOW_SINCE_VERSION 1
|
| /**
|
| * @ingroup iface_zcr_remote_surface_v1
|
| */
|
| -#define ZCR_REMOTE_SURFACE_V1_SET_RECTANGULAR_SHADOW_SINCE_VERSION 1
|
| +#define ZCR_REMOTE_SURFACE_V1_SET_RECTANGULAR_SHADOW_BACKGROUND_OPACITY_SINCE_VERSION 1
|
| /**
|
| * @ingroup iface_zcr_remote_surface_v1
|
| */
|
| -#define ZCR_REMOTE_SURFACE_V1_SET_RECTANGULAR_SHADOW_BACKGROUND_OPACITY_SINCE_VERSION 1
|
| +#define ZCR_REMOTE_SURFACE_V1_SET_TITLE_SINCE_VERSION 1
|
| /**
|
| * @ingroup iface_zcr_remote_surface_v1
|
| */
|
| -#define ZCR_REMOTE_SURFACE_V1_SET_TITLE_SINCE_VERSION 1
|
| +#define ZCR_REMOTE_SURFACE_V1_SET_TOP_INSET_SINCE_VERSION 1
|
| /**
|
| * @ingroup iface_zcr_remote_surface_v1
|
| */
|
| -#define ZCR_REMOTE_SURFACE_V1_SET_TOP_INSET_SINCE_VERSION 1
|
| +#define ZCR_REMOTE_SURFACE_V1_ACTIVATE_SINCE_VERSION 1
|
| /**
|
| * @ingroup iface_zcr_remote_surface_v1
|
| */
|
| -#define ZCR_REMOTE_SURFACE_V1_ACTIVATE_SINCE_VERSION 1
|
| +#define ZCR_REMOTE_SURFACE_V1_MAXIMIZE_SINCE_VERSION 1
|
| /**
|
| * @ingroup iface_zcr_remote_surface_v1
|
| */
|
| -#define ZCR_REMOTE_SURFACE_V1_MAXIMIZE_SINCE_VERSION 1
|
| +#define ZCR_REMOTE_SURFACE_V1_MINIMIZE_SINCE_VERSION 1
|
| /**
|
| * @ingroup iface_zcr_remote_surface_v1
|
| */
|
| -#define ZCR_REMOTE_SURFACE_V1_MINIMIZE_SINCE_VERSION 1
|
| +#define ZCR_REMOTE_SURFACE_V1_RESTORE_SINCE_VERSION 1
|
| /**
|
| * @ingroup iface_zcr_remote_surface_v1
|
| */
|
| -#define ZCR_REMOTE_SURFACE_V1_RESTORE_SINCE_VERSION 1
|
| +#define ZCR_REMOTE_SURFACE_V1_FULLSCREEN_SINCE_VERSION 1
|
| /**
|
| * @ingroup iface_zcr_remote_surface_v1
|
| */
|
| -#define ZCR_REMOTE_SURFACE_V1_FULLSCREEN_SINCE_VERSION 1
|
| +#define ZCR_REMOTE_SURFACE_V1_UNFULLSCREEN_SINCE_VERSION 1
|
| /**
|
| * @ingroup iface_zcr_remote_surface_v1
|
| */
|
| -#define ZCR_REMOTE_SURFACE_V1_UNFULLSCREEN_SINCE_VERSION 1
|
| +#define ZCR_REMOTE_SURFACE_V1_PIN_SINCE_VERSION 1
|
| /**
|
| * @ingroup iface_zcr_remote_surface_v1
|
| */
|
| -#define ZCR_REMOTE_SURFACE_V1_PIN_SINCE_VERSION 1
|
| +#define ZCR_REMOTE_SURFACE_V1_UNPIN_SINCE_VERSION 1
|
| /**
|
| * @ingroup iface_zcr_remote_surface_v1
|
| */
|
| -#define ZCR_REMOTE_SURFACE_V1_UNPIN_SINCE_VERSION 1
|
| +#define ZCR_REMOTE_SURFACE_V1_SET_SYSTEM_MODAL_SINCE_VERSION 1
|
| /**
|
| * @ingroup iface_zcr_remote_surface_v1
|
| */
|
| -#define ZCR_REMOTE_SURFACE_V1_SET_SYSTEM_MODAL_SINCE_VERSION 1
|
| +#define ZCR_REMOTE_SURFACE_V1_UNSET_SYSTEM_MODAL_SINCE_VERSION 1
|
| /**
|
| * @ingroup iface_zcr_remote_surface_v1
|
| */
|
| -#define ZCR_REMOTE_SURFACE_V1_UNSET_SYSTEM_MODAL_SINCE_VERSION 1
|
| +#define ZCR_REMOTE_SURFACE_V1_SET_RECTANGULAR_SURFACE_SHADOW_SINCE_VERSION 2
|
| /**
|
| * @ingroup iface_zcr_remote_surface_v1
|
| */
|
| -#define ZCR_REMOTE_SURFACE_V1_ACK_CONFIGURE_SINCE_VERSION 2
|
| +#define ZCR_REMOTE_SURFACE_V1_ACK_CONFIGURE_SINCE_VERSION 3
|
| /**
|
| * @ingroup iface_zcr_remote_surface_v1
|
| */
|
| -#define ZCR_REMOTE_SURFACE_V1_SET_MOVING_SINCE_VERSION 2
|
| +#define ZCR_REMOTE_SURFACE_V1_SET_MOVING_SINCE_VERSION 3
|
| /**
|
| * @ingroup iface_zcr_remote_surface_v1
|
| */
|
| -#define ZCR_REMOTE_SURFACE_V1_UNSET_MOVING_SINCE_VERSION 2
|
| +#define ZCR_REMOTE_SURFACE_V1_UNSET_MOVING_SINCE_VERSION 3
|
|
|
| /** @ingroup iface_zcr_remote_surface_v1 */
|
| static inline void
|
| @@ -655,7 +638,7 @@ zcr_remote_surface_v1_set_scale(struct zcr_remote_surface_v1 *zcr_remote_surface
|
| /**
|
| * @ingroup iface_zcr_remote_surface_v1
|
| *
|
| - * Request that surface needs a rectangular shadow.
|
| + * [Deprecated] Request that surface needs a rectangular shadow.
|
| *
|
| * This is only a request that the surface should have a rectangular
|
| * shadow. The compositor may choose to ignore this request.
|
| @@ -879,6 +862,25 @@ zcr_remote_surface_v1_unset_system_modal(struct zcr_remote_surface_v1 *zcr_remot
|
| /**
|
| * @ingroup iface_zcr_remote_surface_v1
|
| *
|
| + * Request that surface needs a rectangular shadow.
|
| + *
|
| + * This is only a request that the surface should have a rectangular
|
| + * shadow. The compositor may choose to ignore this request.
|
| + *
|
| + * The arguments are given in the remote surface coordinate space and
|
| + * specifies inner bounds of the shadow. Specifying zero width and height
|
| + * will disable the shadow.
|
| + */
|
| +static inline void
|
| +zcr_remote_surface_v1_set_rectangular_surface_shadow(struct zcr_remote_surface_v1 *zcr_remote_surface_v1, int32_t x, int32_t y, int32_t width, int32_t height)
|
| +{
|
| + wl_proxy_marshal((struct wl_proxy *) zcr_remote_surface_v1,
|
| + ZCR_REMOTE_SURFACE_V1_SET_RECTANGULAR_SURFACE_SHADOW, x, y, width, height);
|
| +}
|
| +
|
| +/**
|
| + * @ingroup iface_zcr_remote_surface_v1
|
| + *
|
| * When a configure event is received, if a client commits the
|
| * surface in response to the configure event, then the client
|
| * must make an ack_configure request sometime before the commit
|
| @@ -935,13 +937,12 @@ zcr_remote_surface_v1_unset_moving(struct zcr_remote_surface_v1 *zcr_remote_surf
|
| ZCR_REMOTE_SURFACE_V1_UNSET_MOVING);
|
| }
|
|
|
| -#define ZCR_NOTIFICATION_SURFACE_V1_DESTROY 0
|
| -
|
| +#define ZCR_NOTIFICATION_SURFACE_V1_DESTROY 0
|
|
|
| /**
|
| * @ingroup iface_zcr_notification_surface_v1
|
| */
|
| -#define ZCR_NOTIFICATION_SURFACE_V1_DESTROY_SINCE_VERSION 1
|
| +#define ZCR_NOTIFICATION_SURFACE_V1_DESTROY_SINCE_VERSION 1
|
|
|
| /** @ingroup iface_zcr_notification_surface_v1 */
|
| static inline void
|
|
|