7cc5c4f330d47060/geode
1
0
Fork 0
mirror of https://github.com/geode-sdk/geode.git synced 2025-02-17 00:30:26 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Reenable platform console

Browse source
This commit is contained in:
altalk23 2023-09-10 17:19:59 +03:00
parent 19ad688fcc
commit d277b9435c
1 changed files with 32 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

61
loader/src/platform/mac/LoaderImpl.mm
View file

@ -42,39 +42,42 @@ void Loader::Impl::logConsoleMessageWithSeverity(std::string const& msg, Severit
void Loader::Impl::openPlatformConsole() {
if (m_platformConsoleOpen) return;
// std::string outFile = "/tmp/command_output_XXXXXX";
// int outFd = mkstemp(&outFile[0]);
std::string outFile = "/tmp/command_output_XXXXXX";
int outFd = mkstemp(&outFile[0]);
// auto script = outFile + ".command";
// auto scriptContent = fmt::format(R"(
// #!/bin/sh
// echo -n -e "\033]0;Geode Console\007"
// tail -f {} &
// trap "" SIGINT
// while [ $(lsof -t {} 2>/dev/null | wc -l) -gt 1 ]; do :; done
// osascript -e 'tell application "Terminal"
// close (every window whose name contains "Geode Console")
// if (count windows) is 0 then quit
// end tell' &
// exit
// )", outFile, outFile);
auto script = outFile + ".command";
auto scriptContent = fmt::format(R"(
#!/bin/sh
echo -n -e "\033]0;Geode Console {}\007"
tail -f {} &
trap "" SIGINT
while [ $(lsof -t {} 2>/dev/null | wc -l) -gt 1 ]
do :
sleep 2
done
osascript -e 'tell application "Terminal"
close (every window whose name contains "Geode Console {}")
if (count windows) is 0 then quit
end tell' &
exit
)", getpid(), outFile, outFile, getpid());
// if (file::writeString(script, scriptContent)) {
// chmod(script.c_str(), 0777);
// dup2(outFd, 1);
// dup2(outFd, 2);
if (file::writeString(script, scriptContent)) {
chmod(script.c_str(), 0777);
dup2(outFd, 1);
dup2(outFd, 2);
// NSTask *task = [[NSTask alloc] init];
// task.launchPath = @"/usr/bin/open";
// task.arguments = @[[NSString stringWithUTF8String:script.c_str()]];
// [task launch];
NSTask *task = [[NSTask alloc] init];
task.launchPath = @"/usr/bin/open";
task.arguments = @[[NSString stringWithUTF8String:script.c_str()]];
[task launch];
// m_platformData = new MacConsoleData {
// outFile,
// script,
// outFd
// };
// }
m_platformData = new MacConsoleData {
outFile,
script,
outFd
};
}
m_platformConsoleOpen = true;