Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion Loop/Core/Triggers/KeybindObserver.swift
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ final class KeybindObserver {

var filteredFlags = event.flags

if keyCode.isArrowKey || keyCode.isFKey, !previousEventFlags.contains(.maskSecondaryFn) {
if keyCode.isFnSpecialKey, !previousEventFlags.contains(.maskSecondaryFn) {
filteredFlags.remove(.maskSecondaryFn)
}

Expand Down
36 changes: 24 additions & 12 deletions Loop/Extensions/CGKeyCode+Extensions.swift
Original file line number Diff line number Diff line change
Expand Up @@ -183,20 +183,32 @@ extension CGKeyCode {
return rightModifiers.contains(self)
}

var isArrowKey: Bool {
let arrowKeys: Set<CGKeyCode> = [.kVK_LeftArrow, .kVK_RightArrow, .kVK_DownArrow, .kVK_UpArrow]
return arrowKeys.contains(self)
}

var isFKey: Bool {
let fKeys: Set<CGKeyCode> = [
.kVK_F1, .kVK_F2, .kVK_F3, .kVK_F4, .kVK_F5,
.kVK_F6, .kVK_F7, .kVK_F8, .kVK_F9, .kVK_F10,
.kVK_F11, .kVK_F12, .kVK_F13, .kVK_F14, .kVK_F15,
.kVK_F16, .kVK_F17, .kVK_F18, .kVK_F19, .kVK_F20
var isFnSpecialKey: Bool {
/// See: https://github.com/koekeishiya/skhd/issues/1
let specialKeys: Set<CGKeyCode> = [
.kVK_Delete, /// Usually `kVK_ForwardDelete`, but `baseKey(flags:)` converts that back into `kVK_Delete` if the fn key is also being pressed.
.kVK_Help
]
return fKeys.contains(self)
let allKeys = specialKeys
.union(Self.arrowKeys)
.union(Self.fKeys)

return allKeys.contains(self)
}

private static let arrowKeys: Set<CGKeyCode> = [
.kVK_LeftArrow,
.kVK_RightArrow,
.kVK_DownArrow,
.kVK_UpArrow
]

private static let fKeys: Set<CGKeyCode> = [
.kVK_F1, .kVK_F2, .kVK_F3, .kVK_F4, .kVK_F5,
.kVK_F6, .kVK_F7, .kVK_F8, .kVK_F9, .kVK_F10,
.kVK_F11, .kVK_F12, .kVK_F13, .kVK_F14, .kVK_F15,
.kVK_F16, .kVK_F17, .kVK_F18, .kVK_F19, .kVK_F20
]
}

// MARK: Stringification of keycodes
Expand Down