Compatibilty with Mir API changes

5 files changed, 17 insertions, 9 deletions

diff --git a/src/modules/Unity/Application/application_manager.cpp b/src/modules/Unity/Application/application_manager.cpp
index 0fb5ad9..7d9bec0 100644
--- a/src/modules/Unity/Application/application_manager.cpp
+++ b/src/modules/Unity/Application/application_manager.cpp
@@ -68,10 +68,12 @@ bool forceAllAppsIntoMainStage(const QSharedPointer<MirServer> &mirServer)
 
     // Obtain display size
     mir::geometry::Rectangles view_area;
-    mirServer->the_display()->for_each_display_buffer(
-        [&view_area](const mir::graphics::DisplayBuffer & db)
-        {
-            view_area.add(db.view_area());
+    mirServer->the_display()->for_each_display_sync_group(
+        [&](mir::graphics::DisplaySyncGroup& group) {
+            group.for_each_display_buffer(
+                [&view_area](const mir::graphics::DisplayBuffer & db) {
+                    view_area.add(db.view_area());
+                });
         });
 
     // Get current Grid Unit value
diff --git a/src/platforms/mirserver/displaywindow.cpp b/src/platforms/mirserver/displaywindow.cpp
index e6f9e2d..07300ce 100644
--- a/src/platforms/mirserver/displaywindow.cpp
+++ b/src/platforms/mirserver/displaywindow.cpp
@@ -101,7 +101,7 @@ bool DisplayWindow::event(QEvent *event)
 void DisplayWindow::swapBuffers()
 {
     m_displayBuffer->gl_swap_buffers();
-    m_displayBuffer->flip();
+//    m_displayBuffer->flip(); TODO check with kdub what's needed
 }
 
 void DisplayWindow::makeCurrent()
diff --git a/src/platforms/mirserver/mirserverintegration.cpp b/src/platforms/mirserver/mirserverintegration.cpp
index 14e7033..476ce94 100644
--- a/src/platforms/mirserver/mirserverintegration.cpp
+++ b/src/platforms/mirserver/mirserverintegration.cpp
@@ -135,10 +135,13 @@ QPlatformWindow *MirServerIntegration::createPlatformWindow(QWindow *window) con
 
     DisplayWindow* displayWindow = nullptr;
 
-    m_mirServer->the_display()->for_each_display_buffer(
+    m_mirServer->the_display()->for_each_display_sync_group(
+                [&](mg::DisplaySyncGroup& group) {
+        group.for_each_display_buffer(
                 [&](mg::DisplayBuffer& buffer) {
-        // FIXME(gerry) this will go very bad for >1 display buffer
-        displayWindow = new DisplayWindow(window, &buffer);
+            // FIXME(gerry) this will go very bad for >1 display buffer
+            displayWindow = new DisplayWindow(window, &buffer);
+        });
     });
 
     if (!displayWindow)
diff --git a/src/platforms/mirserver/mirshell.cpp b/src/platforms/mirserver/mirshell.cpp
index fac7ec3..d2a7eba 100644
--- a/src/platforms/mirserver/mirshell.cpp
+++ b/src/platforms/mirserver/mirshell.cpp
@@ -22,6 +22,7 @@
 #include <mir/scene/session.h>
 #include <mir/scene/surface_creation_parameters.h>
 #include <mir/shell/display_layout.h>
+#include <mir/shell/null_window_manager.h>
 
 namespace ms = mir::scene;
 using mir::shell::AbstractShell;
@@ -32,7 +33,8 @@ MirShell::MirShell(
     const std::shared_ptr<mir::scene::SessionCoordinator> &sessionCoordinator,
     const std::shared_ptr<mir::scene::PromptSessionManager> &promptSessionManager,
     const std::shared_ptr<mir::shell::DisplayLayout> &displayLayout) :
-    AbstractShell(inputTargeter, surfaceCoordinator, sessionCoordinator, promptSessionManager),
+    AbstractShell(inputTargeter, surfaceCoordinator, sessionCoordinator, promptSessionManager,
+        [](mir::shell::FocusController*) { return std::make_shared<mir::shell::NullWindowManager>(); }),
     m_displayLayout{displayLayout}
 {
     qCDebug(QTMIR_MIR_MESSAGES) << "MirShell::MirShell";
diff --git a/src/platforms/mirserver/surfaceobserver.h b/src/platforms/mirserver/surfaceobserver.h
index db90765..1f491be 100644
--- a/src/platforms/mirserver/surfaceobserver.h
+++ b/src/platforms/mirserver/surfaceobserver.h
@@ -42,6 +42,7 @@ public:
     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 {}
 
 Q_SIGNALS:
     void framesPosted();