Merge c5e83f1b6a 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.

CONTRIBUTORS.md

@@ -264,6 +264,7 @@ video tutorials.
  - Jared Tiala
  - Sergey Tikhomirov
  - Arthur Tombs
+ - Luis Torres
  - TronicLabs
  - Ioannis Tsakpinis
  - Samuli Tuomola

README.md

@@ -128,6 +128,8 @@ information on what to include when reporting a bug.
  - [Win32] Removed support for Windows XP and Vista (#2505)
  - [Cocoa] Added `QuartzCore` framework as link-time dependency
  - [Cocoa] Removed support for OS X 10.10 Yosemite and earlier (#2506)
+ - [Cocoa] Bugfix: glfwGetFramebufferSize() now returns correct values for
+   non-retina windows for some Macs. (#2478)
  - [Wayland] Bugfix: The fractional scaling related objects were not destroyed
  - [Wayland] Bugfix: `glfwInit` would segfault on compositor with no seat (#2517)
  - [Wayland] Bugfix: A drag entering a non-GLFW surface could cause a segfault
@@ -139,6 +141,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`

src/cocoa_window.m

@@ -1133,12 +1133,24 @@ void _glfwGetFramebufferSizeCocoa(_GLFWwindow* window, int* width, int* height)
     @autoreleasepool {
 
     const NSRect contentRect = [window->ns.view frame];
+
+    if (window->ns.scaleFramebuffer)
+    {
         const NSRect fbRect = [window->ns.view convertRectToBacking:contentRect];
 
         if (width)
             *width = (int) fbRect.size.width;
         if (height)
             *height = (int) fbRect.size.height;
+    }
+    else
+    {
+        if (width)
+            *width = (int) contentRect.size.width;
+        if (height)
+            *height = (int) contentRect.size.height;
+
+    }
     
     } // autoreleasepool
 }

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);
+        }
     }
 }