[PATCH] If AEI is on, disable 'vmmouse' in addition to 'kbd' and 'mouse'.
Peter Hutterer
peter.hutterer at who-t.net
Sun Nov 30 15:45:53 PST 2008
On Fri, Nov 28, 2008 at 02:55:55PM +0200, Timo Aaltonen wrote:
> ---
> 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 a6290a7..b05b283 100644
> --- a/hw/xfree86/common/xf86Config.c
> +++ b/hw/xfree86/common/xf86Config.c
> @@ -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;
> }
>
> diff --git a/hw/xfree86/doc/man/xorg.conf.man.pre b/hw/xfree86/doc/man/xorg.conf.man.pre
> index 3baa7fb..e68c156 100644
> --- a/hw/xfree86/doc/man/xorg.conf.man.pre
> +++ b/hw/xfree86/doc/man/xorg.conf.man.pre
> @@ -696,7 +696,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.
> --
> 1.6.0.4
Signed-off-by: Peter Hutterer <peter.hutterer at redhat.com>
Cheers,
Peter
More information about the xorg
mailing list