Merge 15f9e1bea7 into acb92944d4

Revert readme for "Wayland: Keyboard leave event handler now processes key repeats"
Wayland: Fix cursor position after a modal
2025-12-21 14:42:06 +00:00 · 2025-08-19 21:22:03 +02:00 · 2025-08-19 11:30:52 +02:00 · 2025-08-18 20:58:12 +02:00 · 2025-08-18 18:06:46 +02:00 · 2025-08-18 18:06:46 +02:00
2 changed files with 28 additions and 8 deletions
--- a/README.md
+++ b/README.md
@ -134,11 +134,15 @@ 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)
 - [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`
--- a/src/wl_window.c
+++ b/src/wl_window.c
@ -405,13 +405,19 @@ static void handleFallbackDecorationButton(_GLFWwindow* window,
    }
    else if (button == BTN_RIGHT)
    {
-        if (window->wl.xdg.toplevel)
-        {
+        if (!window->wl.xdg.toplevel)
+            return;
+
+        if (window->wl.fallback.focus != window->wl.fallback.top.surface)
+            return;
+
+        if (ypos < GLFW_BORDER_SIZE)
+            return;
+
        xdg_toplevel_show_window_menu(window->wl.xdg.toplevel,
                                      _glfw.wl.seat, serial,
-                                          window->wl.cursorPosX,
-                                          window->wl.cursorPosY);
-        }
+                                      xpos,
+                                      ypos - GLFW_CAPTION_HEIGHT - GLFW_BORDER_SIZE);
    }
 }

@ -1532,11 +1538,21 @@ 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);
+        }
    }
 }
Author	SHA1	Message	Date
Yukari Hafner	52b789c994	Merge `15f9e1bea7` into `acb92944d4`	2025-08-19 21:22:03 +02:00
Doug Binks	acb92944d4	Revert readme for "Wayland: Keyboard leave event handler now processes key repeats"	2025-08-19 11:30:52 +02:00
Camilla Löwy	7ef6efeb66	Wayland: Fix cursor position after a modal If a modal surface like the window menu was active, clicking on the GLFW window content area to close it would correctly emit the cursor enter event but would not propagate the cursor position from the event.	2025-08-18 20:58:12 +02:00
Camilla Löwy	3cf9f6726d	Wayland: Fix fallback decoration cursor updating When a click through to the fallback decorations caused the end of a modal like the window menu, the cursor shape would not be updated until the next time the cursor moved. This commit adds an update of the cursor for the pointer enter event for fallback decoration surfaces, in addition to the updates at pointer motion events.	2025-08-18 18:06:46 +02:00
Camilla Löwy	bfa1c424e5	Wayland: Fix fallback decoration menu placement The fallback decorations would place the menu at the wrong position, by not translating the last decoration surface position into toplevel surface coordinates. This also limits the menu to the caption area of the top decoration surface, similar to how other toolkits work.	2025-08-18 18:06:46 +02:00