Merge lp:~robert-ancell/unity-system-compositor/app-lifecycle into lp:unity-system-compositor

[Robert Ancell]

Set lifecycle state for clients when setting the active session

[Robert Ancell (robert-ancell)]

Requires related Mir change in https://code.launchpad.net/~robert-ancell/mir/pause-status/+merge/186134

[Robert Ancell (robert-ancell)]

A future improvement is to set the client to paused on startup - it might be in the background.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:77
http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ci/31/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-saucy-amd64-ci/24/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-system-compositor-ci/31/rebuild

review: Needs Fixing (continuous-integration)

[lp:~robert-ancell/unity-system-compositor/app-lifecycle]

78. By Robert Ancell on 2013-09-19

Merge with trunk

79. By Robert Ancell on 2013-09-19

Use new Mir interface name ServerStatus->PauseResumeListener

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:79
http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ci/32/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-saucy-amd64-ci/25/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-saucy-armhf-ci/1/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-system-compositor-ci/32/rebuild

review: Needs Fixing (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:79
http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ci/33/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-saucy-amd64-ci/26
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-saucy-armhf-ci/2

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-system-compositor-ci/33/rebuild

review: Approve (continuous-integration)

[Chris Halse Rogers (raof)]

LGTM

review: Approve

=== modified file 'src/system_compositor.cpp'
--- src/system_compositor.cpp	2013-08-21 14:57:43 +0000
+++ src/system_compositor.cpp	2013-09-19 13:14:57 +0000
@@ -19,6 +19,8 @@
 #include "system_compositor.h"
 
 #include <mir/run_mir.h>
+#include <mir/pause_resume_listener.h>
+#include <mir/shell/application_session.h>
 #include <mir/shell/session.h>
 #include <mir/shell/session_container.h>
 #include <mir/shell/focus_setter.h>
@@ -33,8 +35,8 @@
 class SystemCompositorServerConfiguration : public mir::DefaultServerConfiguration
 {
 public:
-    SystemCompositorServerConfiguration(int argc, char const** argv)
-        : mir::DefaultServerConfiguration(argc, argv)
+    SystemCompositorServerConfiguration(SystemCompositor *compositor, int argc, char const** argv)
+        : mir::DefaultServerConfiguration(argc, argv), compositor{compositor}
     {
         namespace po = boost::program_options;
 
@@ -70,11 +72,35 @@
         };
         return std::make_shared<NullCursorListener>();
     }
+
+    std::shared_ptr<mir::PauseResumeListener> the_pause_resume_listener() override
+    {
+        struct PauseResumeListener : public mir::PauseResumeListener
+        {
+            PauseResumeListener (SystemCompositor *compositor) : compositor{compositor} {}
+
+            void paused() override
+            {
+                compositor->pause();
+            }
+
+            void resumed() override
+            {
+                compositor->resume();
+            }
+
+            SystemCompositor *compositor;
+        };
+        return std::make_shared<PauseResumeListener>(compositor);
+    }
+
+private:
+    SystemCompositor *compositor;
 };
 
 void SystemCompositor::run(int argc, char const** argv)
 {
-    auto c = std::make_shared<SystemCompositorServerConfiguration>(argc, argv);
+    auto c = std::make_shared<SystemCompositorServerConfiguration>(this, argc, argv);
     config = c;
   
     if (c->show_version())
@@ -100,19 +126,42 @@
         });
 }
 
+void SystemCompositor::pause()
+{
+    std::cerr << "pause" << std::endl;
+
+    if (active_session)
+        active_session->set_lifecycle_state(mir_lifecycle_state_will_suspend);
+}
+
+void SystemCompositor::resume()
+{
+    std::cerr << "resume" << std::endl;
+
+    if (active_session)
+        active_session->set_lifecycle_state(mir_lifecycle_state_resumed);
+}
+
 void SystemCompositor::set_active_session(std::string client_name)
 {
     std::cerr << "set_active_session" << std::endl;
 
-    std::shared_ptr<msh::Session> session;
-    config->the_shell_session_container()->for_each([&client_name, &session](std::shared_ptr<msh::Session> const& s)
+    active_session.reset();
+    config->the_shell_session_container()->for_each([&](std::shared_ptr<msh::Session> const& s)
     {
+        auto app_session(std::static_pointer_cast<msh::ApplicationSession>(s));
+
         if (s->name() == client_name)
-            session = s;
+        {
+            app_session->set_lifecycle_state(mir_lifecycle_state_resumed);
+            active_session = app_session;
+        }
+        else
+            app_session->set_lifecycle_state(mir_lifecycle_state_will_suspend);
     });
 
-    if (session)
-        config->the_shell_focus_setter()->set_focus_to(session);
+    if (active_session)
+        config->the_shell_focus_setter()->set_focus_to(active_session);
     else
         std::cerr << "Unable to set active session, unknown client name " << client_name << std::endl;
 }
 
=== modified file 'src/system_compositor.h'
--- src/system_compositor.h	2013-07-09 19:18:59 +0000
+++ src/system_compositor.h	2013-09-19 13:14:57 +0000
@@ -22,6 +22,7 @@
 #include "dm_connection.h"
 
 #include <mir/default_server_configuration.h>
+#include <mir/shell/application_session.h>
 
 class Configuration;
 
@@ -29,14 +30,17 @@
 {
 public:
     void run(int argc, char const** argv);
+    void pause();
+    void resume();
 
 private:
     std::shared_ptr<mir::DefaultServerConfiguration> config;
     boost::asio::io_service io_service;
     std::shared_ptr<DMConnection> dm_connection;
+    std::shared_ptr<mir::shell::ApplicationSession> active_session;
 
-    virtual void set_active_session(std::string client_name);
-    virtual void set_next_session(std::string client_name);
+    void set_active_session(std::string client_name);
+    void set_next_session(std::string client_name);
     void main();
 };