winemac: Discard key repeat events after a modifier key has been pressed.

Sierra (macOS 10.12) changed the behavior of key repeat. In previous versions of macOS, key repeat stops when a modifier key is pressed or released. In Sierra, it does not; it just keeps repeating as newly-modified. On Windows, key repeat stops when a modifier key is pressed, although not when one is released. Some programs depend on this behavior. So, the Mac driver emulates it. Signed-off-by: Ken Thomases <ken@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

winemac: Discard key repeat events after a modifier key has been pressed.
c5eca7be · Ken Thomases · Alexandre Julliard · b115e967 · c5eca7be · c5eca7be
Commit c5eca7be authored Mar 10, 2017 by Ken Thomases Committed by Alexandre Julliard Mar 10, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 17 additions and 1 deletion

cocoa_window.h dlls/winemac.drv/cocoa_window.h +2 -0

cocoa_window.m dlls/winemac.drv/cocoa_window.m +15 -1

No files found.
--- a/dlls/winemac.drv/cocoa_window.h
+++ b/dlls/winemac.drv/cocoa_window.h
@@ -81,6 +81,8 @@

    NSTimeInterval lastDockIconSnapshot;

+    BOOL allowKeyRepeats;
+
    BOOL ignore_windowDeminiaturize;
    BOOL ignore_windowResize;
    BOOL fakingClose;

--- a/dlls/winemac.drv/cocoa_window.m
+++ b/dlls/winemac.drv/cocoa_window.m
@@ -2424,7 +2424,18 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi
    /*
     * ---------- NSResponder method overrides ----------
     */
-    - (void) keyDown:(NSEvent *)theEvent { [self postKeyEvent:theEvent]; }
+    - (void) keyDown:(NSEvent *)theEvent
+    {
+        if ([theEvent isARepeat])
+        {
+            if (!allowKeyRepeats)
+                return;
+        }
+        else
+            allowKeyRepeats = YES;
+
+        [self postKeyEvent:theEvent];
+    }

    - (void) flagsChanged:(NSEvent *)theEvent
    {
@@ -2461,6 +2472,9 @@ static CVReturn WineDisplayLinkCallback(CVDisplayLinkRef displayLink, const CVTi
            {
                BOOL pressed = (modifierFlags & modifiers[i].mask) != 0;

+                if (pressed)
+                    allowKeyRepeats = NO;
+
                if (i == last_changed)
                    lastModifierFlags = modifierFlags;
                else