Merge lp:~mir-team/qtmir/devel-mir-next-update into lp:qtmir/devel-mir-next

[Alan Griffiths]

Update for the latest set of Mir changes

Update for the latest set of Mir changes

[lp:~mir-team/qtmir/devel-mir-next-update]

281. By Alan Griffiths on 2015-04-01

Don't rely on Mir to provide NullWindowManager

[Daniel van Vugt (vanvugt)]

Looks like multiple possibly unrelated changes?

Still, it builds and all tests pass.

Someone can and might polish it more before the changes land in lp:qtmir.

review: Approve

=== modified file 'debian/control'
--- debian/control	2015-03-25 08:21:35 +0000
+++ debian/control	2015-04-01 13:50:18 +0000
@@ -17,9 +17,9 @@
                libgles2-mesa-dev,
                libglib2.0-dev,
                liblttng-ust-dev,
-               libmirclient-dev (>= 0.6.0),
+               libmirclient-dev (>= 0.13.0),
                libmircommon-dev,
-               libmirserver-dev (>= 0.11.0),
+               libmirserver-dev (>= 0.13.0),
                libmtdev-dev,
                libprocess-cpp-dev,
                libqtdbusmock1-dev (>= 0.2),

=== modified file 'src/modules/Unity/Application/CMakeLists.txt'
--- src/modules/Unity/Application/CMakeLists.txt	2015-01-08 12:37:08 +0000
+++ src/modules/Unity/Application/CMakeLists.txt	2015-04-01 13:50:18 +0000
@@ -2,7 +2,6 @@
     ${GLIB_INCLUDE_DIRS}
     ${GIO_INCLUDE_DIRS}
     ${GIO_UNIX_INCLUDE_DIRS}
-    ${MIRCOMMON_INCLUDE_DIRS}
     ${MIRSERVER_INCLUDE_DIRS}
     ${PROCESS_CPP_INCLUDE_DIRS}
     ${UBUNTU_PLATFORM_API_INCLUDE_DIRS}

=== modified file 'src/modules/Unity/Application/application_manager.cpp'
--- src/modules/Unity/Application/application_manager.cpp	2015-03-25 08:21:35 +0000
+++ src/modules/Unity/Application/application_manager.cpp	2015-04-01 13:50:18 +0000
@@ -70,9 +70,9 @@
     //TODO: should use mir::graphics::Display::configuration
     mir::geometry::Rectangles view_area;
     mirServer->the_display()->for_each_display_sync_group(
-        [&view_area](mir::graphics::DisplaySyncGroup& group) {
+        [&view_area](mir::graphics::DisplaySyncGroup &group) {
             group.for_each_display_buffer(
-                [&view_area](const mir::graphics::DisplayBuffer & db) {
+                [&view_area](const mir::graphics::DisplayBuffer &db) {
                     view_area.add(db.view_area());
                 });
         });

=== modified file 'src/platforms/mirserver/CMakeLists.txt'
--- src/platforms/mirserver/CMakeLists.txt	2015-03-25 08:26:35 +0000
+++ src/platforms/mirserver/CMakeLists.txt	2015-04-01 13:50:18 +0000
@@ -18,7 +18,6 @@
 endforeach(item ${Qt5Gui_PRIVATE_INCLUDE_DIRS})
 
 include_directories(
-    ${MIRCOMMON_INCLUDE_DIRS}
     ${MIRSERVER_INCLUDE_DIRS}
     
     ${URL_DISPATCHER_INCLUDE_DIRS}

=== modified file 'src/platforms/mirserver/displaywindow.cpp'
--- src/platforms/mirserver/displaywindow.cpp	2015-03-11 14:53:34 +0000
+++ src/platforms/mirserver/displaywindow.cpp	2015-04-01 13:50:18 +0000
@@ -105,6 +105,16 @@
 void DisplayWindow::swapBuffers()
 {
     m_displayBuffer->gl_swap_buffers();
+
+    // FIXME this exposes a QtMir architecture problem now, as DisplayWindow
+    // is supposed to wrap a mg::DisplayBuffer. We use Qt's multithreaded
+    // renderer, where each DisplayWindow is rendered to relatively
+    // independently, and post() called also individually.
+    //
+    // But in multimonitor case where a DisplaySyncGroup contains 2
+    // DisplayBuffers, one post() call will submit both
+    // mg::DisplayBuffers for flipping, which can happen before the other
+    // DisplayWindow has been rendered to, causing visual artifacts
     m_displayGroup->post();
 }
 

=== modified file 'src/platforms/mirserver/mirserver.h'
--- src/platforms/mirserver/mirserver.h	2015-02-02 12:05:00 +0000
+++ src/platforms/mirserver/mirserver.h	2015-04-01 13:50:18 +0000
@@ -51,7 +51,6 @@
     using mir::Server::the_prompt_session_manager;
     using mir::Server::the_session_authorizer;
     using mir::Server::the_session_listener;
-    using mir::Server::the_surface_configurator;
 
     /* qt specific */
     // getters

=== modified file 'src/platforms/mirserver/mirserverintegration.cpp'
--- src/platforms/mirserver/mirserverintegration.cpp	2015-03-11 14:53:34 +0000
+++ src/platforms/mirserver/mirserverintegration.cpp	2015-04-01 13:50:18 +0000
@@ -137,10 +137,14 @@
 
     mg::DisplayBuffer* first_buffer{nullptr};
     mg::DisplaySyncGroup* first_group{nullptr};
-    m_mirServer->the_display()->for_each_display_sync_group([&](mg::DisplaySyncGroup& group) {
-        if (!first_group) first_group = &group;
-        group.for_each_display_buffer([&](mg::DisplayBuffer& buffer) {
-            if (!first_buffer) first_buffer = &buffer;
+    m_mirServer->the_display()->for_each_display_sync_group([&](mg::DisplaySyncGroup &group) {
+        if (!first_group) {
+            first_group = &group;
+        }
+        group.for_each_display_buffer([&](mg::DisplayBuffer &buffer) {
+            if (!first_buffer) {
+                first_buffer = &buffer;
+            }
         });
     });
 

=== modified file 'src/platforms/mirserver/mirshell.cpp'
--- src/platforms/mirserver/mirshell.cpp	2015-03-11 14:35:23 +0000
+++ src/platforms/mirserver/mirshell.cpp	2015-04-01 13:50:18 +0000
@@ -21,12 +21,50 @@
 #include <mir/geometry/rectangle.h>
 #include <mir/scene/session.h>
 #include <mir/scene/surface_creation_parameters.h>
+#include <mir/scene/surface.h>
 #include <mir/shell/display_layout.h>
-#include <mir/shell/null_window_manager.h>
+#include <mir/shell/window_manager.h>
 
 namespace ms = mir::scene;
 using mir::shell::AbstractShell;
 
+namespace
+{
+class NullWindowManager : public mir::shell::WindowManager
+{
+public:
+    void add_session(std::shared_ptr<ms::Session> const& session) override;
+
+    void remove_session(std::shared_ptr<ms::Session> const& session) override;
+
+    mir::frontend::SurfaceId add_surface(
+        std::shared_ptr<ms::Session> const& session,
+        ms::SurfaceCreationParameters const& params,
+        std::function<mir::frontend::SurfaceId(std::shared_ptr<ms::Session> const& session, ms::SurfaceCreationParameters const& params)> const& build) override;
+
+    void remove_surface(
+        std::shared_ptr<ms::Session> const& session,
+        std::weak_ptr<ms::Surface> const& surface) override;
+
+    void add_display(mir::geometry::Rectangle const& area) override;
+
+    void remove_display(mir::geometry::Rectangle const& area) override;
+
+    bool handle_key_event(MirKeyboardEvent const* event) override;
+
+    bool handle_touch_event(MirTouchEvent const* event) override;
+
+    bool handle_pointer_event(MirPointerEvent const* event) override;
+
+    int set_surface_attribute(
+        std::shared_ptr<ms::Session> const& session,
+        std::shared_ptr<ms::Surface> const& surface,
+        MirSurfaceAttrib attrib,
+        int value) override;
+};
+}
+
+
 MirShell::MirShell(
     const std::shared_ptr<mir::shell::InputTargeter> &inputTargeter,
     const std::shared_ptr<mir::scene::SurfaceCoordinator> &surfaceCoordinator,
@@ -34,7 +72,7 @@
     const std::shared_ptr<mir::scene::PromptSessionManager> &promptSessionManager,
     const std::shared_ptr<mir::shell::DisplayLayout> &displayLayout) :
     AbstractShell(inputTargeter, surfaceCoordinator, sessionCoordinator, promptSessionManager,
-        [](mir::shell::FocusController*) { return std::make_shared<mir::shell::NullWindowManager>(); }),
+        [](mir::shell::FocusController*) { return std::make_shared<NullWindowManager>(); }),
     m_displayLayout{displayLayout}
 {
     qCDebug(QTMIR_MIR_MESSAGES) << "MirShell::MirShell";
@@ -75,3 +113,58 @@
 
     return result;
 }
+
+void NullWindowManager::add_session(std::shared_ptr<ms::Session> const& /*session*/)
+{
+}
+
+void NullWindowManager::remove_session(std::shared_ptr<ms::Session> const& /*session*/)
+{
+}
+
+auto NullWindowManager::add_surface(
+    std::shared_ptr<ms::Session> const& session,
+    ms::SurfaceCreationParameters const& params,
+    std::function<mir::frontend::SurfaceId(std::shared_ptr<ms::Session> const& session, ms::SurfaceCreationParameters const& params)> const& build)
+-> mir::frontend::SurfaceId
+{
+    return build(session, params);
+}
+
+void NullWindowManager::remove_surface(
+    std::shared_ptr<ms::Session> const& /*session*/,
+    std::weak_ptr<ms::Surface> const& /*surface*/)
+{
+}
+
+void NullWindowManager::add_display(mir::geometry::Rectangle const& /*area*/)
+{
+}
+
+void NullWindowManager::remove_display(mir::geometry::Rectangle const& /*area*/)
+{
+}
+
+bool NullWindowManager::handle_key_event(MirKeyboardEvent const* /*event*/)
+{
+    return false;
+}
+
+bool NullWindowManager::handle_touch_event(MirTouchEvent const* /*event*/)
+{
+    return false;
+}
+
+bool NullWindowManager::handle_pointer_event(MirPointerEvent const* /*event*/)
+{
+    return false;
+}
+
+int NullWindowManager::set_surface_attribute(
+    std::shared_ptr<ms::Session> const& /*session*/,
+    std::shared_ptr<ms::Surface> const& surface,
+    MirSurfaceAttrib attrib,
+    int value)
+{
+    return surface->configure(attrib, value);
+}

=== modified file 'src/platforms/mirserver/surfaceobserver.h'
--- src/platforms/mirserver/surfaceobserver.h	2015-03-11 14:35:23 +0000
+++ src/platforms/mirserver/surfaceobserver.h	2015-04-01 13:50:18 +0000
@@ -42,7 +42,8 @@
     void cursor_image_set_to(mir::graphics::CursorImage const&) override {}
     void orientation_set_to(MirOrientation) override {}
     void client_surface_close_requested() override {}
-    void keymap_changed(xkb_rule_names const&) override {}
+    void keymap_changed(xkb_rule_names const &) override {}
+    void renamed(char const *) override {}
 
 Q_SIGNALS:
     void framesPosted();

=== modified file 'tests/mirserver/QtEventFeeder/qteventfeeder_test.cpp'
--- tests/mirserver/QtEventFeeder/qteventfeeder_test.cpp	2015-02-19 23:03:14 +0000
+++ tests/mirserver/QtEventFeeder/qteventfeeder_test.cpp	2015-04-01 13:50:18 +0000
@@ -15,8 +15,6 @@
  *
  */
 
-#define MIR_INCLUDE_DEPRECATED_EVENT_HEADER
-
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
@@ -26,6 +24,8 @@
 #include <QGuiApplication>
 #include <QWindow>
 
+#include "mir/events/event_builders.h"
+
 #include "mock_qtwindowsystem.h"
 
 using ::testing::_;
@@ -44,6 +44,8 @@
 using ::testing::HasId;
 using ::testing::StateIsMoved;
 
+namespace mev = mir::events;
+
 void PrintTo(const struct QWindowSystemInterface::TouchPoint& touchPoint, ::std::ostream* os) {
     *os << "TouchPoint("
         << "id=" << touchPoint.id
@@ -108,19 +110,10 @@
                                                               Contains(AllOf(HasId(0),
                                                                              IsPressed()))),_)).Times(1);
 
-    MirEvent mirEvent;
-    mirEvent.type = mir_event_type_motion;
-    mirEvent.motion.pointer_count = 1;
-    mirEvent.motion.pointer_coordinates[0].id = 0;
-    mirEvent.motion.pointer_coordinates[0].x = 10;
-    mirEvent.motion.pointer_coordinates[0].y = 10;
-    mirEvent.motion.pointer_coordinates[0].touch_major = 1;
-    mirEvent.motion.pointer_coordinates[0].touch_minor = 1;
-    mirEvent.motion.pointer_coordinates[0].pressure = 10;
-    mirEvent.motion.action = mir_motion_action_down;
-    mirEvent.motion.event_time = 123 * 1000000;
-
-    qtEventFeeder->dispatch(mirEvent);
+    auto ev1 = mev::make_event(MirInputDeviceId(), 123*1000000, 0);
+    mev::add_touch(*ev1, /* touch ID */ 0, mir_touch_action_down, mir_touch_tooltype_unknown,
+                   10, 10, 10, 1, 1, 10);
+    qtEventFeeder->dispatch(*ev1);
 
     ASSERT_TRUE(Mock::VerifyAndClearExpectations(mockWindowSystem));
 
@@ -131,18 +124,10 @@
                                                               Contains(AllOf(HasId(1),IsPressed()))
                                                              ),_)).Times(1);
 
-    mirEvent.type = mir_event_type_motion;
-    mirEvent.motion.pointer_count = 1;
-    mirEvent.motion.pointer_coordinates[0].id = 1;
-    mirEvent.motion.pointer_coordinates[0].x = 20;
-    mirEvent.motion.pointer_coordinates[0].y = 20;
-    mirEvent.motion.pointer_coordinates[0].touch_major = 1;
-    mirEvent.motion.pointer_coordinates[0].touch_minor = 1;
-    mirEvent.motion.pointer_coordinates[0].pressure = 10;
-    mirEvent.motion.action = mir_motion_action_down;
-    mirEvent.motion.event_time = 125 * 1000000;
-
-    qtEventFeeder->dispatch(mirEvent);
+    auto ev2 = mev::make_event(MirInputDeviceId(), 125*1000000, 0);
+    mev::add_touch(*ev2, 1 /* touch ID */, mir_touch_action_down, mir_touch_tooltype_unknown,
+                   10, 10, 10, 1, 1, 10);
+    qtEventFeeder->dispatch(*ev2);
 
     ASSERT_TRUE(Mock::VerifyAndClearExpectations(mockWindowSystem));
 }
