CONTRIBUTORS.md

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

README.md

@@ -138,12 +138,6 @@ 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)
- - [Wayland] Bugfix: Fallback decorations would show menu at wrong position
- - [Wayland] Bugfix: The cursor was not updated when clicking through from
-   a modal to a fallback decoration
- - [Wayland] Bugfix: The cursor position was not updated when clicking through
-   from a modal to the content area
  - [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_window.c

@@ -405,19 +405,13 @@ static void handleFallbackDecorationButton(_GLFWwindow* window,
     }
     else if (button == BTN_RIGHT)
     {
-        if (!window->wl.xdg.toplevel)
-            return;
-
-        if (window->wl.fallback.focus != window->wl.fallback.top.surface)
-            return;
-
-        if (ypos < GLFW_BORDER_SIZE)
-            return;
-
+        if (window->wl.xdg.toplevel)
+        {
             xdg_toplevel_show_window_menu(window->wl.xdg.toplevel,
                                           _glfw.wl.seat, serial,
-                                      xpos,
-                                      ypos - GLFW_CAPTION_HEIGHT - GLFW_BORDER_SIZE);
+                                          window->wl.cursorPosX,
+                                          window->wl.cursorPosY);
+        }
     }
 }
 
@@ -1538,21 +1532,11 @@ static void pointerHandleEnter(void* userData,
         window->wl.hovered = GLFW_TRUE;
         _glfwSetCursorWayland(window, window->wl.currentCursor);
         _glfwInputCursorEnter(window, GLFW_TRUE);
-
-        if (window->cursorMode != GLFW_CURSOR_DISABLED)
-        {
-            window->wl.cursorPosX = wl_fixed_to_double(sx);
-            window->wl.cursorPosY = wl_fixed_to_double(sy);
-            _glfwInputCursorPos(window, window->wl.cursorPosX, window->wl.cursorPosY);
-        }
     }
     else
     {
         if (window->wl.fallback.decorations)
-        {
             window->wl.fallback.focus = surface;
-            updateFallbackDecorationCursor(window, sx, sy);
-        }
     }
 }
 
@@ -1794,6 +1778,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);
 
@@ -1836,12 +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);
     }
 
+    timerfd_settime(_glfw.wl.keyRepeatTimerfd, 0, &timer, NULL);
+
     _glfwInputKey(window, key, scancode, action, _glfw.wl.xkb.modifiers);
 
     if (action == GLFW_PRESS)