xf86-input-mouse: Changes to 'master'

[Alan Coopersmith]

 Makefile.am                     |    5 +
 configure.ac                    |   12 +++
 include/Makefile.am             |    1 
 include/xf86-mouse-properties.h |   33 ++++++++
 man/mousedrv.man                |    7 +
 src/Makefile.am                 |    2 
 src/mouse.c                     |  159 +++++++++++++++++++++++++++++++++++++---
 src/sun_mouse.c                 |    6 -
 xf86-mouse.pc.in                |    6 +
 9 files changed, 212 insertions(+), 19 deletions(-)

New commits:
commit 1816cd91981c0f9673cf56dc4f5b0021e9cbbc65
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Fri Apr 27 17:36:01 2012 -0700

    Add settable properties for middle mouse button emulation
    
    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 at oracle.com>
    Reviewed-by: Alexandr Shadchin <alexandr.shadchin at gmail.com>
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>

commit 84090b15ea6346d0764a0e0be3f0bd65a7e0fe7c
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Fri Apr 27 15:57:28 2012 -0700

    Set button & axis labels
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Reviewed-by: Alexandr Shadchin <alexandr.shadchin at gmail.com>
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>

commit 4b6738c8409fe73596863b37a8fcad8ae352d121
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Fri Apr 27 15:44:00 2012 -0700

    Set XI_PROP_DEVICE_NODE property to string from "Device" option
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Reviewed-by: Alexandr Shadchin <alexandr.shadchin at gmail.com>
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>

commit 5583a77bbadd2e89cbc69a66f27deee1a5da982c
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Fri Apr 27 14:31:20 2012 -0700

    sun_mouse.c: Remove redundant option checks
    
    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 at oracle.com>
    Reviewed-by: Alexandr Shadchin <alexandr.shadchin at gmail.com>
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>