Merge lp:~vanvugt/mir/eglapp-fullscreen-properly into lp:mir

[Daniel van Vugt]

eglapp: Go fullscreen properly, using window states.

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

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

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

review: Approve (continuous-integration)

[Alan Griffiths (alan-griffiths)]

LGTM

review: Approve

=== modified file 'examples/eglapp.c'
--- examples/eglapp.c	2017-03-14 02:26:28 +0000
+++ examples/eglapp.c	2017-03-31 06:46:29 +0000
@@ -209,24 +209,6 @@
     }
 }
 
-static MirOutput const* find_active_output(
-    MirDisplayConfig const* conf)
-{
-    size_t num_outputs = mir_display_config_get_num_outputs(conf);
-
-    for (size_t i = 0; i < num_outputs; i++)
-    {
-        MirOutput const* output = mir_display_config_get_output(conf, i);
-        MirOutputConnectionState state = mir_output_get_connection_state(output);
-        if (state == mir_output_connection_state_connected && mir_output_is_enabled(output))
-        {
-            return output;
-        }
-    }
-
-    return NULL;
-}
-
 static void show_help(struct mir_eglapp_arg const* const* arg_lists)
 {
     int const indent = 2, desc_offset = 2;
@@ -465,44 +447,14 @@
     }
     printf("Using pixel format %d.\n", pixel_format);
 
-    /* eglapps are interested in the screen size, so
-       use mir_connection_create_display_config */
-    MirDisplayConfig* display_config =
-        mir_connection_create_display_configuration(connection);
-
-    MirOutput const* output = find_active_output(display_config);
-
-    if (output == NULL)
-    {
-        printf("No active outputs found.\n");
-        return 0;
-    }
-
-    MirOutputMode const* mode = mir_output_get_current_mode(output);
-
-    int pos_x = mir_output_get_position_x(output);
-    int pos_y = mir_output_get_position_y(output);
-
-    int mode_width  = mir_output_mode_get_width(mode);
-    int mode_height = mir_output_mode_get_height(mode);
-
-    printf("Current active output is %dx%d %+d%+d\n",
-        mode_width, mode_height,
-        pos_x, pos_y);
-
-    if (fullscreen)  /* TODO: Use window states for this */
-    {
-        *width  = mode_width;
-        *height = mode_height;
-    }
-
-    mir_display_config_release(display_config);
-
     MirWindowSpec *spec =
         mir_create_normal_window_spec(connection, *width, *height);
 
     CHECK(spec != NULL, "Can't create a window spec");
 
+    if (fullscreen)
+        mir_window_spec_set_state(spec, mir_window_state_fullscreen);
+
     if (new_egl)
     {
         surface = mir_connection_create_render_surface_sync(connection, *width, *height);