third_party: Amend version 3 of remote shell protocol

third_party/wayland-protocols/include/protocol/remote-shell-unstable-v1-client-protocol.h

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 e537817a8ea37096a402188311ccf1937f983a66..1590041142dec3f66b51f3d69c133f1a2d4563d8 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
@@ -188,6 +188,10 @@ enum zcr_remote_shell_v1_state_type {
 	 * trusted pinned window state
 	 */
 	ZCR_REMOTE_SHELL_V1_STATE_TYPE_TRUSTED_PINNED = 6,
+	/**
+	 * moving window state
+	 */
+	ZCR_REMOTE_SHELL_V1_STATE_TYPE_MOVING = 7,
 };
 #endif /* ZCR_REMOTE_SHELL_V1_STATE_TYPE_ENUM */
 
@@ -258,7 +262,7 @@ struct zcr_remote_shell_v1_listener {
 };
 
 /**
- * @ingroup zcr_remote_shell_v1_iface
+ * @ingroup iface_zcr_remote_shell_v1
  */
 static inline int
 zcr_remote_shell_v1_add_listener(struct zcr_remote_shell_v1 *zcr_remote_shell_v1,
@@ -268,22 +272,31 @@ 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
+#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_ACTIVATED_SINCE_VERSION 1
+/**
+ * @ingroup iface_zcr_remote_shell_v1
+ */
+#define ZCR_REMOTE_SHELL_V1_CONFIGURATION_CHANGED_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_DESTROY_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_REMOTE_SURFACE_SINCE_VERSION 1
+/**
+ * @ingroup iface_zcr_remote_shell_v1
+ */
+#define ZCR_REMOTE_SHELL_V1_GET_NOTIFICATION_SURFACE_SINCE_VERSION 1
 
 /** @ingroup iface_zcr_remote_shell_v1 */
 static inline void
@@ -385,8 +398,8 @@ struct zcr_remote_surface_v1_listener {
 	/**
 	 * surface state type changed
 	 *
-	 * The state_type_changed event is sent by the compositor when
-	 * the surface state changed.
+	 * [Deprecated] The state_type_changed event is sent by the
+	 * compositor when the surface state changed.
 	 *
 	 * This is an event to notify that the window state changed in
 	 * compositor. The state change may be triggered by a client's
@@ -407,6 +420,10 @@ struct zcr_remote_surface_v1_listener {
 	 * positions in set_window_geometry requests by this origin in
 	 * order to convert between coordinate spaces.
 	 *
+	 * 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.
@@ -420,11 +437,12 @@ struct zcr_remote_surface_v1_listener {
 			  struct zcr_remote_surface_v1 *zcr_remote_surface_v1,
 			  int32_t origin_x,
 			  int32_t origin_y,
+			  struct wl_array *states,
 			  uint32_t serial);
 };
 
 /**
- * @ingroup zcr_remote_surface_v1_iface
+ * @ingroup iface_zcr_remote_surface_v1
  */
 static inline int
 zcr_remote_surface_v1_add_listener(struct zcr_remote_surface_v1 *zcr_remote_surface_v1,
@@ -434,117 +452,125 @@ 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_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
+#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_MOVE 20
 
 /**
  * @ingroup iface_zcr_remote_surface_v1
  */
-#define ZCR_REMOTE_SURFACE_V1_DESTROY_SINCE_VERSION	1
+#define ZCR_REMOTE_SURFACE_V1_CLOSE_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_STATE_TYPE_CHANGED_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_CONFIGURE_SINCE_VERSION 3
+
 /**
  * @ingroup iface_zcr_remote_surface_v1
  */
-#define ZCR_REMOTE_SURFACE_V1_SET_SCALE_SINCE_VERSION	1
+#define ZCR_REMOTE_SURFACE_V1_DESTROY_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_APP_ID_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_WINDOW_GEOMETRY_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_SCALE_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_SET_RECTANGULAR_SHADOW_SINCE_VERSION 1
 /**
  * @ingroup iface_zcr_remote_surface_v1
  */
-#define ZCR_REMOTE_SURFACE_V1_ACTIVATE_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_MAXIMIZE_SINCE_VERSION	1
+#define ZCR_REMOTE_SURFACE_V1_SET_TITLE_SINCE_VERSION 1
 /**
  * @ingroup iface_zcr_remote_surface_v1
  */
-#define ZCR_REMOTE_SURFACE_V1_MINIMIZE_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_RESTORE_SINCE_VERSION	1
+#define ZCR_REMOTE_SURFACE_V1_ACTIVATE_SINCE_VERSION 1
 /**
  * @ingroup iface_zcr_remote_surface_v1
  */
-#define ZCR_REMOTE_SURFACE_V1_FULLSCREEN_SINCE_VERSION	1
+#define ZCR_REMOTE_SURFACE_V1_MAXIMIZE_SINCE_VERSION 1
 /**
  * @ingroup iface_zcr_remote_surface_v1
  */
-#define ZCR_REMOTE_SURFACE_V1_UNFULLSCREEN_SINCE_VERSION	1
+#define ZCR_REMOTE_SURFACE_V1_MINIMIZE_SINCE_VERSION 1
 /**
  * @ingroup iface_zcr_remote_surface_v1
  */
-#define ZCR_REMOTE_SURFACE_V1_PIN_SINCE_VERSION	1
+#define ZCR_REMOTE_SURFACE_V1_RESTORE_SINCE_VERSION 1
 /**
  * @ingroup iface_zcr_remote_surface_v1
  */
-#define ZCR_REMOTE_SURFACE_V1_UNPIN_SINCE_VERSION	1
+#define ZCR_REMOTE_SURFACE_V1_FULLSCREEN_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_UNFULLSCREEN_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_PIN_SINCE_VERSION 1
 /**
  * @ingroup iface_zcr_remote_surface_v1
  */
-#define ZCR_REMOTE_SURFACE_V1_SET_RECTANGULAR_SURFACE_SHADOW_SINCE_VERSION	2
+#define ZCR_REMOTE_SURFACE_V1_UNPIN_SINCE_VERSION 1
 /**
  * @ingroup iface_zcr_remote_surface_v1
  */
-#define ZCR_REMOTE_SURFACE_V1_ACK_CONFIGURE_SINCE_VERSION	3
+#define ZCR_REMOTE_SURFACE_V1_SET_SYSTEM_MODAL_SINCE_VERSION 1
 /**
  * @ingroup iface_zcr_remote_surface_v1
  */
-#define ZCR_REMOTE_SURFACE_V1_SET_MOVING_SINCE_VERSION	3
+#define ZCR_REMOTE_SURFACE_V1_UNSET_SYSTEM_MODAL_SINCE_VERSION 1
 /**
  * @ingroup iface_zcr_remote_surface_v1
  */
-#define ZCR_REMOTE_SURFACE_V1_UNSET_MOVING_SINCE_VERSION	3
+#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 3
+/**
+ * @ingroup iface_zcr_remote_surface_v1
+ */
+#define ZCR_REMOTE_SURFACE_V1_MOVE_SINCE_VERSION 3
 
 /** @ingroup iface_zcr_remote_surface_v1 */
 static inline void
@@ -911,38 +937,31 @@ zcr_remote_surface_v1_ack_configure(struct zcr_remote_surface_v1 *zcr_remote_sur
 /**
  * @ingroup iface_zcr_remote_surface_v1
  *
- * Notifies the compositor when an interactive, user-driven move of the
- * surface starts. The compositor may assume that subsequent
- * set_window_geometry requests are position updates until it receives a
- * unset_moving request.
- */
-static inline void
-zcr_remote_surface_v1_set_moving(struct zcr_remote_surface_v1 *zcr_remote_surface_v1)
-{
-	wl_proxy_marshal((struct wl_proxy *) zcr_remote_surface_v1,
-			 ZCR_REMOTE_SURFACE_V1_SET_MOVING);
-}
-
-/**
- * @ingroup iface_zcr_remote_surface_v1
+ * 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.
  *
- * Notifies the compositor when an interactive, user-driven move of the
- * surface stops. The compositor may choose to stop the move regardless
- * of this request.
+ * The compositor may ignore move requests depending on the state of the
+ * surface, e.g. fullscreen or maximized.
  */
 static inline void
-zcr_remote_surface_v1_unset_moving(struct zcr_remote_surface_v1 *zcr_remote_surface_v1)
+zcr_remote_surface_v1_move(struct zcr_remote_surface_v1 *zcr_remote_surface_v1)
 {
 	wl_proxy_marshal((struct wl_proxy *) zcr_remote_surface_v1,
-			 ZCR_REMOTE_SURFACE_V1_UNSET_MOVING);
+			 ZCR_REMOTE_SURFACE_V1_MOVE);
 }
 
-#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