system/weston
system/weston
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wayland/weston synced 2024-10-15 13:11:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

rdp: Don't bother trying to pick an optimal keyboard model name

Browse source 
Nothing actually cares about this string, and pc105 will do just
fine.

Signed-off-by: Derek Foreman <derek.foreman@collabora.com>
This commit is contained in:
Derek Foreman 2022-04-26 09:17:25 -05:00
parent 806e824809
commit 2eb5912960
1 changed files with 1 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
libweston/backend-rdp/rdp.c
View file

@ -812,18 +812,6 @@ struct rdp_to_xkb_keyboard_layout rdp_keyboards[] = {
{0x00000000, 0, 0},
};
/* taken from 2.2.7.1.6 Input Capability Set (TS_INPUT_CAPABILITYSET) */
static const char *rdp_keyboard_types[] = {
"", /* 0: unused */
"", /* 1: IBM PC/XT or compatible (83-key) keyboard */
"", /* 2: Olivetti "ICO" (102-key) keyboard */
"", /* 3: IBM PC/AT (84-key) or similar keyboard */
"pc102",/* 4: IBM enhanced (101- or 102-key) keyboard */
"", /* 5: Nokia 1050 and similar keyboards */
"", /* 6: Nokia 9140 and similar keyboards */
"" /* 7: Japanese keyboard */
};
static BOOL
xf_peer_activate(freerdp_peer* client)
{
@ -902,8 +890,7 @@ xf_peer_activate(freerdp_peer* client)
settings->KeyboardFunctionKey);
memset(&xkbRuleNames, 0, sizeof(xkbRuleNames));
if (settings->KeyboardType <= 7)
xkbRuleNames.model = rdp_keyboard_types[settings->KeyboardType];
xkbRuleNames.model = "pc105";
for (i = 0; rdp_keyboards[i].rdpLayoutCode; i++) {
if (rdp_keyboards[i].rdpLayoutCode == settings->KeyboardLayout) {
xkbRuleNames.layout = rdp_keyboards[i].xkbLayout;