Navy.gif/glfw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Wayland: Rename data transfer parameters

Browse Source 
No rationale beyond personal preference.

(cherry picked from commit ba11e60859)
This commit is contained in:
Camilla Löwy 2022-03-23 18:52:06 +01:00
parent 32bedd9a94
commit 1ee540bf48
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/wl_init.c
View File

@ -697,7 +697,7 @@ static const struct wl_seat_listener seatListener = {
}; };
static void dataOfferHandleOffer(void* data, static void dataOfferHandleOffer(void* data,
struct wl_data_offer* dataOffer, struct wl_data_offer* offer,
const char* mimeType) const char* mimeType)
{ {
} }
@ -707,33 +707,33 @@ static const struct wl_data_offer_listener dataOfferListener = {
}; };
static void dataDeviceHandleDataOffer(void* data, static void dataDeviceHandleDataOffer(void* data,
struct wl_data_device* dataDevice, struct wl_data_device* device,
struct wl_data_offer* id) struct wl_data_offer* offer)
{ {
if (_glfw.wl.dataOffer) if (_glfw.wl.dataOffer)
wl_data_offer_destroy(_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); wl_data_offer_add_listener(_glfw.wl.dataOffer, &dataOfferListener, NULL);
} }
static void dataDeviceHandleEnter(void* data, static void dataDeviceHandleEnter(void* data,
struct wl_data_device* dataDevice, struct wl_data_device* device,
uint32_t serial, uint32_t serial,
struct wl_surface *surface, struct wl_surface *surface,
wl_fixed_t x, wl_fixed_t x,
wl_fixed_t y, wl_fixed_t y,
struct wl_data_offer *id) struct wl_data_offer *offer)
{ {
} }
static void dataDeviceHandleLeave(void* data, static void dataDeviceHandleLeave(void* data,
struct wl_data_device* dataDevice) struct wl_data_device* device)
{ {
} }
static void dataDeviceHandleMotion(void* data, static void dataDeviceHandleMotion(void* data,
struct wl_data_device* dataDevice, struct wl_data_device* device,
uint32_t time, uint32_t time,
wl_fixed_t x, wl_fixed_t x,
wl_fixed_t y) wl_fixed_t y)
@ -741,13 +741,13 @@ static void dataDeviceHandleMotion(void* data,
} }
static void dataDeviceHandleDrop(void* data, static void dataDeviceHandleDrop(void* data,
struct wl_data_device* dataDevice) struct wl_data_device* device)
{ {
} }
static void dataDeviceHandleSelection(void* data, static void dataDeviceHandleSelection(void* data,
struct wl_data_device* dataDevice, struct wl_data_device* device,
struct wl_data_offer* id) struct wl_data_offer* offer)
{ {
} }

14
src/wl_window.c
View File

@ -1709,10 +1709,10 @@ void _glfwPlatformSetCursor(_GLFWwindow* window, _GLFWcursor* cursor)
} }
static void dataSourceHandleTarget(void* data, static void dataSourceHandleTarget(void* data,
struct wl_data_source* dataSource, struct wl_data_source* source,
const char* mimeType) const char* mimeType)
{ {
if (_glfw.wl.dataSource != dataSource) if (_glfw.wl.dataSource != source)
{ {
_glfwInputError(GLFW_PLATFORM_ERROR, _glfwInputError(GLFW_PLATFORM_ERROR,
"Wayland: Unknown clipboard data source"); "Wayland: Unknown clipboard data source");
@ -1721,7 +1721,7 @@ static void dataSourceHandleTarget(void* data,
} }
static void dataSourceHandleSend(void* data, static void dataSourceHandleSend(void* data,
struct wl_data_source* dataSource, struct wl_data_source* source,
const char* mimeType, const char* mimeType,
int fd) int fd)
{ {
@ -1729,7 +1729,7 @@ static void dataSourceHandleSend(void* data,
size_t len = strlen(string); size_t len = strlen(string);
int ret; int ret;
if (_glfw.wl.dataSource != dataSource) if (_glfw.wl.dataSource != source)
{ {
_glfwInputError(GLFW_PLATFORM_ERROR, _glfwInputError(GLFW_PLATFORM_ERROR,
"Wayland: Unknown clipboard data source"); "Wayland: Unknown clipboard data source");
@ -1771,11 +1771,11 @@ static void dataSourceHandleSend(void* data,
} }
static void dataSourceHandleCancelled(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, _glfwInputError(GLFW_PLATFORM_ERROR,
"Wayland: Unknown clipboard data source"); "Wayland: Unknown clipboard data source");