mirror of
https://github.com/glfw/glfw.git
synced 2024-11-10 00:51:47 +00:00
Wayland: Rename data transfer parameters
No rationale beyond personal preference.
This commit is contained in:
parent
2d45681bc3
commit
ba11e60859
@ -701,7 +701,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)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
@ -711,33 +711,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)
|
||||||
@ -745,13 +745,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)
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1575,10 +1575,10 @@ void _glfwSetCursorWayland(_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");
|
||||||
@ -1587,7 +1587,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)
|
||||||
{
|
{
|
||||||
@ -1595,7 +1595,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");
|
||||||
@ -1637,11 +1637,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");
|
||||||
|
Loading…
Reference in New Issue
Block a user