public-backup/Boxedwine
1
0
Fork 0
mirror of https://github.com/danoon2/Boxedwine.git synced 2025-12-05 18:46:44 -06:00
Code Issues Packages Projects Releases Wiki Activity

Kind of went down the rabbit hole on this one. As I was testing on mac I noticed that I don't launch games from the UI into a new process like I do on Linux and Windows. If the game crashes, it also remove the UI. Turns out this is a very hard thing to do with sandboxed apps on Mac. I finally figured out how to launch the app, but it turns out for sandboxed apps you can supply command line arguments. So I had to invent a way to communicate between the UI process and the game process. I chose to do this via text files. There is a more official way of doing it with a helper app, but that looked even harder.

Browse Source
This commit is contained in:
James Bryant
2025-09-07 18:48:38 -07:00
parent 4b2b4a8581
commit b45ec1558d
19 changed files with 236 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/ksystem.h
View File

@@ -164,7 +164,8 @@ public:
static bool isMac();
static bool isLinux();
static std::shared_ptr<FsNode> procNode;
static std::shared_ptr<FsNode> procNode;
static BString showWindowTimestamp;
private:
static void initDisplayModes();
static void internalEraseProcess(U32 id);

4
platform/sdl/knativescreenSDL.cpp
View File

@@ -149,6 +149,10 @@ void KNativeScreenSDL::showWindow(bool show) {
uiShutdown();
}
#else
if (!KSystem::showWindowTimestamp.isEmpty()) {
BWriteFile file(KSystem::showWindowTimestamp);
file.write("Showing Window");
}
klog("Showing Window");
#endif
}

68
project/mac-xcode/Boxedwine/Boxedwine.xcodeproj/project.pbxproj
View File

