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

Merge pull request #2587 from metalefty/keymap_load

Browse Source 
[refactoring] xrdp: enable loading any keymap files
This commit is contained in:
metalefty 2023-03-28 14:49:51 +09:00 committed by GitHub
commit 7bf95fc1d2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 46 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
xrdp/lang.c
View File

@ -231,7 +231,6 @@ km_read_section(int fd, const char *section_name, struct xrdp_key_info *keymap)
int int
get_keymaps(int keylayout, struct xrdp_keymap *keymap) get_keymaps(int keylayout, struct xrdp_keymap *keymap)
{ {
int fd;
int basic_key_layout = keylayout & 0x0000ffff; int basic_key_layout = keylayout & 0x0000ffff;
char *filename; char *filename;
struct xrdp_keymap *lkeymap; struct xrdp_keymap *lkeymap;
@ -258,36 +257,21 @@ get_keymaps(int keylayout, struct xrdp_keymap *keymap)
if (g_file_exist(filename)) if (g_file_exist(filename))
{ {
fd = g_file_open(filename);
LOG(LOG_LEVEL_INFO, "Loading keymap file %s", filename);
if (fd != -1) lkeymap = (struct xrdp_keymap *)g_malloc(sizeof(struct xrdp_keymap), 0);
/* make a copy of the built-in keymap */
g_memcpy(lkeymap, keymap, sizeof(struct xrdp_keymap));
km_load_file(filename, keymap);
if (g_memcmp(lkeymap, keymap, sizeof(struct xrdp_keymap)) != 0)
{ {
lkeymap = (struct xrdp_keymap *)g_malloc(sizeof(struct xrdp_keymap), 0); LOG(LOG_LEVEL_WARNING,
/* make a copy of the built-in keymap */ "local keymap file for 0x%08x found and doesn't match "
g_memcpy(lkeymap, keymap, sizeof(struct xrdp_keymap)); "built in keymap, using local keymap file", keylayout);
/* clear the keymaps */
g_memset(keymap, 0, sizeof(struct xrdp_keymap));
/* read the keymaps */
km_read_section(fd, "noshift", keymap->keys_noshift);
km_read_section(fd, "shift", keymap->keys_shift);
km_read_section(fd, "altgr", keymap->keys_altgr);
km_read_section(fd, "shiftaltgr", keymap->keys_shiftaltgr);
km_read_section(fd, "capslock", keymap->keys_capslock);
km_read_section(fd, "capslockaltgr", keymap->keys_capslockaltgr);
km_read_section(fd, "shiftcapslock", keymap->keys_shiftcapslock);
km_read_section(fd, "shiftcapslockaltgr", keymap->keys_shiftcapslockaltgr);
if (g_memcmp(lkeymap, keymap, sizeof(struct xrdp_keymap)) != 0)
{
LOG(LOG_LEVEL_WARNING,
"local keymap file for 0x%08x found and doesn't match "
"built in keymap, using local keymap file", keylayout);
}
g_free(lkeymap);
g_file_close(fd);
} }
g_free(lkeymap);
} }
else else
{ {
@ -297,3 +281,34 @@ get_keymaps(int keylayout, struct xrdp_keymap *keymap)
g_free(filename); g_free(filename);
return 0; return 0;
} }
/*****************************************************************************/
int km_load_file(const char *filename, struct xrdp_keymap *keymap)
{
int fd;
LOG(LOG_LEVEL_INFO, "Loading keymap file %s", filename);
fd = g_file_open(filename);
if (fd != -1)
{
/* read the keymaps */
km_read_section(fd, "noshift", keymap->keys_noshift);
km_read_section(fd, "shift", keymap->keys_shift);
km_read_section(fd, "altgr", keymap->keys_altgr);
km_read_section(fd, "shiftaltgr", keymap->keys_shiftaltgr);
km_read_section(fd, "capslock", keymap->keys_capslock);
km_read_section(fd, "capslockaltgr", keymap->keys_capslockaltgr);
km_read_section(fd, "shiftcapslock", keymap->keys_shiftcapslock);
km_read_section(fd, "shiftcapslockaltgr", keymap->keys_shiftcapslockaltgr);
g_file_close(fd);
}
else
{
LOG(LOG_LEVEL_ERROR, "Error loading keymap file %s (%s)", filename, g_get_strerror());
return 1;
}
return 0;
}

3
xrdp/xrdp.h
View File

@ -411,6 +411,9 @@ get_char_from_scan_code(int device_flags, int scan_code, int *keys,
int int
get_keymaps(int keylayout, struct xrdp_keymap *keymap); get_keymaps(int keylayout, struct xrdp_keymap *keymap);
int
km_load_file(const char *filename, struct xrdp_keymap *keymap);
/* xrdp_login_wnd.c */ /* xrdp_login_wnd.c */
/** /**
* Gets the DPI of the login (primary) monitor * Gets the DPI of the login (primary) monitor