Merge lp:~alan-griffiths/mir/resize-examples into lp:mir

[Alan Griffiths]

Fix window resize logic in example code

[Alberto Aguirre (albaguirre)]

LGTM.

review: Approve

[Alberto Aguirre (albaguirre)]

It looks like this would be a pretty common thing a client needs to do:

    mir_render_surface_set_size(surface, new_width, new_height);
    MirWindowSpec* spec = mir_create_window_spec(mir_window_get_connection(window));
    mir_window_spec_add_render_surface(spec, surface, new_width, new_height, 0, 0);
    mir_window_apply_spec(window, spec);
    mir_window_spec_release(spec);

Maybe a convenience api should be introduced? maybe mir_window_resize_content(MirWindow* window, MirRenderSurface* surface, int new_width, int new_height) ? Just a thought...

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

PASSED: Continuous integration, rev:4193
https://mir-jenkins.ubuntu.com/job/mir-ci/3444/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/4690
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4825
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=artful/4815
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/4815
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4815
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/4727
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=artful/4727/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4727
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4727/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/4727
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=artful/4727/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/4727
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial/4727/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4727
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4727/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/4727
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=artful/4727/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/4727
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/4727/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/4727
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial/4727/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

=== modified file 'examples/client_helpers.cpp'
--- examples/client_helpers.cpp	2017-05-23 10:51:47 +0000
+++ examples/client_helpers.cpp	2017-06-06 15:58:12 +0000
@@ -51,8 +51,14 @@
 }
 
 mir::examples::NormalWindow::NormalWindow(
+    Connection& connection, unsigned int width, unsigned int height, MirRenderSurface* surface) :
+    window{create_window(connection, width, height, surface), &mir_window_release_sync}
+{
+}
+
+mir::examples::NormalWindow::NormalWindow(
     mir::examples::Connection& connection, unsigned int width, unsigned int height, mir::examples::Context& eglcontext) :
-    window{create_window(connection, width, height, eglcontext.mir_surface()), &mir_window_release_sync}
+    NormalWindow(connection, width, height, eglcontext.mir_surface())
 {
 }
 
@@ -61,6 +67,34 @@
     return window.get();
 }
 
+namespace
+{
+void handle_window_event(MirWindow* window, MirEvent const* event, void* context)
+{
+    auto const surface = (MirRenderSurface*)context;
+
+    switch (mir_event_get_type(event))
+    {
+    case mir_event_type_resize:
+    {
+        MirResizeEvent const* resize = mir_event_get_resize_event(event);
+        int const new_width = mir_resize_event_get_width(resize);
+        int const new_height = mir_resize_event_get_height(resize);
+
+        mir_render_surface_set_size(surface, new_width, new_height);
+        MirWindowSpec* spec = mir_create_window_spec(mir_window_get_connection(window));
+        mir_window_spec_add_render_surface(spec, surface, new_width, new_height, 0, 0);
+        mir_window_apply_spec(window, spec);
+        mir_window_spec_release(spec);
+        break;
+    }
+
+    default:
+        break;
+    }
+}
+}
+
 MirWindow* me::NormalWindow::create_window(
     MirConnection* connection, unsigned int width, unsigned int height, MirRenderSurface* surface)
 {
@@ -72,7 +106,10 @@
     mir_window_spec_set_name(spec.get(), __PRETTY_FUNCTION__);
 
     if (surface)
+    {
         mir_window_spec_add_render_surface(spec.get(), surface, width, height, 0, 0);
+        mir_window_spec_set_event_handler(spec.get(), &handle_window_event, surface);
+    }
 
     auto window = mir_create_window_sync(spec.get());
     return window;

=== modified file 'examples/client_helpers.h'
--- examples/client_helpers.h	2017-05-26 13:52:51 +0000
+++ examples/client_helpers.h	2017-06-06 15:58:12 +0000
@@ -86,6 +86,7 @@
 public:
     NormalWindow(Connection& connection, unsigned int width, unsigned int height);
     NormalWindow(Connection& connection, unsigned int width, unsigned int height, Context& eglcontext);
+    NormalWindow(Connection& connection, unsigned int width, unsigned int height, MirRenderSurface* surface);
 
     operator MirWindow*() const;
 private:

=== modified file 'examples/client_touch_validator.cpp'
--- examples/client_touch_validator.cpp	2017-05-08 03:04:26 +0000
+++ examples/client_touch_validator.cpp	2017-06-06 15:58:12 +0000
@@ -134,7 +134,7 @@
     state->record_event(tev);
 }
     
