summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-10-21tools: make install fails when user has no write permission in /libHEADmasterGaetan Nadon1-9/+6
The location of the udevdir is obtained from pkg-config. This is generally /lib/udev. Most people run their build scripts as non-root and do not want to overwrite or add files on their workstation system. This was not the behaviour in release 12.8.0. The code in configure.ac set udevdir based on common installation prefixes /usr or /usr/local for which the user would probably have root permission anyway. Other prefixes would be assigned a udevdir value under the given $prefix. The patch proposes the default location $libdir/udev/rules.d and no longer seeking it's value from pkg-config, just like what was done for hal. The expectation is that the xorg source tree can be built from top to bottom out of the box without tweaks or workarounds. A developer need to manually install a rule under development and run an admin command for it to take effect. Unlike binaries or libraries, there is no "path" style variable to append a rule in development from a different location. Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2013-10-21Drop AM_MAINTAINER_MODEPeter Hutterer1-2/+0
Long writeup: http://blogs.gnome.org/desrt/2011/09/08/am_maintainer_mode-is-not-cool/ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
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-09-24"make dist" fails when workstation has no udev packageGaetan Nadon1-1/+1
Unable to create a tar file for the vmmouse package or run distcheck for that matter. In tools, when the dev package is not installed, the makefile code under HAS_UDEV_RULES_DIR is commented out. That leaves $(udev_DATA) empty which causes EXTRA_DIST to be missing a file. The solution is to spell out the file name. The name can never change as the content of the tarball must be the same for everyone creating a tar file from git, regardless of their workstation configuration. Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2013-09-24Autoconf: Fix deprecated use of AC_OUTPUTGaetan Nadon1-1/+8
Use AC_CONFIG_FILES (once or more) and then AC_OUTPUT. Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2013-09-24Autoconf: minimum level required is 2.60Gaetan Nadon1-1/+1
The minimum for all X.Org modules. Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2013-09-24Autoconf: replace deprecated AC_HELP_STRING with AS_HELP_STRINGGaetan Nadon1-6/+6
Just a macro name change. Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2013-09-24Autoconf: remove AC_PROG_CC which overrides AC_PROG_CC_C99 from util-macrosGaetan Nadon1-1/+0
All other X.Org modules and mainly the server are using C99 compiler. Currently the compiler gets initialized twice, once to C99 from util-macros and once to C89 from configure.ac. Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
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>
2013-01-15vmmouse release 13.0.0Zack Rusin1-1/+1
Signed-off-by: Zack Rusin <zackr@vmware.com>
2012-12-06vmmouse 12.9.99.901Zack Rusin1-1/+1
Internal release for QE testing Signed-off-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-07Fetch the udev dir from udev.pc instead of guessing based on prefixPeter Hutterer3-15/+6
Reviewed-by: Gaetan Nadon<memsize@videotron.ca> 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>
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-22vmmouse 12.8.0Jakob Bornecrantz1-1/+1
Signed-off-by: Jakob Bornecrantz <jakob@vmware.com>
2012-05-10Revert "Adjust the kernel name in the udev file."Zack Rusin1-1/+1
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.
2012-05-03config: replace obsolete AM_CONFIG_HEADER with AC_CONFIG_HEADERSGaetan Nadon1-2/+2
Moved up in the autoconf init section. It has been removed from Automake 1.12. Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Signed-off-by: Zack Rusin <zackr@vmware.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-03-08vmmouse 12.8.0Zack Rusin1-1/+1
bump the version number for the new release Signed-off-by: Zack Rusin <zackr@vmware.com>
2012-03-08Adjust the kernel name in the udev file.Zack Rusin1-1/+1
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 <zackr@vmware.com> Reviewed-by: Jakob Bornecrantz <jakob@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>
2011-04-06Make the fdi script work with FreeBSDThomas Hellstrom1-0/+3
The key "input.originating_device" is not present on FreeBSD. Use "freebsd.driver" instead. Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com> Reviewed-by: Michel Dänzer <daenzer@vmware.com>
2011-03-02vmmouse 12.7.0Thomas Hellstrom1-1/+1
Remove trailing zero from version number. Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
2011-03-02vmmouse 12.7.0.0Thomas Hellstrom1-1/+1
VMware internal testing completed. Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
2010-12-08vmmouse 12.6.99.901Thomas Hellstrom1-1/+1
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
2010-12-08Make the .fdi script work on solarisThomas Hellstrom1-1/+1
Solaris doesn't use the same HAL device naming as Linux. Use the common part of the device name. Signed-off-by: Thomas Hellstrom <thellstrom@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-21make: remove duplicate definition of EXTRA_DISTGaetan Nadon1-2/+0
autoreconf -vfi produces this output: tools/Makefile.am:59: EXTRA_DIST multiply defined in condition TRUE ... tools/Makefile.am:36: ... `EXTRA_DIST' previously defined here Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Acked-by: Thomas Hellstrom <thellstrom@vmware.com>
2010-10-21config: upgrade to util-macros 1.8 for additional man page supportGaetan Nadon2-24/+4
Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS The value of MAN_SUBST is the same for all X.Org packages. Use AC_PROG_SED now supplied by XORG_DEFAULT_OPTIONS Use the appropriate platform version of sed Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Acked-by: Thomas Hellstrom <thellstrom@vmware.com>
2010-10-21tools make: use Autoconf provided $(AM_V_GEN)$(SED)Gaetan Nadon1-1/+1
Enables silent rule and use platform appropriate version of sed. Signed-off-by: Gaetan Nadon <memsize@videotron.ca> 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 Woerner2-9/+18
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-08-10xf86-input-vmmouse 12.6.10Adam Jackson1-1/+1
Signed-off-by: Adam Jackson <ajax@redhat.com>
2010-08-10Fix distcheckAdam Jackson1-2/+3
2010-07-09Improve Solaris compatibility of hal-probe-vmmouse generation ruleAlan Coopersmith1-2/+2
Use $(SED) from AC_PROG_SED to ensure a good version of sed is found Use explicit input file name instead of $< to workaround Solaris make issue with $< in explicit rules. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.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-06-12COPYING: update and refactor Copyright noticesGaetan Nadon1-19/+47
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-04-25config: git ignore recently added 69-xorg-vmmouse.rulesGaetan Nadon1-0/+1
Was added in 1d1c0514158abb66388ee4eb44764d201203a863 Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2010-04-19Only match against event[0-9] in udev rulesJakob Bornecrantz1-1/+1
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.
2010-04-17Don't clobber CFLAGSJulien Cristau4-6/+3
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-04-09Bump for 12.6.9 release.Peter Hutterer1-1/+1
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>