Makefile.am | 3 ++- configure.ac | 19 +++++-------------- src/vmmouse.c | 24 +++++++----------------- tools/Makefile.am | 1 - 4 files changed, 14 insertions(+), 33 deletions(-)
New commits: commit a2e4aa9d2002dad6e976d9e4d3f129ad3127be81 Author: Zack Rusin <[email protected]> Date: Tue Jan 15 12:03:28 2013 -0800 vmmouse release 13.0.0 Signed-off-by: Zack Rusin <[email protected]> diff --git a/configure.ac b/configure.ac index eb8ece1..1ffc219 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-input-vmmouse], - [12.9.99.901], + [13.0.0], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-input-vmmouse) commit 1b40f1e1f61b5f44836ba5cd5d487cf57f6608ac Author: Zack Rusin <[email protected]> Date: Thu Dec 6 16:37:19 2012 -0500 vmmouse 12.9.99.901 Internal release for QE testing Signed-off-by: Zack Rusin <[email protected]> diff --git a/configure.ac b/configure.ac index 2e1e021..eb8ece1 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-input-vmmouse], - [12.9.0], + [12.9.99.901], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-input-vmmouse) commit cabf4cb7c0ba3e535068ebb1d80108a26dddddaa Author: Peter Hutterer <[email protected]> Date: Tue Aug 21 14:03:55 2012 +1000 Fix compiler warnings about unused variables vmmouse.c: In function 'MouseCommonOptions': vmmouse.c:732:16: warning: variable 'from' set but not used [-Wunused-but-set-variable] vmmouse.c: In function 'MouseCommonOptions': vmmouse.c:733:8: warning: variable 'origButtons' set but not used [-Wunused-but-set-variable] vmmouse.c: In function 'VMMouseDeviceControl': vmmouse.c:838:19: warning: variable 'mPriv' set but not used [-Wunused-but-set-variable] Signed-off-by: Peter Hutterer <[email protected]> Reviewed-by: Thomas Hellstrom <[email protected]> diff --git a/src/vmmouse.c b/src/vmmouse.c index d841771..bb450ff 100644 --- a/src/vmmouse.c +++ b/src/vmmouse.c @@ -729,19 +729,14 @@ static void MouseCommonOptions(InputInfoPtr pInfo) { MouseDevPtr pMse; - MessageType from = X_DEFAULT; char *s; - int origButtons; pMse = pInfo->private; pMse->buttons = xf86SetIntOption(pInfo->options, "Buttons", 0); - from = X_CONFIG; if (!pMse->buttons) { pMse->buttons = MSE_DFLTBUTTONS; - from = X_DEFAULT; } - origButtons = pMse->buttons; /* * "emulate3Buttons" and "Drag Lock" is not supported @@ -790,13 +785,6 @@ MouseCommonOptions(InputInfoPtr pInfo) pInfo->name, s); } } - - /* - * Emulatewheel is not supported - */ - if (origButtons != pMse->buttons) - from = X_CONFIG; - } @@ -847,7 +835,6 @@ VMMouseDeviceControl(DeviceIntPtr device, int mode) { InputInfoPtr pInfo; MouseDevPtr pMse; - VMMousePrivPtr mPriv; unsigned char map[MSE_MAXBUTTONS + 1]; int i; #if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7 @@ -858,7 +845,6 @@ VMMouseDeviceControl(DeviceIntPtr device, int mode) pInfo = device->public.devicePrivate; pMse = pInfo->private; pMse->device = device; - mPriv = (VMMousePrivPtr)pMse->mousePriv; switch (mode){ case DEVICE_INIT: commit 393880d2e6fe7f744e6c701a4fde6116a7278325 Author: Peter Hutterer <[email protected]> Date: Tue Aug 21 14:03:54 2012 +1000 Use sigsafe logging in ReadInput path Signed-off-by: Peter Hutterer <[email protected]> Reviewed-by: Thomas Hellstrom <[email protected]> diff --git a/src/vmmouse.c b/src/vmmouse.c index 590144f..d841771 100644 --- a/src/vmmouse.c +++ b/src/vmmouse.c @@ -73,6 +73,10 @@ #include "exevents.h" #endif +#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 18 +#define LogMessageVerbSigSafe xf86MsgVerb +#endif + #include "xisb.h" #include "mipointer.h" @@ -1063,7 +1067,7 @@ VMMouseReadInput(InputInfoPtr pInfo) */ VMMouseClient_RequestAbsolute(); mPriv->absoluteRequested = TRUE; - xf86Msg(X_INFO, "VMWARE(0): vmmouse enable absolute mode\n"); + LogMessageVerbSigSafe(X_INFO, -1, "VMWARE(0): vmmouse enable absolute mode\n"); } /* @@ -1130,7 +1134,7 @@ GetVMMouseMotionEvent(InputInfoPtr pInfo){ VMMouseClient_Disable(); VMMouseClient_Enable(); VMMouseClient_RequestAbsolute(); - xf86Msg(X_INFO, "VMWARE(0): re-requesting absolute mode after reset\n"); + LogMessageVerbSigSafe(X_INFO, -1, "VMWARE(0): re-requesting absolute mode after reset\n"); break; } commit dba73cebb527bb36a3d17d67b1e8e1892852b240 Author: Peter Hutterer <[email protected]> Date: Sun Aug 5 08:12:15 2012 +1000 Fetch the udev dir from udev.pc instead of guessing based on prefix Reviewed-by: Gaetan Nadon<[email protected]> Reviewed-by: Jakob Bornecrantz <[email protected]> Signed-off-by: Peter Hutterer <[email protected]> Signed-off-by: Jakob Bornecrantz <[email protected]> diff --git a/Makefile.am b/Makefile.am index f1ad5af..ce2d86c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,7 +19,8 @@ # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. # Ensure xorg.conf.d snippets are installed below $(prefix) for distcheck -DISTCHECK_CONFIGURE_FLAGS = --with-xorg-conf-dir='$${datadir}/X11/xorg.conf.d' +DISTCHECK_CONFIGURE_FLAGS = --with-xorg-conf-dir='$${datadir}/X11/xorg.conf.d' \ + --with-udev-rules-dir='$${libdir}/udev/rules.d' SUBDIRS = shared src tools fdi man MAINTAINERCLEANFILES = ChangeLog INSTALL diff --git a/configure.ac b/configure.ac index d2fb0b6..2e1e021 100644 --- a/configure.ac +++ b/configure.ac @@ -92,19 +92,10 @@ AC_ARG_WITH(hal-fdi-dir, HAL_FDI_DIR=${halfdidir} AC_SUBST(HAL_FDI_DIR) -case $host_os in - linux*) - if test "x$prefix" = "xNONE" -o "x$prefix" = "x/usr" -o "x$prefix" = "x/usr/local" ; then - slashlibdir=/lib - else - slashlibdir=$prefix/lib - fi - UDEV_RULES_DIR=$slashlibdir/udev/rules.d - ;; - *) - UDEV_RULES_DIR=no - ;; -esac + +PKG_CHECK_MODULES(UDEV, udev, + [UDEV_RULES_DIR="`$PKG_CONFIG --variable=udevdir udev`/rules.d"], + [UDEV_RULES_DIR=no]) AC_ARG_WITH(udev-rules-dir, AC_HELP_STRING([--with-udev-rules-dir=DIR], diff --git a/tools/Makefile.am b/tools/Makefile.am index 23493cd..ea7ba66 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -43,7 +43,6 @@ dist_conf_DATA = 50-vmmouse.conf endif if HAS_UDEV_RULES_DIR - udevdir=$(UDEV_RULES_DIR) udev_DATA = 69-xorg-vmmouse.rules commit 3c8ccf5eec3177ed8976ed5ff04795a20287d2d8 Author: Stephen Brooks <[email protected]> Date: Wed May 18 22:48:34 2011 +0100 Reset ps2buttons to avoid button messages from being discarded. Reviewed-by: Peter Hutterer <[email protected]> Reviewed-by: Jakob Bornecrantz <[email protected]> Signed-off-by: Jakob Bornecrantz <[email protected]> Signed-off-by: Stephen Brooks <[email protected]> diff --git a/src/vmmouse.c b/src/vmmouse.c index 7778923..590144f 100644 --- a/src/vmmouse.c +++ b/src/vmmouse.c @@ -1120,12 +1120,12 @@ GetVMMouseMotionEvent(InputInfoPtr pInfo){ VMMousePrivPtr mPriv; int buttons, dx, dy, dz, dw; VMMOUSE_INPUT_DATA vmmouseInput; - int ps2Buttons = 0; int numPackets; pMse = pInfo->private; mPriv = (VMMousePrivPtr)pMse->mousePriv; while((numPackets = VMMouseClient_GetInput(&vmmouseInput))){ + int ps2Buttons = 0; if (numPackets == VMMOUSE_ERROR) { VMMouseClient_Disable(); VMMouseClient_Enable(); -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
