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

xquartz: Remove support for Mountain Lion and earlier versions of macOS 

Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
This commit is contained in:
Jeremy Huddleston Sequoia 2021-01-27 13:35:17 -08:00
parent c0b2d3e099
commit aea15a7659
2 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hw/xquartz/mach-startup/bundle-main.c
View File

@ -57,6 +57,8 @@
#include "mach_startup.h" #include "mach_startup.h"
#include "mach_startupServer.h" #include "mach_startupServer.h"
#include <asl.h>
/* From darwinEvents.c ... but don't want to pull in all the server cruft */ /* From darwinEvents.c ... but don't want to pull in all the server cruft */
void void
DarwinListenOnOpenFD(int fd); DarwinListenOnOpenFD(int fd);

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

@ -56,11 +56,6 @@
#include "nonsdk_extinit.h" #include "nonsdk_extinit.h"
#if MAC_OS_X_VERSION_MIN_REQUIRED < 1090
// From NSApplication.h
extern const double NSAppKitVersionNumber;
#endif
/* 10.4's deferred update makes X slower.. have to live with the tearing /* 10.4's deferred update makes X slower.. have to live with the tearing
* for now.. */ * for now.. */
#define XP_NO_DEFERRED_UPDATES 8 #define XP_NO_DEFERRED_UPDATES 8
@ -172,18 +167,13 @@ displayScreenBounds(CGDirectDisplayID id)
(int)frame.origin.x, (int)frame.origin.y); (int)frame.origin.x, (int)frame.origin.y);
Boolean spacePerDisplay = false; Boolean spacePerDisplay = false;
#if MAC_OS_X_VERSION_MIN_REQUIRED < 1090 Boolean ok;
if (NSAppKitVersionNumber >= 1265) (void)CFPreferencesAppSynchronize(CFSTR("com.apple.spaces"));
#endif spacePerDisplay = ! CFPreferencesGetAppBooleanValue(CFSTR("spans-displays"),
{ CFSTR("com.apple.spaces"),
Boolean ok; &ok);
(void)CFPreferencesAppSynchronize(CFSTR("com.apple.spaces")); if (!ok)
spacePerDisplay = ! CFPreferencesGetAppBooleanValue(CFSTR("spans-displays"), spacePerDisplay = true;
CFSTR("com.apple.spaces"),
&ok);
if (!ok)
spacePerDisplay = true;
}
/* Remove menubar to help standard X11 window managers. /* 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. * On Mavericks and later, the menu bar is on all displays when spans-displays is false or unset.