Merge lp:~gerboland/miral/focus-on-click into lp:miral

[Gerry Boland]

[miral-qt] Implement focus-on-click window management policy

[Alan Griffiths (alan-griffiths)]

+ std::shared_ptr<mir::scene::Surface> surface;

I'm not totally happy about holding a strong pointer (I've a slight preference for a wrapper that noops when appropriate). But I can't think of an actual problem.

As this code uses libmiral APIs it needs revisiting later anyway.

review: Approve

=== modified file 'miral-qt/src/common/windowmodelnotifierinterface.h'
--- miral-qt/src/common/windowmodelnotifierinterface.h	2016-08-24 12:40:48 +0000
+++ miral-qt/src/common/windowmodelnotifierinterface.h	2016-09-01 12:11:43 +0000
@@ -42,6 +42,7 @@
       , minHeight(windowInfo.min_height())
       , maxWidth(windowInfo.max_width())
       , maxHeight(windowInfo.max_height())
+      , surface(window)
     {}
 
     miral::Window window;
@@ -55,6 +56,10 @@
     mir::geometry::Height minHeight;
     mir::geometry::Width maxWidth;
     mir::geometry::Height maxHeight;
+
+    // hold copy of Surface shared pointer, as miral::Window has just a weak pointer to the Surface
+    // but MirSurface needs to share ownership of the Surface with Mir
+    std::shared_ptr<mir::scene::Surface> surface;
 };
 
 
 
=== modified file 'miral-qt/src/modules/Unity/Application/mirsurface.cpp'
--- miral-qt/src/modules/Unity/Application/mirsurface.cpp	2016-08-22 16:06:32 +0000
+++ miral-qt/src/modules/Unity/Application/mirsurface.cpp	2016-09-01 12:11:43 +0000
@@ -212,9 +212,8 @@
 {
     DEBUG_MSG << "()";
 
-    const auto &surface = static_cast<std::shared_ptr<mir::scene::Surface>>(windowInfo.window);
-    SurfaceObserver::registerObserverForSurface(m_surfaceObserver.get(), surface.get());
-    surface->add_observer(m_surfaceObserver);
+    SurfaceObserver::registerObserverForSurface(m_surfaceObserver.get(), windowInfo.surface.get());
+    m_windowInfo.surface->add_observer(m_surfaceObserver);
 
     //m_shellChrome = creationHints.shellChrome; TODO - where will this come from now?
 
@@ -259,8 +258,7 @@
     Q_ASSERT(m_views.isEmpty());
 
     QMutexLocker locker(&m_mutex);
-//    auto const &window = static_cast<std::shared_ptr<mir::scene::Surface>>(m_windowInfo.window);
-//    window->remove_observer(m_surfaceObserver); // FIXME - window null at this stage!
+    m_windowInfo.surface->remove_observer(m_surfaceObserver);
 
     delete m_closeTimer;
 
@@ -341,8 +339,7 @@
 
     const void* const userId = (void*)123;  // TODO: Multimonitor support
 
-    auto const &window = static_cast<std::shared_ptr<mir::scene::Surface>>(m_windowInfo.window);
-    int framesPending = window->buffers_ready_for_compositor(userId);
+    const int framesPending = m_windowInfo.surface->buffers_ready_for_compositor(userId);
     if (framesPending > 0) {
         m_textureUpdated = false;
 
@@ -403,11 +400,10 @@
     }
 
     const void* const userId = (void*)123;
-    auto const &window = static_cast<std::shared_ptr<mir::scene::Surface>>(m_windowInfo.window);
-    auto renderables = window->generate_renderables(userId);
+    auto renderables = m_windowInfo.surface->generate_renderables(userId);
 
     if (renderables.size() > 0 &&
-            (window->buffers_ready_for_compositor(userId) > 0 || !texture->hasBuffer())
+            (m_windowInfo.surface->buffers_ready_for_compositor(userId) > 0 || !texture->hasBuffer())
         ) {
         // Avoid holding two buffers for the compositor at the same time. Thus free the current
         // before acquiring the next
@@ -423,7 +419,7 @@
         m_textureUpdated = true;
     }
 
-    if (window->buffers_ready_for_compositor(userId) > 0) {
+    if (m_windowInfo.surface->buffers_ready_for_compositor(userId) > 0) {
         // restart the frame dropper to give MirSurfaceItems enough time to render the next frame.
         // queued since the timer lives in a different thread
         QMetaObject::invokeMethod(&m_frameDropperTimer, "start", Qt::QueuedConnection);
@@ -442,8 +438,7 @@
 {
     QMutexLocker locker(&m_mutex);
     const void* const userId = (void*)123;
-    auto const &window = static_cast<std::shared_ptr<mir::scene::Surface>>(m_windowInfo.window);
-    return window->buffers_ready_for_compositor(userId);
+    return m_windowInfo.surface->buffers_ready_for_compositor(userId);
 }
 
 void MirSurface::setFocused(bool value)
@@ -508,8 +503,7 @@
     m_closeTimer->start();
 
     if (m_windowInfo.window) {
-        auto const &window = static_cast<std::shared_ptr<mir::scene::Surface>>(m_windowInfo.window);
-        window->request_client_surface_close();
+        m_windowInfo.surface->request_client_surface_close();
     }
 }
 
@@ -615,8 +609,7 @@
     }
 
     if (m_windowInfo.window) {
-        auto const &window = static_cast<std::shared_ptr<mir::scene::Surface>>(m_windowInfo.window);
-        window->set_orientation(mirOrientation);
+        m_windowInfo.surface->set_orientation(mirOrientation);
     }
 
     Q_EMIT orientationAngleChanged(angle);
@@ -907,9 +900,7 @@
         return;
     }
 
