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

Merge pull request #417 from metalefty/apply-keyboard-options

Browse Source 
Apply xkb options for x11rdp
This commit is contained in:
metalefty 2016-09-09 16:04:43 +09:00 committed by GitHub
commit ba78399122
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libxrdp/xrdp_sec.c
View File

@ -236,7 +236,9 @@ xrdp_load_keyboard_layout(struct xrdp_client_info *client_info)
char keyboard_cfg_file[256] = { 0 };
char rdp_layout[256] = { 0 };
LLOGLN(0, ("xrdp_load_keyboard_layout:"));
LLOGLN(0, ("xrdp_load_keyboard_layout: keyboard_type [%d] keyboard_subtype [%d]",
client_info->keyboard_type, client_info->keyboard_subtype));
/* infer model/variant */
/* TODO specify different X11 keyboard models/variants */
g_memset(client_info->model, 0, sizeof(client_info->model));
@ -422,8 +424,8 @@ xrdp_load_keyboard_layout(struct xrdp_client_info *client_info)
list_delete(values);
LLOGLN(0, ("xrdp_load_keyboard_layout: model [%s] variant [%s] "
"layout [%s]", client_info->model, client_info->variant,
client_info->layout));
"layout [%s] options [%s]", client_info->model,
client_info->variant, client_info->layout, client_info->options));
g_file_close(fd);
}
else

4
xorg/X11R7.6/rdp/rdpinput.c
View File

@ -325,6 +325,10 @@ rdpLoadLayout(struct xrdp_client_info *client_info)
{
set.layout = client_info->layout;
}
if (strlen(client_info->options) > 0)
{
set.options = client_info->options;
}
retry:
/* free some stuff so we can call InitKeyboardDeviceStruct again */