-void on_event(MirWindow * /*surface*/, const MirEvent *event, void *context)
+void on_event(MirWindow *window, const MirEvent *event, void *context)
 {
     TouchState *state = (TouchState*)context;
 
@@ -143,6 +143,9 @@
     case mir_event_type_input:
         on_input_event(state, mir_event_get_input_event(event));
         break;
+    case mir_event_type_resize:
+        egl_app_handle_resize_event(window, mir_event_get_resize_event(event));
+        break;
     case mir_event_type_close_window:
         abort();
         break;

=== modified file 'examples/eglapp.c'
--- examples/eglapp.c	2017-05-19 16:18:30 +0000
+++ examples/eglapp.c	2017-06-06 15:58:12 +0000
@@ -183,13 +183,24 @@
          * support for event queuing (directing them to another thread) or
          * full single-threaded callbacks. (LP: #1194384).
          */
-        {
-            MirResizeEvent const* resize = mir_event_get_resize_event(ev);
-            int const new_width = mir_resize_event_get_width(resize);
-            int const new_height = mir_resize_event_get_height(resize);
-
-            printf("Resized to %dx%d\n", new_width, new_height);
-            if (surface)
+        egl_app_handle_resize_event(window, mir_event_get_resize_event(ev));
+        break;
+    case mir_event_type_close_window:
+        printf("Received close event from server.\n");
+        running = 0;
+        break;
+    default:
+        break;
+    }
+}
+
+void egl_app_handle_resize_event(MirWindow* window, MirResizeEvent const* resize)
+{
+    int const new_width = mir_resize_event_get_width(resize);
+    int const new_height = mir_resize_event_get_height(resize);
+
+    printf("Resized to %dx%d\n", new_width, new_height);
+    if (surface)
             {
                 mir_render_surface_set_size(surface, new_width, new_height);
                 MirWindowSpec* spec = mir_create_window_spec(connection);
@@ -197,15 +208,6 @@
                 mir_window_apply_spec(window, spec);
                 mir_window_spec_release(spec);
             }
-        }
-        break;
-    case mir_event_type_close_window:
-        printf("Received close event from server.\n");
-        running = 0;
-        break;
-    default:
-        break;
-    }
 }
 
 static void show_help(struct mir_eglapp_arg const* const* arg_lists)

=== modified file 'examples/eglapp.h'
--- examples/eglapp.h	2017-05-08 03:04:26 +0000
+++ examples/eglapp.h	2017-06-06 15:58:12 +0000
@@ -45,6 +45,7 @@
 mir_eglapp_bool mir_eglapp_running(void);
 void            mir_eglapp_cleanup(void);
 void            mir_eglapp_handle_event(MirWindow* window, MirEvent const* ev, void* unused);
+void            egl_app_handle_resize_event(MirWindow* window, MirResizeEvent const* resize);
 double          mir_eglapp_display_hz(void);
 
 MirConnection* mir_eglapp_native_connection();

=== modified file 'examples/eglsquare.cpp'
--- examples/eglsquare.cpp	2017-06-05 09:37:52 +0000
+++ examples/eglsquare.cpp	2017-06-06 15:58:12 +0000
@@ -127,106 +127,126 @@
         if (worker.joinable()) worker.join();
     }
 
-    void on_event(MirEvent const* ev)
-    {
-        if (mir_event_get_type(ev) != mir_event_type_input)
-            return;
-        float x{0.0f};
-        float y{0.0f};
-        auto ievent = mir_event_get_input_event(ev);
-        if (mir_input_event_get_type(ievent) == mir_input_event_type_touch)
-        {
-            auto tev = mir_input_event_get_touch_event(ievent);
-            x = mir_touch_event_axis_value(tev, 0, mir_touch_axis_x);
-            y = mir_touch_event_axis_value(tev, 0, mir_touch_axis_y);
-        }
-        else if (mir_input_event_get_type(ievent) == mir_input_event_type_pointer)
-        {
-            auto pev = mir_input_event_get_pointer_event(ievent);
-            x = mir_pointer_event_axis_value(pev, mir_pointer_axis_x);
-            y = mir_pointer_event_axis_value(pev, mir_pointer_axis_y);
-        }
-        else
-        {
-            return;
-        }
-
-        pos = Pos{x, y};
-        cv.notify_one();
-    }
-
-    SquareRenderingSurface(SquareRenderingSurface const&) = delete;
-    SquareRenderingSurface& operator=(SquareRenderingSurface const&) = delete;
-private:
-    struct OutputDimensions
-    {
-        unsigned int const width;
-        unsigned int const height;
-    } const dimensions;
-
-    me::Context context;
-    me::NormalWindow window;
-    RenderProgram program;
-
-    OutputDimensions active_output_dimensions(MirConnection* connection)
-    {
-        unsigned int width{0};
-        unsigned int height{0};
-        auto display_config = mir_connection_create_display_configuration(connection);
-        auto num_outputs = mir_display_config_get_num_outputs(display_config);
-        for (auto i = 0; i < num_outputs; i++)
-        {
-            auto output = mir_display_config_get_output(display_config, i);
-            auto state = mir_output_get_connection_state(output);
-            if (state == mir_output_connection_state_connected && mir_output_is_enabled(output))
-            {
-                auto mode = mir_output_get_current_mode(output);
-                width  = mir_output_mode_get_width(mode);
-                height = mir_output_mode_get_height(mode);
-                break;
-            }
-        }
-        mir_display_config_release(display_config);
-        if (width == 0 || height == 0)
-            throw std::logic_error("could not determine display size");
-        return {width, height};
-    }
-
-    static void on_event(MirWindow*, const MirEvent *event, void *context)
-    {
-        auto surface = reinterpret_cast<SquareRenderingSurface*>(context);
-        if (surface) surface->on_event(event);
-    }
-
-private:
-    void do_work()
-    {
-        std::unique_lock<decltype(mutex)> lock(mutex);
-
-        while (true)
-        {
-            cv.wait(lock);
-
-            if (!running) return;
-
-            Pos  pos = this->pos;
-
-            context.make_current();
-            program.draw(
-                pos.x/static_cast<float>(dimensions.width)*2.0 - 1.0,
-                pos.y/static_cast<float>(dimensions.height)*-2.0 + 1.0);
-            context.swapbuffers();
-        }
-    }
-
-    struct Pos { float x; float y; };
-    std::atomic<Pos> pos;
-
-    std::thread worker;
-    std::condition_variable cv;
-    std::mutex mutex;
-    bool running{true};
-};
+    void on_event(MirEvent const* event)
+    {
+        switch (mir_event_get_type(event))
+        {
+        case mir_event_type_resize:
+        {
+            MirResizeEvent const* resize = mir_event_get_resize_event(event);
+            int const new_width = mir_resize_event_get_width(resize);
+            int const new_height = mir_resize_event_get_height(resize);
+
+            mir_render_surface_set_size(context.mir_surface(), new_width, new_height);
+            MirWindowSpec* spec = mir_create_window_spec(mir_window_get_connection(window));
+            mir_window_spec_add_render_surface(spec, context.mir_surface(), new_width, new_height, 0, 0);
+            mir_window_apply_spec(window, spec);
+            mir_window_spec_release(spec);
+            break;
+        }
+
+        case mir_event_type_input:
+        {
+            float x{0.0f};
+            float y{0.0f};
+            auto ievent = mir_event_get_input_event(event);
+            if (mir_input_event_get_type(ievent) == mir_input_event_type_touch)
+            {
+                auto tev = mir_input_event_get_touch_event(ievent);
+                x = mir_touch_event_axis_value(tev, 0, mir_touch_axis_x);
+                y = mir_touch_event_axis_value(tev, 0, mir_touch_axis_y);
+            }
+            else if (mir_input_event_get_type(ievent) == mir_input_event_type_pointer)
+            {
+                auto pev = mir_input_event_get_pointer_event(ievent);
+                x = mir_pointer_event_axis_value(pev, mir_pointer_axis_x);
+                y = mir_pointer_event_axis_value(pev, mir_pointer_axis_y);
+            }
+            else
+            {
+                return;
+            }
+
+            pos = Pos{x, y};
+            cv.notify_one();
+        }
+
+        default:;
+        }
+        }
+
+        SquareRenderingSurface(SquareRenderingSurface const&) = delete;
+        SquareRenderingSurface& operator=(SquareRenderingSurface const&) = delete;
+        private:
+        struct OutputDimensions
+        {
+            unsigned int const width;
+            unsigned int const height;
+        } const dimensions;
+
+        me::Context context;
+        me::NormalWindow window;
+        RenderProgram program;
+
+        OutputDimensions active_output_dimensions(MirConnection* connection)
+        {
+            unsigned int width{0};
+            unsigned int height{0};
+            auto display_config = mir_connection_create_display_configuration(connection);
+            auto num_outputs = mir_display_config_get_num_outputs(display_config);
+            for (auto i = 0; i < num_outputs; i++)
+            {
+                auto output = mir_display_config_get_output(display_config, i);
+                auto state = mir_output_get_connection_state(output);
+                if (state == mir_output_connection_state_connected && mir_output_is_enabled(output))
+                {
+                    auto mode = mir_output_get_current_mode(output);
+                    width  = mir_output_mode_get_width(mode);
+                    height = mir_output_mode_get_height(mode);
+                    break;
+                }
+            }
+            mir_display_config_release(display_config);
+            if (width == 0 || height == 0)
+                throw std::logic_error("could not determine display size");
+            return {width, height};
+        }
+
+        static void on_event(MirWindow*, const MirEvent *event, void *context)
+        {
+            auto surface = reinterpret_cast<SquareRenderingSurface*>(context);
+            if (surface) surface->on_event(event);
+        }
+
+        private:
+        void do_work()
+        {
+            std::unique_lock<decltype(mutex)> lock(mutex);
+
+            while (true)
+            {
+                cv.wait(lock);
+
+                if (!running) return;
+
+                Pos  pos = this->pos;
+
+                context.make_current();
+                program.draw(
+                    pos.x/static_cast<float>(dimensions.width)*2.0 - 1.0,
+                    pos.y/static_cast<float>(dimensions.height)*-2.0 + 1.0);
+                context.swapbuffers();
+            }
+        }
+
+        struct Pos { float x; float y; };
+        std::atomic<Pos> pos;
+
+        std::thread worker;
+        std::condition_variable cv;
+        std::mutex mutex;
+        bool running{true};
+    };
 }
 
 int main(int argc, char *argv[])