@@ -155,19 +140,10 @@
                                                               Contains(AllOf(HasId(0),
                                                                              IsPressed()))),_)).Times(1);
 
-    MirEvent mirEvent;
-    mirEvent.type = mir_event_type_motion;
-    mirEvent.motion.pointer_count = 1;
-    mirEvent.motion.pointer_coordinates[0].id = 0;
-    mirEvent.motion.pointer_coordinates[0].x = 10;
-    mirEvent.motion.pointer_coordinates[0].y = 10;
-    mirEvent.motion.pointer_coordinates[0].touch_major = 1;
-    mirEvent.motion.pointer_coordinates[0].touch_minor = 1;
-    mirEvent.motion.pointer_coordinates[0].pressure = 10;
-    mirEvent.motion.action = mir_motion_action_down;
-    mirEvent.motion.event_time = 123 * 1000000;
-
-    qtEventFeeder->dispatch(mirEvent);
+    auto ev1 = mev::make_event(MirInputDeviceId(), 123*1000000, 0);
+    mev::add_touch(*ev1, /* touch ID */ 0, mir_touch_action_down, mir_touch_tooltype_unknown,
+                   10, 10, 10, 1, 1, 10);
+    qtEventFeeder->dispatch(*ev1);
 
     ASSERT_TRUE(Mock::VerifyAndClearExpectations(mockWindowSystem));
 
@@ -177,18 +153,10 @@
                                                               Contains(AllOf(HasId(0), StateIsMoved()))
                                                              ),_)).Times(1);
 
-    mirEvent.type = mir_event_type_motion;
-    mirEvent.motion.pointer_count = 1;
-    mirEvent.motion.pointer_coordinates[0].id = 0;
-    mirEvent.motion.pointer_coordinates[0].x = 20;
-    mirEvent.motion.pointer_coordinates[0].y = 20;
-    mirEvent.motion.pointer_coordinates[0].touch_major = 1;
-    mirEvent.motion.pointer_coordinates[0].touch_minor = 1;
-    mirEvent.motion.pointer_coordinates[0].pressure = 10;
-    mirEvent.motion.action = mir_motion_action_down;
-    mirEvent.motion.event_time = 125 * 1000000;
-
-    qtEventFeeder->dispatch(mirEvent);
+    auto ev2 = mev::make_event(MirInputDeviceId(), 123*1000000, 0);
+    mev::add_touch(*ev2, /* touch ID */ 0, mir_touch_action_down, mir_touch_tooltype_unknown,
+                   10, 10, 10, 1, 1, 10);
+    qtEventFeeder->dispatch(*ev2);
 
     ASSERT_TRUE(Mock::VerifyAndClearExpectations(mockWindowSystem));
 }

