Merge lp:~mterry/unity-system-compositor/greeter-api into lp:unity-system-compositor

[Michael Terry]

Add a DBus API for the benefit of a LightDM greeter.

Add a DBus API for the benefit of a LightDM greeter.

Primarily, this is to support a greeter preparing which session will be below the greeter in the compositing stack, so it can overlay its own surface on top.

[lp:~mterry/unity-system-compositor/greeter-api]

34. By Michael Terry on 2013-07-09

Rough cut at supporting a DM message to set the next session; doesn't do anything once that message is received yet

35. By Michael Terry on 2013-08-12

Merge from trunk

36. By Michael Terry on 2013-08-15

Separate greeter from normal sessions by depth id

37. By Michael Terry on 2013-08-15

Lazily create surface_builder, fixing problem where we didn't recognize our own command line arguments

=== modified file 'src/dm_connection.cpp'
--- src/dm_connection.cpp	2013-06-11 00:39:33 +0000
+++ src/dm_connection.cpp	2013-08-15 14:47:01 +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-15 14:47:01 +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-15 14:47:01 +0000
@@ -21,15 +21,54 @@
 #include <mir/run_mir.h>
 #include <mir/shell/session.h>
 #include <mir/shell/session_container.h>
+#include <mir/shell/surface_builder.h>
+#include <mir/shell/surface_creation_parameters.h>
 #include <mir/shell/focus_setter.h>
+#include <mir/surfaces/depth_id.h>
+#include <mir/surfaces/surface_stack_model.h>
 #include <mir/input/cursor_listener.h>
 
 #include <iostream>
 #include <thread>
 
 namespace msh = mir::shell;
+namespace ms = mir::surfaces;
 namespace mi = mir::input;
 
+class SystemCompositorSurfaceBuilder : public msh::SurfaceBuilder
+{
+public:
+    SystemCompositorSurfaceBuilder(std::shared_ptr<ms::SurfaceStackModel> const& surface_stack)
+        : surface_stack(surface_stack)
+    {
+    }
+
+    std::weak_ptr<ms::Surface> create_surface(msh::Session *session, msh::SurfaceCreationParameters const& params)
+    {
+        static ms::DepthId const default_surface_depth{0};
+        static ms::DepthId const greeter_surface_depth{1};
+
+        auto depth_params = params;
+        if (session->name().find("greeter-") == 0)
+        {
+            depth_params.depth = greeter_surface_depth;
+        }
+        else
+        {
+            depth_params.depth = default_surface_depth;
+        }
+        return surface_stack->create_surface(depth_params);
+    }
+
+    void destroy_surface(std::weak_ptr<ms::Surface> const& surface)
+    {
+        surface_stack->destroy_surface(surface);
+    }
+
+private:
+    std::shared_ptr<ms::SurfaceStackModel> const surface_stack;
+};
+
 class SystemCompositorServerConfiguration : public mir::DefaultServerConfiguration
 {
 public:
@@ -41,7 +80,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");
     }
 
@@ -70,6 +109,18 @@
         };
         return std::make_shared<NullCursorListener>();
     }
+
+    std::shared_ptr<msh::SurfaceBuilder> the_surface_builder() override
+    {
+        return surface_builder(
+            [this]()
+            {
+                return std::make_shared<SystemCompositorSurfaceBuilder>(the_surface_stack_model());
+            });
+    }
+
+private:
+    mir::CachedPtr<msh::SurfaceBuilder> surface_builder;
 };
 
 void SystemCompositor::run(int argc, char const** argv)
@@ -117,6 +168,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)
+        config->the_shell_focus_setter()->set_focus_to(session); // depth id will keep it separate from greeter
+    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-15 14:47:01 +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();
 };