Merge 5115508d2c into 0d2d85d19c

README.md

@@ -139,11 +139,6 @@ information on what to include when reporting a bug.
                      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)
+        if (window->wl.xdg.toplevel)
-            return;
+        {
-
+            xdg_toplevel_show_window_menu(window->wl.xdg.toplevel,
-        if (window->wl.fallback.focus != window->wl.fallback.top.surface)
+                                          _glfw.wl.seat, serial,
-            return;
+                                          window->wl.cursorPosX,
-
+                                          window->wl.cursorPosY);
-        if (ypos < GLFW_BORDER_SIZE)
+        }
-            return;
-
-        xdg_toplevel_show_window_menu(window->wl.xdg.toplevel,
-                                      _glfw.wl.seat, serial,
-                                      xpos,
-                                      ypos - GLFW_CAPTION_HEIGHT - GLFW_BORDER_SIZE);
     }
 }
 
@@ -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);
-        }
     }
 }