Merge lp:~mterry/mir/no-nested-display-config into lp:mir/0.1

[Michael Terry]

Bandaid for greeter turning screen on.

(This is just a port of https://code.launchpad.net/~andreas-pokorny/mir/no-initial-display-configuration-sent-to-hosting-server/+merge/213126 to lp:mir)

Workaround for Greeter turning the screen on.

This is just a workaround for the issue with the split greeter. While display is off another greeter is spawned to be shown as soon as display is turned on again. A greeter is a nested mir server. On initialization nested servers send the initial display configuration to the hosting server. Obviously that configuration contains power_mode == MirPowerMode::mir_power_mode_on.
u-s-c sets the focus onto the recently started greeter as soon as the session has a surface with buffers in. On that focus change the the stored display configuration (given they have one) is applied. Which turns the display on.

This change disables sending the first/initial nested display configuration.
We clearly need a better solution for that issue so we can remove that workaround as soon as we have one.

Unmerged revisions

1183. By Michael Terry on 2014-04-09

Port Andreas Pokorny's patch from devel to trunk

=== modified file 'src/server/graphics/nested/nested_display.cpp'
--- src/server/graphics/nested/nested_display.cpp	2014-03-17 07:35:22 +0000
+++ src/server/graphics/nested/nested_display.cpp	2014-04-09 15:36:26 +0000
@@ -137,10 +137,9 @@
     egl_display{*connection},
     outputs{}
 {
-
     std::shared_ptr<DisplayConfiguration> conf(configuration());
     initial_conf_policy->apply_to(*conf);
-    configure(*conf);
+    create_surfaces(*conf);
 }
 
 mgn::NestedDisplay::~NestedDisplay() noexcept
@@ -173,6 +172,12 @@
 
 void mgn::NestedDisplay::configure(mg::DisplayConfiguration const& configuration)
 {
+    create_surfaces(configuration);
+    apply_to_connection(configuration);
+}
+
+void mgn::NestedDisplay::create_surfaces(mg::DisplayConfiguration const& configuration)
+{
     if (!configuration.valid())
     {
         BOOST_THROW_EXCEPTION(std::logic_error("Invalid or inconsistent display configuration"));
@@ -224,12 +229,16 @@
     if (result.empty())
         BOOST_THROW_EXCEPTION(std::runtime_error("Nested Mir needs at least one output for display"));
 
-    auto const& conf = dynamic_cast<NestedDisplayConfiguration const&>(configuration);
 
     {
         std::unique_lock<std::mutex> lock(outputs_mutex);
         outputs.swap(result);
     }
+}
+
+void mgn::NestedDisplay::apply_to_connection(mg::DisplayConfiguration const& configuration)
+{
+    auto const& conf = dynamic_cast<NestedDisplayConfiguration const&>(configuration);
 
     mir_connection_apply_display_config(*connection, conf);
 }

=== modified file 'src/server/graphics/nested/nested_display.h'
--- src/server/graphics/nested/nested_display.h	2014-03-06 06:05:17 +0000
+++ src/server/graphics/nested/nested_display.h	2014-04-09 15:36:26 +0000
@@ -129,6 +129,8 @@
     std::mutex outputs_mutex;
     std::unordered_map<DisplayConfigurationOutputId, std::shared_ptr<detail::NestedOutput>> outputs;
     DisplayConfigurationChangeHandler my_conf_change_handler;
+    void create_surfaces(mir::graphics::DisplayConfiguration const& configuration);
+    void apply_to_connection(mir::graphics::DisplayConfiguration const& configuration);
     void complete_display_initialization(MirPixelFormat format);
 };