fix cursor autohide race condition

tsl0922 · Jan 22, 2023 · 572a42f · 572a42f
1 parent 9f589b3
commit 572a42f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/include/window.h b/include/window.h
@@ -45,6 +45,7 @@ class Window {
   std::mutex renderMutex;
   std::condition_variable renderCond;
   std::atomic_int waitTimeout = defaultTimeout;
+  bool ownCursor = false;
   double lastRenderAt = 0;
   double lastInputAt = 0;
   double lastMousePressAt = 0;

diff --git a/source/window.cpp b/source/window.cpp
@@ -96,7 +96,7 @@ bool Window::run(OptionParser& parser) {
     dispatch.process();
 
     bool hasInputEvents = !ImGui::GetCurrentContext()->InputEventsQueue.empty();
-    if (cursorAutoHide > 0 && mpv->playing() && !ImGui::GetIO().WantCaptureMouse) {
+    if (ownCursor && cursorAutoHide > 0 && mpv->playing() && !ImGui::GetIO().WantCaptureMouse) {
       int mode = (glfwGetTime() - lastInputAt) * 1000 > cursorAutoHide ? GLFW_CURSOR_DISABLED : GLFW_CURSOR_NORMAL;
       glfwSetInputMode(window, GLFW_CURSOR, mode);
     }
@@ -192,6 +192,10 @@ void Window::initGLFW(const char* title) {
     win->requestRender();
     win->dispatch.process();
   });
+  glfwSetCursorEnterCallback(window, [](GLFWwindow* window, int entered) {
+    auto win = static_cast<Window*>(glfwGetWindowUserPointer(window));
+    win->ownCursor = entered;
+  });
   glfwSetCursorPosCallback(window, [](GLFWwindow* window, double x, double y) {
     auto win = static_cast<Window*>(glfwGetWindowUserPointer(window));
     win->lastInputAt = glfwGetTime();