Merge lp:~andreas-pokorny/mir/fix-1598267 into lp:mir

[Andreas Pokorny]

Do not use the window size in mm as resolution

stupid mistake..

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

FAILED: Continuous integration, rev:3569
https://mir-jenkins.ubuntu.com/job/mir-ci/1223/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/1409/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/1460
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1451
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/1451
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1423
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1423/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/1423
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/1423/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/1423
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1423/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/1423
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1423/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/1423/console

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:3569
https://mir-jenkins.ubuntu.com/job/mir-ci/1227/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/1414
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/1465
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1456
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/1456
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1428
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=vivid+overlay/1428/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/1428
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/1428/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/1428
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/1428/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/1428
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/1428/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/1428
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/1428/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[Alexandros Frantzis (afrantzis)]

OK.

review: Approve

[Alexandros Frantzis (afrantzis)]

... we could avoid such mistakes if we had dedicated types for physical width/height/size

=== modified file 'src/platforms/mesa/server/x11/graphics/display.cpp'
--- src/platforms/mesa/server/x11/graphics/display.cpp	2016-06-28 08:24:02 +0000
+++ src/platforms/mesa/server/x11/graphics/display.cpp	2016-07-01 18:43:40 +0000
@@ -309,7 +309,8 @@
 
 std::unique_ptr<mg::DisplayConfiguration> mgx::Display::configuration() const
 {
-    return std::make_unique<mgx::DisplayConfiguration>(pf, geom::Size{size.width*pixel_width, size.height*pixel_height}, orientation);
+    return std::make_unique<mgx::DisplayConfiguration>(
+        pf, size, geom::Size{size.width * pixel_width, size.height * pixel_height}, orientation);
 }
 
 void mgx::Display::configure(mg::DisplayConfiguration const& new_configuration)

=== modified file 'src/platforms/mesa/server/x11/graphics/display_configuration.cpp'
--- src/platforms/mesa/server/x11/graphics/display_configuration.cpp	2016-06-28 08:24:02 +0000
+++ src/platforms/mesa/server/x11/graphics/display_configuration.cpp	2016-07-01 18:43:40 +0000
@@ -24,14 +24,14 @@
 namespace mgx = mg::X;
 namespace geom = mir::geometry;
 
-mgx::DisplayConfiguration::DisplayConfiguration(MirPixelFormat pf, geom::Size const size, MirOrientation orientation) :
+mgx::DisplayConfiguration::DisplayConfiguration(MirPixelFormat pf, geom::Size const pixels, geom::Size const size, MirOrientation orientation) :
     configuration{
             mg::DisplayConfigurationOutputId{1},
             mg::DisplayConfigurationCardId{0},
             mg::DisplayConfigurationOutputType::unknown,
             {pf},
             //TODO: query fps
-            {mg::DisplayConfigurationMode{size, 60.0}},
+            {mg::DisplayConfigurationMode{pixels, 60.0}},
             0,
             size,
             true,

=== modified file 'src/platforms/mesa/server/x11/graphics/display_configuration.h'
--- src/platforms/mesa/server/x11/graphics/display_configuration.h	2016-01-29 08:18:22 +0000
+++ src/platforms/mesa/server/x11/graphics/display_configuration.h	2016-07-01 18:43:40 +0000
@@ -33,7 +33,10 @@
 class DisplayConfiguration : public graphics::DisplayConfiguration
 {
 public:
-    DisplayConfiguration(MirPixelFormat pf, mir::geometry::Size const size, MirOrientation orientation);
+    DisplayConfiguration(MirPixelFormat pf,
+                         mir::geometry::Size const pixels,
+                         mir::geometry::Size const size_mm,
+                         MirOrientation orientation);
     DisplayConfiguration(DisplayConfiguration const&);
 
     virtual ~DisplayConfiguration() = default;

=== modified file 'tests/unit-tests/graphics/mesa/x11/test_display.cpp'
--- tests/unit-tests/graphics/mesa/x11/test_display.cpp	2016-06-28 08:24:02 +0000
+++ tests/unit-tests/graphics/mesa/x11/test_display.cpp	2016-07-01 18:43:40 +0000
@@ -177,3 +177,24 @@
 
     EXPECT_THAT(reported_size, Eq(expected_size));
 }
+
+TEST_F(X11DisplayTest, reports_a_resolution_that_matches_the_window_size)
+{
+    auto const pixel = geom::Size{2560, 1080};
+    auto const mm = geom::Size{677, 290};
+    auto const window = geom::Size{1280, 1024};
+
+    setup_x11_screen(pixel, mm, window);
+
+    auto display = create_display();
+    auto config = display->configuration();
+    geom::Size reported_resolution;
+    config->for_each_output(
+        [&reported_resolution](mg::DisplayConfigurationOutput const& output)
+        {
+            reported_resolution = output.modes[0].size;
+        }
+        );
+
+    EXPECT_THAT(reported_resolution, Eq(window));
+}