0263d3538e
### Problem description Typing `--help` causes ImHex to exit without outputting anything. Diagnostic messages from glib, ASan, other libraries that might have something important to say, etc. are also suppressed. ### Implementation description This effectively reverts 7c1e33dde6e55ef6347f3b10868a42f456c2ae6a, which was partially reverted only on Windows by code that was left commented out in f114239f51ba68c385e3d46721dd9d97ca4a6c21. Allowing other libraries to print to stderr may make the output ‘ugly’, but lots of things print to stderr that are important for figuring out why something is bugged, like ASan and glib. ### Additional things ![image](https://github.com/user-attachments/assets/fa6771e2-da2e-45ea-93cd-06c3f6bfd3bf)
111 lines
3.3 KiB
C++
111 lines
3.3 KiB
C++
#include "window.hpp"
|
|
|
|
#if defined(OS_MACOS)
|
|
|
|
#include <hex/api/project_file_manager.hpp>
|
|
#include <hex/api/imhex_api.hpp>
|
|
#include <hex/api/event_manager.hpp>
|
|
#include <hex/api/task_manager.hpp>
|
|
|
|
#include <hex/helpers/utils_macos.hpp>
|
|
#include <hex/helpers/logger.hpp>
|
|
#include <hex/helpers/default_paths.hpp>
|
|
|
|
#include <unistd.h>
|
|
|
|
#include <imgui_impl_glfw.h>
|
|
|
|
namespace hex {
|
|
|
|
void nativeErrorMessage(const std::string &message) {
|
|
log::fatal(message);
|
|
errorMessageMacos(message.c_str());
|
|
}
|
|
|
|
void Window::configureGLFW() {
|
|
glfwWindowHint(GLFW_CONTEXT_VERSION_MAJOR, 3);
|
|
glfwWindowHint(GLFW_CONTEXT_VERSION_MINOR, 2);
|
|
glfwWindowHint(GLFW_OPENGL_PROFILE, GLFW_OPENGL_CORE_PROFILE);
|
|
glfwWindowHint(GLFW_COCOA_RETINA_FRAMEBUFFER, GLFW_FALSE);
|
|
glfwWindowHint(GLFW_COCOA_GRAPHICS_SWITCHING, GLFW_TRUE);
|
|
glfwWindowHint(GLFW_TRANSPARENT_FRAMEBUFFER, GLFW_TRUE);
|
|
}
|
|
|
|
void Window::initNative() {
|
|
log::impl::enableColorPrinting();
|
|
|
|
// Add plugin library folders to dll search path
|
|
for (const auto &path : paths::Libraries.read()) {
|
|
if (std::fs::exists(path))
|
|
setenv("LD_LIBRARY_PATH", hex::format("{};{}", hex::getEnvironmentVariable("LD_LIBRARY_PATH").value_or(""), path.string().c_str()).c_str(), true);
|
|
}
|
|
|
|
// Redirect stdout to log file if we're not running in a terminal
|
|
if (!isatty(STDOUT_FILENO)) {
|
|
log::impl::redirectToFile();
|
|
}
|
|
|
|
enumerateFontsMacos();
|
|
}
|
|
|
|
void Window::setupNativeWindow() {
|
|
bool themeFollowSystem = ImHexApi::System::usesSystemThemeDetection();
|
|
EventOSThemeChanged::subscribe(this, [themeFollowSystem] {
|
|
if (!themeFollowSystem) return;
|
|
|
|
if (!isMacosSystemDarkModeEnabled())
|
|
RequestChangeTheme::post("Light");
|
|
else
|
|
RequestChangeTheme::post("Dark");
|
|
});
|
|
|
|
EventProviderDirtied::subscribe([this](prv::Provider *) {
|
|
TaskManager::doLater([this] {
|
|
macosMarkContentEdited(m_window);
|
|
});
|
|
});
|
|
|
|
ProjectFile::registerHandler({
|
|
.basePath = "",
|
|
.required = true,
|
|
.load = [](const std::fs::path &, Tar &) {
|
|
return true;
|
|
},
|
|
.store = [this](const std::fs::path &, Tar &) {
|
|
TaskManager::doLater([this] {
|
|
macosMarkContentEdited(m_window, false);
|
|
});
|
|
|
|
return true;
|
|
}
|
|
});
|
|
|
|
if (themeFollowSystem)
|
|
EventOSThemeChanged::post();
|
|
|
|
// Register file drop callback
|
|
glfwSetDropCallback(m_window, [](GLFWwindow *, int count, const char **paths) {
|
|
for (int i = 0; i < count; i++) {
|
|
EventFileDropped::post(reinterpret_cast<const char8_t *>(paths[i]));
|
|
}
|
|
});
|
|
|
|
setupMacosWindowStyle(m_window, ImHexApi::System::isBorderlessWindowModeEnabled());
|
|
|
|
glfwSetWindowRefreshCallback(m_window, [](GLFWwindow *window) {
|
|
auto win = static_cast<Window *>(glfwGetWindowUserPointer(window));
|
|
win->fullFrame();
|
|
});
|
|
}
|
|
|
|
void Window::beginNativeWindowFrame() {
|
|
|
|
}
|
|
|
|
void Window::endNativeWindowFrame() {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#endif |