WallyHackenslacker/Aerofoil
1
0
Fork 0
mirror of https://github.com/elasota/Aerofoil.git synced 2025-09-23 06:53:43 +00:00
Code Issues Projects Releases Wiki Activity

Override Cocoa app lifecycle defined by SDL

Browse Source
This commit is contained in:
Phil Marell
2021-07-24 16:32:58 +10:00
parent f16ffa0c4c
commit 00488c6fea
8 changed files with 126 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
AerofoilMac/AerofoilMac.xcodeproj/project.pbxproj
View File

@@ -8,6 +8,9 @@
/* Begin PBXBuildFile section */
4A04C5AC269AD58E009F5CA3 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4A04C59D269AD58E009F5CA3 /* MainMenu.xib */; };
4A04C5AF269AD600009F5CA3 /* AerofoilAppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4A04C5AE269AD600009F5CA3 /* AerofoilAppDelegate.mm */; };
4A04C5B6269AE945009F5CA3 /* AerofoilApplication.m in Sources */ = {isa = PBXBuildFile; fileRef = 4A04C5B5269AE945009F5CA3 /* AerofoilApplication.m */; };
4A04C5B7269AE96B009F5CA3 /* MacInit.mm in Sources */ = {isa = PBXBuildFile; fileRef = 4A04C5B0269AE243009F5CA3 /* MacInit.mm */; };
5C54D0A02629B42400AB55E0 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 5C54D09F2629B42400AB55E0 /* Assets.xcassets */; };
5C54D0BE2629B72000AB55E0 /* stb_image_write.h in Headers */ = {isa = PBXBuildFile; fileRef = 5C54D0BC2629B72000AB55E0 /* stb_image_write.h */; };
5C54D0BF2629B72000AB55E0 /* stb_image_write.c in Sources */ = {isa = PBXBuildFile; fileRef = 5C54D0BD2629B72000AB55E0 /* stb_image_write.c */; };
@@ -590,6 +593,12 @@
/* Begin PBXFileReference section */
4A04C59E269AD58E009F5CA3 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = "<group>"; };
4A04C5AD269AD600009F5CA3 /* AerofoilAppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AerofoilAppDelegate.h; sourceTree = "<group>"; };
4A04C5AE269AD600009F5CA3 /* AerofoilAppDelegate.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = AerofoilAppDelegate.mm; sourceTree = "<group>"; usesTabs = 1; };
4A04C5B0269AE243009F5CA3 /* MacInit.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = MacInit.mm; sourceTree = "<group>"; };
4A04C5B2269AE368009F5CA3 /* MacInit.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MacInit.h; sourceTree = "<group>"; };
4A04C5B4269AE945009F5CA3 /* AerofoilApplication.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = AerofoilApplication.h; sourceTree = "<group>"; };
4A04C5B5269AE945009F5CA3 /* AerofoilApplication.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = AerofoilApplication.m; sourceTree = "<group>"; };
5C54D0962629B42100AB55E0 /* Aerofoil.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Aerofoil.app; sourceTree = BUILT_PRODUCTS_DIR; };
5C54D09F2629B42400AB55E0 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
5C54D0A42629B42400AB55E0 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
@@ -1065,10 +1074,16 @@
5C54D656262D84A800AB55E0 /* GpLogDriver_X.cpp */,
5C54D659262D84A900AB55E0 /* GpLogDriver_X.h */,
5C54D654262D84A800AB55E0 /* GpMain_SDL_X.cpp */,
4A04C5B0269AE243009F5CA3 /* MacInit.mm */,
4A04C5B2269AE368009F5CA3 /* MacInit.h */,
5C54D655262D84A800AB55E0 /* GpSystemServices_X.cpp */,
5C54D658262D84A900AB55E0 /* GpSystemServices_X.h */,
5C54D0A42629B42400AB55E0 /* Info.plist */,
4A04C59D269AD58E009F5CA3 /* MainMenu.xib */,
4A04C5B4269AE945009F5CA3 /* AerofoilApplication.h */,
4A04C5B5269AE945009F5CA3 /* AerofoilApplication.m */,
4A04C5AD269AD600009F5CA3 /* AerofoilAppDelegate.h */,
4A04C5AE269AD600009F5CA3 /* AerofoilAppDelegate.mm */,
);
path = AerofoilMac;
sourceTree = "<group>";
@@ -1997,8 +2012,10 @@
5C54D67A262D889D00AB55E0 /* DrawQuad32P.cpp in Sources */,
5C54D67B262D889D00AB55E0 /* CopyQuadP.cpp in Sources */,
5C54D669262D886900AB55E0 /* GpThreadEvent_Cpp11.cpp in Sources */,
4A04C5B6269AE945009F5CA3 /* AerofoilApplication.m in Sources */,
5C54D65B262D84A900AB55E0 /* GpMain_SDL_X.cpp in Sources */,
5C54D67C262D889E00AB55E0 /* DrawQuadPaletteP.cpp in Sources */,
4A04C5B7269AE96B009F5CA3 /* MacInit.mm in Sources */,
5C54D679262D889D00AB55E0 /* GpDisplayDriver_SDL_GL2.cpp in Sources */,
5C54D67F262D889E00AB55E0 /* GpAudioDriver_SDL2.cpp in Sources */,
5C54D668262D886900AB55E0 /* GpSystemServices_POSIX.cpp in Sources */,
@@ -2006,6 +2023,7 @@
5C54D65C262D84A900AB55E0 /* GpSystemServices_X.cpp in Sources */,
5C54D67D262D889E00AB55E0 /* ScaleQuadP.cpp in Sources */,
5C54D678262D889D00AB55E0 /* GpInputDriver_SDL_Gamepad.cpp in Sources */,
4A04C5AF269AD600009F5CA3 /* AerofoilAppDelegate.mm in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};

9
AerofoilMac/AerofoilMac/AerofoilAppDelegate.h Normal file
View File

@@ -0,0 +1,9 @@
#import <Cocoa/Cocoa.h>
NS_ASSUME_NONNULL_BEGIN
@interface AerofoilAppDelegate : NSObject <NSApplicationDelegate>
@end
NS_ASSUME_NONNULL_END

44
AerofoilMac/AerofoilMac/AerofoilAppDelegate.mm Normal file
View File

@@ -0,0 +1,44 @@
#import "AerofoilAppDelegate.h"
#import "About.h"
#include "WindowManager.h"
#include "GliderDefines.h" // kPlayMode
extern short theMode;
void DoSettingsMain(void);
@interface AerofoilAppDelegate ()
@property (weak) IBOutlet NSMenuItem *aboutAerofoilMenuItem;
@property (weak) IBOutlet NSMenuItem *aboutGliderPROMenuItem;
@property (weak) IBOutlet NSMenuItem *preferencesMenuItem;
@end
@implementation AerofoilAppDelegate
- (IBAction)showAboutAerofoil:(id)sender {
DoAboutFramework();
}
- (IBAction)showAboutGliderPRO:(id)sender {
DoAbout();
}
- (IBAction)showPreferences:(id)sender {
DoSettingsMain();
}
- (BOOL)validateMenuItem:(NSMenuItem *)menuItem {
if (menuItem == _aboutAerofoilMenuItem || menuItem == _aboutGliderPROMenuItem) {
return ![self menuItemsDisabled];
} else if (menuItem == _preferencesMenuItem) {
return ![self menuItemsDisabled];
} else {
return NO;
}
}
- (BOOL)menuItemsDisabled {
PortabilityLayer::WindowManager* wm = PortabilityLayer::WindowManager::GetInstance();
return theMode == kPlayMode || wm->IsExclusiveWindowVisible();
}
@end

9
AerofoilMac/AerofoilMac/AerofoilApplication.h Normal file
View File

@@ -0,0 +1,9 @@
#import <Cocoa/Cocoa.h>
NS_ASSUME_NONNULL_BEGIN
@interface AerofoilApplication : NSApplication
@end
NS_ASSUME_NONNULL_END

13
AerofoilMac/AerofoilMac/AerofoilApplication.m Normal file
View File

@@ -0,0 +1,13 @@
#import "AerofoilApplication.h"
#include "SDL.h"
extern int SDL_SendQuit(void);
@implementation AerofoilApplication
- (void)terminate:(id)sender {
// TODO: Use Aerofoil method instead of private SDL method
SDL_SendQuit();
}
@end

6
AerofoilMac/AerofoilMac/MacInit.h Normal file
View File

@@ -0,0 +1,6 @@
#ifndef MacInit_h
#define MacInit_h
int MacInit(void);
#endif /* MacInit_h */

