edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-09-20 09:34:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

DDNet-Server-Launcher (for macOS): Support running without config

Browse source
This commit is contained in:
def 2021-12-25 19:32:43 +01:00
parent feb863306a
commit 21594a0405
3 changed files with 23 additions and 121 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ddnet-libs

@ -1 +1 @@
Subproject commit fb6f77066f108262d285bbca95ffdeea80c27515
Subproject commit 2b721d4531b4ae18904b4159f42aeda8950f77e2

30
src/macoslaunch/server.mm
View file

@ -54,15 +54,29 @@ void runServer()
task = [[NSTask alloc] init];
[task setCurrentDirectoryPath: [mainBundle resourcePath]];
// get a server config
NSOpenPanel *openDlg = [NSOpenPanel openPanel];
[openDlg setCanChooseFiles:YES];
NSArray *arguments = [NSArray new];
if([openDlg runModal] != NSOKButton)
return;
NSString *filename = [[openDlg URL] path];
NSArray *arguments = [NSArray arrayWithObjects: @"-f", filename, nil];
NSAlert *alert = [[[NSAlert alloc] init] autorelease];
[alert setMessageText: @"Run DDNet Server"];
[alert addButtonWithTitle: @"Run with default config"];
[alert addButtonWithTitle: @"Select config"];
[alert addButtonWithTitle: @"Cancel"];
switch([alert runModal])
{
case NSAlertFirstButtonReturn:
break;
case NSAlertThirdButtonReturn:
return;
case NSAlertSecondButtonReturn:
// get a server config
NSOpenPanel *openDlg = [NSOpenPanel openPanel];
[openDlg setCanChooseFiles:YES];
if([openDlg runModal] != NSOKButton)
return;
NSString *filename = [[openDlg URL] path];
arguments = [NSArray arrayWithObjects: @"-f", filename, nil];
break;
}
// run server
NSWindow *window;

112
src/macoslaunch/server_mysql.m
View file

@ -1,112 +0,0 @@
#import <Cocoa/Cocoa.h>
@interface ServerView : NSTextView
{
NSTask *task;
NSFileHandle *file;
}
- (void)listenTo: (NSTask*)t;
@end
@implementation ServerView
- (void)listenTo: (NSTask*)t;
{
NSPipe *pipe;
task = t;
pipe = [NSPipe pipe];
[task setStandardOutput: pipe];
file = [pipe fileHandleForReading];
[[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(outputNotification:) name: NSFileHandleReadCompletionNotification object: file];
[file readInBackgroundAndNotify];
}
- (void) outputNotification: (NSNotification *) notification
{
NSData *data = [[[notification userInfo] objectForKey: NSFileHandleNotificationDataItem] retain];
NSString *string = [[NSString alloc] initWithData: data encoding: NSASCIIStringEncoding];
NSAttributedString *attrstr = [[NSAttributedString alloc] initWithString: string];
[[self textStorage] appendAttributedString: attrstr];
int length = [[self textStorage] length];
NSRange range = NSMakeRange(length, 0);
[self scrollRangeToVisible: range];
[attrstr release];
[string release];
[file readInBackgroundAndNotify];
}
-(void)windowWillClose:(NSNotification *)notification
{
[task terminate];
[NSApp terminate:self];
}
@end
void runServer()
{
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
NSApp = [NSApplication sharedApplication];
NSBundle* mainBundle = [NSBundle mainBundle];
NSTask *task;
task = [[NSTask alloc] init];
[task setCurrentDirectoryPath: [mainBundle resourcePath]];
// get a server config
NSOpenPanel* openDlg = [NSOpenPanel openPanel];
[openDlg setCanChooseFiles:YES];
if([openDlg runModalForDirectory:nil file:nil] != NSOKButton)
return;
NSArray* filenames = [openDlg filenames];
if([filenames count] != 1)
return;
NSString* filename = [filenames objectAtIndex: 0];
NSArray* arguments = [NSArray arrayWithObjects: @"-f", filename, nil];
// run server
NSWindow *window;
ServerView *view;
NSRect graphicsRect;
graphicsRect = NSMakeRect(100.0, 1000.0, 600.0, 400.0);
window = [[NSWindow alloc]
initWithContentRect: graphicsRect
styleMask: NSTitledWindowMask
| NSClosableWindowMask
| NSMiniaturizableWindowMask
backing: NSBackingStoreBuffered
defer: NO];
[window setTitle: @"DDNet Server"];
view = [[[ServerView alloc] initWithFrame: graphicsRect] autorelease];
[view setEditable: NO];
[view setRulerVisible: YES];
[window setContentView: view];
[window setDelegate: view];
[window makeKeyAndOrderFront: nil];
[view listenTo: task];
[task setLaunchPath: [mainBundle pathForAuxiliaryExecutable: @"DDNet-Server_sql"]];
[task setArguments: arguments];
[task launch];
[NSApp run];
[task terminate];
[NSApp release];
[pool release];
}
int main (int argc, char **argv)
{
runServer();
return 0;
}