Merge lp:~vanvugt/mir/fix-1559831 into lp:mir

[Daniel van Vugt]

eglapp: Log valid DPI numbers (LP: #1559831) and more.

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

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

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

review: Approve (continuous-integration)

[Alexandros Frantzis (afrantzis)]

OK.

review: Approve

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

FAILED: Autolanding.
More details in the following jenkins job:
https://mir-jenkins.ubuntu.com/job/mir-autolanding/638/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/2348/console
    None: https://mir-jenkins.ubuntu.com/job/generic-land-mp/679/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/2411
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2403
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2403
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2403
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/2377
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=yakkety/2377/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/2377
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/2377/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/2377
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=yakkety/2377/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/2377/console
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/2377/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/2377
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/2377/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/2377
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/2377/artifact/output/*zip*/output.zip

review: Needs Fixing (continuous-integration)

[Daniel van Vugt (vanvugt)]

^^^
Bug 1628828

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

review: Approve (continuous-integration)

=== modified file 'examples/eglapp.c'
--- examples/eglapp.c	2016-05-03 06:55:25 +0000
+++ examples/eglapp.c	2016-09-29 09:07:49 +0000
@@ -106,21 +106,36 @@
 static void mir_eglapp_handle_surface_event(MirSurfaceEvent const* sev)
 {
     MirSurfaceAttrib attrib = mir_surface_event_get_attribute(sev);
-    if (attrib != mir_surface_attrib_visibility)
-        return;
-    switch (mir_surface_event_get_attribute_value(sev))
+    int value = mir_surface_event_get_attribute_value(sev);
+
+    switch (attrib)
     {
-    case mir_surface_visibility_exposed:
-        printf("Surface exposed\n");
+    case mir_surface_attrib_visibility:
+        printf("Surface %s\n", value == mir_surface_visibility_exposed ?
+                               "exposed" : "occluded");
         break;
-    case mir_surface_visibility_occluded:
-        printf("Surface occluded\n");
+    case mir_surface_attrib_dpi:
+        // value is still zero - never implemented. Deprecate? (LP: #1559831)
         break;
     default:
         break;
     }
 }
 
+static void handle_surface_output_event(MirSurfaceOutputEvent const* out)
+{
+    static char const* const form_factor_name[6] =
+        {"unknown", "phone", "tablet", "monitor", "TV", "projector"};
+    unsigned ff = mir_surface_output_event_get_form_factor(out);
+    char const* form_factor = (ff < 6) ? form_factor_name[ff] : "out-of-range";
+
+    printf("Surface is on output %u: %d DPI, scale %.1fx, %s form factor\n",
+           mir_surface_output_event_get_output_id(out),
+           mir_surface_output_event_get_dpi(out),
+           mir_surface_output_event_get_scale(out),
+           form_factor);
+}
+
 static void mir_eglapp_handle_event(MirSurface* surface, MirEvent const* ev, void* context)
 {
     (void) surface;
@@ -134,6 +149,9 @@
     case mir_event_type_surface:
         mir_eglapp_handle_surface_event(mir_event_get_surface_event(ev));
         break;
+    case mir_event_type_surface_output:
+        handle_surface_output_event(mir_event_get_surface_output_event(ev));
+        break;
     case mir_event_type_resize:
         /*
          * FIXME: https://bugs.launchpad.net/mir/+bug/1194384
@@ -459,7 +477,6 @@
     signal(SIGTERM, shutdown);
     signal(SIGHUP, shutdown);
 
-    printf("Surface %d DPI\n", mir_surface_get_dpi(surface));
     eglSwapInterval(egldisplay, swapinterval);
 
     running = 1;