22
AerofoilMac/AerofoilMac/MacInit.mm Normal file
View File

@@ -0,0 +1,22 @@
#import <Cocoa/Cocoa.h>
#import "AerofoilApplication.h"
#import "AerofoilAppDelegate.h"
#import "MacInit.h"
#include "SDL.h"
int MacInit(void) {
// Instantiate NSApp and its delegate first, so SDL chooses those over its own implementation.
[AerofoilApplication sharedApplication];
[[NSBundle mainBundle] loadNibNamed:@"MainMenu" owner:NSApp topLevelObjects:nil];
if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_GAMECONTROLLER) < 0)
return -1;
// Gracefully activate app.
//
// (SDL forcefully does this via [NSApp activateIgnoringOtherApps:YES],
// which isn't consistent with normal Mac apps).
[NSApp finishLaunching];
return 0;
}

5
AerofoilX/GpMain_SDL_X.cpp
View File

@@ -20,6 +20,7 @@
#include "IGpVOSEventQueue.h"
#include <string>
#include "MacInit.h"
GpXGlobals g_gpXGlobals;
@@ -40,7 +41,11 @@ SDLMAIN_DECLSPEC int SDL_main(int argc, char *argv[])
enableLogging = true;
}
#ifndef __MACOS__
if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_GAMECONTROLLER) < 0)
#else
if (MacInit())
#endif
return -1;
GpFileSystem_X::GetInstance()->Init();