xserver-xorg-input-vmmouse: Changes to 'upstream-unstable'
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 za...@vmware.com
Date: Tue Jan 15 12:03:28 2013 -0800
vmmouse release 13.0.0
Signed-off-by: Zack Rusin za...@vmware.com
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 za...@vmware.com
Date: Thu Dec 6 16:37:19 2012 -0500
vmmouse 12.9.99.901
Internal release for QE testing
Signed-off-by: Zack Rusin za...@vmware.com
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 cabf4cb7c0ba3e535068ebb1d80108a26daa
Author: Peter Hutterer peter.hutte...@who-t.net
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 peter.hutte...@who-t.net
Reviewed-by: Thomas Hellstrom thellst...@vmware.com
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 peter.hutte...@who-t.net
Date: Tue Aug 21 14:03:54 2012 +1000
Use sigsafe logging in ReadInput path
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
Reviewed-by: Thomas Hellstrom thellst...@vmware.com
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 peter.hutte...@who-t.net
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 Nadonmems...@videotron.ca
Reviewed-by: Jakob Bornecrantz
xserver-xorg-input-vmmouse: Changes to 'upstream-unstable'
configure.ac |6 +++---
src/vmmouse.c | 21 +
tools/69-xorg-vmmouse.rules.in |2 +-
3 files changed, 25 insertions(+), 4 deletions(-)
New commits:
commit 3a828d876772d05577b9372e8f6dc068794f4704
Author: Jakob Bornecrantz ja...@vmware.com
Date: Tue May 22 20:14:25 2012 +0200
vmmouse 12.8.0
Signed-off-by: Jakob Bornecrantz ja...@vmware.com
diff --git a/configure.ac b/configure.ac
index 33fbd64..d2fb0b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-vmmouse],
-[12.8.0],
+[12.9.0],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-vmmouse)
commit 2a321a39350aa020a8103813bed61ff559088195
Author: Zack Rusin za...@vmware.com
Date: Thu May 10 19:55:01 2012 -0400
Revert Adjust the kernel name in the udev file.
This reverts commit 189dc266a66485d48303acbc1a4fbe4642c75e9f.
It seems that for some reason the device routing is breaking with this.
Possibly related to Win7 x64 hosts because it's not reproducible on
GNU/Linux hosts. Semantially we'd still like to match only on mouse
kernel but for the time being this seems to cause more problems
than it solves. Hence the revert.
diff --git a/tools/69-xorg-vmmouse.rules.in b/tools/69-xorg-vmmouse.rules.in
index 9af3938..602afb6 100644
--- a/tools/69-xorg-vmmouse.rules.in
+++ b/tools/69-xorg-vmmouse.rules.in
@@ -1 +1 @@
-ACTION==add|change, ENV{ID_INPUT_MOUSE}==?*, ATTRS{description}==i8042
AUX port, KERNEL==mouse[0-9]*, PROGRAM=__BIN_PREFIX__/vmmouse_detect,
ENV{ID_INPUT.tags}=vmmouse
+ACTION==add|change, ENV{ID_INPUT_MOUSE}==?*, ATTRS{description}==i8042
AUX port, KERNEL==event[0-9]*, PROGRAM=__BIN_PREFIX__/vmmouse_detect,
ENV{ID_INPUT.tags}=vmmouse
commit 55efac85ca9bd2041240ca29316ca716ddc2185d
Author: Gaetan Nadon mems...@videotron.ca
Date: Tue May 1 16:20:59 2012 -0400
config: replace obsolete AM_CONFIG_HEADER with AC_CONFIG_HEADERS
Moved up in the autoconf init section.
It has been removed from Automake 1.12.
Signed-off-by: Gaetan Nadon mems...@videotron.ca
Signed-off-by: Zack Rusin za...@vmware.com
diff --git a/configure.ac b/configure.ac
index 5938ca7..33fbd64 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,6 +28,8 @@ AC_INIT([xf86-input-vmmouse],
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_AUX_DIR(.)
+AC_CONFIG_HEADERS([config.h])
+
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
@@ -41,8 +43,6 @@ XORG_DEFAULT_OPTIONS
DRIVER_NAME=vmmouse
AC_SUBST([DRIVER_NAME])
-AM_CONFIG_HEADER([config.h])
-
# Checks for programs.
AC_DISABLE_STATIC
AC_PROG_LIBTOOL
commit 840dcbf947dd9d1383777c3cd811ff680cef5f16
Author: Michal Srb m...@suse.com
Date: Thu May 3 17:55:24 2012 +0200
Enable hardware access during vmmouse preinit.
Vmmouse driver uses outl calls but never requests hardware access.
In case there are no other drivers that requests it, vmmouse
initialization will fail. (Found on KVM virtual machine with fbdev
graphics driver and vmmouse input driver.)
Request hardware access in same way xf86-input-keyboard does.
Signed-off-by: Zack Rusin za...@vmware.com
diff --git a/src/vmmouse.c b/src/vmmouse.c
index 285ba26..7778923 100644
--- a/src/vmmouse.c
+++ b/src/vmmouse.c
@@ -65,6 +65,7 @@
#include xf86Xinput.h
#include xf86_OSproc.h
#include xf86OSmouse.h
+#include xf86Priv.h
#include compiler.h
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) = 7
@@ -339,6 +340,16 @@ VMMousePreInit(InputDriverPtr drv, IDevPtr dev, int flags)
#endif
/*
+* enable hardware access
+*/
+ if (!xorgHWAccess) {
+ if (xf86EnableIO())
+ xorgHWAccess = TRUE;
+ else
+ return NULL;
+ }
+
+ /*
* try to enable vmmouse here
*/
if (!VMMouseClient_Enable()) {
@@ -399,6 +410,16 @@ VMMousePreInit(InputDriverPtr drv, InputInfoPtr pInfo, int
flags)
VMMousePrivPtr mPriv = NULL;
int rc = Success;
+ /* Enable hardware access. */
+ if (!xorgHWAccess) {
+ if (xf86EnableIO())
+ xorgHWAccess = TRUE;
+ else {
+ rc = BadValue;
+ goto error;
+ }
+ }
+
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) = 12
/* For ABI 12, we need to return the wrapped driver's pInfo (see
* above). ABI 12, we call NIDR and are done */
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1swvok-0001rl...@vasks.debian.org
xserver-xorg-input-vmmouse: Changes to 'upstream-unstable'
configure.ac |2 -
fdi/11-x11-vmmouse.fdi |3 ++
src/vmmouse.c | 49 -
tools/69-xorg-vmmouse.rules.in |2 -
4 files changed, 39 insertions(+), 17 deletions(-)
New commits:
commit e925b2e6e9d548db5a6646a76d513fb6881f69b4
Author: Zack Rusin za...@vmware.com
Date: Thu Mar 8 09:51:48 2012 -0500
vmmouse 12.8.0
bump the version number for the new release
Signed-off-by: Zack Rusin za...@vmware.com
diff --git a/configure.ac b/configure.ac
index 20d6806..5938ca7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-vmmouse],
-[12.7.0],
+[12.8.0],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-vmmouse)
commit 189dc266a66485d48303acbc1a4fbe4642c75e9f
Author: Zack Rusin za...@vmware.com
Date: Wed Mar 7 23:22:35 2012 -0500
Adjust the kernel name in the udev file.
Some distros (most notable OpenSuSE) are unable to match on the
'event' devices, since we should be using 'mouse' kernel anyway
(because that's what the 'udevadm info' reports) switch to it in the
rules file.
Signed-off-by: Zack Rusin za...@vmware.com
Reviewed-by: Jakob Bornecrantz ja...@vmware.com
diff --git a/tools/69-xorg-vmmouse.rules.in b/tools/69-xorg-vmmouse.rules.in
index 602afb6..9af3938 100644
--- a/tools/69-xorg-vmmouse.rules.in
+++ b/tools/69-xorg-vmmouse.rules.in
@@ -1 +1 @@
-ACTION==add|change, ENV{ID_INPUT_MOUSE}==?*, ATTRS{description}==i8042
AUX port, KERNEL==event[0-9]*, PROGRAM=__BIN_PREFIX__/vmmouse_detect,
ENV{ID_INPUT.tags}=vmmouse
+ACTION==add|change, ENV{ID_INPUT_MOUSE}==?*, ATTRS{description}==i8042
AUX port, KERNEL==mouse[0-9]*, PROGRAM=__BIN_PREFIX__/vmmouse_detect,
ENV{ID_INPUT.tags}=vmmouse
commit 3960dd29b4e839d224b9da4e28ab4302832e906f
Author: Peter Hutterer peter.hutte...@who-t.net
Date: Sat Nov 12 14:08:13 2011 +1000
Deal with opaque InputOption types in ABI 14
Tested-by: Jakob Bornecrantz ja...@vmware.com
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
Signed-off-by: Jakob Bornecrantz ja...@vmware.com
diff --git a/src/vmmouse.c b/src/vmmouse.c
index ad014ec..285ba26 100644
--- a/src/vmmouse.c
+++ b/src/vmmouse.c
@@ -228,11 +228,40 @@ static char reverseMap[32] = { 0, 4, 2, 6, 1, 5, 3,
7,
#define reverseBits(map, b)(((b) ~0x0f) | map[(b) 0x0f])
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) = 12
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) 14
+
+static InputOption*
+input_option_new(InputOption *list, char *key, char *value)
+{
+ InputOption *new;
+
+ new = calloc(1, sizeof(InputOption));
+ new-key = key;
+ new-value = value;
+ new-next = list;
+ return new;
+}
+
+static void
+input_option_free_list(InputOption **opts)
+{
+ InputOption *tmp = *opts;
+ while(*opts)
+ {
+ tmp = (*opts)-next;
+ free((*opts)-key);
+ free((*opts)-value);
+ free((*opts));
+ *opts = tmp;
+ }
+}
+#endif
+
static int
VMMouseInitPassthru(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
{
InputAttributes *attrs = NULL;
- InputOption *input_options = NULL, *tmp, *opts;
+ InputOption *input_options = NULL;
pointer options;
DeviceIntPtr dev;
int rc;
@@ -241,25 +270,15 @@ VMMouseInitPassthru(InputDriverPtr drv, InputInfoPtr
pInfo, int flags)
options = xf86ReplaceStrOption(options, Driver, mouse);
while(options) {
- tmp = calloc(1, sizeof(InputOption));
- tmp-key = xf86OptionName(options);
- tmp-value = xf86OptionValue(options);
- tmp-next = input_options;
- input_options = tmp;
+ input_options = input_option_new(input_options,
+ xf86OptionName(options),
+ xf86OptionValue(options));
options = xf86NextOption(options);
}
rc = NewInputDeviceRequest(input_options, attrs, dev);
- opts = input_options;
- tmp = opts;
- while(opts) {
- tmp = opts-next;
- free(opts-key);
- free(opts-value);
- free(opts);
- opts = tmp;
- }
+ input_option_free_list(input_options);
return rc;
}
commit fd140bfbea9fac8f05ad525dd798a5ca39f68c44
Author: Thomas Hellstrom thellst...@vmware.com
Date: Tue Apr 5 14:42:37 2011 +0200
Make the fdi script work with FreeBSD
The key input.originating_device is not present on FreeBSD.
Use freebsd.driver instead.
Signed-off-by: Thomas Hellstrom thellst...@vmware.com
Reviewed-by: Michel D�nzer daen...@vmware.com
diff --git a/fdi/11-x11-vmmouse.fdi b/fdi/11-x11-vmmouse.fdi
index 6151196..77f0abd 100644
--- a/fdi/11-x11-vmmouse.fdi
+++ b/fdi/11-x11-vmmouse.fdi
@@ -5,6 +5,9 @@
match key=input.originating_device contains=i8042_
append key=info.callouts.add
type=strlisthal-probe-vmmouse/append
/match
+ match key=freebsd.driver contains=psm
+
xserver-xorg-input-vmmouse: Changes to 'upstream-unstable'
COPYING| 66 +
configure.ac | 13 +-
fdi/11-x11-vmmouse.fdi |2
man/Makefile.am| 21
src/vmmouse.c | 236 -
tools/Makefile.am |9 -
6 files changed, 236 insertions(+), 111 deletions(-)
New commits:
commit de2b5ca7a76f1ffac1e8d4ed88408dda0f77a83c
Author: Thomas Hellstrom thellst...@vmware.com
Date: Wed Mar 2 11:50:12 2011 +0100
vmmouse 12.7.0
Remove trailing zero from version number.
Signed-off-by: Thomas Hellstrom thellst...@vmware.com
diff --git a/configure.ac b/configure.ac
index 1090179..20d6806 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-vmmouse],
-[12.7.0.0],
+[12.7.0],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-vmmouse)
commit cfaffd24413a31ebd7ae766ac39ed366902e38e5
Author: Thomas Hellstrom thellst...@vmware.com
Date: Wed Mar 2 09:06:47 2011 +0100
vmmouse 12.7.0.0
VMware internal testing completed.
Signed-off-by: Thomas Hellstrom thellst...@vmware.com
diff --git a/configure.ac b/configure.ac
index 73d0164..1090179 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-vmmouse],
-[12.6.99.901],
+[12.7.0.0],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-vmmouse)
commit 07232feb6b5acc5c25e9cdf12b804397ca52dbce
Author: Thomas Hellstrom thellst...@vmware.com
Date: Wed Dec 8 10:07:20 2010 +0100
vmmouse 12.6.99.901
Signed-off-by: Thomas Hellstrom thellst...@vmware.com
diff --git a/configure.ac b/configure.ac
index 9d42e24..73d0164 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-vmmouse],
-12.6.10,
+[12.6.99.901],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-vmmouse)
commit 5d0ba2e03718b73013519fc0a1c74f2ef5f4e7ad
Author: Thomas Hellstrom thellst...@vmware.com
Date: Wed Dec 1 10:04:01 2010 +0100
Make the .fdi script work on solaris
Solaris doesn't use the same HAL device naming as Linux.
Use the common part of the device name.
Signed-off-by: Thomas Hellstrom thellst...@vmware.com
diff --git a/fdi/11-x11-vmmouse.fdi b/fdi/11-x11-vmmouse.fdi
index e725f9a..6151196 100644
--- a/fdi/11-x11-vmmouse.fdi
+++ b/fdi/11-x11-vmmouse.fdi
@@ -2,7 +2,7 @@
deviceinfo version=0.2
device
match key=info.capabilities contains=input.mouse
- match key=input.originating_device contains=i8042_AUX_port
+ match key=input.originating_device contains=i8042_
append key=info.callouts.add
type=strlisthal-probe-vmmouse/append
/match
/match
commit e5987a4e60d4e05159c7cc4a24cee6daed36c770
Author: Thomas Hellstrom thellst...@vmware.com
Date: Thu Nov 4 09:09:52 2010 +0100
Make the modinfo sring contain an optional subpatch number
The idea is that the build system assigns this number if needed.
As an example it might be the commit number since the last version tag.
Signed-off-by: Thomas Hellstrom thellst...@vmware.com
diff --git a/src/vmmouse.c b/src/vmmouse.c
index e70d95e..ad014ec 100644
--- a/src/vmmouse.c
+++ b/src/vmmouse.c
@@ -110,12 +110,18 @@
/*
* Standard four digit version string expected by VMware Tools installer.
- * As the driver's version is only {major, minor, patchlevel}, simply append
an
- * extra zero for the fourth digit.
+ * As the driver's version is only {major, minor, patchlevel},
+ * The fourth digit may describe the commit number relative to the
+ * last version tag as output from `git describe`
*/
#ifdef __GNUC__
+#ifdef VMW_SUBPATCH
+const char vm_mouse_version[] __attribute__((section(.modinfo),unused)) =
+version= VMMOUSE_DRIVER_VERSION_STRING . VMW_STRING(VMW_SUBPATCH);
+#else
const char vm_mouse_version[] __attribute__((section(.modinfo),unused)) =
version= VMMOUSE_DRIVER_VERSION_STRING .0;
+#endif /*VMW_SUBPATCH*/
#endif
commit 3ef519e91fb85261834a3f4ff6982c0a9f86d616
Author: Peter Hutterer peter.hutte...@who-t.net
Date: Tue Nov 2 09:23:10 2010 +1000
Adjust to input ABI 12.
New PreInit prototype that requires reshuffling.
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
Signed-off-by: Thomas Hellstrom thellst...@vmware.com
diff --git a/src/vmmouse.c b/src/vmmouse.c
index 9d366e2..e70d95e 100644
--- a/src/vmmouse.c
+++ b/src/vmmouse.c
@@ -122,19 +122,23 @@ const char vm_mouse_version[]
__attribute__((section(.modinfo),unused)) =
/*
* static function header
/
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) = 12
+static int VMMousePreInit(InputDriverPtr drv,
xserver-xorg-input-vmmouse: Changes to 'upstream-unstable'
configure.ac |3 ---
shared/Makefile.am |2 +-
src/Makefile.am|2 +-
src/vmmouse.c |1 +
tools/.gitignore |1 +
tools/69-xorg-vmmouse.rules.in |2 +-
tools/Makefile.am |2 +-
7 files changed, 6 insertions(+), 7 deletions(-)
New commits:
commit 833698b3b9857fda176c91a0dbb128275a174624
Author: Gaetan Nadon mems...@videotron.ca
Date: Sun Apr 25 19:36:19 2010 -0400
config: git ignore recently added 69-xorg-vmmouse.rules
Was added in 1d1c0514158abb66388ee4eb44764d201203a863
Signed-off-by: Gaetan Nadon mems...@videotron.ca
diff --git a/tools/.gitignore b/tools/.gitignore
index 96849a3..b402509 100644
--- a/tools/.gitignore
+++ b/tools/.gitignore
@@ -1,3 +1,4 @@
# Add Override for this directory and it's subdirectories
hal-probe-vmmouse
vmmouse_detect
+69-xorg-vmmouse.rules
commit 1d1c0514158abb66388ee4eb44764d201203a863
Author: Jakob Bornecrantz ja...@vmware.com
Date: Mon Apr 19 15:29:41 2010 +0100
Only match against event[0-9] in udev rules
It looks like the udev rule was matched against two devices which caused
the driver to be loaded twice. We shouldn't match against the other
device because it will very seldom send bogus events. Some of the bug
this caused was buttons getting stuck.
diff --git a/tools/69-xorg-vmmouse.rules.in b/tools/69-xorg-vmmouse.rules.in
index 0d7f028..602afb6 100644
--- a/tools/69-xorg-vmmouse.rules.in
+++ b/tools/69-xorg-vmmouse.rules.in
@@ -1 +1 @@
-ACTION==add|change, ENV{ID_INPUT_MOUSE}==?*, ATTRS{description}==i8042
AUX port, PROGRAM=__BIN_PREFIX__/vmmouse_detect, ENV{ID_INPUT.tags}=vmmouse
+ACTION==add|change, ENV{ID_INPUT_MOUSE}==?*, ATTRS{description}==i8042
AUX port, KERNEL==event[0-9]*, PROGRAM=__BIN_PREFIX__/vmmouse_detect,
ENV{ID_INPUT.tags}=vmmouse
commit b22d830a4e1c609a709e71c306a3b3a8ff8a6078
Author: Julien Cristau jcris...@debian.org
Date: Sat Apr 17 01:39:23 2010 +0200
Don't clobber CFLAGS
CFLAGS is a user variable, don't set it from configure.
diff --git a/configure.ac b/configure.ac
index 472c705..6c29dc2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -138,9 +138,6 @@ 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])
-
# Checks for libraries.
# Checks for header files.
diff --git a/shared/Makefile.am b/shared/Makefile.am
index 33c5862..c1b6ca9 100644
--- a/shared/Makefile.am
+++ b/shared/Makefile.am
@@ -23,5 +23,5 @@ l...@driver_name@_la_SOURCES = @driver_n...@_defs.h \
@driver_n...@_client.c @driver_n...@_client.h \
@driver_n...@_proto.c @driver_n...@_proto.h
-
+AM_CPPFLAGS = $(XORG_CFLAGS)
diff --git a/src/Makefile.am b/src/Makefile.am
index 6848537..7e6ea36 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -23,7 +23,7 @@
@driver_n...@_drv_la_libadd = $(top_builddir)/shared/l...@driver_name@.la
@driver_n...@_drv_ladir = @inputdir@
-INCLUDES = -I$(top_srcdir)/shared
+AM_CPPFLAGS = -I$(top_srcdir)/shared $(XORG_CFLAGS)
@driver_n...@_drv_la_sources = @driver_n...@.c xf86OSmouse.h
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 8c40369..581ad65 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -20,7 +20,7 @@
bin_PROGRAMS = @driver_n...@_detect
-INCLUDES = -I$(top_srcdir)/shared
+AM_CPPFLAGS = -I$(top_srcdir)/shared $(XORG_CFLAGS)
@driver_n...@_detect_sources = vmmouse_detect.c
@driver_n...@_detect_ldadd = $(top_builddir)/shared/l...@driver_name@.la
commit 1cba87aab183eb3846757a0ee0828e3eb119a6e6
Author: Julien Cristau jcris...@debian.org
Date: Sat Apr 17 01:30:15 2010 +0200
Include exevents.h for XIGetKnownProperty
Fixes this compiler warning:
vmmouse.c: In function ‘VMMouseDeviceControl’:
vmmouse.c:734: warning: implicit declaration of function
‘XIGetKnownProperty’
Signed-off-by: Julien Cristau jcris...@debian.org
diff --git a/src/vmmouse.c b/src/vmmouse.c
index 0394fb8..1b08eff 100644
--- a/src/vmmouse.c
+++ b/src/vmmouse.c
@@ -70,6 +70,7 @@
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) = 7
#include xserver-properties.h
+#include exevents.h
#endif
#include xisb.h
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1okrte-0002hw...@alioth.debian.org
xserver-xorg-input-vmmouse: Changes to 'upstream-unstable'
Makefile.am|3 ++
configure.ac | 38 --
man/.gitignore |3 --
man/Makefile.am| 14 +
man/vmmouse_detect.1 | 58 -
man/vmmouse_detect.man | 58 +
shared/Makefile.am |2 -
src/vmmouse.c | 11 ++-
tools/50-vmmouse.conf |7
tools/69-xorg-vmmouse.rules.in |1
tools/Makefile.am | 24 +++-
tools/hal-probe-vmmouse.in |1
12 files changed, 139 insertions(+), 81 deletions(-)
New commits:
commit 01f03ca8fbca96957d6c2718f4279e31cb406c2f
Author: Peter Hutterer peter.hutte...@who-t.net
Date: Fri Apr 9 08:30:26 2010 +1000
Bump for 12.6.9 release.
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
diff --git a/configure.ac b/configure.ac
index 8bd1926..472c705 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-vmmouse],
-12.6.8,
+12.6.9,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-vmmouse)
commit 7b2ff5322b298ed8458c7442a16b8c0a14bcc5dc
Author: Peter Hutterer peter.hutte...@who-t.net
Date: Fri Apr 9 07:57:17 2010 +1000
man: move vmmouse_detect back to section 1
Was moved to section 4 in commit 36c2cd8ec6d3bf7191a98a04a876e8d7b6f64d5d,
man: build vmmouse_detect man page.
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
Reviewed-by: Alan Coopersmith alan.coopersm...@oracle.com
diff --git a/man/Makefile.am b/man/Makefile.am
index 142eb1d..d59d374 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -23,13 +23,17 @@
drivermandir = $(DRIVER_MAN_DIR)
-driverman_PRE = @driver_n...@.man @driver_n...@_detect.man
+driverman_PRE = @driver_n...@.man
driverman_DATA = $(driverman_PRE:m...@driver_man_suffix@)
-EXTRA_DIST = @driver_n...@.man @driver_n...@_detect.man
+appmandir = $(APP_MAN_DIR)
+appman_PRE = @driver_n...@_detect.man
+appman_DATA = $(appman_PRE:m...@app_man_suffix@)
-CLEANFILES = $(driverman_DATA)
+EXTRA_DIST = @driver_n...@.man $(appman_PRE)
+
+CLEANFILES = $(driverman_DATA) $(appman_DATA)
# Strings to replace in man pages
XORGRELSTRING = @PACKAGE_STRING@
@@ -51,3 +55,5 @@ SUFFIXES = .$(DRIVER_MAN_SUFFIX) .man
.man.$(DRIVER_MAN_SUFFIX):
$(AM_V_GEN)$(SED) $(MAN_SUBSTS) $ $@
+.man.$(APP_MAN_SUFFIX):
+ $(AM_V_GEN)$(SED) $(MAN_SUBSTS) $ $@
diff --git a/man/vmmouse_detect.man b/man/vmmouse_detect.man
index a7b884e..53cc36d 100644
--- a/man/vmmouse_detect.man
+++ b/man/vmmouse_detect.man
@@ -18,7 +18,7 @@
.\
.\ That's right, although mdetect itself is under the QPL, this manpage is
.\ under the GPL. Enjoy!
-.TH vmmouse_detect __drivermansuffix__ __vendorversion__
+.TH vmmouse_detect __appmansuffix__ __vendorversion__
.SH NAME
vmmouse_detect \- VMware mouse device autodetection tool
.SH SYNOPSIS
commit 21f53010d204c681e1a82b176841c2d4af8f61d8
Author: Michel Dänzer daen...@vmware.com
Date: Thu Apr 8 16:18:07 2010 +0200
Bump for 12.6.8 release.
diff --git a/configure.ac b/configure.ac
index 7623b98..8bd1926 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-vmmouse],
-12.6.7,
+12.6.8,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-vmmouse)
commit 80f671233e583ae085986bce12057fc45da444aa
Author: Michel Dänzer daen...@vmware.com
Date: Thu Apr 1 18:35:38 2010 +0200
Add InputClass support.
The InputClass can match the tag vmmouse. A sample xorg.conf.d snippet is
provided to try and make sure the driver will be loaded automatically in a
compatible VM also if the X server uses udev instead of HAL.
The configure script tries to determine if and where it makes sense to
install
the udev rule and xorg.conf.d snippet but allows overriding both.
Thanks to Timo Aaltonen for the udev rules file and Dan Nicholson and Simon
Thum for review and suggestions for improvement.
diff --git a/Makefile.am b/Makefile.am
index daf09d4..f1ad5af 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,6 +18,9 @@
# IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
# 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'
+
SUBDIRS = shared src tools fdi man
MAINTAINERCLEANFILES = ChangeLog INSTALL
.PHONY: ChangeLog INSTALL
diff --git a/configure.ac b/configure.ac
index e39fcbb..7623b98 100644
--- a/configure.ac
+++ b/configure.ac
@@ -59,6 +59,14 @@ AC_ARG_WITH(xorg-module-dir,
inputdir=${moduledir}/input
AC_SUBST(inputdir)
+AC_ARG_WITH(xorg-conf-dir,
+
xserver-xorg-input-vmmouse: Changes to 'upstream-unstable'
.gitignore | 73 +++-- ChangeLog| 25 - INSTALL | 231 --- Makefile.am | 11 ++ configure.ac | 30 +-- man/.gitignore |3 man/Makefile.am | 41 - src/vmmouse.c|4 tools/.gitignore |3 9 files changed, 110 insertions(+), 311 deletions(-) New commits: commit aca67eca8bbb1368a2f36614b0e78b98947f134f Author: Alan Coopersmith alan.coopersm...@sun.com Date: Fri Jan 15 15:15:54 2010 -0800 Update Sun license notices to current X.Org standard form Signed-off-by: Alan Coopersmith alan.coopersm...@sun.com diff --git a/man/Makefile.am b/man/Makefile.am index 1f31487..2671512 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -1,27 +1,24 @@ # # Copyright 2005 Sun Microsystems, Inc. All rights reserved. -# -# Permission to use, copy, modify, distribute, and sell this software and its -# documentation for any purpose is hereby granted without fee, provided that -# the above copyright notice appear in all copies and that both that -# copyright notice and this permission notice appear in supporting -# documentation. -# -# The above copyright notice and this permission notice shall be included -# in all copies or substantial portions of the Software. -# -# THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS -# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -# IN NO EVENT SHALL THE OPEN GROUP BE LIABLE FOR ANY CLAIM, DAMAGES OR -# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, -# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -# OTHER DEALINGS IN THE SOFTWARE. -# -# Except as contained in this notice, the name of the copyright holders shall -# not be used in advertising or otherwise to promote the sale, use or -# other dealings in this Software without prior written authorization -# from the copyright holders. +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the Software), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice (including the next +# paragraph) shall be included in all copies or substantial portions of the +# Software. +# +# THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +# DEALINGS IN THE SOFTWARE. # man_MANS = @driver_n...@_detect.1 commit b3b9f36deb3fb1fcf66e591fcb075fe295e0cf0e Author: Gaetan Nadon mems...@videotron.ca Date: Tue Dec 15 22:01:02 2009 -0500 configure.ac: remove unused sdkdir=$(pkg-config...) statement The sdkdir variable isn't use, so remove the statement. Acked-by: Dan Nicholson dbn.li...@gmail.com Signed-off-by: Gaetan Nadon mems...@videotron.ca diff --git a/configure.ac b/configure.ac index 6aaf9db..80248c9 100644 --- a/configure.ac +++ b/configure.ac @@ -90,7 +90,6 @@ XORG_DRIVER_CHECK_EXT(XINPUT, inputproto) # Checks for pkg-config packages PKG_CHECK_MODULES(XORG, [xorg-server = 1.0.1] xproto $REQUIRED_MODULES) -sdkdir=$(pkg-config --variable=sdkdir xorg-server) PKG_CHECK_EXISTS([xorg-server = 1.1.0], [AC_DEFINE([HAVE_XORG_SERVER_1_1_0], 1, commit 4eb807b3e7271f5116daebea9412c72e2faae4a5 Author: Gaetan Nadon mems...@videotron.ca Date: Mon Nov 23 09:25:05 2009 -0500 Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES Now that the INSTALL file is generated. Allows running make maintainer-clean. diff --git a/Makefile.am b/Makefile.am index f80d2ee..daf09d4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -19,6 +19,7 @@ # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. SUBDIRS = shared src tools fdi man +MAINTAINERCLEANFILES = ChangeLog INSTALL .PHONY: ChangeLog INSTALL INSTALL: commit 9bdfaffc1b858737c3fe85bc9b0bb25001f46460 Author: Peter Hutterer peter.hutte...@who-t.net Date: Fri Nov 20 10:09:24 2009 +1000 Remove unused bits from configure.ac Signed-off-by: Peter Hutterer peter.hutte...@who-t.net diff --git a/configure.ac b/configure.ac index 776b454..6aaf9db 100644 --- a/configure.ac +++ b/configure.ac @@ -50,24 +50,6 @@ AC_PROG_CC
xserver-xorg-input-vmmouse: Changes to 'upstream-unstable'
configure.ac |5 +
src/vmmouse.c | 152 --
2 files changed, 68 insertions(+), 89 deletions(-)
New commits:
commit 989004f300c9fd897837fdee4fd9c1307c6ed6ca
Author: Adam Jackson a...@redhat.com
Date: Thu Jul 16 09:57:27 2009 +1000
Compile with INPUT ABI 7.
Button labels up to 7 are essentially default so we can assume they are the
usual ones. Beyond that, they are anyone's guess.
Axis labels are X/Y.
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
diff --git a/src/vmmouse.c b/src/vmmouse.c
index caba093..d4f0ca6 100644
--- a/src/vmmouse.c
+++ b/src/vmmouse.c
@@ -68,6 +68,10 @@
#include xf86OSmouse.h
#include compiler.h
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) = 7
+#include xserver-properties.h
+#endif
+
#include xisb.h
#include mipointer.h
@@ -708,6 +712,10 @@ VMMouseDeviceControl(DeviceIntPtr device, int mode)
VMMousePrivPtr mPriv;
unsigned char map[MSE_MAXBUTTONS + 1];
int i;
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) = 7
+ Atom btn_labels[MSE_MAXBUTTONS] = {0};
+ Atom axes_labels[2] = { 0, 0 };
+#endif
pInfo = device-public.devicePrivate;
pMse = pInfo-private;
@@ -723,9 +731,30 @@ VMMouseDeviceControl(DeviceIntPtr device, int mode)
*/
for (i = 0; i MSE_MAXBUTTONS; i++)
map[i + 1] = i + 1;
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) = 7
+ btn_labels[0] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_LEFT);
+ btn_labels[1] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_MIDDLE);
+ btn_labels[2] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_RIGHT);
+ btn_labels[4] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_UP);
+ btn_labels[5] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_DOWN);
+ btn_labels[6] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_HWHEEL_LEFT);
+ btn_labels[7] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_HWHEEL_RIGHT);
+ /* other buttons are unknown */
+
+#ifdef ABS_VALUATOR_AXES
+ axes_labels[0] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_X);
+ axes_labels[1] = XIGetKnownProperty(AXIS_LABEL_PROP_ABS_Y);
+#else
+ axes_labels[0] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_X);
+ axes_labels[1] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_Y);
+#endif /* ABS_VALUATOR_AXES */
+#endif
InitPointerDeviceStruct((DevicePtr)device, map,
min(pMse-buttons, MSE_MAXBUTTONS),
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) = 7
+ btn_labels,
+#endif
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
miPointerGetMotionEvents,
#elif GET_ABI_MAJOR(ABI_XINPUT_VERSION) 3
@@ -737,20 +766,39 @@ VMMouseDeviceControl(DeviceIntPtr device, int mode)
#else
GetMotionHistorySize(), 2
#endif
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) = 7
+ , axes_labels
+#endif
);
/* X valuator */
#ifdef ABS_VALUATOR_AXES
- xf86InitValuatorAxisStruct(device, 0, 0, 65535, 1, 0, 1);
+ xf86InitValuatorAxisStruct(device, 0,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) = 7
+ axes_labels[0],
+#endif
+ 0, 65535, 1, 0, 1);
#else
- xf86InitValuatorAxisStruct(device, 0, 0, -1, 1, 0, 1);
+ xf86InitValuatorAxisStruct(device, 0,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) = 7
+ axes_labels[0],
+#endif
+ 0, -1, 1, 0, 1);
#endif
xf86InitValuatorDefaults(device, 0);
/* Y valuator */
#ifdef ABS_VALUATOR_AXES
- xf86InitValuatorAxisStruct(device, 1, 0, 65535, 1, 0, 1);
+ xf86InitValuatorAxisStruct(device, 1,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) = 7
+ axes_labels[1],
+#endif
+ 0, 65535, 1, 0, 1);
#else
- xf86InitValuatorAxisStruct(device, 1, 0, -1, 1, 0, 1);
+ xf86InitValuatorAxisStruct(device, 1,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) = 7
+ axes_labels[1],
+#endif
+ 0, -1, 1, 0, 1);
#endif
xf86InitValuatorDefaults(device, 1);
#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) == 0
commit 2fd8646ff528f4f7c4450dff111b4e9335ae2186
Author: Peter Hutterer peter.hutte...@who-t.net
Date: Wed Jul 29 11:21:19 2009 -0700
Needed by newer X servers, otherwise the module data is invisible and a
dlopen error occurs.
Signed-off-by: Peter Hutterer peter.hutte...@who-t.net
diff --git a/src/vmmouse.c b/src/vmmouse.c
index 6a4f9f9..caba093 100644
--- a/src/vmmouse.c
+++ b/src/vmmouse.c
@@ -1175,7 +1175,7 @@ static XF86ModuleVersionInfo VMMouseVersionRec = {
/*
* The variable contains the necessary information to load and initialize the
module
*/
-XF86ModuleData vmmouseModuleData = {
+_X_EXPORT XF86ModuleData vmmouseModuleData = {
VMMouseVersionRec,
VMMousePlug,
VMMouseUnplug
xserver-xorg-input-vmmouse: Changes to 'upstream-unstable'
configure.ac |8 +++
man/vmmouse.man|2 -
shared/vmmouse_defs.h |6 +
shared/vmmouse_proto.h |9
src/vmmouse.c | 53 ++---
tools/vmmouse_detect.c |6 +
6 files changed, 63 insertions(+), 21 deletions(-)
New commits:
commit d61609868697825717d2f6a63b2a6177cb13873b
Author: Shelley Gong shelleyg...@vmware.com
Date: Mon May 11 10:08:56 2009 -0700
1) Fix bug where motion notify events were being sent with every button
event.
2) Classify relative vs. absolute packets individually rather than from a
global flag.
3) Compile with older distros.
4) Bump for 12.6.4 Release.
Signed-off-by: Philip Langdale phil...@fido2.homeip.net
diff --git a/configure.ac b/configure.ac
index 118ae84..ab39f6c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-vmmouse],
-12.6.3,
+12.6.4,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-vmmouse)
diff --git a/shared/vmmouse_defs.h b/shared/vmmouse_defs.h
index 8dc769e..d256faf 100644
--- a/shared/vmmouse_defs.h
+++ b/shared/vmmouse_defs.h
@@ -57,6 +57,12 @@
#define VMMOUSE_ERROR 0x
/*
+ * VMMouse Input packet flags
+ */
+#define VMMOUSE_MOVE_RELATIVE 1
+#define VMMOUSE_MOVE_ABSOLUTE 0
+
+/*
* VMMouse Input button flags
*/
#define VMMOUSE_LEFT_BUTTON0x20
diff --git a/src/vmmouse.c b/src/vmmouse.c
index a712bd5..deec8c8 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 2
+#define VMMOUSE_PATCHLEVEL 4
#define VMMOUSE_DRIVER_VERSION \
(VMMOUSE_MAJOR_VERSION * 65536 + VMMOUSE_MINOR_VERSION * 256 +
VMMOUSE_PATCHLEVEL)
#define VMMOUSE_DRIVER_VERSION_STRING \
@@ -138,9 +138,11 @@ static void MouseCtrl(DeviceIntPtr device, PtrCtrl *ctrl);
* Definitions
*/
typedef struct {
- int screenNum;
- BoolvmmouseAvailable;
- Boolrelative;
+ int screenNum;
+ BoolvmmouseAvailable;
+ VMMOUSE_INPUT_DATA vmmousePrevInput;
+ BoolisCurrRelative;
+ BoolabsoluteRequested;
} VMMousePrivRec, *VMMousePrivPtr;
static const char *reqSymbols[] = {
@@ -311,7 +313,7 @@ VMMousePreInit(InputDriverPtr drv, IDevPtr dev, int flags)
return NULL;
}
- mPriv-relative = TRUE;
+ mPriv-absoluteRequested = FALSE;
/*
* try to enable vmmouse here
@@ -479,6 +481,7 @@ VMMouseDoPostEvent(InputInfoPtr pInfo, int buttons, int dx,
int dy)
VMMousePrivPtr mPriv;
int truebuttons;
int id, change;
+Bool mouseMoved = FALSE;
pMse = pInfo-private;
mPriv = (VMMousePrivPtr)pMse-mousePriv;
@@ -492,7 +495,14 @@ VMMouseDoPostEvent(InputInfoPtr pInfo, int buttons, int
dx, int dy)
buttons = reverseBits(reverseMap, buttons);
-if (dx || dy) {
+if (mPriv-isCurrRelative) {
+ mouseMoved = dx || dy;
+} else {
+ mouseMoved = (dx != mPriv-vmmousePrevInput.X) ||
+(dy != mPriv-vmmousePrevInput.Y) ||
+(mPriv-vmmousePrevInput.Flags VMMOUSE_MOVE_RELATIVE);
+}
+if (mouseMoved) {
#ifdef CALL_CONVERSION_PROC
/*
@@ -501,7 +511,7 @@ VMMouseDoPostEvent(InputInfoPtr pInfo, int buttons, int dx,
int dy)
*/
VMMouseConvertProc(pInfo, 0, 2, dx, dy, 0, 0, 0, 0, dx, dy);
#endif
-xf86PostMotionEvent(pInfo-dev, !mPriv-relative, 0, 2, dx, dy);
+xf86PostMotionEvent(pInfo-dev, !mPriv-isCurrRelative, 0, 2, dx, dy);
}
if (truebuttons != pMse-lastButtons) {
@@ -549,7 +559,7 @@ VMMousePostEvent(InputInfoPtr pInfo, int buttons, int dx,
int dy, int dz, int dw
break;
case MSE_MAPTOX:
if (dz != 0) {
- if(mPriv-relative)
+ if(mPriv-isCurrRelative)
dx = dz;
else
dx += dz;
@@ -558,7 +568,7 @@ VMMousePostEvent(InputInfoPtr pInfo, int buttons, int dx,
int dy, int dz, int dw
break;
case MSE_MAPTOY:
if (dz != 0) {
- if(mPriv-relative)
+ if(mPriv-isCurrRelative)
dy = dz;
else
dy += dz;
@@ -593,7 +603,7 @@ VMMousePostEvent(InputInfoPtr pInfo, int buttons, int dx,
int dy, int dz, int dw
*/
if (zbutton) {
buttons = ~zbutton;
- if(mPriv-relative)
+ if(mPriv-isCurrRelative)
VMMouseDoPostEvent(pInfo, buttons, 0, 0);
else
VMMouseDoPostEvent(pInfo, buttons, dx, dy);
@@ -621,7 +631,6 @@ static void
FlushButtons(MouseDevPtr pMse)
{
pMse-lastButtons = 0;
-pMse-lastMappedButtons = 0;
}
@@ -865,8 +874,8 @@
xserver-xorg-input-vmmouse: Changes to 'upstream-unstable'
.gitignore |3 Makefile.am|2 README | 13 + configure.ac | 33 fdi/11-x11-vmmouse.fdi | 10 + fdi/Makefile.am| 25 +++ man/Makefile.am|4 man/vmmouse_detect.1 | 58 +++ shared/Makefile.am | 29 +++ shared/vmmouse_client.c| 339 + shared/vmmouse_client.h| 73 + shared/vmmouse_defs.h | 66 shared/vmmouse_proto.c | 147 +++ shared/vmmouse_proto.h | 131 + src/Makefile.am| 13 - src/vmmouse.c | 50 +++--- src/vmmouse_client.c | 339 - src/vmmouse_client.h | 73 - src/vmmouse_defs.h | 66 src/vmmouse_proto.c| 147 --- src/vmmouse_proto.h| 131 - src/xf86OSmouse.h | 277 tools/Makefile.am | 38 + tools/hal-probe-vmmouse.in | 30 +++ tools/vmmouse_detect.c | 62 25 files changed, 1364 insertions(+), 795 deletions(-) New commits: commit bc324161680b1403e5811b3ac2b9ca679829a5c9 Author: Peter Hutterer peter.hutte...@who-t.net Date: Mon Dec 22 14:19:30 2008 +1000 Bump for 12.6.3 release diff --git a/configure.ac b/configure.ac index b461820..5c5f639 100644 --- a/configure.ac +++ b/configure.ac @@ -22,7 +22,7 @@ AC_PREREQ(2.57) AC_INIT([xf86-input-vmmouse], -12.6.2, +12.6.3, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xf86-input-vmmouse) commit 6f855ac348db34726eac68dc114563543ff0eae2 Author: Peter Hutterer peter.hutte...@who-t.net Date: Mon Dec 22 14:53:27 2008 +1000 Fix make distcheck allowing custom build directories. diff --git a/src/Makefile.am b/src/Makefile.am index 844a972..6848537 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -18,14 +18,12 @@ # IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -SHARED_DIR = $(top_srcdir)/shared - @driver_n...@_drv_la_ltlibraries = @driver_n...@_drv.la @driver_n...@_drv_la_ldflags = -module -avoid-version -...@driver_name@_drv_la_LIBADD = $(SHARED_DIR)/l...@driver_name@.la +...@driver_name@_drv_la_LIBADD = $(top_builddir)/shared/l...@driver_name@.la @driver_n...@_drv_ladir = @inputdir@ -INCLUDES = -I$(SHARED_DIR) +INCLUDES = -I$(top_srcdir)/shared @driver_n...@_drv_la_sources = @driver_n...@.c xf86OSmouse.h diff --git a/tools/Makefile.am b/tools/Makefile.am index 9236c5f..c00d65d 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -20,11 +20,10 @@ bin_PROGRAMS = @driver_n...@_detect -SHARED_PATH = $(top_srcdir)/shared -INCLUDES = -I$(SHARED_PATH) +INCLUDES = -I$(top_srcdir)/shared @driver_n...@_detect_sources = vmmouse_detect.c -...@driver_name@_detect_LDADD = $(SHARED_PATH)/l...@driver_name@.la +...@driver_name@_detect_LDADD = $(top_builddir)/shared/l...@driver_name@.la calloutsdir=$(HAL_CALLOUTS_DIR) callouts_SCRIPTS = hal-probe-vmmouse @@ -32,7 +31,7 @@ callouts_SCRIPTS = hal-probe-vmmouse hal-probe-vmmouse: sed -e 's|__BIN_PREFIX__|$(bindir)|g' \ -e 's|__HAL_BIN_PREFIX__|$(HAL_BIN_DIR)|g' \ -$...@.in $@ +$(srcdir)/$...@.in $@ EXTRA_DIST = hal-probe-vmmouse.in commit 7cb41b467a161461627e6abf1ea979b7058d02f0 Author: Peter Hutterer peter.hutte...@who-t.net Date: Mon Dec 22 14:10:38 2008 +1000 Fix build against master - add xf86OSmouse.h diff --git a/src/Makefile.am b/src/Makefile.am index b8ad878..844a972 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -27,5 +27,5 @@ SHARED_DIR = $(top_srcdir)/shared INCLUDES = -I$(SHARED_DIR) -...@driver_name@_drv_la_SOURCES = @driver_n...@.c +...@driver_name@_drv_la_SOURCES = @driver_n...@.c xf86OSmouse.h diff --git a/src/xf86OSmouse.h b/src/xf86OSmouse.h new file mode 100644 index 000..09b8525 --- /dev/null +++ b/src/xf86OSmouse.h @@ -0,0 +1,277 @@ +/* + * Copyright (c) 1999-2003 by The XFree86 Project, Inc. + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the Software), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED,
xserver-xorg-input-vmmouse: Changes to 'upstream-unstable'
configure.ac | 13 ++-
man/Makefile.am |1
src/vmmouse.c| 200 ++-
src/vmmouse_client.c |6 +
src/vmmouse_proto.h | 12 ++-
5 files changed, 130 insertions(+), 102 deletions(-)
New commits:
commit e72f4fbc61f4a0acf99a4b31f16fdebde9d339f1
Author: Vinay Bondhugula [EMAIL PROTECTED]
Date: Wed May 21 01:36:53 2008 -0400
Don't call conversion_proc for older Xservers
There was a bug in the Xserver for a while when it didn't call a driver's
conversion_proc to convert device space coordinates to screen space. To fix
this, vmmouse starting calling that method (since January), but if this is
done
on older versions of X, the conversion gets done twice.
The fix is to add a configure check for the right versions of X and call
VMMouseConvertProc() only if we are compiling against an X that has the bug.
There's some whitespace cleanup for vmmouse.c too.
diff --git a/configure.ac b/configure.ac
index 7013426..a57851f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -80,7 +80,12 @@ sdkdir=$(pkg-config --variable=sdkdir xorg-server)
PKG_CHECK_EXISTS([xorg-server = 1.1.0],
[AC_DEFINE([HAVE_XORG_SERVER_1_1_0], 1,
- [Has version 1.1.0 or greater of the Xserver])])
+[Has version 1.1.0 or greater of the Xserver])])
+
+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])])
CFLAGS=$CFLAGS $XORG_CFLAGS ' -I$(top_srcdir)/src'
AC_SUBST([CFLAGS])
diff --git a/src/vmmouse.c b/src/vmmouse.c
index 8c9ba55..1e2a1c9 100644
--- a/src/vmmouse.c
+++ b/src/vmmouse.c
@@ -139,8 +139,8 @@ static void MouseCtrl(DeviceIntPtr device, PtrCtrl *ctrl);
*/
typedef struct {
int screenNum;
- BoolvmmouseAvailable;
- Boolrelative;
+ BoolvmmouseAvailable;
+ Boolrelative;
} VMMousePrivRec, *VMMousePrivPtr;
static const char *reqSymbols[] = {
@@ -195,7 +195,7 @@ InputDriverRec VMMOUSE = {
vmmouse,
NULL,
VMMousePreInit,
- VMMouseUnInit,
+ VMMouseUnInit,
NULL,
0
};
@@ -231,8 +231,8 @@ typedef enum {
/*
* Define the acceptable mouse options
* Currently not all of those options are supported
- *
- */
+ *
+ */
static const OptionInfoRec mouseOptions[] = {
{ OPTION_ALWAYS_CORE, AlwaysCore, OPTV_BOOLEAN, {0}, FALSE },
{ OPTION_SEND_CORE_EVENTS, SendCoreEvents, OPTV_BOOLEAN, {0}, FALSE },
@@ -277,12 +277,12 @@ static char reverseMap[32] = { 0, 4, 2, 6, 1, 5, 3,
7,
* This function collect all the information that is necessary to
* determine the configuration of the hardware and to prepare the
* device for being used
- *
+ *
* Results:
* An InputInfoPtr object which points to vmmouse's information,
* if the absolute pointing device available
* Otherwise, an InputInfoPtr of regular mouse
- *
+ *
* Side effects:
* VMMouse was initialized with necessary information
*
@@ -291,7 +291,7 @@ static char reverseMap[32] = { 0, 4, 2, 6, 1, 5, 3,
7,
static InputInfoPtr
VMMousePreInit(InputDriverPtr drv, IDevPtr dev, int flags)
-{
+{
InputInfoPtr pInfo;
MouseDevPtr pMse;
VMMousePrivPtr mPriv;
@@ -299,14 +299,14 @@ VMMousePreInit(InputDriverPtr drv, IDevPtr dev, int flags)
/*
* let Xserver init the mouse first
-*/
+*/
osInfo = xf86OSMouseInit(0);
if (!osInfo)
return FALSE;
-
+
mPriv = xcalloc (1, sizeof (VMMousePrivRec));
-
+
if (!mPriv) {
return NULL;
}
@@ -328,7 +328,7 @@ VMMousePreInit(InputDriverPtr drv, IDevPtr dev, int flags)
} else {
return NULL;
}
-
+
} else {
/*
* vmmouse is available
@@ -339,16 +339,16 @@ VMMousePreInit(InputDriverPtr drv, IDevPtr dev, int flags)
* Disable the absolute pointing device for now
* It will be enabled during DEVICE_ON phase
*/
- VMMouseClient_Disable();
+ VMMouseClient_Disable();
}
-
+
if (!(pInfo = xf86AllocateInput(drv, 0))) {
xfree(mPriv);
return NULL;
- }
+ }
/* Settup the pInfo */
- pInfo-name = dev-identifier;
+ pInfo-name = dev-identifier;
pInfo-type_name = XI_MOUSE;
pInfo-flags = XI86_POINTER_CAPABLE | XI86_SEND_DRAG_EVENTS;
pInfo-device_control = VMMouseDeviceControl;
@@ -378,7 +378,7 @@ VMMousePreInit(InputDriverPtr drv, IDevPtr dev, int flags)
pMse-PostEvent = VMMousePostEvent;
pMse-CommonOptions = MouseCommonOptions;
pMse-mousePriv = mPriv;
-
+
/* Collect the options, and process the
Re: xserver-xorg-input-vmmouse: Changes to 'upstream-unstable'
On Wed, May 28, 2008 at 20:48:00 +, Brice Goglin wrote: commit e72f4fbc61f4a0acf99a4b31f16fdebde9d339f1 Author: Vinay Bondhugula [EMAIL PROTECTED] Date: Wed May 21 01:36:53 2008 -0400 Don't call conversion_proc for older Xservers There was a bug in the Xserver for a while when it didn't call a driver's conversion_proc to convert device space coordinates to screen space. To fix this, vmmouse starting calling that method (since January), but if this is done on older versions of X, the conversion gets done twice. The fix is to add a configure check for the right versions of X and call VMMouseConvertProc() only if we are compiling against an X that has the bug. There's some whitespace cleanup for vmmouse.c too. diff --git a/configure.ac b/configure.ac index 7013426..a57851f 100644 --- a/configure.ac +++ b/configure.ac @@ -80,7 +80,12 @@ sdkdir=$(pkg-config --variable=sdkdir xorg-server) PKG_CHECK_EXISTS([xorg-server = 1.1.0], [AC_DEFINE([HAVE_XORG_SERVER_1_1_0], 1, - [Has version 1.1.0 or greater of the Xserver])]) +[Has version 1.1.0 or greater of the Xserver])]) + +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])]) CFLAGS=$CFLAGS $XORG_CFLAGS ' -I$(top_srcdir)/src' AC_SUBST([CFLAGS]) The current X server in sid is 1.4.0.90 and does call conversion_proc (since the latest version), so the driver shouldn't call it itself. Now maybe we ought to bump the server version, but in any case this needs to be fixed somehow. Cheers, Julien -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xserver-xorg-input-vmmouse: Changes to 'upstream-unstable'
.cvsignore | 19
.gitignore | 20 +
configure.ac|2
man/vmmouse.man | 223 +---
src/vmmouse.c | 50 +++-
5 files changed, 89 insertions(+), 225 deletions(-)
New commits:
commit ca4cc3fed99457add3935f8a063558b51e816d74
Author: Philip Langdale [EMAIL PROTECTED]
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 [EMAIL PROTECTED]
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 [EMAIL PROTECTED]
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
commit b1ca22c8bdaa2450d98d5043b504d4a4fe412128
Author: Philip Langdale [EMAIL PROTECTED]
Date: Mon Sep 10 21:17:12 2007 -0700
Guard modinfo section against gcc.
diff --git a/src/vmmouse.c b/src/vmmouse.c
index 10859b4..0919e3f 100644
--- a/src/vmmouse.c
+++ b/src/vmmouse.c
@@ -100,8 +100,10 @@
* As the driver's version is only {major, minor, patchlevel}, simply append
an
* extra zero for the fourth digit.
*/
+#ifdef __GNUC__
const char vm_version[] __attribute__((section(.modinfo),unused)) =
version= VMMOUSE_DRIVER_VERSION_STRING .0;
+#endif
/*
commit 0cd80f9869feef92261d0972f3d2d018a3dcfb18
Author: Philip Langdale [EMAIL PROTECTED]
Date: Mon Sep 10 20:45:58 2007 -0700
Ready 12.4.2 release.
To allow for easier detection of driver version by other VMware tools,
we are embedding the version in a .modinfo section so that the Linux
kernel 'modinfo' tool can be (ab)used to check it.
diff --git a/configure.ac b/configure.ac
index bf558be..2efe700 100644
--- a/configure.ac
+++ b/configure.ac
@@ -22,7 +22,7 @@
AC_PREREQ(2.57)
AC_INIT([xf86-input-vmmouse],
-12.4.0,
+12.4.2,
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
xf86-input-vmmouse)
diff --git a/src/vmmouse.c b/src/vmmouse.c
index 2c2683b..af24848 100644
--- a/src/vmmouse.c
+++ b/src/vmmouse.c
@@ -77,11 +77,32 @@
#include vmmouse_client.h
/*
+ * This is the only way I know to turn a #define of an integer constant into
+ * a constant string.
+ */
+#define VMW_INNERSTRINGIFY(s) #s
+#define VMW_STRING(str) VMW_INNERSTRINGIFY(str)
+
+/*
* Version constants
*/
#define VMMOUSE_MAJOR_VERSION 12
#define VMMOUSE_MINOR_VERSION 4
-#define VMMOUSE_PATCHLEVEL 0
+#define VMMOUSE_PATCHLEVEL 2
+#define VMMOUSE_DRIVER_VERSION \
+ (VMMOUSE_MAJOR_VERSION * 65536 + VMMOUSE_MINOR_VERSION * 256 +
VMMOUSE_PATCHLEVEL)
+#define VMMOUSE_DRIVER_VERSION_STRING \
+VMW_STRING(VMMOUSE_MAJOR_VERSION) . VMW_STRING(VMMOUSE_MINOR_VERSION) \
+. VMW_STRING(VMMOUSE_PATCHLEVEL)
+
+/*
+ * Standard four digit version string expected by VMware Tools installer.
+ * As the driver's version is only {major, minor, patchlevel}, simply append
an
+ * extra zero for the fourth digit.
+ */
+const char vm_version[] __attribute__((section(.modinfo),unused)) =
+version= VMMOUSE_DRIVER_VERSION_STRING .0;
+
/*
*
xserver-xorg-input-vmmouse: Changes to 'upstream-unstable'
src/vmmouse.c | 11 ++-
1 files changed, 10 insertions(+), 1 deletion(-)
New commits:
commit 87d047e6132d5734ab65f0ef18354608dae39ec8
Author: Philip Langdale [EMAIL PROTECTED]
Date: Tue Feb 27 18:02:43 2007 -0800
Under certain circumstances, typically when the kernel PS/2 driver decides
to reset the PS/2 device, we can find ourselves in an inconsistent state
between the vmmouse driver and the virtual hardware. When this is
encountered,
we should re-request absolute mode from the hardware to get back in sync.
diff --git a/src/vmmouse.c b/src/vmmouse.c
index 5543c4c..2c2683b 100644
--- a/src/vmmouse.c
+++ b/src/vmmouse.c
@@ -919,9 +919,18 @@ GetVMMouseMotionEvent(InputInfoPtr pInfo){
int buttons, dx, dy, dz, dw;
VMMOUSE_INPUT_DATA vmmouseInput;
int ps2Buttons = 0;
+ int numPackets;
pMse = pInfo-private;
- while(VMMouseClient_GetInput(vmmouseInput)){
+ while((numPackets = VMMouseClient_GetInput(vmmouseInput))){
+ if (numPackets == VMMOUSE_ERROR) {
+ VMMouseClient_Disable();
+ VMMouseClient_Enable();
+ VMMouseClient_RequestAbsolute();
+ xf86Msg(X_INFO, VMWARE(0): re-requesting absolute mode after
reset\n);
+ break;
+ }
+
if(vmmouseInput.Buttons VMMOUSE_MIDDLE_BUTTON)
ps2Buttons |= 0x04;/* Middle*/
if(vmmouseInput.Buttons VMMOUSE_RIGHT_BUTTON)
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
xserver-xorg-input-vmmouse: Changes to 'upstream-unstable'
New branch 'upstream-unstable' available with the following commits: commit 16e12c2c08a92a7bb9c11d4a359bf9904998e93f Author: Adam Jackson [EMAIL PROTECTED] Date: Fri Apr 7 18:17:10 2006 + Unlibcwrap. Bump server version requirement. Bump to 12.4.0. commit 6a74d428e2ce1ad07b9dc8b361bd7c2e71dd19d0 Author: philipl philipl Date: Wed Mar 29 02:36:23 2006 + Bump PATCHLEVEL. Use the right #define when detecting a 64bit compilation. This fixes the driver to actually work for 64bit builds. commit 1d7b250cbda0b96a494a17fdfb53eb971907a35b Author: philipl philipl Date: Mon Jan 16 23:54:15 2006 + Fix for compilation with gcc4 and PIC. commit ee148a2f8ef97557ec2db501295ed8227699d2bf Author: philipl philipl Date: Mon Jan 9 19:12:26 2006 + Initial release of the vmmouse driver for VMware virtual machines. -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of unsubscribe. Trouble? Contact [EMAIL PROTECTED]
