PulseStudio/VoxelEngine
PulseStudio/VoxelEngine
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

cleanup platform.cpp

Browse Source
This commit is contained in:
MihailRis 2025-09-26 21:57:48 +03:00
parent 240abb939f
commit 4c815db222
3 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/logic/scripting/lua/libs/libcore.cpp
View File

@ -244,7 +244,7 @@ static int l_open_url(lua::State* L) {
auto menu = engine->getGUI().getMenu(); auto menu = engine->getGUI().getMenu();
guiutil::confirm(*engine, msg, [url, menu]() { guiutil::confirm(*engine, msg, [url, menu]() {
platform::openURL(url); platform::open_url(url);
if (!menu->back()) { if (!menu->back()) {
menu->reset(); menu->reset();
} }

44
src/util/platform.cpp
View File

@ -65,7 +65,7 @@ int platform::get_process_id() {
return GetCurrentProcessId(); return GetCurrentProcessId();
} }
bool platform::openURL(const std::string& url) { bool platform::open_url(const std::string& url) {
if (url.empty()) return false; if (url.empty()) return false;
// UTF-8 → UTF-16 // UTF-8 → UTF-16
int wlen = MultiByteToWideChar(CP_UTF8, 0, url.c_str(), -1, nullptr, 0); int wlen = MultiByteToWideChar(CP_UTF8, 0, url.c_str(), -1, nullptr, 0);
@ -84,7 +84,6 @@ bool platform::openURL(const std::string& url) {
#else // _WIN32 #else // _WIN32
#include <unistd.h> #include <unistd.h>
#include <sys/wait.h>
#include "frontend/locale.hpp" #include "frontend/locale.hpp"
void platform::configure_encoding() { void platform::configure_encoding() {
@ -110,22 +109,32 @@ int platform::get_process_id() {
return getpid(); return getpid();
} }
bool platform::openURL(const std::string& url) { bool platform::open_url(const std::string& url) {
if (url.empty()) return false; if (url.empty()) return false;
pid_t pid = fork();
if (pid == 0) {
#ifdef __APPLE__ #ifdef __APPLE__
execlp("open", "open", url.c_str(), (char*)nullptr); auto cmd = "open " + util::quote(url);
#else if (int res = system(cmd.c_str())) {
execlp("xdg-open", "xdg-open", url.c_str(), (char*)nullptr); logger.warning() << "'" << cmd << "' returned code " << res;
#endif } else {
_exit(127); return false;
} else if (pid > 0) {
int status = 0;
waitpid(pid, &status, 0);
return WIFEXITED(status) && WEXITSTATUS(status) == 0;
} }
return false; #elif defined(_WIN32)
auto res = ShellExecuteW(NULL, L"open", util::quote(url).c_str(), NULL, NULL, SW_SHOWDEFAULT);
if (res <= 32) {
logger.warning() << "'open' returned code " << res;
} else {
return false;
}
#else
auto cmd = "xdg-open " + util::quote(url);
if (int res = system(cmd.c_str())) {
logger.warning() << "'" << cmd << "' returned code " << res;
} else {
return false;
}
#endif
return true;
} }
#endif // _WIN32 #endif // _WIN32
@ -136,9 +145,10 @@ void platform::open_folder(const std::filesystem::path& folder) {
} }
#ifdef __APPLE__ #ifdef __APPLE__
auto cmd = "open " + util::quote(folder.u8string()); auto cmd = "open " + util::quote(folder.u8string());
system(cmd.c_str()); if (int res = system(cmd.c_str())) {
logger.warning() << "'" << cmd << "' returned code " << res;
}
#elif defined(_WIN32) #elif defined(_WIN32)
auto cmd = "start explorer " + util::quote(folder.u8string());
ShellExecuteW(NULL, L"open", folder.wstring().c_str(), NULL, NULL, SW_SHOWDEFAULT); ShellExecuteW(NULL, L"open", folder.wstring().c_str(), NULL, NULL, SW_SHOWDEFAULT);
#else #else
auto cmd = "xdg-open " + util::quote(folder.u8string()); auto cmd = "xdg-open " + util::quote(folder.u8string());

2
src/util/platform.hpp
View File

@ -13,5 +13,5 @@ namespace platform {
/// Makes the current thread sleep for the specified amount of milliseconds. /// Makes the current thread sleep for the specified amount of milliseconds.
void sleep(size_t millis); void sleep(size_t millis);
int get_process_id(); int get_process_id();
bool openURL(const std::string& url); bool open_url(const std::string& url);
} }