xserver-xorg-input-vmmouse: Changes to 'debian-unstable'
configure.ac | 3 +++
debian/changelog | 7 +++++++
src/vmmouse.c | 8 ++++++++
3 files changed, 18 insertions(+)
New commits:
commit baca09c9e93fb160e9fb5e1a2283800520047747
Author: Julien Cristau <jcristau@debian.org>
Date: Sat Oct 18 11:24:34 2008 +0200
Update debian changelog
diff --git a/debian/changelog b/debian/changelog
index 35971ec..614767b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-input-vmmouse (1:12.5.1-3) unstable; urgency=low
+
+ * Cherry-pick from upstream: Properly set axis range and resolution for
+ Server 1.5+ (closes: #490912).
+
+ -- Julien Cristau <jcristau@debian.org> Sat, 18 Oct 2008 10:55:07 +0200
+
xserver-xorg-input-vmmouse (1:12.5.1-2) unstable; urgency=low
* Rebuild against xserver-xorg-dev 1.4.2 so that conversion_proc
commit ae8a59877df2ede4525c66b8e1eecd7386715bc8
Author: Philip Langdale <philipl@fido2.homeip.net>
Date: Fri Oct 17 19:41:07 2008 -0700
Properly set axis range and resolution for Server 1.5+
(cherry picked from commit 64760dae6b1184405641b6b46a7967d114f4ab80)
diff --git a/configure.ac b/configure.ac
index a57851f..639ba74 100644
--- a/configure.ac
+++ b/configure.ac
@@ -86,6 +86,9 @@ PKG_CHECK_EXISTS([xorg-server >= 1.3.99.0 xorg-server <= 1.4.0.90],
[AC_DEFINE([CALL_CONVERSION_PROC], 1,
[Call conversion_proc from within the driver, as
Xserver doesn't])])
+PKG_CHECK_EXISTS([xorg-server > 1.4.0.90],
+ [AC_DEFINE([ABS_VALUATOR_AXES], 1,
+ [Define absolute valuator axes])])
CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src'
AC_SUBST([CFLAGS])
diff --git a/src/vmmouse.c b/src/vmmouse.c
index 1e2a1c9..65db793 100644
--- a/src/vmmouse.c
+++ b/src/vmmouse.c
@@ -807,10 +807,18 @@ VMMouseDeviceControl(DeviceIntPtr device, int mode)
);
/* X valuator */
+#ifdef ABS_VALUATOR_AXES
+ xf86InitValuatorAxisStruct(device, 0, 0, 65535, 10000, 0, 10000);
+#else
xf86InitValuatorAxisStruct(device, 0, 0, -1, 1, 0, 1);
+#endif
xf86InitValuatorDefaults(device, 0);
/* Y valuator */
+#ifdef ABS_VALUATOR_AXES
+ xf86InitValuatorAxisStruct(device, 1, 0, 65535, 10000, 0, 10000);
+#else
xf86InitValuatorAxisStruct(device, 1, 0, -1, 1, 0, 1);
+#endif
xf86InitValuatorDefaults(device, 1);
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
xf86MotionHistoryAllocate(pInfo);
Reply to: