diff options
| author | Shelley Gong <shelleygong@vmware.com> | 2009-07-29 11:12:24 -0700 |
|---|---|---|
| committer | Philip Langdale <philipl@fido2.homeip.net> | 2009-07-29 11:12:24 -0700 |
| commit | 436582791de540ef85b0b66000f2446d6f8f9802 (patch) | |
| tree | 1f82f30886dbc8902aa94a4a9cda4fbb768fa440 | |
| parent | 370aab66b97a6fdc18f87d584a252f33f575899e (diff) | |
Turn off built-in fallback-to-mouse-driver mechanism. With input
hotplug, HAL handles deciding which driver to use and the presence
of mouse_drv can't be assumed anymore on modern distros.
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | src/vmmouse.c | 13 |
2 files changed, 15 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index ab39f6c..a7ecda9 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-input-vmmouse], - 12.6.4, + 12.6.5, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-input-vmmouse) @@ -115,6 +115,9 @@ PKG_CHECK_EXISTS([xorg-server >= 1.3.99.0 xorg-server <= 1.4.0.90], PKG_CHECK_EXISTS([xorg-server > 1.4.0.90], [AC_DEFINE([ABS_VALUATOR_AXES], 1, [Define absolute valuator axes])]) +PKG_CHECK_EXISTS([xorg-server >= 1.6.0], + [AC_DEFINE([NO_MOUSE_MODULE], 1, + [Do not include built-in mouse module fallback])]) CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src' AC_SUBST([CFLAGS]) diff --git a/src/vmmouse.c b/src/vmmouse.c index 2fc0c4c..6a4f9f9 100644 --- a/src/vmmouse.c +++ b/src/vmmouse.c @@ -95,7 +95,7 @@ */ #define VMMOUSE_MAJOR_VERSION 12 #define VMMOUSE_MINOR_VERSION 6 -#define VMMOUSE_PATCHLEVEL 4 +#define VMMOUSE_PATCHLEVEL 5 #define VMMOUSE_DRIVER_VERSION \ (VMMOUSE_MAJOR_VERSION * 65536 + VMMOUSE_MINOR_VERSION * 256 + VMMOUSE_PATCHLEVEL) #define VMMOUSE_DRIVER_VERSION_STRING \ @@ -232,6 +232,9 @@ VMMousePreInit(InputDriverPtr drv, IDevPtr dev, int flags) InputInfoPtr pInfo; MouseDevPtr pMse; VMMousePrivPtr mPriv; + +#ifndef NO_MOUSE_MODULE +{ OSMouseInfoPtr osInfo = NULL; /* @@ -240,6 +243,8 @@ VMMousePreInit(InputDriverPtr drv, IDevPtr dev, int flags) osInfo = xf86OSMouseInit(0); if (!osInfo) return FALSE; +} +#endif mPriv = xcalloc (1, sizeof (VMMousePrivRec)); @@ -1121,7 +1126,6 @@ VMMousePlug(pointer module, int *errmin) { static Bool Initialised = FALSE; - char *name; xf86LoaderReqSymLists(reqSymbols, NULL); @@ -1131,6 +1135,9 @@ VMMousePlug(pointer module, xf86Msg(X_INFO, "VMWARE(0): VMMOUSE module was loaded\n"); xf86AddInputDriver(&VMMOUSE, module, 0); +#ifndef NO_MOUSE_MODULE +{ + char *name; /* * Load the normal mouse module as submodule * If we fail in PreInit later, this allows us to fall back to normal mouse module @@ -1146,6 +1153,8 @@ VMMousePlug(pointer module, LoaderErrorMsg(NULL, name, *errmaj, *errmin); } xfree(name); +} +#endif return module; } |