mirrors/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2025-11-04 01:34:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed Unix version of PlatformOpenInShellFn_DefaultImpl. (#7772, #7660)

Browse Source 
+ Enable on non-iPhone macOS builds
This commit is contained in:
cfillion
2024-07-06 04:12:46 -04:00
committed by ocornut
parent 2d0baaabe6
commit 1ec1f7a3de
1 changed files with 29 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
imgui.cpp
View File

@@ -14353,11 +14353,18 @@ static void SetClipboardTextFn_DefaultImpl(void* user_data_ctx, const char* text
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
#if defined(__APPLE__) && defined(TARGET_OS_IPHONE) && !defined(IMGUI_DISABLE_DEFAULT_SHELL_FUNCTIONS) #ifndef IMGUI_DISABLE_DEFAULT_SHELL_FUNCTIONS
#if defined(__APPLE__) && TARGET_OS_IPHONE
#define IMGUI_DISABLE_DEFAULT_SHELL_FUNCTIONS #define IMGUI_DISABLE_DEFAULT_SHELL_FUNCTIONS
#endif #endif
#if defined(_WIN32) && !defined(IMGUI_DISABLE_WIN32_FUNCTIONS) && !defined(IMGUI_DISABLE_DEFAULT_SHELL_FUNCTIONS) #if defined(_WIN32) && defined(IMGUI_DISABLE_WIN32_FUNCTIONS)
#define IMGUI_DISABLE_DEFAULT_SHELL_FUNCTIONS
#endif
#endif
#ifndef IMGUI_DISABLE_DEFAULT_SHELL_FUNCTIONS
#ifdef _WIN32
#include <shellapi.h> // ShellExecuteA() #include <shellapi.h> // ShellExecuteA()
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma comment(lib, "shell32") #pragma comment(lib, "shell32")
@@ -14366,18 +14373,32 @@ static bool PlatformOpenInShellFn_DefaultImpl(ImGuiContext*, const char* path)
{ {
return (INT_PTR)::ShellExecuteA(NULL, "open", path, NULL, NULL, SW_SHOWDEFAULT) > 32; return (INT_PTR)::ShellExecuteA(NULL, "open", path, NULL, NULL, SW_SHOWDEFAULT) > 32;
} }
#elif !defined(IMGUI_DISABLE_DEFAULT_SHELL_FUNCTIONS) #else
#include <sys/wait.h>
#include <unistd.h>
static bool PlatformOpenInShellFn_DefaultImpl(ImGuiContext*, const char* path) static bool PlatformOpenInShellFn_DefaultImpl(ImGuiContext*, const char* path)
{ {
#if __APPLE__ #if __APPLE__
const char* open_executable = "open"; const char* args[] { "open", "--", path, NULL };
#else #else
const char* open_executable = "xdg-open"; const char* args[] { "xdg-open", path, NULL };
#endif #endif
ImGuiTextBuffer buf; pid_t pid = fork();
buf.appendf("%s \"%s\"", open_executable, path); if (pid < 0)
return system(buf.c_str()) != -1; return false;
if (!pid)
{
execvp(args[0], const_cast<char **>(args));
exit(-1);
} }
else
{
int status;
waitpid(pid, &status, 0);
return WEXITSTATUS(status) == 0;
}
}
#endif
#else #else
static bool PlatformOpenInShellFn_DefaultImpl(ImGuiContext*, const char*) { return false; } static bool PlatformOpenInShellFn_DefaultImpl(ImGuiContext*, const char*) { return false; }
#endif // Default shell handlers #endif // Default shell handlers