Index: third_party/wayland-protocols/include/protocol/remote-shell-unstable-v1-server-protocol.h |
diff --git a/third_party/wayland-protocols/include/protocol/remote-shell-unstable-v1-server-protocol.h b/third_party/wayland-protocols/include/protocol/remote-shell-unstable-v1-server-protocol.h |
index 79a014bca4da81cdb0a568e1a56aebaef831c2be..56f525b3255498f1e1132345e6b34f0505b8b189 100644 |
--- a/third_party/wayland-protocols/include/protocol/remote-shell-unstable-v1-server-protocol.h |
+++ b/third_party/wayland-protocols/include/protocol/remote-shell-unstable-v1-server-protocol.h |
@@ -295,11 +295,11 @@ struct zcr_remote_shell_v1_interface { |
/** |
* @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 |
@@ -367,18 +367,18 @@ zcr_remote_shell_v1_send_configure(struct wl_resource *resource_, uint32_t layou |
* 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 */ |
@@ -631,85 +631,113 @@ struct zcr_remote_surface_v1_interface { |
int32_t y, |
int32_t width, |
int32_t height); |
- /** |
- * requests the system ui visibility behavior for the surface |
- * |
- * Requests how the surface will change the visibility of the |
- * system UI when it is made active. |
- * @since 3 |
- */ |
- void (*set_systemui_visibility)(struct wl_client* client, |
- struct wl_resource* resource, |
- uint32_t visibility); |
- /** |
- * set always on top |
- * |
- * Request that surface is made to be always on top. |
- * |
- * This is only a request that the window should be always on top. |
- * The compositor may choose to ignore this request. |
- * @since 4 |
- */ |
- void (*set_always_on_top)(struct wl_client* client, |
- struct wl_resource* resource); |
- /** |
- * unset always on top |
- * |
- * Request that surface is made to be not 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. |
- * @since 4 |
- */ |
- void (*unset_always_on_top)(struct wl_client* client, |
- struct wl_resource* resource); |
- /** |
- * ack a configure event |
- * |
- * 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 |
- * request, passing along the serial of the configure event. |
- * |
- * For instance, the compositor might use this information during |
- * display configuration to change its coordinate space for |
- * set_window_geometry requests only when the client has switched |
- * to the new coordinate space. |
- * |
- * If the client receives multiple configure events before it can |
- * respond to one, it only has to ack the last configure event. |
- * |
- * A client is not required to commit immediately after sending an |
- * ack_configure request - it may even ack_configure several times |
- * before its next surface commit. |
- * |
- * A client may send multiple ack_configure requests before |
- * committing, but only the last request sent before a commit |
- * indicates which configure event the client really is responding |
- * to. |
- * @param serial the serial from the configure event |
- * @since 5 |
- */ |
- void (*ack_configure)(struct wl_client* client, |
- struct wl_resource* resource, |
- uint32_t serial); |
- /** |
- * start an interactive move |
- * |
- * Start an interactive, user-driven move of the surface. |
- * |
- * The compositor responds to this request with a configure event |
- * that transitions to the "moving" state. The client must only |
- * initiate motion after acknowledging the state change. The |
- * compositor can assume that subsequent set_window_geometry |
- * requests are position updates until the next state transition is |
- * acknowledged. |
- * |
- * The compositor may ignore move requests depending on the state |
- * of the surface, e.g. fullscreen or maximized. |
- * @since 5 |
- */ |
- void (*move)(struct wl_client* client, struct wl_resource* resource); |
+ /** |
+ * requests the system ui visibility behavior for the surface |
+ * |
+ * Requests how the surface will change the visibility of the |
+ * system UI when it is made active. |
+ * @since 3 |
+ */ |
+ void (*set_systemui_visibility)(struct wl_client *client, |
+ struct wl_resource *resource, |
+ uint32_t visibility); |
+ /** |
+ * set always on top |
+ * |
+ * Request that surface is made to be always on top. |
+ * |
+ * This is only a request that the window should be always on top. |
+ * The compositor may choose to ignore this request. |
+ * @since 4 |
+ */ |
+ void (*set_always_on_top)(struct wl_client *client, |
+ struct wl_resource *resource); |
+ /** |
+ * unset always on top |
+ * |
+ * Request that surface is made to be not 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. |
+ * @since 4 |
+ */ |
+ void (*unset_always_on_top)(struct wl_client *client, |
+ struct wl_resource *resource); |
+ /** |
+ * Set a chunk of surface icon |
+ * |
+ * 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. |
+ * @since 5 |
+ */ |
+ void (*set_icon_png_chunk)(struct wl_client *client, |
+ struct wl_resource *resource, |
+ uint32_t flags, |
+ struct wl_array *chunk); |
+ /** |
+ * Reset surface icon |
+ * |
+ * This reset any previosly set surface custom icon. |
+ * |
+ * Default app icon will be used to show the task icon in a task |
+ * bar. |
+ * @since 5 |
+ */ |
+ void (*reset_icon_png)(struct wl_client *client, |
+ struct wl_resource *resource); |
+ /** |
+ * ack a configure event |
+ * |
+ * 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 |
+ * request, passing along the serial of the configure event. |
+ * |
+ * For instance, the compositor might use this information during |
+ * display configuration to change its coordinate space for |
+ * set_window_geometry requests only when the client has switched |
+ * to the new coordinate space. |
+ * |
+ * If the client receives multiple configure events before it can |
+ * respond to one, it only has to ack the last configure event. |
+ * |
+ * A client is not required to commit immediately after sending an |
+ * ack_configure request - it may even ack_configure several times |
+ * before its next surface commit. |
+ * |
+ * A client may send multiple ack_configure requests before |
+ * committing, but only the last request sent before a commit |
+ * indicates which configure event the client really is responding |
+ * to. |
+ * @param serial the serial from the configure event |
+ * @since 6 |
+ */ |
+ void (*ack_configure)(struct wl_client *client, |
+ struct wl_resource *resource, |
+ uint32_t serial); |
+ /** |
+ * start an interactive move |
+ * |
+ * Start an interactive, user-driven move of the surface. |
+ * |
+ * The compositor responds to this request with a configure event |
+ * that transitions to the "moving" state. The client must only |
+ * initiate motion after acknowledging the state change. The |
+ * compositor can assume that subsequent set_window_geometry |
+ * requests are position updates until the next state transition is |
+ * acknowledged. |
+ * |
+ * The compositor may ignore move requests depending on the state |
+ * of the surface, e.g. fullscreen or maximized. |
+ * @since 6 |
+ */ |
+ void (*move)(struct wl_client *client, |
+ struct wl_resource *resource); |
}; |
#define ZCR_REMOTE_SURFACE_V1_CLOSE 0 |
@@ -727,7 +755,7 @@ struct zcr_remote_surface_v1_interface { |
/** |
* @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 |
@@ -820,11 +848,19 @@ struct zcr_remote_surface_v1_interface { |
/** |
* @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_ACK_CONFIGURE_SINCE_VERSION 6 |
/** |
* @ingroup iface_zcr_remote_surface_v1 |
*/ |
-#define ZCR_REMOTE_SURFACE_V1_MOVE_SINCE_VERSION 5 |
+#define ZCR_REMOTE_SURFACE_V1_MOVE_SINCE_VERSION 6 |
/** |
* @ingroup iface_zcr_remote_surface_v1 |