-    auto const &window = static_cast<std::shared_ptr<mir::scene::Surface>>(m_windowInfo.window);
-
-    window->set_keymap(MirInputDeviceId(), "", layout.toStdString(), variant.toStdString(), "");
+    m_windowInfo.surface->set_keymap(MirInputDeviceId(), "", layout.toStdString(), variant.toStdString(), "");
 }
 
 QCursor MirSurface::cursor() const
 
=== modified file 'miral-qt/src/modules/Unity/Application/windowmodel.cpp'
--- miral-qt/src/modules/Unity/Application/windowmodel.cpp	2016-08-25 10:20:56 +0000
+++ miral-qt/src/modules/Unity/Application/windowmodel.cpp	2016-09-01 12:11:43 +0000
@@ -53,13 +53,13 @@
 
 void WindowModel::connectToWindowModelNotifier(WindowModelNotifierInterface *notifier)
 {
-    connect(notifier, &WindowModelNotifierInterface::windowAdded,       this, &WindowModel::onWindowAdded);
-    connect(notifier, &WindowModelNotifierInterface::windowRemoved,     this, &WindowModel::onWindowRemoved);
-    connect(notifier, &WindowModelNotifierInterface::windowMoved,       this, &WindowModel::onWindowMoved);
-    connect(notifier, &WindowModelNotifierInterface::windowResized,     this, &WindowModel::onWindowResized);
-    connect(notifier, &WindowModelNotifierInterface::windowFocused,     this, &WindowModel::onWindowFocused);
-    connect(notifier, &WindowModelNotifierInterface::windowInfoChanged, this, &WindowModel::onWindowInfoChanged);
-    connect(notifier, &WindowModelNotifierInterface::windowsRaised,     this, &WindowModel::onWindowsRaised);
+    connect(notifier, &WindowModelNotifierInterface::windowAdded,       this, &WindowModel::onWindowAdded,       Qt::QueuedConnection);
+    connect(notifier, &WindowModelNotifierInterface::windowRemoved,     this, &WindowModel::onWindowRemoved,     Qt::QueuedConnection);
+    connect(notifier, &WindowModelNotifierInterface::windowMoved,       this, &WindowModel::onWindowMoved,       Qt::QueuedConnection);
+    connect(notifier, &WindowModelNotifierInterface::windowResized,     this, &WindowModel::onWindowResized,     Qt::QueuedConnection);
+    connect(notifier, &WindowModelNotifierInterface::windowFocused,     this, &WindowModel::onWindowFocused,     Qt::QueuedConnection);
+    connect(notifier, &WindowModelNotifierInterface::windowInfoChanged, this, &WindowModel::onWindowInfoChanged, Qt::QueuedConnection);
+    connect(notifier, &WindowModelNotifierInterface::windowsRaised,     this, &WindowModel::onWindowsRaised,     Qt::QueuedConnection);
 }
 
 QHash<int, QByteArray> WindowModel::roleNames() const
 
=== modified file 'miral-qt/src/platforms/mirserver/windowmanagementpolicy.cpp'
--- miral-qt/src/platforms/mirserver/windowmanagementpolicy.cpp	2016-08-17 16:18:17 +0000
+++ miral-qt/src/platforms/mirserver/windowmanagementpolicy.cpp	2016-09-01 12:11:43 +0000
@@ -178,9 +178,12 @@
 void WindowManagementPolicy::deliver_pointer_event(const MirPointerEvent *event,
                                                    const miral::Window &window)
 {
-    m_tools.invoke_under_lock([&window, this]() {
-        m_tools.select_active_window(window);
-    });
+    // Prevent mouse hover events causing window focus to change
+    if (mir_pointer_event_action(event) == mir_pointer_action_button_down) {
+        m_tools.invoke_under_lock([&window, this]() {
+            m_tools.select_active_window(window);
+        });
+    }
     auto e = reinterpret_cast<MirEvent const*>(event); // naughty
 
     if (auto surface = std::weak_ptr<mir::scene::Surface>(window).lock()) {