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

X11rdp: set options and default 105 keyboard

Browse Source
This commit is contained in:
Jay Sorg 2014-11-26 19:06:28 -08:00
parent bff2009147
commit 2010567ecc
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -306,10 +306,10 @@ rdpLoadLayout(struct xrdp_client_info *client_info)
set.rules = "base"; set.rules = "base";
} }
set.model = "pc104"; set.model = "pc105";
set.layout = "us"; set.layout = "us";
set.variant = ""; set.variant = "";
set.options = ""; set.options = "terminate:ctrl_alt_bksp,grp:shift_caps_toggle";
if (strlen(client_info->model) > 0) if (strlen(client_info->model) > 0)
{ {
@ -360,7 +360,8 @@ rdpLoadLayout(struct xrdp_client_info *client_info)
NULL, serverClient); NULL, serverClient);
} }
} }
} else }
else
{ {
/* sometimes, variant doesn't support all layouts */ /* sometimes, variant doesn't support all layouts */
set.variant = ""; set.variant = "";
@ -394,10 +395,10 @@ rdpKeybdProc(DeviceIntPtr pDevice, int onoff)
{ {
set.rules = "base"; set.rules = "base";
} }
set.model = "pc104"; set.model = "pc105";
set.layout = "us"; set.layout = "us";
set.variant = ""; set.variant = "";
set.options = ""; set.options = "terminate:ctrl_alt_bksp,grp:shift_caps_toggle";
ok = InitKeyboardDeviceStruct(pDevice, &set, rdpBell, ok = InitKeyboardDeviceStruct(pDevice, &set, rdpBell,
rdpChangeKeyboardControl); rdpChangeKeyboardControl);
LLOGLN(10, ("rdpKeybdProc: InitKeyboardDeviceStruct %d", ok)); LLOGLN(10, ("rdpKeybdProc: InitKeyboardDeviceStruct %d", ok));