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

Wayland: Partially implement glfwSetCursorPos

Browse Source
This commit is contained in:
Friz64 2024-02-25 00:51:49 +01:00
parent 7b6aead9fb
commit 2307384a83
2 changed files with 37 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/wl_platform.h
View File

@ -371,6 +371,7 @@ typedef struct _GLFWwindowWayland
GLFWbool iconified; GLFWbool iconified;
GLFWbool activated; GLFWbool activated;
GLFWbool fullscreen; GLFWbool fullscreen;
double cursorPosX, cursorPosY;
} pending; } pending;
struct { struct {
@ -386,6 +387,7 @@ typedef struct _GLFWwindowWayland
_GLFWcursor* currentCursor; _GLFWcursor* currentCursor;
double cursorPosX, cursorPosY; double cursorPosX, cursorPosY;
GLFWbool pendingCursorPos;
char* appId; char* appId;

37
src/wl_window.c
View File

@ -2667,8 +2667,34 @@ void _glfwGetCursorPosWayland(_GLFWwindow* window, double* xpos, double* ypos)
void _glfwSetCursorPosWayland(_GLFWwindow* window, double x, double y) void _glfwSetCursorPosWayland(_GLFWwindow* window, double x, double y)
{ {
_glfwInputError(GLFW_FEATURE_UNAVAILABLE, if (!_glfw.wl.pointerConstraints)
"Wayland: The platform does not support setting the cursor position"); {
_glfwInputError(GLFW_FEATURE_UNAVAILABLE,
"Wayland: The compositor does not support setting the cursor position");
return;
}
if (window->wl.lockedPointer) {
zwp_locked_pointer_v1_set_cursor_position_hint(window->wl.lockedPointer,
wl_fixed_from_double(x),
wl_fixed_from_double(y));
} else {
if (window->cursorMode != GLFW_CURSOR_DISABLED) {
_glfwInputError(GLFW_PLATFORM_ERROR,
"Wayland: Delaying the cursor position update until "
"the cursor mode is set to GLFW_CURSOR_DISABLED");
}
// The cursor is not currently locked, but it may be locked later. Either
// - the application has already set the cursor mode to GLFW_CURSOR_DISABLED,
// but the cursor is currently outside of the window, or
// - the application has not yet set the cursor mode to GLFW_CURSOR_DISABLED,
// but will do so soon.
// Defer setting the cursor position to _glfwSetCursorWayland.
window->wl.pending.cursorPosX = x;
window->wl.pending.cursorPosY = y;
window->wl.pendingCursorPos = GLFW_TRUE;
}
} }
void _glfwSetCursorModeWayland(_GLFWwindow* window, int mode) void _glfwSetCursorModeWayland(_GLFWwindow* window, int mode)
@ -3009,6 +3035,13 @@ void _glfwSetCursorWayland(_GLFWwindow* window, _GLFWcursor* cursor)
unconfinePointer(window); unconfinePointer(window);
if (!window->wl.lockedPointer) if (!window->wl.lockedPointer)
lockPointer(window); lockPointer(window);
if (window->wl.pendingCursorPos == GLFW_TRUE) {
zwp_locked_pointer_v1_set_cursor_position_hint(window->wl.lockedPointer,
wl_fixed_from_double(window->wl.pending.cursorPosX),
wl_fixed_from_double(window->wl.pending.cursorPosY));
window->wl.pendingCursorPos = GLFW_FALSE;
}
} }
else if (window->cursorMode == GLFW_CURSOR_CAPTURED) else if (window->cursorMode == GLFW_CURSOR_CAPTURED)
{ {