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

[Andreas Pokorny]

fix: use Information inside default x11 screen of display to calculate size of window in mm

instead of using the resolution as screen size in mm

Small fix in x11 platform .. forwards the mm information x11 believes is correct. It is off by four to six cm in my case (the information offered by kms seems to be more accurate), but better than claiming we have 1 pixel per millimeter.

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

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

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

review: Approve (continuous-integration)

[Alexandros Frantzis (afrantzis)]

Looks good.

review: Approve

[Cemil Azizoglu (cemil-azizoglu)]

Ok

review: Approve

=== modified file 'src/platforms/mesa/server/x11/graphics/display.cpp'
--- src/platforms/mesa/server/x11/graphics/display.cpp	2016-06-13 16:03:06 +0000
+++ src/platforms/mesa/server/x11/graphics/display.cpp	2016-06-28 08:29:09 +0000
@@ -36,6 +36,22 @@
 #define MIR_LOG_COMPONENT "x11-display"
 #include "mir/log.h"
 
+namespace
+{
+auto get_pixel_width(Display *dpy)
+{
+    auto screen = XDefaultScreenOfDisplay(dpy);
+
+    return float(screen->mwidth) / screen->width;
+}
+auto get_pixel_height(Display *dpy)
+{
+    auto screen = XDefaultScreenOfDisplay(dpy);
+
+    return float(screen->mheight) / screen->height;
+}
+}
+
 namespace mg=mir::graphics;
 namespace mgx=mg::X;
 namespace geom=mir::geometry;
@@ -256,6 +272,8 @@
                       GLConfig const& gl_config)
     : egl_display{X11EGLDisplay(x_dpy)},
       size{size},
