Merge lp:~mterry/unity-system-compositor/set-next-session into lp:unity-system-compositor

[Michael Terry]

Add the API needed for LightDM to be able to set the 'next session' (but leave actually implementing the API to later).

Add the API needed for LightDM to be able to set the 'next session' (but leave actually implementing the API to later).

The 'next session' is the user session that LightDM wants displayed beneath the greeter. An in-the-batter-box session.

This does not do implementation yet, since I'm not sure exactly what that code will be. It will likely look like an overrided surface_builder that sets DepthIds for its surfaces based on the owning session name. The greeter will be in a separate DepthId from all the user sessions. Then when we get a 'set-next-session' request, we can just float the matching session to the top of its DepthId.

But since Mir-on-Mir isn't working, I can't really test that. So here's this branch at least to lock in the API for LightDM so we can land that side of things before FF.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:39
http://jenkins.qa.ubuntu.com/job/unity-system-compositor-ci/27/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-system-compositor-saucy-amd64-ci/20

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

review: Approve (continuous-integration)

[Robert Ancell (robert-ancell)]

review: Approve

=== modified file 'src/dm_connection.cpp'
--- src/dm_connection.cpp	2013-06-11 00:39:33 +0000
+++ src/dm_connection.cpp	2013-08-21 15:02:26 +0000
@@ -90,6 +90,16 @@
                 handler->set_active_session(client_name);
             break;
         }
+        case USCMessageID::set_next_session:
+        {
+            std::ostringstream ss;
+            ss << &message_payload_buffer;
+            auto client_name = ss.str();
+            std::cerr << "set_next_session '" << client_name << "'" << std::endl;
+            if (handler)
+                handler->set_next_session(client_name);
+            break;
+        }
         default:
             std::cerr << "Ignoring unknown message " << (uint16_t) message_id << " with " << payload_length << " octets" << std::endl;
             break;

=== modified file 'src/dm_connection.h'
--- src/dm_connection.h	2013-04-26 04:30:42 +0000
+++ src/dm_connection.h	2013-08-21 15:02:26 +0000
@@ -25,12 +25,14 @@
 {
 public:
     virtual void set_active_session(std::string client_name) = 0;
+    virtual void set_next_session(std::string client_name) = 0;
 };
 
 class NullDMMessageHandler : public DMMessageHandler
 {
 public:
     void set_active_session(std::string client_name) {};
+    void set_next_session(std::string client_name) {};
 };
 
 enum class USCMessageID
@@ -39,7 +41,8 @@
     pong = 1,
     ready = 2,
     session_connected = 3,
-    set_active_session = 4
+    set_active_session = 4,
+    set_next_session = 5,
 };
 
 class DMConnection

=== modified file 'src/system_compositor.cpp'
--- src/system_compositor.cpp	2013-07-10 17:16:32 +0000
+++ src/system_compositor.cpp	2013-08-21 15:02:26 +0000
@@ -41,7 +41,7 @@
         add_options()
             ("from-dm-fd", po::value<int>(),  "File descriptor of read end of pipe from display manager [int]")
             ("to-dm-fd", po::value<int>(),  "File descriptor of write end of pipe to display manager [int]");
-       add_options()
+        add_options()
             ("version", "Show version of Unity System Compositor");
     }
 
@@ -117,6 +117,23 @@
         std::cerr << "Unable to set active session, unknown client name " << client_name << std::endl;
 }
 
+void SystemCompositor::set_next_session(std::string client_name)
+{
+    std::cerr << "set_next_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)
+    {
+        if (s->name() == client_name)
+            session = s;
+    });
+
+    if (session)
+        ; // TODO: implement this
+    else
+        std::cerr << "Unable to set next session, unknown client name " << client_name << std::endl;
+}
+
 void SystemCompositor::main()
 {
     dm_connection->set_handler(this);

=== modified file 'src/system_compositor.h'
--- src/system_compositor.h	2013-06-20 08:29:14 +0000
+++ src/system_compositor.h	2013-08-21 15:02:26 +0000
@@ -36,6 +36,7 @@
     std::shared_ptr<DMConnection> dm_connection;
 
     virtual void set_active_session(std::string client_name);
+    virtual void set_next_session(std::string client_name);
     void main();
 };