=== modified file 'tests/modules/common/mock_surface.h'
--- tests/modules/common/mock_surface.h	2015-03-27 07:36:51 +0000
+++ tests/modules/common/mock_surface.h	2015-04-01 13:50:18 +0000
@@ -66,7 +66,7 @@
     MOCK_METHOD1(set_reception_mode, void(input::InputReceptionMode mode));
     MOCK_METHOD0(request_client_surface_close, void());
     MOCK_CONST_METHOD1(buffers_ready_for_compositor, int(void const*));
-    void set_keymap(xkb_rule_names const&) override {}
+    void set_keymap(xkb_rule_names const &) override {}
 
     // from mir::input::surface
     MOCK_CONST_METHOD1(input_area_contains, bool(geometry::Point const& point));
@@ -80,6 +80,8 @@
     MOCK_CONST_METHOD0(client_input_fd, int());
     MOCK_METHOD2(configure, int(MirSurfaceAttrib attrib, int value));
     MOCK_CONST_METHOD1(query, int(MirSurfaceAttrib attrib));
+    bool modify(const Modifications &) override { return false; }
+
 
     // from mir::scene::SurfaceBufferAccess
     MOCK_METHOD1(with_most_recent_buffer_do, void(std::function<void(graphics::Buffer&)> const& exec));