Fix macOS client/server failing to start from terminal

The macOS client and server were completely unusable when run from a
terminal. They blocked forever in `[NSApp run];` which was called by
Sys_InitProtocolHandler(). `applicationDidFinishLaunching` was never
called to exit the NSApp run loop.

Use SDL's SDL_DROPFILE event to receive URLs to handle on macOS instead.
This also handles URLs while the game is running (connect to new server)
instead of nothing happening when clicking a link while the game is
running.
This commit is contained in:
Zack Middleton authored and Turtle Man ♣ committed 2023-06-11 11:05:13 -04:00
1 parent 8b6333fbd3
commit e452b7ac04
4 files changed
+29 -64

No files matched your search

-1
View File
@@ -66,6 +66,5 @@ int Sys_PID( void );
qboolean Sys_PIDIsRunning( int pid );
#ifdef PROTOCOL_HANDLER
char *Sys_InitProtocolHandler( void );
char *Sys_ParseProtocolUri( const char *uri );
#endif
+3 -20
View File
@@ -643,20 +643,6 @@ void Sys_ParseArgs( int argc, char **argv )
}
#ifdef PROTOCOL_HANDLER
/*
=================
Sys_InitProtocolHandler
See sys_osx.m for macOS implementation.
=================
*/
#ifndef __APPLE__
char *Sys_InitProtocolHandler( void )
{
return NULL;
}
#endif
/*
=================
Sys_ParseProtocolUri
@@ -716,9 +702,9 @@ char *Sys_ParseProtocolUri( const char *uri )
}
}
bufsize = strlen( "+connect " ) + i + 1;
bufsize = strlen( "connect " ) + i + 1;
out = malloc( bufsize );
strcpy( out, "+connect " );
strcpy( out, "connect " );
strncat( out, uri, i );
return out;
}
@@ -815,10 +801,6 @@ int main( int argc, char **argv )
Sys_PlatformInit( );
#ifdef PROTOCOL_HANDLER
protocolCommand = Sys_InitProtocolHandler( );
#endif
// Set the initial time base
Sys_Milliseconds( );
@@ -865,6 +847,7 @@ int main( int argc, char **argv )
#ifdef PROTOCOL_HANDLER
if ( protocolCommand != NULL )
{
Q_strcat( commandLine, sizeof( commandLine ), "+" );
Q_strcat( commandLine, sizeof( commandLine ), protocolCommand );
free( protocolCommand );
}
-43
View File
@@ -34,10 +34,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#import <Carbon/Carbon.h>
#import <Cocoa/Cocoa.h>
#ifdef PROTOCOL_HANDLER
char *protocolCommand = NULL;
#endif
/*
==============
Sys_Dialog
@@ -119,42 +115,3 @@ char *Sys_StripAppBundle( char *dir )
Q_strncpyz(cwd, Sys_Dirname(cwd), sizeof(cwd));
return cwd;
}
#ifdef PROTOCOL_HANDLER
@interface AppDelegate : NSObject <NSApplicationDelegate>
@end
@implementation AppDelegate
- (void)handleAppleEvent:(NSAppleEventDescriptor *)event withReplyEvent: (NSAppleEventDescriptor *)replyEvent
{
NSString *input = [[event paramDescriptorForKeyword:keyDirectObject] stringValue];
protocolCommand = Sys_ParseProtocolUri( input.UTF8String );
}
- (void)applicationDidFinishLaunching:(NSNotification *)notification
{
[NSApp stop:nil];
}
@end
char *Sys_InitProtocolHandler( void )
{
[NSApplication sharedApplication];
AppDelegate *appDelegate = [AppDelegate new];
NSAppleEventManager *sharedAppleEventManager = [NSAppleEventManager new];
[sharedAppleEventManager setEventHandler:appDelegate
andSelector:@selector(handleAppleEvent:withReplyEvent:)
forEventClass:kInternetEventClass
andEventID:kAEGetURL];
[NSApp setDelegate:appDelegate];
[NSApp run];
return protocolCommand;
}
#endif