1 files changed, 53 insertions, 51 deletions
diff --git a/src/3rdparty/wayland/wayland-protocol.c b/src/3rdparty/wayland/wayland-protocol.c
index 9ae296a4c..afcd2c9d3 100644
--- a/src/3rdparty/wayland/wayland-protocol.c
+++ b/src/3rdparty/wayland/wayland-protocol.c
@@ -25,12 +25,13 @@
 #include <stdint.h>
 #include "wayland-util.h"
 
-static const struct wl_message display_requests[] = {
+static const struct wl_message wl_display_requests[] = {
+	{ "bind", "usu" },
 	{ "sync", "u" },
 	{ "frame", "ou" },
 };
 
-static const struct wl_message display_events[] = {
+static const struct wl_message wl_display_events[] = {
 	{ "invalid_object", "u" },
 	{ "invalid_method", "uu" },
 	{ "no_memory", "" },
@@ -40,115 +41,116 @@ static const struct wl_message display_events[] = {
 };
 
 WL_EXPORT const struct wl_interface wl_display_interface = {
-	"display", 1,
-	ARRAY_LENGTH(display_requests), display_requests,
-	ARRAY_LENGTH(display_events), display_events,
+	"wl_display", 1,
+	ARRAY_LENGTH(wl_display_requests), wl_display_requests,
+	ARRAY_LENGTH(wl_display_events), wl_display_events,
 };
 
-static const struct wl_message compositor_requests[] = {
+static const struct wl_message wl_compositor_requests[] = {
 	{ "create_surface", "n" },
 };
 
 WL_EXPORT const struct wl_interface wl_compositor_interface = {
-	"compositor", 1,
-	ARRAY_LENGTH(compositor_requests), compositor_requests,
+	"wl_compositor", 1,
+	ARRAY_LENGTH(wl_compositor_requests), wl_compositor_requests,
 	0, NULL,
 };
 
-static const struct wl_message shm_requests[] = {
+static const struct wl_message wl_shm_requests[] = {
 	{ "create_buffer", "nhiiuo" },
 };
 
 WL_EXPORT const struct wl_interface wl_shm_interface = {
-	"shm", 1,
-	ARRAY_LENGTH(shm_requests), shm_requests,
+	"wl_shm", 1,
+	ARRAY_LENGTH(wl_shm_requests), wl_shm_requests,
 	0, NULL,
 };
 
-static const struct wl_message buffer_requests[] = {
+static const struct wl_message wl_buffer_requests[] = {
+	{ "damage", "iiii" },
 	{ "destroy", "" },
 };
 
 WL_EXPORT const struct wl_interface wl_buffer_interface = {
-	"buffer", 1,
-	ARRAY_LENGTH(buffer_requests), buffer_requests,
+	"wl_buffer", 1,
+	ARRAY_LENGTH(wl_buffer_requests), wl_buffer_requests,
 	0, NULL,
 };
 
-static const struct wl_message shell_requests[] = {
+static const struct wl_message wl_shell_requests[] = {
 	{ "move", "oou" },
 	{ "resize", "oouu" },
 	{ "create_drag", "n" },
 	{ "create_selection", "n" },
 };
 
-static const struct wl_message shell_events[] = {
+static const struct wl_message wl_shell_events[] = {
 	{ "configure", "uuoii" },
 };
 
 WL_EXPORT const struct wl_interface wl_shell_interface = {
-	"shell", 1,
-	ARRAY_LENGTH(shell_requests), shell_requests,
-	ARRAY_LENGTH(shell_events), shell_events,
+	"wl_shell", 1,
+	ARRAY_LENGTH(wl_shell_requests), wl_shell_requests,
+	ARRAY_LENGTH(wl_shell_events), wl_shell_events,
 };
 
-static const struct wl_message selection_requests[] = {
+static const struct wl_message wl_selection_requests[] = {
 	{ "offer", "s" },
 	{ "activate", "ou" },
 	{ "destroy", "" },
 };
 
-static const struct wl_message selection_events[] = {
+static const struct wl_message wl_selection_events[] = {
 	{ "send", "sh" },
 	{ "cancelled", "" },
 };
 
 WL_EXPORT const struct wl_interface wl_selection_interface = {
-	"selection", 1,
-	ARRAY_LENGTH(selection_requests), selection_requests,
-	ARRAY_LENGTH(selection_events), selection_events,
+	"wl_selection", 1,
+	ARRAY_LENGTH(wl_selection_requests), wl_selection_requests,
+	ARRAY_LENGTH(wl_selection_events), wl_selection_events,
 };
 
-static const struct wl_message selection_offer_requests[] = {
+static const struct wl_message wl_selection_offer_requests[] = {
 	{ "receive", "sh" },
 };
 
-static const struct wl_message selection_offer_events[] = {
+static const struct wl_message wl_selection_offer_events[] = {
 	{ "offer", "s" },
 	{ "keyboard_focus", "o" },
 };
 
 WL_EXPORT const struct wl_interface wl_selection_offer_interface = {
-	"selection_offer", 1,
-	ARRAY_LENGTH(selection_offer_requests), selection_offer_requests,
-	ARRAY_LENGTH(selection_offer_events), selection_offer_events,
+	"wl_selection_offer", 1,
+	ARRAY_LENGTH(wl_selection_offer_requests), wl_selection_offer_requests,
+	ARRAY_LENGTH(wl_selection_offer_events), wl_selection_offer_events,
 };
 
-static const struct wl_message drag_requests[] = {
+static const struct wl_message wl_drag_requests[] = {
 	{ "offer", "s" },
 	{ "activate", "oou" },
 	{ "destroy", "" },
 };
 
-static const struct wl_message drag_events[] = {
+static const struct wl_message wl_drag_events[] = {
 	{ "target", "s" },
 	{ "finish", "h" },
 	{ "reject", "" },
 };
 
 WL_EXPORT const struct wl_interface wl_drag_interface = {
-	"drag", 1,
-	ARRAY_LENGTH(drag_requests), drag_requests,
-	ARRAY_LENGTH(drag_events), drag_events,
+	"wl_drag", 1,
+	ARRAY_LENGTH(wl_drag_requests), wl_drag_requests,
+	ARRAY_LENGTH(wl_drag_events), wl_drag_events,
 };
 
-static const struct wl_message drag_offer_requests[] = {
+static const struct wl_message wl_drag_offer_requests[] = {
 	{ "accept", "us" },
 	{ "receive", "h" },
 	{ "reject", "" },
 };
 
-static const struct wl_message drag_offer_events[] = {
+static const struct wl_message wl_drag_offer_events[] = {
 	{ "offer", "s" },
 	{ "pointer_focus", "uoiiii" },
 	{ "motion", "uiiii" },
@@ -156,12 +158,12 @@ static const struct wl_message drag_offer_events[] = {
 };
 
 WL_EXPORT const struct wl_interface wl_drag_offer_interface = {
-	"drag_offer", 1,
-	ARRAY_LENGTH(drag_offer_requests), drag_offer_requests,
-	ARRAY_LENGTH(drag_offer_events), drag_offer_events,
+	"wl_drag_offer", 1,
+	ARRAY_LENGTH(wl_drag_offer_requests), wl_drag_offer_requests,
+	ARRAY_LENGTH(wl_drag_offer_events), wl_drag_offer_events,
 };
 
-static const struct wl_message surface_requests[] = {
+static const struct wl_message wl_surface_requests[] = {
 	{ "destroy", "" },
 	{ "attach", "oii" },
 	{ "map_toplevel", "" },
@@ -171,16 +173,16 @@ static const struct wl_message surface_requests[] = {
 };
 
 WL_EXPORT const struct wl_interface wl_surface_interface = {
-	"surface", 1,
-	ARRAY_LENGTH(surface_requests), surface_requests,
+	"wl_surface", 1,
+	ARRAY_LENGTH(wl_surface_requests), wl_surface_requests,
 	0, NULL,
 };
 
-static const struct wl_message input_device_requests[] = {
+static const struct wl_message wl_input_device_requests[] = {
 	{ "attach", "uoii" },
 };
 
-static const struct wl_message input_device_events[] = {
+static const struct wl_message wl_input_device_events[] = {
 	{ "motion", "uiiii" },
 	{ "button", "uuu" },
 	{ "key", "uuu" },
@@ -189,23 +191,23 @@ static const struct wl_message input_device_events[] = {
 };
 
 WL_EXPORT const struct wl_interface wl_input_device_interface = {
-	"input_device", 1,
-	ARRAY_LENGTH(input_device_requests), input_device_requests,
-	ARRAY_LENGTH(input_device_events), input_device_events,
+	"wl_input_device", 1,
+	ARRAY_LENGTH(wl_input_device_requests), wl_input_device_requests,
+	ARRAY_LENGTH(wl_input_device_events), wl_input_device_events,
 };
 
-static const struct wl_message output_events[] = {
+static const struct wl_message wl_output_events[] = {
 	{ "geometry", "iiii" },
 };
 
 WL_EXPORT const struct wl_interface wl_output_interface = {
-	"output", 1,
+	"wl_output", 1,
 	0, NULL,
-	ARRAY_LENGTH(output_events), output_events,
+	ARRAY_LENGTH(wl_output_events), wl_output_events,
 };
 
 WL_EXPORT const struct wl_interface wl_visual_interface = {
-	"visual", 1,
+	"wl_visual", 1,
 	0, NULL,
 	0, NULL,
 };