Merge feature to allow responding to keyUp events.

cocoabits#114

Author: tylerhall

Framework/Monitoring/MASHotKey.h

@@ -6,6 +6,7 @@ extern FourCharCode const MASHotKeySignature;
 
 @property(readonly) UInt32 carbonID;
 @property(copy) dispatch_block_t action;
+@property(copy) dispatch_block_t actionUp;
 
 + (instancetype) registeredHotKeyWithShortcut: (MASShortcut*) shortcut;
 

Framework/Monitoring/MASShortcutMonitor.h

@@ -12,13 +12,21 @@
 - (instancetype) init __unavailable;
 + (instancetype) sharedMonitor;
 
+/**
+ Register a shortcut along with an action.
+ 
+ Attempting to insert an already registered shortcut probably won’t work.
+ It may burn your house or cut your fingers. You have been warned.
+ */
+- (BOOL) registerShortcut: (MASShortcut*) shortcut withAction: (dispatch_block_t) action;
+
 /**
  Register a shortcut along with an action.
 
  Attempting to insert an already registered shortcut probably won’t work.
  It may burn your house or cut your fingers. You have been warned.
 */
-- (BOOL) registerShortcut: (MASShortcut*) shortcut withAction: (dispatch_block_t) action;
+- (BOOL) registerShortcut: (MASShortcut*) shortcut withAction: (dispatch_block_t) action onKeyUp: (dispatch_block_t) actionUp;
 - (BOOL) isShortcutRegistered: (MASShortcut*) shortcut;
 
 - (void) unregisterShortcut: (MASShortcut*) shortcut;

Framework/Monitoring/MASShortcutMonitor.m

@@ -16,9 +16,13 @@ - (instancetype) init
 {
     self = [super init];
     [self setHotKeys:[NSMutableDictionary dictionary]];
-    EventTypeSpec hotKeyPressedSpec = { .eventClass = kEventClassKeyboard, .eventKind = kEventHotKeyPressed };
+    EventTypeSpec eventTypeSpecs[2] = {
+        { .eventClass = kEventClassKeyboard, .eventKind = kEventHotKeyPressed },
+        { .eventClass = kEventClassKeyboard, .eventKind = kEventHotKeyReleased }
+    };
     OSStatus status = InstallEventHandler(GetEventDispatcherTarget(), MASCarbonEventCallback,
-        1, &hotKeyPressedSpec, (__bridge void*)self, &_eventHandlerRef);
+                                          2, eventTypeSpecs,
+                                          (__bridge void*)self, &_eventHandlerRef);
     if (status != noErr) {
         return nil;
     }
@@ -46,10 +50,16 @@ + (instancetype) sharedMonitor
 #pragma mark Registration
 
 - (BOOL) registerShortcut: (MASShortcut*) shortcut withAction: (dispatch_block_t) action
