From d7ed676ada2d4f6781e79118e21d1f59745975a2 Mon Sep 17 00:00:00 2001 From: crupest Date: Wed, 29 Sep 2021 18:53:51 +0800 Subject: ... --- include/cru/osx/gui/UiApplication.hpp | 2 +- include/cru/platform/gui/UiApplication.hpp | 2 +- src/osx/gui/UiApplication.mm | 66 +++++++++++++++++++++++++++++- 3 files changed, 67 insertions(+), 3 deletions(-) diff --git a/include/cru/osx/gui/UiApplication.hpp b/include/cru/osx/gui/UiApplication.hpp index abe5780a..5de0cc6b 100644 --- a/include/cru/osx/gui/UiApplication.hpp +++ b/include/cru/osx/gui/UiApplication.hpp @@ -39,7 +39,7 @@ class OsxUiApplication : public OsxGuiResource, public virtual IUiApplication { INativeWindow* CreateWindow(INativeWindow* parent, CreateWindowFlag flags) override; - cru::platform::graphics::IGraphicsFactory* GetGraphFactory() override; + cru::platform::graphics::IGraphicsFactory* GetGraphicsFactory() override; ICursorManager* GetCursorManager() override; diff --git a/include/cru/platform/gui/UiApplication.hpp b/include/cru/platform/gui/UiApplication.hpp index 86eb0904..78c7fae6 100644 --- a/include/cru/platform/gui/UiApplication.hpp +++ b/include/cru/platform/gui/UiApplication.hpp @@ -62,7 +62,7 @@ struct CRU_PLATFORM_GUI_API IUiApplication : public virtual IPlatformResource { virtual INativeWindow* CreateWindow(INativeWindow* parent, CreateWindowFlag flags) = 0; - virtual cru::platform::graphics::IGraphicsFactory* GetGraphFactory() = 0; + virtual cru::platform::graphics::IGraphicsFactory* GetGraphicsFactory() = 0; virtual ICursorManager* GetCursorManager() = 0; }; diff --git a/src/osx/gui/UiApplication.mm b/src/osx/gui/UiApplication.mm index 69f52c1f..2491390f 100644 --- a/src/osx/gui/UiApplication.mm +++ b/src/osx/gui/UiApplication.mm @@ -1,7 +1,13 @@ #include "cru/osx/gui/UiApplication.hpp" +#include "cru/osx/graphics/quartz/Factory.hpp" + #include +#include + #include +#include +#include @interface AppDelegate : NSObject - (id)init:(cru::platform::gui::osx::details::OsxUiApplicationPrivate*)p; @@ -32,6 +38,12 @@ class OsxUiApplicationPrivate { OsxUiApplication* osx_ui_application_; AppDelegate* app_delegate_; std::vector> quit_handlers_; + + long long current_timer_id_ = 1; + std::unordered_map> next_tick_; + std::unordered_map timers_; + + std::unique_ptr quartz_graphics_factory_; }; void OsxUiApplicationPrivate::CallQuitHandlers() { @@ -41,7 +53,11 @@ void OsxUiApplicationPrivate::CallQuitHandlers() { } } -OsxUiApplication::OsxUiApplication() : OsxGuiResource(this) {} +OsxUiApplication::OsxUiApplication() + : OsxGuiResource(this), p_(new details::OsxUiApplicationPrivate(this)) { + [NSApp setDelegate:p_->app_delegate_]; + p_->quartz_graphics_factory_ = std::make_unique(); +} OsxUiApplication::~OsxUiApplication() {} @@ -58,6 +74,54 @@ void OsxUiApplication::AddOnQuitHandler(std::function handler) { p_->quit_handlers_.push_back(std::move(handler)); } +long long OsxUiApplication::SetImmediate(std::function action) { + const long long id = p_->current_timer_id_++; + p_->next_tick_.emplace(id, std::move(action)); + + [[NSRunLoop mainRunLoop] performBlock:^{ + const auto i = p_->next_tick_.find(id); + if (i != p_->next_tick_.cend()) { + i->second(); + } + p_->next_tick_.erase(i); + }]; + + return id; +} + +long long OsxUiApplication::SetTimeout(std::chrono::milliseconds milliseconds, + std::function action) { + long long id = p_->current_timer_id_++; + p_->timers_.emplace(id, [NSTimer scheduledTimerWithTimeInterval:milliseconds.count() / 1000.0 + repeats:false + block:^(NSTimer* timer) { + action(); + p_->timers_.erase(id); + }]); + + return id; +} + +long long OsxUiApplication::SetInterval(std::chrono::milliseconds milliseconds, + std::function action) { + long long id = p_->current_timer_id_++; + p_->timers_.emplace(id, [NSTimer scheduledTimerWithTimeInterval:milliseconds.count() / 1000.0 + repeats:true + block:^(NSTimer* timer) { + action(); + }]); + + return id; +} + +void OsxUiApplication::CancelTimer(long long id) { + p_->next_tick_.erase(id); + auto i = p_->timers_.find(id); + if (i != p_->timers_.cend()) { + [i->second invalidate]; + p_->timers_.erase(i); + } +} } @implementation AppDelegate -- cgit v1.2.3