If AEI is on, disable 'vmmouse' in addition to 'kbd' and 'mouse'.
Signed-off-by: Timo Aaltonen <tjaalton@cc.hut.fi> Signed-off-by: Peter Hutterer <peter.hutterer@redhat.com>
This commit is contained in:
parent
0b5ecabfb8
commit
dd128ddcdc
|
@ -2442,13 +2442,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;
|
||||
}
|
||||
|
||||
|
|
|
@ -642,7 +642,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.
|
||||
|
|
Loading…
Reference in New Issue
Block a user