xserver: Changes to 'server-1.15-branch'

[Matt Dew]

New branch 'server-1.15-branch' available with the following commits:
commit f41ab8c60780ea8f87354e536e5b73cb23878eb7
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Fri Jan 24 18:32:54 2014 +1000

    dix: prevent a driver from initializing or submitting buttons > MAX_BUTTONS
    
    The server internally relies on arrays with a MAX_BUTTONS maximum size (which
    is the max the core protocol can transport). Make sure a driver adheres to
    that.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    Reviewed-by: Daniel Stone <daniel at fooishbar.org>
    (cherry picked from commit 87ca80a7196949597113225405f3e4ee03bbee13)

commit 4447d71b9a74afe91aaf4cc01eae12a44ef09306
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Tue Jan 28 20:27:51 2014 -0800

    xf86DeleteScreen: move check for NULL pScrn before first dereference
    
    Flagged by cppcheck 1.62:
    [hw/xfree86/common/xf86Helper.c:220] -> [hw/xfree86/common/xf86Helper.c:231]:
     (warning) Possible null pointer dereference: pScrn - otherwise it is
     redundant to check it against null.
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
    Signed-off-by: Keith Packard <keithp at keithp.com>
    (cherry picked from commit c1ac89c793614797e08d3d8e7fc9ba55be899130)

commit 2ac840a14958fe74170518ee2c3a6b2dd88b20bd
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Tue Jan 28 20:27:50 2014 -0800

    On realloc failure, free font_path_string instead of leaking it
    
    Flagged by cppcheck 1.62:
    [dix/dixfonts.c:1792]: (error) Common realloc mistake:
     'font_path_string' nulled but not freed upon failure
    
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
    Signed-off-by: Keith Packard <keithp at keithp.com>
    (cherry picked from commit e6733ae91b7be52930f22a87de15fa05819ef948)

commit 157cc02fc13c998bba70e1652907972015e15e8e
Author: Alan Coopersmith <alan.coopersmith at oracle.com>
Date:   Fri Jan 24 23:42:49 2014 -0800

    Check for calloc() failure in add_master()
    
    Reported-by: Ilja Van Sprundel <ivansprundel at ioactive.com>
    Signed-off-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    (cherry picked from commit 9fc19168e7ca6308275bf8769d1ccb982f88465b)

commit f11c5938d732af717aeebbbf3b356138f3411bb7
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Fri Jan 24 16:51:02 2014 +1000

    Xi: fix modifier offset in XIPassiveGrab swapping function
    
    The request is followed by mask_len 4-byte units, then followed by the actual
    modifiers.
    
    Also fix up the swapping test, which had the same issue.
    
    Reported-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    Reviewed-by: Alan Coopersmith <alan.coopersmith at oracle.com>
    (cherry picked from commit 76b3be75b62657e346731444736f7e4d200beb5b)
    
    Conflicts:
    	test/xi2/protocol-xipassivegrabdevice.c

commit 345b7ead1dd262020e10b4aeb71044d46d16e134
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Mon Jan 13 17:00:23 2014 +1000

    os: restrict display names to digits
    
    We call atoi() on the server's display to get the socket but otherwise use the
    unmodified display for log file name, xkb paths, etc. This results in
    Xorg :banana being the equivalent of Xorg :0, except for the log files being
    in /var/log/Xorg.banana.log. I'm not sure there's a good use-case for this
    behaviour.
    
    Check the display for something that looks reasonable, i.e. digits only, but
    do allow for :0.0 (i.e. digits, followed by a period, followed by one or two
    digits).
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    Reviewed-by: Keith Packard <keithp at keithp.com>
    (cherry picked from commit 71baa466b1f6b02fe503f9a3089b7b9d61aa0f80)

commit 940d6a8e9d3544696654d5e68c615ab887f81945
Author: Carlos Garnacho <carlosg at gnome.org>
Date:   Thu Jan 2 21:33:30 2014 +0100

    Xi: Ensure DeviceChanged is emitted after grabs are deactivated
    
    When a grab on a slave device is deactivated, the master device must
    be checked, just in case there were events from other devices while
    the slave device was stolen away by the passive grab. This may
    introduce misbehaviors on mismatching valuators and device features
    later on UpdateDeviceState().
    
    Signed-off-by: Carlos Garnacho <carlosg at gnome.org>
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    (cherry picked from commit b2d5ee2e3684951b611fd2068d57cc65fd8305a3)

commit 47da6e3f47a55aeeef2c849067dd2d09fc2fe481
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Fri Jan 24 18:16:54 2014 +1000

    dix: fix button state check before changing a button mapping
    
    dev->button->down is a bitmask, not a normal array. Use the helper function to
    check, we technically allow the mapping to change after the physical button
    has been pressed (but not yet processed yet), so only check BUTTON_PROCESSED.
    
    From XSetPointerMapping(3):
    "If any of the buttons to be altered are logically in the down state,
    XSetPointerMapping returns MappingBusy, and the mapping is not changed."
    
    Reported-by: Ilja Van Sprundel <ivansprundel at ioactive.com>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    Reviewed-by: Daniel Stone <daniel at fooishbar.org>
    (cherry picked from commit 25d10464f440b8b34594b7c988a99a830ea39a29)