| 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 7b3daa931194c997ca43aa0b1aa04cc6b845cca2..b6d5b4b90d9c7ffe6502c451a7172ab8006a48b2 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
|
| @@ -259,15 +259,15 @@ struct zcr_remote_shell_v1_listener {
|
| int32_t work_area_inset_right,
|
| int32_t work_area_inset_bottom,
|
| uint32_t layout_mode);
|
| - /**
|
| - * area of remote shell
|
| - *
|
| - * Defines an area of the remote shell used for layout. Each
|
| - * series of "workspace" events must be terminated by a "configure"
|
| - * event.
|
| - * @since 5
|
| - */
|
| - void (*workspace)(void *data,
|
| + /**
|
| + * area of remote shell
|
| + *
|
| + * Defines an area of the remote shell used for layout. Each
|
| + * series of "workspace" events must be terminated by a "configure"
|
| + * event.
|
| + * @since 6
|
| + */
|
| + void (*workspace)(void *data,
|
| struct zcr_remote_shell_v1 *zcr_remote_shell_v1,
|
| uint32_t id_hi,
|
| uint32_t id_lo,
|
| @@ -281,20 +281,20 @@ struct zcr_remote_shell_v1_listener {
|
| int32_t inset_bottom,
|
| int32_t transform,
|
| wl_fixed_t scale_factor);
|
| - /**
|
| - * suggests configuration of remote shell
|
| - *
|
| - * Suggests a new configuration of the remote shell. Preceded by
|
| - * a series of "workspace" events.
|
| - * @since 5
|
| - */
|
| - void (*configure)(void *data,
|
| + /**
|
| + * suggests configuration of remote shell
|
| + *
|
| + * Suggests a new configuration of the remote shell. Preceded by
|
| + * a series of "workspace" events.
|
| + * @since 6
|
| + */
|
| + void (*configure)(void *data,
|
| struct zcr_remote_shell_v1 *zcr_remote_shell_v1,
|
| uint32_t layout_mode);
|
| };
|
|
|
| /**
|
| - * @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,
|
| @@ -319,11 +319,11 @@ zcr_remote_shell_v1_add_listener(struct zcr_remote_shell_v1 *zcr_remote_shell_v1
|
| /**
|
| * @ingroup iface_zcr_remote_shell_v1
|
| */
|
| -#define ZCR_REMOTE_SHELL_V1_WORKSPACE_SINCE_VERSION 5
|
| +#define ZCR_REMOTE_SHELL_V1_WORKSPACE_SINCE_VERSION 6
|
| /**
|
| * @ingroup iface_zcr_remote_shell_v1
|
| */
|
| -#define ZCR_REMOTE_SHELL_V1_CONFIGURE_SINCE_VERSION 5
|
| +#define ZCR_REMOTE_SHELL_V1_CONFIGURE_SINCE_VERSION 6
|
|
|
| /**
|
| * @ingroup iface_zcr_remote_shell_v1
|
| @@ -425,18 +425,18 @@ zcr_remote_shell_v1_get_notification_surface(struct zcr_remote_shell_v1 *zcr_rem
|
| * Determine the visibility behavior of the system UI.
|
| */
|
| enum zcr_remote_surface_v1_systemui_visibility_state {
|
| - /**
|
| - * system ui is visible
|
| - */
|
| - ZCR_REMOTE_SURFACE_V1_SYSTEMUI_VISIBILITY_STATE_VISIBLE = 1,
|
| - /**
|
| - * system ui autohides and is not sticky
|
| - */
|
| - ZCR_REMOTE_SURFACE_V1_SYSTEMUI_VISIBILITY_STATE_AUTOHIDE_NON_STICKY = 2,
|
| - /**
|
| - * system ui autohides and is sticky
|
| - */
|
| - ZCR_REMOTE_SURFACE_V1_SYSTEMUI_VISIBILITY_STATE_AUTOHIDE_STICKY = 3,
|
| + /**
|
| + * system ui is visible
|
| + */
|
| + ZCR_REMOTE_SURFACE_V1_SYSTEMUI_VISIBILITY_STATE_VISIBLE = 1,
|
| + /**
|
| + * system ui autohides and is not sticky
|
| + */
|
| + ZCR_REMOTE_SURFACE_V1_SYSTEMUI_VISIBILITY_STATE_AUTOHIDE_NON_STICKY = 2,
|
| + /**
|
| + * system ui autohides and is sticky
|
| + */
|
| + ZCR_REMOTE_SURFACE_V1_SYSTEMUI_VISIBILITY_STATE_AUTOHIDE_STICKY = 3,
|
| };
|
| #endif /* ZCR_REMOTE_SURFACE_V1_SYSTEMUI_VISIBILITY_STATE_ENUM */
|
|
|
| @@ -473,28 +473,28 @@ struct zcr_remote_surface_v1_listener {
|
| void (*state_type_changed)(void *data,
|
| struct zcr_remote_surface_v1 *zcr_remote_surface_v1,
|
| uint32_t state_type);
|
| - /**
|
| - * suggest a surface change
|
| - *
|
| - * The configure event asks the client to change surface state.
|
| - *
|
| - * The client must apply the origin offset to window positions in
|
| - * set_window_geometry requests.
|
| - *
|
| - * The states listed in the event are state_type values, and might
|
| - * change due to a client request or an event directly handled by
|
| - * the compositor.
|
| - *
|
| - * Clients should arrange their surface for the new state, and then
|
| - * send an ack_configure request with the serial sent in this
|
| - * configure event at some point before committing the new surface.
|
| - *
|
| - * 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 5
|
| - */
|
| - void (*configure)(void *data,
|
| + /**
|
| + * suggest a surface change
|
| + *
|
| + * The configure event asks the client to change surface state.
|
| + *
|
| + * The client must apply the origin offset to window positions in
|
| + * set_window_geometry requests.
|
| + *
|
| + * The states listed in the event are state_type values, and might
|
| + * change due to a client request or an event directly handled by
|
| + * the compositor.
|
| + *
|
| + * Clients should arrange their surface for the new state, and then
|
| + * send an ack_configure request with the serial sent in this
|
| + * configure event at some point before committing the new surface.
|
| + *
|
| + * 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 6
|
| + */
|
| + void (*configure)(void *data,
|
| struct zcr_remote_surface_v1 *zcr_remote_surface_v1,
|
| int32_t origin_offset_x,
|
| int32_t origin_offset_y,
|
| @@ -503,7 +503,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,
|
| @@ -535,8 +535,10 @@ zcr_remote_surface_v1_add_listener(struct zcr_remote_surface_v1 *zcr_remote_surf
|
| #define ZCR_REMOTE_SURFACE_V1_SET_SYSTEMUI_VISIBILITY 19
|
| #define ZCR_REMOTE_SURFACE_V1_SET_ALWAYS_ON_TOP 20
|
| #define ZCR_REMOTE_SURFACE_V1_UNSET_ALWAYS_ON_TOP 21
|
| -#define ZCR_REMOTE_SURFACE_V1_ACK_CONFIGURE 22
|
| -#define ZCR_REMOTE_SURFACE_V1_MOVE 23
|
| +#define ZCR_REMOTE_SURFACE_V1_SET_ICON_PNG_CHUNK 22
|
| +#define ZCR_REMOTE_SURFACE_V1_RESET_ICON_PNG 23
|
| +#define ZCR_REMOTE_SURFACE_V1_ACK_CONFIGURE 24
|
| +#define ZCR_REMOTE_SURFACE_V1_MOVE 25
|
|
|
| /**
|
| * @ingroup iface_zcr_remote_surface_v1
|
| @@ -549,7 +551,7 @@ zcr_remote_surface_v1_add_listener(struct zcr_remote_surface_v1 *zcr_remote_surf
|
| /**
|
| * @ingroup iface_zcr_remote_surface_v1
|
| */
|
| -#define ZCR_REMOTE_SURFACE_V1_CONFIGURE_SINCE_VERSION 5
|
| +#define ZCR_REMOTE_SURFACE_V1_CONFIGURE_SINCE_VERSION 6
|
|
|
| /**
|
| * @ingroup iface_zcr_remote_surface_v1
|
| @@ -642,11 +644,19 @@ zcr_remote_surface_v1_add_listener(struct zcr_remote_surface_v1 *zcr_remote_surf
|
| /**
|
| * @ingroup iface_zcr_remote_surface_v1
|
| */
|
| -#define ZCR_REMOTE_SURFACE_V1_ACK_CONFIGURE_SINCE_VERSION 5
|
| +#define ZCR_REMOTE_SURFACE_V1_SET_ICON_PNG_CHUNK_SINCE_VERSION 5
|
| +/**
|
| + * @ingroup iface_zcr_remote_surface_v1
|
| + */
|
| +#define ZCR_REMOTE_SURFACE_V1_RESET_ICON_PNG_SINCE_VERSION 5
|
| /**
|
| * @ingroup iface_zcr_remote_surface_v1
|
| */
|
| -#define ZCR_REMOTE_SURFACE_V1_MOVE_SINCE_VERSION 5
|
| +#define ZCR_REMOTE_SURFACE_V1_ACK_CONFIGURE_SINCE_VERSION 6
|
| +/**
|
| + * @ingroup iface_zcr_remote_surface_v1
|
| + */
|
| +#define ZCR_REMOTE_SURFACE_V1_MOVE_SINCE_VERSION 6
|
|
|
| /** @ingroup iface_zcr_remote_surface_v1 */
|
| static inline void
|
| @@ -983,14 +993,13 @@ zcr_remote_surface_v1_set_rectangular_surface_shadow(struct zcr_remote_surface_v
|
| /**
|
| * @ingroup iface_zcr_remote_surface_v1
|
| *
|
| - * Requests how the surface will change the visibility of the system UI when it
|
| - * is made active.
|
| + * Requests how the surface will change the visibility of the system UI when it is made active.
|
| */
|
| -static inline void zcr_remote_surface_v1_set_systemui_visibility(
|
| - struct zcr_remote_surface_v1* zcr_remote_surface_v1,
|
| - uint32_t visibility) {
|
| - wl_proxy_marshal((struct wl_proxy*)zcr_remote_surface_v1,
|
| - ZCR_REMOTE_SURFACE_V1_SET_SYSTEMUI_VISIBILITY, visibility);
|
| +static inline void
|
| +zcr_remote_surface_v1_set_systemui_visibility(struct zcr_remote_surface_v1 *zcr_remote_surface_v1, uint32_t visibility)
|
| +{
|
| + wl_proxy_marshal((struct wl_proxy *) zcr_remote_surface_v1,
|
| + ZCR_REMOTE_SURFACE_V1_SET_SYSTEMUI_VISIBILITY, visibility);
|
| }
|
|
|
| /**
|
| @@ -1002,10 +1011,11 @@ static inline void zcr_remote_surface_v1_set_systemui_visibility(
|
| * The compositor may choose to ignore this request.
|
| *
|
| */
|
| -static inline void zcr_remote_surface_v1_set_always_on_top(
|
| - struct zcr_remote_surface_v1* zcr_remote_surface_v1) {
|
| - wl_proxy_marshal((struct wl_proxy*)zcr_remote_surface_v1,
|
| - ZCR_REMOTE_SURFACE_V1_SET_ALWAYS_ON_TOP);
|
| +static inline void
|
| +zcr_remote_surface_v1_set_always_on_top(struct zcr_remote_surface_v1 *zcr_remote_surface_v1)
|
| +{
|
| + wl_proxy_marshal((struct wl_proxy *) zcr_remote_surface_v1,
|
| + ZCR_REMOTE_SURFACE_V1_SET_ALWAYS_ON_TOP);
|
| }
|
|
|
| /**
|
| @@ -1016,10 +1026,43 @@ static inline void zcr_remote_surface_v1_set_always_on_top(
|
| * This is only a request that the window should be not always on top.
|
| * The compositor may choose to ignore this request.
|
| */
|
| -static inline void zcr_remote_surface_v1_unset_always_on_top(
|
| - struct zcr_remote_surface_v1* zcr_remote_surface_v1) {
|
| - wl_proxy_marshal((struct wl_proxy*)zcr_remote_surface_v1,
|
| - ZCR_REMOTE_SURFACE_V1_UNSET_ALWAYS_ON_TOP);
|
| +static inline void
|
| +zcr_remote_surface_v1_unset_always_on_top(struct zcr_remote_surface_v1 *zcr_remote_surface_v1)
|
| +{
|
| + wl_proxy_marshal((struct wl_proxy *) zcr_remote_surface_v1,
|
| + ZCR_REMOTE_SURFACE_V1_UNSET_ALWAYS_ON_TOP);
|
| +}
|
| +
|
| +/**
|
| + * @ingroup iface_zcr_remote_surface_v1
|
| + *
|
| + * Set a chunk of surface custom icon compressed in png format.
|
| + *
|
| + * This icon may be used to show the task icon in a task bar.
|
| + *
|
| + * If flag contains 0x1 bit then this is the first chunk of data.
|
| + * If flag contains 0x2 bit then this is the last chunk of data.
|
| + * Both bits may be set or not set.
|
| + */
|
| +static inline void
|
| +zcr_remote_surface_v1_set_icon_png_chunk(struct zcr_remote_surface_v1 *zcr_remote_surface_v1, uint32_t flags, struct wl_array *chunk)
|
| +{
|
| + wl_proxy_marshal((struct wl_proxy *) zcr_remote_surface_v1,
|
| + ZCR_REMOTE_SURFACE_V1_SET_ICON_PNG_CHUNK, flags, chunk);
|
| +}
|
| +
|
| +/**
|
| + * @ingroup iface_zcr_remote_surface_v1
|
| + *
|
| + * This reset any previosly set surface custom icon.
|
| + *
|
| + * Default app icon will be used to show the task icon in a task bar.
|
| + */
|
| +static inline void
|
| +zcr_remote_surface_v1_reset_icon_png(struct zcr_remote_surface_v1 *zcr_remote_surface_v1)
|
| +{
|
| + wl_proxy_marshal((struct wl_proxy *) zcr_remote_surface_v1,
|
| + ZCR_REMOTE_SURFACE_V1_RESET_ICON_PNG);
|
| }
|
|
|
| /**
|
|
|