From 00b01f1b4e1e5be1ccaaa34ff7b6c6325cc66309 Mon Sep 17 00:00:00 2001 From: Justin DeFields Date: Tue, 8 Jul 2014 16:51:50 -0400 Subject: [PATCH] I am making several changes to cleanup French Canadian, with the end result being: ca,fr -> Canadian French ca,fr-legacy -> Canadian English ca,eng -> Canadian English. Currently ca,fr isn't defined, ca,fr-legacy thinks it's Canadian French and it isn't anyway because the value is wrong for that definition, and ca,eng is US. --- include/freerdp/locale/keyboard.h | 5 +++-- libfreerdp/locale/keyboard_layout.c | 1 + libfreerdp/locale/xkb_layout_ids.c | 5 +++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/include/freerdp/locale/keyboard.h b/include/freerdp/locale/keyboard.h index 147067d8e..e188092cd 100644 --- a/include/freerdp/locale/keyboard.h +++ b/include/freerdp/locale/keyboard.h @@ -116,9 +116,10 @@ typedef struct _RDP_KEYBOARD_LAYOUT RDP_KEYBOARD_LAYOUT; #define KBD_SWEDISH_WITH_SAMI 0x0000083B #define KBD_UZBEK_CYRILLIC 0x00000843 #define KBD_INUKTITUT_LATIN 0x0000085D -#define KBD_CANADIAN_FRENCH_LEGACY 0x00000C0C +#define KBD_CANADIAN_ENGLISH 0x00001009 +#define KBD_CANADIAN_FRENCH_LEGACY 0x00001009 #define KBD_SERBIAN_CYRILLIC 0x00000C1A -#define KBD_CANADIAN_FRENCH 0x00001009 +#define KBD_CANADIAN_FRENCH 0x000000C0C #define KBD_SWISS_FRENCH 0x0000100C #define KBD_BOSNIAN 0x0000141A #define KBD_IRISH 0x00001809 diff --git a/libfreerdp/locale/keyboard_layout.c b/libfreerdp/locale/keyboard_layout.c index 3869358cc..df902bef6 100644 --- a/libfreerdp/locale/keyboard_layout.c +++ b/libfreerdp/locale/keyboard_layout.c @@ -120,6 +120,7 @@ static const RDP_KEYBOARD_LAYOUT RDP_KEYBOARD_LAYOUT_TABLE[] = { KBD_CANADIAN_FRENCH_LEGACY, "Canadian French (legacy)" }, { KBD_SERBIAN_CYRILLIC, "Serbian (Cyrillic)" }, { KBD_CANADIAN_FRENCH, "Canadian French" }, + { KBD_CANADIAN_ENGLISH, "Canadian English" }, { KBD_SWISS_FRENCH, "Swiss French" }, { KBD_BOSNIAN, "Bosnian" }, { KBD_IRISH, "Irish" }, diff --git a/libfreerdp/locale/xkb_layout_ids.c b/libfreerdp/locale/xkb_layout_ids.c index 75ae0419b..fc67b2707 100644 --- a/libfreerdp/locale/xkb_layout_ids.c +++ b/libfreerdp/locale/xkb_layout_ids.c @@ -208,15 +208,16 @@ static const XKB_VARIANT ma_variants[] = /* Canada */ static const XKB_VARIANT ca_variants[] = { + { "fr", KBD_CANADIAN_FRENCH }, /* 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 */ { "multi", KBD_CANADIAN_MULTILINGUAL_STANDARD }, /* Multilingual, first part */ { "multi-2gr", KBD_CANADIAN_MULTILINGUAL_STANDARD }, /* Multilingual, second part */ { "ike", KBD_INUKTITUT_LATIN }, /* Inuktitut */ { "shs", 0 }, /* Secwepemctsin */ { "kut", 0 }, /* Ktunaxa */ - { "eng", KBD_US }, /* English */ + { "eng", KBD_CANADIAN_ENGLISH }, /* English */ { "", 0 }, };