jh163888/xrdp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #418 from metalefty/keymap-fallback-lower-16bit

Browse Source 
Use km-0000yyyy.ini if km-xxxxyyyy.ini doen't exist
This commit is contained in:
metalefty 2016-11-08 15:12:51 +09:00 committed by GitHub
commit d7fd153951
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
xrdp/lang.c
View File

@ -226,22 +226,34 @@ int APP_CC
get_keymaps(int keylayout, struct xrdp_keymap *keymap) get_keymaps(int keylayout, struct xrdp_keymap *keymap)
{ {
int fd; int fd;
int basic_key_layout = keylayout & 0x0000ffff;
char *filename; char *filename;
struct xrdp_keymap *lkeymap; struct xrdp_keymap *lkeymap;
filename = (char *)g_malloc(256, 0); filename = (char *)g_malloc(256, 0);
/* check if there is a keymap file */
/* check if there is a keymap file e.g. km-e00100411.ini */
g_snprintf(filename, 255, "%s/km-%08x.ini", XRDP_CFG_PATH, keylayout); g_snprintf(filename, 255, "%s/km-%08x.ini", XRDP_CFG_PATH, keylayout);
/* if the file does not exist, try again with 'en-us' as fallback */ /* if the file does not exist, use only lower 16 bits instead */
if (!g_file_exist(filename)) if (!g_file_exist(filename))
{ {
log_message(LOG_LEVEL_INFO, "Cannot find keymap file %s", filename);
/* e.g. km-00000411.ini */
g_snprintf(filename, 255, "%s/km-%08x.ini", XRDP_CFG_PATH, basic_key_layout);
}
/* finally, use 'en-us' */
if (!g_file_exist(filename))
{
log_message(LOG_LEVEL_INFO, "Cannot find keymap file %s", filename);
g_snprintf(filename, 255, "%s/km-00000409.ini", XRDP_CFG_PATH); g_snprintf(filename, 255, "%s/km-00000409.ini", XRDP_CFG_PATH);
} }
if (g_file_exist(filename)) if (g_file_exist(filename))
{ {
fd = g_file_open(filename); fd = g_file_open(filename);
log_message(LOG_LEVEL_INFO, "Loading keymap file %s", filename);
if (fd != -1) if (fd != -1)
{ {