Merge pull request jeantil#11 Swiftify code

moms-spaghetti · Jun 2, 2017 · 1c92e21 · 1c92e21
2 parents 43d846d + 2eab9fd
commit 1c92e21
Showing 1 changed file with 62 additions and 69 deletions.
diff --git a/autokbisw/IOKeyEventMonitor.swift b/autokbisw/IOKeyEventMonitor.swift
@@ -18,38 +18,18 @@ import IOKit
 import IOKit.usb
 import IOKit.hid
 
-
-struct IOKeyEventMonitorContext {
-  var lastSeenSender: String
-  init(lastSeenSender: String) {
-    self.lastSeenSender = lastSeenSender
-  }
-}
-
-class IOKeyEventMonitor {
-  private
-  let hidManager: IOHIDManager
-  let notificationCenter: CFNotificationCenter
-  let match: CFMutableDictionary
-
-  var lastActiveKeyboard: String = ""
-  var kb2is: [String: TISInputSource] = [String: TISInputSource]()
-
-
-  private class func createDeviceMatchingDictionary( usagePage: Int, usage: Int) -> CFMutableDictionary {
-    let dict = [
-      kIOHIDDeviceUsageKey: usage,
-      kIOHIDDeviceUsagePageKey: usagePage
-    ] as NSDictionary
-
-    return dict.mutableCopy() as! NSMutableDictionary;
-  }
+final internal class IOKeyEventMonitor {
+  private let hidManager: IOHIDManager
+
+  fileprivate let notificationCenter: CFNotificationCenter
+  fileprivate var lastActiveKeyboard: String = ""
+  fileprivate var kb2is: [String: TISInputSource] = [String: TISInputSource]()
 
   init? ( usagePage: Int, usage: Int) {
     hidManager = IOHIDManagerCreate( kCFAllocatorDefault, IOOptionBits(kIOHIDOptionsTypeNone));
     notificationCenter = CFNotificationCenterGetDistributedCenter();
-    match = IOKeyEventMonitor.createDeviceMatchingDictionary(usagePage: usagePage, usage: usage);
-    IOHIDManagerSetDeviceMatching( hidManager, match);
+    let deviceMatch: CFMutableDictionary = [kIOHIDDeviceUsageKey: usage, kIOHIDDeviceUsagePageKey: usagePage] as NSMutableDictionary
+    IOHIDManagerSetDeviceMatching( hidManager, deviceMatch);
   }
 
   deinit {
@@ -59,62 +39,75 @@ class IOKeyEventMonitor {
     CFNotificationCenterRemoveObserver(notificationCenter, context, CFNotificationName(kTISNotifySelectedKeyboardInputSourceChanged), nil);
   }
 
-  func restoreInputSource(keyboard: String) -> Void {
-    if let targetIs = kb2is[keyboard] {
-      //print("set input source to \(targetIs) for keyboard \(keyboard)");
-      TISSelectInputSource(targetIs)
-    } else {
-      self.storeInputSource(keyboard: keyboard);
-    }
-  }
-
-  func storeInputSource(keyboard: String) -> Void {
-    let currentSource: TISInputSource = TISCopyCurrentKeyboardInputSource().takeUnretainedValue();
-    kb2is[keyboard] = currentSource;
-  }
+  func start() -> Void {
+    let context = UnsafeMutableRawPointer(Unmanaged.passUnretained(self).toOpaque());
+
+    observeIputSourceChangedNotification(context: context);
+    registerHIDKeyboardCallback(context: context);
 
-  func onInputSourceChanged() -> Void {
-    self.storeInputSource(keyboard: self.lastActiveKeyboard);
+    IOHIDManagerScheduleWithRunLoop( hidManager, CFRunLoopGetMain(), CFRunLoopMode.defaultMode!.rawValue);
+    IOHIDManagerOpen( hidManager, IOOptionBits(kIOHIDOptionsTypeNone));
   }
-
-  func onKeyboardEvent(keyboard: String) -> Void {
-    if(self.lastActiveKeyboard != keyboard) {
-      //print("Active keyboard changed from \(self.lastActiveKeyboard) to \(keyboard)");
-      self.restoreInputSource(keyboard: keyboard);
-      self.lastActiveKeyboard = keyboard;
+  
+  private func observeIputSourceChangedNotification(context: UnsafeMutableRawPointer){
+    let inputSourceChanged: CFNotificationCallback = {
+      (center, observer, name, notif, userInfo) in
+      let selfPtr = Unmanaged<IOKeyEventMonitor>.fromOpaque(observer!).takeUnretainedValue();
+      selfPtr.onInputSourceChanged()
     }
-  }
-
+
+    CFNotificationCenterAddObserver(notificationCenter,
+                                    context, inputSourceChanged,
+                                    kTISNotifySelectedKeyboardInputSourceChanged, nil,
+                                    CFNotificationSuspensionBehavior.deliverImmediately);
 
-  func start() -> Void {
-    let context = UnsafeMutableRawPointer(Unmanaged.passUnretained(self).toOpaque());
+  }
+
+  private func registerHIDKeyboardCallback(context: UnsafeMutableRawPointer){
     let myHIDKeyboardCallback: IOHIDValueCallback = {
       (context, ioreturn, sender, value) in
       let selfPtr = Unmanaged<IOKeyEventMonitor>.fromOpaque(context!).takeUnretainedValue();
       let senderDevice = Unmanaged<IOHIDDevice>.fromOpaque(sender!).takeUnretainedValue();
-
+      
       let vendorId = String(describing: IOHIDDeviceGetProperty(senderDevice, kIOHIDVendorIDKey as CFString));
       let productId = String(describing: IOHIDDeviceGetProperty(senderDevice, kIOHIDProductIDKey as CFString));
       let product = String(describing: IOHIDDeviceGetProperty(senderDevice, kIOHIDProductKey as CFString));
       let keyboard = "\(product)[\(vendorId)-\(productId)]";
       selfPtr.onKeyboardEvent(keyboard: keyboard);
-
+      
     }
-    let inputSourceChanged: CFNotificationCallback = {
-      (center, observer, name, notif, userInfo) in
-      let selfPtr = Unmanaged<IOKeyEventMonitor>.fromOpaque(observer!).takeUnretainedValue();
-      selfPtr.onInputSourceChanged()
-    }
-
-    CFNotificationCenterAddObserver(notificationCenter,
-                                    context, inputSourceChanged,
-                                    kTISNotifySelectedKeyboardInputSourceChanged, nil,
-                                    CFNotificationSuspensionBehavior.deliverImmediately);
-
-
+
     IOHIDManagerRegisterInputValueCallback( hidManager, myHIDKeyboardCallback, context);
-    IOHIDManagerScheduleWithRunLoop( hidManager, CFRunLoopGetMain(), CFRunLoopMode.defaultMode!.rawValue);
-    IOHIDManagerOpen( hidManager, IOOptionBits(kIOHIDOptionsTypeNone));
   }
+
+}
 
+extension IOKeyEventMonitor {
+
+
+
+  func restoreInputSource(keyboard: String) -> Void {
+    if let targetIs = kb2is[keyboard] {
+      //print("set input source to \(targetIs) for keyboard \(keyboard)");
+      TISSelectInputSource(targetIs)
+    } else {
+      self.storeInputSource(keyboard: keyboard);
+    }
+  }
+
+  func storeInputSource(keyboard: String) -> Void {
+    let currentSource: TISInputSource = TISCopyCurrentKeyboardInputSource().takeUnretainedValue();
+    kb2is[keyboard] = currentSource;
+  }
+
+  func onInputSourceChanged() -> Void {
+    self.storeInputSource(keyboard: self.lastActiveKeyboard);
+  }
+
+  func onKeyboardEvent(keyboard: String) -> Void {
+    guard self.lastActiveKeyboard != keyboard else { return }
+
+    self.restoreInputSource(keyboard: keyboard);
+    self.lastActiveKeyboard = keyboard;
+  }
 }