Merge lp:~albaguirre/mir/add-virtual-as-display-type into lp:mir

[Alberto Aguirre]

Add an explicit "Virtual" display type. Fixes LP: #1573782

[Cemil Azizoglu (cemil-azizoglu)]

lgtm

review: Approve

[Mir CI Bot (mir-ci-bot)]

FAILED: Continuous integration, rev:3474
https://mir-jenkins.ubuntu.com/job/mir-ci/893/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/928/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/967
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/958
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/958
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/938
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/938/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/938
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/938/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/938
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/938/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/938
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/938/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/938/console

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/893/rebuild

review: Needs Fixing (continuous-integration)

[Alberto Aguirre (albaguirre)]

"[ FAILED ] ServerSignal.terminate_handler_is_called_for_SIGTERM
21:12:02 11: [ FAILED ] ServerSignal.terminate_handler_is_called_for_SIGINT
21:12:02 11: [ FAILED ] NestedServer.when_monitor_plugged_in_client_is_notified_of_new_display_configuration"

Seems unrelated.

=== modified file 'include/client/mir_toolkit/client_types.h'
--- include/client/mir_toolkit/client_types.h	2016-04-04 06:58:49 +0000
+++ include/client/mir_toolkit/client_types.h	2016-04-22 20:25:19 +0000
@@ -281,7 +281,8 @@
     mir_display_output_type_hdmia,
     mir_display_output_type_hdmib,
     mir_display_output_type_tv,
-    mir_display_output_type_edp
+    mir_display_output_type_edp,
+    mir_display_output_type_virtual
 } MirDisplayOutputType;
 
 typedef enum MirOutputType
@@ -300,7 +301,8 @@
     mir_output_type_hdmia,
     mir_output_type_hdmib,
     mir_output_type_tv,
-    mir_output_type_edp
+    mir_output_type_edp,
+    mir_output_type_virtual
 } MirOutputType;
 
 typedef enum MirOutputConnectionState

=== modified file 'include/platform/mir/graphics/display_configuration.h'
--- include/platform/mir/graphics/display_configuration.h	2016-01-29 08:18:22 +0000
+++ include/platform/mir/graphics/display_configuration.h	2016-04-22 20:25:19 +0000
@@ -66,7 +66,8 @@
     hdmia,
     hdmib,
     tv,
-    edp
+    edp,
+    virt,
 };
 
 /**

=== modified file 'src/platforms/android/server/display_configuration.cpp'
--- src/platforms/android/server/display_configuration.cpp	2016-02-01 22:53:06 +0000
+++ src/platforms/android/server/display_configuration.cpp	2016-04-22 20:25:19 +0000
@@ -42,7 +42,7 @@
     size_t const preferred_format_index{0};
     size_t const preferred_mode_index{0};
     bool const connected{false};
-    auto const type = mg::DisplayConfigurationOutputType::lvds;
+    auto const type = mg::DisplayConfigurationOutputType::virt;
     auto const form_factor = mir_form_factor_monitor;
     float const scale{1.0f};
     std::vector<mg::DisplayConfigurationMode> external_modes;

=== modified file 'src/utils/out.c'
--- src/utils/out.c	2016-01-29 08:18:22 +0000
+++ src/utils/out.c	2016-04-22 20:25:19 +0000
@@ -40,6 +40,7 @@
         "HDMI-B",
         "TV",
         "eDP",
+        "Virtual"
     };
     return ((unsigned)t < sizeof(name)/sizeof(name[0])) ? name[t] : name[0];
 }

=== modified file 'tests/integration-tests/test_server_client_types.cpp'
--- tests/integration-tests/test_server_client_types.cpp	2013-09-04 19:01:36 +0000
+++ tests/integration-tests/test_server_client_types.cpp	2016-04-22 20:25:19 +0000
@@ -43,4 +43,6 @@
     EXPECT_DISPLAY_OUTPUT_TYPES_MATCH(hdmib);
     EXPECT_DISPLAY_OUTPUT_TYPES_MATCH(tv);
     EXPECT_DISPLAY_OUTPUT_TYPES_MATCH(edp);
+    EXPECT_EQ(static_cast<mg::DisplayConfigurationOutputType>(mir_display_output_type_virtual),
+              mg::DisplayConfigurationOutputType::virt);
 }