[PATCH 0/1] MR9802: winewayland: Mind KLLF_ALTGR when sending VK_CONTROL + VK_MENU.

[Rémi Bernon (＠rbernon)]

Removing the flag for a few locales for which native keyboard layouts
don't usually have it set.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=58640

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/9802

[PATCH 1/1] winewayland: Mind KLLF_ALTGR when sending VK_CONTROL + VK_MENU.

[Rémi Bernon]

From: Rémi Bernon <[e-mail]>

Removing the flag for a few locales for which native keyboard layouts
don't usually have it set.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=58640
---
 dlls/winewayland.drv/wayland_keyboard.c | 39 ++++++++++++++++++++++---
 1 file changed, 35 insertions(+), 4 deletions(-)

diff --git a/dlls/winewayland.drv/wayland_keyboard.c b/dlls/winewayland.drv/wayland_keyboard.c
index 648b7f9cc2f..2a80d95daa7 100644
--- a/dlls/winewayland.drv/wayland_keyboard.c
+++ b/dlls/winewayland.drv/wayland_keyboard.c
@@ -343,7 +343,7 @@ static inline LANGID langid_from_xkb_layout(const char *layout, size_t layout_le
 
     FIXME("Unknown layout language %s\n", debugstr_a(layout));
     return MAKELANGID(LANG_NEUTRAL, SUBLANG_CUSTOM_UNSPECIFIED);
-};
+}
 
 static HKL get_layout_hkl(struct layout *layout, LCID locale)
 {
@@ -351,6 +351,23 @@ static HKL get_layout_hkl(struct layout *layout, LCID locale)
     else return (HKL)(UINT_PTR)MAKELONG(locale, 0xf000 | layout->layout_id);
 }
 
+static WORD get_locale_flags(HKL hkl)
+{
+    struct layout *layout;
+    WORD flags;
+
+    pthread_mutex_lock(&xkb_layouts_mutex);
+
+    LIST_FOR_EACH_ENTRY(layout, &xkb_layouts, struct layout, entry)
+        if (hkl == get_layout_hkl(layout, LOWORD(hkl))) break;
+    if (&layout->entry == &xkb_layouts) flags = 0;
+    else flags = LOWORD(layout->tables.fLocaleFlags);
+
+    pthread_mutex_unlock(&xkb_layouts_mutex);
+
+    return flags;
+}
+
 static void add_xkb_layout(const char *xkb_layout, struct xkb_keymap *xkb_keymap,
                             xkb_layout_index_t xkb_group, LANGID lang)
 {
@@ -419,7 +436,21 @@ static void add_xkb_layout(const char *xkb_layout, struct xkb_keymap *xkb_keymap
     layout->tables.pVSCtoVK_E1 = layout->vsc2vk_e1;
     layout->tables.pCharModifiers = &layout->modifiers;
     layout->tables.pVkToWcharTable = layout->vk_to_wchar_table;
-    layout->tables.fLocaleFlags = MAKELONG(KLLF_ALTGR, KBD_VERSION);
+
+    switch (lang)
+    {
+    case MAKELANGID(LANG_ARABIC, SUBLANG_DEFAULT):
+    case MAKELANGID(LANG_BULGARIAN, SUBLANG_DEFAULT):
+    case MAKELANGID(LANG_CHINESE, SUBLANG_DEFAULT):
+    case MAKELANGID(LANG_ENGLISH, SUBLANG_DEFAULT):
+    case MAKELANGID(LANG_JAPANESE, SUBLANG_DEFAULT):
+    case MAKELANGID(LANG_KOREAN, SUBLANG_DEFAULT):
+        layout->tables.fLocaleFlags = MAKELONG(0, KBD_VERSION);
+        break;
+    default:
+        layout->tables.fLocaleFlags = MAKELONG(KLLF_ALTGR, KBD_VERSION);
+        break;
+    }
 
     layout->vk_to_wchar_table[0].pVkToWchars = (VK_TO_WCHARS1 *)layout->vk_to_wchars8;
     layout->vk_to_wchar_table[0].cbSize = sizeof(*layout->vk_to_wchars8);
@@ -828,8 +859,8 @@ static void keyboard_handle_key(void *data, struct wl_keyboard *wl_keyboard,
 
     TRACE_(key)("serial=%u hwnd=%p key=%d scan=%#x state=%#x\n", serial, hwnd, key, scan, state);
 
-    /* NOTE: Windows normally sends VK_CONTROL + VK_MENU only if the layout has KLLF_ALTGR */
-    if (key == KEY_RIGHTALT) send_right_control(hwnd, state);
+    if (key == KEY_RIGHTALT && (get_locale_flags(keyboard_hkl) & KLLF_ALTGR))
+        send_right_control(hwnd, state);
 
     input.type = INPUT_KEYBOARD;
     input.ki.wScan = (scan & 0x300) ? scan + 0xdf00 : scan;
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/9802

[Byeongsik Jeon (＠bsjeon)]

Shouldn't this be determined by checking whether the keysym is XKB_KEY_ISO_Level3_Shift?

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/9802#note_125907