Skip to content

remember last cursor position per monitor on focus switch #6

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
zzJinux wants to merge 1 commit into
base: main
Choose a base branch
from
+17 −8
Open

remember last cursor position per monitor on focus switch #6

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
19 changes: 12 additions & 7 deletions Sources/MonitorManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,30 +188,35 @@ enum MonitorManager {
return cursorMonitor == id ? .none : .moveAndClick
}

static func focusMonitor(_ id: Int, transition: MonitorTransition, debug: Bool = false) {
static func focusMonitor(_ id: Int, transition: MonitorTransition, restorePoint: CGPoint? = nil, debug: Bool = false) {
guard transition.requiresAction else { return }

let displayID = CGDirectDisplayID(id)
let bounds = CGDisplayBounds(displayID)
let center = CGPoint(x: bounds.midX, y: bounds.midY)
let targetPoint: CGPoint
if let rp = restorePoint, bounds.contains(rp) {
targetPoint = rp
} else {
targetPoint = CGPoint(x: bounds.midX, y: bounds.midY)
}

if debug {
let cursorBefore = CGEvent(source: nil)?.location ?? .zero
CLI.debug("[EXEC] display=\(displayID) bounds=\(bounds) center=\(center) cursorBefore=\(cursorBefore) transition=\(transition)")
CLI.debug("[EXEC] display=\(displayID) bounds=\(bounds) target=\(targetPoint) cursorBefore=\(cursorBefore) transition=\(transition)")
}

if transition == .move || transition == .moveAndClick {
CGWarpMouseCursorPosition(center)
CGWarpMouseCursorPosition(targetPoint)
if debug {
let cursorAfterWarp = CGEvent(source: nil)?.location ?? .zero
CLI.debug("[WARP] target=\(center) cursorAfterWarp=\(cursorAfterWarp)")
CLI.debug("[WARP] target=\(targetPoint) cursorAfterWarp=\(cursorAfterWarp)")
}
}

if transition.appliesFocus {
let clickPos = transition == .click
? CGEvent(source: nil)?.location ?? center
: center
? CGEvent(source: nil)?.location ?? targetPoint
: targetPoint
let mouseDown = CGEvent(mouseEventSource: nil, mouseType: .leftMouseDown, mouseCursorPosition: clickPos, mouseButton: .left)
let mouseUp = CGEvent(mouseEventSource: nil, mouseType: .leftMouseUp, mouseCursorPosition: clickPos, mouseButton: .left)

Expand Down
6 changes: 5 additions & 1 deletion Sources/main.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@ var lastAppliedGazeMonitor = gazeMonitor
let switchCooldown: TimeInterval = 0.5 // minimum seconds between switches
var lastSwitchTime = Date.distantPast
var trackingEnabled = true
var lastCursorPosition: [Int: CGPoint] = [:]

while running {
// Check for double-blink toggle
Expand Down Expand Up @@ -209,8 +210,11 @@ while running {
if transition.requiresAction {
let now = Date()
if now.timeIntervalSince(lastSwitchTime) >= switchCooldown {
if let fromMonitor = cursorMonitor, let loc = CGEvent(source: nil)?.location {
lastCursorPosition[fromMonitor] = loc
}
let name = monitors.first { $0.id == target }?.name ?? "?"
MonitorManager.focusMonitor(target, transition: transition, debug: config.debug)
MonitorManager.focusMonitor(target, transition: transition, restorePoint: lastCursorPosition[target], debug: config.debug)
lastAppliedGazeMonitor = target
lastSwitchTime = now
CLI.printFocusSwitch(name)
Expand Down