summaryrefslogtreecommitdiff
path: root/src
AgeCommit message (Collapse)AuthorFilesLines
2013-09-30Don't de-reference pMse if it hasn't been initialised yetPeter Hutterer1-2/+4
If the device fails PreInit, UnInit is still called by pMse may be NULL. Dereferencing it is a bad idea. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2013-09-30Handle DEVICE_ABORT on ABI 19.1Peter Hutterer1-0/+9
Called on server abort, so let's just do the absolute minimum. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2013-02-07Free the vmmouse data on UnInitPeter Hutterer1-0/+7
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>
2012-11-23Fix compiler warnings about unused variablesPeter Hutterer1-14/+0
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>
2012-11-23Use sigsafe logging in ReadInput pathPeter Hutterer1-2/+6
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Thomas Hellstrom <thellstrom@vmware.com>
2012-08-07Reset ps2buttons to avoid button messages from being discarded.Stephen Brooks1-1/+1
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>
2012-05-03Enable hardware access during vmmouse preinit.Michal Srb1-0/+21
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>
2012-01-12Deal with opaque InputOption types in ABI 14Peter Hutterer1-15/+34
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>
2010-11-04Make the modinfo sring contain an optional subpatch numberThomas Hellstrom1-2/+8
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>
2010-11-04Adjust to input ABI 12.Peter Hutterer1-33/+117
New PreInit prototype that requires reshuffling. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
2010-11-04Move allocation of mPriv down.Peter Hutterer1-12/+10
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>
2010-11-04ABI 12 requires valuator modes to be specified.Peter Hutterer1-4/+20
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Acked-by: Thomas Hellstrom <thellstrom@vmware.com>
2010-11-04Move passthrough initialization out into a separate function.Peter Hutterer1-8/+12
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>
2010-11-04Remove superflouous assignment.Peter Hutterer1-1/+0
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>
2010-11-04Replace LocalDevicePtr with InputInfoPtr.Peter Hutterer1-5/+5
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>
2010-10-21InputDriverRec XINPUT cleanup.Trevor Woerner1-1/+4
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>
2010-10-21Deprecated code cleanup.Trevor Woerner1-9/+14
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>
2010-07-09Purge macro NEED_EVENTSFernando Carrijo1-1/+0
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>
2010-04-17Don't clobber CFLAGSJulien Cristau1-1/+1
CFLAGS is a user variable, don't set it from configure.
2010-04-17Include exevents.h for XIGetKnownPropertyJulien Cristau1-0/+1
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>
2010-02-26vmmouse: don't hardcode the module version in the sourceJulien Cristau1-7/+4
XORG_RELEASE_VERSION gives us that info from configure.ac, let's use it. Signed-off-by: Julien Cristau <jcristau@debian.org>
2009-09-08Symbol was removed from the server.Peter Hutterer1-0/+4
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-08-06Compile with INPUT ABI 7.Adam Jackson1-4/+52
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>
2009-07-29Needed by newer X servers, otherwise the module data is invisible and a ↵Peter Hutterer1-1/+1
dlopen error occurs. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2009-07-29Turn off built-in fallback-to-mouse-driver mechanism. With inputShelley Gong1-2/+11
hotplug, HAL handles deciding which driver to use and the presence of mouse_drv can't be assumed anymore on modern distros.
2009-06-06Remove ModuleInfoRec and associated bits.Matthias Hopf1-81/+0
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>
2009-05-111) Fix bug where motion notify events were being sent with every button event.Shelley Gong1-16/+37
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>
2008-12-22Fix make distcheck allowing custom build directories.Peter Hutterer1-4/+2
2008-12-22Fix build against master - add xf86OSmouse.hPeter Hutterer2-1/+278
2008-11-14Bump for 12.6.2 release.Philip Langdale1-1/+1
2008-11-13Only turn on absolute mode when we get an actual event; we don'tPhilip Langdale1-2/+10
want the driver to throw us into absolute mode just because the device is present but the user has a relative input path configured.
2008-11-13Don't flush buttons.Philip Langdale1-13/+2
Apply equivalent of commit 6a03e8bd9699a33dabcdd2bbcf51a001ddfd5534 from xf86-input-mouse.
2008-10-23Bump for 12.6.1 release.Philip Langdale1-1/+1
2008-10-23Bump version number for 12.6.0 release.Philip Langdale1-2/+2
2008-10-21Move shared vmmouse files into a separate static lib so we canPhilip Langdale6-765/+4
share it with the vmmouse detection utility I'm about to add.
2008-10-17Change ZAxisMapping default to match main mouse driver.Philip Langdale1-2/+2
2008-10-17Properly set axis range and resolution for Server 1.5+Philip Langdale1-0/+8
2008-10-14Revert "Grab mouse from kernel if possible."Matthias Hopf1-10/+0
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...
2008-09-29Grab mouse from kernel if possible.Matthias Hopf1-0/+10
Avoids mouse event duplication if a mouse driver is sitting on /dev/input/mice on Linux.
2008-08-19Remove useless call to xf86AddModuleInfoAdam Jackson1-6/+1
2008-06-16Check for XINPUT ABI 3.Jeff Smith1-1/+1
Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
2008-05-21Don't call conversion_proc for older XserversVinay Bondhugula1-93/+95
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.
2008-04-22Compatibility with older versions of XVinay Bondhugula2-5/+15
- 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.
2008-01-22Fix device to screen space coordinate conversionVinay Bondhugula1-1/+7
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?).
2008-01-19Fix an old sign bug for the relative modeVinay Bondhugula1-2/+4
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.
2007-09-25Update for 12.4.3 release.Philip Langdale1-1/+1
2007-09-24Add compatibility #define for compilation on pre-X.OrgPhilip Langdale1-0/+7
versions of the Xserver.
2007-09-24There are problems when running with old X releases with aPhilip Langdale1-1/+1
global symbol collision with the svga driver.
2007-09-10Guard modinfo section against gcc.Philip Langdale1-0/+2
2007-09-10Merge branch 'master' of ↵Philip Langdale1-2/+16
git+ssh://git.freedesktop.org/git/xorg/driver/xf86-input-vmmouse
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-05 19:28:42 +0000