summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-04-18Do not drop the result of protocol detectionMichael Thayer1-5/+2
In MousePickProtocol() with protocol PROT_AUTO we probe for the protocol to use but drop the result in most cases. This was causing DEVICE_INIT and DEVICE_ON to fail to be called with the VUID protocol. Git history suggests that this code was originally meant to cover both PS/2 auto-detection and OS- specific detection, but that only the first case was implemented at the time. Now that only the second is needed dropping the result to keep the protocol as PROT_AUTO is presumably no longer useful and seems to actively breaking things. Signed-off-by: Michael Thayer <michael.thayer@oracle.com> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2014-03-30Add support for absolute positioning (tablets).Thomas Klausner1-1/+21
From Pierre Pronchery <khorben@NetBSD.org> and review comments by Daniel Stone <daniel@fooishbar.org>. Reviewed-by: Daniel Stone <daniel@fooishbar.org> Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
2014-03-30For wsmouse, keep 3-button emulation status.Thomas Klausner1-0/+11
With a multiplexed device like wsmouse it does not make sense to kill emulate3buttons on the first button-3-pressed event. The button-3 pressed may belong to a mouse long gone and leave the internal (two button only) mousepad useless. Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> From Martin Husemann <martin@NetBSD.org> Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
2014-03-30Make wsmouse (re-)init the version.Thomas Klausner1-0/+11
This makes sure that the xserver and the mouse speak the same protocol version. Acked-by: Alan Coopersmith <alan.coopersmith@oracle.com> From Matthew R. Green <mrg@NetBSD.org> Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
2014-03-30Enable MSE_MISC on NetBSD as well.Thomas Klausner1-3/+1
Otherwise we can't find WSMouse. Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> From Matthew R. Green <mrg@NetBSD.org> Signed-off-by: Thomas Klausner <wiz@NetBSD.org>
2014-01-05Add AC_SYSTEM_EXTENSIONS to expose asprintf with GNU libcPatrik Jakobsson1-0/+1
As required by the following commit: commit 8c75f6e1c117f3d05f0bc7bed34f0e7e933f3b9a Use asprintf (or Xprintf on old servers) instead of strdup+sprintf Signed-off-by: Patrik Jakobsson <patrik.r.jakobsson@gmail.com> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2013-11-03Use asprintf (or Xprintf on old servers) instead of strdup+sprintfAlan Coopersmith2-17/+43
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2013-10-19Wrap some overly long linesAlan Coopersmith1-12/+22
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2013-03-27mouse 1.9.0xf86-input-mouse-1.9.0Peter Hutterer1-1/+1
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2013-01-16autogen.sh: Implement GNOME Build APIColin Walters1-1/+3
http://people.gnome.org/~walters/docs/build-api.txt Signed-off-by: Adam Jackson <ajax@redhat.com>
2013-01-16configure: Drop AM_MAINTAINER_MODEAdam Jackson1-1/+0
Signed-off-by: Adam Jackson <ajax@redhat.com>
2012-10-08Use signal-safe logging if availablePeter Hutterer5-41/+49
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Chase Douglas <chase.douglas@ubuntu.com>
2012-08-17Fix compilation error with EXTMOUSEDEBUG onPeter Hutterer1-2/+1
pInfo->atom was removed in xorg-server-1.9.0-26-g9802cca Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2012-07-31xf86-input-mouse 1.8.1xf86-input-mouse-1.8.1Peter Hutterer1-1/+1
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2012-07-31Fix compiler warning in sun_mouse.c (Solaris-only)Alan Coopersmith1-1/+1
sun_mouse.c: In function 'vuidRemoveMouse': sun_mouse.c:150:42: warning: declaration of 'time' shadows a global declaration Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2012-07-31Rename xf86-mouse.pc to xorg-mouse.pcPeter Hutterer3-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>
2012-07-31Install xf86-mouse.pc filePeter Hutterer1-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>
2012-07-30Fix compiler warningsPeter Hutterer2-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>
2012-07-26xf86-input-mouse 1.8.0xf86-input-mouse-1.8.0Alan Coopersmith1-1/+1
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2012-07-25Fix vuidMouseAdjustFrame to build with Xorg 1.13 ABIAlan Coopersmith4-8/+110
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2012-07-24Raise bar for xorg-server to 1.7 for XINPUT ABI 7Alan Coopersmith2-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>
2012-04-30Expand tabs to spacesAlan Coopersmith8-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>
2012-04-30Strip trailing whitespaceAlan Coopersmith8-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>
2012-04-30Add settable properties for middle mouse button emulationAlan Coopersmith8-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>
2012-04-30Set button & axis labelsAlan Coopersmith1-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>
2012-04-30Set XI_PROP_DEVICE_NODE property to string from "Device" optionAlan Coopersmith2-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>
2012-04-30sun_mouse.c: Remove redundant option checksAlan Coopersmith1-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>
2012-03-15xf86-input-mouse 1.7.2xf86-input-mouse-1.7.2Alan Coopersmith1-1/+1
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2011-12-22sun_mouse.c: remove unused variablesAlan Coopersmith1-2/+0
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2011-12-22Mark symtab_t.name in pnp.c as const to fix gcc -Wwrite-strings warningsAlan Coopersmith1-1/+1
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2011-12-05Avoid NULL pointer dereference in autoProbeMouse if proto == PROT_UNSUPAlan Coopersmith1-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>
2011-08-22Fix wrong read Protocol and Device from xorg.confAlexandr Shadchin1-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>
2011-07-27sun_mouse.c: Ensure vuidMouse setup routines are called for protocol "Auto"Alan Coopersmith1-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>
2011-07-27No need to merge NULL options list with existing optionsAlan Coopersmith1-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>
2011-07-18xf86-input-mouse: Return proper default for unknown values in ↵Terry Lambert2-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>
2011-07-05xf86-input-mouse 1.7.1xf86-input-mouse-1.7.1Alan Coopersmith1-1/+1
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2011-06-27Fix Solaris issues with new ABI12 init process.Alan Coopersmith3-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>
2011-03-30Fix Hurd mouse driver with XInput ABI before 12Samuel Thibault1-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.
2011-03-30Fix OSMouse OS-defined protocol supportSamuel Thibault1-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>
2011-03-10mouse 1.7.0xf86-input-mouse-1.7.0Peter Hutterer1-1/+1
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-03-10Fix BSD issues with new ABI12 init process.Alexandr Shadchin3-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>
2011-02-21mouse 1.6.99.901xf86-input-mouse-1.6.99.901Peter Hutterer1-1/+1
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2011-02-21man: ClearDTR and ClearRTS are handled by the X server.Peter Hutterer1-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>
2011-02-21man: protocol option isn't mandatory, it's platform-specific.Peter Hutterer1-2/+2
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Cyril Brulebois <kibi@debian.org>
2011-02-21man: fix typo "Auto platform" → "Auto protocol"Peter Hutterer1-1/+1
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Cyril Brulebois <kibi@debian.org>
2011-02-21man: README.mouse is just READMEPeter Hutterer1-2/+3
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Cyril Brulebois <kibi@debian.org>
2011-02-21man: add mention of xorg.conf.d snippetPeter Hutterer1-2/+3
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Cyril Brulebois <kibi@debian.org>
2011-02-21man: remove mention of core pointer.Peter Hutterer1-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>
2010-11-30Add ABI checks around XI86_CONFIGURED uses in OS-specific PreInitsAlan Coopersmith3-0/+8
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2010-11-25Bump to 1.6.99Peter Hutterer1-1/+1
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-27 07:32:32 +0000