xserver-xorg-input-vmmouse: Changes to 'upstream-experimental'
configure.ac | 2 +-
man/Makefile.am | 1 -
src/vmmouse.c | 19 ++++++++++++++++---
src/vmmouse_client.c | 6 ++++--
4 files changed, 21 insertions(+), 7 deletions(-)
New commits:
commit f9629096c1e0ac0e090642cf6a53674842aaf9a8
Author: Adam Jackson <ajax@redhat.com>
Date: Thu Mar 20 16:53:05 2008 -0400
vmmouse 12.5.0
diff --git a/configure.ac b/configure.ac
index a049195..4374b2b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-vmmouse],
- 12.4.3,
+ 12.5.0,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-vmmouse)
commit a88387f1276d598843ffa0cd3648f8bf34d10680
Author: Matthieu Herrb <matthieu@bluenote.herrb.net>
Date: Sat Mar 8 23:17:40 2008 +0100
Makefile.am: nuke RCS Id
diff --git a/man/Makefile.am b/man/Makefile.am
index bf7ec17..f0eb29b 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,4 +1,3 @@
-# $Id$
#
# Copyright 2005 Sun Microsystems, Inc. All rights reserved.
#
commit c312189cedf7526d61ced521f275ad5c4a972610
Author: Vinay Bondhugula <vinayb@vmware.com>
Date: Tue Jan 22 23:32:12 2008 -0800
Fix device to screen space coordinate conversion
The Xserver no longer calls an input device's conversion_proc to convert x and
y coordinates from device to screen space. This fix calls the conversion
routine in vmmouse.c before posting the motion event to Xserver.
Other drivers also seem to rely on conversion_proc, so the real fix should probably
go into Xserver's code (maybe in xserver/hw/xfree86/common/xf86Xinput.c?).
diff --git a/src/vmmouse.c b/src/vmmouse.c
index be1087e..bd3763b 100644
--- a/src/vmmouse.c
+++ b/src/vmmouse.c
@@ -490,7 +490,13 @@ VMMouseDoPostEvent(InputInfoPtr pInfo, int buttons, int dx, int dy)
buttons = reverseBits(reverseMap, buttons);
if (dx || dy) {
- xf86PostMotionEvent(pInfo->dev, !mPriv->relative, 0, 2, dx, dy);
+
+ /*
+ * The Xserver no longer calls an input device's conversion_proc
+ * to convert x and y coordinates from device to screen space.
+ */
+ VMMouseConvertProc(pInfo, 0, 2, dx, dy, 0, 0, 0, 0, &dx, &dy);
+ xf86PostMotionEvent(pInfo->dev, !mPriv->relative, 0, 2, dx, dy);
}
if (truebuttons != pMse->lastButtons) {
commit ca3eb5abeb187a1e40ff7c36bf87d52efb999be9
Author: Vinay Bondhugula <vinayb@vmware.com>
Date: Sat Jan 19 09:07:16 2008 -0800
Fix an old sign bug for the relative mode
Higher order bits for the X and Y inputs (which could be set in case of a
relative mouse) were being zeroed off in VMMouseClient_GetInput. This change
fixes it.
diff --git a/src/vmmouse_client.c b/src/vmmouse_client.c
index 5f27e54..f34c223 100644
--- a/src/vmmouse_client.c
+++ b/src/vmmouse_client.c
@@ -267,9 +267,11 @@ VMMouseClient_GetInput (PVMMOUSE_INPUT_DATA pvmmouseInput) {
pvmmouseInput->Flags = (packetInfo & 0xffff0000) >> 16;
pvmmouseInput->Buttons = (packetInfo & 0x0000ffff);
- pvmmouseInput->X = vmpc.out.vEbx & 0xffff;
- pvmmouseInput->Y = vmpc.out.vEcx & 0xffff;
+ /* Note that Z is always signed, and X/Y are signed in relative mode. */
+ pvmmouseInput->X = (int)vmpc.out.vEbx;
+ pvmmouseInput->Y = (int)vmpc.out.vEcx;
pvmmouseInput->Z = (int)vmpc.out.vEdx;
+
/*
* Return number of packets (including this one) in queue.
*/
commit ca4cc3fed99457add3935f8a063558b51e816d74
Author: Philip Langdale <philipl@fido2.homeip.net>
Date: Tue Sep 25 16:18:53 2007 -0700
Update for 12.4.3 release.
diff --git a/configure.ac b/configure.ac
index 2efe700..a049195 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-vmmouse],
- 12.4.2,
+ 12.4.3,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-vmmouse)
diff --git a/src/vmmouse.c b/src/vmmouse.c
index ad40cd1..be1087e 100644
--- a/src/vmmouse.c
+++ b/src/vmmouse.c
@@ -95,7 +95,7 @@
*/
#define VMMOUSE_MAJOR_VERSION 12
#define VMMOUSE_MINOR_VERSION 4
-#define VMMOUSE_PATCHLEVEL 2
+#define VMMOUSE_PATCHLEVEL 3
#define VMMOUSE_DRIVER_VERSION \
(VMMOUSE_MAJOR_VERSION * 65536 + VMMOUSE_MINOR_VERSION * 256 + VMMOUSE_PATCHLEVEL)
#define VMMOUSE_DRIVER_VERSION_STRING \
commit 4840be10e99a77d567ee9122f57c6fb6b5208cd9
Author: Philip Langdale <philipl@fido2.homeip.net>
Date: Mon Sep 24 12:03:56 2007 -0700
Add compatibility #define for compilation on pre-X.Org
versions of the Xserver.
diff --git a/src/vmmouse.c b/src/vmmouse.c
index b430fc7..ad40cd1 100644
--- a/src/vmmouse.c
+++ b/src/vmmouse.c
@@ -84,6 +84,13 @@
#define VMW_STRING(str) VMW_INNERSTRINGIFY(str)
/*
+ * So that the file compiles unmodified when dropped into an xfree source tree.
+ */
+#ifndef XORG_VERSION_CURRENT
+#define XORG_VERSION_CURRENT XF86_VERSION_CURRENT
+#endif
+
+/*
* Version constants
*/
#define VMMOUSE_MAJOR_VERSION 12
commit d89b0ffc1b994fb8e19cecbab683478b599fea73
Author: Philip Langdale <philipl@fido2.homeip.net>
Date: Mon Sep 24 11:48:39 2007 -0700
There are problems when running with old X releases with a
global symbol collision with the svga driver.
diff --git a/src/vmmouse.c b/src/vmmouse.c
index 0919e3f..b430fc7 100644
--- a/src/vmmouse.c
+++ b/src/vmmouse.c
@@ -101,7 +101,7 @@
* extra zero for the fourth digit.
*/
#ifdef __GNUC__
-const char vm_version[] __attribute__((section(".modinfo"),unused)) =
+const char vm_mouse_version[] __attribute__((section(".modinfo"),unused)) =
"version=" VMMOUSE_DRIVER_VERSION_STRING ".0";
#endif
Reply to: