fdo-mirrors/xserver
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/xorg/xserver.git synced 2026-01-01 23:30:09 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

If AEI is on, disable 'vmmouse' in addition to 'kbd' and 'mouse'.

Browse source 
Signed-off-by: Timo Aaltonen <tjaalton@cc.hut.fi>
Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
(cherry picked from commit dd128ddcdc)

Signed-off-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Timo Aaltonen 2008-12-03 18:40:29 +02:00 • committed by Keith Packard
parent 90900976ce
commit d6129ebf8d
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
hw/xfree86/common/xf86Config.c
View file

@ -2460,13 +2460,14 @@ checkInput(serverLayoutPtr layout, Bool implicit_layout) {
while(*dev)
{
if (strcmp((*dev)->driver, "kbd") == 0 ||
strcmp((*dev)->driver, "mouse") == 0)
strcmp((*dev)->driver, "mouse") == 0 ||
strcmp((*dev)->driver, "vmmouse") == 0)
{
IDevPtr *current;
if (!warned)
{
xf86Msg(X_WARNING, "AllowEmptyInput is on, devices using "
"drivers 'kbd' or 'mouse' will be disabled.\n");
"drivers 'kbd', 'mouse' or 'vmmouse' will be disabled.\n");
warned = TRUE;
}

2
hw/xfree86/doc/man/xorg.conf.man.pre
View file

@ -662,7 +662,7 @@ the X server to load. Disabled by default.
If enabled, don't add the standard keyboard and mouse drivers, if there are no
input devices in the config file. Enabled by default if AutoAddDevices and
AutoEnableDevices is enabled, otherwise disabled.
If AllowEmptyInput is on, devices using the kbd or mouse driver are ignored.
If AllowEmptyInput is on, devices using the kbd, mouse or vmmouse driver are ignored.
.TP 7
.BI "Option \*qAutoAddDevices\*q \*q" boolean \*q
If this option is disabled, then no devices will be added from HAL events.