+      pixel_width{get_pixel_width(x_dpy)},
+      pixel_height{get_pixel_height(x_dpy)},
       win{X11Window(x_dpy,
                     egl_display,
                     size,
@@ -291,7 +309,7 @@
 
 std::unique_ptr<mg::DisplayConfiguration> mgx::Display::configuration() const
 {
-    return std::make_unique<mgx::DisplayConfiguration>(pf, size, orientation);
+    return std::make_unique<mgx::DisplayConfiguration>(pf, 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.h'
--- src/platforms/mesa/server/x11/graphics/display.h	2016-06-09 14:10:58 +0000
+++ src/platforms/mesa/server/x11/graphics/display.h	2016-06-28 08:29:09 +0000
@@ -128,6 +128,8 @@
 private:
     X11EGLDisplay const egl_display;
     mir::geometry::Size const size;
+    float pixel_width;
+    float pixel_height;
     X11Window const win;
     X11EGLContext egl_context;
     X11EGLSurface egl_surface;
 
=== modified file 'src/platforms/mesa/server/x11/graphics/display_configuration.cpp'
--- src/platforms/mesa/server/x11/graphics/display_configuration.cpp	2016-01-29 08:18:22 +0000
+++ src/platforms/mesa/server/x11/graphics/display_configuration.cpp	2016-06-28 08:29:09 +0000
@@ -33,7 +33,6 @@
             //TODO: query fps
             {mg::DisplayConfigurationMode{size, 60.0}},
             0,
-            //TODO: query mm-size
             size,
             true,
             true,
 
=== modified file 'tests/include/mir/test/doubles/mock_x11.h'
--- tests/include/mir/test/doubles/mock_x11.h	2016-06-10 00:36:22 +0000
+++ tests/include/mir/test/doubles/mock_x11.h	2016-06-28 08:29:09 +0000
@@ -39,6 +39,7 @@
 
     Display *display;
     Window window;
+    Screen screen;
     XVisualInfo visual_info;
     XEvent keypress_event_return = { 0 };
     XEvent button_release_event_return = { 0 };
@@ -77,6 +78,7 @@
     MOCK_METHOD5(XLookupString, int(XKeyEvent*, char*, int, KeySym*, XComposeStatus*));
     MOCK_METHOD1(XRefreshKeyboardMapping, int(XMappingEvent*));
     MOCK_METHOD1(XDefaultRootWindow, Window(Display*));
+    MOCK_METHOD1(XDefaultScreenOfDisplay, Screen*(Display*));
     MOCK_METHOD6(XGrabKeyboard, int(Display*, Window, Bool, int, int, Time));
     MOCK_METHOD2(XUngrabKeyboard, int(Display*, Time));
     MOCK_METHOD4(XGetErrorText, int(Display*, int, char*, int ));
 
=== modified file 'tests/mir_test_doubles/mock_x11.cpp'
--- tests/mir_test_doubles/mock_x11.cpp	2016-06-10 00:36:22 +0000
+++ tests/mir_test_doubles/mock_x11.cpp	2016-06-28 08:29:09 +0000
@@ -43,6 +43,7 @@
     std::memset(&enter_notify_event_return, 0, sizeof(XEvent));
     std::memset(&leave_notify_event_return, 0, sizeof(XEvent));
     std::memset(&visual_info, 0, sizeof(XVisualInfo));
+    std::memset(&screen, 0, sizeof screen);
     visual_info.red_mask = 0xFF0000;
     keypress_event_return.type = KeyPress;
     button_release_event_return.type = ButtonRelease;
@@ -56,6 +57,10 @@
     motion_event_return.type = MotionNotify;
     enter_notify_event_return.type = EnterNotify;
     leave_notify_event_return.type = LeaveNotify;
+    screen.width = 1024;
+    screen.height = 768;
+    screen.mwidth = 338;
+    screen.mwidth = 270;
 }
 
 mtd::MockX11::MockX11()
@@ -68,6 +73,9 @@
     ON_CALL(*this, XOpenDisplay(_))
     .WillByDefault(Return(fake_x11.display));
 
+    ON_CALL(*this, XDefaultScreenOfDisplay(fake_x11.display))
+    .WillByDefault(Return(&fake_x11.screen));
+
     ON_CALL(*this, XGetVisualInfo(fake_x11.display,_,_,_))
     .WillByDefault(DoAll(SetArgPointee<3>(1),
                          Return(&fake_x11.visual_info)));
@@ -224,3 +232,8 @@
 {
     return global_mock->XSetWMProtocols(display, w, protocols, count);
 }
+
+Screen* XDefaultScreenOfDisplay(Display* display)
+{
+    return global_mock->XDefaultScreenOfDisplay(display);
+}
 
=== modified file 'tests/unit-tests/graphics/mesa/x11/test_display.cpp'
--- tests/unit-tests/graphics/mesa/x11/test_display.cpp	2016-06-09 14:10:58 +0000
+++ tests/unit-tests/graphics/mesa/x11/test_display.cpp	2016-06-28 08:29:09 +0000
@@ -20,23 +20,29 @@
 #include <gmock/gmock.h>
 
 #include "src/platforms/mesa/server/x11/graphics/display.h"
+
+#include "mir/graphics/display_configuration.h"
+
 #include "mir/test/doubles/mock_egl.h"
 #include "mir/test/doubles/mock_x11.h"
 #include "mir/test/doubles/mock_gl_config.h"
 
+
 namespace mg=mir::graphics;
 namespace mgx=mg::X;
 namespace mtd=mir::test::doubles;
 namespace geom=mir::geometry;
+using namespace testing;
+
 
 namespace
 {
 
-geom::Size const size{1280, 1024};
 
 class X11DisplayTest : public ::testing::Test
 {
 public:
+    geom::Size size{1280, 1024};
 
     X11DisplayTest()
     {
@@ -77,6 +83,14 @@
                        Return(1)));
     }
 
+    void setup_x11_screen(geom::Size const& pixel, geom::Size const& mm, geom::Size const& window)
+    {
+        mock_x11.fake_x11.screen.width = pixel.width.as_int();
+        mock_x11.fake_x11.screen.height = pixel.height.as_int();
+        mock_x11.fake_x11.screen.mwidth = mm.width.as_int();
+        mock_x11.fake_x11.screen.mheight = mm.height.as_int();
+        size = window;
+    }
     std::shared_ptr<mgx::Display> create_display()
     {
         return std::make_shared<mgx::Display>(
@@ -119,8 +133,6 @@
 
 TEST_F(X11DisplayTest, respects_gl_config)
 {
-    using namespace testing;
-
     EGLint const depth_bits{24};
     EGLint const stencil_bits{8};
 
@@ -141,3 +153,27 @@
 
     auto display = create_display();
 }
+
+TEST_F(X11DisplayTest, calculates_physical_size_of_display_based_on_default_screen)
+{
+    auto const pixel = geom::Size{2560, 1080};
+    auto const mm = geom::Size{677, 290};
+    auto const window = geom::Size{1280, 1024};
+    auto const pixel_width = float(mm.width.as_int()) / float(pixel.width.as_int());
+    auto const pixel_height = float(mm.height.as_int()) / float(pixel.height.as_int());
+    auto const expected_size = geom::Size{window.width * pixel_width, window.height * pixel_height};
+
+    setup_x11_screen(pixel, mm, window);
+
+    auto display = create_display();
+    auto config = display->configuration();
+    geom::Size reported_size;
+    config->for_each_output(
+        [&reported_size](mg::DisplayConfigurationOutput const& output)
+        {
+            reported_size = output.physical_size_mm;
+        }
+        );
+
+    EXPECT_THAT(reported_size, Eq(expected_size));
+}