xserver: Branch 'server-1.16-branch' - 2 commits

[Jeremy Huddleston Sequoia]

Sorry, I meant to push that to jeremyhu/server-1.16-branch and then eventually send a [PULL] request, but I failed...

On Aug 11, 2014, at 13:20, Jeremy Huddleston <jeremyhu at kemper.freedesktop.org> wrote:

> hw/xquartz/xpr/xprScreen.c |   23 +++++++++++++++++------
> os/connection.c            |    7 -------
> 2 files changed, 17 insertions(+), 13 deletions(-)
> 
> New commits:
> commit af2e9e3bb173885106f041f89b9f39b57fe3550a
> Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
> Date:   Mon Aug 11 13:15:24 2014 -0700
> 
>    XQuartz: Better support turning off "Displays have separate Spaces" on OS X Mavericks
> 
>    http://xquartz.macosforge.org/trac/ticket/1876
> 
>    Follow-up to: 1c10b37380d228b35db8a8616a6312ac54f5e59b
> 
>    Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
>    (cherry picked from commit ab32ee35890be51137b56525826ffe219b63eb88)
> 
> diff --git a/hw/xquartz/xpr/xprScreen.c b/hw/xquartz/xpr/xprScreen.c
> index 7aa1ae1..d0a525f 100644
> --- a/hw/xquartz/xpr/xprScreen.c
> +++ b/hw/xquartz/xpr/xprScreen.c
> @@ -169,14 +169,25 @@ displayScreenBounds(CGDirectDisplayID id)
>               (int)frame.size.width, (int)frame.size.height,
>               (int)frame.origin.x, (int)frame.origin.y);
> 
> -    /* Remove menubar to help standard X11 window managers.
> -     * On Mavericks and later, the menu bar is on all displays.
> -     */
> -    if (XQuartzIsRootless
> +    Boolean spacePerDisplay = false;
> #if MAC_OS_X_VERSION_MIN_REQUIRED < 1090
> -        && (NSAppKitVersionNumber >= 1265 || (frame.origin.x == 0 && frame.origin.y == 0))
> +    if (NSAppKitVersionNumber >= 1265)
> #endif
> -        ) {
> +    {
> +        Boolean ok;
> +        (void)CFPreferencesAppSynchronize(CFSTR("com.apple.spaces"));
> +        spacePerDisplay = ! CFPreferencesGetAppBooleanValue(CFSTR("spans-displays"),
> +                                                            CFSTR("com.apple.spaces"),
> +                                                            &ok);
> +        if (!ok)
> +            spacePerDisplay = true;
> +    }
> +
> +    /* Remove menubar to help standard X11 window managers.
> +     * On Mavericks and later, the menu bar is on all displays when spans-displays is false or unset.
> +     */
> +    if (XQuartzIsRootless &&
> +        (spacePerDisplay || (frame.origin.x == 0 && frame.origin.y == 0))) {
>         frame.origin.y += aquaMenuBarHeight;
>         frame.size.height -= aquaMenuBarHeight;
>     }
> commit b7a24467f738bfd9437e8de02ed5e44409054185
> Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
> Date:   Wed Jul 23 11:53:33 2014 -0700
> 
>    ListenOnOpenFD: Remove Resets since this is intended to be for hotplugging connections
> 
>    pharris says that the resets should not be done in the hotplugging case.
> 
>    This may fix a crash reported against XQuartz:
>    http://xquartz.macosforge.org/trac/ticket/869
> 
>    Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
>    Reviewed-by: Peter Harris <pharris at opentext.com>
>    (cherry picked from commit dfbc6a1a78ff3192baae6f7f2af98b6e51422f75)
> 
> diff --git a/os/connection.c b/os/connection.c
> index 40d9ff3..f915e12 100644
> --- a/os/connection.c
> +++ b/os/connection.c
> @@ -1307,13 +1307,6 @@ ListenOnOpenFD(int fd, int noxauth)
> 
>     /* Increment the count */
>     ListenTransCount++;
> -
> -    /* This *might* not be needed... /shrug */
> -    ResetAuthorization();
> -    ResetHosts(display);
> -#ifdef XDMCP
> -    XdmcpReset();
> -#endif
> }
> 
> /* based on TRANS(SocketUNIXAccept) (XtransConnInfo ciptr, int *status) */
> _______________________________________________
> xorg-commit mailing list
> xorg-commit at lists.x.org
> http://lists.x.org/mailman/listinfo/xorg-commit
>