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

Merged
ReenigneArcher merged 25 commits into
LizardByte:nightlyfrom
TimmyOVO:nightly
May 2, 2024
Merged

fix(macos/input): incorrect mouse input for non-main display#2461
ReenigneArcher merged 25 commits into
LizardByte:nightlyfrom
TimmyOVO:nightly

Conversation

@TimmyOVO

Copy link
Copy Markdown
Contributor

Description

fix: abs mouse input not working in macOS
fix: wrong abs mouse coordinates when capturing non-main display in macOS
fix: wrong mouse coordinates correction when capturing non-main display in macOS

Screenshot

Issues Fixed or Closed

Type of Change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Dependency update (updates to dependencies)
  • Documentation update (changes to documentation)
  • Repository update (changes to repository files, e.g. .github/...)

Checklist

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have added or updated the in code docstring/documentation-blocks for new or existing methods/components

Branch Updates

LizardByte requires that branches be up-to-date before merging. This means that after any PR is merged, this branch
must be updated before it can be merged. You must also
Allow edits from maintainers.

  • I want maintainers to keep my branch updated

fix: wrong abs mouse coordinates when capturing non-main display in macOS
fix: wrong mouse coordinates correction when capturing non-main display in macOS
@codecov

codecovBot commented Apr 22, 2024

Copy link
Copy Markdown

Codecov Report

Attention: Patch coverage is 18.18182% with 9 lines in your changes are missing coverage. Please review.

Project coverage is 6.18%. Comparing base (7fb8c76) to head (4d89d73).

Additional details and impacted files
@@ Coverage Diff @@## nightly #2461 +/- ##
==========================================
+ Coverage 6.17% 6.18% +0.01% 
==========================================
Files 86 86 Lines 17546 17548 +2 Branches 8190 8186 -4 ==========================================
+ Hits 1083 1085 +2 + Misses 15410 14655 -755 - Partials 1053 1808 +755 
FlagCoverage Δ
Linux4.26% <ø> (ø)
Windows2.04% <ø> (ø)
macOS-128.73% <18.18%> (+0.14%)⬆️
macOS-13?
macOS-148.19% <18.18%> (+0.02%)⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

FilesCoverage Δ
src/platform/macos/display.mm42.15% <100.00%> (+1.15%)⬆️
src/platform/macos/input.cpp2.39% <0.00%> (ø)

... and 27 files with indirect coverage changes

@ReenigneArcher

Copy link
Copy Markdown
Member

I don't have the ability to test these changes. Ideally unit tests would be added around the changed code, but I understand that's not always the easiest thing to do.

Can you explain how you tested your changes?

@TimmyOVOTimmyOVO left a comment

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's all i done here in order to get correct input coordinates after we support specific display capture.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In this commit, there is a change that would require both env_width and env_height to have non-zero values, but these values are not properly set in that commit, which could break absolute mouse input on macOS.

