summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormetalefty <meta@vmeta.jp>2016-08-30 09:28:25 +0900
committerGitHub <noreply@github.com>2016-08-30 09:28:25 +0900
commitb934e55fc84122b5fede9bb8fd91f631f5948895 (patch)
tree23b184d2bfbf03a1d984172e48900c523eb794c7
parent8f747e37ca75852d11cbdf34b74825c397e6fdba (diff)
parent59be4134c3e429ab388f26b4edd50ebea080b4e3 (diff)
downloadxrdp-proprietary-b934e55fc84122b5fede9bb8fd91f631f5948895.tar.gz
xrdp-proprietary-b934e55fc84122b5fede9bb8fd91f631f5948895.zip
Merge pull request #364 from laigor/devel
Allows use the xkb options that for example allows you to specify a key combination to change the layouts.
-rw-r--r--libxrdp/xrdp_sec.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/libxrdp/xrdp_sec.c b/libxrdp/xrdp_sec.c
index d2101b60..40315a50 100644
--- a/libxrdp/xrdp_sec.c
+++ b/libxrdp/xrdp_sec.c
@@ -338,6 +338,15 @@ xrdp_load_keyboard_layout(struct xrdp_client_info *client_info)
g_strncpy(client_info->variant, value, bytes - 1);
}
}
+ else if (g_strcasecmp(item, "options") == 0)
+ {
+ if (section_found != -1 && section_found == index)
+ {
+ bytes = sizeof(client_info->options);
+ g_memset(client_info->options, 0, bytes);
+ g_strncpy(client_info->options, value, bytes - 1);
+ }
+ }
else
{
/*