github-starred/MonitorControl
2
0
Fork 0
mirror of https://github.com/MonitorControl/MonitorControl.git synced 2026-05-15 06:05:52 -06:00
Code Issues 21 Projects Packages Wiki Activity Actions

Add open sound/brightness preferences from media keys (#168)

Browse source
This commit is contained in:
paphonb 2020-05-31 23:06:30 +07:00 • committed by GitHub
parent afa31400d8
commit 31c313d17b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 32 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.swiftformat
View file

@ -1,5 +1,5 @@
--indent 2
--ranges no-space
--nospaceoperators
--self insert
--exponentcase lowercase
--exclude Carthage

28
MonitorControl/AppDelegate.swift
View file

@ -67,7 +67,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
func clearDisplays() {
if self.statusMenu.items.count > 2 {
var items: [NSMenuItem] = []
for i in 0..<self.statusMenu.items.count - 2 {
for i in 0 ..< self.statusMenu.items.count - 2 {
items.append(self.statusMenu.items[i])
}
@ -192,12 +192,35 @@ class AppDelegate: NSObject, NSApplicationDelegate {
}
return nil
}
func handleOpenPrefPane(mediaKey: MediaKey, event: KeyEvent?, modifiers: NSEvent.ModifierFlags?) -> Bool {
guard let modifiers = modifiers else { return false }
if !(modifiers.contains(.option) && !modifiers.contains(.shift)) {
return false
}
if event?.keyRepeat == true {
return false
}
switch mediaKey {
case .brightnessUp, .brightnessDown:
NSWorkspace.shared.open(URL(fileURLWithPath: "/System/Library/PreferencePanes/Displays.prefPane"))
case .mute, .volumeUp, .volumeDown:
NSWorkspace.shared.open(URL(fileURLWithPath: "/System/Library/PreferencePanes/Sound.prefPane"))
default:
return false
}
return true
}
}
// MARK: - Media Key Tap delegate
extension AppDelegate: MediaKeyTapDelegate {
func handle(mediaKey: MediaKey, event: KeyEvent?, modifiers: NSEvent.ModifierFlags?) {
if self.handleOpenPrefPane(mediaKey: mediaKey, event: event, modifiers: modifiers) {
return
}
let isSmallIncrement = modifiers?.isSuperset(of: NSEvent.ModifierFlags([.shift, .option])) ?? false
// control internal display when holding ctrl modifier
@ -222,7 +245,10 @@ extension AppDelegate: MediaKeyTapDelegate {
}
mediaKeyTimer.invalidate()
}
self.sendDisplayCommand(mediaKey: mediaKey, isRepeat: isRepeat, isSmallIncrement: isSmallIncrement)
}
private func sendDisplayCommand(mediaKey: MediaKey, isRepeat: Bool, isSmallIncrement: Bool) {
let displays = DisplayManager.shared.getAllDisplays()
guard let currentDisplay = DisplayManager.shared.getCurrentDisplay() else { return }

2
MonitorControl/Info.plist
View file

@ -19,7 +19,7 @@
<key>CFBundleShortVersionString</key>
<string>$(MARKETING_VERSION)</string>
<key>CFBundleVersion</key>
<string>640</string>
<string>642</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.utilities</string>
<key>LSMinimumSystemVersion</key>

2
MonitorControl/Model/ExternalDisplay.swift
View file

@ -46,7 +46,7 @@ class ExternalDisplay: Display {
return
}
for _ in 0..<20 {
for _ in 0 ..< 20 {
_ = self.ddc?.write(command: .osd, value: UInt16(1), errorRecoveryWaitTime: 2000)
}
}

2
MonitorControlHelper/Info.plist
View file

@ -19,7 +19,7 @@
<key>CFBundleShortVersionString</key>
<string>$(MARKETING_VERSION)</string>
<key>CFBundleVersion</key>
<string>640</string>
<string>642</string>
<key>LSApplicationCategoryType</key>
<string>public.app-category.utilities</string>
<key>LSBackgroundOnly</key>

2
MonitorControlHelper/main.swift
View file

@ -11,7 +11,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
}
let pathComponents = bundlePath.pathComponents
let path = NSString.path(withComponents: Array(pathComponents[0..<(pathComponents.count - 4)]))
let path = NSString.path(withComponents: Array(pathComponents[0 ..< (pathComponents.count - 4)]))
NSWorkspace.shared.launchApplication(path)
NSApp.terminate(nil)