Merge baf3290308 into 768e81a0eb

Key repeat shoud only be halted when the repeating key
is released, not when another key is released.

CONTRIBUTORS.md

@@ -68,6 +68,7 @@ video tutorials.
  - Jan Ekström
  - Siavash Eliasi
  - er-azh
+ - Jan Hendrik Farr
  - Ahmad Fatoum
  - Nikita Fediuchin
  - Felipe Ferreira

README.md

@@ -138,6 +138,7 @@ information on what to include when reporting a bug.
  - [Wayland] Bugfix: Retrieved cursor position would be incorrect when hovering over
                      fallback decorations
  - [Wayland] Bugfix: Fallback decorations would report scroll events
+ - [Wayland] Bugfix: Keyboard repeat events halted when any key is released (#2568)
  - [X11] Bugfix: Running without a WM could trigger an assert (#2593,#2601,#2631)
  - [Null] Added Vulkan 'window' surface creation via `VK_EXT_headless_surface`
  - [Null] Added EGL context creation on Mesa via `EGL_MESA_platform_surfaceless`

src/wl_init.c

@@ -518,7 +518,12 @@ GLFWbool _glfwConnectWayland(int platformID, _GLFWplatform* platform)
         .createWindowSurface = _glfwCreateWindowSurfaceWayland
     };
 
-    void* module = _glfwPlatformLoadModule("libwayland-client.so.0");
+    void* module;
+#if defined(__OpenBSD__)
+    module = _glfwPlatformLoadModule("libwayland-client.so");
+#else
+    module = _glfwPlatformLoadModule("libwayland-client.so.0");
+#endif
     if (!module)
     {
         if (platformID == GLFW_PLATFORM_WAYLAND)
@@ -631,7 +636,11 @@ int _glfwInitWayland(void)
         return GLFW_FALSE;
     }
 
+#if defined(__OpenBSD__)
+    _glfw.wl.cursor.handle = _glfwPlatformLoadModule("libwayland-cursor.so");
+#else
     _glfw.wl.cursor.handle = _glfwPlatformLoadModule("libwayland-cursor.so.0");
+#endif
     if (!_glfw.wl.cursor.handle)
     {
         _glfwInputError(GLFW_PLATFORM_ERROR,
@@ -648,7 +657,11 @@ int _glfwInitWayland(void)
     _glfw.wl.cursor.image_get_buffer = (PFN_wl_cursor_image_get_buffer)
         _glfwPlatformGetModuleSymbol(_glfw.wl.cursor.handle, "wl_cursor_image_get_buffer");
 
+#if defined(__OpenBSD__)
+    _glfw.wl.egl.handle = _glfwPlatformLoadModule("libwayland-egl.so");
+#else
     _glfw.wl.egl.handle = _glfwPlatformLoadModule("libwayland-egl.so.1");
+#endif
     if (!_glfw.wl.egl.handle)
     {
         _glfwInputError(GLFW_PLATFORM_ERROR,
@@ -663,7 +676,11 @@ int _glfwInitWayland(void)
     _glfw.wl.egl.window_resize = (PFN_wl_egl_window_resize)
         _glfwPlatformGetModuleSymbol(_glfw.wl.egl.handle, "wl_egl_window_resize");
 
+#if defined(__OpenBSD__)
+    _glfw.wl.xkb.handle = _glfwPlatformLoadModule("libxkbcommon.so");
+#else
     _glfw.wl.xkb.handle = _glfwPlatformLoadModule("libxkbcommon.so.0");
+#endif
     if (!_glfw.wl.xkb.handle)
     {
         _glfwInputError(GLFW_PLATFORM_ERROR,
@@ -743,7 +760,11 @@ int _glfwInitWayland(void)
     }
 
     if (_glfw.hints.init.wl.libdecorMode == GLFW_WAYLAND_PREFER_LIBDECOR)
+#if defined(__OpenBSD__)
+        _glfw.wl.libdecor.handle = _glfwPlatformLoadModule("libdecor-0.so");
+#else
         _glfw.wl.libdecor.handle = _glfwPlatformLoadModule("libdecor-0.so.0");
+#endif
 
     if (_glfw.wl.libdecor.handle)
     {

src/wl_window.c

@@ -1838,10 +1838,11 @@ static void keyboardHandleKey(void* userData,
 
             timer.it_value.tv_sec = _glfw.wl.keyRepeatDelay / 1000;
             timer.it_value.tv_nsec = (_glfw.wl.keyRepeatDelay % 1000) * 1000000;
-        }
-    }
-
             timerfd_settime(_glfw.wl.keyRepeatTimerfd, 0, &timer, NULL);
+        }
+    } else if (scancode == _glfw.wl.keyRepeatScancode) {
+        timerfd_settime(_glfw.wl.keyRepeatTimerfd, 0, &timer, NULL);
+    }
 
     _glfwInputKey(window, key, scancode, action, _glfw.wl.xkb.modifiers);