From 1ee540bf48618e83f093b6f9e30b9ced24c9edb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Camilla=20L=C3=B6wy?= <elmindreda@elmindreda.org>
Date: Wed, 23 Mar 2022 18:52:06 +0100
Subject: [PATCH] Wayland: Rename data transfer parameters

No rationale beyond personal preference.

(cherry picked from commit ba11e60859c22132cb6c11f570f5341fa38ef856)
---
 src/wl_init.c   | 22 +++++++++++-----------
 src/wl_window.c | 14 +++++++-------
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/wl_init.c b/src/wl_init.c
index 54b76743..7024cfba 100644
--- a/src/wl_init.c
+++ b/src/wl_init.c
@@ -697,7 +697,7 @@ static const struct wl_seat_listener seatListener = {
 };
 
 static void dataOfferHandleOffer(void* data,
-                                 struct wl_data_offer* dataOffer,
+                                 struct wl_data_offer* offer,
                                  const char* mimeType)
 {
 }
@@ -707,33 +707,33 @@ static const struct wl_data_offer_listener dataOfferListener = {
 };
 
 static void dataDeviceHandleDataOffer(void* data,
-                                      struct wl_data_device* dataDevice,
-                                      struct wl_data_offer* id)
+                                      struct wl_data_device* device,
+                                      struct wl_data_offer* offer)
 {
     if (_glfw.wl.dataOffer)
         wl_data_offer_destroy(_glfw.wl.dataOffer);
 
-    _glfw.wl.dataOffer = id;
+    _glfw.wl.dataOffer = offer;
     wl_data_offer_add_listener(_glfw.wl.dataOffer, &dataOfferListener, NULL);
 }
 
 static void dataDeviceHandleEnter(void* data,
-                                  struct wl_data_device* dataDevice,
+                                  struct wl_data_device* device,
                                   uint32_t serial,
                                   struct wl_surface *surface,
                                   wl_fixed_t x,
                                   wl_fixed_t y,
-                                  struct wl_data_offer *id)
+                                  struct wl_data_offer *offer)
 {
 }
 
 static void dataDeviceHandleLeave(void* data,
-                                  struct wl_data_device* dataDevice)
+                                  struct wl_data_device* device)
 {
 }
 
 static void dataDeviceHandleMotion(void* data,
-                                   struct wl_data_device* dataDevice,
+                                   struct wl_data_device* device,
                                    uint32_t time,
                                    wl_fixed_t x,
                                    wl_fixed_t y)
@@ -741,13 +741,13 @@ static void dataDeviceHandleMotion(void* data,
 }
 
 static void dataDeviceHandleDrop(void* data,
-                                 struct wl_data_device* dataDevice)
+                                 struct wl_data_device* device)
 {
 }
 
 static void dataDeviceHandleSelection(void* data,
-                                      struct wl_data_device* dataDevice,
-                                      struct wl_data_offer* id)
+                                      struct wl_data_device* device,
+                                      struct wl_data_offer* offer)
 {
 }
 
diff --git a/src/wl_window.c b/src/wl_window.c
index 5deeac4d..1359d588 100644
--- a/src/wl_window.c
+++ b/src/wl_window.c
@@ -1709,10 +1709,10 @@ void _glfwPlatformSetCursor(_GLFWwindow* window, _GLFWcursor* cursor)
 }
 
 static void dataSourceHandleTarget(void* data,
-                                   struct wl_data_source* dataSource,
+                                   struct wl_data_source* source,
                                    const char* mimeType)
 {
-    if (_glfw.wl.dataSource != dataSource)
+    if (_glfw.wl.dataSource != source)
     {
         _glfwInputError(GLFW_PLATFORM_ERROR,
                         "Wayland: Unknown clipboard data source");
@@ -1721,7 +1721,7 @@ static void dataSourceHandleTarget(void* data,
 }
 
 static void dataSourceHandleSend(void* data,
-                                 struct wl_data_source* dataSource,
+                                 struct wl_data_source* source,
                                  const char* mimeType,
                                  int fd)
 {
@@ -1729,7 +1729,7 @@ static void dataSourceHandleSend(void* data,
     size_t len = strlen(string);
     int ret;
 
-    if (_glfw.wl.dataSource != dataSource)
+    if (_glfw.wl.dataSource != source)
     {
         _glfwInputError(GLFW_PLATFORM_ERROR,
                         "Wayland: Unknown clipboard data source");
@@ -1771,11 +1771,11 @@ static void dataSourceHandleSend(void* data,
 }
 
 static void dataSourceHandleCancelled(void* data,
-                                      struct wl_data_source* dataSource)
+                                      struct wl_data_source* source)
 {
-    wl_data_source_destroy(dataSource);
+    wl_data_source_destroy(source);
 
-    if (_glfw.wl.dataSource != dataSource)
+    if (_glfw.wl.dataSource != source)
     {
         _glfwInputError(GLFW_PLATFORM_ERROR,
                         "Wayland: Unknown clipboard data source");