RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

mac/input: define AltGr mask as static NSEvent.ModifierFlags variable 

this makes it possible to properly test for those modifiers in a proper
swift like way.
This commit is contained in:
der richter 2024-03-10 23:17:54 +01:00
parent 18fb71498b
commit 5482eecb8a
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
osdep/mac/input_helper.swift
View File

@ -85,8 +85,8 @@ class InputHelper: NSObject {
if modifiers.contains(.command) { if modifiers.contains(.command) {
mask |= MP_KEY_MODIFIER_META mask |= MP_KEY_MODIFIER_META
} }
if modifiers.rawValue & UInt(NX_DEVICELALTKEYMASK) != 0 || if modifiers.contains(.optionLeft) ||
modifiers.rawValue & UInt(NX_DEVICERALTKEYMASK) != 0 && !mp_input_use_alt_gr(input) modifiers.contains(.optionRight) && !mp_input_use_alt_gr(input)
{ {
mask |= MP_KEY_MODIFIER_ALT mask |= MP_KEY_MODIFIER_ALT
} }

6
osdep/mac/swift_extensions.swift
View File

@ -16,6 +16,7 @@
*/ */
import Cocoa import Cocoa
import IOKit.hidsystem
extension NSDeviceDescriptionKey { extension NSDeviceDescriptionKey {
static let screenNumber = NSDeviceDescriptionKey("NSScreenNumber") static let screenNumber = NSDeviceDescriptionKey("NSScreenNumber")
@ -41,6 +42,11 @@ extension NSColor {
} }
} }
extension NSEvent.ModifierFlags {
public static var optionLeft: NSEvent.ModifierFlags = .init(rawValue: UInt(NX_DEVICELALTKEYMASK))
public static var optionRight: NSEvent.ModifierFlags = .init(rawValue: UInt(NX_DEVICERALTKEYMASK))
}
extension Bool { extension Bool {
init(_ int32: Int32) { init(_ int32: Int32) {
self.init(int32 != 0) self.init(int32 != 0)