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

override keyboard infomation #1950

Browse Source
This commit is contained in:
TOMATO-ONE 2021-07-23 13:31:04 +00:00
parent 7e95576849
commit badc612a8a
4 changed files with 57 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
common/xrdp_client_info.h
View File

@ -33,6 +33,14 @@ struct monitor_info
int is_primary;
};
/* xrdp keyboard overrids */
struct xrdp_keyboard_overrides
{
int type;
int subtype;
int layout;
};
/**
* Information about the xrdp client
*
@ -172,9 +180,12 @@ struct xrdp_client_info
int enable_token_login;
char domain_user_separator[16];
/* xrdp.override_* values */
struct xrdp_keyboard_overrides xrdp_keyboard_overrides;
};
/* yyyymmdd of last incompatible change to xrdp_client_info */
#define CLIENT_INFO_CURRENT_VERSION 20210225
#define CLIENT_INFO_CURRENT_VERSION 20210723
#endif

12
libxrdp/xrdp_rdp.c
View File

@ -278,6 +278,18 @@ xrdp_rdp_read_config(const char *xrdp_ini, struct xrdp_client_info *client_info)
{
g_strncpy(client_info->domain_user_separator, value, sizeof(client_info->domain_user_separator) - 1);
}
else if (g_strcasecmp(item, "xrdp.override_keyboard_type") == 0)
{
client_info->xrdp_keyboard_overrides.type = g_atoix(value);
}
else if (g_strcasecmp(item, "xrdp.override_keyboard_subtype") == 0)
{
client_info->xrdp_keyboard_overrides.subtype = g_atoix(value);
}
else if (g_strcasecmp(item, "xrdp.override_keylayout") == 0)
{
client_info->xrdp_keyboard_overrides.layout = g_atoix(value);
}
}
list_delete(items);

29
libxrdp/xrdp_sec.c
View File

@ -374,9 +374,34 @@ xrdp_load_keyboard_layout(struct xrdp_client_info *client_info)
char keyboard_cfg_file[256] = { 0 };
char rdp_layout[256] = { 0 };
LOG(LOG_LEVEL_INFO, "xrdp_load_keyboard_layout: keyboard_type [%d] keyboard_subtype [%d]",
client_info->keyboard_type, client_info->keyboard_subtype);
const struct xrdp_keyboard_overrides *ko =
&client_info->xrdp_keyboard_overrides;
LOG(LOG_LEVEL_INFO, "xrdp_load_keyboard_layout: Keyboard information sent"
" by the RDP client, keyboard_type:[0x%02X], keyboard_subtype:[0x%02X],"
" keylayout:[0x%08X]",
client_info->keyboard_type, client_info->keyboard_subtype,
client_info->keylayout);
if (ko->type != 0)
{
LOG(LOG_LEVEL_INFO, "overrode keyboard_type 0x%02X"
" with 0x%02X", client_info->keyboard_type, ko->type);
client_info->keyboard_type = ko->type;
}
if (ko->subtype != 0)
{
LOG(LOG_LEVEL_INFO, "overrode keyboard_subtype 0x%02X"
" with 0x%02X", client_info->keyboard_subtype,
ko->subtype);
client_info->keyboard_subtype = ko->subtype;
}
if (ko->layout != 0)
{
LOG(LOG_LEVEL_INFO, "overrode keylayout 0x%08X"
" with 0x%08X", client_info->keylayout, ko->layout);
client_info->keylayout = ko->layout;
}
/* infer model/variant */
/* TODO specify different X11 keyboard models/variants */
g_memset(client_info->model, 0, sizeof(client_info->model));

6
xrdp/xrdp.ini.in
View File

@ -63,6 +63,12 @@ ssl_protocols=TLSv1.2, TLSv1.3
; for example when the server is multi homed with SSSd
#domain_user_separator=@
; The following options will override the keyboard layout settings.
; These options are for DEBUG and are not recommended for regular use.
#xrdp.override_keyboard_type=0x04
#xrdp.override_keyboard_subtype=0x01
#xrdp.override_keylayout=0x00000409
; Section name to use for automatic login if the client sends username
; and password. If empty, the domain name sent by the client is used.
; If empty and no domain name is given, the first suitable section in