Fix parsing of current keyboard locale

(cherry picked from commit 2e59baa33c23cbd0e0ef6e432d8ef202caa34303)

diff --git a/libfreerdp/locale/keyboard_x11.c b/libfreerdp/locale/keyboard_x11.c
index 7ec8793..858ed7c 100644 (file)
--- a/libfreerdp/locale/keyboard_x11.c
+++ b/libfreerdp/locale/keyboard_x11.c
@@ -80,6 +80,11 @@ int freerdp_detect_keyboard_layout_from_xkb(DWORD* keyboardLayoutId)
 
                        layout = beg;
 
+                       /* if multiple languages are present we just take the first one */
+                       pch = strchr(layout, ',');
+                       if (pch)
+                               *pch = '\0';
+
                        /* "variant" */
                        beg = strchr(end + 1, '"');
                        beg += 1;
@@ -124,6 +129,11 @@ int freerdp_detect_keyboard_layout_from_xkb(DWORD* keyboardLayoutId)
 
                        layout = beg;
 
+                       /* if multiple languages are present we just take the first one */
+                       pch = strchr(layout, ',');
+                       if (pch)
+                               *pch = '\0';
+
                        /* "variant" */
                        beg = strchr(end + 1, '"');
                        beg += 1;

diff --git a/libfreerdp/locale/xkb_layout_ids.c b/libfreerdp/locale/xkb_layout_ids.c
index ce0810b..223f7d1 100644 (file)
--- a/libfreerdp/locale/xkb_layout_ids.c
+++ b/libfreerdp/locale/xkb_layout_ids.c
@@ -776,6 +776,7 @@ static const XKB_LAYOUT xkbLayouts[] = {
        { "gh", 0, gh_variants },                                /* Ghana */
        { "gn", 0, NULL },                                       /* Guinea */
        { "ge", KBD_GEORGIAN, ge_variants },                     /* Georgia */
+       { "at", KBD_GERMAN, de_variants },                       /* Austria */
        { "de", KBD_GERMAN, de_variants },                       /* Germany */
        { "gr", KBD_GREEK, gr_variants },                        /* Greece */
        { "hu", KBD_HUNGARIAN, hu_variants },                    /* Hungary */