Add a "--display-config static=<filename>" option

debian/control

@@ -54,7 +54,8 @@ Build-Depends: cmake,
                libxcb-xfixes0-dev,
                libxcb-render0-dev,
                libxcb-composite0-dev,
-               libxcursor-dev
+               libxcursor-dev,
+               libyaml-cpp-dev
 Standards-Version: 3.9.4
 Homepage: https://launchpad.net/mir
 # If you aren't a member of ~mir-team but need to upload packaging changes,

include/test/mir/test/doubles/mock_display_configuration.h

@@ -21,6 +21,8 @@
 
 #include "mir/graphics/display_configuration.h"
 
+#include <gmock/gmock.h>
+
 namespace mir
 {
 namespace test

spread/build/fedora/task.yaml

@@ -50,7 +50,8 @@ execute: |
         python3-gobject-base \
         python3-dbus \
         mesa-libwayland-egl-devel\
-        libXcursor-devel
+        libXcursor-devel \
+        yaml-cpp-devel
 
     BUILD_DIR=$(mktemp --directory)
     cmake -H$SPREAD_PATH -B$BUILD_DIR -DCMAKE_BUILD_TYPE=Debug -DMIR_USE_LD_GOLD=ON

src/miral/CMakeLists.txt

@@ -9,15 +9,20 @@ set(MIRAL_ABI 3)
 set(symbol_map ${CMAKE_CURRENT_SOURCE_DIR}/symbols.map)
 set(miral_include ${PROJECT_SOURCE_DIR}/include/miral)
 
+pkg_check_modules(YAML REQUIRED yaml-cpp)
+
 add_library(mirclientcpp INTERFACE)
 
+add_definitions(-DMIR_LOG_COMPONENT_FALLBACK="miral")
+
 add_library(miral-internal STATIC
     active_outputs.cpp                  active_outputs.h
     basic_window_manager.cpp            basic_window_manager.h window_manager_tools_implementation.h
     coordinate_translator.cpp           coordinate_translator.h
     display_configuration_listeners.cpp display_configuration_listeners.h
     launch_app.cpp                      launch_app.h
     mru_window_list.cpp                 mru_window_list.h
+    static_display_config.cpp           static_display_config.h
     window_management_trace.cpp         window_management_trace.h
     xcursor_loader.cpp                  xcursor_loader.h
     xcursor.c                           xcursor.h
@@ -82,6 +87,13 @@ target_include_directories(miral-internal
     PRIVATE ${MIRSERVER_INCLUDE_DIRS}
 )
 
+target_link_libraries(miral-internal
+    PRIVATE
+        mirserver
+        ${WAYLAND_CLIENT_LDFLAGS} ${WAYLAND_CLIENT_LIBRARIES}
+        ${YAML_LIBRARIES}
+)
+
 target_include_directories(miral
     PUBLIC  "${miral_include}" ${MIRCLIENT_INCLUDE_DIRS}
     PRIVATE ${MIRSERVER_INCLUDE_DIRS}
@@ -94,7 +106,6 @@ target_link_libraries(miral
     PRIVATE
         miral-internal
         mirserver
-        ${WAYLAND_CLIENT_LDFLAGS} ${WAYLAND_CLIENT_LIBRARIES}
 )
 
 set_target_properties(miral

src/miral/display_configuration_option.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2014, 2016 Canonical Ltd.
+ * Copyright © 2014-2018 Canonical Ltd.
  *
  * This program is free software: you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 or 3 as
@@ -17,6 +17,7 @@
  */
 
 #include "miral/display_configuration_option.h"
+#include "static_display_config.h"
 
 #include <mir/graphics/default_display_configuration_policy.h>
 #include <mir/graphics/display_configuration.h>
@@ -28,11 +29,12 @@ namespace mg = mir::graphics;
 namespace
 {
 char const* const display_config_opt = "display-config";
-char const* const display_config_descr = "Display configuration [{clone,sidebyside,single}]";
+char const* const display_config_descr = "Display configuration [{clone,sidebyside,single,static=<filename>}]";
 
 //char const* const clone_opt_val = "clone";
 char const* const sidebyside_opt_val = "sidebyside";
 char const* const single_opt_val = "single";
+char const* const static_opt_val = "static=";
 
 char const* const display_alpha_opt = "translucent";
 char const* const display_alpha_descr = "Select a display mode with alpha[{on,off}]";
@@ -108,6 +110,8 @@ void miral::display_configuration_options(mir::Server& server)
                 layout_selector = std::make_shared<mg::SideBySideDisplayConfigurationPolicy>();
             else if (display_layout == single_opt_val)
                 layout_selector = std::make_shared<mg::SingleDisplayConfigurationPolicy>();
+            else if (display_layout.compare(0, strlen(static_opt_val), static_opt_val) == 0)
+                layout_selector = std::make_shared<StaticDisplayConfig>(display_layout.substr(strlen(static_opt_val)));
 
             // Whatever the layout select a pixel format with requested alpha
             return std::make_shared<PixelFormatSelector>(layout_selector, with_alpha);