Merge 0d31a4afb6 into 7b51a8eb31

- Fixes #2736

README.md

@@ -134,6 +134,7 @@ information on what to include when reporting a bug.
  - [Wayland] Bugfix: Ignore key repeat events when no window has keyboard focus (#2727)
  - [Wayland] Bugfix: Reset key repeat timer when window destroyed (#2741,#2727)
  - [Wayland] Bugfix: Memory would leak if reading a data offer failed midway
+ - [Wayland] Bugfix: Keyboard leave event handler now processes key repeats (#2736)
  - [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/win32_init.c

@@ -163,6 +163,13 @@ static GLFWbool loadLibraries(void)
             _glfwPlatformGetModuleSymbol(_glfw.win32.ntdll.instance, "RtlVerifyVersionInfo");
     }
 
+    _glfw.win32.winmm.instance = _glfwPlatformLoadModule("winmm.dll");
+    if (_glfw.win32.winmm.instance)
+    {
+        _glfw.win32.winmm.timeBeginPeriod_ = (PFN_timeBeginPeriod) _glfwPlatformGetModuleSymbol(_glfw.win32.winmm.instance, "timeBeginPeriod");
+        _glfw.win32.winmm.timeBeginPeriod_(1);
+    }
+
     return GLFW_TRUE;
 }
 
@@ -187,6 +194,9 @@ static void freeLibraries(void)
 
     if (_glfw.win32.ntdll.instance)
         _glfwPlatformFreeModule(_glfw.win32.ntdll.instance);
+
+    if (_glfw.win32.winmm.instance)
+        _glfwPlatformFreeModule(_glfw.win32.winmm.instance);
 }
 
 // Create key code translation tables

src/win32_platform.h

@@ -258,6 +258,9 @@ typedef HRESULT (WINAPI * PFN_GetDpiForMonitor)(HMONITOR,MONITOR_DPI_TYPE,UINT*,
 typedef LONG (WINAPI * PFN_RtlVerifyVersionInfo)(OSVERSIONINFOEXW*,ULONG,ULONGLONG);
 #define RtlVerifyVersionInfo _glfw.win32.ntdll.RtlVerifyVersionInfo_
 
+// winmm.dll function pointer typedefs
+typedef UINT (WINAPI * PFN_timeBeginPeriod)(UINT);
+
 // WGL extension pointer typedefs
 typedef BOOL (WINAPI * PFNWGLSWAPINTERVALEXTPROC)(int);
 typedef BOOL (WINAPI * PFNWGLGETPIXELFORMATATTRIBIVARBPROC)(HDC,int,int,UINT,const int*,int*);
@@ -442,6 +445,11 @@ typedef struct _GLFWlibraryWin32
         HINSTANCE                       instance;
         PFN_RtlVerifyVersionInfo        RtlVerifyVersionInfo_;
     } ntdll;
+    
+    struct {
+        HINSTANCE                       instance;
+        PFN_timeBeginPeriod             timeBeginPeriod_;
+    } winmm;
 } _GLFWlibraryWin32;
 
 // Win32-specific per-monitor data

src/wl_window.c

@@ -1760,6 +1760,24 @@ static void keyboardHandleLeave(void* userData,
     if (!window)
         return;
 
+    // Handle any key repeats up to this point. We don't poll as this should be infrequent.
+    uint64_t repeats;
+    if (read(_glfw.wl.keyRepeatTimerfd, &repeats, sizeof(repeats)) == 8)
+    {
+        if(_glfw.wl.keyboardFocus)
+        {
+            for (uint64_t i = 0; i < repeats; i++)
+            {
+                _glfwInputKey(_glfw.wl.keyboardFocus,
+                              translateKey(_glfw.wl.keyRepeatScancode),
+                              _glfw.wl.keyRepeatScancode,
+                              GLFW_PRESS,
+                              _glfw.wl.xkb.modifiers);
+                inputText(_glfw.wl.keyboardFocus, _glfw.wl.keyRepeatScancode);
+            }
+        }
+    }
+
     struct itimerspec timer = {0};
     timerfd_settime(_glfw.wl.keyRepeatTimerfd, 0, &timer, NULL);