Merge lp:~alan-griffiths/miral/advise-new-delete-application into lp:miral

[Alan Griffiths]

Add notifications for add/delete application

[Gerry Boland (gerboland)]

Looks ok.

review: Approve

=== modified file 'include/miral/canonical_window_manager.h'
--- include/miral/canonical_window_manager.h	2016-06-06 13:34:18 +0000
+++ include/miral/canonical_window_manager.h	2016-06-06 19:32:12 +0000
@@ -67,6 +67,9 @@
     void advise_resize(WindowInfo const& window_info, Size const& new_size) override;
     void advise_delete_window(WindowInfo const& window_info) override;
 
+    void advise_new_app(miral::ApplicationInfo& application) override;
+    void advise_delete_app(miral::ApplicationInfo const& application) override;
+
     void handle_app_info_updated(Rectangles const& displays) override;
     void handle_displays_updated(Rectangles const& displays) override;
 

=== modified file 'include/miral/window_management_policy.h'
--- include/miral/window_management_policy.h	2016-06-03 09:49:22 +0000
+++ include/miral/window_management_policy.h	2016-06-06 19:32:12 +0000
@@ -60,6 +60,8 @@
 
 /** @name notification of WM events that the policy may need to track
  *  @{ */
+    virtual void advise_new_app(ApplicationInfo& application) = 0;
+    virtual void advise_delete_app(ApplicationInfo const& application) = 0;
     virtual void advise_new_window(WindowInfo& window_info) = 0;
     virtual void advise_focus_lost(WindowInfo const& info) = 0;
     virtual void advise_focus_gained(WindowInfo const& info) = 0;

=== modified file 'miral-kiosk/kiosk_window_manager.cpp'
--- miral-kiosk/kiosk_window_manager.cpp	2016-06-03 13:40:44 +0000
+++ miral-kiosk/kiosk_window_manager.cpp	2016-06-06 19:32:12 +0000
@@ -240,3 +240,11 @@
 void KioskWindowManagerPolicy::advise_resize(WindowInfo const& /*window_info*/, Size const& /*new_size*/)
 {
 }
+
+void KioskWindowManagerPolicy::advise_new_app(miral::ApplicationInfo& /*application*/)
+{
+}
+
+void KioskWindowManagerPolicy::advise_delete_app(miral::ApplicationInfo const& /*application*/)
+{
+}

=== modified file 'miral-kiosk/kiosk_window_manager.h'
--- miral-kiosk/kiosk_window_manager.h	2016-06-03 13:25:17 +0000
+++ miral-kiosk/kiosk_window_manager.h	2016-06-06 19:32:12 +0000
@@ -61,6 +61,9 @@
     void advise_state_change(miral::WindowInfo const& window_info, MirSurfaceState state) override;
     void advise_resize(miral::WindowInfo const& window_info, Size const& new_size) override;
 
+    void advise_new_app(miral::ApplicationInfo& application) override;
+    void advise_delete_app(miral::ApplicationInfo const& application) override;
+
 private:
     static const int modifier_mask =
         mir_input_event_modifier_alt |

=== modified file 'miral-shell/tiling_window_manager.cpp'
--- miral-shell/tiling_window_manager.cpp	2016-06-03 14:12:00 +0000
+++ miral-shell/tiling_window_manager.cpp	2016-06-06 19:32:12 +0000
@@ -456,9 +456,6 @@
 
     tools->for_each_application([&](ApplicationInfo& info)
         {
-            if (!info.userdata())
-                info.userdata(std::make_shared<TilingWindowManagerPolicyData>());
-
             auto& tile = tile_for(info);
 
             auto const x = (total_width * index) / applications;
@@ -600,3 +597,11 @@
 {
 }
 
+void TilingWindowManagerPolicy::advise_new_app(miral::ApplicationInfo& application)
+{
+    application.userdata(std::make_shared<TilingWindowManagerPolicyData>());
+}
+
+void TilingWindowManagerPolicy::advise_delete_app(miral::ApplicationInfo const& /*application*/)
+{
+}

=== modified file 'miral-shell/tiling_window_manager.h'
--- miral-shell/tiling_window_manager.h	2016-06-03 15:26:45 +0000
+++ miral-shell/tiling_window_manager.h	2016-06-06 19:32:12 +0000
@@ -62,6 +62,9 @@
     void advise_state_change(miral::WindowInfo const& window_info, MirSurfaceState state) override;
     void advise_resize(miral::WindowInfo const& window_info, Size const& new_size) override;
 
+    void advise_new_app(miral::ApplicationInfo& application) override;
+    void advise_delete_app(miral::ApplicationInfo const& application) override;
+
 private:
     static const int modifier_mask =
         mir_input_event_modifier_alt |

=== modified file 'miral/basic_window_manager.cpp'
--- miral/basic_window_manager.cpp	2016-06-03 16:18:16 +0000
+++ miral/basic_window_manager.cpp	2016-06-06 19:32:12 +0000
@@ -70,13 +70,14 @@
 void miral::BasicWindowManager::add_session(std::shared_ptr<scene::Session> const& session)
 {
     std::lock_guard<decltype(mutex)> lock(mutex);
-    app_info[session] = ApplicationInfo();
+    policy->advise_new_app(app_info[session] = ApplicationInfo());
     policy->handle_app_info_updated(displays);
 }
 
 void miral::BasicWindowManager::remove_session(std::shared_ptr<scene::Session> const& session)
 {
     std::lock_guard<decltype(mutex)> lock(mutex);
+    policy->advise_delete_app(app_info[session]);
     app_info.erase(session);
     policy->handle_app_info_updated(displays);
 }

=== modified file 'miral/canonical_window_manager.cpp'
--- miral/canonical_window_manager.cpp	2016-06-06 13:34:18 +0000
+++ miral/canonical_window_manager.cpp	2016-06-06 19:32:12 +0000
@@ -393,3 +393,11 @@
 void miral::CanonicalWindowManagerPolicy::advise_resize(WindowInfo const& /*window_info*/, Size const& /*new_size*/)
 {
 }
+
+void miral::CanonicalWindowManagerPolicy::advise_new_app(ApplicationInfo& /*application*/)
+{
+}
+
+void miral::CanonicalWindowManagerPolicy::advise_delete_app(ApplicationInfo const& /*application*/)
+{
+}