sendnrw/netbird
2
0
Fork 0
mirror of https://github.com/netbirdio/netbird.git synced 2026-10-05 04:59:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Order macOS pointer events by the previous button state, scale the cursor position into framebuffer pixels, and escalate crash cleanup to SIGKILL

Browse Source
This commit is contained in:
Viktor Liu
2026-09-22 20:10:15 +02:00
parent a5c146ccda
commit 88dbac029e
4 changed files with 59 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/vnc/server/cursor_darwin.go
+13 -3
View File
@@ -156,8 +156,14 @@ func (c *CGCapturer) Cursor() (*image.RGBA, int, int, uint64, error) {
return c.cursor.Cursor()
}
// CursorPos returns the current global mouse location via CGEventCreate /
// CGEventGetLocation. Coordinates are screen pixels in the main display.
// CursorPos returns the current mouse location in this capturer's framebuffer
// pixels, which is the space the caller composites the sprite into.
//
// CGEventGetLocation reports logical points. That is not the framebuffer's grid
// on a Retina display: the frame is captured at native resolution and then
// optionally halved, so the two differ by the display's backing scale factor
// over downscale. Returning points unconverted puts the cursor at a fraction of
// its real position whenever those disagree.
func (c *CGCapturer) CursorPos() (int, int, error) {
if cgEventCreate == nil || cgEventGetLocation == nil {
return 0, 0, fmt.Errorf("CGEvent location APIs unavailable")
@@ -168,7 +174,11 @@ func (c *CGCapturer) CursorPos() (int, int, error) {
}
defer cfRelease(ev)
pt := cgEventGetLocation(ev)
return int(pt.X), int(pt.Y), nil
if c.logicalW <= 0 || c.logicalH <= 0 {
return int(pt.X), int(pt.Y), nil
}
return int(pt.X) * c.w / c.logicalW, int(pt.Y) * c.h / c.logicalH, nil
}
// Cursor on MacPoller forwards to the lazy CGCapturer. ensureCapturerLocked