From d14bd10cd74ecfb9777e19dde842fe64d7681605 Mon Sep 17 00:00:00 2001 From: "Admiral H. Curtiss" Date: Thu, 21 Jul 2022 00:15:00 +0200 Subject: [PATCH] Quartz: Handle mouse centering hotkey. Co-authored-by: Dentomologist --- .../Quartz/QuartzKeyboardAndMouse.mm | 38 +++++++++++++++---- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/Source/Core/InputCommon/ControllerInterface/Quartz/QuartzKeyboardAndMouse.mm b/Source/Core/InputCommon/ControllerInterface/Quartz/QuartzKeyboardAndMouse.mm index 6b1790149b..b8ae0219be 100644 --- a/Source/Core/InputCommon/ControllerInterface/Quartz/QuartzKeyboardAndMouse.mm +++ b/Source/Core/InputCommon/ControllerInterface/Quartz/QuartzKeyboardAndMouse.mm @@ -8,6 +8,8 @@ #include #include +#include "Core/Host.h" + #include "InputCommon/ControllerInterface/ControllerInterface.h" namespace ciface::Quartz @@ -192,16 +194,36 @@ void KeyboardAndMouse::UpdateInput() CFRelease(windowDescriptions); CFRelease(windowArray); - CGEventRef event = CGEventCreate(nil); - CGPoint loc = CGEventGetLocation(event); - CFRelease(event); + const double window_width = std::max(bounds.size.width, 1.0); + const double window_height = std::max(bounds.size.height, 1.0); - const auto window_scale = g_controller_interface.GetWindowInputScale(); + if (g_controller_interface.IsMouseCenteringRequested() && Host_RendererHasFocus()) + { + m_cursor.x = 0; + m_cursor.y = 0; - loc.x -= bounds.origin.x; - loc.y -= bounds.origin.y; - m_cursor.x = (loc.x / std::max(bounds.size.width, 1.0) * 2 - 1.0) * window_scale.x; - m_cursor.y = (loc.y / std::max(bounds.size.height, 1.0) * 2 - 1.0) * window_scale.y; + const CGPoint window_center_global_coordinates = + CGPointMake(bounds.origin.x + window_width / 2.0, bounds.origin.y + window_height / 2.0); + CGWarpMouseCursorPosition(window_center_global_coordinates); + // Without this line there is a short but obvious delay after centering the cursor before it can + // be moved again + CGAssociateMouseAndMouseCursorPosition(true); + + g_controller_interface.SetMouseCenteringRequested(false); + } + else + { + CGEventRef event = CGEventCreate(nil); + CGPoint loc = CGEventGetLocation(event); + CFRelease(event); + + const auto window_scale = g_controller_interface.GetWindowInputScale(); + + loc.x -= bounds.origin.x; + loc.y -= bounds.origin.y; + m_cursor.x = (loc.x / window_width * 2 - 1.0) * window_scale.x; + m_cursor.y = (loc.y / window_height * 2 - 1.0) * window_scale.y; + } } std::string KeyboardAndMouse::GetName() const