KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Better code when using a stack cursor

Browse Source
This commit is contained in:
Kovid Goyal 2020-06-02 07:59:32 +05:30
parent ad27452275
commit 80b2df2ef4
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
glfw/wl_window.c vendored
View File

@ -683,8 +683,14 @@ static bool createXdgSurface(_GLFWwindow* window)
} }
static void static void
setCursorImage(_GLFWwindow* window, _GLFWcursorWayland* cursorWayland, bool is_stack_cursor) setCursorImage(_GLFWwindow* window, _GLFWcursorWayland* cursorWayland)
{ {
_GLFWcursorWayland defaultCursor = {.shape = GLFW_ARROW_CURSOR};
bool isDefaultCursor = false;
if (!cursorWayland) {
cursorWayland = &defaultCursor;
isDefaultCursor = true;
}
struct wl_cursor_image* image = NULL; struct wl_cursor_image* image = NULL;
struct wl_buffer* buffer = NULL; struct wl_buffer* buffer = NULL;
struct wl_surface* surface = _glfw.wl.cursorSurface; struct wl_surface* surface = _glfw.wl.cursorSurface;
@ -708,7 +714,7 @@ setCursorImage(_GLFWwindow* window, _GLFWcursorWayland* cursorWayland, bool is_s
return; return;
image = cursorWayland->cursor->images[cursorWayland->currentImage]; image = cursorWayland->cursor->images[cursorWayland->currentImage];
buffer = wl_cursor_image_get_buffer(image); buffer = wl_cursor_image_get_buffer(image);
if (image->delay && !is_stack_cursor) { if (image->delay && !isDefaultCursor) {
changeTimerInterval(&_glfw.wl.eventLoopData, _glfw.wl.cursorAnimationTimer, ms_to_monotonic_t(image->delay)); changeTimerInterval(&_glfw.wl.eventLoopData, _glfw.wl.cursorAnimationTimer, ms_to_monotonic_t(image->delay));
toggleTimer(&_glfw.wl.eventLoopData, _glfw.wl.cursorAnimationTimer, 1); toggleTimer(&_glfw.wl.eventLoopData, _glfw.wl.cursorAnimationTimer, 1);
} else { } else {
@ -744,7 +750,7 @@ incrementCursorImage(_GLFWwindow* window)
{ {
cursor->wl.currentImage += 1; cursor->wl.currentImage += 1;
cursor->wl.currentImage %= cursor->wl.cursor->image_count; cursor->wl.currentImage %= cursor->wl.cursor->image_count;
setCursorImage(window, &cursor->wl, false); setCursorImage(window, &cursor->wl);
toggleTimer(&_glfw.wl.eventLoopData, _glfw.wl.cursorAnimationTimer, cursor->wl.cursor->image_count > 1); toggleTimer(&_glfw.wl.eventLoopData, _glfw.wl.cursorAnimationTimer, cursor->wl.cursor->image_count > 1);
return; return;
} }
@ -1494,11 +1500,10 @@ void _glfwPlatformSetCursor(_GLFWwindow* window, _GLFWcursor* cursor)
if (window->cursorMode == GLFW_CURSOR_NORMAL) if (window->cursorMode == GLFW_CURSOR_NORMAL)
{ {
if (cursor) if (cursor)
setCursorImage(window, &cursor->wl, false); setCursorImage(window, &cursor->wl);
else else
{ {
_GLFWcursorWayland cursorWayland = {.shape = GLFW_ARROW_CURSOR}; setCursorImage(window, NULL);
setCursorImage(window, &cursorWayland, true);
} }
} }
else if (window->cursorMode == GLFW_CURSOR_DISABLED) else if (window->cursorMode == GLFW_CURSOR_DISABLED)