summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* Rename xf86-mouse.pc to xorg-mouse.pcPeter Hutterer2012-07-313-3/+3
| | | | | | | | | Other input drivers already shipping pkgconfig files use this naming scheme and since the 1.8 release didn't install the file anyway, renaming is still acceptable at this point. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
* Install xf86-mouse.pc filePeter Hutterer2012-07-311-0/+3
| | | | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Jeremy Huddleston <jeremyhu@apple.com> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
* Fix compiler warningsPeter Hutterer2012-07-302-9/+9
| | | | | | | | | | | | | | | | | | | | | | pnp.c: In function 'probePs2ProtocolPnP': pnp.c:711:31: warning: declaration of 'seq' shadows a previous local [-Wshadow] pnp.c:705:23: warning: shadowed declaration is here [-Wshadow] mouse.c: In function 'MouseCommonOptions': mouse.c:330:13: warning: declaration of 'i' shadows a previous local [-Wshadow] mouse.c:279:9: warning: shadowed declaration is here [-Wshadow] mouse.c: In function 'autoProbeMouse': mouse.c:3602:29: warning: declaration of 'proto' shadows a global declaration [-Wshadow] mouse.c:2482:22: warning: shadowed declaration is here [-Wshadow] Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
* xf86-input-mouse 1.8.0xf86-input-mouse-1.8.0Alan Coopersmith2012-07-261-1/+1
| | | | Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
* Fix vuidMouseAdjustFrame to build with Xorg 1.13 ABIAlan Coopersmith2012-07-254-8/+110
| | | | Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
* Raise bar for xorg-server to 1.7 for XINPUT ABI 7Alan Coopersmith2012-07-242-15/+3
| | | | | | | | | Not all of the button label settings were wrapped in ABI #ifdefs, so just drop all #ifdefs for GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 7 Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
* Expand tabs to spacesAlan Coopersmith2012-04-308-3144/+3144
| | | | | | | | | | Existing code had a mix of places tab & space characters were used. Make them all spaces for consistency, since that's the new style chosen for xorg-server. "git diff -w" shows no changes - this is pure whitespace adjustment. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
* Strip trailing whitespaceAlan Coopersmith2012-04-308-211/+211
| | | | | | | cleanup done via: perl -p -i -e 's/[\t ]*$//' "git diff -w" shows no changes - this is pure whitespace adjustment. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
* Add settable properties for middle mouse button emulationAlan Coopersmith2012-04-308-11/+146
| | | | | | | | | | | | | | | Based on evdev's similar properties, including using the name "middle" button, to avoid confusion with evdev's 3rd button emulation for emulating the right button on a single button mouse. Allows manual enable & disable at runtime. Exports new xf86-mouse.pc & xf86-mouse-properties.h for property name definitions. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Alexandr Shadchin <alexandr.shadchin@gmail.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
* Set button & axis labelsAlan Coopersmith2012-04-301-1/+41
| | | | | | Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Alexandr Shadchin <alexandr.shadchin@gmail.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
* Set XI_PROP_DEVICE_NODE property to string from "Device" optionAlan Coopersmith2012-04-302-1/+25
| | | | | | Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Alexandr Shadchin <alexandr.shadchin@gmail.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
* sun_mouse.c: Remove redundant option checksAlan Coopersmith2012-04-301-6/+0
| | | | | | | | | | Previously they checked pInfo->options, then fell back to pInfo->conf_idev->commonOptions - but then 7bf22a368c752fe76dc replaced the latter with the former, resulting in some redunancy. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Alexandr Shadchin <alexandr.shadchin@gmail.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
* xf86-input-mouse 1.7.2xf86-input-mouse-1.7.2Alan Coopersmith2012-03-151-1/+1
| | | | Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
* sun_mouse.c: remove unused variablesAlan Coopersmith2011-12-221-2/+0
| | | | Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
* Mark symtab_t.name in pnp.c as const to fix gcc -Wwrite-strings warningsAlan Coopersmith2011-12-221-1/+1
| | | | Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
* Avoid NULL pointer dereference in autoProbeMouse if proto == PROT_UNSUPAlan Coopersmith2011-12-051-1/+3
| | | | | | | | | | | | | | | | | Error: Null pointer dereference (CWE 476) Read from null pointer 'GetProtocol(proto)' at line 3477 of src/mouse.c in function 'autoProbeMouse'. Function 'GetProtocol' may return constant 'NULL' at line 736, called at line 3477. Null pointer introduced at line 736 in function 'GetProtocol'. We already handle one of the two cases that make GetProtocol return NULL, proto == PROTO_UNKNOWN, but not PROT_UNSUP. [ This bug was found by the Parfait 0.4.2 bug checking tool. For more information see http://labs.oracle.com/projects/parfait/ ] Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Alexandr Shadchin <alexandr.shadchin@gmail.com>
* Fix wrong read Protocol and Device from xorg.confAlexandr Shadchin2011-08-221-0/+2
| | | | | | | | | Add call xf86CollectInputOptions() before using pInfo->options. The bug is seeing by ABI < 12. Signed-off-by: Alexandr Shadchin <Alexandr.Shadchin@gmail.com> Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* sun_mouse.c: Ensure vuidMouse setup routines are called for protocol "Auto"Alan Coopersmith2011-07-271-1/+7
| | | | | | | | | | | | | | | | | Fixes regression caused by commit b12fa0d5ab23 in which devices with protocol "Auto" (generally just PS/2 devices on Solaris, since HAL sets protocol "VUID" for USB devices already) weren't going through vuidMousePreInit and setting up the device_control & read_input pointers to the routines which know how to decode VUID packets. Adds a check to vuidPreInit to ensure we don't leak memory if called twice for the same device, just in case I missed a code path, or a new one appears in the future. Fixes Solaris bug 7070321: Mouse protocol "Auto" does not work in build 170 Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
* No need to merge NULL options list with existing optionsAlan Coopersmith2011-07-271-4/+4
| | | | | | | | | Appending NULL to an existing options list simply walks the entire existing list before returning it unchanged, so if we aren't creating a new list to merge, don't bother merging it either. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
* xf86-input-mouse: Return proper default for unknown values in ↵Terry Lambert2011-07-182-0/+6
| | | | | | | | pInfo->device_control. Signed-off-by: Terry Lambert <tlambert@chromium.org> Reviewed-by: Stephane Marchesin <marcheu@chromium.org> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* xf86-input-mouse 1.7.1xf86-input-mouse-1.7.1Alan Coopersmith2011-07-051-1/+1
| | | | Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
* Fix Solaris issues with new ABI12 init process.Alan Coopersmith2011-06-273-68/+3
| | | | | | | | | | Based on BSD changes in commit a22879c6779283684fe4a61543fc95179b4f5d0b by Alexandr Shadchin Fix segfaults when mouse device fails to open. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Fix Hurd mouse driver with XInput ABI before 12Samuel Thibault2011-03-301-0/+8
| | | | | | Commit 7bf22a36 (Use pInfo->options instead of conf-idev.) updated the xf86CollectInputOptions call into keeping previous options (for ABI before 12). The hurd mouse driver also needs to be updated.
* Fix OSMouse OS-defined protocol supportSamuel Thibault2011-03-301-0/+2
| | | | | | | | Fix regression introduced by 0a088df6: in the case of an OS-specific protocol, the protocol is PROT_UNKNOWN, but should not be rejected: the core mouse drive just needs to let the OS driver handle it. Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
* mouse 1.7.0xf86-input-mouse-1.7.0Peter Hutterer2011-03-101-1/+1
| | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Fix BSD issues with new ABI12 init process.Alexandr Shadchin2011-03-103-26/+7
| | | | | | | | | | | | | | | | | | | From Bug 34794: "Until xf86-input-mouse-1.6.0, the MousePreInit() function exited if an os specific PreInit function existed. It let the os-specific function finish all initialisations that remained to be done after osInfo->PreInit() was called. The code in master now continues, and does things that the bsdMousePreInit() function in bsd_mouse.c doesn't expect." Fix up wsconsPreInit to deal with the new init process. Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=34794 Signed-off-by: Alexandr Shadchin <Alexandr.Shadchin@gmail.com> Reviewed-by: Matthieu Herrb <matthieu.herrb@laas.fr> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* mouse 1.6.99.901xf86-input-mouse-1.6.99.901Peter Hutterer2011-02-211-1/+1
| | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* man: ClearDTR and ClearRTS are handled by the X server.Peter Hutterer2011-02-211-2/+4
| | | | | | | If it breaks, we know who to blame (or file a bug against). Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Cyril Brulebois <kibi@debian.org>
* man: protocol option isn't mandatory, it's platform-specific.Peter Hutterer2011-02-211-2/+2
| | | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Cyril Brulebois <kibi@debian.org>
* man: fix typo "Auto platform" → "Auto protocol"Peter Hutterer2011-02-211-1/+1
| | | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Cyril Brulebois <kibi@debian.org>
* man: README.mouse is just READMEPeter Hutterer2011-02-211-2/+3
| | | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Cyril Brulebois <kibi@debian.org>
* man: add mention of xorg.conf.d snippetPeter Hutterer2011-02-211-2/+3
| | | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Cyril Brulebois <kibi@debian.org>
* man: remove mention of core pointer.Peter Hutterer2011-02-211-3/+2
| | | | | | | This doesn't apply to X servers 1.7 and later. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Cyril Brulebois <kibi@debian.org>
* Add ABI checks around XI86_CONFIGURED uses in OS-specific PreInitsAlan Coopersmith2010-11-303-0/+8
| | | | | Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
* Bump to 1.6.99Peter Hutterer2010-11-251-1/+1
| | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
* Adjust to new Input ABI 12.Peter Hutterer2010-11-185-26/+76
| | | | | | | New PreInit prototype and a couple of other minor changes. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
* ABI 12 requires per-valuator modes.Peter Hutterer2010-11-181-2/+10
| | | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
* Use pInfo->options instead of conf-idev.Peter Hutterer2010-11-185-21/+23
| | | | | | | Because it doesn't really matter anyway, I think. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
* Remove write-only field mouseFlags.Peter Hutterer2010-10-262-24/+1
| | | | | | | | | The flags were used to store ClearDTS and ClearRTR, but those options only resulted in log messages. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Tested-by: Alan Coopersmith <alan.coopersmith@oracle.com>
* Rename xf86OSMouseInit to OSMouseInit.Peter Hutterer2010-10-266-9/+9
| | | | | | | | This isn't a DDX function anymore. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Tested-by: Alan Coopersmith <alan.coopersmith@oracle.com>
* Remove random History comment.Peter Hutterer2010-10-261-11/+0
| | | | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Tested-by: Alan Coopersmith <alan.coopersmith@oracle.com>
* Rename xf86OSmouse.h to mouse.hPeter Hutterer2010-10-269-281/+268
| | | | | | | | | The driver-internal mouse.h header was only an include command for xf86OSmouse.h anyway. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Tested-by: Alan Coopersmith <alan.coopersmith@oracle.com>
* Remove a bunch of unused fields from the MouseRec.Peter Hutterer2010-10-261-6/+0
| | | | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Tested-by: Alan Coopersmith <alan.coopersmith@oracle.com>
* Move a statement down to have all allocations close together.Peter Hutterer2010-10-261-6/+7
| | | | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Tested-by: Alan Coopersmith <alan.coopersmith@oracle.com>
* Remove convoluted do { } while loop.Peter Hutterer2010-10-261-20/+15
| | | | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Tested-by: Alan Coopersmith <alan.coopersmith@oracle.com>
* Move protocol ID detection into a separate function.Peter Hutterer2010-10-261-45/+57
| | | | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Tested-by: Alan Coopersmith <alan.coopersmith@oracle.com>
* Use single exit path for PreInit.Peter Hutterer2010-10-261-8/+10
| | | | | | Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Tested-by: Alan Coopersmith <alan.coopersmith@oracle.com>
* De-duplicate Option "Device" handling.Peter Hutterer2010-10-261-28/+26
| | | | | | | | | | Move the warning messages and the OS-specific autoprobing calls into a new function. This will change the order log messages appear in but functional changes should be identical. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Tested-by: Alan Coopersmith <alan.coopersmith@oracle.com>
* Remove unused branch from if 1 condition.Peter Hutterer2010-10-261-6/+0
| | | | | | | | This has been in since 2003 or earlier, let's pretend it works. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Tested-by: Alan Coopersmith <alan.coopersmith@oracle.com>
* Remove a bunch of unnecessary log prints.Peter Hutterer2010-10-261-25/+1
| | | | | | | | xf86SetFooOption will print to the log anyway, no need to print twice. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Tested-by: Alan Coopersmith <alan.coopersmith@oracle.com>
View Lorry Controller Status