Skip to content

[codex] Support extended function key shortcut labels #331

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
FreeTeaspoon wants to merge 1 commit into
base: master
Choose a base branch
from
+44 −0
Open

[codex] Support extended function key shortcut labels #331

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
24 changes: 24 additions & 0 deletions Snapzy/Services/Shortcuts/KeyboardShortcutManager.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,6 +212,14 @@ struct ShortcutConfig: Equatable, Codable {
case kVK_F10: return "F10"
case kVK_F11: return "F11"
case kVK_F12: return "F12"
case kVK_F13: return "F13"
case kVK_F14: return "F14"
case kVK_F15: return "F15"
case kVK_F16: return "F16"
case kVK_F17: return "F17"
case kVK_F18: return "F18"
case kVK_F19: return "F19"
case kVK_F20: return "F20"
case kVK_Space: return "Space"
case kVK_Return: return "↩"
case kVK_Tab: return "⇥"
Expand Down Expand Up @@ -319,6 +327,22 @@ extension ShortcutConfig {
return Self.unicodeScalarString(Int(NSF11FunctionKey))
case kVK_F12:
return Self.unicodeScalarString(Int(NSF12FunctionKey))
case kVK_F13:
return Self.unicodeScalarString(Int(NSF13FunctionKey))
case kVK_F14:
return Self.unicodeScalarString(Int(NSF14FunctionKey))
case kVK_F15:
return Self.unicodeScalarString(Int(NSF15FunctionKey))
case kVK_F16:
return Self.unicodeScalarString(Int(NSF16FunctionKey))
case kVK_F17:
return Self.unicodeScalarString(Int(NSF17FunctionKey))
case kVK_F18:
return Self.unicodeScalarString(Int(NSF18FunctionKey))
case kVK_F19:
return Self.unicodeScalarString(Int(NSF19FunctionKey))
case kVK_F20:
return Self.unicodeScalarString(Int(NSF20FunctionKey))
case kVK_ForwardDelete:
return Self.unicodeScalarString(Int(NSDeleteFunctionKey))
case kVK_Home:
Expand Down
20 changes: 20 additions & 0 deletions SnapzyTests/Services/Shortcuts/ShortcutCoreTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,37 @@ final class ShortcutCoreTests: XCTestCase {
XCTAssertEqual(ShortcutConfig.keyCodeToString(UInt32(kVK_ANSI_A)), "A")
XCTAssertEqual(ShortcutConfig.keyCodeToString(UInt32(kVK_ANSI_0)), "0")
XCTAssertEqual(ShortcutConfig.keyCodeToString(UInt32(kVK_F12)), "F12")
XCTAssertEqual(ShortcutConfig.keyCodeToString(UInt32(kVK_F13)), "F13")
XCTAssertEqual(ShortcutConfig.keyCodeToString(UInt32(kVK_F14)), "F14")
XCTAssertEqual(ShortcutConfig.keyCodeToString(UInt32(kVK_F20)), "F20")
XCTAssertEqual(ShortcutConfig.keyCodeToString(UInt32(kVK_LeftArrow)), "\u{2190}")
XCTAssertEqual(ShortcutConfig.keyCodeToString(UInt32(kVK_ANSI_Slash)), "/")
XCTAssertEqual(ShortcutConfig.keyCodeToString(9999), "?")
}

func testShortcutConfigDisplayParts_includeFnWithExtendedFunctionKeys() {
let f13 = ShortcutConfig(
keyCode: UInt32(kVK_F13),
modifiers: ShortcutConfig.functionCarbonModifier
)
let f14 = ShortcutConfig(
keyCode: UInt32(kVK_F14),
modifiers: ShortcutConfig.functionCarbonModifier
)

XCTAssertEqual(f13.displayParts, ["fn", "F13"])
XCTAssertEqual(f13.displayString, "fn F13")
XCTAssertEqual(f14.displayParts, ["fn", "F14"])
}

func testShortcutConfigMenuKeyEquivalent_mapsSpecialKeys() {
XCTAssertEqual(ShortcutConfig(keyCode: UInt32(kVK_Space), modifiers: 0).menuKeyEquivalent, " ")
XCTAssertEqual(ShortcutConfig(keyCode: UInt32(kVK_Return), modifiers: 0).menuKeyEquivalent, "\r")
XCTAssertEqual(ShortcutConfig(keyCode: UInt32(kVK_Tab), modifiers: 0).menuKeyEquivalent, "\t")
XCTAssertEqual(ShortcutConfig(keyCode: UInt32(kVK_Escape), modifiers: 0).menuKeyEquivalent, "\u{1B}")
XCTAssertNotNil(ShortcutConfig(keyCode: UInt32(kVK_F1), modifiers: 0).menuKeyEquivalent)
XCTAssertNotNil(ShortcutConfig(keyCode: UInt32(kVK_F13), modifiers: 0).menuKeyEquivalent)
XCTAssertNotNil(ShortcutConfig(keyCode: UInt32(kVK_F20), modifiers: 0).menuKeyEquivalent)
}

func testShortcutConfigMenuModifierFlags_convertCarbonModifiers() {
Expand Down