mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1948 from jbd1986/fix-french-canadian

Browse Source 
I am making several changes to clean up French Canadian keyboard defs.
This commit is contained in:
Marc-André Moreau 2014-07-11 16:34:43 -04:00
commit 61b35e2e8f
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/freerdp/locale/keyboard.h
View File

@ -116,9 +116,10 @@ typedef struct _RDP_KEYBOARD_LAYOUT RDP_KEYBOARD_LAYOUT;
#define KBD_SWEDISH_WITH_SAMI 0x0000083B #define KBD_SWEDISH_WITH_SAMI 0x0000083B
#define KBD_UZBEK_CYRILLIC 0x00000843 #define KBD_UZBEK_CYRILLIC 0x00000843
#define KBD_INUKTITUT_LATIN 0x0000085D #define KBD_INUKTITUT_LATIN 0x0000085D
#define KBD_CANADIAN_ENGLISH 0x00001009
#define KBD_CANADIAN_FRENCH_LEGACY 0x00000C0C #define KBD_CANADIAN_FRENCH_LEGACY 0x00000C0C
#define KBD_SERBIAN_CYRILLIC 0x00000C1A #define KBD_SERBIAN_CYRILLIC 0x00000C1A
#define KBD_CANADIAN_FRENCH 0x00001009 #define KBD_CANADIAN_FRENCH 0x00000C0C
#define KBD_SWISS_FRENCH 0x0000100C #define KBD_SWISS_FRENCH 0x0000100C
#define KBD_BOSNIAN 0x0000141A #define KBD_BOSNIAN 0x0000141A
#define KBD_IRISH 0x00001809 #define KBD_IRISH 0x00001809

1
libfreerdp/locale/keyboard_layout.c
View File

@ -120,6 +120,7 @@ static const RDP_KEYBOARD_LAYOUT RDP_KEYBOARD_LAYOUT_TABLE[] =
{ KBD_CANADIAN_FRENCH_LEGACY, "Canadian French (legacy)" }, { KBD_CANADIAN_FRENCH_LEGACY, "Canadian French (legacy)" },
{ KBD_SERBIAN_CYRILLIC, "Serbian (Cyrillic)" }, { KBD_SERBIAN_CYRILLIC, "Serbian (Cyrillic)" },
{ KBD_CANADIAN_FRENCH, "Canadian French" }, { KBD_CANADIAN_FRENCH, "Canadian French" },
{ KBD_CANADIAN_ENGLISH, "Canadian English" },
{ KBD_SWISS_FRENCH, "Swiss French" }, { KBD_SWISS_FRENCH, "Swiss French" },
{ KBD_BOSNIAN, "Bosnian" }, { KBD_BOSNIAN, "Bosnian" },
{ KBD_IRISH, "Irish" }, { KBD_IRISH, "Irish" },

5
libfreerdp/locale/xkb_layout_ids.c
View File

@ -208,15 +208,16 @@ static const XKB_VARIANT ma_variants[] =
/* Canada */ /* Canada */
static const XKB_VARIANT ca_variants[] = static const XKB_VARIANT ca_variants[] =
{ {
{ "fr", KBD_CANADIAN_FRENCH }, /* French Dvorak */
{ "fr-dvorak", KBD_UNITED_STATES_DVORAK }, /* French Dvorak */ { "fr-dvorak", KBD_UNITED_STATES_DVORAK }, /* French Dvorak */
{ "fr-legacy", KBD_CANADIAN_FRENCH }, /* French (legacy) */ { "fr-legacy", KBD_CANADIAN_FRENCH_LEGACY }, /* French (legacy) */
{ "multix", KBD_CANADIAN_MULTILINGUAL_STANDARD }, /* Multilingual */ { "multix", KBD_CANADIAN_MULTILINGUAL_STANDARD }, /* Multilingual */
{ "multi", KBD_CANADIAN_MULTILINGUAL_STANDARD }, /* Multilingual, first part */ { "multi", KBD_CANADIAN_MULTILINGUAL_STANDARD }, /* Multilingual, first part */
{ "multi-2gr", KBD_CANADIAN_MULTILINGUAL_STANDARD }, /* Multilingual, second part */ { "multi-2gr", KBD_CANADIAN_MULTILINGUAL_STANDARD }, /* Multilingual, second part */
{ "ike", KBD_INUKTITUT_LATIN }, /* Inuktitut */ { "ike", KBD_INUKTITUT_LATIN }, /* Inuktitut */
{ "shs", 0 }, /* Secwepemctsin */ { "shs", 0 }, /* Secwepemctsin */
{ "kut", 0 }, /* Ktunaxa */ { "kut", 0 }, /* Ktunaxa */
{ "eng", KBD_US }, /* English */ { "eng", KBD_CANADIAN_ENGLISH }, /* English */
{ "", 0 }, { "", 0 },
}; };