Tweak event tap creation to somehow fix a problem (fixes #40)

radiant-player · Mar 9, 2014 · 440cd20 · 440cd20
1 parent 235a11b
commit 440cd20
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/google-music-mac/AppDelegate.m b/google-music-mac/AppDelegate.m
@@ -64,7 +64,7 @@ - (void)applicationDidFinishLaunching:(NSNotification *)aNotification
     eventTap = CGEventTapCreate(kCGSessionEventTap,
                                 kCGHeadInsertEventTap,
                                 kCGEventTapOptionDefault,
-                                CGEventMaskBit(NX_SYSDEFINED),
+                                kCGEventMaskForAllEvents,
                                 event_tap_callback,
                                 (__bridge void *)(self));
 	if (!eventTap) {
@@ -195,11 +195,12 @@ static CGEventRef event_tap_callback(CGEventTapProxy proxy,
         return event;
     }
 
-    if (!(type == NX_SYSDEFINED) || (type == NX_KEYDOWN))
+    if ((type != NX_SYSDEFINED) && (type != NX_KEYDOWN))
         return event;
 
     NSEvent* keyEvent = [NSEvent eventWithCGEvent: event];
-    if (keyEvent.type != NSSystemDefined || keyEvent.subtype != 8) return event;
+    if (keyEvent.type != NSSystemDefined || keyEvent.subtype != 8)
+        return event;
 
     int keyCode = (([keyEvent data1] & 0xFFFF0000) >> 16);
     int keyFlags = ([keyEvent data1] & 0x0000FFFF);