fix(macos/input): incorrect mouse input for non-main display (#2461)

LizardByte · May 2, 2024 · 9d5ee2f · 9d5ee2f
1 parent 7fb8c76
commit 9d5ee2f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/src/platform/macos/display.mm b/src/platform/macos/display.mm
@@ -169,6 +169,9 @@
 
     display->width = display->av_capture.frameWidth;
     display->height = display->av_capture.frameHeight;
+    // We also need set env_width and env_height for absolute mouse coordinates
+    display->env_width = display->width;
+    display->env_height = display->height;
 
     return display;
   }

diff --git a/src/platform/macos/input.cpp b/src/platform/macos/input.cpp
@@ -328,15 +328,12 @@ const KeyCodeMap kKeyCodesMap[] = {
     auto display = macos_input->display;
     auto event = macos_input->mouse_event;
 
-    if (location.x < 0)
-      location.x = 0;
-    if (location.x >= (double) CGDisplayPixelsWide(display))
-      location.x = (double) CGDisplayPixelsWide(display) - 1;
+    // get display bounds for current display
+    CGRect display_bounds = CGDisplayBounds(display);
 
-    if (location.y < 0)
-      location.y = 0;
-    if (location.y >= (double) CGDisplayPixelsHigh(display))
-      location.y = (double) CGDisplayPixelsHigh(display) - 1;
+    // limit mouse to current display bounds
+    location.x = std::clamp(location.x, display_bounds.origin.x, display_bounds.origin.x + display_bounds.size.width - 1);
+    location.y = std::clamp(location.y, display_bounds.origin.y, display_bounds.origin.y + display_bounds.size.height - 1);
 
     CGEventSetType(event, type);
     CGEventSetLocation(event, location);
@@ -379,10 +376,15 @@ const KeyCodeMap kKeyCodesMap[] = {
 
   void
   abs_mouse(input_t &input, const touch_port_t &touch_port, float x, float y) {
-    auto scaling = ((macos_input_t *) input.get())->displayScaling;
+    auto macos_input = static_cast<macos_input_t *>(input.get());
+    auto scaling = macos_input->displayScaling;
+    auto display = macos_input->display;
 
     CGPoint location = CGPointMake(x * scaling, y * scaling);
-
+    CGRect display_bounds = CGDisplayBounds(display);
+    // in order to get the correct mouse location for capturing display , we need to add the display bounds to the location
+    location.x += display_bounds.origin.x;
+    location.y += display_bounds.origin.y;
     post_mouse(input, kCGMouseButtonLeft, event_type_mouse(input), location, 0);
   }