libXi: Changes to 'master'

[Peter Hutterer]

 configure.ac                     |    2 -
 include/X11/extensions/XInput2.h |   11 ++++++++++
 man/XIQueryDevice.txt            |   39 +++++++++++++++++++++++++++++++++++++-
 src/XExtInt.c                    |   40 ++++++++++++++++++++++++++++++++++++++-
 src/XIint.h                      |    2 -
 5 files changed, 90 insertions(+), 4 deletions(-)

New commits:
commit 69f2580fd47cfe24105892e9ffb79cd046954b7d
Merge: fc5d47895c1361763aa7f088b6d8cb3859e3fda8 3ed1b463205295a5ebba7d570a4cb8dfade51a38
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Sat Sep 17 06:41:30 2011 +1000

    Merge branch 'smooth-scrolling'
    
    Conflicts:
    	src/XExtInt.c

commit 3ed1b463205295a5ebba7d570a4cb8dfade51a38
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Wed Aug 17 14:50:39 2011 +1000

    Support XI 2.1 XIScrollClass
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

commit 00382417331d0b38373796fd31757be9fd3e9971
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Thu Jun 2 13:23:32 2011 +1000

    Support XI 2.1 internally
    
    Add the required constants to pretend to support XI 2.1.
    Having named constants for 2.1 seems a bit pointless, so let's just use the
    numbers directly.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    Reviewed-by: Jeremy Huddleston <jeremyhu at apple.com>

commit fc5d47895c1361763aa7f088b6d8cb3859e3fda8
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Sat Sep 17 06:40:01 2011 +1000

    Require inputproto 2.0.99.1 or later
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

commit 942dd55eb370e0acea3184de78619766a09f7670
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Fri Jun 3 15:46:47 2011 +1000

    man: update property and grab man pages for new constants
    
    Suggest the use of the new XIGrabModeAsync, etc. defines instead of the core
    defines. Add a BUGS section to each man page explaining
    backwards-compatibility.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    Reviewed-by: Daniel Stone <daniel at fooishbar.org>

commit eb5039859810a0fc4e4e594a4a1ccd99c5fecf85
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Mon Aug 22 13:55:56 2011 +1000

    man: fix typo in XIQueryDevice man page
    
    struct name is XIValuatorClassInfo.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

commit 635c2c029b1e73311c3f650bcaf7eeb9e782134b
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Wed Aug 17 15:20:48 2011 +1000

    Handle unknown device classes.
    
    If the server sends an unknown device class in response to an XIQueryDevice
    call, no memory is allocated for these classes but we still write type
    and sourceid as well as setting to->classes[i]. The latter causes multiple
    classes to point to the same memory field.
    
    Move the common code of assigning these three into the respective class type
    handlers so to automatically skip any unknown classes.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>