xf86-input-mouse: Changes to 'master'

[Peter Hutterer]

 man/mousedrv.man |    3 ++-
 src/mouse.c      |   14 ++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

New commits:
commit bf95ccf496d6674a83c44d559e3eef8729c69449
Author: Dima Kogan <dkogan at secretsauce.net>
Date:   Sun Aug 16 22:27:28 2009 -0700

    Restrict wheel emulation to a single axis at a time.
    
    Wheel emulation works for both horizontal and vertical axes. Thus, if a
    device doesn't move in perfect straight line, scroll events build up on the
    respective other axis.
    
    In some clients, scroll wheel events have specific meanings other than
    scrolling (e.g. mplayer). In these clients, erroneous scrolling events come
    at a high cost.
    
    Thus, if a scroll wheel event is generated for one axis, reset the inertia
    of the other axis to 0, avoiding the buildup of these erroneous scrolling
    events.
    
    Signed-off-by: Dima Kogan <dkogan at secretsauce.net>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

commit 2d43329d778d7bfae5d9c99611ad49efa56716a6
Author: Dima Kogan <dkogan at secretsauce.net>
Date:   Sun Aug 16 21:33:43 2009 -0700

    Allow 0 as wheel emulation button for unconditional scrolling (#20529)
    
    If wheel emulation is on and the emulation button is 0, then any x/y motion
    of the device is converted into wheel events. The device becomes a
    scrolling-only device.
    
    Signed-off-by: Dima Kogan <dkogan at dkogan@cds.caltech.edu>
    Signed-off-by: Dima Kogan <dkogan at secretsauce.net>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>