third_party: Update wayland-protocols to 1.7.

BUG=631960,648028
TBR=piman@chromium.org

Review-Url: https://codereview.chromium.org/2350593002
Cr-Commit-Position: refs/heads/master@{#419397}

DEPS

@@ -414,7 +414,7 @@ deps_os = {
 
     # Wayland protocols that add functionality not available in the core protocol.
     'src/third_party/wayland-protocols/src':
-     Var('chromium_git') + '/external/anongit.freedesktop.org/git/wayland/wayland-protocols.git' + '@' + '65d09ef404fb26cb513f4f836e904f415c425a8f',
+     Var('chromium_git') + '/external/anongit.freedesktop.org/git/wayland/wayland-protocols.git' + '@' + '2e541a36deff5f2e16e25e27f7f93d26822eecc2',
 
     # Wireless Display Software. Used on Chrome OS.
     'src/third_party/wds/src':

third_party/wayland-protocols/README.chromium

 Name: wayland-protocols
 URL: http://wayland.freedesktop.org/
-Version: 1.4
+Version: 1.7
 License: MIT
 License File: src/COPYING
 Security Critical: yes
@@ -13,34 +13,34 @@ protocol either in Wayland core, or some other protocol in
 wayland-protocols.
 
 To import a new snapshot of wayland-protocols:
-- Checkout the latest release tag: git checkout 1.4
+- Checkout the latest release tag: git checkout 1.7
 - Change the DEPS entry to the newly checked out commit.
 - Update generated files:
-    wayland-scanner code < src/*/xdg-shell/xdg-shell*.xml > protocol/xdg-shell-protocol.c
+    wayland-scanner code < src/unstable/xdg-shell/xdg-shell-unstable-v5.xml > protocol/xdg-shell-protocol.c
     wayland-scanner server-header < src/unstable/xdg-shell/xdg-shell-unstable-v5.xml > include/protocol/xdg-shell-unstable-v5-server-protocol.h
     wayland-scanner client-header < src/unstable/xdg-shell/xdg-shell-unstable-v5.xml > include/protocol/xdg-shell-unstable-v5-client-protocol.h
-    wayland-scanner code < src/*/linux-dmabuf/linux-dmabuf*.xml > protocol/linux-dmabuf-protocol.c
+    wayland-scanner code < src/unstable/linux-dmabuf/linux-dmabuf-unstable-v1.xml > protocol/linux-dmabuf-protocol.c
     wayland-scanner server-header < src/unstable/linux-dmabuf/linux-dmabuf-unstable-v1.xml > include/protocol/linux-dmabuf-unstable-v1-server-protocol.h
     wayland-scanner client-header < src/unstable/linux-dmabuf/linux-dmabuf-unstable-v1.xml > include/protocol/linux-dmabuf-unstable-v1-client-protocol.h
-    wayland-scanner code < src/*/viewporter/viewporter.xml > protocol/viewporter-protocol.c
+    wayland-scanner code < src/stable/viewporter/viewporter.xml > protocol/viewporter-protocol.c
     wayland-scanner server-header < src/stable/viewporter/viewporter.xml > include/protocol/viewporter-server-protocol.h
     wayland-scanner client-header < src/stable/viewporter/viewporter.xml > include/protocol/viewporter-client-protocol.h
-    wayland-scanner code < */secure-output/secure-output-unstable-v1.xml > protocol/secure-output-protocol.c
+    wayland-scanner code < unstable/secure-output/secure-output-unstable-v1.xml > protocol/secure-output-protocol.c
     wayland-scanner server-header < unstable/secure-output/secure-output-unstable-v1.xml > include/protocol/secure-output-unstable-v1-server-protocol.h
     wayland-scanner client-header < unstable/secure-output/secure-output-unstable-v1.xml > include/protocol/secure-output-unstable-v1-client-protocol.h
-    wayland-scanner code < */alpha-compositing/alpha-compositing-unstable-v1.xml > protocol/alpha-compositing-protocol.c
+    wayland-scanner code < unstable/alpha-compositing/alpha-compositing-unstable-v1.xml > protocol/alpha-compositing-protocol.c
     wayland-scanner server-header < unstable/alpha-compositing/alpha-compositing-unstable-v1.xml > include/protocol/alpha-compositing-unstable-v1-server-protocol.h
     wayland-scanner client-header < unstable/alpha-compositing/alpha-compositing-unstable-v1.xml > include/protocol/alpha-compositing-unstable-v1-client-protocol.h
-    wayland-scanner code < */remote-shell/remote-shell-unstable-v1.xml > protocol/remote-shell-protocol.c
+    wayland-scanner code < unstable/remote-shell/remote-shell-unstable-v1.xml > protocol/remote-shell-protocol.c
     wayland-scanner server-header < unstable/remote-shell/remote-shell-unstable-v1.xml > include/protocol/remote-shell-unstable-v1-server-protocol.h
     wayland-scanner client-header < unstable/remote-shell/remote-shell-unstable-v1.xml > include/protocol/remote-shell-unstable-v1-client-protocol.h
-    wayland-scanner code < */vsync-feedback/vsync-feedback-unstable-v1.xml > protocol/vsync-feedback-protocol.c
+    wayland-scanner code < unstable/vsync-feedback/vsync-feedback-unstable-v1.xml > protocol/vsync-feedback-protocol.c
     wayland-scanner server-header < unstable/vsync-feedback/vsync-feedback-unstable-v1.xml > include/protocol/vsync-feedback-unstable-v1-server-protocol.h
     wayland-scanner client-header < unstable/vsync-feedback/vsync-feedback-unstable-v1.xml > include/protocol/vsync-feedback-unstable-v1-client-protocol.h
-    wayland-scanner code < */gaming-input/gaming-input-unstable-v1.xml > protocol/gaming-input-protocol.c
+    wayland-scanner code < unstable/gaming-input/gaming-input-unstable-v1.xml > protocol/gaming-input-protocol.c
     wayland-scanner server-header < unstable/gaming-input/gaming-input-unstable-v1.xml > include/protocol/gaming-input-unstable-v1-server-protocol.h
     wayland-scanner client-header < unstable/gaming-input/gaming-input-unstable-v1.xml > include/protocol/gaming-input-unstable-v1-client-protocol.h
-    wayland-scanner code < */stylus/stylus-unstable-v1.xml > protocol/stylus-protocol.c
+    wayland-scanner code < unstable/stylus/stylus-unstable-v1.xml > protocol/stylus-protocol.c
     wayland-scanner server-header < unstable/stylus/stylus-unstable-v1.xml > include/protocol/stylus-unstable-v1-server-protocol.h
     wayland-scanner client-header < unstable/stylus/stylus-unstable-v1.xml > include/protocol/stylus-unstable-v1-client-protocol.h
 - Update this README to reflect the new version number.

third_party/wayland-protocols/include/protocol/gaming-input-unstable-v1-server-protocol.h

-/* 
+/* Generated by wayland-scanner 1.11.0 */
+
+#ifndef GAMING_INPUT_UNSTABLE_V1_SERVER_PROTOCOL_H
+#define GAMING_INPUT_UNSTABLE_V1_SERVER_PROTOCOL_H
+
+#include <stdint.h>
+#include <stddef.h>
+#include "wayland-server.h"
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+struct wl_client;
+struct wl_resource;
+
+/**
+ * @page page_gaming_input_unstable_v1 The gaming_input_unstable_v1 protocol
+ * @section page_ifaces_gaming_input_unstable_v1 Interfaces
+ * - @subpage page_iface_zwp_gaming_input_v1 - extends wl_seat with gaming input devices
+ * - @subpage page_iface_zwp_gamepad_v1 - gamepad input device
+ * @section page_copyright_gaming_input_unstable_v1 Copyright
+ * <pre>
+ *
  * Copyright 2016 The Chromium Authors.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice (including the next
  * paragraph) shall be included in all copies or substantial portions of the
  * Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@@ -19,31 +42,33 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
+ * </pre>
  */
-
-#ifndef GAMING_INPUT_UNSTABLE_V1_SERVER_PROTOCOL_H
-#define GAMING_INPUT_UNSTABLE_V1_SERVER_PROTOCOL_H
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#include <stdint.h>
-#include <stddef.h>
-#include "wayland-util.h"
-
-struct wl_client;
-struct wl_resource;
-
-struct zwp_gaming_input_v1;
+struct wl_seat;
 struct zwp_gamepad_v1;
+struct zwp_gaming_input_v1;
 
-extern const struct wl_interface zwp_gaming_input_v1_interface;
-extern const struct wl_interface zwp_gamepad_v1_interface;
-
 /**
- * zwp_gaming_input_v1 - extends wl_seat with gaming input devices
- * @get_gamepad: get gamepad device assigned to seat
+ * @page page_iface_zwp_gaming_input_v1 zwp_gaming_input_v1
+ * @section page_iface_zwp_gaming_input_v1_desc Description
+ *
+ * A global interface to provide gaming input devices for a given seat.
+ *
+ * Currently only gamepad devices are supported.
+ *
+ * Warning! The protocol described in this file is experimental and
+ * backward incompatible changes may be made. Backward compatible changes
+ * may be added together with the corresponding uinterface version bump.
+ * Backward incompatible changes are done by bumping the version number in
+ * the protocol and uinterface names and resetting the interface version.
+ * Once the protocol is to be declared stable, the 'z' prefix and the
+ * version number in the protocol and interface names are removed and the
+ * interface version number is reset.
+ * @section page_iface_zwp_gaming_input_v1_api API
+ * See @ref iface_zwp_gaming_input_v1.
+ */
+/**
+ * @defgroup iface_zwp_gaming_input_v1 The zwp_gaming_input_v1 interface
  *
  * A global interface to provide gaming input devices for a given seat.
  *
@@ -58,11 +83,33 @@ extern const struct wl_interface zwp_gamepad_v1_interface;
  * version number in the protocol and interface names are removed and the
  * interface version number is reset.
  */
+extern const struct wl_interface zwp_gaming_input_v1_interface;
+/**
+ * @page page_iface_zwp_gamepad_v1 zwp_gamepad_v1
+ * @section page_iface_zwp_gamepad_v1_desc Description
+ *
+ * The zwp_gamepad_v1 interface represents one or more gamepad input devices,
+ * which are reported as a normalized 'Standard Gamepad' as it is specified
+ * by the W3C Gamepad API at: https://w3c.github.io/gamepad/#remapping
+ * @section page_iface_zwp_gamepad_v1_api API
+ * See @ref iface_zwp_gamepad_v1.
+ */
+/**
+ * @defgroup iface_zwp_gamepad_v1 The zwp_gamepad_v1 interface
+ *
+ * The zwp_gamepad_v1 interface represents one or more gamepad input devices,
+ * which are reported as a normalized 'Standard Gamepad' as it is specified
+ * by the W3C Gamepad API at: https://w3c.github.io/gamepad/#remapping
+ */
+extern const struct wl_interface zwp_gamepad_v1_interface;
+
+/**
+ * @ingroup iface_zwp_gaming_input_v1
+ * @struct zwp_gaming_input_v1_interface
+ */
 struct zwp_gaming_input_v1_interface {
 	/**
-	 * get_gamepad - get gamepad device assigned to seat
-	 * @id: (none)
-	 * @seat: (none)
+	 * get gamepad device assigned to seat
 	 *
 	 * Create gamepad object. See zwp_gamepad_v1 interface for
 	 * details.
@@ -73,17 +120,21 @@ struct zwp_gaming_input_v1_interface {
 			    struct wl_resource *seat);
 };
 
+
 #ifndef ZWP_GAMEPAD_V1_GAMEPAD_STATE_ENUM
 #define ZWP_GAMEPAD_V1_GAMEPAD_STATE_ENUM
 /**
- * zwp_gamepad_v1_gamepad_state - connection state
- * @ZWP_GAMEPAD_V1_GAMEPAD_STATE_OFF: no gamepads are connected or on.
- * @ZWP_GAMEPAD_V1_GAMEPAD_STATE_ON: at least one gamepad is connected.
- *
- * 
+ * @ingroup iface_zwp_gamepad_v1
+ * connection state
  */
 enum zwp_gamepad_v1_gamepad_state {
+	/**
+	 * no gamepads are connected or on.
+	 */
 	ZWP_GAMEPAD_V1_GAMEPAD_STATE_OFF = 0,
+	/**
+	 * at least one gamepad is connected.
+	 */
 	ZWP_GAMEPAD_V1_GAMEPAD_STATE_ON = 1,
 };
 #endif /* ZWP_GAMEPAD_V1_GAMEPAD_STATE_ENUM */
@@ -91,31 +142,31 @@ enum zwp_gamepad_v1_gamepad_state {
 #ifndef ZWP_GAMEPAD_V1_BUTTON_STATE_ENUM
 #define ZWP_GAMEPAD_V1_BUTTON_STATE_ENUM
 /**
- * zwp_gamepad_v1_button_state - physical button state
- * @ZWP_GAMEPAD_V1_BUTTON_STATE_RELEASED: the button is not pressed
- * @ZWP_GAMEPAD_V1_BUTTON_STATE_PRESSED: the button is pressed
+ * @ingroup iface_zwp_gamepad_v1
+ * physical button state
  *
  * Describes the physical state of a button that produced the button
  * event.
  */
 enum zwp_gamepad_v1_button_state {
+	/**
+	 * the button is not pressed
+	 */
 	ZWP_GAMEPAD_V1_BUTTON_STATE_RELEASED = 0,
+	/**
+	 * the button is pressed
+	 */
 	ZWP_GAMEPAD_V1_BUTTON_STATE_PRESSED = 1,
 };
 #endif /* ZWP_GAMEPAD_V1_BUTTON_STATE_ENUM */
 
 /**
- * zwp_gamepad_v1 - gamepad input device
- * @destroy: destroy gamepad object
- *
- * The zwp_gamepad_v1 interface represents one or more gamepad input
- * devices, which are reported as a normalized 'Standard Gamepad' as it is
- * specified by the W3C Gamepad API at:
- * https://w3c.github.io/gamepad/#remapping
+ * @ingroup iface_zwp_gamepad_v1
+ * @struct zwp_gamepad_v1_interface
  */
 struct zwp_gamepad_v1_interface {
 	/**
-	 * destroy - destroy gamepad object
+	 * destroy gamepad object
 	 *
 	 * 
 	 */
@@ -128,24 +179,70 @@ struct zwp_gamepad_v1_interface {
 #define ZWP_GAMEPAD_V1_BUTTON	2
 #define ZWP_GAMEPAD_V1_FRAME	3
 
+/**
+ * @ingroup iface_zwp_gamepad_v1
+ */
+#define ZWP_GAMEPAD_V1_STATE_CHANGE_SINCE_VERSION	1
+/**
+ * @ingroup iface_zwp_gamepad_v1
+ */
+#define ZWP_GAMEPAD_V1_AXIS_SINCE_VERSION	1
+/**
+ * @ingroup iface_zwp_gamepad_v1
+ */
+#define ZWP_GAMEPAD_V1_BUTTON_SINCE_VERSION	1
+/**
+ * @ingroup iface_zwp_gamepad_v1
+ */
+#define ZWP_GAMEPAD_V1_FRAME_SINCE_VERSION	1
+
+/**
+ * @ingroup iface_zwp_gamepad_v1
+ * Sends an state_change event to the client owning the resource.
+ * @param resource_ The client's resource
+ * @param state new state
+ */
 static inline void
 zwp_gamepad_v1_send_state_change(struct wl_resource *resource_, uint32_t state)
 {
 	wl_resource_post_event(resource_, ZWP_GAMEPAD_V1_STATE_CHANGE, state);
 }
 
+/**
+ * @ingroup iface_zwp_gamepad_v1
+ * Sends an axis event to the client owning the resource.
+ * @param resource_ The client's resource
+ * @param time timestamp with millisecond granularity
+ * @param axis axis that produced this event
+ * @param value new value of axis
+ */
 static inline void
 zwp_gamepad_v1_send_axis(struct wl_resource *resource_, uint32_t time, uint32_t axis, wl_fixed_t value)
 {
 	wl_resource_post_event(resource_, ZWP_GAMEPAD_V1_AXIS, time, axis, value);
 }
 
+/**
+ * @ingroup iface_zwp_gamepad_v1
+ * Sends an button event to the client owning the resource.
+ * @param resource_ The client's resource
+ * @param time timestamp with millisecond granularity
+ * @param button id of button
+ * @param state digital state of the button
+ * @param analog analog value of the button
+ */
 static inline void
 zwp_gamepad_v1_send_button(struct wl_resource *resource_, uint32_t time, uint32_t button, uint32_t state, wl_fixed_t analog)
 {
 	wl_resource_post_event(resource_, ZWP_GAMEPAD_V1_BUTTON, time, button, state, analog);
 }
 
+/**
+ * @ingroup iface_zwp_gamepad_v1
+ * Sends an frame event to the client owning the resource.
+ * @param resource_ The client's resource
+ * @param time timestamp with millisecond granularity
+ */
 static inline void
 zwp_gamepad_v1_send_frame(struct wl_resource *resource_, uint32_t time)
 {

third_party/wayland-protocols/include/protocol/stylus-unstable-v1-server-protocol.h

-/* 
+/* Generated by wayland-scanner 1.11.0 */
+
+#ifndef STYLUS_UNSTABLE_V1_SERVER_PROTOCOL_H
+#define STYLUS_UNSTABLE_V1_SERVER_PROTOCOL_H
+
+#include <stdint.h>
+#include <stddef.h>
+#include "wayland-server.h"
+
+#ifdef  __cplusplus
+extern "C" {
+#endif
+
+struct wl_client;
+struct wl_resource;
+
+/**
+ * @page page_stylus_unstable_v1 The stylus_unstable_v1 protocol
+ * @section page_ifaces_stylus_unstable_v1 Interfaces
+ * - @subpage page_iface_zwp_stylus_v1 - extends wl_pointer with events for on-screen stylus
+ * - @subpage page_iface_zwp_pointer_stylus_v1 - stylus extension for pointer
+ * @section page_copyright_stylus_unstable_v1 Copyright
+ * <pre>
+ *
  * Copyright 2016 The Chromium Authors.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice (including the next
  * paragraph) shall be included in all copies or substantial portions of the
  * Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@@ -19,39 +42,23 @@
  * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  * DEALINGS IN THE SOFTWARE.
+ * </pre>
  */
-
-#ifndef STYLUS_UNSTABLE_V1_SERVER_PROTOCOL_H
-#define STYLUS_UNSTABLE_V1_SERVER_PROTOCOL_H
-
-#ifdef  __cplusplus
-extern "C" {
-#endif
-
-#include <stdint.h>
-#include <stddef.h>
-#include "wayland-util.h"
-
-struct wl_client;
-struct wl_resource;
-
-struct zwp_stylus_v1;
+struct wl_pointer;
 struct zwp_pointer_stylus_v1;
-
-extern const struct wl_interface zwp_stylus_v1_interface;
-extern const struct wl_interface zwp_pointer_stylus_v1_interface;
+struct zwp_stylus_v1;
 
 /**
- * zwp_stylus_v1 - extends wl_pointer with events for on-screen stylus
- * @get_pointer_stylus: get stylus interface for pointer
+ * @page page_iface_zwp_stylus_v1 zwp_stylus_v1
+ * @section page_iface_zwp_stylus_v1_desc Description
  *
  * Allows a wl_pointer to represent an on-screen stylus. The client can
- * interpret the on-screen stylus like any other mouse device, and use this
- * protocol to obtain detail information about the type of stylus, as well
- * as the force and tilt of the tool.
+ * interpret the on-screen stylus like any other mouse device, and use
+ * this protocol to obtain detail information about the type of stylus,
+ * as well as the force and tilt of the tool.
  *
- * These events are to be fired by the server within the same frame as
- * other wl_pointer events.
+ * These events are to be fired by the server within the same frame as other
+ * wl_pointer events.
  *
  * Warning! The protocol described in this file is experimental and
  * backward incompatible changes may be made. Backward compatible changes
@@ -61,12 +68,54 @@ extern const struct wl_interface zwp_pointer_stylus_v1_interface;
  * Once the protocol is to be declared stable, the 'z' prefix and the
  * version number in the protocol and interface names are removed and the
  * interface version number is reset.
+ * @section page_iface_zwp_stylus_v1_api API
+ * See @ref iface_zwp_stylus_v1.
+ */
+/**
+ * @defgroup iface_zwp_stylus_v1 The zwp_stylus_v1 interface
+ *
+ * Allows a wl_pointer to represent an on-screen stylus. The client can
+ * interpret the on-screen stylus like any other mouse device, and use
+ * this protocol to obtain detail information about the type of stylus,
+ * as well as the force and tilt of the tool.
+ *
+ * These events are to be fired by the server within the same frame as other
+ * wl_pointer events.
+ *
+ * Warning! The protocol described in this file is experimental and
+ * backward incompatible changes may be made. Backward compatible changes
+ * may be added together with the corresponding uinterface version bump.
+ * Backward incompatible changes are done by bumping the version number in
+ * the protocol and uinterface names and resetting the interface version.
+ * Once the protocol is to be declared stable, the 'z' prefix and the
+ * version number in the protocol and interface names are removed and the
+ * interface version number is reset.
+ */
+extern const struct wl_interface zwp_stylus_v1_interface;
+/**
+ * @page page_iface_zwp_pointer_stylus_v1 zwp_pointer_stylus_v1
+ * @section page_iface_zwp_pointer_stylus_v1_desc Description
+ *
+ * The zwp_pointer_stylus_v1 interface extends the wl_pointer interface with
+ * events to describe details about a stylus acting as a pointer.
+ * @section page_iface_zwp_pointer_stylus_v1_api API
+ * See @ref iface_zwp_pointer_stylus_v1.
+ */
+/**
+ * @defgroup iface_zwp_pointer_stylus_v1 The zwp_pointer_stylus_v1 interface
+ *
+ * The zwp_pointer_stylus_v1 interface extends the wl_pointer interface with
+ * events to describe details about a stylus acting as a pointer.
+ */
+extern const struct wl_interface zwp_pointer_stylus_v1_interface;
+
+/**
+ * @ingroup iface_zwp_stylus_v1
+ * @struct zwp_stylus_v1_interface
  */
 struct zwp_stylus_v1_interface {
 	/**
-	 * get_pointer_stylus - get stylus interface for pointer
-	 * @id: (none)
-	 * @pointer: (none)
+	 * get stylus interface for pointer
 	 *
 	 * Create pointer_stylus object. See zwp_pointer_stylus_v1
 	 * interface for details.
@@ -77,36 +126,40 @@ struct zwp_stylus_v1_interface {
 				   struct wl_resource *pointer);
 };
 
+
 #ifndef ZWP_POINTER_STYLUS_V1_TOOL_TYPE_ENUM
 #define ZWP_POINTER_STYLUS_V1_TOOL_TYPE_ENUM
 /**
- * zwp_pointer_stylus_v1_tool_type - tool type of device.
- * @ZWP_POINTER_STYLUS_V1_TOOL_TYPE_MOUSE: Mouse or touchpad, not a
- *	stylus.
- * @ZWP_POINTER_STYLUS_V1_TOOL_TYPE_PEN: Pen
- * @ZWP_POINTER_STYLUS_V1_TOOL_TYPE_TOUCH: Touch
- * @ZWP_POINTER_STYLUS_V1_TOOL_TYPE_ERASER: Eraser
- *
- * 
+ * @ingroup iface_zwp_pointer_stylus_v1
+ * tool type of device.
  */
 enum zwp_pointer_stylus_v1_tool_type {
+	/**
+	 * Mouse or touchpad, not a stylus.
+	 */
 	ZWP_POINTER_STYLUS_V1_TOOL_TYPE_MOUSE = 0,
+	/**
+	 * Pen
+	 */
 	ZWP_POINTER_STYLUS_V1_TOOL_TYPE_PEN = 1,
+	/**
+	 * Touch
+	 */
 	ZWP_POINTER_STYLUS_V1_TOOL_TYPE_TOUCH = 2,
+	/**
+	 * Eraser
+	 */
 	ZWP_POINTER_STYLUS_V1_TOOL_TYPE_ERASER = 3,
 };
 #endif /* ZWP_POINTER_STYLUS_V1_TOOL_TYPE_ENUM */
 
 /**
- * zwp_pointer_stylus_v1 - stylus extension for pointer
- * @destroy: destroy stylus object
- *
- * The zwp_pointer_stylus_v1 interface extends the wl_pointer interface
- * with events to describe details about a stylus acting as a pointer.
+ * @ingroup iface_zwp_pointer_stylus_v1
+ * @struct zwp_pointer_stylus_v1_interface
  */
 struct zwp_pointer_stylus_v1_interface {
 	/**
-	 * destroy - destroy stylus object
+	 * destroy stylus object
 	 *
 	 * 
 	 */
@@ -118,18 +171,52 @@ struct zwp_pointer_stylus_v1_interface {
 #define ZWP_POINTER_STYLUS_V1_FORCE	1
 #define ZWP_POINTER_STYLUS_V1_TILT	2
 
+/**
+ * @ingroup iface_zwp_pointer_stylus_v1
+ */
+#define ZWP_POINTER_STYLUS_V1_TOOL_CHANGE_SINCE_VERSION	1
+/**
+ * @ingroup iface_zwp_pointer_stylus_v1
+ */
+#define ZWP_POINTER_STYLUS_V1_FORCE_SINCE_VERSION	1
+/**
+ * @ingroup iface_zwp_pointer_stylus_v1
+ */
+#define ZWP_POINTER_STYLUS_V1_TILT_SINCE_VERSION	1
+
+/**
+ * @ingroup iface_zwp_pointer_stylus_v1
+ * Sends an tool_change event to the client owning the resource.
+ * @param resource_ The client's resource
+ * @param type new device type
+ */
 static inline void
 zwp_pointer_stylus_v1_send_tool_change(struct wl_resource *resource_, uint32_t type)
 {
 	wl_resource_post_event(resource_, ZWP_POINTER_STYLUS_V1_TOOL_CHANGE, type);
 }
 
+/**
+ * @ingroup iface_zwp_pointer_stylus_v1
+ * Sends an force event to the client owning the resource.
+ * @param resource_ The client's resource
+ * @param time timestamp with millisecond granularity
+ * @param force new value of force
+ */
 static inline void
 zwp_pointer_stylus_v1_send_force(struct wl_resource *resource_, uint32_t time, wl_fixed_t force)
 {
 	wl_resource_post_event(resource_, ZWP_POINTER_STYLUS_V1_FORCE, time, force);
 }
 
+/**
+ * @ingroup iface_zwp_pointer_stylus_v1
+ * Sends an tilt event to the client owning the resource.
+ * @param resource_ The client's resource
+ * @param time timestamp with millisecond granularity
+ * @param tilt_x tilt in x direction
+ * @param tilt_y tilt in y direction
+ */
 static inline void
 zwp_pointer_stylus_v1_send_tilt(struct wl_resource *resource_, uint32_t time, wl_fixed_t tilt_x, wl_fixed_t tilt_y)
 {

third_party/wayland-protocols/protocol/gaming-input-protocol.c

-/* 
+/* Generated by wayland-scanner 1.11.0 */
+
+/*
  * Copyright 2016 The Chromium Authors.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice (including the next
  * paragraph) shall be included in all copies or substantial portions of the
  * Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@@ -25,8 +27,8 @@
 #include <stdint.h>
 #include "wayland-util.h"
 
-extern const struct wl_interface zwp_gamepad_v1_interface;
 extern const struct wl_interface wl_seat_interface;
+extern const struct wl_interface zwp_gamepad_v1_interface;
 
 static const struct wl_interface *types[] = {
 	NULL,

third_party/wayland-protocols/protocol/stylus-protocol.c

-/* 
+/* Generated by wayland-scanner 1.11.0 */
+
+/*
  * Copyright 2016 The Chromium Authors.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice (including the next
  * paragraph) shall be included in all copies or substantial portions of the
  * Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
@@ -25,8 +27,8 @@
 #include <stdint.h>
 #include "wayland-util.h"
 
-extern const struct wl_interface zwp_pointer_stylus_v1_interface;
 extern const struct wl_interface wl_pointer_interface;
+extern const struct wl_interface zwp_pointer_stylus_v1_interface;
 
 static const struct wl_interface *types[] = {
 	NULL,

third_party/wayland-protocols/unstable/stylus/stylus-unstable-v1.xml

@@ -82,7 +82,7 @@
         use. The remaining events of this protocol are only being generated
         after this event has been fired with a tool type other than mouse.
       </description>
-      <arg name="type" type="uint" enum="type" summary="new device type"/>
+      <arg name="type" type="uint" enum="tool_type" summary="new device type"/>
     </event>
 
     <event name="force">