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

Track macOS click count and pixel-scale wheel scroll

Browse Source
This commit is contained in:
Viktor Liu
2026-05-20 12:14:53 +02:00
parent 17b60b6c6b
commit e56dca74ca
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/vnc/server/input_darwin.go
+12 -10
View File
@@ -490,17 +490,19 @@ func (m *MacInputInjector) postButtonTransitions(src uintptr, buttonMask uint8,
func (m *MacInputInjector) postScrollWheel(src uintptr, buttonMask uint8) { func (m *MacInputInjector) postScrollWheel(src uintptr, buttonMask uint8) {
if buttonMask&0x08 != 0 { if buttonMask&0x08 != 0 {
m.postScroll(src, scrollLinesPerWheelTick) m.postScroll(src, scrollPixelsPerWheelTick)
} }
if buttonMask&0x10 != 0 { if buttonMask&0x10 != 0 {
m.postScroll(src, -scrollLinesPerWheelTick) m.postScroll(src, -scrollPixelsPerWheelTick)
} }
} }
// scrollLinesPerWheelTick is what one wheel-button event (VNC button 4 / 5) // scrollPixelsPerWheelTick is the pixel delta we post for one VNC wheel
// translates to in macOS line units. Three matches the default per-notch // button event. noVNC accumulates the host wheel/trackpad deltaY and
// scroll on macOS and what most VNC clients send for wheel events. // emits one press+release per ~10 px, so a real gesture arrives as many
const scrollLinesPerWheelTick int32 = 3 // small events; 20 px per event keeps the resulting macOS scroll fluid
// without overshooting on a single notch.
const scrollPixelsPerWheelTick int32 = 20
func (m *MacInputInjector) postMouse(src uintptr, eventType int32, x, y float64, button int32) { func (m *MacInputInjector) postMouse(src uintptr, eventType int32, x, y float64, button int32) {
if cgEventCreateMouseEvent == nil { if cgEventCreateMouseEvent == nil {
@@ -536,11 +538,11 @@ func (m *MacInputInjector) postScroll(src uintptr, deltaY int32) {
return return
} }
// CGEventCreateScrollWheelEvent(source, units, wheelCount, wheel1delta). // CGEventCreateScrollWheelEvent(source, units, wheelCount, wheel1delta).
// Line units (1) give the user-facing "one notch = a few lines" feel; // Pixel units (0) feel smoother under noVNC's "one event per ~10 px of
// pixel units (0) would need ~60-80 pixels per notch to match, and // host wheel" emission than line units (1) where each event jumps a
// that depends on screen density. Variadic C function, pass via SyscallN. // whole line. Variadic C function, pass via SyscallN.
r1, _, _ := purego.SyscallN(cgEventCreateScrollWheelEventAddr, r1, _, _ := purego.SyscallN(cgEventCreateScrollWheelEventAddr,
src, 1, 1, uintptr(uint32(deltaY))) src, 0, 1, uintptr(uint32(deltaY)))
if r1 == 0 { if r1 == 0 {
return return
} }