From 1d766c8b39936469280001a18f506c4efb394cb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Camilla=20L=C3=B6wy?= Date: Tue, 25 Apr 2023 22:47:18 +0200 Subject: [PATCH] Wayland: Fix fallback decorations emitting errors A GLFW_CURSOR_UNAVAILABLE error would be emitted each time the cursor moved over the fallback decorations if the standard cursor shape appropriate for that part was missing on the system. These errors served no useful purpose and have been removed. (cherry picked from commit 00a663dafd3bc214181a2987af1f5dac81e3b053) --- README.md | 1 + src/wl_window.c | 5 +---- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 525fefd6..5b8cd7a0 100644 --- a/README.md +++ b/README.md @@ -129,6 +129,7 @@ information on what to include when reporting a bug. `EGL_EXT_present_opaque` (#1895) - [Wayland] Bugfix: Buffer would overrun when storing received drag offer (#2225) - [Wayland] Bugfix: Joysticks connected after `glfwInit` were not detected (#2198) + - [Wayland] Bugfix: Fallback decorations emitted `GLFW_CURSOR_UNAVAILABLE` errors - [Linux] Bugfix: Joysticks without buttons were ignored (#2042,#2043) [EGL] Added loading of glvnd `libOpenGL.so.0` where available for OpenGL - [GLX] Added loading of glvnd `libGLX.so.0` where available diff --git a/src/wl_window.c b/src/wl_window.c index 88647a53..a798c57e 100644 --- a/src/wl_window.c +++ b/src/wl_window.c @@ -1358,11 +1358,8 @@ static void setCursor(_GLFWwindow* window, const char* name) cursor = wl_cursor_theme_get_cursor(theme, name); if (!cursor) - { - _glfwInputError(GLFW_PLATFORM_ERROR, - "Wayland: Standard cursor shape unavailable"); return; - } + // TODO: handle animated cursors too. image = cursor->images[0];