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

X11rdp: switch back to 'base' rules for xkb

Browse Source
This commit is contained in:
Jay Sorg 2014-11-28 14:11:38 -08:00
parent 2010567ecc
commit 290aee8cd9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -68,7 +68,7 @@ static int g_x = 0;
static int g_y = 0; static int g_y = 0;
static int g_timer_schedualed = 0; static int g_timer_schedualed = 0;
static int g_delay_motion = 1; /* turn on or off */ static int g_delay_motion = 1; /* turn on or off */
static int g_use_evdev = 1; static int g_use_evdev = 0;
/* Copied from Xvnc/lib/font/util/utilbitmap.c */ /* Copied from Xvnc/lib/font/util/utilbitmap.c */
static unsigned char g_reverse_byte[0x100] = static unsigned char g_reverse_byte[0x100] =
@ -309,7 +309,7 @@ rdpLoadLayout(struct xrdp_client_info *client_info)
set.model = "pc105"; set.model = "pc105";
set.layout = "us"; set.layout = "us";
set.variant = ""; set.variant = "";
set.options = "terminate:ctrl_alt_bksp,grp:shift_caps_toggle"; set.options = "";
if (strlen(client_info->model) > 0) if (strlen(client_info->model) > 0)
{ {
@ -398,7 +398,7 @@ rdpKeybdProc(DeviceIntPtr pDevice, int onoff)
set.model = "pc105"; set.model = "pc105";
set.layout = "us"; set.layout = "us";
set.variant = ""; set.variant = "";
set.options = "terminate:ctrl_alt_bksp,grp:shift_caps_toggle"; set.options = "";
ok = InitKeyboardDeviceStruct(pDevice, &set, rdpBell, ok = InitKeyboardDeviceStruct(pDevice, &set, rdpBell,
rdpChangeKeyboardControl); rdpChangeKeyboardControl);
LLOGLN(10, ("rdpKeybdProc: InitKeyboardDeviceStruct %d", ok)); LLOGLN(10, ("rdpKeybdProc: InitKeyboardDeviceStruct %d", ok));