summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2024-07-14Move sizeof to second argument in calloc callsHEADmasterAlan Coopersmith5-7/+7
Clears -Wcalloc-transposed-args warnings from gcc 14.1, such as: mouse.c: In function ‘MousePreInit’: mouse.c:900:32: warning: ‘calloc’ sizes specified with ‘sizeof’ in the earlier argument and not in the later argument [-Wcalloc-transposed-args] 900 | if (!(pMse = calloc(sizeof(MouseDevRec), 1))) | ^~~~~~~~~~~ mouse.c:900:32: note: earlier argument should specify number of elements, later size of each element Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-input-mouse/-/merge_requests/17>
2024-05-30gitlab CI: FTBS: fix pkg-config pathEnrico Weigelt, metux IT consult1-2/+3
The pkg-config path isn't correct, so it finds an older version of xorgproto that's already present in the base image, instead of the newer one we've just built ourselves. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net> Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-input-mouse/-/merge_requests/15>
2024-05-30gitlab CI: FTBS: fix missing libepoll-shimEnrico Weigelt, metux IT consult1-2/+2
Recent Xserver needs libepoll-shim on FreeBSD. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net> Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-input-mouse/-/merge_requests/15>
2024-05-18use XNFrealloc() instead of xnfreallocEnrico Weigelt, metux IT consult1-1/+1
xnfrealloc is just an alias for XNFrealloc() that doesn't seem to serve any practical purpose, so it can go away once all drivers stopped using it. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net> Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-input-mouse/-/merge_requests/14>
2024-05-18use XNFstrdup() instead of xnfstrdupEnrico Weigelt, metux IT consult1-1/+1
xnfstrdup is just an alias for XNFstrdup() that doesn't seem to serve any practical purpose, so it can go away once all drivers stopped using it. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net> Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-input-mouse/-/merge_requests/14>
2024-05-18use XNFalloc() instead of xnfallocEnrico Weigelt, metux IT consult2-3/+3
xnfalloc is just an alias for XNFalloc() that doesn't seem to serve any practical purpose, so it can go away once all drivers stopped using it. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net> Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-input-mouse/-/merge_requests/14>
2024-05-12Raise required xserver version from 1.7 to 1.10 (ABI_XINPUT_VERSION 12.2)Alan Coopersmith6-124/+7
Xserver 1.10.0 was released in Feb. 2011 Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-input-mouse/-/merge_requests/11>
2024-05-12bsd_mouse: include sys/stat.h directly instead of relying on xf86_OSlib.hAlan Coopersmith1-0/+1
xf86_OSlib.h used to include sys/stat.h but that was recently removed by xorg/xserver@5057c716eb5960f6971be620ce03a808d0f191ac so we need to do it here now. Fixes compiler errors: bsd_mouse.c: In function 'FindDevice': bsd_mouse.c:282:17: error: storage size of 'devMouseStat' isn't known 282 | struct stat devMouseStat; | ^~~~~~~~~~~~ bsd_mouse.c:283:17: error: storage size of 'sb' isn't known 283 | struct stat sb; | ^~ bsd_mouse.c:298:21: error: implicit declaration of function 'fstat' [-Werror=implicit-function-declaration] 298 | if (fstat(fd, &devMouseStat) == 0) | ^~~~~ bsd_mouse.c:298:21: warning: nested extern declaration of 'fstat' [-Wnested-externs] bsd_mouse.c:283:17: warning: unused variable 'sb' [-Wunused-variable] 283 | struct stat sb; | ^~ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-input-mouse/-/merge_requests/12>
2024-05-12gitlab CI: install xorgproto from git before building the XserverAlan Coopersmith1-2/+8
Xserver git is now failing to build due to: Dependency presentproto found: NO found 1.3 but need: '>= 1.4' Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-input-mouse/-/merge_requests/12>
2024-03-19Fix missing #include <errno.h>Enrico Weigelt, metux IT consult2-0/+3
Two source files currently relying on xorg headers including errno.h for them. Even though it practically works, it's not a very robust programming style to rely on indirect includes. It's better when everybody includes what he need on its own. Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
2023-12-02configure: Use LT_INIT from libtool 2 instead of deprecated AC_PROG_LIBTOOLAlan Coopersmith1-2/+1
AC_PROG_LIBTOOL was replaced by LT_INIT in libtool 2 in 2008, so it's time to rely on it. Clears autoconf warnings: configure.ac:39: warning: The macro 'AC_PROG_LIBTOOL' is obsolete. configure.ac:39: You should run autoupdate. aclocal.m4:3465: AC_PROG_LIBTOOL is expanded from... configure.ac:39: the top level Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2023-12-02gitlab CI: update to latest ci-templates & FreeBSD 14.0Alan Coopersmith1-3/+3
Needed to avoid "Failed to unpack image" errors in the container-prep job since FreeBSD 13.0 images are no longer available for download Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2023-05-04xf86-input-mouse 1.9.5xf86-input-mouse-1.9.5Alan Coopersmith1-1/+1
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2023-02-25Remove "All rights reserved" from Oracle copyright noticesAlan Coopersmith2-2/+2
Oracle no longer includes this term in our copyright & license notices. Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2022-11-09sun_mouse: remove entry from vuidMouseList in DEVICE_CLOSEAlan Coopersmith1-1/+14
Originally written by fei.feng@oracle.com to fix Oracle Bug 17429216: "global vuidMouseList should not keep info for removed mouse device" "During the testing for bug#17251473, I often see the mouse hang in X. By debugging, I get that there seems something wrong in mouse_drv.so - when a mouse is disconnected, the global vuidMouseList does not cleanup the mouse's recorded info. So if a newly inserted mouse allocates a input info pInfo which happens to have the same memory address as previous pInfo, the driver would go wrong." Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2022-11-09sun_mouse: Add RelToAbs option to convert relative events to absoluteAlan Coopersmith1-2/+167
Enabled automatically for the Sun ILOM device, to avoid acceleration that causes the Remote KVMS mouse cursor to become unaligned with the X mouse cursor. Code originally written by david.m.marx@oracle.com in 2013 to fix Oracle bug 15798251 - SUNBT7177072 "actual mouse pointer is off from the cursor on remote window" Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2022-11-02sun_mouse: include more required system headersAlan Coopersmith2-4/+4
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2022-11-02Rearrange includes to fix build on OmniOS. Include unistd.h for ioctl(2).Thomas Klausner1-3/+4
Signed-off-by: Thomas Klausner <wiz@gatalith.at>
2022-11-01xf86-input-mouse 1.9.4xf86-input-mouse-1.9.4Alan Coopersmith1-2/+2
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2022-11-01sun_mouse.c: #include "config.h"Alan Coopersmith1-0/+4
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2022-10-17configure: check for timingsafe_memcmpAlan Coopersmith1-1/+1
Not needed by mouse driver, but quiets warnings from xorg server headers: In file included from /usr/include/xorg/misc.h:117:0, from /usr/include/xorg/xf86str.h:37, from /usr/include/xorg/xf86.h:44, from mouse.c:57: /usr/include/xorg/os.h:595:1: warning: redundant redeclaration of ‘timingsafe_memcmp’ [-Wredundant-decls] timingsafe_memcmp(const void *b1, const void *b2, size_t len); ^~~~~~~~~~~~~~~~~ In file included from mouse.c:52:0: /usr/include/string.h:235:12: note: previous declaration of ‘timingsafe_memcmp’ was here extern int timingsafe_memcmp(const void *s1, const void *s2, size_t n); ^~~~~~~~~~~~~~~~~ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2022-10-17autoGood: quiet -Wimplicit-fallthrough warningAlan Coopersmith1-0/+1
mouse.c: In function ‘autoGood’: mouse.c:3724:12: warning: this statement may fall through [-Wimplicit-fallthrough=] if (mPriv->goodCount < PROBE_UNCERTAINTY/2) ^ mouse.c:3726:5: note: here default: ^~~~~~~ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2022-10-17InputDriverRec: Fix -Wmissing-field-initializers warningAlan Coopersmith1-6/+12
mouse.c:185:1: warning: missing initializer for field ‘default_options’ of ‘InputDriverRec {aka struct _InputDriverRec}’ [-Wmissing-field-initializers] }; ^ In file included from mouse.c:63:0: /usr/include/xorg/xf86Xinput.h:83:18: note: ‘default_options’ declared here const char **default_options; ^~~~~~~~~~~~~~~ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2022-10-16SetupMouse: fix -Wsign-compare warningAlan Coopersmith1-2/+1
mouse.c: In function ‘SetupMouse’: mouse.c:2620:27: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] for (i = 0; i < sizeof(pMse->protoPara); i++) ^ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2022-10-16checkForErraticMovements: Fix -Wempty-body warningsAlan Coopersmith1-2/+4
mouse.c: In function ‘checkForErraticMovements’: mouse.c:3759:52: warning: suggest braces around empty body in an ‘else’ statement [-Wempty-body] AP_DBG(("accDx=%i\n",mPriv->accDx)); ^ mouse.c:3772:52: warning: suggest braces around empty body in an ‘else’ statement [-Wempty-body] AP_DBG(("accDy=%i\n",mPriv->accDy)); ^ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2022-10-16sun_mouse: Fix -Wnull-dereference warningAlan Coopersmith1-2/+5
sun_mouse.c: In function ‘vuidReadInput’: sun_mouse.c:291:10: warning: potential null pointer dereference [-Wnull-dereference] pBuf = pVuidMse->buffer; ~~~~~^~~~~~~~~~~~~~~~~~ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2022-10-16sun_mouse: Fix -Wsign-compare warningsAlan Coopersmith1-3/+3
sun_mouse.c: In function ‘vuidReadInput’: sun_mouse.c:299:22: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] } else if (n == -1) { ^~ sun_mouse.c: In function ‘vuidMouseProc’: sun_mouse.c:507:33: warning: comparison between signed and unsigned integer expressions [-Wsign-compare] if (vuidMouseGeneration != serverGeneration) { ^~ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2022-10-16gitlab CI: stop requiring Signed-off-by in commitsAlan Coopersmith1-2/+2
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2022-01-17gitlab CI: add a basic build testAlan Coopersmith1-0/+127
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2022-01-16Fix spelling/wording issuesAlan Coopersmith4-15/+15
Found by using: codespell --builtin clear,rare,usage,informal,code,names Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2022-01-16Build xz tarballs instead of bzip2Alan Coopersmith1-1/+1
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2018-11-25Update configure.ac bug URL for gitlab migrationAlan Coopersmith1-1/+1
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2018-06-18xf86-input-mouse 1.9.3xf86-input-mouse-1.9.3Matt Turner1-1/+1
Signed-off-by: Matt Turner <mattst88@gmail.com>
2018-02-21bsd: Don't try to use SIGIO for input ABI >= 23Adam Jackson1-0/+2
Signed-off-by: Adam Jackson <ajax@redhat.com>
2017-02-16Adapt to removal of xf86GetOSAdam Jackson1-6/+5
Signed-off-by: Adam Jackson <ajax@redhat.com>
2017-01-26autogen: add default patch prefixMihail Konev1-0/+3
Signed-off-by: Mihail Konev <k.mvc@ya.ru>
2017-01-26autogen.sh: use quoted string variablesEmil Velikov1-4/+4
Place quotes around the $srcdir, $ORIGDIR and $0 variables to prevent fall-outs, when they contain space. Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2017-01-26autogen.sh: use exec instead of waiting for configure to finishPeter Hutterer1-1/+1
Syncs the invocation of configure with the one from the server. Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
2016-11-17mouse 1.9.2xf86-input-mouse-1.9.2Peter Hutterer1-1/+1
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2016-09-06Support ABI_XINPUT_VERSION 24 (remove LastSelectMask from block/wakeup)Keith Packard1-9/+12
The block and wakeup handler API is changing so that the FD_SET type isn't visible outside the OS layer anymore. The mouse driver didn't need that argument anyways, so the change is just to adjust the APIs to avoid compiler warnings. Signed-off-by: Keith Packard <keithp@keithp.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2016-06-01Support ABI_XINPUT_VERSION 23 (use input_lock/input_unlock)Keith Packard1-0/+24
This makes using input_lock/input_unlock conditional on the ABI version so that we don't get compiler warnings when compiling with the newer server bits. Signed-off-by: Keith Packard <keithp@keithp.com> Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
2015-07-27Add some standard defines to pkg-config file.Thomas Klausner1-0/+4
Not strictly needed in the xorg build, but helps the NetBSD reachover build, and follows implicit conventions about pkg-config files more closely. See also http://gnats.netbsd.org/48991 Signed-off-by: Thomas Klausner <wiz@NetBSD.org> Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2015-03-06README: Drop ancient, no longer supported versions of SolarisAlan Coopersmith1-2/+2
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2015-03-06README: Add "or xf86-input-libinput" to -evdev note for LinuxAlan Coopersmith1-1/+1
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2014-08-11xf86-input-mouse 1.9.1xf86-input-mouse-1.9.1Alan Coopersmith1-1/+1
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2014-07-11Update some outdated language in a comment on obsolete hardwareAlan Coopersmith1-1/+1
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
2014-05-20Make absolute input reporting in Solaris aware of resolution changesMichael Thayer1-9/+33
Currently on Solaris absolute input reporting only takes resolution changes into account when the video driver is using the pre-RandR 1.2 APIs, and there it uses the physical resolution, not the virtual. This patch fixes those two things. Signed-off-by: Michael Thayer <michael.thayer@oracle.com> Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
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>