Claude/fix active target mode 011 c uy l7 ny9 pfo gabvg1q lj w #12
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,77 @@ | ||
| // | ||
| // CursorManager.swift | ||
| // ClickIt | ||
| // | ||
| // Manages custom cursor states for active target mode | ||
| // | ||
|
|
||
| import Cocoa | ||
| import os.log | ||
|
|
||
| /// Manages cursor appearance for different automation modes | ||
| final class CursorManager { | ||
| static let shared = CursorManager() | ||
|
|
||
| private let logger = Logger(subsystem: "com.clickit.app", category: "CursorManager") | ||
| private var isTargetCursorActive = false | ||
| private var cursorUpdateTimer: Timer? | ||
|
|
||
| private init() {} | ||
|
|
||
| /// Shows the target/crosshair cursor for active target mode | ||
| func showTargetCursor() { | ||
| DispatchQueue.main.async { [weak self] in | ||
| guard let self = self else { return } | ||
|
|
||
| if !self.isTargetCursorActive { | ||
| self.isTargetCursorActive = true | ||
|
|
||
| // Set the cursor immediately | ||
| NSCursor.crosshair.set() | ||
|
|
||
| // Keep re-setting the cursor on a timer to ensure it stays active | ||
| // This is needed because system can reset cursor on window focus changes | ||
| self.cursorUpdateTimer = Timer.scheduledTimer(withTimeInterval: 0.1, repeats: true) { [weak self] _ in | ||
| guard let self = self, self.isTargetCursorActive else { return } | ||
| NSCursor.crosshair.set() | ||
| } | ||
|
Comment on lines
+34
to
+37
Contributor
There was a problem hiding this comment. The timer closure should invalidate the timer itself when it's no longer needed. This prevents the timer from continuing to fire unnecessarily if self.cursorUpdateTimer = Timer.scheduledTimer(withTimeInterval: 0.1, repeats: true) { [weak self] timer in
guard let self = self, self.isTargetCursorActive else {
timer.invalidate()
return
}
NSCursor.crosshair.set()
} |
||
|
|
||
| self.logger.info("Target cursor activated with timer refresh") | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /// Restores the normal system cursor | ||
| func restoreNormalCursor() { | ||
| DispatchQueue.main.async { [weak self] in | ||
| guard let self = self else { return } | ||
|
|
||
| if self.isTargetCursorActive { | ||
| self.isTargetCursorActive = false | ||
|
|
||
| // Stop the cursor update timer | ||
| self.cursorUpdateTimer?.invalidate() | ||
| self.cursorUpdateTimer = nil | ||
|
|
||
| // Restore arrow cursor | ||
| NSCursor.arrow.set() | ||
|
|
||
| self.logger.info("Normal cursor restored") | ||
| } | ||
| } | ||
| } | ||
|
|
||
| /// Force restore cursor (useful for cleanup on app termination) | ||
| func forceRestoreNormalCursor() { | ||
| DispatchQueue.main.async { [weak self] in | ||
| guard let self = self else { return } | ||
|
|
||
| self.isTargetCursorActive = false | ||
| self.cursorUpdateTimer?.invalidate() | ||
| self.cursorUpdateTimer = nil | ||
| NSCursor.arrow.set() | ||
|
|
||
| self.logger.info("Cursor forcefully restored") | ||
| } | ||
| } | ||
| } | ||
|
Comment on lines
+44
to
+77
Contributor
There was a problem hiding this comment. The functions /// Restores the normal system cursor
func restoreNormalCursor(force: Bool = false) {
DispatchQueue.main.async { [weak self] in
guard let self = self else { return }
if force || self.isTargetCursorActive {
self.isTargetCursorActive = false
// Stop the cursor update timer
self.cursorUpdateTimer?.invalidate()
self.cursorUpdateTimer = nil
// Restore arrow cursor
NSCursor.arrow.set()
self.logger.info(force ? "Cursor forcefully restored" : "Normal cursor restored")
}
}
}
/// Force restore cursor (useful for cleanup on app termination)
func forceRestoreNormalCursor() {
restoreNormalCursor(force: true)
}
} |
||
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The implementation of
unregisterMouseMonitor()is very similar to the existingunregisterGlobalHotkey()method. To reduce code duplication and improve maintainability, you could extract this common logic into a private helper function.For example:
You could then refactor
unregisterGlobalHotkey()to use this helper as well.