+{
+    return [self registerShortcut:shortcut withAction:action onKeyUp:nil];
+}
+
+- (BOOL) registerShortcut: (MASShortcut*) shortcut withAction: (dispatch_block_t) action onKeyUp: (dispatch_block_t) actionUp
 {
     MASHotKey *hotKey = [MASHotKey registeredHotKeyWithShortcut:shortcut];
     if (hotKey) {
         [hotKey setAction:action];
+        [hotKey setActionUp:actionUp];
         [_hotKeys setObject:hotKey forKey:shortcut];
         return YES;
     } else {
@@ -91,7 +101,10 @@ - (void) handleEvent: (EventRef) event
     [_hotKeys enumerateKeysAndObjectsUsingBlock:^(MASShortcut *shortcut, MASHotKey *hotKey, BOOL *stop) {
         if (hotKeyID.id == [hotKey carbonID]) {
             if ([hotKey action]) {
-                dispatch_async(dispatch_get_main_queue(), [hotKey action]);
+                dispatch_block_t action = (GetEventKind(event) == kEventHotKeyReleased) ? [hotKey actionUp] : [hotKey action];
+                if (action) {
+                    dispatch_async(dispatch_get_main_queue(), action);
+                }
             }
             *stop = YES;
         }

Framework/User Defaults Storage/MASShortcutBinder.h

@@ -47,6 +47,15 @@
 */
 - (void) bindShortcutWithDefaultsKey: (NSString*) defaultsKeyName toAction: (dispatch_block_t) action;
 
+
+/**
+ Binds given actions to a shortcut stored under the given defaults key.
+ 
+ In other words, no matter what shortcut you store under the given key,
+ pressing it will always trigger the given action.
+ */
+- (void) bindShortcutWithDefaultsKey: (NSString*) defaultsKeyName toAction: (dispatch_block_t) action onKeyUp: (dispatch_block_t) actionUp;
+
 /**
  Disconnect the binding between user defaults and action.
 

Framework/User Defaults Storage/MASShortcutBinder.m

@@ -3,6 +3,7 @@
 
 @interface MASShortcutBinder ()
 @property(strong) NSMutableDictionary *actions;
+@property(strong) NSMutableDictionary *actionsUp;
 @property(strong) NSMutableDictionary *shortcuts;
 @end
 
@@ -14,6 +15,7 @@ - (id) init
 {
     self = [super init];
     [self setActions:[NSMutableDictionary dictionary]];
+    [self setActionsUp:[NSMutableDictionary dictionaryWithCapacity:0]];
     [self setShortcuts:[NSMutableDictionary dictionary]];
     [self setShortcutMonitor:[MASShortcutMonitor sharedMonitor]];
     [self setBindingOptions:@{NSValueTransformerNameBindingOption: NSKeyedUnarchiveFromDataTransformerName}];
@@ -40,23 +42,33 @@ + (instancetype) sharedBinder
 #pragma mark Registration
 
 - (void) bindShortcutWithDefaultsKey: (NSString*) defaultsKeyName toAction: (dispatch_block_t) action
+{
+    [self bindShortcutWithDefaultsKey:defaultsKeyName toAction:action onKeyUp:nil];
+}
+
+- (void) bindShortcutWithDefaultsKey: (NSString*) defaultsKeyName toAction: (dispatch_block_t) action onKeyUp: (dispatch_block_t) actionUp
 {
     NSAssert([defaultsKeyName rangeOfString:@"."].location == NSNotFound,
-        @"Illegal character in binding name (“.”), please see http://git.io/x5YS.");
+             @"Illegal character in binding name (“.”), please see http://git.io/x5YS.");
     NSAssert([defaultsKeyName rangeOfString:@" "].location == NSNotFound,
-        @"Illegal character in binding name (“ ”), please see http://git.io/x5YS.");
+             @"Illegal character in binding name (“ ”), please see http://git.io/x5YS.");
     [_actions setObject:[action copy] forKey:defaultsKeyName];
+    if (actionUp)
+        [_actionsUp setObject:[actionUp copy] forKey:defaultsKeyName];
+    else
+        [_actionsUp removeObjectForKey:defaultsKeyName];
     [self bind:defaultsKeyName
-        toObject:[NSUserDefaultsController sharedUserDefaultsController]
-        withKeyPath:[@"values." stringByAppendingString:defaultsKeyName]
-        options:_bindingOptions];
+      toObject:[NSUserDefaultsController sharedUserDefaultsController]
+   withKeyPath:[@"values." stringByAppendingString:defaultsKeyName]
+       options:_bindingOptions];
 }
 
 - (void) breakBindingWithDefaultsKey: (NSString*) defaultsKeyName
 {
     [_shortcutMonitor unregisterShortcut:[_shortcuts objectForKey:defaultsKeyName]];
     [_shortcuts removeObjectForKey:defaultsKeyName];
     [_actions removeObjectForKey:defaultsKeyName];
+    [_actionsUp removeObjectForKey:defaultsKeyName];
     [self unbind:defaultsKeyName];
 }
 
@@ -115,7 +127,7 @@ - (void) setValue: (id) value forUndefinedKey: (NSString*) key
 
     // Bind new shortcut
     [_shortcuts setObject:newShortcut forKey:key];
-    [_shortcutMonitor registerShortcut:newShortcut withAction:[_actions objectForKey:key]];
+    [_shortcutMonitor registerShortcut:newShortcut withAction:[_actions objectForKey:key] onKeyUp:[_actionsUp objectForKey:key]];
 }
 
 @end

MASShortcut.xcodeproj/xcshareddata/xcschemes/MASShortcut.xcscheme

@@ -66,7 +66,7 @@
       </AdditionalOptions>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Debug"
+      buildConfiguration = "Release"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"