Merge f1284eb884 into 7ef6efeb66

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.

README.md

@@ -139,6 +139,11 @@ 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`

include/GLFW/glfw3.h

@@ -1129,6 +1129,7 @@ extern "C" {
 /*! @brief Win32 specific [window hint](@ref GLFW_WIN32_SHOWDEFAULT_hint).
  */
 #define GLFW_WIN32_SHOWDEFAULT      0x00025002
+#define GLFW_WIN32_HWND_PARENT      0x00025003
 /*! @brief Wayland specific
  *  [window hint](@ref GLFW_WAYLAND_APP_ID_hint).
  *  
@@ -3053,6 +3054,14 @@ GLFWAPI void glfwDefaultWindowHints(void);
  */
 GLFWAPI void glfwWindowHint(int hint, int value);
 
+/*! @brief Sets the specified window hint to the desired value.
+ * 
+ *  @since Added in version 3.4.x.
+ *
+ *  @ingroup window
+ */
+GLFWAPI void glfwWindowHintPointer(int hint, void* value);
+
 /*! @brief Sets the specified window hint to the desired value.
  *
  *  This function sets hints for the next call to @ref glfwCreateWindow.  The

src/internal.h

@@ -425,6 +425,7 @@ struct _GLFWwndconfig
     struct {
         GLFWbool  keymenu;
         GLFWbool  showDefault;
+        void*     handleParent;
     } win32;
     struct {
         char      appId[256];

src/win32_platform.h

@@ -355,6 +355,7 @@ typedef struct _GLFWlibraryWGL
 typedef struct _GLFWwindowWin32
 {
     HWND                handle;
+    HWND                handleParent;
     HICON               bigIcon;
     HICON               smallIcon;
 

src/win32_window.c

@@ -45,6 +45,8 @@ static DWORD getWindowStyle(const _GLFWwindow* window)
     if (window->monitor)
         style |= WS_POPUP;
     else
+    {
+        if (!window->win32.handleParent)
         {
             style |= WS_SYSMENU | WS_MINIMIZEBOX;
 
@@ -58,6 +60,9 @@ static DWORD getWindowStyle(const _GLFWwindow* window)
             else
                 style |= WS_POPUP;
         }
+        else
+            style |= WS_CHILD;
+    }
 
     return style;
 }
@@ -1387,7 +1392,7 @@ static int createNativeWindow(_GLFWwindow* window,
                                            style,
                                            frameX, frameY,
                                            frameWidth, frameHeight,
-                                           NULL, // No parent window
+                                           (HWND)wndconfig->win32.handleParent,
                                            NULL, // No window menu
                                            _glfw.win32.instance,
                                            (LPVOID) wndconfig);
@@ -1487,6 +1492,8 @@ GLFWbool _glfwCreateWindowWin32(_GLFWwindow* window,
                                 const _GLFWctxconfig* ctxconfig,
                                 const _GLFWfbconfig* fbconfig)
 {
+    window->win32.handleParent = wndconfig->win32.handleParent;
+
     if (!createNativeWindow(window, wndconfig, fbconfig))
         return GLFW_FALSE;
 

src/window.c

@@ -436,6 +436,18 @@ GLFWAPI void glfwWindowHint(int hint, int value)
     _glfwInputError(GLFW_INVALID_ENUM, "Invalid window hint 0x%08X", hint);
 }
 
+GLFWAPI void glfwWindowHintPointer(int hint, void* value)
+{
+    _GLFW_REQUIRE_INIT();
+
+    switch (hint)
+    {
+    case GLFW_WIN32_HWND_PARENT:
+        _glfw.hints.window.win32.handleParent = value;
+        break;
+    }
+}
+
 GLFWAPI void glfwWindowHintString(int hint, const char* value)
 {
     assert(value != NULL);

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,
+                                      xpos,
-                                          window->wl.cursorPosY);
+                                      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);
+        }
     }
 }