From 9fc035a562b1bd2ce962239108c65afad32f5e74 Mon Sep 17 00:00:00 2001
From: Leon Linhart <themrmilchmann@gmail.com>
Date: Mon, 27 May 2019 22:42:12 +0200
Subject: [PATCH] Win32: Fix cursor enter/position event order

This fixes the cursor enter event being emitted after the first cursor
position event on Windows.

Closes #1490.

(cherry picked from commit 4f0b8b0ddaada126cd257f2e5b06450e932ad5f6)
---
 README.md          |  2 ++
 src/win32_window.c | 26 +++++++++++++-------------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index 83bb17a2..7a34d699 100644
--- a/README.md
+++ b/README.md
@@ -122,6 +122,7 @@ information on what to include when reporting a bug.
    relocatable (#1470)
  - [Win32] Bugfix: `GLFW_INCLUDE_VULKAN` plus `VK_USE_PLATFORM_WIN32_KHR` caused
    symbol redefinition (#1524)
+ - [Win32] Bugfix: Invoke cursor enter callback before cursor position callback
  - [X11] Bugfix: The CMake files did not check for the XInput headers (#1480)
  - [X11] Bugfix: Key names were not updated when the keyboard layout changed
    (#1462,#1528)
@@ -225,6 +226,7 @@ skills.
  - Glenn Lewis
  - Shane Liesegang
  - Anders Lindqvist
+ - Leon Linhart
  - Eyal Lotem
  - Aaron Loucks
  - Luflosi
diff --git a/src/win32_window.c b/src/win32_window.c
index 1f58acb6..5b9671d8 100644
--- a/src/win32_window.c
+++ b/src/win32_window.c
@@ -828,6 +828,19 @@ static LRESULT CALLBACK windowProc(HWND hWnd, UINT uMsg,
             const int x = GET_X_LPARAM(lParam);
             const int y = GET_Y_LPARAM(lParam);
 
+            if (!window->win32.cursorTracked)
+            {
+                TRACKMOUSEEVENT tme;
+                ZeroMemory(&tme, sizeof(tme));
+                tme.cbSize = sizeof(tme);
+                tme.dwFlags = TME_LEAVE;
+                tme.hwndTrack = window->win32.handle;
+                TrackMouseEvent(&tme);
+
+                window->win32.cursorTracked = GLFW_TRUE;
+                _glfwInputCursorEnter(window, GLFW_TRUE);
+            }
+
             if (window->cursorMode == GLFW_CURSOR_DISABLED)
             {
                 const int dx = x - window->win32.lastCursorPosX;
@@ -848,19 +861,6 @@ static LRESULT CALLBACK windowProc(HWND hWnd, UINT uMsg,
             window->win32.lastCursorPosX = x;
             window->win32.lastCursorPosY = y;
 
-            if (!window->win32.cursorTracked)
-            {
-                TRACKMOUSEEVENT tme;
-                ZeroMemory(&tme, sizeof(tme));
-                tme.cbSize = sizeof(tme);
-                tme.dwFlags = TME_LEAVE;
-                tme.hwndTrack = window->win32.handle;
-                TrackMouseEvent(&tme);
-
-                window->win32.cursorTracked = GLFW_TRUE;
-                _glfwInputCursorEnter(window, GLFW_TRUE);
-            }
-
             return 0;
         }