summaryrefslogtreecommitdiffstats
path: root/osdep/mac/input_helper.swift
diff options
context:
space:
mode:
Diffstat (limited to 'osdep/mac/input_helper.swift')
-rw-r--r--osdep/mac/input_helper.swift44
1 files changed, 22 insertions, 22 deletions
diff --git a/osdep/mac/input_helper.swift b/osdep/mac/input_helper.swift
index e5268ade4c..0fa0119ad4 100644
--- a/osdep/mac/input_helper.swift
+++ b/osdep/mac/input_helper.swift
@@ -25,24 +25,24 @@ class InputHelper: NSObject {
let keymap: [mp_keymap] = [
// special keys
- .init(kVK_Return, MP_KEY_ENTER), .init(kVK_Escape, MP_KEY_ESC),
- .init(kVK_Delete, MP_KEY_BACKSPACE), .init(kVK_Tab, MP_KEY_TAB),
+ .init(kVK_Return, MP_KEY_ENTER), .init(kVK_Escape, MP_KEY_ESC),
+ .init(kVK_Delete, MP_KEY_BACKSPACE), .init(kVK_Tab, MP_KEY_TAB),
.init(kVK_VolumeUp, MP_KEY_VOLUME_UP), .init(kVK_VolumeDown, MP_KEY_VOLUME_DOWN),
.init(kVK_Mute, MP_KEY_MUTE),
// cursor keys
- .init(kVK_UpArrow, MP_KEY_UP), .init(kVK_DownArrow, MP_KEY_DOWN),
+ .init(kVK_UpArrow, MP_KEY_UP), .init(kVK_DownArrow, MP_KEY_DOWN),
.init(kVK_LeftArrow, MP_KEY_LEFT), .init(kVK_RightArrow, MP_KEY_RIGHT),
// navigation block
- .init(kVK_Help, MP_KEY_INSERT), .init(kVK_ForwardDelete, MP_KEY_DELETE),
- .init(kVK_Home, MP_KEY_HOME), .init(kVK_End, MP_KEY_END),
+ .init(kVK_Help, MP_KEY_INSERT), .init(kVK_ForwardDelete, MP_KEY_DELETE),
+ .init(kVK_Home, MP_KEY_HOME), .init(kVK_End, MP_KEY_END),
.init(kVK_PageUp, MP_KEY_PAGE_UP), .init(kVK_PageDown, MP_KEY_PAGE_DOWN),
// F-keys
- .init(kVK_F1, MP_KEY_F + 1), .init(kVK_F2, MP_KEY_F + 2), .init(kVK_F3, MP_KEY_F + 3),
- .init(kVK_F4, MP_KEY_F + 4), .init(kVK_F5, MP_KEY_F + 5), .init(kVK_F6, MP_KEY_F + 6),
- .init(kVK_F7, MP_KEY_F + 7), .init(kVK_F8, MP_KEY_F + 8), .init(kVK_F9, MP_KEY_F + 9),
+ .init(kVK_F1, MP_KEY_F + 1), .init(kVK_F2, MP_KEY_F + 2), .init(kVK_F3, MP_KEY_F + 3),
+ .init(kVK_F4, MP_KEY_F + 4), .init(kVK_F5, MP_KEY_F + 5), .init(kVK_F6, MP_KEY_F + 6),
+ .init(kVK_F7, MP_KEY_F + 7), .init(kVK_F8, MP_KEY_F + 8), .init(kVK_F9, MP_KEY_F + 9),
.init(kVK_F10, MP_KEY_F + 10), .init(kVK_F11, MP_KEY_F + 11), .init(kVK_F12, MP_KEY_F + 12),
.init(kVK_F13, MP_KEY_F + 13), .init(kVK_F14, MP_KEY_F + 14), .init(kVK_F15, MP_KEY_F + 15),
.init(kVK_F16, MP_KEY_F + 16), .init(kVK_F17, MP_KEY_F + 17), .init(kVK_F18, MP_KEY_F + 18),
@@ -54,11 +54,11 @@ class InputHelper: NSObject {
.init(kVK_ANSI_KeypadMultiply, Int32(Character("*").asciiValue ?? 0)),
.init(kVK_ANSI_KeypadDivide, Int32(Character("/").asciiValue ?? 0)),
.init(kVK_ANSI_KeypadEnter, MP_KEY_KPENTER), .init(kVK_ANSI_KeypadDecimal, MP_KEY_KPDEC),
- .init(kVK_ANSI_Keypad0, MP_KEY_KP0), .init(kVK_ANSI_Keypad1, MP_KEY_KP1),
- .init(kVK_ANSI_Keypad2, MP_KEY_KP2), .init(kVK_ANSI_Keypad3, MP_KEY_KP3),
- .init(kVK_ANSI_Keypad4, MP_KEY_KP4), .init(kVK_ANSI_Keypad5, MP_KEY_KP5),
- .init(kVK_ANSI_Keypad6, MP_KEY_KP6), .init(kVK_ANSI_Keypad7, MP_KEY_KP7),
- .init(kVK_ANSI_Keypad8, MP_KEY_KP8), .init(kVK_ANSI_Keypad9, MP_KEY_KP9),
+ .init(kVK_ANSI_Keypad0, MP_KEY_KP0), .init(kVK_ANSI_Keypad1, MP_KEY_KP1),
+ .init(kVK_ANSI_Keypad2, MP_KEY_KP2), .init(kVK_ANSI_Keypad3, MP_KEY_KP3),
+ .init(kVK_ANSI_Keypad4, MP_KEY_KP4), .init(kVK_ANSI_Keypad5, MP_KEY_KP5),
+ .init(kVK_ANSI_Keypad6, MP_KEY_KP6), .init(kVK_ANSI_Keypad7, MP_KEY_KP7),
+ .init(kVK_ANSI_Keypad8, MP_KEY_KP8), .init(kVK_ANSI_Keypad9, MP_KEY_KP9),
.init(0, 0)
]
@@ -187,7 +187,7 @@ class InputHelper: NSObject {
}
private func mapType(_ type: NSEvent.EventType) -> Int32 {
- let typeMapping: [NSEvent.EventType:UInt32] = [
+ let typeMapping: [NSEvent.EventType: UInt32] = [
.keyDown: MP_KEY_STATE_DOWN,
.keyUp: MP_KEY_STATE_UP,
.leftMouseDown: MP_KEY_STATE_DOWN,
@@ -195,14 +195,14 @@ class InputHelper: NSObject {
.rightMouseDown: MP_KEY_STATE_DOWN,
.rightMouseUp: MP_KEY_STATE_UP,
.otherMouseDown: MP_KEY_STATE_DOWN,
- .otherMouseUp: MP_KEY_STATE_UP,
+ .otherMouseUp: MP_KEY_STATE_UP
]
- return Int32(typeMapping[type] ?? 0);
+ return Int32(typeMapping[type] ?? 0)
}
private func mapModifier(_ modifiers: NSEvent.ModifierFlags) -> Int32 {
- var mask: UInt32 = 0;
+ var mask: UInt32 = 0
if modifiers.contains(.shift) {
mask |= MP_KEY_MODIFIER_SHIFT
@@ -221,15 +221,15 @@ class InputHelper: NSObject {
}
private func map(button: Int) -> Int32 {
- let buttonMapping: [Int:Int32] = [
+ let buttonMapping: [Int: Int32] = [
0: SWIFT_MBTN_LEFT,
1: SWIFT_MBTN_RIGHT,
2: SWIFT_MBTN_MID,
3: SWIFT_MBTN_FORWARD,
- 4: SWIFT_MBTN_BACK,
+ 4: SWIFT_MBTN_BACK
]
- return Int32(buttonMapping[button] ?? SWIFT_MBTN9 + Int32(button - 5));
+ return Int32(buttonMapping[button] ?? SWIFT_MBTN9 + Int32(button - 5))
}
func mapDeadKey(_ event: NSEvent) -> String {
@@ -257,12 +257,12 @@ class InputHelper: NSObject {
var action = DND_APPEND
if !append {
action = NSEvent.modifierFlags.contains(.shift) ? DND_APPEND : DND_REPLACE
- if (option?.vo.drag_and_drop ?? -1) >= 0 {
+ if (option?.vo.drag_and_drop ?? -1) >= 0 {
action = mp_dnd_action(UInt32(option?.vo.drag_and_drop ?? Int32(DND_REPLACE.rawValue)))
}
}
- let filesClean = files.map{ $0.hasPrefix("file:///.file/id=") ? (URL(string: $0)?.path ?? $0) : $0 }
+ let filesClean = files.map { $0.hasPrefix("file:///.file/id=") ? (URL(string: $0)?.path ?? $0) : $0 }
var filesPtr = filesClean.map { UnsafeMutablePointer<CChar>(strdup($0)) }
mp_event_drop_files(input, Int32(files.count), &filesPtr, action)
for charPtr in filesPtr { free(UnsafeMutablePointer(mutating: charPtr)) }