From dd128ddcdcbe254a9cdd973590f6a979a7f0427e Mon Sep 17 00:00:00 2001 From: Timo Aaltonen Date: Wed, 3 Dec 2008 18:40:29 +0200 Subject: If AEI is on, disable 'vmmouse' in addition to 'kbd' and 'mouse'. Signed-off-by: Timo Aaltonen Signed-off-by: Peter Hutterer --- hw/xfree86/common/xf86Config.c | 5 +++-- hw/xfree86/doc/man/xorg.conf.man.pre | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c index 5a5a7f20f..a03d977c0 100644 --- a/hw/xfree86/common/xf86Config.c +++ b/hw/xfree86/common/xf86Config.c @@ -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; } diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre index d54896fb9..f5c49e111 100644 --- a/hw/xfree86/doc/man/xorg.conf.man.pre +++ b/hw/xfree86/doc/man/xorg.conf.man.pre @@ -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. -- cgit v1.2.3