소스 검색

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)
Camilla Löwy 2 년 전
부모
커밋
1d766c8b39
2개의 변경된 파일2개의 추가작업 그리고 4개의 파일을 삭제
  1. 1 0
      README.md
  2. 1 4
      src/wl_window.c

+ 1 - 0
README.md

@@ -129,6 +129,7 @@ information on what to include when reporting a bug.
    `EGL_EXT_present_opaque` (#1895)
    `EGL_EXT_present_opaque` (#1895)
  - [Wayland] Bugfix: Buffer would overrun when storing received drag offer (#2225)
  - [Wayland] Bugfix: Buffer would overrun when storing received drag offer (#2225)
  - [Wayland] Bugfix: Joysticks connected after `glfwInit` were not detected (#2198)
  - [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)
  - [Linux] Bugfix: Joysticks without buttons were ignored (#2042,#2043)
    [EGL] Added loading of glvnd `libOpenGL.so.0` where available for OpenGL
    [EGL] Added loading of glvnd `libOpenGL.so.0` where available for OpenGL
  - [GLX] Added loading of glvnd `libGLX.so.0` where available
  - [GLX] Added loading of glvnd `libGLX.so.0` where available

+ 1 - 4
src/wl_window.c

@@ -1358,11 +1358,8 @@ static void setCursor(_GLFWwindow* window, const char* name)
 
 
     cursor = wl_cursor_theme_get_cursor(theme, name);
     cursor = wl_cursor_theme_get_cursor(theme, name);
     if (!cursor)
     if (!cursor)
-    {
-        _glfwInputError(GLFW_PLATFORM_ERROR,
-                        "Wayland: Standard cursor shape unavailable");
         return;
         return;
-    }
+
     // TODO: handle animated cursors too.
     // TODO: handle animated cursors too.
     image = cursor->images[0];
     image = cursor->images[0];