xserver-xorg-input-mouse: Changes to 'debian-unstable'
ChangeLog | 421 ++++++++++++++++++++++++++++++++++++++++++++++++++++
configure.ac | 2
debian/changelog | 6
man/mousedrv.man | 27 +--
src/Makefile.am | 1
src/bsd_mouse.c | 44 ++---
src/hurd_mouse.c | 22 +-
src/lnx_mouse.c | 20 +-
src/mouse.c | 433 +++++++++++++++++++++++-------------------------------
src/mouse.h | 260 +++++++++++++++++++++++++++++++-
src/pnp.c | 1
src/sun_mouse.c | 60 +++----
src/xf86OSmouse.h | 274 ----------------------------------
13 files changed, 957 insertions(+), 614 deletions(-)
New commits:
commit aee0ab3737aa5e0d850638ec9f397ee0ad28af18
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Feb 21 02:17:37 2011 +0100
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index 76a2d07..8c93b5e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xserver-xorg-input-mouse (1:1.6.99.901-1) UNRELEASED; urgency=low
+xserver-xorg-input-mouse (1:1.6.99.901-1) unstable; urgency=low
* New upstream release.
- -- Cyril Brulebois <kibi@debian.org> Mon, 21 Feb 2011 02:17:04 +0100
+ -- Cyril Brulebois <kibi@debian.org> Mon, 21 Feb 2011 02:17:29 +0100
xserver-xorg-input-mouse (1:1.6.0-3) unstable; urgency=low
commit a698cce519f9315872a16ad92b37d3aa14f7332a
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Feb 21 02:17:17 2011 +0100
Bump changelogs.
diff --git a/ChangeLog b/ChangeLog
index 27c275a..c93df20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,403 @@
+commit 2e507df6704ebd2cab6ada450ed40d89a2d3ca19
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon Feb 21 10:06:54 2011 +1000
+
+ mouse 1.6.99.901
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 70f1d8579ef86dd428eabcb3752b5d1bce47b8f7
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon Feb 21 09:40:13 2011 +1000
+
+ man: ClearDTR and ClearRTS are handled by the X server.
+
+ 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>
+
+commit 194c5913e92c84d1a30447d43b5beee77a98b7ba
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon Feb 21 09:33:37 2011 +1000
+
+ man: protocol option isn't mandatory, it's platform-specific.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Cyril Brulebois <kibi@debian.org>
+
+commit f70a9817a2eb845eb9718c0ed6540de1ffe7e531
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon Feb 21 09:30:36 2011 +1000
+
+ man: fix typo "Auto platform" → "Auto protocol"
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Cyril Brulebois <kibi@debian.org>
+
+commit a45b5d0eaf871c139b057f757869a20fd617d529
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon Feb 21 09:29:59 2011 +1000
+
+ man: README.mouse is just README
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Cyril Brulebois <kibi@debian.org>
+
+commit 9140e2640319833658a2be5ab2f8349a79ff20aa
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon Feb 21 09:28:26 2011 +1000
+
+ man: add mention of xorg.conf.d snippet
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Cyril Brulebois <kibi@debian.org>
+
+commit af784aad332d67bb746597d5de032ca320928d51
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon Feb 21 09:24:38 2011 +1000
+
+ man: remove mention of core pointer.
+
+ 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>
+
+commit 6b5a82e4e85ab12df23ecf30f2b07eb4c5763e93
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Mon Nov 29 22:25:52 2010 -0800
+
+ Add ABI checks around XI86_CONFIGURED uses in OS-specific PreInits
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 73bb42e10033cfeb41ba540ea0303b882ff7e61e
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Thu Nov 25 11:35:29 2010 +1000
+
+ Bump to 1.6.99
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+commit 0a088df6b2f5cac05a00c4f461274b83feb1a9a8
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon Oct 25 14:34:28 2010 +1000
+
+ Adjust to new Input ABI 12.
+
+ 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>
+
+commit fedd52ba781da1960ada0a96b85293afe2509a4a
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon Oct 25 11:16:22 2010 +1000
+
+ ABI 12 requires per-valuator modes.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
+
+commit 7bf22a368c752fe76dc60c3ea0f70ec1a46d653e
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon Oct 25 14:36:59 2010 +1000
+
+ Use pInfo->options instead of conf-idev.
+
+ 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>
+
+commit f3f405db5603ecca5bc14dba23628ea56a0f5202
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon Oct 25 16:08:49 2010 +1000
+
+ Remove write-only field mouseFlags.
+
+ 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>
+
+commit 23308a251e16c4a6ab3c89c0505b0d8900c9cdff
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon Oct 25 13:51:59 2010 +1000
+
+ Rename xf86OSMouseInit to OSMouseInit.
+
+ 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>
+
+commit 9263c949df6cbbb8e42ec4f0d6337206f684d0f5
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon Oct 25 13:49:23 2010 +1000
+
+ Remove random History comment.
+
+ 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>
+
+commit ecc3d28fa488f186896d714b8872b8875f8eccfd
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon Oct 25 13:46:13 2010 +1000
+
+ Rename xf86OSmouse.h to mouse.h
+
+ 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>
+
+commit a92175888885ac77c87d52309cba87f1e9c96e73
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon Oct 25 13:43:47 2010 +1000
+
+ Remove a bunch of unused fields from the MouseRec.
+
+ 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>
+
+commit a48e8ce9434837d649eb88058aa9406f1bf9dce9
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon Oct 25 13:41:26 2010 +1000
+
+ Move a statement down to have all allocations close together.
+
+ 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>
+
+commit f3ac92a41b9e85a0cfba011812b637b1f3ae2529
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon Oct 25 13:35:55 2010 +1000
+
+ Remove convoluted do { } while loop.
+
+ 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>
+
+commit fac47e7df6f719b1fce5341b343cabcbe150b52f
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon Oct 25 13:34:21 2010 +1000
+
+ Move protocol ID detection into a separate function.
+
+ 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>
+
+commit 859b8f2c4d964cd9b40dcbc64bd28fc98e129387
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon Oct 25 12:17:19 2010 +1000
+
+ Use single exit path for PreInit.
+
+ 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>
+
+commit 11f94120035d1c4e2d1d299d9fa19f79ca3ed75e
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon Oct 25 12:13:00 2010 +1000
+
+ De-duplicate Option "Device" handling.
+
+ 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>
+
+commit 0b1920abf72664765f7dab4a487839a3d29267a1
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon Oct 25 11:59:17 2010 +1000
+
+ Remove unused branch from if 1 condition.
+
+ 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>
+
+commit 008906b855f05be4d1942d2a3e1afcb8a7ee4b14
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon Oct 25 11:56:36 2010 +1000
+
+ Remove a bunch of unnecessary log prints.
+
+ 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>
+
+commit 9d6723303216e7b6de583716768d0dc972f03d03
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon Oct 25 11:53:21 2010 +1000
+
+ Remove if 0'd out model.
+
+ If 0 since at least 2003 is enough to pretend we don't need this block.
+
+ 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>
+
+commit 6f227252af6458fbf6cbeee43e3f739fd2f03c67
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon Oct 25 15:38:57 2010 +1000
+
+ Remove includes for protocol headers.
+
+ The driver shouldn't need those.
+
+ 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>
+
+commit 3b39dd7ca3a4055e63a8ca55b614912fe47215a6
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon Oct 25 11:49:51 2010 +1000
+
+ Remove unused define NEED_X86_TYPES.
+
+ Not needed for 1.6 and later.
+
+ 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>
+
+commit ef4fad4d823d46be4538daeca0ee3e014efc73c2
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon Oct 25 11:39:42 2010 +1000
+
+ Assume ABI_XINPUT_VERSION 4 or higher.
+
+ We require server 1.6 in configure.ac to build, so let's assume that's the
+ minimal ABI version we support. Purge the rest.
+
+ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+ Acked-by: Gaetan Nadon <memsize@videotron.ca>
+ Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+ Tested-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit f7b426ef2a6bc181ec700f74b59b39c2e695bf6b
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon Oct 25 11:34:41 2010 +1000
+
+ Remove refcnt field from InputDriverRec.
+
+ Wasn't used in the server and is now removed.
+
+ 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>
+
+commit b5fc405451d8fa01b9e5fb6f2da74a6e03d50174
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon Oct 25 11:31:23 2010 +1000
+
+ Don't try to call conversion_proc anymore.
+
+ This hasn't been called since at least server 1.5 or so (ABI 2), possibly
+ longer.
+
+ 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>
+
+commit bb2d63df99457de1e5c06be501a03b5629fc52c8
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon Oct 25 11:10:25 2010 +1000
+
+ Replace LocalDevicePtr with InputInfoPtr.
+
+ No functional changes.
+ The typedef has been removed from the server but was an alias for
+ InputInfoPtr since the dawn of, well, at least git.
+
+ 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>
+
+commit b5f4fc652cf5999045ff9006a55cf75edaba65c0
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon Oct 25 10:57:58 2010 +1000
+
+ XI86_POINTER_CAPABLE is gone from the server.
+
+ And was a write-only flag before that anyway, no ifdef needed.
+
+ 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>
+
+commit 4eefb5bfa837aae2201769360745edcaad4ea8d8
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon Oct 25 10:54:41 2010 +1000
+
+ Remove out-of-date comment.
+
+ /*
+ * XXX This should be done by a function in the core server since the
+ * MouseDevRec is defined in the os-support layer.
+ */
+
+ no, it shouldn't and it isn't, in exactly that order.
+
+ 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>
+
+commit fdd5d5c77d05c7f085e6f62c66b31b66087d195d
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon Oct 25 10:46:35 2010 +1000
+
+ Remove unused declaration of MouseUnInit.
+
+ To not have an UnInit function one needs to explicitly not define an UnInit
+ function that is then not used, so that definitely no UnInit is performed
+ with the function that is not defined. Philosophically speaking, this may be
+ true. Meanwhile, over here in reality, well... meh.
+
+ 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>
+
+commit abc107eeb8847b9bf2f303abefde5adaab9331bf
+Author: Peter Hutterer <peter.hutterer@who-t.net>
+Date: Mon Oct 25 10:45:27 2010 +1000
+
+ Replace libc wrappers to xcalloc and friends with libc calls.
+
+ 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>
+
+commit 782052d087fd59d673de6c45784c316c055a592d
+Merge: 4f1a5cc 6d6c247
+Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
+Date: Wed Sep 29 23:42:43 2010 +0200
+
+ Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/driver/xf86-input-mouse
+
commit 6d6c24768b2b347436a6d35c4aaa129227c7392e
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Sep 8 23:11:19 2010 -0700
@@ -14,6 +414,27 @@ Date: Wed Sep 8 22:58:30 2010 -0700
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+commit 4f1a5cc98c8452362ecb81843cd0a32c9a45ce4e
+Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
+Date: Sun Sep 5 21:21:58 2010 +0200
+
+ Fix build warning
+
+ Add extra parentheses to avoid ambiguity.
+
+ Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
+
+commit 35f277a718f2da6a09080af020aaf29ef96fe807
+Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
+Date: Sun Sep 5 21:20:33 2010 +0200
+
+ Fix mouse data buffering
+
+ Check remaining buffer size *before* reading a character from the device. Also
+ keep extra characters in the static buffer until next invocation.
+
+ Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
+
commit cb11e9ca60e8ca2590c77f844bfd19e5278f518f
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Aug 11 21:30:40 2010 -0700
diff --git a/debian/changelog b/debian/changelog
index cb39149..76a2d07 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xserver-xorg-input-mouse (1:1.6.99.901-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Cyril Brulebois <kibi@debian.org> Mon, 21 Feb 2011 02:17:04 +0100
+
xserver-xorg-input-mouse (1:1.6.0-3) unstable; urgency=low
* Cherry-pick from upstream, thanks to Samuel Thibault:
commit 2e507df6704ebd2cab6ada450ed40d89a2d3ca19
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Feb 21 10:06:54 2011 +1000
mouse 1.6.99.901
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index ad57273..ed7c6fa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-input-mouse],
- [1.6.99],
+ [1.6.99.901],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-input-mouse])
AC_CONFIG_SRCDIR([Makefile.am])
commit 70f1d8579ef86dd428eabcb3752b5d1bce47b8f7
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Feb 21 09:40:13 2011 +1000
man: ClearDTR and ClearRTS are handled by the X server.
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>
diff --git a/man/mousedrv.man b/man/mousedrv.man
index 917ca8e..23528f6 100644
--- a/man/mousedrv.man
+++ b/man/mousedrv.man
@@ -281,13 +281,15 @@ indicating that the next button pressed is to be
.BI "Option \*qClearDTR\*q \*q" boolean \*q
Enable/disable clearing the DTR line on the serial port used by the mouse.
Some dual-protocol mice require the DTR line to be cleared to operate
-in the non-default protocol. This option is for serial mice only.
+in the non-default protocol. This option is for serial mice only and is
+handled by the X server.
Default: off.
.TP 7
.BI "Option \*qClearRTS\*q \*q" boolean \*q
Enable/disable clearing the RTS line on the serial port used by the mouse.
Some dual-protocol mice require the RTS line to be cleared to operate
-in the non-default protocol. This option is for serial mice only.
+in the non-default protocol. This option is for serial mice only and is
+handled by the X server.
Default: off.
.TP 7
.BI "Option \*qBaudRate\*q \*q" integer \*q
commit 194c5913e92c84d1a30447d43b5beee77a98b7ba
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Feb 21 09:33:37 2011 +1000
man: protocol option isn't mandatory, it's platform-specific.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Cyril Brulebois <kibi@debian.org>
diff --git a/man/mousedrv.man b/man/mousedrv.man
index f9b9993..917ca8e 100644
--- a/man/mousedrv.man
+++ b/man/mousedrv.man
@@ -106,8 +106,8 @@ NetMousePS/2, NetScrollPS/2, BusMouse, SysMouse, WSMouse, USB, VUID, Xqueue.
.PP
.RS 7
Not all protocols are supported on all platforms. The "Auto" protocol
-specifies that protocol auto-detection should be attempted. There is no
-default protocol setting, and specifying this option is mandatory.
+specifies that protocol auto-detection should be attempted. The default
+protocol setting is platform-specific.
.RE
.TP 7
.BI "Option \*qDevice\*q \*q" string \*q
commit f70a9817a2eb845eb9718c0ed6540de1ffe7e531
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Feb 21 09:30:36 2011 +1000
man: fix typo "Auto platform" → "Auto protocol"
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Cyril Brulebois <kibi@debian.org>
diff --git a/man/mousedrv.man b/man/mousedrv.man
index 7be4935..f9b9993 100644
--- a/man/mousedrv.man
+++ b/man/mousedrv.man
@@ -105,7 +105,7 @@ NetMousePS/2, NetScrollPS/2, BusMouse, SysMouse, WSMouse, USB, VUID, Xqueue.
.RE
.PP
.RS 7
-Not all protocols are supported on all platforms. The "Auto" platform
+Not all protocols are supported on all platforms. The "Auto" protocol
specifies that protocol auto-detection should be attempted. There is no
default protocol setting, and specifying this option is mandatory.
.RE
commit a45b5d0eaf871c139b057f757869a20fd617d529
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Feb 21 09:29:59 2011 +1000
man: README.mouse is just README
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Cyril Brulebois <kibi@debian.org>
diff --git a/man/mousedrv.man b/man/mousedrv.man
index 13db918..7be4935 100644
--- a/man/mousedrv.man
+++ b/man/mousedrv.man
@@ -86,8 +86,9 @@ platforms this is limited to plug and play serial mice, and on some the
auto-detection works for any mouse that the OS's kernel driver supports.
On others, it is always necessary to specify the mouse protocol in the
config file. The
-.I README.mouse
-document contains some detailed information about this.
+.I README
+document provided with this driver contains some detailed information about
+this.
.PP
The following driver
.B Options
commit 9140e2640319833658a2be5ab2f8349a79ff20aa
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Feb 21 09:28:26 2011 +1000
man: add mention of xorg.conf.d snippet
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Cyril Brulebois <kibi@debian.org>
diff --git a/man/mousedrv.man b/man/mousedrv.man
index a6b443d..13db918 100644
--- a/man/mousedrv.man
+++ b/man/mousedrv.man
@@ -73,8 +73,9 @@ what matters.
.SH CONFIGURATION DETAILS
.PP
Depending on the X server version in use, input device options may be set
-in either a __xconfigfile__ file, or in the configuration files read by the
-Hardware Abstraction Layer (HAL) daemon, hald(1).
+in either a __xconfigfile__ file, an xorg.conf.d snippet
+or in the configuration files read by the Hardware Abstraction Layer (HAL)
+daemon, hald(1).
.PP
Please refer to __xconfigfile__(__filemansuffix__) for general configuration
details and for options that can be used with all input drivers. This
commit af784aad332d67bb746597d5de032ca320928d51
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Feb 21 09:24:38 2011 +1000
man: remove mention of core pointer.
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>
diff --git a/man/mousedrv.man b/man/mousedrv.man
index e805335..a6b443d 100644
--- a/man/mousedrv.man
+++ b/man/mousedrv.man
@@ -21,9 +21,8 @@ types of mice depends on the OS.
.PP
The
.B mouse
-driver functions as a pointer input device, and may be used as the
-X server's core pointer. Multiple mice are supported by multiple
-instances of this driver.
+driver functions as a pointer input device. Multiple mice are supported by
+multiple instances of this driver.
.SH SUPPORTED HARDWARE
.TP
USB mouse
commit 6b5a82e4e85ab12df23ecf30f2b07eb4c5763e93
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Mon Nov 29 22:25:52 2010 -0800
Add ABI checks around XI86_CONFIGURED uses in OS-specific PreInits
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/src/bsd_mouse.c b/src/bsd_mouse.c
index 8a57226..e9e2649 100644
--- a/src/bsd_mouse.c
+++ b/src/bsd_mouse.c
@@ -483,7 +483,9 @@ wsconsPreInit(InputInfoPtr pInfo, const char *protocol, int flags)
pInfo->read_input = wsconsReadInput;
pMse->xisbscale = sizeof(struct wscons_event);
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
pInfo->flags |= XI86_CONFIGURED;
+#endif
return TRUE;
}
#endif
@@ -746,7 +748,9 @@ usbPreInit(InputInfoPtr pInfo, const char *protocol, int flags)
pInfo->device_control = usbMouseProc;
pInfo->read_input = usbReadInput;
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
pInfo->flags |= XI86_CONFIGURED;
+#endif
return TRUE;
}
#endif /* USBMOUSE */
diff --git a/src/hurd_mouse.c b/src/hurd_mouse.c
index e5c7186..a285a87 100644
--- a/src/hurd_mouse.c
+++ b/src/hurd_mouse.c
@@ -167,7 +167,9 @@ OsMousePreInit(InputInfoPtr pInfo, const char *protocol, int flags)
/* Setup the local procs. */
pInfo->read_input = OsMouseReadInput;
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
pInfo->flags |= XI86_CONFIGURED;
+#endif
return TRUE;
}
diff --git a/src/sun_mouse.c b/src/sun_mouse.c
index 2799947..dd545c7 100644
--- a/src/sun_mouse.c
+++ b/src/sun_mouse.c
@@ -297,7 +297,9 @@ vuidPreInit(InputInfoPtr pInfo, const char *protocol, int flags)
pVuidMse->next = vuidMouseList;
vuidMouseList = pVuidMse;
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
pInfo->flags |= XI86_CONFIGURED;
+#endif
return TRUE;
}
commit 73bb42e10033cfeb41ba540ea0303b882ff7e61e
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Thu Nov 25 11:35:29 2010 +1000
Bump to 1.6.99
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
diff --git a/configure.ac b/configure.ac
index 8c99ac5..ad57273 100644
--- a/configure.ac
+++ b/configure.ac
@@ -23,7 +23,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
AC_INIT([xf86-input-mouse],
- [1.6.0],
+ [1.6.99],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
[xf86-input-mouse])
AC_CONFIG_SRCDIR([Makefile.am])
commit 0a088df6b2f5cac05a00c4f461274b83feb1a9a8
Author: Peter Hutterer <peter.hutterer@who-t.net>
Date: Mon Oct 25 14:34:28 2010 +1000
Adjust to new Input ABI 12.
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>
diff --git a/src/bsd_mouse.c b/src/bsd_mouse.c
index 94d4382..8a57226 100644
--- a/src/bsd_mouse.c
+++ b/src/bsd_mouse.c
@@ -458,7 +458,7 @@ wsconsPreInit(InputInfoPtr pInfo, const char *protocol, int flags)
xf86Msg(X_CONFIG, "%s: Protocol: %s\n", pInfo->name, protocol);
/* Collect the options, and process the common options. */
- xf86CollectInputOptions(pInfo, NULL, NULL);
+ COLLECT_INPUT_OPTIONS(pInfo, NULL);
xf86ProcessCommonOptions(pInfo, pInfo->options);
/* Check if the device can be opened. */
@@ -653,7 +653,7 @@ usbPreInit(InputInfoPtr pInfo, const char *protocol, int flags)
xf86Msg(X_CONFIG, "%s: Protocol: %s\n", pInfo->name, protocol);
/* Collect the options, and process the common options. */
- xf86CollectInputOptions(pInfo, NULL, NULL);
+ COLLECT_INPUT_OPTIONS(pInfo, NULL);
xf86ProcessCommonOptions(pInfo, pInfo->options);
/* Check if the device can be opened. */
diff --git a/src/hurd_mouse.c b/src/hurd_mouse.c
index e0ed126..e5c7186 100644
--- a/src/hurd_mouse.c
+++ b/src/hurd_mouse.c
@@ -144,7 +144,7 @@ OsMousePreInit(InputInfoPtr pInfo, const char *protocol, int flags)
xf86Msg(X_CONFIG, "%s: Protocol: %s\n", pInfo->name, protocol);
/* Collect the options, and process the common options. */
- xf86CollectInputOptions(pInfo, NULL, NULL);
+ COLLECT_INPUT_OPTIONS(pInfo, NULL);
xf86ProcessCommonOptions(pInfo, pInfo->options);
/* Check if the device can be opened. */
diff --git a/src/mouse.c b/src/mouse.c
index 7088abc..d2377ad 100644
--- a/src/mouse.c
+++ b/src/mouse.c
@@ -112,7 +112,11 @@ typedef struct _DragLockRec {
} DragLockRec, *DragLockPtr;
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
static InputInfoPtr MousePreInit(InputDriverPtr drv, IDevPtr dev, int flags);
+#else
+static int MousePreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags);
+#endif
static int MouseProc(DeviceIntPtr device, int what);
static void MouseCtrl(DeviceIntPtr device, PtrCtrl *ctrl);
@@ -842,10 +846,48 @@ MousePickProtocol(InputInfoPtr pInfo, const char* device,
return protocol;
}
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
+static int NewMousePreInit(InputDriverPtr drv, InputInfoPtr pInfo,
+ int flags);
+
static InputInfoPtr
MousePreInit(InputDriverPtr drv, IDevPtr dev, int flags)
{
InputInfoPtr pInfo;
+
+ if (!(pInfo = xf86AllocateInput(drv, 0)))
+ return NULL;
+
+ pInfo->name = dev->identifier;
+ pInfo->flags = XI86_SEND_DRAG_EVENTS;
+ pInfo->conf_idev = dev;
+ pInfo->close_proc = NULL;
+ pInfo->private_flags = 0;
+ pInfo->always_core_feedback = NULL;
+
+ if (NewMousePreInit(drv, pInfo, flags) == Success)
+ {
+ /* Check if SendDragEvents has been disabled. */
+ if (!xf86SetBoolOption(dev->commonOptions, "SendDragEvents", TRUE))
+ pInfo->flags &= ~XI86_SEND_DRAG_EVENTS;
+
+ pInfo->flags |= XI86_CONFIGURED;
+
+ return pInfo;
+ }
+
+ xf86DeleteInput(pInfo, 0);
+
+ return NULL;
+}
+
+static int
+NewMousePreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
+#else
+static int
+MousePreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
+#endif
+{
MouseDevPtr pMse;
mousePrivPtr mPriv;
MessageType protocolFrom = X_DEFAULT;
@@ -854,44 +896,34 @@ MousePreInit(InputDriverPtr drv, IDevPtr dev, int flags)
MouseProtocolID protocolID;
MouseProtocolPtr pProto;
int i;
-
- if (!InitProtocols())
- return NULL;
+ int rc = Success;
- if (!(pInfo = xf86AllocateInput(drv, 0)))
- return NULL;
+ if (!InitProtocols())
+ return BadAlloc;
/* Initialise the InputInfoRec. */
- pInfo->name = dev->identifier;
pInfo->type_name = XI_MOUSE;
- pInfo->flags = XI86_SEND_DRAG_EVENTS;
pInfo->device_control = MouseProc;
pInfo->read_input = MouseReadInput;
pInfo->control_proc = NULL;
- pInfo->close_proc = NULL;
pInfo->switch_mode = NULL;
pInfo->fd = -1;
pInfo->dev = NULL;
- pInfo->private_flags = 0;
- pInfo->always_core_feedback = NULL;
- pInfo->conf_idev = dev;
/* Allocate the MouseDevRec and initialise it. */
if (!(pMse = calloc(sizeof(MouseDevRec), 1)))
+ {
+ rc = BadAlloc;
goto out;
+ }
pInfo->private = pMse;
pMse->Ctrl = MouseCtrl;
pMse->PostEvent = MousePostEvent;
pMse->CommonOptions = MouseCommonOptions;
- /* Check if SendDragEvents has been disabled. */
- if (!xf86SetBoolOption(dev->commonOptions, "SendDragEvents", TRUE)) {
- pInfo->flags &= ~XI86_SEND_DRAG_EVENTS;
- }
-
/* Find the protocol type. */
- protocol = xf86SetStrOption(dev->commonOptions, "Protocol", NULL);
+ protocol = xf86SetStrOption(pInfo->options, "Protocol", NULL);
if (protocol) {
protocolFrom = X_CONFIG;
} else if (osInfo->DefaultProtocol) {
@@ -900,10 +932,11 @@ MousePreInit(InputDriverPtr drv, IDevPtr dev, int flags)
}
if (!protocol) {
xf86Msg(X_ERROR, "%s: No Protocol specified\n", pInfo->name);
+ rc = BadValue;
goto out;
}
- device = xf86SetStrOption(dev->commonOptions, "Device", NULL);
+ device = xf86SetStrOption(pInfo->options, "Device", NULL);
/* Default Mapping: 1 2 3 8 9 10 11 ... */
for (i = 0; i < MSE_MAXBUTTONS; i++)
@@ -916,18 +949,25 @@ MousePreInit(InputDriverPtr drv, IDevPtr dev, int flags)
xf86Msg(protocolFrom, "%s: Protocol: \"%s\"\n", pInfo->name, protocol);
if (!(pProto = GetProtocol(protocolID)))
+ {
+ rc = BadValue;
goto out;
+ }
pMse->protocolID = protocolID;
pMse->oldProtocolID = protocolID; /* hack */
pMse->autoProbe = FALSE;
/* Collect the options, and process the common options. */
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
/* need some special handling here. xf86CollectInputOptions will reset
* pInfo->options if the second argument is not-null. To re-merge the
* previously set arguments, pass the original pInfo->options in.
*/
xf86CollectInputOptions(pInfo, pProto->defaults, pInfo->options);
+#else
+ COLLECT_INPUT_OPTIONS(pInfo, pProto->defaults);
+#endif
xf86ProcessCommonOptions(pInfo, pInfo->options);
/* Check if the device can be opened. */
@@ -941,6 +981,7 @@ MousePreInit(InputDriverPtr drv, IDevPtr dev, int flags)
free(pMse->mousePriv);
free(pMse);
pInfo->private = NULL;
+ rc = BadValue;
goto out;
}
}
@@ -948,7 +989,11 @@ MousePreInit(InputDriverPtr drv, IDevPtr dev, int flags)
pInfo->fd = -1;
if (!(mPriv = (pointer) calloc(sizeof(mousePrivRec), 1)))
+ {
+ rc = BadAlloc;
goto out;
+ }
+
pMse->mousePriv = mPriv;
pMse->CommonOptions(pInfo);
pMse->checkMovements = checkForErraticMovements;
@@ -958,11 +1003,9 @@ MousePreInit(InputDriverPtr drv, IDevPtr dev, int flags)
MouseHWOptions(pInfo);
MouseSerialOptions(pInfo);
-
- pInfo->flags |= XI86_CONFIGURED;
out:
- return pInfo;
+ return rc;
}
@@ -2523,7 +2566,7 @@ initMouseHW(InputInfoPtr pInfo)
usleep(100000);
Reply to: