Merge lp:~alan-griffiths/mir/fix-1717561 into lp:mir

[Alan Griffiths]

A first pass at getting fullscreen wayland windows fullscreen

A first pass at getting fullscreen wayland windows fullscreen

This still seems a little racy on surface creation: e.g. kiosk doesn't always end up with a maximized window.

But other resizing (including client initiated fullscreen) seems to work.

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

FAILED: Continuous integration, rev:4255
https://mir-jenkins.ubuntu.com/job/mir-ci/3671/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/5026/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5259
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5247
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5247
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5247
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5069
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5069/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5069
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5069/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5069/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5069
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5069/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5069
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5069/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5069
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5069/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5069
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5069/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5069
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5069/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:4257
https://mir-jenkins.ubuntu.com/job/mir-ci/3677/
Executed test runs:
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-mir/5040/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5276
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5264
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5264
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5264
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5083
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5083/artifact/output/*zip*/output.zip
    FAILURE: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5083/console
    ABORTED: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5083/console
    ABORTED: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5083/console
    ABORTED: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5083/console
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5083
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5083/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5083
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5083/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5083
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5083/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[Gerry Boland (gerboland)]

Works, and code looks correct

review: Approve

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

PASSED: Continuous integration, rev:4259
https://mir-jenkins.ubuntu.com/job/mir-ci/3678/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/5041
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/5277
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/5265
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/5265
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/5265
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5084
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/5084/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5084
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/5084/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5084
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/5084/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5084
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/5084/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5084
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/5084/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5084
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/5084/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5084
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/5084/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5084
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/5084/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

=== modified file 'include/server/mir/frontend/buffer_stream.h'
--- include/server/mir/frontend/buffer_stream.h	2017-09-01 05:03:55 +0000
+++ include/server/mir/frontend/buffer_stream.h	2017-09-22 11:48:21 +0000
@@ -21,6 +21,7 @@
 
 #include <mir_toolkit/common.h>
 #include "mir/graphics/buffer_id.h"
+#include "mir/geometry/size.h"
 #include <functional>
 #include <memory>
 

=== modified file 'src/server/frontend/wayland/wayland_connector.cpp'
--- src/server/frontend/wayland/wayland_connector.cpp	2017-09-21 11:30:51 +0000
+++ src/server/frontend/wayland/wayland_connector.cpp	2017-09-22 11:48:21 +0000
@@ -21,6 +21,7 @@
 #include "core_generated_interfaces.h"
 
 #include "mir/frontend/shell.h"
+#include "mir/frontend/surface.h"
 
 #include "mir/compositor/buffer_stream.h"
 
@@ -1028,6 +1029,11 @@
     InputCtx<WlKeyboard> const& acquire_keyboard_reference(wl_client* client) const;
     InputCtx<WlTouch> const& acquire_touch_reference(wl_client* client) const;
 
+    void spawn(std::function<void()>&& work)
+    {
+        executor->spawn(std::move(work));
+    }
+
 private:
     std::unordered_map<wl_client*, InputCtx<WlPointer>> mutable pointer;
     std::unordered_map<wl_client*, InputCtx<WlKeyboard>> mutable keyboard;
@@ -1146,13 +1152,14 @@
 {
 }
 
-class SurfaceInputSink : public mf::EventSink
+class SurfaceEventSink : public mf::EventSink
 {
 public:
-    SurfaceInputSink(WlSeat* seat, wl_client* client, wl_resource* target)
+    SurfaceEventSink(WlSeat* seat, wl_client* client, wl_resource* target, wl_resource* event_sink)
         : seat{seat},
           client{client},
-          target{target}
+          target{target},
+          event_sink{event_sink}
     {
     }
 
@@ -1172,12 +1179,24 @@
     WlSeat* const seat;
     wl_client* const client;
     wl_resource* const target;
+    wl_resource* const event_sink;
 };
 
-void SurfaceInputSink::handle_event(MirEvent const& event)
+void SurfaceEventSink::handle_event(MirEvent const& event)
 {
     switch (mir_event_get_type(&event))
     {
+    case mir_event_type_resize:
+    {
+        auto resize = mir_event_get_resize_event(&event);
+        seat->spawn([event_sink=event_sink,
+                     width = mir_resize_event_get_width(resize),
+                     height = mir_resize_event_get_height(resize)]()
+        {
+            wl_shell_surface_send_configure(event_sink, WL_SHELL_SURFACE_RESIZE_NONE, width, height);
+        });
+        break;
+    }
     case mir_event_type_input:
     {
         auto input_event = mir_event_get_input_event(&event);
@@ -1362,7 +1381,7 @@
           shell{shell}
     {
         auto* tmp = wl_resource_get_user_data(surface);
-        auto& mir_surface = *static_cast<WlSurface*>(reinterpret_cast<wayland::Surface*>(tmp));
+        auto& mir_surface = *static_cast<WlSurface*>(tmp);
 
         auto const session = session_for_client(client);
 
@@ -1374,7 +1393,15 @@
         surface_id = shell->create_surface(
             session,
             params,
-            std::make_shared<SurfaceInputSink>(&seat, client, surface));
+            std::make_shared<SurfaceEventSink>(&seat, client, surface, resource));
+
+        {
+            // The shell isn't guaranteed to respect the requested size
+            auto const window = session->get_surface(surface_id);
+            auto const size = window->client_size();
+            seat.spawn([resource=resource, height = size.height.as_int(), width = size.width.as_int()]()
+                { wl_shell_surface_send_configure(resource, WL_SHELL_SURFACE_RESIZE_NONE, width, height); });
+        }
 
         mir_surface.set_resize_handler(
             [shell, session, id = surface_id](geom::Size new_size)
@@ -1429,8 +1456,18 @@
     void set_fullscreen(
         uint32_t /*method*/,
         uint32_t /*framerate*/,
-        std::experimental::optional<struct wl_resource*> const& /*output*/) override
+        std::experimental::optional<struct wl_resource*> const& output) override
     {
+        mir::shell::SurfaceSpecification mods;
+        mods.state = mir_window_state_fullscreen;
+        if (output)
+        {
+            // TODO{alan_g} mods.output_id = DisplayConfigurationOutputId_from(output)
+        }
+
+        auto const session = session_for_client(client);
+        shell->modify_surface(session, surface_id, mods);
+
     }
 
     void set_popup(
@@ -1443,8 +1480,16 @@
     {
     }
 
-    void set_maximized(std::experimental::optional<struct wl_resource*> const& /*output*/) override
+    void set_maximized(std::experimental::optional<struct wl_resource*> const& output) override
     {
+        mir::shell::SurfaceSpecification mods;
+        mods.state = mir_window_state_maximized;
+        if (output)
+        {
+            // TODO{alan_g} mods.output_id = DisplayConfigurationOutputId_from(output)
+        }
+        auto const session = session_for_client(client);
+        shell->modify_surface(session, surface_id, mods);
     }
 
     void set_title(std::string const& /*title*/) override