frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'jeremyhu/master'

This commit is contained in:
Keith Packard 2014-08-12 16:34:24 -07:00
parent 606b701c56 ab32ee3589
commit d09c9ddb86
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
hw/xquartz/xpr/xprScreen.c
View File

@ -169,14 +169,25 @@ displayScreenBounds(CGDirectDisplayID id)
(int)frame.size.width, (int)frame.size.height, (int)frame.size.width, (int)frame.size.height,
(int)frame.origin.x, (int)frame.origin.y); (int)frame.origin.x, (int)frame.origin.y);
/* Remove menubar to help standard X11 window managers. Boolean spacePerDisplay = false;
* On Mavericks and later, the menu bar is on all displays.
*/
if (XQuartzIsRootless
#if MAC_OS_X_VERSION_MIN_REQUIRED < 1090 #if MAC_OS_X_VERSION_MIN_REQUIRED < 1090
&& (NSAppKitVersionNumber >= 1265 || (frame.origin.x == 0 && frame.origin.y == 0)) if (NSAppKitVersionNumber >= 1265)
#endif #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.origin.y += aquaMenuBarHeight;
frame.size.height -= aquaMenuBarHeight; frame.size.height -= aquaMenuBarHeight;
} }

7
os/connection.c
View File

@ -1307,13 +1307,6 @@ ListenOnOpenFD(int fd, int noxauth)
/* Increment the count */ /* Increment the count */
ListenTransCount++; ListenTransCount++;
/* This *might* not be needed... /shrug */
ResetAuthorization();
ResetHosts(display);
#ifdef XDMCP
XdmcpReset();
#endif
} }
/* based on TRANS(SocketUNIXAccept) (XtransConnInfo ciptr, int *status) */ /* based on TRANS(SocketUNIXAccept) (XtransConnInfo ciptr, int *status) */