[PATCH 3/3] winex11: Create layouts when falling back to fuzzy detection.

[Matteo Bruni]

From: Matteo Bruni <[e-mail]>

---
 dlls/winex11.drv/keyboard.c | 71 +++++++++++++++++++++----------------
 1 file changed, 41 insertions(+), 30 deletions(-)

diff --git a/dlls/winex11.drv/keyboard.c b/dlls/winex11.drv/keyboard.c
index 50bb613e1a5..3d5d2c81f03 100644
--- a/dlls/winex11.drv/keyboard.c
+++ b/dlls/winex11.drv/keyboard.c
@@ -1669,6 +1669,14 @@ static LANGID langid_from_xkb_layout( const char *layout )
     return MAKELANGID(LANG_NEUTRAL, SUBLANG_CUSTOM_UNSPECIFIED);
 };
 
+static const char *xkb_layout_from_langid( LANGID langid )
+{
+    for (int i = 0; i < ARRAY_SIZE(layout_ids); i++)
+        if (langid == layout_ids[i].langid)
+            return layout_ids[i].name;
+    return NULL;
+}
+
 static const struct klid_map_entry
 {
     const char *layout;
@@ -2062,12 +2070,16 @@ static void init_keycode_mappings( Display *display )
       }
 }
 
-static BOOL find_xkb_layout_variant( const char *name, const char **layout, const char **variant )
+static void find_xkb_layout_variant( Display *display, XModifierKeymap *mmp, int group, const char *name,
+                                     const char **layout, const char **variant )
 {
+    unsigned int index;
 #ifdef SONAME_LIBXKBREGISTRY
     struct rxkb_layout *iter;
 
-    if (rxkb_context)
+    if (!rxkb_context) WARN( "libxkbregistry not available, falling back to fuzzy layout detection\n" );
+    else if (!name) WARN( "Xkb layout name not found, falling back to fuzzy layout detection\n" );
+    else
     {
         for (iter = p_rxkb_layout_first( rxkb_context ); iter; iter = p_rxkb_layout_next( iter ))
         {
@@ -2077,23 +2089,25 @@ static BOOL find_xkb_layout_variant( const char *name, const char **layout, cons
             {
                 *layout = p_rxkb_layout_get_name( iter );
                 *variant = p_rxkb_layout_get_variant( iter );
-                return TRUE;
+                return;
             }
         }
 
         WARN( "Unknown Xkb layout name %s\n", debugstr_a(name) );
     }
-    else
-        WARN( "libxkbregistry not available, falling back to fuzzy layout detection\n" );
 #else
     WARN( "libxkbregistry support not compiled in, falling back to fuzzy layout detection\n" );
 #endif
-    return FALSE;
+
+    index = detect_keyboard_layout( display, mmp, group );
+    *layout = xkb_layout_from_langid( main_key_tab[index].lcid );
+    if (strstr( main_key_tab[index].comment, "dvorak" )) *variant = "dvorak";
 }
 
 /* initialize or update keyboard layouts */
 void init_keyboard_layouts( Display *display )
 {
+    char *names[4] = { NULL };
     unsigned int xkb_group;
     XkbStateRec xkb_state;
     XModifierKeymap *mmp;
@@ -2102,6 +2116,7 @@ void init_keyboard_layouts( Display *display )
     LANGID xkb_lang = 0;
     Status status;
     KeyCode *kcp;
+    int count;
 
     pthread_mutex_lock( &kbd_mutex );
     XDisplayKeycodes( display, &min_keycode, &max_keycode );
@@ -2139,39 +2154,35 @@ void init_keyboard_layouts( Display *display )
 
     if ((xkb_desc = XkbGetMap( display, XkbAllClientInfoMask, XkbUseCoreKbd )))
     {
-        char *names[4];
-        int count;
-
         XkbGetNames( display, XkbGroupNamesMask, xkb_desc );
         for (count = 0; count < ARRAY_SIZE(xkb_desc->names->groups); count++)
             if (!xkb_desc->names->groups[count]) break;
 
         if (!XGetAtomNames( display, xkb_desc->names->groups, count, names )) count = 0;
-        TRACE("Found %u group names\n", count);
-        for (int i = 0; i < count; i++)
-        {
-            const char *layout, *variant = NULL;
-            char buffer[1024];
-            DWORD klid;
-            LANGID lang;
+        TRACE( "Found %u group names\n", count );
+        XkbFreeKeyboard( xkb_desc, 0, True );
+    }
+    else count = status ? 1 : 4;
 
-            if (!names[i]) continue;
-            if (find_xkb_layout_variant( names[i], &layout, &variant ))
-            {
-                lang = langid_from_xkb_layout( layout );
-                klid = klid_from_xkb_layout( layout, variant );
-                if (i == xkb_group) xkb_lang = lang;
+    for (int i = 0; i < count; i++)
+    {
+        const char *layout, *variant = NULL;
+        char buffer[1024];
+        DWORD klid;
+        LANGID lang;
 
-                TRACE( "Found group %u with name %s -> layout %s:%s, lang %04x, klid %08x\n", i, debugstr_a(names[i]),
-                       debugstr_a(layout), debugstr_a(variant), lang, klid );
+        find_xkb_layout_variant( display, mmp, i, names[i], &layout, &variant );
+        lang = langid_from_xkb_layout( layout );
+        klid = klid_from_xkb_layout( layout, variant );
+        if (i == xkb_group) xkb_lang = lang;
 
-                snprintf( buffer, ARRAY_SIZE(buffer), "%s:%s", layout, variant );
-                create_layout_from_xkb( i, buffer, lang, klid );
-            }
-            XFree( names[i] );
-        }
+        TRACE( "Found group %u with name %s -> layout %s:%s, lang %04x, klid %08x\n", i, debugstr_a(names[i]),
+               debugstr_a(layout), debugstr_a(variant), lang, klid );
 
-        XkbFreeKeyboard( xkb_desc, 0, True );
+        snprintf( buffer, ARRAY_SIZE(buffer), "%s:%s", layout, variant );
+        create_layout_from_xkb( i, buffer, lang, klid );
+
+        if (names[i]) XFree( names[i] );
     }
 
     kbd_layout = detect_keyboard_layout( display, mmp, xkb_group );
-- 
GitLab

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