@@ -324,6 +324,10 @@
718F07782D31C23F00D41270 /* libMoltenVK.dylib in CopyFiles */ = {isa = PBXBuildFile; fileRef = 718F07772D31C23F00D41270 /* libMoltenVK.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
71A24F0E2E6BA582007573AB /* libncurses.6.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 715CD0312D715DCA00917EF6 /* libncurses.6.dylib */; };
71A24F0F2E6BA582007573AB /* libncurses.6.dylib in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 715CD0312D715DCA00917EF6 /* libncurses.6.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
71A2787D2E6E3A3C007573AB /* MacPlatformSwift.swift in Sources */ = {isa = PBXBuildFile; fileRef = 71A2787C2E6E3A2D007573AB /* MacPlatformSwift.swift */; };
71A2787E2E6E3A3C007573AB /* MacPlatformSwift.swift in Sources */ = {isa = PBXBuildFile; fileRef = 71A2787C2E6E3A2D007573AB /* MacPlatformSwift.swift */; };
71A2787F2E6E3A3C007573AB /* MacPlatformSwift.swift in Sources */ = {isa = PBXBuildFile; fileRef = 71A2787C2E6E3A2D007573AB /* MacPlatformSwift.swift */; };
71A278802E6E3A3C007573AB /* MacPlatformSwift.swift in Sources */ = {isa = PBXBuildFile; fileRef = 71A2787C2E6E3A2D007573AB /* MacPlatformSwift.swift */; };
71B4910C2D4AA1B800A8AB32 /* s_approxRecipSqrt32_1.c in Sources */ = {isa = PBXBuildFile; fileRef = 71B490E02D4AA1B800A8AB32 /* s_approxRecipSqrt32_1.c */; };
71B4910D2D4AA1B800A8AB32 /* s_mul64To128.c in Sources */ = {isa = PBXBuildFile; fileRef = 71B490E72D4AA1B800A8AB32 /* s_mul64To128.c */; };
71B4910F2D4AA1B800A8AB32 /* f32_to_extF80.c in Sources */ = {isa = PBXBuildFile; fileRef = 71B490D72D4AA1B800A8AB32 /* f32_to_extF80.c */; };
@@ -1042,6 +1046,7 @@
718F07732D31C23200D41270 /* libvulkan.1.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libvulkan.1.dylib; path = ../../../lib/mac/vulkan/lib/libvulkan.1.dylib; sourceTree = "<group>"; };
718F07752D31C23800D41270 /* libvulkan.1.3.296.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libvulkan.1.3.296.dylib; path = ../../../lib/mac/vulkan/lib/libvulkan.1.3.296.dylib; sourceTree = "<group>"; };
718F07772D31C23F00D41270 /* libMoltenVK.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libMoltenVK.dylib; path = ../../../lib/mac/vulkan/lib/libMoltenVK.dylib; sourceTree = "<group>"; };
71A2787C2E6E3A2D007573AB /* MacPlatformSwift.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MacPlatformSwift.swift; sourceTree = "<group>"; };
71B2D2F82668170000010AB6 /* libOSMesa.8.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libOSMesa.8.dylib; path = ../../../lib/mac/precompiledMac/libOSMesa.8.dylib; sourceTree = "<group>"; };
71B2D30926681CCA00010AB6 /* libglapi.0.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libglapi.0.dylib; path = ../../../lib/mac/precompiledMac/libglapi.0.dylib; sourceTree = "<group>"; };
71B4905E2D4AA1B800A8AB32 /* extF80M_isSignalingNaN.c */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.c; path = extF80M_isSignalingNaN.c; sourceTree = "<group>"; };
@@ -1689,6 +1694,7 @@
71FBFCAF2433B815003F17F1 /* Boxedwine */ = {
isa = PBXGroup;
children = (
71A2787C2E6E3A2D007573AB /* MacPlatformSwift.swift */,
1AC3F45D2CDF247200EB9C76 /* atomic_ref.gcc.h */,
1AC3F45E2CDF247200EB9C76 /* atomic_ref.h */,
1A80F2F6276EBFF40032A70A /* BoxedwineX64-Automation.entitlements */,
@@ -1878,6 +1884,12 @@
LastUpgradeCheck = 1620;
ORGANIZATIONNAME = Boxedwine;
TargetAttributes = {
1A80EE46276EBCC70032A70A = {
LastSwiftMigration = 1640;
};
1A80F091276EBF170032A70A = {
LastSwiftMigration = 1640;
};
1AEBC3912AABC0A9007ECB08 = {
CreatedOnToolsVersion = 14.2;
TestTargetID = 7135DC10264EBCD0005D6AA6;
@@ -1889,8 +1901,12 @@
71222B182435140100CDBABD = {
CreatedOnToolsVersion = 11.3.1;
};
71222BCB24351CBA00CDBABD = {
LastSwiftMigration = 1640;
};
71FBFCAC2433B815003F17F1 = {
CreatedOnToolsVersion = 11.3.1;
LastSwiftMigration = 1640;
};
};
};
@@ -2089,6 +2105,7 @@
71B492362D4AA1B800A8AB32 /* extF80_to_i64.c in Sources */,
71B492372D4AA1B800A8AB32 /* s_normSubnormalExtF80Sig.c in Sources */,
71B492382D4AA1B800A8AB32 /* s_approxRecip_1Ks.c in Sources */,
71A278802E6E3A3C007573AB /* MacPlatformSwift.swift in Sources */,
71B4923B2D4AA1B800A8AB32 /* extF80_div.c in Sources */,
71B4923C2D4AA1B800A8AB32 /* extF80M_isSignalingNaN.c in Sources */,
71B4923D2D4AA1B800A8AB32 /* s_commonNaNToF64UI.c in Sources */,
@@ -2146,6 +2163,7 @@
1A55D63C2A0841E2002B7021 /* inftrees.c in Sources */,
1AC5F2FD2772D9D6001D0FCA /* platformThreads-armv8.cpp in Sources */,
1A55D6402A0841E2002B7021 /* infback.c in Sources */,
71A2787F2E6E3A3C007573AB /* MacPlatformSwift.swift in Sources */,
1A55D66B2A0842E8002B7021 /* trees.c in Sources */,
1A80F1E2276EBF170032A70A /* knativesystem.cpp in Sources */,
1A55D6382A0841E2002B7021 /* inffast.c in Sources */,
@@ -2379,6 +2397,7 @@
71222BE824351CBA00CDBABD /* imgui_draw.cpp in Sources */,
1A55D6502A08428F002B7021 /* crc32.c in Sources */,
71222BED24351CBA00CDBABD /* imgui_impl_sdl.cpp in Sources */,
71A2787E2E6E3A3C007573AB /* MacPlatformSwift.swift in Sources */,
710091612644D44E003413C3 /* platformThreads.cpp in Sources */,
714097462D4AA53F00D10110 /* pugixml.cpp in Sources */,
71222BFF24351CBA00CDBABD /* imgui_widgets.cpp in Sources */,
@@ -2719,6 +2738,7 @@
1AFC4798264827A600EE5FCC /* coremidi.cpp in Sources */,
1A0F95642C912BD100E5A9BF /* knativeinputSDL.cpp in Sources */,
712228F52433EE5400CDBABD /* imguitinyfiledialogs.cpp in Sources */,
71A2787D2E6E3A3C007573AB /* MacPlatformSwift.swift in Sources */,
7100914E2644D42C003413C3 /* sdlcallback.cpp in Sources */,
1AFC480A2663FFC000EE5FCC /* pixelformat.cpp in Sources */,
1A0F95582C912BD100E5A9BF /* knativescreenGL.cpp in Sources */,
@@ -2767,6 +2787,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_CXX_LANGUAGE_STANDARD = "c++20";
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = "Boxedwine/Boxedwine-Automation.entitlements";
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
@@ -2784,7 +2805,6 @@
"GLH=<SDL_opengl.h>",
BOXEDWINE_OPENGL_SDL,
BOXEDWINE_GLHANDLE_ARB_POINTER,
BOXEDWINE_UI_LAUNCH_IN_PROCESS,
BOXEDWINE_RECORDER,
BOXEDWINE_CORE_AUDIO,
BOXEDWINE_MULTI_THREADED,
@@ -2801,6 +2821,9 @@
OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
PRODUCT_BUNDLE_IDENTIFIER = org.boxedwine;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Boxedwine/BoxedwineAutomationSlow-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 6.0;
SYSTEM_FRAMEWORK_SEARCH_PATHS = "";
SYSTEM_HEADER_SEARCH_PATHS = (
"$(SRCROOT)/../../../lib/glew/include",
@@ -2817,6 +2840,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_CXX_LANGUAGE_STANDARD = "c++20";
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = "Boxedwine/Boxedwine-Automation.entitlements";
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
@@ -2834,7 +2858,6 @@
"GLH=<SDL_opengl.h>",
BOXEDWINE_OPENGL_SDL,
BOXEDWINE_GLHANDLE_ARB_POINTER,
BOXEDWINE_UI_LAUNCH_IN_PROCESS,
BOXEDWINE_RECORDER,
BOXEDWINE_CORE_AUDIO,
BOXEDWINE_MULTI_THREADED,
@@ -2851,6 +2874,8 @@
OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
PRODUCT_BUNDLE_IDENTIFIER = org.boxedwine;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Boxedwine/BoxedwineAutomationSlow-Bridging-Header.h";
SWIFT_VERSION = 6.0;
SYSTEM_FRAMEWORK_SEARCH_PATHS = "";
SYSTEM_HEADER_SEARCH_PATHS = (
"$(SRCROOT)/../../../lib/glew/include",
@@ -2868,6 +2893,7 @@
ARCHS = "$(ARCHS_STANDARD)";
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_CXX_LANGUAGE_STANDARD = "c++20";
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = "Boxedwine/BoxedwineX64-Automation.entitlements";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
@@ -2885,7 +2911,6 @@
BOXEDWINE_OPENGL_SDL,
BOXEDWINE_GLHANDLE_ARB_POINTER,
BOXEDWINE_POSIX,
BOXEDWINE_UI_LAUNCH_IN_PROCESS,
BOXEDWINE_RECORDER,
BOXEDWINE_CORE_AUDIO,
BOXEDWINE_MAC_JIT,
@@ -2903,6 +2928,9 @@
OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
PRODUCT_BUNDLE_IDENTIFIER = org.boxedwine;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Boxedwine/BoxedwineAutomation-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 6.0;
SYSTEM_HEADER_SEARCH_PATHS = (
"$(SRCROOT)/../../../lib/glew/include",
"$(SRCROOT)/../../../lib/imgui",
@@ -2919,6 +2947,7 @@
ARCHS = "$(ARCHS_STANDARD)";
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_CXX_LANGUAGE_STANDARD = "c++20";
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = "Boxedwine/BoxedwineX64-Automation.entitlements";
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
@@ -2936,7 +2965,6 @@
BOXEDWINE_OPENGL_SDL,
BOXEDWINE_GLHANDLE_ARB_POINTER,
BOXEDWINE_POSIX,
BOXEDWINE_UI_LAUNCH_IN_PROCESS,
BOXEDWINE_RECORDER,
BOXEDWINE_CORE_AUDIO,
BOXEDWINE_MAC_JIT,
@@ -2955,6 +2983,8 @@
OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
PRODUCT_BUNDLE_IDENTIFIER = org.boxedwine;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Boxedwine/BoxedwineAutomation-Bridging-Header.h";
SWIFT_VERSION = 6.0;
SYSTEM_HEADER_SEARCH_PATHS = (
"$(SRCROOT)/../../../lib/glew/include",
"$(SRCROOT)/../../../lib/imgui",
@@ -3123,11 +3153,13 @@
ARCHS = "$(ARCHS_STANDARD)";
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_CXX_LANGUAGE_STANDARD = "c++20";
CODE_SIGN_ENTITLEMENTS = Boxedwine/BoxedwineX64.entitlements;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Boxedwine/Boxedwine.entitlements;
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_ASSET_PATHS = "";
DEVELOPMENT_TEAM = NHYAMS3B9Z;
ENABLE_HARDENED_RUNTIME = YES;
EXCLUDED_ARCHS = "";
FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../../../lib/mac";
@@ -3140,14 +3172,16 @@
BOXEDWINE_OPENGL_SDL,
BOXEDWINE_GLHANDLE_ARB_POINTER,
BOXEDWINE_POSIX,
BOXEDWINE_UI_LAUNCH_IN_PROCESS,
BOXEDWINE_RECORDER,
BOXEDWINE_CORE_AUDIO,
BOXEDWINE_MAC_JIT,
__MACOSX_CORE__,
BOXEDWINE_VULKAN,
BOXED_NO_EXCEPTIONS,
BOXEDWINE_UI_LAUNCH_IN_PROCESS,
);
GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS = "";
"GCC_PREPROCESSOR_DEFINITIONS_NOT_USED_IN_PRECOMPS[arch=*]" = "";
HEADER_SEARCH_PATHS = "";
INFOPLIST_FILE = "BoxedwineX64-Info.plist";
LD_RUNPATH_SEARCH_PATHS = (
@@ -3163,6 +3197,9 @@
OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
PRODUCT_BUNDLE_IDENTIFIER = org.boxedwine;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Boxedwine/Boxedwine-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 6.0;
SYSTEM_HEADER_SEARCH_PATHS = (
"$(SRCROOT)/../../../lib/glew/include",
"$(SRCROOT)/../../../lib/imgui",
@@ -3179,11 +3216,13 @@
ARCHS = "$(ARCHS_STANDARD)";
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_CXX_LANGUAGE_STANDARD = "c++20";
CODE_SIGN_ENTITLEMENTS = Boxedwine/BoxedwineX64.entitlements;
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Boxedwine/Boxedwine.entitlements;
CODE_SIGN_STYLE = Automatic;
COMBINE_HIDPI_IMAGES = YES;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_ASSET_PATHS = "";
DEVELOPMENT_TEAM = NHYAMS3B9Z;
ENABLE_HARDENED_RUNTIME = YES;
EXCLUDED_ARCHS = "";
FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/../../../lib/mac";
@@ -3196,7 +3235,6 @@
BOXEDWINE_OPENGL_SDL,
BOXEDWINE_GLHANDLE_ARB_POINTER,
BOXEDWINE_POSIX,
BOXEDWINE_UI_LAUNCH_IN_PROCESS,
BOXEDWINE_RECORDER,
BOXEDWINE_CORE_AUDIO,
BOXEDWINE_MAC_JIT,
@@ -3219,6 +3257,8 @@
OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
PRODUCT_BUNDLE_IDENTIFIER = org.boxedwine;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Boxedwine/Boxedwine-Bridging-Header.h";
SWIFT_VERSION = 6.0;
SYSTEM_HEADER_SEARCH_PATHS = (
"$(SRCROOT)/../../../lib/glew/include",
"$(SRCROOT)/../../../lib/imgui",
@@ -3248,7 +3288,6 @@
BOXEDWINE_OPENGL_SDL,
BOXEDWINE_GLHANDLE_ARB_POINTER,
BOXEDWINE_POSIX,
BOXEDWINE_UI_LAUNCH_IN_PROCESS,
BOXEDWINE_CORE_AUDIO,
BOXEDWINE_MAC_JIT,
BOXED_NO_EXCEPTIONS,
@@ -3293,7 +3332,6 @@
BOXEDWINE_OPENGL_SDL,
BOXEDWINE_GLHANDLE_ARB_POINTER,
BOXEDWINE_POSIX,
BOXEDWINE_UI_LAUNCH_IN_PROCESS,
BOXEDWINE_CORE_AUDIO,
BOXEDWINE_MAC_JIT,
BOXED_NO_EXCEPTIONS,
@@ -3436,6 +3474,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_CXX_LANGUAGE_STANDARD = "c++20";
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Boxedwine/Boxedwine.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
@@ -3453,11 +3492,11 @@
"GLH=<SDL_opengl.h>",
BOXEDWINE_OPENGL_SDL,
BOXEDWINE_GLHANDLE_ARB_POINTER,
BOXEDWINE_UI_LAUNCH_IN_PROCESS,
BOXEDWINE_RECORDER,
BOXEDWINE_CORE_AUDIO,
BOXEDWINE_MULTI_THREADED,
__MACOSX_CORE__,
BOXEDWINE_UI_LAUNCH_IN_PROCESS,
);
HEADER_SEARCH_PATHS = "";
INFOPLIST_FILE = Boxedwine/Info.plist;
@@ -3470,6 +3509,9 @@
OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
PRODUCT_BUNDLE_IDENTIFIER = org.boxedwine;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Boxedwine/BoxedwineSlow-Bridging-Header.h";
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
SWIFT_VERSION = 6.0;
SYSTEM_FRAMEWORK_SEARCH_PATHS = "";
SYSTEM_HEADER_SEARCH_PATHS = (
"$(SRCROOT)/../../../lib/glew/include",
@@ -3486,6 +3528,7 @@
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_CXX_LANGUAGE_STANDARD = "c++20";
CLANG_ENABLE_MODULES = YES;
CODE_SIGN_ENTITLEMENTS = Boxedwine/Boxedwine.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "-";
@@ -3503,7 +3546,6 @@
"GLH=<SDL_opengl.h>",
BOXEDWINE_OPENGL_SDL,
BOXEDWINE_GLHANDLE_ARB_POINTER,
BOXEDWINE_UI_LAUNCH_IN_PROCESS,
BOXEDWINE_RECORDER,
BOXEDWINE_CORE_AUDIO,
BOXEDWINE_MULTI_THREADED,
@@ -3520,6 +3562,8 @@
OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)";
PRODUCT_BUNDLE_IDENTIFIER = org.boxedwine;
PRODUCT_NAME = "$(TARGET_NAME)";
SWIFT_OBJC_BRIDGING_HEADER = "Boxedwine/BoxedwineSlow-Bridging-Header.h";
SWIFT_VERSION = 6.0;
SYSTEM_FRAMEWORK_SEARCH_PATHS = "";
SYSTEM_HEADER_SEARCH_PATHS = (
"$(SRCROOT)/../../../lib/glew/include",

4
project/mac-xcode/Boxedwine/Boxedwine/Boxedwine-Bridging-Header.h Normal file
View File

@@ -0,0 +1,4 @@
//
// Use this file to import your target's public headers that you would like to expose to Swift.
//

4
project/mac-xcode/Boxedwine/Boxedwine/BoxedwineAutomation-Bridging-Header.h Normal file
View File

@@ -0,0 +1,4 @@
//
// Use this file to import your target's public headers that you would like to expose to Swift.
//

4
project/mac-xcode/Boxedwine/Boxedwine/BoxedwineAutomationSlow-Bridging-Header.h Normal file
View File

@@ -0,0 +1,4 @@
//
// Use this file to import your target's public headers that you would like to expose to Swift.
//

4
project/mac-xcode/Boxedwine/Boxedwine/BoxedwineSlow-Bridging-Header.h Normal file
View File

@@ -0,0 +1,4 @@
//
// Use this file to import your target's public headers that you would like to expose to Swift.
//

2
project/mac-xcode/Boxedwine/Boxedwine/Info.plist
View File

@@ -26,6 +26,8 @@
<string>$(MACOSX_DEPLOYMENT_TARGET)</string>
<key>NSHumanReadableCopyright</key>
<string>Copyright © 2020 Boxedwine. All rights reserved.</string>
<key>LSMultipleInstancesProhibited</key>
<false/>
<key>NSMainNibFile</key>
<string>MainMenu</string>
<key>NSPrincipalClass</key>

3
project/mac-xcode/Boxedwine/Boxedwine/MacPlatform.h
View File

@@ -29,3 +29,6 @@
void MacPlatformOpenFileLocation(const char* str);
const char* MacPlatformGetResourcePath(const char* pName);
void MacPlatormSetThreadPriority(void);
int MacPlatformLaunchAnotherInstance(void);
int MacPlatformIsTaskRunning(void);
int MacPlatformIsTaskFinishedLaunching(void);

17
project/mac-xcode/Boxedwine/Boxedwine/MacPlatform.m
View File

@@ -27,6 +27,9 @@
#import "MacPlatform.h"
#import <Cocoa/Cocoa.h>
#import <Foundation/Foundation.h>
#import "Boxedwine-Swift.h"
@class MacPlatformSwift;
void MacPlatormSetThreadPriority(void) {
[NSThread setThreadPriority:1.0];
@@ -61,3 +64,17 @@ const char* MacPlatformGetResourcePath(const char* pName) {
}
return NULL;
}
int MacPlatformIsTaskRunning(void) {
return [MacPlatformSwift isAppRunning] ? 1 : 0;
}
int MacPlatformIsTaskFinishedLaunching(void) {
return [MacPlatformSwift hasFinishedStartup] ? 1 : 0;
}
int MacPlatformLaunchAnotherInstance(void)
{
[MacPlatformSwift launchAnotherInstance];
return 1;
}

40
project/mac-xcode/Boxedwine/Boxedwine/MacPlatformSwift.swift Normal file
View File

@@ -0,0 +1,40 @@
//
// MacPlatformSwift.swift
// Boxedwine
//
// Created by James Bryant on 9/7/25.
// Copyright © 2025 Boxedwine. All rights reserved.
//
import Cocoa
@objc
class MacPlatformSwift : NSObject {
nonisolated(unsafe) static var runningApp: NSRunningApplication?
@objc
class func launchAnotherInstance() {
let appURL = Bundle.main.bundleURL
let configuration = NSWorkspace.OpenConfiguration()
configuration.createsNewApplicationInstance = true
NSWorkspace.shared.openApplication(at: appURL, configuration: configuration) { (app, error) in
if let error = error {
print("Error launching app: \(error.localizedDescription)")
} else if let launchedApp = app {
print("Successfully launched new instance of \(launchedApp.bundleIdentifier ?? "unknown app")")
}
runningApp = app
}
}
@objc
class func isAppRunning() -> Bool {
let terminated = runningApp?.isTerminated ?? true
return !terminated
}
@objc
class func hasFinishedStartup() -> Bool {
return runningApp?.isFinishedLaunching ?? false
}
}

8
source/emulation/cpu/binaryTranslation/btCpu.cpp
View File

@@ -369,7 +369,13 @@ void unscheduleThread(KThread* thread) {
#if !defined(BOXEDWINE_X64)
void common_runSingleOp(BtCPU* cpu) {
DecodedOp* op = cpu->getNextOp();
DecodedOp* op = nullptr;
try {
op = cpu->getNextOp();
} catch (...) {
// at this point the previous getNextOp threw an exception and the eip is now pointing to the signal handler
op = cpu->getNextOp();
}
bool deallocOp = false;
if (op->flags & OP_FLAG_EMULATED_OP) {

1
source/kernel/ksystem.cpp
View File

@@ -63,6 +63,7 @@ U32 KSystem::wineMajorVersion;
bool KSystem::disableHideCursor = false;
bool KSystem::forceRelativeMouse = false;
bool KSystem::cacheReads = false;
BString KSystem::showWindowTimestamp;
#if defined(BOXEDWINE_X64) && !defined(BOXEDWINE_USE_SSE_FOR_FPU)
bool KSystem::useF64 = false;

24
source/sdl/main.cpp
View File

@@ -41,7 +41,29 @@ void writeSource();
int boxedmain(int argc, const char **argv) {
StartUpArgs startupArgs;
klog("Starting ...");
klog("Starting ...");
#if defined(__MACH__)
std::vector<BString> lines;
std::vector<const char*> args;
BString dataPath = KNativeSystem::getLocalDirectory();
BString argsPath = dataPath.stringByApppendingPath("args.txt");
readLinesFromFile(argsPath, lines);
Fs::deleteNativeFile(argsPath);
if (lines.size()) {
KSystem::showWindowTimestamp = dataPath.stringByApppendingPath(lines[0]+".txt");
U32 createdTime = lines[0].toInt();
U32 now = (U32)(KSystem::getSystemTimeAsMicroSeconds() / 100000);
if (createdTime + 10 > now) {
args.push_back(argv[0]);
for (int i=1;i<(int)lines.size();i++) {
args.push_back(lines[i].c_str());
}
argc = (int)args.size();
argv = args.data();
}
}
#endif
KSystem::startMicroCounter();
KSystem::exePath = BString::copy(argv[0]);
if (KSystem::exePath.contains("\\")) {

54
source/ui/data/boxedwineData.cpp
View File

@@ -20,6 +20,7 @@
#include "../boxedwineui.h"
#include "../../util/threadutils.h"
#include "knativethread.h"
#include "knativesystem.h"
#ifndef BOXEDWINE_UI_LAUNCH_IN_PROCESS
#include "../../../lib/tiny-process/process.hpp"
#endif
@@ -64,6 +65,14 @@ BoxedWinVersion* BoxedwineData::getWinVersionFromName(BString name) {
return nullptr;
}
#if defined(__MACH__)
extern "C" {
int MacPlatformLaunchAnotherInstance(void);
int MacPlatformIsTaskRunning(void);
int MacPlatformIsTaskFinishedLaunching(void);
}
#endif
void BoxedwineData::startApp() {
#ifdef BOXEDWINE_UI_LAUNCH_IN_PROCESS
GlobalSettings::startUpArgs.apply();
@@ -71,6 +80,48 @@ void BoxedwineData::startApp() {
uiShutdown();
}
#else
#if defined(__MACH__)
std::vector<BString> args = GlobalSettings::startUpArgs.buildArgs();
BString now;
now.append((U32)(KSystem::getSystemTimeAsMicroSeconds() / 100000));
args.insert(args.begin(), now);
writeLinesToFile(GlobalSettings::getArgsPath(), args);
MacPlatformLaunchAnotherInstance();
BString filePath = GlobalSettings::getDataFolder().stringByApppendingPath(now+".txt");
bool started = false;
U32 startTime = KSystem::getMilliesSinceStart();
bool windowCreated = false;
while (true) {
bool running = MacPlatformIsTaskRunning();
if (!started) {
if (running) {
started = true;
} else {
if (KSystem::getMilliesSinceStart() - startTime > 10000) {
break;
}
}
} else if (!running) {
break; // we started but are no longer running
}
if (windowCreated) {
if (uiIsRunning()) {
uiShutdown();
}
} else {
if (Fs::doesNativePathExist(filePath)) {
windowCreated = true;
Fs::deleteNativeFile(filePath);
}
uiLoop();
}
uiPumpEvents(); // without this, swift won't get the isTerminated msg
KNativeThread::sleep(16);
}
Fs::deleteNativeFile(filePath);
#else
std::vector<BString> a = GlobalSettings::startUpArgs.buildArgs();
BString log;
BString cmd = GlobalSettings::getExeFilePath();
@@ -121,6 +172,7 @@ void BoxedwineData::startApp() {
uiShutdown();
}
#endif
#endif
}
void BoxedwineData::reloadContainers() {
@@ -169,4 +221,4 @@ void BoxedwineData::sortContainers() {
std::sort(BoxedwineData::containers.begin(), BoxedwineData::containers.end(), [](BoxedContainer* a, BoxedContainer* b) {
return a->getName().compareTo(b->getName(), true) < 0;
});
}
}

4
source/ui/data/globalSettings.cpp
View File

@@ -362,6 +362,10 @@ BString GlobalSettings::getDemoFolder() {
return GlobalSettings::dataFolderLocation.stringByApppendingPath("DemoCache");
}
BString GlobalSettings::getArgsPath() {
return GlobalSettings::dataFolderLocation.stringByApppendingPath("args.txt");
}
BString GlobalSettings::getRootFolder(BoxedContainer* container) {
return container->dirPath.stringByApppendingPath("root");
}

1
source/ui/data/globalSettings.h
View File

@@ -122,6 +122,7 @@ public:
static BString getAutomationFolder(BoxedContainer* container);
static BString getRootFolder(BoxedContainer* container);
static BString getDemoFolder();
static BString getArgsPath(); // used by Mac
static BString getExePath() {return GlobalSettings::exePath;}
static BString getExeFilePath() { return GlobalSettings::exeFilePath; }
static std::vector<std::shared_ptr<FileSystemZip>> getWineVersions();

6
source/ui/mainui.cpp
View File

@@ -356,6 +356,10 @@ void uiShutdown() {
window = nullptr;
}
void uiPumpEvents() {
SDL_PumpEvents();
}
bool uiIsRunning() {
return window!= nullptr;
}
@@ -678,4 +682,4 @@ bool uiContinue() {
return true;
}
return GlobalSettings::startUpArgs.readyToLaunch;
}
}

3
source/ui/mainui.h
View File

@@ -25,8 +25,9 @@ bool uiContinue();
bool uiLoop();
void uiShutdown();
bool uiIsRunning();
void uiPumpEvents();
void runOnMainUI(std::function<bool()> f, U64 delayInMillies=0);
void runAfterFrame(std::function<bool()> f, U64 delayInMillies=0);
#endif
#endif