mirror of
https://github.com/WerWolv/ImHex.git
synced 2026-03-28 07:47:03 -05:00
impr: Various web build improvements, API cleanup (#1541)
This commit is contained in:
@@ -7,7 +7,6 @@
|
||||
#include "messaging.hpp"
|
||||
|
||||
#include "init/splash_window.hpp"
|
||||
#include "init/tasks.hpp"
|
||||
|
||||
#include <hex/api/task_manager.hpp>
|
||||
#include <hex/api/plugin_manager.hpp>
|
||||
@@ -16,20 +15,17 @@
|
||||
#include "hex/subcommands/subcommands.hpp"
|
||||
|
||||
#include <wolv/io/fs.hpp>
|
||||
#include <wolv/utils/guards.hpp>
|
||||
#include <fcntl.h>
|
||||
|
||||
#if defined(OS_WINDOWS)
|
||||
#include <windows.h>
|
||||
#include <shellapi.h>
|
||||
#include <codecvt>
|
||||
#elif defined(OS_WEB)
|
||||
#include <emscripten.h>
|
||||
#include <emscripten/html5.h>
|
||||
#endif
|
||||
|
||||
using namespace hex;
|
||||
|
||||
namespace hex::init { int runImHex(); }
|
||||
|
||||
namespace {
|
||||
|
||||
/**
|
||||
@@ -95,150 +91,6 @@ namespace {
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Displays ImHex's splash screen and runs all initialization tasks. The splash screen will be displayed until all tasks have finished.
|
||||
*/
|
||||
[[maybe_unused]]
|
||||
void initializeImHex() {
|
||||
init::WindowSplash splashWindow;
|
||||
|
||||
log::info("Using '{}' GPU", ImHexApi::System::getGPUVendor());
|
||||
|
||||
// Add initialization tasks to run
|
||||
TaskManager::init();
|
||||
for (const auto &[name, task, async] : init::getInitTasks())
|
||||
splashWindow.addStartupTask(name, task, async);
|
||||
|
||||
splashWindow.startStartupTasks();
|
||||
|
||||
// Draw the splash window while tasks are running
|
||||
if (!splashWindow.loop())
|
||||
ImHexApi::System::impl::addInitArgument("tasks-failed");
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* @brief Deinitializes ImHex by running all exit tasks
|
||||
*/
|
||||
void deinitializeImHex() {
|
||||
// Run exit tasks
|
||||
init::runExitTasks();
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief Handles a file open request by opening the file specified by OS-specific means
|
||||
*/
|
||||
void handleFileOpenRequest() {
|
||||
if (auto path = hex::getInitialFilePath(); path.has_value()) {
|
||||
RequestOpenFile::post(path.value());
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
#if defined(OS_WEB)
|
||||
|
||||
using namespace hex::init;
|
||||
|
||||
void saveFsData() {
|
||||
EM_ASM({
|
||||
FS.syncfs(function (err) {
|
||||
if (!err)
|
||||
return;
|
||||
alert("Failed to save permanent file system: "+err);
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
int runImHex() {
|
||||
auto splashWindow = new WindowSplash();
|
||||
|
||||
log::info("Using '{}' GPU", ImHexApi::System::getGPUVendor());
|
||||
|
||||
// Add initialization tasks to run
|
||||
TaskManager::init();
|
||||
for (const auto &[name, task, async] : init::getInitTasks())
|
||||
splashWindow->addStartupTask(name, task, async);
|
||||
|
||||
splashWindow->startStartupTasks();
|
||||
|
||||
RequestRestartImHex::subscribe([&] {
|
||||
MAIN_THREAD_EM_ASM({
|
||||
location.reload();
|
||||
});
|
||||
});
|
||||
|
||||
// Draw the splash window while tasks are running
|
||||
emscripten_set_main_loop_arg([](void *arg) {
|
||||
auto splashWindow = reinterpret_cast<WindowSplash*>(arg);
|
||||
|
||||
FrameResult frameResult = splashWindow->fullFrame();
|
||||
if (frameResult == FrameResult::Success) {
|
||||
handleFileOpenRequest();
|
||||
|
||||
// Clean up everything after the main window is closed
|
||||
emscripten_set_beforeunload_callback(nullptr, [](int eventType, const void *reserved, void *userData) {
|
||||
hex::unused(eventType, reserved, userData);
|
||||
|
||||
try {
|
||||
saveFsData();
|
||||
deinitializeImHex();
|
||||
return "";
|
||||
} catch (const std::exception &ex) {
|
||||
std::string *msg = new std::string("Failed to deinitialize ImHex. This is just a message warning you of this, the application has already closed, you probably can't do anything about it. Message: ");
|
||||
msg->append(std::string(ex.what()));
|
||||
log::fatal("{}", *msg);
|
||||
return msg->c_str();
|
||||
}
|
||||
});
|
||||
|
||||
// Delete splash window (do it before creating the main window so glfw destroys the window)
|
||||
delete splashWindow;
|
||||
|
||||
emscripten_cancel_main_loop();
|
||||
|
||||
// Main window
|
||||
static Window window;
|
||||
emscripten_set_main_loop([]() {
|
||||
window.fullFrame();
|
||||
}, 60, 0);
|
||||
}
|
||||
}, splashWindow, 60, 0);
|
||||
|
||||
return -1;
|
||||
}
|
||||
|
||||
#else
|
||||
|
||||
int runImHex() {
|
||||
|
||||
bool shouldRestart = false;
|
||||
do {
|
||||
// Register an event handler that will make ImHex restart when requested
|
||||
shouldRestart = false;
|
||||
RequestRestartImHex::subscribe([&] {
|
||||
shouldRestart = true;
|
||||
});
|
||||
|
||||
initializeImHex();
|
||||
handleFileOpenRequest();
|
||||
|
||||
// Clean up everything after the main window is closed
|
||||
ON_SCOPE_EXIT {
|
||||
deinitializeImHex();
|
||||
};
|
||||
|
||||
// Main window
|
||||
Window window;
|
||||
window.loop();
|
||||
|
||||
} while (shouldRestart);
|
||||
|
||||
return EXIT_SUCCESS;
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -262,5 +114,5 @@ int main(int argc, char **argv) {
|
||||
|
||||
ImHexApi::System::impl::setPortableVersion(isPortableVersion());
|
||||
|
||||
return runImHex();
|
||||
return init::runImHex();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user