Cleaing the initial renders after 5 seconds, woohoo!

canonical · Sep 1, 2023 · a93b6c9 · a93b6c9
1 parent 651b1a2
commit a93b6c9
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 16 deletions.
diff --git a/src/include/server/mir/default_server_configuration.h b/src/include/server/mir/default_server_configuration.h
@@ -439,7 +439,7 @@ class DefaultServerConfiguration : public virtual ServerConfiguration
         display_configuration_observer_multiplexer;
     CachedPtr<ObserverMultiplexer<input::SeatObserver>>
         seat_observer_multiplexer;
-    CachedPtr<graphics::InitialRenderManager> initial_render_manager;
+    std::shared_ptr<graphics::InitialRenderManager> initial_render_manager;
 
     // The following caches and factory functions are internal to the
     // default implementations of corresponding the Mir components

diff --git a/src/include/server/mir/graphics/default_initial_render_manager.h b/src/include/server/mir/graphics/default_initial_render_manager.h
@@ -50,10 +50,11 @@ class DefaultInitialRenderManager : public InitialRenderManager
     void add_initial_render(std::shared_ptr<InitialRender> const&) override;
 
 private:
+    void remove_renderables();
     std::shared_ptr<time::Clock> const& clock;
-    time::AlarmFactory& alarm_factory;
     std::shared_ptr<input::Scene>& scene;
     std::vector<std::shared_ptr<InitialRender>> renderable_list;
+    std::unique_ptr<time::Alarm> const alarm;
 };
 
 }

diff --git a/src/server/graphics/default_configuration.cpp b/src/server/graphics/default_configuration.cpp
@@ -504,14 +504,10 @@ mir::DefaultServerConfiguration::the_display_configuration_observer()
 std::shared_ptr<mg::InitialRenderManager>
 mir::DefaultServerConfiguration::the_initial_render_manager(mg::Display& in_display)
 {
-    return initial_render_manager(
-        [display = &in_display, this]
-        {
-            auto in_input_scene = the_input_scene();
-            auto in_main_loop = the_main_loop();
-            auto in_clock = the_clock();
-            auto render_manager = std::make_shared<mg::DefaultInitialRenderManager>(in_clock, *in_main_loop, in_input_scene);
-            render_manager->add_initial_render(display->create_initial_render());
-            return render_manager;
-        });
+    auto in_input_scene = the_input_scene();
+    auto in_main_loop = the_main_loop();
+    auto in_clock = the_clock();
+    initial_render_manager = std::make_shared<mg::DefaultInitialRenderManager>(in_clock, *in_main_loop, in_input_scene);
+    initial_render_manager->add_initial_render(in_display.create_initial_render());
+    return initial_render_manager;
 }
diff --git a/src/server/graphics/default_initial_render_manager.cpp b/src/server/graphics/default_initial_render_manager.cpp
@@ -16,6 +16,9 @@
 
 #include "mir/graphics/default_initial_render_manager.h"
 #include "mir/input/scene.h"
+#include "mir/time/alarm_factory.h"
+#include "mir/time/clock.h"
+#include <chrono>
 
 namespace mg = mir::graphics;
 
@@ -24,15 +27,18 @@ mg::DefaultInitialRenderManager::DefaultInitialRenderManager(
     time::AlarmFactory &alarm_factory,
     std::shared_ptr<input::Scene>& scene)
     : clock{clock},
-      alarm_factory{alarm_factory},
-      scene{scene}
+     scene{scene},
+     alarm{alarm_factory.create_alarm([&]{
+         remove_renderables();
+         alarm->cancel();
+     })}
 {
-
+    time::Timestamp scheduled_time = clock->now() + std::chrono::seconds {5};
+    alarm->reschedule_for(scheduled_time);
 }
 
 mg::DefaultInitialRenderManager::~DefaultInitialRenderManager()
 {
-
 }
 
 void mg::DefaultInitialRenderManager::add_initial_render(std::shared_ptr<InitialRender> const& initial_render)
@@ -45,4 +51,16 @@ void mg::DefaultInitialRenderManager::add_initial_render(std::shared_ptr<Initial
         scene->add_input_visualization(renderable);
     }
     renderable_list.push_back(initial_render);
+}
+
+void mg::DefaultInitialRenderManager::remove_renderables()
+{
+    for (auto inital_render : renderable_list)
+    {
+        for (auto const& renderable : inital_render->get_renderables())
+        {
+            scene->remove_input_visualization(renderable);
+        }
+    }
+    renderable_list.clear();
 }