Copy link
Copy Markdown
ContributorAuthor

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 using CGDisplayBounds which return The bounds of the display, expressed as a rectangle in the global display coordinate space (relative to the upper-left corner of the main 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

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Comment threadsrc/platform/macos/input.cpp Outdated
@BayLee4

Copy link
Copy Markdown
Contributor

Hi, just wanted to report that I tested the changes (by forking the homebrew tap repository and then pointing it to the right branch/commit) and confirm the issue is now gone, everything[1] works perfectly 👍

[1]: Well except the CTRL + ALT + SHIFT + N shortcut which still doesn't hide the cursor in anything but the main display, but that behavior is already present upstream so that would be a different issue

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@TimmyOVO@ReenigneArcher@BayLee4@cgutman
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

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

Merged
ReenigneArcher merged 25 commits into
LizardByte:nightlyfrom
TimmyOVO:nightly
May 2, 2024
Merged

fix(macos/input): incorrect mouse input for non-main display#2461
ReenigneArcher merged 25 commits into
LizardByte:nightlyfrom
TimmyOVO:nightly

Conversation

@TimmyOVO

Copy link
Copy Markdown
Contributor

Description

fix: abs mouse input not working in macOS
fix: wrong abs mouse coordinates when capturing non-main display in macOS
fix: wrong mouse coordinates correction when capturing non-main display in macOS

Screenshot

Issues Fixed or Closed

Type of Change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Dependency update (updates to dependencies)
  • Documentation update (changes to documentation)
  • Repository update (changes to repository files, e.g. .github/...)

Checklist

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have added or updated the in code docstring/documentation-blocks for new or existing methods/components

Branch Updates

LizardByte requires that branches be up-to-date before merging. This means that after any PR is merged, this branch
must be updated before it can be merged. You must also
Allow edits from maintainers.

  • I want maintainers to keep my branch updated

fix: wrong abs mouse coordinates when capturing non-main display in macOS
fix: wrong mouse coordinates correction when capturing non-main display in macOS
@codecov

codecovBot commented Apr 22, 2024

Copy link
Copy Markdown

Codecov Report

Attention: Patch coverage is 18.18182% with 9 lines in your changes are missing coverage. Please review.

Project coverage is 6.18%. Comparing base (7fb8c76) to head (4d89d73).

Additional details and impacted files
@@ Coverage Diff @@## nightly #2461 +/- ##
==========================================
+ Coverage 6.17% 6.18% +0.01% 
==========================================
Files 86 86 Lines 17546 17548 +2 Branches 8190 8186 -4 ==========================================
+ Hits 1083 1085 +2 + Misses 15410 14655 -755 - Partials 1053 1808 +755 
FlagCoverage Δ
Linux4.26% <ø> (ø)
Windows2.04% <ø> (ø)
macOS-128.73% <18.18%> (+0.14%)⬆️
macOS-13?
macOS-148.19% <18.18%> (+0.02%)⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

FilesCoverage Δ
src/platform/macos/display.mm42.15% <100.00%> (+1.15%)⬆️
src/platform/macos/input.cpp2.39% <0.00%> (ø)

... and 27 files with indirect coverage changes

@ReenigneArcher

Copy link
Copy Markdown
Member

I don't have the ability to test these changes. Ideally unit tests would be added around the changed code, but I understand that's not always the easiest thing to do.

Can you explain how you tested your changes?

@TimmyOVOTimmyOVO left a comment

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's all i done here in order to get correct input coordinates after we support specific display capture.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In this commit, there is a change that would require both env_width and env_height to have non-zero values, but these values are not properly set in that commit, which could break absolute mouse input on macOS.

Copy link
Copy Markdown
ContributorAuthor

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 using CGDisplayBounds which return The bounds of the display, expressed as a rectangle in the global display coordinate space (relative to the upper-left corner of the main 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

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Comment threadsrc/platform/macos/input.cpp Outdated
@BayLee4

Copy link
Copy Markdown
Contributor

Hi, just wanted to report that I tested the changes (by forking the homebrew tap repository and then pointing it to the right branch/commit) and confirm the issue is now gone, everything[1] works perfectly 👍

[1]: Well except the CTRL + ALT + SHIFT + N shortcut which still doesn't hide the cursor in anything but the main display, but that behavior is already present upstream so that would be a different issue

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@TimmyOVO@ReenigneArcher@BayLee4@cgutman
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

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

Merged
ReenigneArcher merged 25 commits into
LizardByte:nightlyfrom
TimmyOVO:nightly
May 2, 2024
Merged

fix(macos/input): incorrect mouse input for non-main display#2461
ReenigneArcher merged 25 commits into
LizardByte:nightlyfrom
TimmyOVO:nightly

Conversation

@TimmyOVO

Copy link
Copy Markdown
Contributor

Description

fix: abs mouse input not working in macOS
fix: wrong abs mouse coordinates when capturing non-main display in macOS
fix: wrong mouse coordinates correction when capturing non-main display in macOS

Screenshot

Issues Fixed or Closed

Type of Change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Dependency update (updates to dependencies)
  • Documentation update (changes to documentation)
  • Repository update (changes to repository files, e.g. .github/...)

Checklist

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have added or updated the in code docstring/documentation-blocks for new or existing methods/components

Branch Updates

LizardByte requires that branches be up-to-date before merging. This means that after any PR is merged, this branch
must be updated before it can be merged. You must also
Allow edits from maintainers.

  • I want maintainers to keep my branch updated

fix: wrong abs mouse coordinates when capturing non-main display in macOS
fix: wrong mouse coordinates correction when capturing non-main display in macOS
@codecov

codecovBot commented Apr 22, 2024

Copy link
Copy Markdown

Codecov Report

Attention: Patch coverage is 18.18182% with 9 lines in your changes are missing coverage. Please review.

Project coverage is 6.18%. Comparing base (7fb8c76) to head (4d89d73).

Additional details and impacted files
@@ Coverage Diff @@## nightly #2461 +/- ##
==========================================
+ Coverage 6.17% 6.18% +0.01% 
==========================================
Files 86 86 Lines 17546 17548 +2 Branches 8190 8186 -4 ==========================================
+ Hits 1083 1085 +2 + Misses 15410 14655 -755 - Partials 1053 1808 +755 
FlagCoverage Δ
Linux4.26% <ø> (ø)
Windows2.04% <ø> (ø)
macOS-128.73% <18.18%> (+0.14%)⬆️
macOS-13?
macOS-148.19% <18.18%> (+0.02%)⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

FilesCoverage Δ
src/platform/macos/display.mm42.15% <100.00%> (+1.15%)⬆️
src/platform/macos/input.cpp2.39% <0.00%> (ø)

... and 27 files with indirect coverage changes

@ReenigneArcher

Copy link
Copy Markdown
Member

I don't have the ability to test these changes. Ideally unit tests would be added around the changed code, but I understand that's not always the easiest thing to do.

Can you explain how you tested your changes?

@TimmyOVOTimmyOVO left a comment

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's all i done here in order to get correct input coordinates after we support specific display capture.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In this commit, there is a change that would require both env_width and env_height to have non-zero values, but these values are not properly set in that commit, which could break absolute mouse input on macOS.

Copy link
Copy Markdown
ContributorAuthor

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 using CGDisplayBounds which return The bounds of the display, expressed as a rectangle in the global display coordinate space (relative to the upper-left corner of the main 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

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Comment threadsrc/platform/macos/input.cpp Outdated
@BayLee4

Copy link
Copy Markdown
Contributor

Hi, just wanted to report that I tested the changes (by forking the homebrew tap repository and then pointing it to the right branch/commit) and confirm the issue is now gone, everything[1] works perfectly 👍

[1]: Well except the CTRL + ALT + SHIFT + N shortcut which still doesn't hide the cursor in anything but the main display, but that behavior is already present upstream so that would be a different issue

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@TimmyOVO@ReenigneArcher@BayLee4@cgutman
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

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

Merged
ReenigneArcher merged 25 commits into
LizardByte:nightlyfrom
TimmyOVO:nightly
May 2, 2024
Merged

fix(macos/input): incorrect mouse input for non-main display#2461
ReenigneArcher merged 25 commits into
LizardByte:nightlyfrom
TimmyOVO:nightly

Conversation

@TimmyOVO

Copy link
Copy Markdown
Contributor

Description

fix: abs mouse input not working in macOS
fix: wrong abs mouse coordinates when capturing non-main display in macOS
fix: wrong mouse coordinates correction when capturing non-main display in macOS

Screenshot

Issues Fixed or Closed

Type of Change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Dependency update (updates to dependencies)
  • Documentation update (changes to documentation)
  • Repository update (changes to repository files, e.g. .github/...)

Checklist

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have added or updated the in code docstring/documentation-blocks for new or existing methods/components

Branch Updates

LizardByte requires that branches be up-to-date before merging. This means that after any PR is merged, this branch
must be updated before it can be merged. You must also
Allow edits from maintainers.

  • I want maintainers to keep my branch updated

fix: wrong abs mouse coordinates when capturing non-main display in macOS
fix: wrong mouse coordinates correction when capturing non-main display in macOS
@codecov

codecovBot commented Apr 22, 2024

Copy link
Copy Markdown

Codecov Report

Attention: Patch coverage is 18.18182% with 9 lines in your changes are missing coverage. Please review.

Project coverage is 6.18%. Comparing base (7fb8c76) to head (4d89d73).

Additional details and impacted files
@@ Coverage Diff @@## nightly #2461 +/- ##
==========================================
+ Coverage 6.17% 6.18% +0.01% 
==========================================
Files 86 86 Lines 17546 17548 +2 Branches 8190 8186 -4 ==========================================
+ Hits 1083 1085 +2 + Misses 15410 14655 -755 - Partials 1053 1808 +755 
FlagCoverage Δ
Linux4.26% <ø> (ø)
Windows2.04% <ø> (ø)
macOS-128.73% <18.18%> (+0.14%)⬆️
macOS-13?
macOS-148.19% <18.18%> (+0.02%)⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

FilesCoverage Δ
src/platform/macos/display.mm42.15% <100.00%> (+1.15%)⬆️
src/platform/macos/input.cpp2.39% <0.00%> (ø)

... and 27 files with indirect coverage changes

@ReenigneArcher

Copy link
Copy Markdown
Member

I don't have the ability to test these changes. Ideally unit tests would be added around the changed code, but I understand that's not always the easiest thing to do.

Can you explain how you tested your changes?

@TimmyOVOTimmyOVO left a comment

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's all i done here in order to get correct input coordinates after we support specific display capture.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In this commit, there is a change that would require both env_width and env_height to have non-zero values, but these values are not properly set in that commit, which could break absolute mouse input on macOS.

Copy link
Copy Markdown
ContributorAuthor

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 using CGDisplayBounds which return The bounds of the display, expressed as a rectangle in the global display coordinate space (relative to the upper-left corner of the main 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

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Comment threadsrc/platform/macos/input.cpp Outdated
@BayLee4

Copy link
Copy Markdown
Contributor

Hi, just wanted to report that I tested the changes (by forking the homebrew tap repository and then pointing it to the right branch/commit) and confirm the issue is now gone, everything[1] works perfectly 👍

[1]: Well except the CTRL + ALT + SHIFT + N shortcut which still doesn't hide the cursor in anything but the main display, but that behavior is already present upstream so that would be a different issue

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@TimmyOVO@ReenigneArcher@BayLee4@cgutman
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

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

Merged
ReenigneArcher merged 25 commits into
LizardByte:nightlyfrom
TimmyOVO:nightly
May 2, 2024
Merged

fix(macos/input): incorrect mouse input for non-main display#2461
ReenigneArcher merged 25 commits into
LizardByte:nightlyfrom
TimmyOVO:nightly

Conversation

@TimmyOVO

Copy link
Copy Markdown
Contributor

Description

fix: abs mouse input not working in macOS
fix: wrong abs mouse coordinates when capturing non-main display in macOS
fix: wrong mouse coordinates correction when capturing non-main display in macOS

Screenshot

Issues Fixed or Closed

Type of Change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Dependency update (updates to dependencies)
  • Documentation update (changes to documentation)
  • Repository update (changes to repository files, e.g. .github/...)

Checklist

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have added or updated the in code docstring/documentation-blocks for new or existing methods/components

Branch Updates

LizardByte requires that branches be up-to-date before merging. This means that after any PR is merged, this branch
must be updated before it can be merged. You must also
Allow edits from maintainers.

  • I want maintainers to keep my branch updated

fix: wrong abs mouse coordinates when capturing non-main display in macOS
fix: wrong mouse coordinates correction when capturing non-main display in macOS
@codecov

codecovBot commented Apr 22, 2024

Copy link
Copy Markdown

Codecov Report

Attention: Patch coverage is 18.18182% with 9 lines in your changes are missing coverage. Please review.

Project coverage is 6.18%. Comparing base (7fb8c76) to head (4d89d73).

Additional details and impacted files
@@ Coverage Diff @@## nightly #2461 +/- ##
==========================================
+ Coverage 6.17% 6.18% +0.01% 
==========================================
Files 86 86 Lines 17546 17548 +2 Branches 8190 8186 -4 ==========================================
+ Hits 1083 1085 +2 + Misses 15410 14655 -755 - Partials 1053 1808 +755 
FlagCoverage Δ
Linux4.26% <ø> (ø)
Windows2.04% <ø> (ø)
macOS-128.73% <18.18%> (+0.14%)⬆️
macOS-13?
macOS-148.19% <18.18%> (+0.02%)⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

FilesCoverage Δ
src/platform/macos/display.mm42.15% <100.00%> (+1.15%)⬆️
src/platform/macos/input.cpp2.39% <0.00%> (ø)

... and 27 files with indirect coverage changes

@ReenigneArcher

Copy link
Copy Markdown
Member

I don't have the ability to test these changes. Ideally unit tests would be added around the changed code, but I understand that's not always the easiest thing to do.

Can you explain how you tested your changes?

@TimmyOVOTimmyOVO left a comment

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's all i done here in order to get correct input coordinates after we support specific display capture.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In this commit, there is a change that would require both env_width and env_height to have non-zero values, but these values are not properly set in that commit, which could break absolute mouse input on macOS.

Copy link
Copy Markdown
ContributorAuthor

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 using CGDisplayBounds which return The bounds of the display, expressed as a rectangle in the global display coordinate space (relative to the upper-left corner of the main 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

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Comment threadsrc/platform/macos/input.cpp Outdated
@BayLee4

Copy link
Copy Markdown
Contributor

Hi, just wanted to report that I tested the changes (by forking the homebrew tap repository and then pointing it to the right branch/commit) and confirm the issue is now gone, everything[1] works perfectly 👍

[1]: Well except the CTRL + ALT + SHIFT + N shortcut which still doesn't hide the cursor in anything but the main display, but that behavior is already present upstream so that would be a different issue

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@TimmyOVO@ReenigneArcher@BayLee4@cgutman
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

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

Merged
ReenigneArcher merged 25 commits into
LizardByte:nightlyfrom
TimmyOVO:nightly
May 2, 2024
Merged

fix(macos/input): incorrect mouse input for non-main display#2461
ReenigneArcher merged 25 commits into
LizardByte:nightlyfrom
TimmyOVO:nightly

Conversation

@TimmyOVO

Copy link
Copy Markdown
Contributor

Description

fix: abs mouse input not working in macOS
fix: wrong abs mouse coordinates when capturing non-main display in macOS
fix: wrong mouse coordinates correction when capturing non-main display in macOS

Screenshot

Issues Fixed or Closed

Type of Change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Dependency update (updates to dependencies)
  • Documentation update (changes to documentation)
  • Repository update (changes to repository files, e.g. .github/...)

Checklist

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have added or updated the in code docstring/documentation-blocks for new or existing methods/components

Branch Updates

LizardByte requires that branches be up-to-date before merging. This means that after any PR is merged, this branch
must be updated before it can be merged. You must also
Allow edits from maintainers.

  • I want maintainers to keep my branch updated

fix: wrong abs mouse coordinates when capturing non-main display in macOS
fix: wrong mouse coordinates correction when capturing non-main display in macOS
@codecov

codecovBot commented Apr 22, 2024

Copy link
Copy Markdown

Codecov Report

Attention: Patch coverage is 18.18182% with 9 lines in your changes are missing coverage. Please review.

Project coverage is 6.18%. Comparing base (7fb8c76) to head (4d89d73).

Additional details and impacted files
@@ Coverage Diff @@## nightly #2461 +/- ##
==========================================
+ Coverage 6.17% 6.18% +0.01% 
==========================================
Files 86 86 Lines 17546 17548 +2 Branches 8190 8186 -4 ==========================================
+ Hits 1083 1085 +2 + Misses 15410 14655 -755 - Partials 1053 1808 +755 
FlagCoverage Δ
Linux4.26% <ø> (ø)
Windows2.04% <ø> (ø)
macOS-128.73% <18.18%> (+0.14%)⬆️
macOS-13?
macOS-148.19% <18.18%> (+0.02%)⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

FilesCoverage Δ
src/platform/macos/display.mm42.15% <100.00%> (+1.15%)⬆️
src/platform/macos/input.cpp2.39% <0.00%> (ø)

... and 27 files with indirect coverage changes

@ReenigneArcher

Copy link
Copy Markdown
Member

I don't have the ability to test these changes. Ideally unit tests would be added around the changed code, but I understand that's not always the easiest thing to do.

Can you explain how you tested your changes?

@TimmyOVOTimmyOVO left a comment

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's all i done here in order to get correct input coordinates after we support specific display capture.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In this commit, there is a change that would require both env_width and env_height to have non-zero values, but these values are not properly set in that commit, which could break absolute mouse input on macOS.

Copy link
Copy Markdown
ContributorAuthor

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 using CGDisplayBounds which return The bounds of the display, expressed as a rectangle in the global display coordinate space (relative to the upper-left corner of the main 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

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Comment threadsrc/platform/macos/input.cpp Outdated
@BayLee4

Copy link
Copy Markdown
Contributor

Hi, just wanted to report that I tested the changes (by forking the homebrew tap repository and then pointing it to the right branch/commit) and confirm the issue is now gone, everything[1] works perfectly 👍

[1]: Well except the CTRL + ALT + SHIFT + N shortcut which still doesn't hide the cursor in anything but the main display, but that behavior is already present upstream so that would be a different issue

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@TimmyOVO@ReenigneArcher@BayLee4@cgutman
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

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

Merged
ReenigneArcher merged 25 commits into
LizardByte:nightlyfrom
TimmyOVO:nightly
May 2, 2024
Merged

fix(macos/input): incorrect mouse input for non-main display#2461
ReenigneArcher merged 25 commits into
LizardByte:nightlyfrom
TimmyOVO:nightly

Conversation

@TimmyOVO

Copy link
Copy Markdown
Contributor

Description

fix: abs mouse input not working in macOS
fix: wrong abs mouse coordinates when capturing non-main display in macOS
fix: wrong mouse coordinates correction when capturing non-main display in macOS

Screenshot

Issues Fixed or Closed

Type of Change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Dependency update (updates to dependencies)
  • Documentation update (changes to documentation)
  • Repository update (changes to repository files, e.g. .github/...)

Checklist

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have added or updated the in code docstring/documentation-blocks for new or existing methods/components

Branch Updates

LizardByte requires that branches be up-to-date before merging. This means that after any PR is merged, this branch
must be updated before it can be merged. You must also
Allow edits from maintainers.

  • I want maintainers to keep my branch updated

fix: wrong abs mouse coordinates when capturing non-main display in macOS
fix: wrong mouse coordinates correction when capturing non-main display in macOS
@codecov

codecovBot commented Apr 22, 2024

Copy link
Copy Markdown

Codecov Report

Attention: Patch coverage is 18.18182% with 9 lines in your changes are missing coverage. Please review.

Project coverage is 6.18%. Comparing base (7fb8c76) to head (4d89d73).

Additional details and impacted files
@@ Coverage Diff @@## nightly #2461 +/- ##
==========================================
+ Coverage 6.17% 6.18% +0.01% 
==========================================
Files 86 86 Lines 17546 17548 +2 Branches 8190 8186 -4 ==========================================
+ Hits 1083 1085 +2 + Misses 15410 14655 -755 - Partials 1053 1808 +755 
FlagCoverage Δ
Linux4.26% <ø> (ø)
Windows2.04% <ø> (ø)
macOS-128.73% <18.18%> (+0.14%)⬆️
macOS-13?
macOS-148.19% <18.18%> (+0.02%)⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

FilesCoverage Δ
src/platform/macos/display.mm42.15% <100.00%> (+1.15%)⬆️
src/platform/macos/input.cpp2.39% <0.00%> (ø)

... and 27 files with indirect coverage changes

@ReenigneArcher

Copy link
Copy Markdown
Member

I don't have the ability to test these changes. Ideally unit tests would be added around the changed code, but I understand that's not always the easiest thing to do.

Can you explain how you tested your changes?

@TimmyOVOTimmyOVO left a comment

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's all i done here in order to get correct input coordinates after we support specific display capture.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In this commit, there is a change that would require both env_width and env_height to have non-zero values, but these values are not properly set in that commit, which could break absolute mouse input on macOS.

Copy link
Copy Markdown
ContributorAuthor

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 using CGDisplayBounds which return The bounds of the display, expressed as a rectangle in the global display coordinate space (relative to the upper-left corner of the main 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

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Comment threadsrc/platform/macos/input.cpp Outdated
@BayLee4

Copy link
Copy Markdown
Contributor

Hi, just wanted to report that I tested the changes (by forking the homebrew tap repository and then pointing it to the right branch/commit) and confirm the issue is now gone, everything[1] works perfectly 👍

[1]: Well except the CTRL + ALT + SHIFT + N shortcut which still doesn't hide the cursor in anything but the main display, but that behavior is already present upstream so that would be a different issue

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@TimmyOVO@ReenigneArcher@BayLee4@cgutman
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

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

Merged
ReenigneArcher merged 25 commits into
LizardByte:nightlyfrom
TimmyOVO:nightly
May 2, 2024
Merged

fix(macos/input): incorrect mouse input for non-main display#2461
ReenigneArcher merged 25 commits into
LizardByte:nightlyfrom
TimmyOVO:nightly

Conversation

@TimmyOVO

Copy link
Copy Markdown
Contributor

Description

fix: abs mouse input not working in macOS
fix: wrong abs mouse coordinates when capturing non-main display in macOS
fix: wrong mouse coordinates correction when capturing non-main display in macOS

Screenshot

Issues Fixed or Closed

Type of Change

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Dependency update (updates to dependencies)
  • Documentation update (changes to documentation)
  • Repository update (changes to repository files, e.g. .github/...)

Checklist

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have added or updated the in code docstring/documentation-blocks for new or existing methods/components

Branch Updates

LizardByte requires that branches be up-to-date before merging. This means that after any PR is merged, this branch
must be updated before it can be merged. You must also
Allow edits from maintainers.

  • I want maintainers to keep my branch updated

fix: wrong abs mouse coordinates when capturing non-main display in macOS
fix: wrong mouse coordinates correction when capturing non-main display in macOS
@codecov

codecovBot commented Apr 22, 2024

Copy link
Copy Markdown

Codecov Report

Attention: Patch coverage is 18.18182% with 9 lines in your changes are missing coverage. Please review.

Project coverage is 6.18%. Comparing base (7fb8c76) to head (4d89d73).

Additional details and impacted files
@@ Coverage Diff @@## nightly #2461 +/- ##
==========================================
+ Coverage 6.17% 6.18% +0.01% 
==========================================
Files 86 86 Lines 17546 17548 +2 Branches 8190 8186 -4 ==========================================
+ Hits 1083 1085 +2 + Misses 15410 14655 -755 - Partials 1053 1808 +755 
FlagCoverage Δ
Linux4.26% <ø> (ø)
Windows2.04% <ø> (ø)
macOS-128.73% <18.18%> (+0.14%)⬆️
macOS-13?
macOS-148.19% <18.18%> (+0.02%)⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

FilesCoverage Δ
src/platform/macos/display.mm42.15% <100.00%> (+1.15%)⬆️
src/platform/macos/input.cpp2.39% <0.00%> (ø)

... and 27 files with indirect coverage changes

@ReenigneArcher

Copy link
Copy Markdown
Member

I don't have the ability to test these changes. Ideally unit tests would be added around the changed code, but I understand that's not always the easiest thing to do.

Can you explain how you tested your changes?

@TimmyOVOTimmyOVO left a comment

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's all i done here in order to get correct input coordinates after we support specific display capture.

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In this commit, there is a change that would require both env_width and env_height to have non-zero values, but these values are not properly set in that commit, which could break absolute mouse input on macOS.

Copy link
Copy Markdown
ContributorAuthor

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 using CGDisplayBounds which return The bounds of the display, expressed as a rectangle in the global display coordinate space (relative to the upper-left corner of the main 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

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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.

Comment threadsrc/platform/macos/input.cpp Outdated
@BayLee4

Copy link
Copy Markdown
Contributor

Hi, just wanted to report that I tested the changes (by forking the homebrew tap repository and then pointing it to the right branch/commit) and confirm the issue is now gone, everything[1] works perfectly 👍

[1]: Well except the CTRL + ALT + SHIFT + N shortcut which still doesn't hide the cursor in anything but the main display, but that behavior is already present upstream so that would be a different issue

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants

@TimmyOVO@ReenigneArcher@BayLee4@cgutman