Merge lp:unity-system-compositor/0.9 into lp:unity-system-compositor/ubuntu

[Cemil Azizoglu]

Mir 0.26 compatibility branch for USC.

Mir 0.26 compatibility branch for USC.

[Cemil Azizoglu (cemil-azizoglu)]

Need to resync once

https://code.launchpad.net/~unity-system-compositor-team/unity-system-compositor/mir-0.26-compat/+merge/314966

lands.

[lp:unity-system-compositor/0.9]

303. By CI Train Bot Account on 2017-01-18

Sync with distro and prepare trunk for next release.

Approved by mir-ci-bot, Alexandros Frantzis.

[Cemil Azizoglu (cemil-azizoglu)]

> Need to resync once
>
> https://code.launchpad.net/~unity-system-compositor-team/unity-system-
> compositor/mir-0.26-compat/+merge/314966
>
> lands.

Now waiting on :

https://code.launchpad.net/~unity-system-compositor-team/unity-system-compositor/address-deprecations/+merge/315028

[lp:unity-system-compositor/0.9]

304. By Cemil Azizoglu on 2017-01-18

Address more deprecations that landed on lp:mir since yesterday.

Approved by Alexandros Frantzis, mir-ci-bot.

305. By Cemil Azizoglu on 2017-01-20

Address deprecations in mir.

Approved by mir-ci-bot, Brandon Schaefer.

=== modified file '.bzrignore'
--- .bzrignore	2013-04-09 04:47:20 +0000
+++ .bzrignore	2017-01-24 17:18:47 +0000
@@ -4,3 +4,4 @@
 CMakeFiles
 Makefile
 src/dm_protocol.pb.*
+.project

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-11-09 21:39:42 +0000
+++ CMakeLists.txt	2017-01-24 17:18:47 +0000
@@ -16,7 +16,7 @@
 
 project(UnitySystemCompositor)
 set(USC_VERSION_MAJOR 0)
-set(USC_VERSION_MINOR 8)
+set(USC_VERSION_MINOR 9)
 set(USC_VERSION_PATCH 0)
 set(USC_VERSION "${USC_VERSION_MAJOR}.${USC_VERSION_MINOR}.${USC_VERSION_PATCH}")
 

=== modified file 'debian/changelog'
--- debian/changelog	2016-12-06 02:48:56 +0000
+++ debian/changelog	2017-01-24 17:18:47 +0000
@@ -1,3 +1,9 @@
+unity-system-compositor (0.9.0-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Update for compatibility with Mir 0.26
+
+ -- Cemil Azizoglu <[e-mail]>  Tue, 17 Jan 2017 10:58:13 -0600
+
 unity-system-compositor (0.8.0+17.04.20161206-0ubuntu1) zesty; urgency=medium
 
   * 0.8.0 release, containing compatibility fixes for mir 0.25 release

=== modified file 'debian/control'
--- debian/control	2016-11-09 22:14:58 +0000
+++ debian/control	2017-01-24 17:18:47 +0000
@@ -16,8 +16,8 @@
                libglib2.0-dev,
                libgles2-mesa-dev,
                libglm-dev,
-               libmirclient-dev (>= 0.25.0),
-               libmirserver-dev (>= 0.25.0),
+               libmirclient-dev (>= 0.26.0),
+               libmirserver-dev (>= 0.26.0),
                pkg-config,
                python3,
                python3-setuptools,

=== modified file 'spinner/eglapp.cpp'
--- spinner/eglapp.cpp	2015-08-25 15:51:00 +0000
+++ spinner/eglapp.cpp	2017-01-24 17:18:47 +0000
@@ -32,24 +32,26 @@
     MirConnection* const connection, ActiveOutputHandler const& handler)
 {
     /* eglapps are interested in the screen size, so
-    use mir_connection_create_display_config */
-    MirDisplayConfiguration* display_config =
-        mir_connection_create_display_config(connection);
-
-    for (MirDisplayOutput* output = display_config->outputs;
-         output != display_config->outputs + display_config->num_outputs;
-         ++output)
+    use mir_connection_create_display_configuration */
+    MirDisplayConfig* 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)
     {
-        if (output->used &&
-            output->connected &&
-            output->num_modes &&
-            output->current_mode < output->num_modes)
+        auto output = mir_display_config_get_output(display_config, i);
+        auto num_modes = mir_output_get_num_modes(output);
+        if (mir_output_is_enabled(output) &&
+            mir_output_get_connection_state(output) == mir_output_connection_state_connected &&
+            num_modes &&
+            mir_output_get_current_mode(output))
         {
             handler(output);
         }
     }
 
-    mir_display_config_destroy(display_config);
+    mir_display_config_release(display_config);
 }
 
 MirPixelFormat select_pixel_format(MirConnection* connection)
@@ -74,7 +76,7 @@
 
 std::vector<std::shared_ptr<MirEglSurface>> mir_eglapp_init(int argc, char *argv[])
 {
-    MirSurfaceParameters surfaceparm =
+    MirWindowParameters surfaceparm =
         {
             "eglappsurface",
             0, 0,
@@ -219,13 +221,13 @@
     // If an output has been specified just do that
     if (surfaceparm.output_id != mir_display_output_id_invalid)
     {
-        for_each_active_output(connection, [&](MirDisplayOutput const* output)
+        for_each_active_output(connection, [&](MirOutput const* output)
             {
-                if (output->output_id == surfaceparm.output_id)
+                if ((size_t)mir_output_get_id(output) == surfaceparm.output_id)
                 {
-                    auto const& mode = output->modes[output->current_mode];
-                    surfaceparm.width = mode.horizontal_resolution;
-                    surfaceparm.height = mode.vertical_resolution;
+                    auto mode = mir_output_get_current_mode(output);
+                    surfaceparm.width = mir_output_mode_get_width(mode);
+                    surfaceparm.height = mir_output_mode_get_height(mode);
                 }
             });
         result.push_back(std::make_shared<MirEglSurface>(mir_egl_app, surfaceparm, swapinterval));
@@ -233,19 +235,22 @@
     }
 
     // but normally, we're fullscreen on every active output
-    for_each_active_output(connection, [&](MirDisplayOutput const* output)
+    for_each_active_output(connection, [&](MirOutput const* output)
         {
-            auto const& mode = output->modes[output->current_mode];
-
-            printf("Active output [%u] at (%d, %d) is %dx%d\n",
-                   output->output_id,
-                   output->position_x, output->position_y,
-                   mode.horizontal_resolution, mode.vertical_resolution);
-
-            surfaceparm.width = mode.horizontal_resolution;
-            surfaceparm.height = mode.vertical_resolution;
-            surfaceparm.output_id = output->output_id;
+            auto mode = mir_output_get_current_mode(output);
+
+            surfaceparm.width = mir_output_mode_get_width(mode);
+            surfaceparm.height = mir_output_mode_get_height(mode);
+            surfaceparm.output_id = mir_output_get_id(output);
+
             result.push_back(std::make_shared<MirEglSurface>(mir_egl_app, surfaceparm, swapinterval));
+
+            printf("Active output [%d] at (%d, %d) is %dx%d\n",
+                   surfaceparm.output_id,
+                   mir_output_get_position_x(output),
+                   mir_output_get_position_y(output),
+                   surfaceparm.width,
+                   surfaceparm.height);
         });
 
     if (result.empty())

=== modified file 'spinner/miregl.cpp'
--- spinner/miregl.cpp	2015-08-20 09:33:36 +0000
+++ spinner/miregl.cpp	2017-01-24 17:18:47 +0000
@@ -25,7 +25,7 @@
 public:
     MirEglApp(MirConnection* const connection, MirPixelFormat pixel_format);
 
-    EGLSurface create_surface(MirSurface* surface);
+    EGLSurface create_surface(MirWindow* surface);
 
     void release_current();
 
@@ -60,32 +60,32 @@
 
 namespace
 {
-MirSurface* create_surface(MirConnection* const connection, MirSurfaceParameters const& surfaceparm)
+MirWindow* create_surface(MirConnection* const connection, MirWindowParameters const& surfaceparm)
 {
-    auto const spec = mir_connection_create_spec_for_normal_surface(
+    auto const spec = mir_create_normal_window_spec(
         connection,
         surfaceparm.width,
-        surfaceparm.height,
-        surfaceparm.pixel_format);
-
-    mir_surface_spec_set_name(spec, surfaceparm.name);
-    mir_surface_spec_set_buffer_usage(spec, surfaceparm.buffer_usage);
-    mir_surface_spec_set_fullscreen_on_output(spec, surfaceparm.output_id);
-
-    auto const surface = mir_surface_create_sync(spec);
-    mir_surface_spec_release(spec);
-
-    if (!mir_surface_is_valid(surface))
-        throw std::runtime_error(std::string("Can't create a surface ") + mir_surface_get_error_message(surface));
+        surfaceparm.height);
+    mir_window_spec_set_pixel_format(spec, surfaceparm.pixel_format);
+
+    mir_window_spec_set_name(spec, surfaceparm.name);
+    mir_window_spec_set_buffer_usage(spec, surfaceparm.buffer_usage);
+    mir_window_spec_set_fullscreen_on_output(spec, surfaceparm.output_id);
+
+    auto const surface = mir_create_window_sync(spec);
+    mir_window_spec_release(spec);
+
+    if (!mir_window_is_valid(surface))
+        throw std::runtime_error(std::string("Can't create a surface ") + mir_window_get_error_message(surface));
 
     if (surfaceparm.output_id != mir_display_output_id_invalid)
-        mir_surface_set_state(surface, mir_surface_state_fullscreen);
+        mir_window_set_state(surface, mir_window_state_fullscreen);
 
     return surface;
 }
 }
 
-MirEglSurface::MirEglSurface(std::shared_ptr<MirEglApp> const& mir_egl_app, MirSurfaceParameters const& surfaceparm, int swapinterval) :
+MirEglSurface::MirEglSurface(std::shared_ptr<MirEglApp> const& mir_egl_app, MirWindowParameters const& surfaceparm, int swapinterval) :
     mir_egl_app{mir_egl_app},
     surface{create_surface(mir_egl_app->connection, surfaceparm)},
     eglsurface{mir_egl_app->create_surface(surface)},
@@ -98,7 +98,7 @@
 MirEglSurface::~MirEglSurface()
 {
     mir_egl_app->destroy_surface(eglsurface);
-    mir_surface_release_sync(surface);
+    mir_window_release_sync(surface);
 }
 
 void MirEglSurface::egl_make_current()
@@ -181,12 +181,12 @@
     make_current(dummy_surface);
 }
 
-EGLSurface MirEglApp::create_surface(MirSurface* surface)
+EGLSurface MirEglApp::create_surface(MirWindow* surface)
 {
     auto const eglsurface = eglCreateWindowSurface(
         egldisplay,
         eglconfig,
-        (EGLNativeWindowType) mir_buffer_stream_get_egl_native_window(mir_surface_get_buffer_stream(surface)), NULL);
+        (EGLNativeWindowType) mir_buffer_stream_get_egl_native_window(mir_window_get_buffer_stream(surface)), NULL);
 
     if (eglsurface == EGL_NO_SURFACE)
         throw std::runtime_error("eglCreateWindowSurface failed");

=== modified file 'spinner/miregl.h'
--- spinner/miregl.h	2015-06-10 14:17:13 +0000
+++ spinner/miregl.h	2017-01-24 17:18:47 +0000
@@ -37,7 +37,7 @@
 public:
     MirEglSurface(
         std::shared_ptr<MirEglApp> const& mir_egl_app,
-        MirSurfaceParameters const& surfaceparm,
+        MirWindowParameters const& surfaceparm,
         int swapinterval);
 
     ~MirEglSurface();
@@ -58,7 +58,7 @@
     unsigned int height() const;
 
     std::shared_ptr<MirEglApp> const mir_egl_app;
-    MirSurface* const surface;
+    MirWindow* const surface;
     EGLSurface const eglsurface;
     int width_;
     int height_;

=== modified file 'src/mir_input_configuration.cpp'
--- src/mir_input_configuration.cpp	2016-01-20 23:32:14 +0000
+++ src/mir_input_configuration.cpp	2017-01-24 17:18:47 +0000
@@ -17,8 +17,6 @@
 #include "mir_input_configuration.h"
 #include "mir/input/input_device_observer.h"
 #include "mir/input/input_device_hub.h"
-#include "mir/input/pointer_configuration.h"
-#include "mir/input/touchpad_configuration.h"
 #include "mir/input/device.h"
 
 namespace mi = mir::input;
@@ -108,9 +106,9 @@
 
 void usc::MirInputConfiguration::set_mouse_primary_button(int32_t button)
 {
-    mouse_pointer_config.handedness = button == 0 ?
+    mouse_pointer_config.handedness(button == 0 ?
         mir_pointer_handedness_right :
-        mir_pointer_handedness_left;
+        mir_pointer_handedness_left);
     update_mice();
 }
 
@@ -121,20 +119,22 @@
         clamped = 0.0;
     if (clamped > 1.0)
         clamped = 1.0;
-    mouse_pointer_config.cursor_acceleration_bias = clamped * 2.0 - 1.0;
+    mouse_pointer_config.cursor_acceleration_bias(clamped * 2.0 - 1.0);
     update_mice();
 }
 
 void usc::MirInputConfiguration::set_mouse_scroll_speed(double speed)
 {
-    mouse_pointer_config.horizontal_scroll_scale = speed;
-    mouse_pointer_config.vertical_scroll_scale = speed;
+    mouse_pointer_config.horizontal_scroll_scale(speed);
+    mouse_pointer_config.vertical_scroll_scale(speed);
     update_mice();
 }
 
 void usc::MirInputConfiguration::set_touchpad_primary_button(int32_t button)
 {
-    touchpad_pointer_config.handedness = button == 0?mir_pointer_handedness_right:mir_pointer_handedness_left;
+    touchpad_pointer_config.handedness(button == 0 ?
+        mir_pointer_handedness_right :
+        mir_pointer_handedness_left);
     update_touchpads();
 }
 
@@ -145,43 +145,43 @@
         clamped = 0.0;
     if (clamped > 1.0)
         clamped = 1.0;
-    touchpad_pointer_config.cursor_acceleration_bias = clamped * 2.0 - 1.0;
+    touchpad_pointer_config.cursor_acceleration_bias(clamped * 2.0 - 1.0);
     update_touchpads();
 }
 
 void usc::MirInputConfiguration::set_touchpad_scroll_speed(double speed)
 {
-    touchpad_pointer_config.horizontal_scroll_scale = speed;
-    touchpad_pointer_config.vertical_scroll_scale = speed;
+    touchpad_pointer_config.horizontal_scroll_scale(speed);
+    touchpad_pointer_config.vertical_scroll_scale(speed);
     update_touchpads();
 }
 
 void usc::MirInputConfiguration::set_two_finger_scroll(bool enable)
 {
-    MirTouchpadScrollModes current = touchpad_config.scroll_mode;
+    MirTouchpadScrollModes current = touchpad_config.scroll_mode();
     if (enable)
         current |= mir_touchpad_scroll_mode_two_finger_scroll;
     else
         current &= ~mir_touchpad_scroll_mode_two_finger_scroll;
-    touchpad_config.scroll_mode = current;
+    touchpad_config.scroll_mode(current);
     update_touchpads();
 }
 
 void usc::MirInputConfiguration::set_tap_to_click(bool enable)
 {
-    touchpad_config.tap_to_click = enable;
+    touchpad_config.tap_to_click(enable);
     update_touchpads();
 }
 
 void usc::MirInputConfiguration::set_disable_touchpad_while_typing(bool enable)
 {
-    touchpad_config.disable_while_typing = enable;
+    touchpad_config.disable_while_typing(enable);
     update_touchpads();
 }
 
 void usc::MirInputConfiguration::set_disable_touchpad_with_mouse(bool enable)
 {
-    touchpad_config.disable_with_mouse = enable;
+    touchpad_config.disable_with_mouse(enable);
     update_touchpads();
 }
 

=== modified file 'src/mir_input_configuration.h'
--- src/mir_input_configuration.h	2015-11-03 19:59:19 +0000
+++ src/mir_input_configuration.h	2017-01-24 17:18:47 +0000
@@ -19,8 +19,8 @@
 
 #include "input_configuration.h"
 
-#include "mir/input/touchpad_configuration.h"
-#include "mir/input/pointer_configuration.h"
+#include "mir/input/mir_touchpad_config.h"
+#include "mir/input/mir_pointer_config.h"
 
 #include <memory>
 #include <thread>
@@ -67,9 +67,9 @@
     std::mutex devices_lock;
     std::unordered_set<std::shared_ptr<mir::input::Device>> touchpads;
     std::unordered_set<std::shared_ptr<mir::input::Device>> mice;
-    mir::input::PointerConfiguration mouse_pointer_config;
-    mir::input::PointerConfiguration touchpad_pointer_config;
-    mir::input::TouchpadConfiguration touchpad_config;
+    MirPointerConfig mouse_pointer_config;
+    MirPointerConfig touchpad_pointer_config;
+    MirTouchpadConfig touchpad_config;
 };
 
 }

