diff options
| author | Corentin Chary <corentin.chary@gmail.com> | 2011-06-07 17:45:05 +0200 |
|---|---|---|
| committer | Kristian Høgsberg <krh@bitplanet.net> | 2012-03-27 09:31:56 -0400 |
| commit | fac41cbc132d7f70f216c74922fe57741f52ecda (patch) | |
| tree | 283565198b4891dd7b81140b6c9b6a2d5f31836f /hw/xfree86/common | |
| parent | aa0df6ddd490d9ef05832cc02502161fc198c8a0 (diff) | |
xwayland: don't force input devices when using xwayland
Signed-off-by: Corentin Chary <corentin.chary@gmail.com>
Diffstat (limited to 'hw/xfree86/common')
| -rw-r--r-- | hw/xfree86/common/xf86Config.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c index f090f60ee..7364a3481 100644 --- a/hw/xfree86/common/xf86Config.c +++ b/hw/xfree86/common/xf86Config.c @@ -922,9 +922,10 @@ configServerFlags(XF86ConfFlagsPtr flagsconf, XF86OptionPtr layoutopts) } #endif - /* if we're not hotplugging, force some input devices to exist */ - if (!xorgWayland) - xf86Info.forceInputDevices = !(xf86Info.autoAddDevices && xf86Info.autoEnableDevices); + if (xorgWayland) /* Don't force input devices */ + xf86Info.forceInputDevices = FALSE; + else /* if we're not hotplugging, force some input devices to exist */ + xf86Info.forceInputDevices = !(xf86Info.autoAddDevices && xf86Info.autoEnableDevices); /* when forcing input devices, we use kbd. otherwise evdev, so use the * evdev rules set. */ |