DisplayServerJavaScript implementation.

This commit is contained in:
Fabio Alessandrelli 2020-05-01 14:45:45 +02:00
parent 11a81341fa
commit 7411e7fd37
11 changed files with 1538 additions and 1210 deletions

View file

@ -34,22 +34,63 @@
#include <emscripten/emscripten.h>
static OS_JavaScript *os = nullptr;
void exit_callback() {
emscripten_cancel_main_loop(); // After this, we can exit!
Main::cleanup();
int exit_code = OS_JavaScript::get_singleton()->get_exit_code();
memdelete(os);
os = nullptr;
emscripten_force_exit(exit_code); // No matter that we call cancel_main_loop, regular "exit" will not work, forcing.
}
void main_loop_callback() {
if (os->main_loop_iterate()) {
emscripten_cancel_main_loop(); // Cancel current loop and wait for finalize_async.
EM_ASM({
// This will contain the list of operations that need to complete before cleanup.
Module.async_finish = [];
});
os->get_main_loop()->finish();
os->finalize_async(); // Will add all the async finish functions.
EM_ASM({
Promise.all(Module.async_finish).then(function() {
Module.async_finish = [];
ccall("cleanup_after_sync", null, []);
});
});
}
}
extern "C" EMSCRIPTEN_KEEPALIVE void cleanup_after_sync() {
emscripten_set_main_loop(exit_callback, -1, false);
}
extern "C" EMSCRIPTEN_KEEPALIVE void main_after_fs_sync(char *p_idbfs_err) {
String idbfs_err = String::utf8(p_idbfs_err);
if (!idbfs_err.empty()) {
print_line("IndexedDB not available: " + idbfs_err);
}
OS_JavaScript *os = OS_JavaScript::get_singleton();
os->set_idb_available(idbfs_err.empty());
// TODO: Check error return value.
Main::setup2(); // Manual second phase.
// Ease up compatibility.
ResourceLoader::set_abort_on_missing_resources(false);
Main::start();
os->run_async();
os->get_main_loop()->init();
emscripten_resume_main_loop();
}
int main(int argc, char *argv[]) {
os = new OS_JavaScript();
Main::setup(argv[0], argc - 1, &argv[1], false);
emscripten_set_main_loop(main_loop_callback, -1, false);
emscripten_pause_main_loop(); // Will need to wait for FS sync.
// Sync from persistent state into memory and then
// run the 'main_after_fs_sync' function.
/* clang-format off */
@ -62,10 +103,6 @@ int main(int argc, char *argv[]) {
);
/* clang-format on */
new OS_JavaScript(argc, argv);
// TODO: Check error return value.
Main::setup(argv[0], argc - 1, &argv[1]);
return 0;
// Continued async in main_after_fs_sync() from the syncfs() callback.
}