Wayland: Clean up pointer helper function order

(cherry picked from commit 7be6a2cabe)
This commit is contained in:
Camilla Löwy 2022-07-25 13:04:21 +02:00 committed by Camilla Löwy
parent 5f3e5542cf
commit 0ee9b7281b

View File

@ -2460,15 +2460,6 @@ static void lockedPointerHandleLocked(void* userData,
{ {
} }
static void unlockPointer(_GLFWwindow* window)
{
zwp_relative_pointer_v1_destroy(window->wl.relativePointer);
window->wl.relativePointer = NULL;
zwp_locked_pointer_v1_destroy(window->wl.lockedPointer);
window->wl.lockedPointer = NULL;
}
static void lockedPointerHandleUnlocked(void* userData, static void lockedPointerHandleUnlocked(void* userData,
struct zwp_locked_pointer_v1* lockedPointer) struct zwp_locked_pointer_v1* lockedPointer)
{ {
@ -2509,6 +2500,15 @@ static void lockPointer(_GLFWwindow* window)
window); window);
} }
static void unlockPointer(_GLFWwindow* window)
{
zwp_relative_pointer_v1_destroy(window->wl.relativePointer);
window->wl.relativePointer = NULL;
zwp_locked_pointer_v1_destroy(window->wl.lockedPointer);
window->wl.lockedPointer = NULL;
}
void _glfwPlatformSetCursor(_GLFWwindow* window, _GLFWcursor* cursor) void _glfwPlatformSetCursor(_GLFWwindow* window, _GLFWcursor* cursor)
{ {
if (!_glfw.wl.pointer) if (!_glfw.wl.pointer)