Skip to content

fix: keep mouse movement smooth across portal edges #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ai-eks wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: keep mouse movement smooth across portal edges #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 11 additions & 20 deletions MousePortal/Services/PortalService.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -353,7 +353,7 @@ class PortalService: ObservableObject {
callbackState.updateKeyPressed(with: event.flags.rawValue)
}

nonisolated func handleMouseMovedForTap(_ event: CGEvent) -> (target: CGPoint, deltaX: Double, deltaY: Double)? {
nonisolated func handleMouseMovedForTap(_ event: CGEvent) -> CGPoint? {
let snapshot = callbackState.snapshot()

if snapshot.triggerMode == .withKey && !snapshot.isKeyPressed {
Expand All @@ -363,8 +363,6 @@ class PortalService: ObservableObject {
guard let resolver = snapshot.layoutResolver else { return nil }

let mouseLocation = event.location
let deltaX = event.getDoubleValueField(.mouseEventDeltaX)
let deltaY = event.getDoubleValueField(.mouseEventDeltaY)

for portal in snapshot.portals where portal.isEnabled {
// 通过布局标识解析显示器边界
Expand All @@ -377,7 +375,7 @@ class PortalService: ObservableObject {
let boundsB = snapshot.displayBoundsCache[portal.lineB.legacyDisplayID ?? 0] {
if isPointOnLine(mouseLocation, line: portal.lineA, bounds: boundsA) {
if let target = portal.calculateTargetPosition(from: mouseLocation, lineABounds: boundsA, lineBBounds: boundsB) {
return (target, deltaX, deltaY)
return target
}
}

Expand All @@ -391,7 +389,7 @@ class PortalService: ObservableObject {
color: portal.color
)
if let target = reversedPortal.calculateTargetPosition(from: mouseLocation, lineABounds: boundsB, lineBBounds: boundsA) {
return (target, deltaX, deltaY)
return target
}
}
}
Expand All @@ -400,7 +398,7 @@ class PortalService: ObservableObject {

if isPointOnLine(mouseLocation, line: portal.lineA, bounds: boundsA) {
if let target = portal.calculateTargetPosition(from: mouseLocation, lineABounds: boundsA, lineBBounds: boundsB) {
return (target, deltaX, deltaY)
return target
}
}

Expand All @@ -416,7 +414,7 @@ class PortalService: ObservableObject {
color: portal.color
)
if let target = reversedPortal.calculateTargetPosition(from: mouseLocation, lineABounds: boundsB, lineBBounds: boundsA) {
return (target, deltaX, deltaY)
return target
}
}
}
Expand Down Expand Up @@ -486,22 +484,15 @@ private func portalEventCallback(
service.handleFlagsChangedForTap(event)

case .mouseMoved, .leftMouseDragged:
let result = service.handleMouseMovedForTap(event)

if let result {
// 方法：不消费事件，直接修改事件位置
// 同时用底层方式移动光标，不触发加速度重置
CGAssociateMouseAndMouseCursorPosition(0)
defer { CGAssociateMouseAndMouseCursorPosition(1) }

// 创建并发送移动事件到目标位置
if let moveEvent = CGEvent(mouseEventSource: nil, mouseType: type, mouseCursorPosition: result.target, mouseButton: .left) {
moveEvent.setDoubleValueField(.mouseEventDeltaX, value: result.deltaX)
moveEvent.setDoubleValueField(.mouseEventDeltaY, value: result.deltaY)
if let target = service.handleMouseMovedForTap(event) {
// 保留原有的 HID 事件传送手感，但不再切换全局鼠标关联状态。
if let moveEvent = CGEvent(mouseEventSource: nil, mouseType: type, mouseCursorPosition: target, mouseButton: .left) {
moveEvent.setDoubleValueField(.mouseEventDeltaX, value: event.getDoubleValueField(.mouseEventDeltaX))
moveEvent.setDoubleValueField(.mouseEventDeltaY, value: event.getDoubleValueField(.mouseEventDeltaY))
moveEvent.post(tap: .cghidEventTap)
}

return nil // 消费原始事件
return nil
}

default:
Expand Down
4 changes: 2 additions & 2 deletions MousePortalTests/Services/DisplayConfigurationCoordinatorTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,8 +290,8 @@ final class DisplayConfigurationCoordinatorTests: XCTestCase {

private func assertTarget(_ portals: PortalService, x: CGFloat, file: StaticString = #filePath, line: UInt = #line) throws {
let target = try XCTUnwrap(portals.handleMouseMovedForTap(mouseEvent()), file: file, line: line)
XCTAssertEqual(target.target.x, x, file: file, line: line)
XCTAssertEqual(target.target.y, 50, file: file, line: line)
XCTAssertEqual(target.x, x, file: file, line: line)
XCTAssertEqual(target.y, 50, file: file, line: line)
}
}

Expand Down
Loading