Age | Commit message (Collapse) | Author |
|
Wheel is using buttons 4/5, but btn_labels array is 0-based.
It matches mouse and evdev drivers, and fixes wheel in Qt5.3.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
If the device fails PreInit, UnInit is still called by pMse may be NULL.
Dereferencing it is a bad idea.
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
Called on server abort, so let's just do the absolute minimum.
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
|
|
xf86DeleteInput() will free pInfo->private, but not the one hanging off
that.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Tested-by: Zack Rusin <zackr@vmware.com>
|
|
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.hutterer@who-t.net>
Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>
|
|
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>
|
|
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Jakob Bornecrantz <jakob@vmware.com>
Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
Signed-off-by: Stephen Brooks <nightbikeman@gmail.com>
|
|
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 <zackr@vmware.com>
|
|
Tested-by: Jakob Bornecrantz <jakob@vmware.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
|
|
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 <thellstrom@vmware.com>
|
|
New PreInit prototype that requires reshuffling.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
|
|
No functional change. If we get to this point, we know it's available.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Thomas Hellstrom <thellstrom@vmware.com>
|
|
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Thomas Hellstrom <thellstrom@vmware.com>
|
|
No functional changes, just modularising a bit to make future changes
easier.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
|
|
mPriv is freed a few lines down, assigning anything here makes no
difference.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Thomas Hellstrom <thellstrom@vmware.com>
|
|
The LocalDevicePtr define was removed from the server with ABI 12, but
InputInfoPtr has been an alias for it since the Xfree86/Xorg fork.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Acked-by: Thomas Hellstrom <thellstrom@vmware.com>
|
|
ABI version 11 of the InputDriverRec data structure no longer
includes the refCount member.
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>
|
|
Replace calls to deprecated dynamic memory wrapper functions
in driver code.
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>
|
|
Signed-off-by: Fernando Carrijo <fcarrijo@yahoo.com.br>
Acked-by: Tiago Vignatti <tiago.vignatti@nokia.com>
Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
Fixes this compiler warning:
vmmouse.c: In function ‘VMMouseDeviceControl’:
vmmouse.c:734: warning: implicit declaration of function ‘XIGetKnownProperty’
Signed-off-by: Julien Cristau <jcristau@debian.org>
|
|
XORG_RELEASE_VERSION gives us that info from configure.ac, let's use it.
Signed-off-by: Julien Cristau <jcristau@debian.org>
|
|
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
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.hutterer@who-t.net>
|
|
dlopen error occurs.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
hotplug, HAL handles deciding which driver to use and the presence
of mouse_drv can't be assumed anymore on modern distros.
|
|
ModuleInfoRec was removed with 2107becb0ce2ffda001be65728c53563496d8d50 from
the server. The MouseOpts were only used from the ModuleInfoRec, they're gone
now too.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
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 <philipl@fido2.homeip.net>
|
|
|
|
want the driver to throw us into absolute mode just because the
device is present but the user has a relative input path configured.
|
|
Apply equivalent of commit 6a03e8bd9699a33dabcdd2bbcf51a001ddfd5534
from xf86-input-mouse.
|
|
|
|
|
|
|
|
|
|
This reverts commit 028e7d0001d4948e7b11a68d904c6b307a1ccfb3.
The test turned out to be bogus, in fact, the patch had no effect.
The used kernel mouse driver doesn't even allow grabbing...
|
|
Avoids mouse event duplication if a mouse driver is sitting on /dev/input/mice
on Linux.
|
|
|
|
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
|
|
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.
|
|
- Makes the driver compile againt older versions of X (tested upto 4.3).
- Bump up the version number in configure.ac and the modinfo section.
- A couple of trivial whitespace cleanups.
|
|
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?).
|
|
|
|
versions of the Xserver.
|
|
global symbol collision with the svga driver.
|
|
|
|
git+ssh://git.freedesktop.org/git/xorg/driver/xf86-input-vmmouse
|
|
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.
|
|
(Copied from daniels' fix to xf86-input-mouse)
|
|
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.
|
|
|