mirror/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2024-11-22 13:04:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Wayland: Clean up pointer locking

Browse Source 
Shorten names and allow C99 declarations.  Replace helper function with
the NULL check it was hiding.  Separate cursor hiding from pointer
locking.

(cherry picked from commit e85b645b8a)
This commit is contained in:
Camilla Löwy 2022-07-24 22:27:22 +02:00
parent 78edf2516e
commit 5189d52ae3
2 changed files with 37 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/wl_platform.h
View File

@ -214,10 +214,8 @@ typedef struct _GLFWwindowWayland
int monitorsCount; int monitorsCount;
int monitorsSize; int monitorsSize;
struct { struct zwp_relative_pointer_v1* relativePointer;
struct zwp_relative_pointer_v1* relativePointer; struct zwp_locked_pointer_v1* lockedPointer;
struct zwp_locked_pointer_v1* lockedPointer;
} pointerLock;
struct zwp_idle_inhibitor_v1* idleInhibitor; struct zwp_idle_inhibitor_v1* idleInhibitor;

88
src/wl_window.c
View File

@ -2286,15 +2286,14 @@ void _glfwPlatformGetCursorPos(_GLFWwindow* window, double* xpos, double* ypos)
*ypos = window->wl.cursorPosY; *ypos = window->wl.cursorPosY;
} }
static GLFWbool isPointerLocked(_GLFWwindow* window);
void _glfwPlatformSetCursorPos(_GLFWwindow* window, double x, double y) void _glfwPlatformSetCursorPos(_GLFWwindow* window, double x, double y)
{ {
if (isPointerLocked(window)) if (window->wl.lockedPointer)
{ {
zwp_locked_pointer_v1_set_cursor_position_hint( zwp_locked_pointer_v1_set_cursor_position_hint(
window->wl.pointerLock.lockedPointer, window->wl.lockedPointer,
wl_fixed_from_double(x), wl_fixed_from_double(y)); wl_fixed_from_double(x),
wl_fixed_from_double(y));
} }
} }
@ -2457,20 +2456,13 @@ static void lockedPointerHandleLocked(void* userData,
static void unlockPointer(_GLFWwindow* window) static void unlockPointer(_GLFWwindow* window)
{ {
struct zwp_relative_pointer_v1* relativePointer = zwp_relative_pointer_v1_destroy(window->wl.relativePointer);
window->wl.pointerLock.relativePointer; window->wl.relativePointer = NULL;
struct zwp_locked_pointer_v1* lockedPointer =
window->wl.pointerLock.lockedPointer;
zwp_relative_pointer_v1_destroy(relativePointer); zwp_locked_pointer_v1_destroy(window->wl.lockedPointer);
zwp_locked_pointer_v1_destroy(lockedPointer); window->wl.lockedPointer = NULL;
window->wl.pointerLock.relativePointer = NULL;
window->wl.pointerLock.lockedPointer = NULL;
} }
static void lockPointer(_GLFWwindow* window);
static void lockedPointerHandleUnlocked(void* userData, static void lockedPointerHandleUnlocked(void* userData,
struct zwp_locked_pointer_v1* lockedPointer) struct zwp_locked_pointer_v1* lockedPointer)
{ {
@ -2484,9 +2476,6 @@ static const struct zwp_locked_pointer_v1_listener lockedPointerListener =
static void lockPointer(_GLFWwindow* window) static void lockPointer(_GLFWwindow* window)
{ {
struct zwp_relative_pointer_v1* relativePointer;
struct zwp_locked_pointer_v1* lockedPointer;
if (!_glfw.wl.relativePointerManager) if (!_glfw.wl.relativePointerManager)
{ {
_glfwInputError(GLFW_PLATFORM_ERROR, _glfwInputError(GLFW_PLATFORM_ERROR,
@ -2494,42 +2483,28 @@ static void lockPointer(_GLFWwindow* window)
return; return;
} }
relativePointer = window->wl.relativePointer =
zwp_relative_pointer_manager_v1_get_relative_pointer( zwp_relative_pointer_manager_v1_get_relative_pointer(
_glfw.wl.relativePointerManager, _glfw.wl.relativePointerManager,
_glfw.wl.pointer); _glfw.wl.pointer);
zwp_relative_pointer_v1_add_listener(relativePointer, zwp_relative_pointer_v1_add_listener(window->wl.relativePointer,
&relativePointerListener, &relativePointerListener,
window); window);
lockedPointer = window->wl.lockedPointer =
zwp_pointer_constraints_v1_lock_pointer( zwp_pointer_constraints_v1_lock_pointer(
_glfw.wl.pointerConstraints, _glfw.wl.pointerConstraints,
window->wl.surface, window->wl.surface,
_glfw.wl.pointer, _glfw.wl.pointer,
NULL, NULL,
ZWP_POINTER_CONSTRAINTS_V1_LIFETIME_PERSISTENT); ZWP_POINTER_CONSTRAINTS_V1_LIFETIME_PERSISTENT);
zwp_locked_pointer_v1_add_listener(lockedPointer, zwp_locked_pointer_v1_add_listener(window->wl.lockedPointer,
&lockedPointerListener, &lockedPointerListener,
window); window);
window->wl.pointerLock.relativePointer = relativePointer;
window->wl.pointerLock.lockedPointer = lockedPointer;
wl_pointer_set_cursor(_glfw.wl.pointer, _glfw.wl.pointerEnterSerial,
NULL, 0, 0);
}
static GLFWbool isPointerLocked(_GLFWwindow* window)
{
return window->wl.pointerLock.lockedPointer != NULL;
} }
void _glfwPlatformSetCursor(_GLFWwindow* window, _GLFWcursor* cursor) void _glfwPlatformSetCursor(_GLFWwindow* window, _GLFWcursor* cursor)
{ {
struct wl_cursor* defaultCursor;
struct wl_cursor* defaultCursorHiDPI = NULL;
if (!_glfw.wl.pointer) if (!_glfw.wl.pointer)
return; return;
@ -2540,9 +2515,17 @@ void _glfwPlatformSetCursor(_GLFWwindow* window, _GLFWcursor* cursor)
if (window != _glfw.wl.pointerFocus || window->wl.decorations.focus != mainWindow) if (window != _glfw.wl.pointerFocus || window->wl.decorations.focus != mainWindow)
return; return;
// Unlock possible pointer lock if no longer disabled. // Update pointer lock to match cursor mode
if (window->cursorMode != GLFW_CURSOR_DISABLED && isPointerLocked(window)) if (window->cursorMode == GLFW_CURSOR_DISABLED)
unlockPointer(window); {
if (!window->wl.lockedPointer)
lockPointer(window);
}
else
{
if (window->wl.lockedPointer)
unlockPointer(window);
}
if (window->cursorMode == GLFW_CURSOR_NORMAL) if (window->cursorMode == GLFW_CURSOR_NORMAL)
{ {
@ -2550,19 +2533,24 @@ void _glfwPlatformSetCursor(_GLFWwindow* window, _GLFWcursor* cursor)
setCursorImage(window, &cursor->wl); setCursorImage(window, &cursor->wl);
else else
{ {
defaultCursor = wl_cursor_theme_get_cursor(_glfw.wl.cursorTheme, struct wl_cursor* defaultCursor =
"left_ptr"); wl_cursor_theme_get_cursor(_glfw.wl.cursorTheme, "left_ptr");
if (!defaultCursor) if (!defaultCursor)
{ {
_glfwInputError(GLFW_PLATFORM_ERROR, _glfwInputError(GLFW_PLATFORM_ERROR,
"Wayland: Standard cursor not found"); "Wayland: Standard cursor not found");
return; return;
} }
struct wl_cursor* defaultCursorHiDPI = NULL;
if (_glfw.wl.cursorThemeHiDPI) if (_glfw.wl.cursorThemeHiDPI)
{
defaultCursorHiDPI = defaultCursorHiDPI =
wl_cursor_theme_get_cursor(_glfw.wl.cursorThemeHiDPI, wl_cursor_theme_get_cursor(_glfw.wl.cursorThemeHiDPI, "left_ptr");
"left_ptr"); }
_GLFWcursorWayland cursorWayland = {
_GLFWcursorWayland cursorWayland =
{
defaultCursor, defaultCursor,
defaultCursorHiDPI, defaultCursorHiDPI,
NULL, NULL,
@ -2570,18 +2558,12 @@ void _glfwPlatformSetCursor(_GLFWwindow* window, _GLFWcursor* cursor)
0, 0, 0, 0,
0 0
}; };
setCursorImage(window, &cursorWayland); setCursorImage(window, &cursorWayland);
} }
} }
else if (window->cursorMode == GLFW_CURSOR_DISABLED) else
{
if (!isPointerLocked(window))
lockPointer(window);
}
else if (window->cursorMode == GLFW_CURSOR_HIDDEN)
{
wl_pointer_set_cursor(_glfw.wl.pointer, _glfw.wl.pointerEnterSerial, NULL, 0, 0); wl_pointer_set_cursor(_glfw.wl.pointer, _glfw.wl.pointerEnterSerial, NULL, 0, 0);
}
} }
static void dataSourceHandleTarget(void* userData, static void dataSourceHandleTarget(void* userData,