xserver-xorg-input-mouse: Changes to 'upstream-unstable'

[Cyril Brulebois <kibi@alioth.debian.org>]

 src/hurd_mouse.c |    8 ++++++++
 src/mouse.c      |    2 ++
 2 files changed, 10 insertions(+)

New commits:
commit 1780667854d73bbd0e0596271b09f93321cd0b1d
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date:   Wed Mar 30 02:26:25 2011 +0200

    Fix Hurd mouse driver with XInput ABI before 12
    
    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.

diff --git a/src/hurd_mouse.c b/src/hurd_mouse.c
index a285a87..031e44b 100644
--- a/src/hurd_mouse.c
+++ b/src/hurd_mouse.c
@@ -144,7 +144,15 @@ 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. */
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 12
+    /* need some special handling here. xf86CollectInputOptions will reset
+     * pInfo->options. To re-merge the previously set arguments, pass the
+     * original pInfo->options in.
+     */
+    xf86CollectInputOptions(pInfo, NULL, pInfo->options);
+#else
     COLLECT_INPUT_OPTIONS(pInfo, NULL);
+#endif
     xf86ProcessCommonOptions(pInfo, pInfo->options);
 
     /* Check if the device can be opened. */

commit d6e9623875de5714e85f7da5782ea665116f86dc
Author: Samuel Thibault <samuel.thibault@ens-lyon.org>
Date:   Wed Mar 30 01:00:47 2011 +0200

    Fix OSMouse OS-defined protocol support
    
    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>

diff --git a/src/mouse.c b/src/mouse.c
index edb998f..c3498ea 100644
--- a/src/mouse.c
+++ b/src/mouse.c
@@ -953,6 +953,8 @@ MousePreInit(InputDriverPtr drv, InputInfoPtr pInfo, int flags)
         MouseFindDevice(pInfo, protocol);
 
     xf86Msg(protocolFrom, "%s: Protocol: \"%s\"\n", pInfo->name, protocol);
+    if (protocolID == PROT_UNKNOWN)
+        goto out;
     if (!(pProto = GetProtocol(protocolID)))
     {
 	rc = BadValue;