asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #17629 from bruvzg/macos_nstask

Browse source 
[macOS] Implement OS_OSX::execute (using NSTask)
This commit is contained in:
Rémi Verschelde 2018-03-20 11:01:07 +01:00 committed by GitHub
commit d67d094606
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 50 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
platform/osx/os_osx.h
View file

@ -195,6 +195,7 @@ public:
virtual VideoMode get_video_mode(int p_screen = 0) const;
virtual void get_fullscreen_mode_list(List<VideoMode> *p_list, int p_screen = 0) const;
virtual Error execute(const String &p_path, const List<String> &p_arguments, bool p_blocking, ProcessID *r_child_id, String *r_pipe, int *r_exitcode, bool p_read_stderr);
virtual String get_executable_path() const;
virtual LatinKeyboardVariant get_latin_keyboard_variant() const;

49
platform/osx/os_osx.mm
View file

@ -2045,6 +2045,55 @@ bool OS_OSX::get_borderless_window() {
return [window_object styleMask] == NSWindowStyleMaskBorderless;
}
Error OS_OSX::execute(const String &p_path, const List<String> &p_arguments, bool p_blocking, ProcessID *r_child_id, String *r_pipe, int *r_exitcode, bool p_read_stderr) {
NSTask *task = [[NSTask alloc] init];
NSPipe *stdout_pipe = nil;
[task setLaunchPath:[NSString stringWithUTF8String:p_path.utf8().get_data()]];
NSMutableArray *arguments = [[NSMutableArray alloc] initWithCapacity:p_arguments.size()];
for (int i = 0; i < p_arguments.size(); i++) {
[arguments addObject:[NSString stringWithUTF8String:p_arguments[i].utf8().get_data()]];
}
[task setArguments:arguments];
if (p_blocking && r_pipe) {
stdout_pipe = [NSPipe pipe];
[task setStandardOutput:stdout_pipe];
if (p_read_stderr) [task setStandardError:[task standardOutput]];
}
@try {
[task launch];
if (r_child_id)
*r_child_id = [task processIdentifier];
if (p_blocking) {
if (r_pipe) {
NSFileHandle *read_handle = [stdout_pipe fileHandleForReading];
NSData *data = nil;
while ((data = [read_handle availableData]) && [data length]) {
NSString *string = [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding];
(*r_pipe) += [string UTF8String];
[string release];
}
} else {
[task waitUntilExit];
}
}
[arguments release];
[task release];
return OK;
} @catch (NSException *exception) {
ERR_PRINTS("NSException: " + String([exception reason].UTF8String) + "; Path: " + p_path);
[arguments release];
[task release];
return ERR_CANT_OPEN;
}
}
String OS_OSX::get_executable_path() const {
int ret;