refactor(application): internals (#43)

Signed-off-by: Tony Gorez <[email protected]>
sourcemeta-research · Nov 20, 2024 · 0425947 · 0425947
1 parent 6385b8a
commit 0425947
Show file tree

Hide file tree

Showing 6 changed files with 103 additions and 55 deletions.
diff --git a/src/application/appkit/app_appkit.mm b/src/application/appkit/app_appkit.mm
@@ -5,24 +5,38 @@
 #import <AppKit/AppKit.h>
 #import <Cocoa/Cocoa.h>
 
+#include <functional>
 #include <iostream>
 
 namespace {
 sourcemeta::native::Application *instance_{nullptr};
 }
 
 namespace sourcemeta::native {
+
+class Application::Internal {
+public:
+  Internal() = default;
+  ~Internal() = default;
+
+  auto run_application(std::function<void()> on_start) -> void {
+    NSApplication *application = [NSApplication sharedApplication];
+    AppDelegate *delegate = [[AppDelegate alloc] init];
+    [application setDelegate:delegate];
+    [application run];
+
+    on_start();
+  }
+
+  auto terminate() -> void { [NSApp terminate:nil]; }
+};
+
 Application::Application() {
   assert(!instance_);
   instance_ = this;
 }
 
-Application::~Application() {
-  if (internal_) {
-    CFBridgingRelease(internal_);
-  }
-  instance_ = nullptr;
-}
+Application::~Application() { instance_ = nullptr; }
 
 Application &Application::instance() {
   assert(instance_);
@@ -33,13 +47,14 @@
   assert(!running_);
   running_ = true;
 
-  on_start();
+  internal_->run_application([this]() {
+    try {
+      on_start();
+    } catch (...) {
+      on_error(std::current_exception());
+    }
+  });
 
-  NSApplication *application = [NSApplication sharedApplication];
-  AppDelegate *delegate = [[AppDelegate alloc] init];
-  internal_ = const_cast<void *>(CFBridgingRetain(delegate));
-  [application setDelegate:delegate];
-  [application run];
   return EXIT_SUCCESS;
 }
 
@@ -61,7 +76,7 @@
   assert(running_);
 
   if (code == 0) {
-    [NSApp terminate:nil];
+    internal_->terminate();
   }
 
   std::exit(code);

diff --git a/src/application/console/app_console.cc b/src/application/console/app_console.cc
@@ -2,11 +2,23 @@
 
 #include <cassert>
 
+namespace {
+sourcemeta::native::Application *instance_{nullptr};
+}
+
 namespace sourcemeta::native {
 
-Application::Application() {}
+Application::Application() {
+  assert(!instance_);
+  instance_ = this;
+}
 
-Application::~Application() {}
+Application::~Application() { instance_ = nullptr; }
+
+Application &Application::instance() {
+  assert(instance_);
+  return *instance_;
+}
 
 auto Application::run() noexcept -> int {
   assert(!running_);

diff --git a/src/application/foundation/app_foundation.mm b/src/application/foundation/app_foundation.mm
@@ -14,12 +14,7 @@
   instance_ = this;
 }
 
-Application::~Application() {
-  if (internal_) {
-    CFBridgingRelease(internal_);
-  }
-  instance_ = nullptr;
-}
+Application::~Application() { instance_ = nullptr; }
 
 Application &Application::instance() {
   assert(instance_);

diff --git a/src/application/include/sourcemeta/native/application.h b/src/application/include/sourcemeta/native/application.h
@@ -51,9 +51,9 @@ class Application {
   // Internal types is used to store the platform-specific instance of the
   // application. Each platform will have its own implementation and will
   // store the instance in a different way, managing memory and resources.
-  using Internal = void *;
+  class Internal;
 
-  Internal internal_;
+  Internal *internal_;
 
   bool running_{false};
 

diff --git a/src/application/win32/app_win32.cc b/src/application/win32/app_win32.cc
@@ -12,13 +12,41 @@ sourcemeta::native::Application *instance_{nullptr};
 
 namespace sourcemeta::native {
 
+class Application::Internal {
+public:
+  auto setup() -> void {
+    SetProcessDpiAwarenessContext(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2);
+  }
+
+  auto start_loop() -> int {
+    MSG msg = {};
+    BOOL ret = 0;
+    while ((ret = GetMessage(&msg, NULL, 0, 0) != 0)) {
+      if (ret == -1) {
+        // The error is coming from GetMessage().
+        throw std::runtime_error(
+            "Failed to retrieve message from the message queue");
+      }
+      TranslateMessage(&msg);
+      DispatchMessage(&msg);
+    }
+
+    return static_cast<int>(msg.wParam);
+  }
+
+  auto quit(const int code) -> void { PostQuitMessage(code); }
+};
+
 Application::Application() {
   assert(!instance_);
-  SetProcessDpiAwarenessContext(DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2);
   instance_ = this;
+  internal_->setup();
 }
 
-Application::~Application() { instance_ = nullptr; }
+Application::~Application() {
+  internal_ = new Application::Internal();
+  instance_ = nullptr;
+}
 
 Application &Application::instance() {
   assert(instance_);
@@ -38,19 +66,9 @@ auto Application::run() noexcept -> int {
     this->on_error(std::current_exception());
   }
 
-  MSG msg = {};
-  BOOL ret = 0;
-  while ((ret = GetMessage(&msg, NULL, 0, 0) != 0)) {
-    if (ret == -1) {
-      // The error is coming from GetMessage().
-      throw std::runtime_error(
-          "Failed to retrieve message from the message queue");
-    }
-    TranslateMessage(&msg);
-    DispatchMessage(&msg);
-  }
+  int code = internal_->start_loop();
 
-  return static_cast<int>(msg.wParam);
+  return code;
 }
 
 auto Application::on_error(std::exception_ptr error) -> void {
@@ -69,7 +87,7 @@ auto Application::on_error(std::exception_ptr error) -> void {
 
 auto Application::exit(const int code) const noexcept -> void {
   assert(running_);
-  PostQuitMessage(code);
+  internal_->quit(code);
 }
 
 } // namespace sourcemeta::native
diff --git a/src/ui/webview/win32/webview_win32.cc b/src/ui/webview/win32/webview_win32.cc
@@ -68,29 +68,37 @@ class WebView::Internal {
     this->parent_ = static_cast<HWND *>(parent);
   }
 
+  auto create_controller(ICoreWebView2Environment *env,
+                         std::function<void()> callback) -> void {
+    env->CreateCoreWebView2Controller(
+        *this->parent_,
+        Callback<ICoreWebView2CreateCoreWebView2ControllerCompletedHandler>(
+            [this, callback](HRESULT result,
+                             ICoreWebView2Controller *controller) -> HRESULT {
+              assert(result == S_OK);
+
+              this->controller = controller;
+              this->controller->get_CoreWebView2(&this->webview);
+
+              // Set internals to ready
+              this->ready = true;
+
+              callback();
+              return S_OK;
+            })
+            .Get());
+  }
+
   auto create_webview(std::function<void()> callback) -> void {
     CreateCoreWebView2EnvironmentWithOptions(
         nullptr, nullptr, nullptr,
         Callback<ICoreWebView2CreateCoreWebView2EnvironmentCompletedHandler>(
             [this, callback](HRESULT result,
                              ICoreWebView2Environment *env) -> HRESULT {
-              env->CreateCoreWebView2Controller(
-                  *this->parent_,
-                  Callback<
-                      ICoreWebView2CreateCoreWebView2ControllerCompletedHandler>(
-                      [this, callback](
-                          HRESULT result,
-                          ICoreWebView2Controller *controller) -> HRESULT {
-                        this->controller = controller;
-                        this->controller->get_CoreWebView2(&this->webview);
-
-                        // Set internals to ready
-                        this->ready = true;
-
-                        callback();
-                        return S_OK;
-                      })
-                      .Get());
+              assert(result == S_OK);
+
+              this->create_controller(env, callback);
+
               return S_OK;
             })
             .Get());