winemac: Add a category on NSEvent to simplify checking if the Command key (and only that modifier) is pressed for an event.

Signed-off-by: Ken Thomases <ken@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>

dlls/winemac.drv/cocoa_app.m

@@ -1653,7 +1653,7 @@ static NSString* WineLocalizedString(unsigned int stringID)
 
         if ([window isKindOfClass:[WineWindow class]] &&
             type == NSLeftMouseDown &&
-            (([theEvent modifierFlags] & (NSShiftKeyMask | NSControlKeyMask| NSAlternateKeyMask | NSCommandKeyMask)) != NSCommandKeyMask))
+            ![theEvent wine_commandKeyDown])
         {
             NSWindowButton windowButton;
 

dlls/winemac.drv/cocoa_event.h

@@ -28,6 +28,12 @@ enum {
 };
 
 
+@interface NSEvent (WineExtensions)
+    + (BOOL) wine_commandKeyDown;
+    - (BOOL) wine_commandKeyDown;
+@end
+
+
 @class WineWindow;
 
 

dlls/winemac.drv/cocoa_event.m

@@ -40,6 +40,26 @@ static NSString* const WineHotKeyCarbonRefKey   = @"hotKeyRef";
 static const OSType WineHotKeySignature = 'Wine';
 
 
+@implementation NSEvent (WineExtensions)
+
+    static BOOL wine_commandKeyDown(NSUInteger flags)
+    {
+        return ((flags & (NSShiftKeyMask | NSControlKeyMask | NSAlternateKeyMask | NSCommandKeyMask)) == NSCommandKeyMask);
+    }
+
+    + (BOOL) wine_commandKeyDown
+    {
+        return wine_commandKeyDown([self modifierFlags]);
+    }
+
+    - (BOOL) wine_commandKeyDown
+    {
+        return wine_commandKeyDown([self modifierFlags]);
+    }
+
+@end
+
+
 @interface MacDrvEvent : NSObject
 {
 @public