diff --git a/include/freerdp/locale/keyboard.h b/include/freerdp/locale/keyboard.h index ed2e6be6f..98c6ecdd7 100644 --- a/include/freerdp/locale/keyboard.h +++ b/include/freerdp/locale/keyboard.h @@ -150,6 +150,7 @@ typedef struct _RDP_KEYBOARD_LAYOUT RDP_KEYBOARD_LAYOUT; #define KBD_ITALIAN_142 0x00010410 #define KBD_POLISH_214 0x00010415 #define KBD_PORTUGUESE_BRAZILIAN_ABNT2 0x00010416 +#define KBD_ROMANIAN_STANDARD 0x00010418 #define KBD_RUSSIAN_TYPEWRITER 0x00010419 #define KBD_SLOVAK_QWERTY 0x0001041B #define KBD_THAI_PATTACHOTE 0x0001041E @@ -157,10 +158,12 @@ typedef struct _RDP_KEYBOARD_LAYOUT RDP_KEYBOARD_LAYOUT; #define KBD_LATVIAN_QWERTY 0x00010426 #define KBD_LITHUANIAN 0x00010427 #define KBD_ARMENIAN_WESTERN 0x0001042B +#define KBD_GEORGIAN_QUERTY 0x00010437 #define KBD_HINDI_TRADITIONAL 0x00010439 #define KBD_MALTESE_48_KEY 0x0001043A #define KBD_SAMI_EXTENDED_NORWAY 0x0001043B #define KBD_BENGALI_INSCRIPT 0x00010445 +#define KBD_KHMER 0x00010453 #define KBD_SYRIAC_PHONETIC 0x0001045A #define KBD_DIVEHI_TYPEWRITER 0x00010465 #define KBD_BELGIAN_COMMA 0x0001080C @@ -171,15 +174,19 @@ typedef struct _RDP_KEYBOARD_LAYOUT RDP_KEYBOARD_LAYOUT; #define KBD_CZECH_PROGRAMMERS 0x00020405 #define KBD_GREEK_319 0x00020408 #define KBD_UNITED_STATES_INTERNATIONAL 0x00020409 +#define KBD_RUSSIAN_PHONETIC 0x00020419 #define KBD_THAI_KEDMANEE_NON_SHIFTLOCK 0x0002041E +#define KBD_BANGLA 0x00020445 #define KBD_SAMI_EXTENDED_FINLAND_SWEDEN 0x0002083B #define KBD_GREEK_220_LATIN 0x00030408 #define KBD_UNITED_STATES_DVORAK_FOR_LEFT_HAND 0x00030409 #define KBD_THAI_PATTACHOTE_NON_SHIFTLOCK 0x0003041E +#define KBD_BULGARIAN_PHONETIC 0x00040402 #define KBD_GREEK_319_LATIN 0x00040408 #define KBD_UNITED_STATES_DVORAK_FOR_RIGHT_HAND 0x00040409 #define KBD_UNITED_STATES_DVORAK_PROGRAMMER 0x19360409 #define KBD_GREEK_LATIN 0x00050408 +#define KBD_PERSIAN 0x00050429 #define KBD_US_ENGLISH_TABLE_FOR_IBM_ARABIC_238_L 0x00050409 #define KBD_GREEK_POLYTONIC 0x00060408 #define KBD_FRENCH_BEPO 0xa000040c diff --git a/libfreerdp/locale/keyboard_apple.c b/libfreerdp/locale/keyboard_apple.c index d0d59216e..d295e88ea 100644 --- a/libfreerdp/locale/keyboard_apple.c +++ b/libfreerdp/locale/keyboard_apple.c @@ -50,7 +50,7 @@ static const KEYBOARD_LAYOUT_MAPPING KEYBOARD_MAPPING_TABLE[] = { { "com.apple.keylayout.2SetHangul", KOREAN }, { "com.apple.keylayout.390Hangul", KOREAN }, { "com.apple.keylayout.3SetHangul", KOREAN }, - { "com.apple.keylayout.AfghanDari", DARI }, + { "com.apple.keylayout.AfghanDari", KBD_PERSIAN }, { "com.apple.keylayout.AfghanPashto", PASHTO }, { "com.apple.keylayout.AfghanUzbek", UZBEK_LATIN }, { "com.apple.keylayout.Arabic", ARABIC_EGYPT }, @@ -59,48 +59,48 @@ static const KEYBOARD_LAYOUT_MAPPING KEYBOARD_MAPPING_TABLE[] = { { "com.apple.keylayout.Armenian-HMQWERTY", ARMENIAN }, { "com.apple.keylayout.Armenian-WesternQWERTY", ARMENIAN }, { "com.apple.keylayout.Australian", ENGLISH_AUSTRALIAN }, - { "com.apple.keylayout.Austrian", GERMAN_AUSTRIAN }, + { "com.apple.keylayout.Austrian", GERMAN_STANDARD }, { "com.apple.keylayout.Azeri", AZERI_LATIN }, - { "com.apple.keylayout.Bangla", BENGALI_INDIA }, - { "com.apple.keylayout.Bangla-QWERTY", BENGALI_INDIA }, + { "com.apple.keylayout.Bangla", KBD_BANGLA }, + { "com.apple.keylayout.Bangla-QWERTY", KBD_BANGLA }, { "com.apple.keylayout.Belgian", DUTCH_BELGIAN }, { "com.apple.keylayout.Brazilian", PORTUGUESE_BRAZILIAN }, { "com.apple.keylayout.British", ENGLISH_UNITED_KINGDOM }, { "com.apple.keylayout.British-PC", ENGLISH_UNITED_KINGDOM }, { "com.apple.keylayout.Bulgarian", BULGARIAN }, - { "com.apple.keylayout.Bulgarian-Phonetic", BULGARIAN }, + { "com.apple.keylayout.Bulgarian-Phonetic", KBD_BULGARIAN_PHONETIC }, { "com.apple.keylayout.Byelorussian", BELARUSIAN }, - { "com.apple.keylayout.Canadian", ENGLISH_CANADIAN }, - { "com.apple.keylayout.Canadian-CSA", FRENCH_CANADIAN }, + { "com.apple.keylayout.Canadian", ENGLISH_UNITED_STATES }, + { "com.apple.keylayout.Canadian-CSA", KBD_CANADIAN_MULTILINGUAL_STANDARD }, { "com.apple.keylayout.CangjieKeyboard", CHINESE_TAIWAN }, { "com.apple.keylayout.Cherokee-Nation", CHEROKEE }, - { "com.apple.keylayout.Cherokee-QWERTY", CHEROKEE }, + { "com.apple.keylayout.Cherokee-QWERTY", ENGLISH_UNITED_STATES }, { "com.apple.keylayout.Colemak", ENGLISH_UNITED_STATES }, { "com.apple.keylayout.Croatian", CROATIAN }, { "com.apple.keylayout.Croatian-PC", CROATIAN }, { "com.apple.keylayout.Czech", CZECH }, - { "com.apple.keylayout.Czech-QWERTY", CZECH }, - { "com.apple.keylayout.DVORAK-QWERTYCMD", ENGLISH_UNITED_STATES }, + { "com.apple.keylayout.Czech-QWERTY", KBD_CZECH_QWERTY }, + { "com.apple.keylayout.DVORAK-QWERTYCMD", KBD_UNITED_STATES_DVORAK }, { "com.apple.keylayout.Danish", DANISH }, { "com.apple.keylayout.Devanagari", HINDI }, { "com.apple.keylayout.Devanagari-QWERTY", HINDI }, - { "com.apple.keylayout.Dutch", DUTCH_STANDARD }, - { "com.apple.keylayout.Dvorak", ENGLISH_UNITED_STATES }, - { "com.apple.keylayout.Dvorak-Left", ENGLISH_UNITED_STATES }, - { "com.apple.keylayout.Dvorak-Right", ENGLISH_UNITED_STATES }, + { "com.apple.keylayout.Dutch", KBD_UNITED_STATES_INTERNATIONAL }, + { "com.apple.keylayout.Dvorak", KBD_UNITED_STATES_DVORAK }, + { "com.apple.keylayout.Dvorak-Left", KBD_UNITED_STATES_DVORAK_FOR_LEFT_HAND }, + { "com.apple.keylayout.Dvorak-Right", KBD_UNITED_STATES_DVORAK_FOR_RIGHT_HAND }, { "com.apple.keylayout.Estonian", ESTONIAN }, { "com.apple.keylayout.Faroese", FAEROESE }, { "com.apple.keylayout.Finnish", FINNISH }, - { "com.apple.keylayout.FinnishExtended", FINNISH }, - { "com.apple.keylayout.FinnishSami-PC", FINNISH }, - { "com.apple.keylayout.French", FRENCH_STANDARD }, + { "com.apple.keylayout.FinnishExtended", KBD_SAMI_EXTENDED_FINLAND_SWEDEN }, + { "com.apple.keylayout.FinnishSami-PC", KBD_FINNISH_WITH_SAMI }, + { "com.apple.keylayout.French", KBD_BELGIAN_FRENCH }, { "com.apple.keylayout.French-PC", FRENCH_STANDARD }, - { "com.apple.keylayout.French-numerical", FRENCH_STANDARD }, + { "com.apple.keylayout.French-numerical", KBD_BELGIAN_FRENCH }, { "com.apple.keylayout.GJCRomaja", ENGLISH_UNITED_STATES }, - { "com.apple.keylayout.Georgian-QWERTY", GEORGIAN }, + { "com.apple.keylayout.Georgian-QWERTY", KBD_GEORGIAN_QUERTY }, { "com.apple.keylayout.German", GERMAN_STANDARD }, { "com.apple.keylayout.Greek", GREEK }, - { "com.apple.keylayout.GreekPolytonic", GREEK }, + { "com.apple.keylayout.GreekPolytonic", KBD_GREEK_POLYTONIC }, { "com.apple.keylayout.Gujarati", GUJARATI }, { "com.apple.keylayout.Gujarati-QWERTY", GUJARATI }, { "com.apple.keylayout.Gurmukhi", PUNJABI }, @@ -118,14 +118,14 @@ static const KEYBOARD_LAYOUT_MAPPING KEYBOARD_MAPPING_TABLE[] = { { "com.apple.keylayout.Inuktitut-QWERTY", INUKTITUT }, { "com.apple.keylayout.InuttitutNunavik", INUKTITUT }, { "com.apple.keylayout.Irish", ENGLISH_IRELAND }, - { "com.apple.keylayout.IrishExtended", IRISH }, + { "com.apple.keylayout.IrishExtended", KBD_IRISH }, { "com.apple.keylayout.Italian", ITALIAN_STANDARD }, { "com.apple.keylayout.Italian-Pro", ITALIAN_STANDARD }, { "com.apple.keylayout.Jawi-QWERTY", ARABIC_SAUDI_ARABIA }, { "com.apple.keylayout.Kannada", KANNADA }, { "com.apple.keylayout.Kannada-QWERTY", KANNADA }, { "com.apple.keylayout.Kazakh", KAZAKH }, - { "com.apple.keylayout.Khmer", KHMER }, + { "com.apple.keylayout.Khmer", KBD_KHMER }, { "com.apple.keylayout.Latvian", LATVIAN }, { "com.apple.keylayout.Lithuanian", LITHUANIAN }, { "com.apple.keylayout.Macedonian", MACEDONIAN }, @@ -140,26 +140,26 @@ static const KEYBOARD_LAYOUT_MAPPING KEYBOARD_MAPPING_TABLE[] = { { "com.apple.keylayout.NorwegianExtended", NORWEGIAN_BOKMAL }, { "com.apple.keylayout.NorwegianSami-PC", NORWEGIAN_BOKMAL }, { "com.apple.keylayout.Oriya", ORIYA }, - { "com.apple.keylayout.Persian", FARSI }, - { "com.apple.keylayout.Persian-ISIRI2901", FARSI }, - { "com.apple.keylayout.Polish", POLISH }, - { "com.apple.keylayout.PolishPro", POLISH }, + { "com.apple.keylayout.Persian", KBD_PERSIAN }, + { "com.apple.keylayout.Persian-ISIRI2901", KBD_PERSIAN }, + { "com.apple.keylayout.Polish", KBD_POLISH_214 }, + { "com.apple.keylayout.PolishPro", KBD_UNITED_STATES_INTERNATIONAL }, { "com.apple.keylayout.Portuguese", PORTUGUESE_STANDARD }, - { "com.apple.keylayout.Romanian", ROMANIAN }, - { "com.apple.keylayout.Romanian-Standard", ROMANIAN }, + { "com.apple.keylayout.Romanian", KBD_ROMANIAN }, + { "com.apple.keylayout.Romanian-Standard", KBD_ROMANIAN_STANDARD }, { "com.apple.keylayout.Russian", RUSSIAN }, - { "com.apple.keylayout.Russian-Phonetic", RUSSIAN }, + { "com.apple.keylayout.Russian-Phonetic", KBD_RUSSIAN_PHONETIC }, { "com.apple.keylayout.RussianWin", RUSSIAN }, - { "com.apple.keylayout.Sami-PC", SAMI_NORTHERN_SWEDEN }, - { "com.apple.keylayout.Serbian", SERBIAN_CYRILLIC_BOSNIA_HERZEGOVINA }, - { "com.apple.keylayout.Serbian-Latin", SERBIAN_LATIN_BOSNIA_HERZEGOVINA }, + { "com.apple.keylayout.Sami-PC", KBD_SAMI_EXTENDED_FINLAND_SWEDEN }, + { "com.apple.keylayout.Serbian", KBD_SERBIAN_CYRILLIC }, + { "com.apple.keylayout.Serbian-Latin", KBD_SERBIAN_LATIN }, { "com.apple.keylayout.Sinhala", SINHALA }, { "com.apple.keylayout.Sinhala-QWERTY", SINHALA }, { "com.apple.keylayout.Slovak", SLOVAK }, - { "com.apple.keylayout.Slovak-QWERTY", SLOVAK }, + { "com.apple.keylayout.Slovak-QWERTY", KBD_SLOVAK_QWERTY }, { "com.apple.keylayout.Slovenian", SLOVENIAN }, { "com.apple.keylayout.Spanish", SPANISH_TRADITIONAL_SORT }, - { "com.apple.keylayout.Spanish-ISO", SPANISH_MODERN_SORT }, + { "com.apple.keylayout.Spanish-ISO", KBD_SPANISH }, { "com.apple.keylayout.Swedish", SWEDISH }, { "com.apple.keylayout.Swedish-Pro", SWEDISH }, { "com.apple.keylayout.SwedishSami-PC", SWEDISH }, @@ -168,11 +168,11 @@ static const KEYBOARD_LAYOUT_MAPPING KEYBOARD_MAPPING_TABLE[] = { { "com.apple.keylayout.Telugu", TELUGU }, { "com.apple.keylayout.Telugu-QWERTY", TELUGU }, { "com.apple.keylayout.Thai", THAI }, - { "com.apple.keylayout.Thai-PattaChote", THAI }, + { "com.apple.keylayout.Thai-PattaChote", KBD_THAI_PATTACHOTE }, { "com.apple.keylayout.Tibetan-QWERTY", TIBETAN_PRC }, { "com.apple.keylayout.Tibetan-Wylie", TIBETAN_PRC }, { "com.apple.keylayout.TibetanOtaniUS", TIBETAN_PRC }, - { "com.apple.keylayout.Turkish", TURKISH }, + { "com.apple.keylayout.Turkish", KBD_TURKISH_F }, { "com.apple.keylayout.Turkish-QWERTY", TURKISH }, { "com.apple.keylayout.Turkish-QWERTY-PC", TURKISH }, { "com.apple.keylayout.US", ENGLISH_UNITED_STATES },