=== modified file 'tests/unit-tests/test_mir_input_configuration.cpp'
--- tests/unit-tests/test_mir_input_configuration.cpp	2016-08-11 11:28:28 +0000
+++ tests/unit-tests/test_mir_input_configuration.cpp	2017-01-24 17:18:47 +0000
@@ -22,7 +22,9 @@
 #include "mir/input/device_capability.h"
 #include "mir/input/input_device_observer.h"
 #include "mir/input/device.h"
-#include "mir/input/keyboard_configuration.h"
+#include "mir/input/mir_keyboard_config.h"
+#include "mir/input/mir_pointer_config.h"
+#include "mir/input/mir_touchpad_config.h"
 
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>
@@ -39,12 +41,12 @@
     MOCK_CONST_METHOD0(capabilities, mi::DeviceCapabilities());
     MOCK_CONST_METHOD0(name, std::string());
     MOCK_CONST_METHOD0(unique_id, std::string());
-    MOCK_CONST_METHOD0(pointer_configuration, mir::optional_value<mi::PointerConfiguration>());
-    MOCK_METHOD1(apply_pointer_configuration, void(mi::PointerConfiguration const&));
-    MOCK_CONST_METHOD0(touchpad_configuration, mir::optional_value<mi::TouchpadConfiguration>());
-    MOCK_METHOD1(apply_touchpad_configuration, void(mi::TouchpadConfiguration const&));
-    MOCK_CONST_METHOD0(keyboard_configuration, mir::optional_value<mi::KeyboardConfiguration>());
-    MOCK_METHOD1(apply_keyboard_configuration, void(mi::KeyboardConfiguration const&));
+    MOCK_CONST_METHOD0(pointer_configuration, mir::optional_value<MirPointerConfig>());
+    MOCK_METHOD1(apply_pointer_configuration, void(MirPointerConfig const&));
+    MOCK_CONST_METHOD0(touchpad_configuration, mir::optional_value<MirTouchpadConfig>());
+    MOCK_METHOD1(apply_touchpad_configuration, void(MirTouchpadConfig const&));
+    MOCK_CONST_METHOD0(keyboard_configuration, mir::optional_value<MirKeyboardConfig>());
+    MOCK_METHOD1(apply_keyboard_configuration, void(MirKeyboardConfig const&));
 
     MockDevice(mi::DeviceCapabilities caps)
         : caps(caps)
@@ -60,6 +62,7 @@
     MOCK_METHOD1(add_observer,void(std::shared_ptr<mi::InputDeviceObserver> const&));
     MOCK_METHOD1(remove_observer,void(std::weak_ptr<mi::InputDeviceObserver> const&));
     MOCK_METHOD1(for_each_input_device, void(std::function<void(mi::Device const&)> const&));
+    MOCK_METHOD1(for_each_mutable_input_device, void(std::function<void(mi::Device&)> const&));
 };
 
 struct MirInputConfiguration : ::testing::Test

=== modified file 'tests/unit-tests/test_session_switcher.cpp'
--- tests/unit-tests/test_session_switcher.cpp	2016-11-09 18:13:05 +0000
+++ tests/unit-tests/test_session_switcher.cpp	2017-01-24 17:18:47 +0000
@@ -117,6 +117,7 @@
     }
     std::string name() const override { return name_; }
     void send_display_config(mir::graphics::DisplayConfiguration const&) override {}
+    void send_input_config(MirInputConfig const&) override {}
 
 private:
     std::string const name_;