=== modified file 'examples/multi_stream.cpp'
--- examples/multi_stream.cpp	2017-05-23 10:51:47 +0000
+++ examples/multi_stream.cpp	2017-06-06 15:58:12 +0000
@@ -49,8 +49,6 @@
 
     int displacement_x{0};
     int displacement_y{0};
-    int width{0};
-    int height{0};
 
     MyBufferStream& operator=(MyBufferStream &&) = default;
     MyBufferStream(MyBufferStream &&) = default;
@@ -278,7 +276,7 @@
         0
     };
 
-    me::NormalWindow window{connection, 200, 200};
+    me::NormalWindow window{connection, 200, 200, stream[0]};
 
     while (poll(&signal_poll, 1, 0) <= 0)
     {
@@ -302,8 +300,12 @@
         auto spec = mir_create_window_spec(connection);
         for (auto& s : stream)
         {
+            int width{0};
+            int height{0};
+            mir_render_surface_get_size(s, &width, &height);
+
             mir_buffer_stream_swap_buffers_sync(s);
-            mir_window_spec_add_render_surface(spec, s, s.width, s.height, s.displacement_x, s.displacement_y);
+            mir_window_spec_add_render_surface(spec, s, width, height, s.displacement_x, s.displacement_y);
         }
         mir_window_apply_spec(window, spec);
         mir_window_spec_release(spec);
@@ -322,8 +324,6 @@
     int displacement_y)
     : displacement_x{displacement_x},
       displacement_y{displacement_y},
-      width{width},
-      height{height},
       stream{mir_connection_create_render_surface_sync(connection, width, height), &mir_render_surface_release},
       bs{get_stream(connection, width, height)}
 {

=== modified file 'examples/prerendered_frames.c'
--- examples/prerendered_frames.c	2017-05-19 13:49:04 +0000
+++ examples/prerendered_frames.c	2017-06-06 15:58:12 +0000
@@ -92,6 +92,36 @@
         rendering = 0;
 }
 
+static void handle_window_event(MirWindow* window, MirEvent const* event, void* context)
+{
+    MirRenderSurface* const surface = (MirRenderSurface*)context;
+
+    switch (mir_event_get_type(event))
+    {
+    case mir_event_type_resize:
+    {
+        MirResizeEvent const* resize = mir_event_get_resize_event(event);
+        int const new_width = mir_resize_event_get_width(resize);
+        int const new_height = mir_resize_event_get_height(resize);
+
+        mir_render_surface_set_size(surface, new_width, new_height);
+        MirWindowSpec* spec = mir_create_window_spec(mir_window_get_connection(window));
+        mir_window_spec_add_render_surface(spec, surface, new_width, new_height, 0, 0);
+        mir_window_apply_spec(window, spec);
+        mir_window_spec_release(spec);
+        break;
+    }
+
+    case mir_event_type_close_window:
+        printf("Received close event from server.\n");
+        rendering = 0;
+        break;
+
+    default:
+        break;
+    }
+}
+
 int main(int argc, char** argv)
 {
     static char const *socket_file = NULL;
@@ -165,6 +195,8 @@
     MirWindowSpec* spec = mir_create_normal_window_spec(connection, width, height);
     mir_window_spec_add_render_surface(
         spec, surface, width, height, displacement_x, displacement_y);
+    mir_window_spec_set_event_handler(spec, &handle_window_event, surface);
+    mir_window_spec_set_name(spec, "prerendered_frames");
     MirWindow* window = mir_create_window_sync(spec);
     if (!mir_window_is_valid(window))
     {

=== modified file 'examples/target.c'
--- examples/target.c	2017-05-08 03:04:26 +0000
+++ examples/target.c	2017-06-06 15:58:12 +0000
@@ -196,6 +196,7 @@
         get_all_touch_points(mir_event_get_input_event(event), &state->touch);
         break;
     case mir_event_type_resize:
+        egl_app_handle_resize_event(surface, mir_event_get_resize_event(event));
         state->resized = true;
         break;
     case mir_event_type_close_window:

=== modified file 'src/utils/vanity.c'
--- src/utils/vanity.c	2017-05-08 03:04:26 +0000
+++ src/utils/vanity.c	2017-06-06 15:58:12 +0000
@@ -176,6 +176,7 @@
         handled = on_surface_event(mir_event_get_window_event(event), state);
         break;
     case mir_event_type_resize:
+        egl_app_handle_resize_event(surface, mir_event_get_resize_event(event));
         state->resized = true;
         break;
     default: