GitHub/alt-tab-macos
1
0
Fork 0
mirror of https://github.com/lwouis/alt-tab-macos.git synced 2026-05-24 11:20:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: avoid repeating shortcut that was released (closes #5429)

Browse Source
This commit is contained in:
lwouis
2026-03-16 21:42:49 +01:00
parent 8962ad1a54
commit 3b1c7c76a9
1 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/logic/KeyRepeatTimer.swift
+14 -2
View File
@@ -34,7 +34,7 @@ class KeyRepeatTimer {
}
private static func startTimerForRepeatingKey(_ atShortcut: ATShortcut, _ block: @escaping () -> Void) {
guard timerIsSuspended && atShortcut.state != .up else { return }
guard timerIsSuspended && atShortcut.state != .up && (atShortcut.scope == .local || !holdModifierIsReleased()) else { return }
currentTimerShortcutName = atShortcut.id
// reading these user defaults every time guarantees we have the latest value, if the user has updated those
let repeatRate = ticksToSeconds(CachedUserDefaults.globalString("KeyRepeat") ?? "6")
@@ -48,7 +48,7 @@ class KeyRepeatTimer {
private static func handleEvent(_ atShortcut: ATShortcut, _ block: @escaping () -> Void) {
DispatchQueue.main.async {
if atShortcut.state == .up {
if atShortcut.state == .up || (atShortcut.scope == .global && holdModifierIsReleased()) {
stopTimerForRepeatingKey(atShortcut.id)
} else {
block()
@@ -56,6 +56,18 @@ class KeyRepeatTimer {
}
}
/// Poll hardware modifier state to detect key release even when the event-based state update is delayed
/// (e.g. when main thread is busy under CPU stress). Mirrors ATShortcut.redundantSafetyMeasures()
private static func holdModifierIsReleased() -> Bool {
guard App.appIsBeingUsed,
let holdShortcut = ControlsTab.shortcuts[Preferences.indexToName("holdShortcut", App.shortcutIndex)] else {
return true
}
let currentModifiers = cocoaToCarbonFlags(ModifierFlags.current).cleaned()
let holdModifiers = holdShortcut.shortcut.carbonModifierFlags.cleaned()
return currentModifiers & holdModifiers != holdModifiers
}
// NSEvent.keyRepeatInterval exists, but it doesn't seem to update when System Settings are updated, or when the user runs `defaults write -g KeyRepeat X`
// On the other side, defaults.string(forKey: "KeyRepeat") always reflects the current value correctly
private static func ticksToSeconds(_ appleNumber: String) -> Double {