ChangeLog | 421 ++++++++++++++++++++ configure.ac | 2 debian/README.source | 24 - debian/changelog | 36 + debian/compat | 2 debian/control | 21 - debian/rules | 106 ----- debian/watch | 1 debian/xserver-xorg-input-mouse.docs | 1 debian/xserver-xorg-input-mouse.install | 2 debian/xserver-xorg-input-mouse.manpages | 1 debian/xsfbs/repack.sh | 32 - debian/xsfbs/xsfbs.mk | 285 -------------- debian/xsfbs/xsfbs.sh | 622 ------------------------------- man/mousedrv.man | 27 - src/Makefile.am | 1 src/bsd_mouse.c | 44 +- src/hurd_mouse.c | 31 - 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 ------------- 24 files changed, 1022 insertions(+), 1685 deletions(-)
New commits: commit 6fcf551c59d2874a100d399df4da15bf00190145 Author: Cyril Brulebois <k...@debian.org> Date: Mon Feb 21 02:21:55 2011 +0100 Upload to experimental. diff --git a/debian/changelog b/debian/changelog index c78aceb..fc06829 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -xserver-xorg-input-mouse (1:1.6.99.901-1+exp1) UNRELEASED; urgency=low +xserver-xorg-input-mouse (1:1.6.99.901-1+exp1) experimental; urgency=low * Rebuild against Xserver 1.10 rc2. - -- Cyril Brulebois <k...@debian.org> Mon, 21 Feb 2011 02:21:38 +0100 + -- Cyril Brulebois <k...@debian.org> Mon, 21 Feb 2011 02:21:51 +0100 xserver-xorg-input-mouse (1:1.6.99.901-1) unstable; urgency=low commit e1631367fc869297b608ea66fcd0d5e17f846d26 Author: Cyril Brulebois <k...@debian.org> Date: Mon Feb 21 02:21:46 2011 +0100 Rebuild against Xserver 1.10 rc2. diff --git a/debian/changelog b/debian/changelog index 8c93b5e..c78aceb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +xserver-xorg-input-mouse (1:1.6.99.901-1+exp1) UNRELEASED; urgency=low + + * Rebuild against Xserver 1.10 rc2. + + -- Cyril Brulebois <k...@debian.org> Mon, 21 Feb 2011 02:21:38 +0100 + xserver-xorg-input-mouse (1:1.6.99.901-1) unstable; urgency=low * New upstream release. diff --git a/debian/control b/debian/control index 39333c6..083a0f5 100644 --- a/debian/control +++ b/debian/control @@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 8), dh-autoreconf, pkg-config, - xserver-xorg-dev (>= 2:1.9.4), + xserver-xorg-dev (>= 2:1.9.99.902), x11proto-input-dev, x11proto-core-dev, x11proto-randr-dev, commit aee0ab3737aa5e0d850638ec9f397ee0ad28af18 Author: Cyril Brulebois <k...@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 <k...@debian.org> Mon, 21 Feb 2011 02:17:04 +0100 + -- Cyril Brulebois <k...@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 <k...@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.hutte...@who-t.net> +Date: Mon Feb 21 10:06:54 2011 +1000 + + mouse 1.6.99.901 + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + +commit 70f1d8579ef86dd428eabcb3752b5d1bce47b8f7 +Author: Peter Hutterer <peter.hutte...@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.hutte...@who-t.net> + Reviewed-by: Cyril Brulebois <k...@debian.org> + +commit 194c5913e92c84d1a30447d43b5beee77a98b7ba +Author: Peter Hutterer <peter.hutte...@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.hutte...@who-t.net> + Reviewed-by: Cyril Brulebois <k...@debian.org> + +commit f70a9817a2eb845eb9718c0ed6540de1ffe7e531 +Author: Peter Hutterer <peter.hutte...@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.hutte...@who-t.net> + Reviewed-by: Cyril Brulebois <k...@debian.org> + +commit a45b5d0eaf871c139b057f757869a20fd617d529 +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Mon Feb 21 09:29:59 2011 +1000 + + man: README.mouse is just README + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + Reviewed-by: Cyril Brulebois <k...@debian.org> + +commit 9140e2640319833658a2be5ab2f8349a79ff20aa +Author: Peter Hutterer <peter.hutte...@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.hutte...@who-t.net> + Reviewed-by: Cyril Brulebois <k...@debian.org> + +commit af784aad332d67bb746597d5de032ca320928d51 +Author: Peter Hutterer <peter.hutte...@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.hutte...@who-t.net> + Reviewed-by: Cyril Brulebois <k...@debian.org> + +commit 6b5a82e4e85ab12df23ecf30f2b07eb4c5763e93 +Author: Alan Coopersmith <alan.coopersm...@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.coopersm...@oracle.com> + Reviewed-by: Peter Hutterer <peter.hutte...@who-t.net> + +commit 73bb42e10033cfeb41ba540ea0303b882ff7e61e +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Thu Nov 25 11:35:29 2010 +1000 + + Bump to 1.6.99 + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + +commit 0a088df6b2f5cac05a00c4f461274b83feb1a9a8 +Author: Peter Hutterer <peter.hutte...@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.hutte...@who-t.net> + Reviewed-by: Chase Douglas <chase.doug...@canonical.com> + +commit fedd52ba781da1960ada0a96b85293afe2509a4a +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Mon Oct 25 11:16:22 2010 +1000 + + ABI 12 requires per-valuator modes. + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + Reviewed-by: Chase Douglas <chase.doug...@canonical.com> + +commit 7bf22a368c752fe76dc60c3ea0f70ec1a46d653e +Author: Peter Hutterer <peter.hutte...@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.hutte...@who-t.net> + Reviewed-by: Chase Douglas <chase.doug...@canonical.com> + +commit f3f405db5603ecca5bc14dba23628ea56a0f5202 +Author: Peter Hutterer <peter.hutte...@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.hutte...@who-t.net> + Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Tested-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit 23308a251e16c4a6ab3c89c0505b0d8900c9cdff +Author: Peter Hutterer <peter.hutte...@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.hutte...@who-t.net> + Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Tested-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit 9263c949df6cbbb8e42ec4f0d6337206f684d0f5 +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Mon Oct 25 13:49:23 2010 +1000 + + Remove random History comment. + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Tested-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit ecc3d28fa488f186896d714b8872b8875f8eccfd +Author: Peter Hutterer <peter.hutte...@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.hutte...@who-t.net> + Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Tested-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit a92175888885ac77c87d52309cba87f1e9c96e73 +Author: Peter Hutterer <peter.hutte...@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.hutte...@who-t.net> + Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Tested-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit a48e8ce9434837d649eb88058aa9406f1bf9dce9 +Author: Peter Hutterer <peter.hutte...@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.hutte...@who-t.net> + Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Tested-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit f3ac92a41b9e85a0cfba011812b637b1f3ae2529 +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Mon Oct 25 13:35:55 2010 +1000 + + Remove convoluted do { } while loop. + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Tested-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit fac47e7df6f719b1fce5341b343cabcbe150b52f +Author: Peter Hutterer <peter.hutte...@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.hutte...@who-t.net> + Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Tested-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit 859b8f2c4d964cd9b40dcbc64bd28fc98e129387 +Author: Peter Hutterer <peter.hutte...@who-t.net> +Date: Mon Oct 25 12:17:19 2010 +1000 + + Use single exit path for PreInit. + + Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> + Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Tested-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit 11f94120035d1c4e2d1d299d9fa19f79ca3ed75e +Author: Peter Hutterer <peter.hutte...@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.hutte...@who-t.net> + Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Tested-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit 0b1920abf72664765f7dab4a487839a3d29267a1 +Author: Peter Hutterer <peter.hutte...@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.hutte...@who-t.net> + Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Tested-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit 008906b855f05be4d1942d2a3e1afcb8a7ee4b14 +Author: Peter Hutterer <peter.hutte...@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.hutte...@who-t.net> + Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Tested-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit 9d6723303216e7b6de583716768d0dc972f03d03 +Author: Peter Hutterer <peter.hutte...@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.hutte...@who-t.net> + Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Tested-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit 6f227252af6458fbf6cbeee43e3f739fd2f03c67 +Author: Peter Hutterer <peter.hutte...@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.hutte...@who-t.net> + Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Tested-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit 3b39dd7ca3a4055e63a8ca55b614912fe47215a6 +Author: Peter Hutterer <peter.hutte...@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.hutte...@who-t.net> + Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Tested-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit ef4fad4d823d46be4538daeca0ee3e014efc73c2 +Author: Peter Hutterer <peter.hutte...@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.hutte...@who-t.net> + Acked-by: Gaetan Nadon <mems...@videotron.ca> + Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Tested-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit f7b426ef2a6bc181ec700f74b59b39c2e695bf6b +Author: Peter Hutterer <peter.hutte...@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.hutte...@who-t.net> + Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Tested-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit b5fc405451d8fa01b9e5fb6f2da74a6e03d50174 +Author: Peter Hutterer <peter.hutte...@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.hutte...@who-t.net> + Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Tested-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit bb2d63df99457de1e5c06be501a03b5629fc52c8 +Author: Peter Hutterer <peter.hutte...@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.hutte...@who-t.net> + Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Tested-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit b5f4fc652cf5999045ff9006a55cf75edaba65c0 +Author: Peter Hutterer <peter.hutte...@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.hutte...@who-t.net> + Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Tested-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit 4eefb5bfa837aae2201769360745edcaad4ea8d8 +Author: Peter Hutterer <peter.hutte...@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.hutte...@who-t.net> + Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Tested-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit fdd5d5c77d05c7f085e6f62c66b31b66087d195d +Author: Peter Hutterer <peter.hutte...@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.hutte...@who-t.net> + Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Tested-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit abc107eeb8847b9bf2f303abefde5adaab9331bf +Author: Peter Hutterer <peter.hutte...@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.hutte...@who-t.net> + Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com> + Tested-by: Alan Coopersmith <alan.coopersm...@oracle.com> + +commit 782052d087fd59d673de6c45784c316c055a592d +Merge: 4f1a5cc 6d6c247 +Author: Samuel Thibault <samuel.thiba...@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.coopersm...@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.coopersm...@oracle.com> +commit 4f1a5cc98c8452362ecb81843cd0a32c9a45ce4e +Author: Samuel Thibault <samuel.thiba...@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.thiba...@ens-lyon.org> + +commit 35f277a718f2da6a09080af020aaf29ef96fe807 +Author: Samuel Thibault <samuel.thiba...@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.thiba...@ens-lyon.org> + commit cb11e9ca60e8ca2590c77f844bfd19e5278f518f Author: Alan Coopersmith <alan.coopersm...@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 <k...@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.hutte...@who-t.net> Date: Mon Feb 21 10:06:54 2011 +1000 mouse 1.6.99.901 Signed-off-by: Peter Hutterer <peter.hutte...@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.hutte...@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.hutte...@who-t.net> Reviewed-by: Cyril Brulebois <k...@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.hutte...@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.hutte...@who-t.net> Reviewed-by: Cyril Brulebois <k...@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.hutte...@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.hutte...@who-t.net> Reviewed-by: Cyril Brulebois <k...@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.hutte...@who-t.net> Date: Mon Feb 21 09:29:59 2011 +1000 man: README.mouse is just README Signed-off-by: Peter Hutterer <peter.hutte...@who-t.net> Reviewed-by: Cyril Brulebois <k...@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.hutte...@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.hutte...@who-t.net> Reviewed-by: Cyril Brulebois <k...@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.hutte...@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.hutte...@who-t.net> Reviewed-by: Cyril Brulebois <k...@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 2189038cba7b9259a4a897e46c8396f61fb6d73d Author: Cyril Brulebois <k...@debian.org> Date: Thu Feb 17 23:04:36 2011 +0100 Upload to unstable. diff --git a/debian/changelog b/debian/changelog index f531303..cb39149 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,9 @@ -xserver-xorg-input-mouse (1:1.6.0-3) UNRELEASED; urgency=low +xserver-xorg-input-mouse (1:1.6.0-3) unstable; urgency=low * Cherry-pick from upstream, thanks to Samuel Thibault: - Fix mouse data buffering - -- Cyril Brulebois <k...@debian.org> Thu, 17 Feb 2011 23:03:40 +0100 + -- Cyril Brulebois <k...@debian.org> Thu, 17 Feb 2011 23:04:17 +0100 xserver-xorg-input-mouse (1:1.6.0-2) unstable; urgency=low commit 9f886747e6b481455105423b46711b6ab509b6bd Author: Cyril Brulebois <k...@debian.org> Date: Thu Feb 17 23:04:15 2011 +0100 Document the cherry-pick. diff --git a/debian/changelog b/debian/changelog index 812ffea..f531303 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +xserver-xorg-input-mouse (1:1.6.0-3) UNRELEASED; urgency=low + + * Cherry-pick from upstream, thanks to Samuel Thibault: + - Fix mouse data buffering + + -- Cyril Brulebois <k...@debian.org> Thu, 17 Feb 2011 23:03:40 +0100 + xserver-xorg-input-mouse (1:1.6.0-2) unstable; urgency=low * Switch to dh: commit 290afd625aec351037500b6a76913dd6fe60dfe1 Author: Samuel Thibault <samuel.thiba...@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.thiba...@ens-lyon.org> (cherry picked from commit 35f277a718f2da6a09080af020aaf29ef96fe807) diff --git a/src/hurd_mouse.c b/src/hurd_mouse.c index 4dac225..3008d28 100644 --- a/src/hurd_mouse.c +++ b/src/hurd_mouse.c @@ -86,6 +86,7 @@ OsMouseReadInput(InputInfoPtr pInfo) { MouseDevPtr pMse; static kd_event eventList[NUMEVENTS]; + static int remainder = 0; int n, c; kd_event *event = eventList; unsigned char *pBuf; @@ -94,13 +95,14 @@ OsMouseReadInput(InputInfoPtr pInfo) XisbBlockDuration(pMse->buffer, -1); pBuf = (unsigned char *)eventList; - n = 0; - while ((c = XisbRead(pMse->buffer)) >= 0 && n < sizeof(eventList)) + n = remainder; + while (n < sizeof(eventList) && (c = XisbRead(pMse->buffer)) >= 0) pBuf[n++] = (unsigned char)c; - if (n == 0) + if (n == remainder) return; + remainder = n % sizeof(kd_event); n /= sizeof(kd_event); while( n-- ) { int buttons = pMse->lastButtons; @@ -126,6 +128,7 @@ OsMouseReadInput(InputInfoPtr pInfo) pMse->PostEvent(pInfo, buttons, dx, dy, 0, 0); ++event; } + memcpy(eventList, event, remainder); return; } commit f3ac1e2f48acb2a8151e2bdcd1b5d4d396faad56 Author: Cyril Brulebois <k...@debian.org> Date: Sat Feb 5 14:39:23 2011 +0100 Upload to unstable diff --git a/debian/changelog b/debian/changelog index 6f3e9c8..812ffea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xserver-xorg-input-mouse (1:1.6.0-2) UNRELEASED; urgency=low +xserver-xorg-input-mouse (1:1.6.0-2) unstable; urgency=low * Switch to dh: - Use debhelper 8. @@ -13,7 +13,7 @@ xserver-xorg-input-mouse (1:1.6.0-2) UNRELEASED; urgency=low * Wrap Depends/Provides. * Bump Standards-Version to 3.9.1 (no changes needed). - -- Cyril Brulebois <k...@debian.org> Thu, 03 Feb 2011 05:11:51 +0100 + -- Cyril Brulebois <k...@debian.org> Sat, 05 Feb 2011 14:39:23 +0100 xserver-xorg-input-mouse (1:1.6.0-1) experimental; urgency=low commit 62fb5cd942a1691187ea5372f6f0b81e37b5d9e9 Author: Cyril Brulebois <k...@debian.org> Date: Fri Feb 4 11:40:10 2011 +0100 Fix sequence ordering. Since both the autoreconf and quilt sequences insert a command before dh_auto_configure, it is important that we use the quilt one in the first place, so that autoreconf is run on a patched tree. Ditto for dh_clean. diff --git a/debian/rules b/debian/rules index 7efe334..2372c9f 100755 --- a/debian/rules +++ b/debian/rules @@ -20,4 +20,4 @@ override_dh_shlibdeps: dh_shlibdeps -- --warnings=6 %: - dh $@ --with autoreconf,quilt,xsf --builddirectory=build/ + dh $@ --with quilt,autoreconf,xsf --builddirectory=build/ commit b30d11d1e44ee53117bd207a1f778d5311e3204f Author: Cyril Brulebois <k...@debian.org> Date: Thu Feb 3 05:24:04 2011 +0100 Bump Standards-Version to 3.9.1 (no changes needed). diff --git a/debian/changelog b/debian/changelog index f8e6a26..6f3e9c8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,7 @@ xserver-xorg-input-mouse (1:1.6.0-2) UNRELEASED; urgency=low * Remove long obsolete Replaces. * Update Uploaders list. Thanks, David! * Wrap Depends/Provides. + * Bump Standards-Version to 3.9.1 (no changes needed). -- Cyril Brulebois <k...@debian.org> Thu, 03 Feb 2011 05:11:51 +0100 diff --git a/debian/control b/debian/control index 6a10cda..39333c6 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,7 @@ Build-Depends: x11proto-randr-dev, quilt, xutils-dev (>= 1:7.5+4) -Standards-Version: 3.8.3 +Standards-Version: 3.9.1 Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-mouse Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-mouse.git commit 660d9ec0ec98ef537b751a3484d0f611741d6d60 Author: Cyril Brulebois <k...@debian.org> Date: Thu Feb 3 05:23:42 2011 +0100 Wrap Depends/Provides. diff --git a/debian/changelog b/debian/changelog index 48ad418..f8e6a26 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ xserver-xorg-input-mouse (1:1.6.0-2) UNRELEASED; urgency=low * Remove xsfbs accordingly. * Remove long obsolete Replaces. * Update Uploaders list. Thanks, David! + * Wrap Depends/Provides. -- Cyril Brulebois <k...@debian.org> Thu, 03 Feb 2011 05:11:51 +0100 diff --git a/debian/control b/debian/control index b695f1c..6a10cda 100644 --- a/debian/control +++ b/debian/control @@ -19,8 +19,12 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-mouse.g Package: xserver-xorg-input-mouse Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, ${xinpdriver:Depends} -Provides: ${xinpdriver:Provides} +Depends: + ${shlibs:Depends}, + ${misc:Depends}, + ${xinpdriver:Depends}, +Provides: + ${xinpdriver:Provides} Description: X.Org X server -- mouse input driver This package provides the driver for mouse input devices. . commit 9daad1a18a4367427ec127d227ab2b9049b61571 Author: Cyril Brulebois <k...@debian.org> Date: Thu Feb 3 05:23:20 2011 +0100 Update Uploaders list. Thanks, David! diff --git a/debian/changelog b/debian/changelog index 1e29d5e..48ad418 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ xserver-xorg-input-mouse (1:1.6.0-2) UNRELEASED; urgency=low - Use .docs to install README file. * Remove xsfbs accordingly. * Remove long obsolete Replaces. + * Update Uploaders list. Thanks, David! -- Cyril Brulebois <k...@debian.org> Thu, 03 Feb 2011 05:11:51 +0100 diff --git a/debian/control b/debian/control index ec7a43e..b695f1c 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: xserver-xorg-input-mouse Section: x11 Priority: optional Maintainer: Debian X Strike Force <debian-x@lists.debian.org> -Uploaders: David Nusinow <dnusi...@debian.org>, Drew Parsons <dpars...@debian.org>, Cyril Brulebois <k...@debian.org> +Uploaders: Drew Parsons <dpars...@debian.org>, Cyril Brulebois <k...@debian.org> Build-Depends: debhelper (>= 8), dh-autoreconf, commit 6d219eaecc03ebc1d25e5460d9fb90b1a0dabc45 Author: Cyril Brulebois <k...@debian.org> Date: Thu Feb 3 05:23:00 2011 +0100 Remove long obsolete Replaces. diff --git a/debian/changelog b/debian/changelog index 16a8866..1e29d5e 100644 --- a/debian/changelog -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1prkwk-0004tr...@alioth.debian.org