summaryrefslogtreecommitdiffstats
path: root/xorg/X11R7.6
diff options
context:
space:
mode:
authorJay Sorg <jay.sorg@gmail.com>2014-11-28 14:11:38 -0800
committerJay Sorg <jay.sorg@gmail.com>2014-11-28 14:11:38 -0800
commit290aee8cd9859cd0bc3c085b99ca2e02a02f5ffe (patch)
tree57b8e312b2c26d57cf49e1029946a120061ff58f /xorg/X11R7.6
parent2010567ecc5720b9be03f2f206c597682c9ad508 (diff)
downloadxrdp-proprietary-290aee8cd9859cd0bc3c085b99ca2e02a02f5ffe.tar.gz
xrdp-proprietary-290aee8cd9859cd0bc3c085b99ca2e02a02f5ffe.zip
X11rdp: switch back to 'base' rules for xkb
Diffstat (limited to 'xorg/X11R7.6')
-rw-r--r--xorg/X11R7.6/rdp/rdpinput.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/xorg/X11R7.6/rdp/rdpinput.c b/xorg/X11R7.6/rdp/rdpinput.c
index 8dc4c92b..a13c7b5b 100644
--- a/xorg/X11R7.6/rdp/rdpinput.c
+++ b/xorg/X11R7.6/rdp/rdpinput.c
@@ -68,7 +68,7 @@ static int g_x = 0;
static int g_y = 0;
static int g_timer_schedualed = 0;
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 */
static unsigned char g_reverse_byte[0x100] =
@@ -309,7 +309,7 @@ rdpLoadLayout(struct xrdp_client_info *client_info)
set.model = "pc105";
set.layout = "us";
set.variant = "";
- set.options = "terminate:ctrl_alt_bksp,grp:shift_caps_toggle";
+ set.options = "";
if (strlen(client_info->model) > 0)
{
@@ -398,7 +398,7 @@ rdpKeybdProc(DeviceIntPtr pDevice, int onoff)
set.model = "pc105";
set.layout = "us";
set.variant = "";
- set.options = "terminate:ctrl_alt_bksp,grp:shift_caps_toggle";
+ set.options = "";
ok = InitKeyboardDeviceStruct(pDevice, &set, rdpBell,
rdpChangeKeyboardControl);
LLOGLN(10, ("rdpKeybdProc: InitKeyboardDeviceStruct %d", ok));