fix(macos/input): incorrect mouse input for non-main display #2461
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -328,15 +328,12 @@ | |
| auto display = macos_input->display; | ||
| auto event = macos_input->mouse_event; | ||
|
|
||
| // get display bounds for current display | ||
| CGRect display_bounds = CGDisplayBounds(display); | ||
|
|
||
| // 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 @@ | |
|
|
||
| void | ||
| abs_mouse(input_t &input, const touch_port_t &touch_port, float x, float y) { | ||
| 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 | ||
|
There was a problem hiding this comment. The location we received are relative to the display we are capturing ,so we get the display bounds using CGDisplayBounds then add them up to get the right input coordinates. |
||
| location.x += display_bounds.origin.x; | ||
| location.y += display_bounds.origin.y; | ||
| post_mouse(input, kCGMouseButtonLeft, event_type_mouse(input), location, 0); | ||
| } | ||
|
|
||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Before we support change the display we need to capture in macOS, the location we get here according to Apple Document should be
The current location of the specified mouse event in global display coordinates, we can not just simply assuming the display's bounds to[0,display_width]and[0,display_height]. So we need to get the correspond display bounds for display we are capturing usingCGDisplayBoundswhich returnThe bounds of the display, expressed as a rectangle in the global display coordinate space (relative to the upper-left corner of the main display)..