cocoa: fix key equivalent dispatching

Prior to this commit we had a list of key modifiers and checked against that.
Actually, the Cocoa framework has a built in way to do it and it involves
calling performKeyEquivalent: on the menu instance.

Fixes #946

cc @mpv-player/stable: this should apply with no conflicts

1 files changed, 6 insertions, 1 deletions

diff --git a/osdep/macosx_application.m b/osdep/macosx_application.m
index 6c7748080c..047dfeab65 100644
--- a/osdep/macosx_application.m
+++ b/osdep/macosx_application.m
@@ -86,7 +86,12 @@ Application *mpv_shared_app(void)
 
         [NSEvent addLocalMonitorForEventsMatchingMask:NSKeyDownMask|NSKeyUpMask
                                               handler:^(NSEvent *event) {
-            return [self.eventsResponder handleKey:event];
+            BOOL equivalent = [[NSApp mainMenu] performKeyEquivalent:event];
+            if (equivalent) {
+                return (NSEvent *)nil;
+            } else {
+                return [self.eventsResponder handleKey:event];
+            }
         }];
 
         NSAppleEventManager *em = [NSAppleEventManager sharedAppleEventManager];