winemac: Update the keyboard layout data immediately after changing the input source.

It would eventually get updated by the keyboard changed event, but only after the message queue was pumped. Signed-off-by: Huw Davies <huw@codeweavers.com> Signed-off-by: Ken Thomases <ken@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

winemac: Update the keyboard layout data immediately after changing the input source.
c3dbe443 · Huw Davies · Alexandre Julliard · bce972b1 · c3dbe443 · c3dbe443
Commit c3dbe443 authored Oct 24, 2016 by Huw Davies Committed by Alexandre Julliard Oct 24, 2016
Show whitespace changes
Inline Side-by-side

Showing with 9 additions and 0 deletions

cocoa_app.m dlls/winemac.drv/cocoa_app.m +1 -0

keyboard.c dlls/winemac.drv/keyboard.c +8 -0

No files found.
--- a/dlls/winemac.drv/cocoa_app.m
+++ b/dlls/winemac.drv/cocoa_app.m
@@ -2426,6 +2426,7 @@ void macdrv_get_input_source_info(CFDataRef* uchr, CGEventSourceKeyboardType* ke

            *keyboard_type = [WineApplicationController sharedController].keyboardType;
            *is_iso = (KBGetLayoutType(*keyboard_type) == kKeyboardISO);
+            if (input_source)
                *input_source = TISCopyCurrentKeyboardInputSource();
        }
    });

--- a/dlls/winemac.drv/keyboard.c
+++ b/dlls/winemac.drv/keyboard.c
@@ -1186,7 +1186,15 @@ HKL CDECL macdrv_ActivateKeyboardLayout(HKL hkl, UINT flags)
            if (macdrv_select_input_source(layout->input_source))
            {
                oldHkl = thread_data->active_keyboard_layout;
+                if (thread_data->keyboard_layout_uchr)
+                    CFRelease(thread_data->keyboard_layout_uchr);
+
+                macdrv_get_input_source_info(&thread_data->keyboard_layout_uchr, &thread_data->keyboard_type,
+                                             &thread_data->iso_keyboard, NULL);
                thread_data->active_keyboard_layout = hkl;
+                thread_data->dead_key_state = 0;
+
+                macdrv_compute_keyboard_layout(thread_data);
            }
            break;
        }