winemac: Don't allow dead-key state to repeat after characters are generated.

It's fairly common in Mac keyboard layouts that, if you type a dead key twice, the second key press will both produce a non-dead character and also perpetuate the dead-key state. For example, with the U.S. layout, Option-E, E will produce "é" and Option-E, Option-E, E will produce "´é". Windows keyboard layouts don't tend to do this. The second key press produces the non-dead character and clears the dead-key state.

winemac: Don't allow dead-key state to repeat after characters are generated.
ae2ce18f · Ken Thomases · Alexandre Julliard · fa6b0580 · ae2ce18f
Commit ae2ce18f authored Sep 09, 2013 by Ken Thomases Committed by Alexandre Julliard Sep 10, 2013
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

keyboard.c dlls/winemac.drv/keyboard.c +4 -1

No files found.
--- a/dlls/winemac.drv/keyboard.c
+++ b/dlls/winemac.drv/keyboard.c
@@ -1394,7 +1394,10 @@ INT CDECL macdrv_ToUnicodeEx(UINT virtKey, UINT scanCode, const BYTE *lpKeyState
    }
    if (!is_menu)
    {
-        thread_data->dead_key_state = deadKeyState;
+        if (keyAction != kUCKeyActionUp && len > 0 && deadKeyState == thread_data->dead_key_state)
+            thread_data->dead_key_state = 0;
+        else
+            thread_data->dead_key_state = deadKeyState;

        if (keyAction == kUCKeyActionUp)
            goto done;