mirror/Sunshine
1
0
Fork 0
mirror of https://github.com/LizardByte/Sunshine.git synced 2025-03-14 07:20:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TimmyOVO 2024-05-03 01:52:29 +08:00 committed by GitHub
parent 7fb8c76590
commit 9d5ee2f57d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/platform/macos/display.mm
View File

@ -169,6 +169,9 @@ namespace platf {
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;
}

22
src/platform/macos/input.cpp
View File

@ -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);
}