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

suphon-t · web-flow · commit 31c313d17b07 · 2020-05-31T18:06:30.000+02:00
diff --git a/.swiftformat b/.swiftformat
@@ -1,5 +1,5 @@
 --indent 2
---ranges no-space
+--nospaceoperators
 --self insert
 --exponentcase lowercase
 --exclude Carthage
diff --git a/MonitorControl/AppDelegate.swift b/MonitorControl/AppDelegate.swift
@@ -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 }
 
diff --git a/MonitorControl/Info.plist b/MonitorControl/Info.plist
@@ -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>
diff --git a/MonitorControl/Model/ExternalDisplay.swift b/MonitorControl/Model/ExternalDisplay.swift
@@ -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)
     }
   }
diff --git a/MonitorControlHelper/Info.plist b/MonitorControlHelper/Info.plist
@@ -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>
diff --git a/MonitorControlHelper/main.swift b/MonitorControlHelper/main.swift
@@ -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)

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ class ExternalDisplay: Display {`
`46`	`46`	`return`
`47`	`47`	`}`
`48`	`48`
`49`		`- for _ in 0..<20 {`
	`49`	`+ for _ in 0 ..< 20 {`
`50`	`50`	`_ = self.ddc?.write(command: .osd, value: UInt16(1), errorRecoveryWaitTime: 2000)`
`51`	`51`	`}`
`52`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {`
`11`	`11`	`}`
`12`	`12`
`13`	`13`	`let pathComponents = bundlePath.pathComponents`
`14`		`- let path = NSString.path(withComponents: Array(pathComponents[0..<(pathComponents.count - 4)]))`
	`14`	`+ let path = NSString.path(withComponents: Array(pathComponents[0 ..< (pathComponents.count - 4)]))`
`15`	`15`
`16`	`16`	`NSWorkspace.shared.launchApplication(path)`
`17`	`17`	`NSApp.terminate(nil)`