From 86fa9b18a3619a379a597ca0902c23dc053cafc0 Mon Sep 17 00:00:00 2001 From: der richter Date: Tue, 27 Feb 2024 16:55:29 +0100 Subject: osdep/mac: make mac naming of files, folders and function consistent rename all macOS namings (osx, macosx, macOS, macos, apple) to mac, to make naming consistent. --- osdep/macos/mpv_helper.swift | 182 ------------------------------------------- 1 file changed, 182 deletions(-) delete mode 100644 osdep/macos/mpv_helper.swift (limited to 'osdep/macos/mpv_helper.swift') diff --git a/osdep/macos/mpv_helper.swift b/osdep/macos/mpv_helper.swift deleted file mode 100644 index 53ef4cb521..0000000000 --- a/osdep/macos/mpv_helper.swift +++ /dev/null @@ -1,182 +0,0 @@ -/* - * This file is part of mpv. - * - * mpv is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * mpv is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with mpv. If not, see . - */ - -import Cocoa - -typealias swift_wakeup_cb_fn = (@convention(c) (UnsafeMutableRawPointer?) -> Void)? - -class MPVHelper { - var log: LogHelper - var vo: UnsafeMutablePointer - var optsCachePtr: UnsafeMutablePointer - var optsPtr: UnsafeMutablePointer - var macOptsCachePtr: UnsafeMutablePointer - var macOptsPtr: UnsafeMutablePointer - - // these computed properties return a local copy of the struct accessed: - // - don't use if you rely on the pointers - // - only for reading - var vout: vo { get { return vo.pointee } } - var optsCache: m_config_cache { get { return optsCachePtr.pointee } } - var opts: mp_vo_opts { get { return optsPtr.pointee } } - var macOptsCache: m_config_cache { get { return macOptsCachePtr.pointee } } - var macOpts: macos_opts { get { return macOptsPtr.pointee } } - - var input: OpaquePointer { get { return vout.input_ctx } } - - init(_ vo: UnsafeMutablePointer, _ log: LogHelper) { - self.vo = vo - self.log = log - - guard let cache = m_config_cache_alloc(vo, vo.pointee.global, Application.getVoSubConf()), - let macCache = m_config_cache_alloc(vo, vo.pointee.global, Application.getMacOSConf()) else - { - // will never be hit, mp_get_config_group asserts for invalid groups - exit(1) - } - optsCachePtr = cache - optsPtr = UnsafeMutablePointer(OpaquePointer(cache.pointee.opts)) - macOptsCachePtr = macCache - macOptsPtr = UnsafeMutablePointer(OpaquePointer(macCache.pointee.opts)) - } - - func canBeDraggedAt(_ pos: NSPoint) -> Bool { - let canDrag = !mp_input_test_dragging(input, Int32(pos.x), Int32(pos.y)) - return canDrag - } - - func mouseEnabled() -> Bool { - return mp_input_mouse_enabled(input) - } - - func setMousePosition(_ pos: NSPoint) { - mp_input_set_mouse_pos(input, Int32(pos.x), Int32(pos.y)) - } - - func putAxis(_ mpkey: Int32, modifiers: NSEvent.ModifierFlags, delta: Double) { - mp_input_put_wheel(input, mpkey | mapModifier(modifiers), delta) - } - - func nextChangedOption(property: inout UnsafeMutableRawPointer?) -> Bool { - return m_config_cache_get_next_changed(optsCachePtr, &property) - } - - func open(files: [String]) { - if opts.drag_and_drop == -2 { return } - - var action = NSEvent.modifierFlags.contains(.shift) ? DND_APPEND : DND_REPLACE - if opts.drag_and_drop >= 0 { - action = mp_dnd_action(UInt32(opts.drag_and_drop)) - } - - let filesClean = files.map{ $0.hasPrefix("file:///.file/id=") ? (URL(string: $0)?.path ?? $0) : $0 } - var filesPtr = filesClean.map { UnsafeMutablePointer(strdup($0)) } - mp_event_drop_files(input, Int32(files.count), &filesPtr, action) - for charPtr in filesPtr { free(UnsafeMutablePointer(mutating: charPtr)) } - } - - func setOption(fullscreen: Bool) { - optsPtr.pointee.fullscreen = fullscreen - _ = withUnsafeMutableBytes(of: &optsPtr.pointee.fullscreen) { (ptr: UnsafeMutableRawBufferPointer) in - m_config_cache_write_opt(optsCachePtr, ptr.baseAddress) - } - } - - func setOption(minimized: Bool) { - optsPtr.pointee.window_minimized = minimized - _ = withUnsafeMutableBytes(of: &optsPtr.pointee.window_minimized) { (ptr: UnsafeMutableRawBufferPointer) in - m_config_cache_write_opt(optsCachePtr, ptr.baseAddress) - } - } - - func setOption(maximized: Bool) { - optsPtr.pointee.window_maximized = maximized - _ = withUnsafeMutableBytes(of: &optsPtr.pointee.window_maximized) { (ptr: UnsafeMutableRawBufferPointer) in - m_config_cache_write_opt(optsCachePtr, ptr.baseAddress) - } - } - - func setMacOptionCallback(_ callback: swift_wakeup_cb_fn, context object: AnyObject) { - m_config_cache_set_wakeup_cb(macOptsCachePtr, callback, MPVHelper.bridge(obj: object)) - } - - func nextChangedMacOption(property: inout UnsafeMutableRawPointer?) -> Bool { - return m_config_cache_get_next_changed(macOptsCachePtr, &property) - } - - func command(_ cmd: String) { - let cCmd = UnsafePointer(strdup(cmd)) - let mpvCmd = mp_input_parse_cmd(input, bstr0(cCmd), "") - mp_input_queue_cmd(input, mpvCmd) - free(UnsafeMutablePointer(mutating: cCmd)) - } - - func mapModifier(_ modifiers: NSEvent.ModifierFlags) -> Int32 { - var mask: UInt32 = 0; - - if modifiers.contains(.shift) { - mask |= MP_KEY_MODIFIER_SHIFT - } - if modifiers.contains(.control) { - mask |= MP_KEY_MODIFIER_CTRL - } - if modifiers.contains(.command) { - mask |= MP_KEY_MODIFIER_META - } - if modifiers.rawValue & UInt(NX_DEVICELALTKEYMASK) != 0 || - modifiers.rawValue & UInt(NX_DEVICERALTKEYMASK) != 0 && !mp_input_use_alt_gr(input) - { - mask |= MP_KEY_MODIFIER_ALT - } - - return Int32(mask) - } - - // (__bridge void*) - class func bridge(obj: T) -> UnsafeMutableRawPointer { - return UnsafeMutableRawPointer(Unmanaged.passUnretained(obj).toOpaque()) - } - - // (__bridge T*) - class func bridge(ptr: UnsafeRawPointer) -> T { - return Unmanaged.fromOpaque(ptr).takeUnretainedValue() - } - - class func withUnsafeMutableRawPointers(_ arguments: [Any], - pointers: [UnsafeMutableRawPointer?] = [], - closure: (_ pointers: [UnsafeMutableRawPointer?]) -> Void) { - if arguments.count > 0 { - let args = Array(arguments.dropFirst(1)) - var newPtrs = pointers - var firstArg = arguments.first - withUnsafeMutableBytes(of: &firstArg) { (ptr: UnsafeMutableRawBufferPointer) in - newPtrs.append(ptr.baseAddress) - withUnsafeMutableRawPointers(args, pointers: newPtrs, closure: closure) - } - - return - } - - closure(pointers) - } - - class func getPointer(_ value: inout T) -> UnsafeMutableRawPointer? { - return withUnsafeMutableBytes(of: &value) { (ptr: UnsafeMutableRawBufferPointer) in - ptr.baseAddress - } - } -} -- cgit v1.2.3