Merge lp:~dandrader/qtmir/controlMirCursor into lp:qtmir

[Andreas Pokorny]

WIP

No request for review yet. Just an integration test to make use of the new mir nested cursor mode.

Unmerged revisions

550. By Daniel d'Andrada on 2016-08-30

WIP

=== modified file 'src/platforms/mirserver/miropenglcontext.cpp'
--- src/platforms/mirserver/miropenglcontext.cpp	2016-06-07 19:30:06 +0000
+++ src/platforms/mirserver/miropenglcontext.cpp	2016-09-12 09:40:37 +0000
@@ -29,7 +29,19 @@
 
 // Mir
 #include <mir/graphics/display.h>
-#include <mir/graphics/gl_context.h>
+#include <mir/renderer/gl/context.h>
+#include <mir/renderer/gl/context_source.h>
+
+namespace
+{
+auto as_context_source(mir::graphics::Display* display)
+{
+    auto const ctx = dynamic_cast<mir::renderer::gl::ContextSource*>(display->native_display());
+    if (!ctx)
+        throw std::logic_error("Display does not support GL rendering");
+    return ctx;
+}
+}
 
 // Qt supports one GL context per screen, but also shared contexts.
 // The Mir "Display" generates a shared GL context for all DisplayBuffers
@@ -45,7 +57,7 @@
 #endif
 {
     // create a temporary GL context to fetch the EGL display and config, so Qt can determine the surface format
-    std::unique_ptr<mir::graphics::GLContext> mirContext = display.create_gl_context();
+    std::unique_ptr<mir::renderer::gl::Context> mirContext = as_context_source(&display)->create_gl_context();
     mirContext->make_current();
 
     EGLDisplay eglDisplay = eglGetCurrentDisplay();

=== modified file 'src/platforms/mirserver/mirserver.cpp'
--- src/platforms/mirserver/mirserver.cpp	2016-05-19 13:45:08 +0000
+++ src/platforms/mirserver/mirserver.cpp	2016-09-12 09:40:37 +0000
@@ -42,16 +42,27 @@
 
 // mir
 #include <mir/graphics/cursor.h>
+#include <mir/input/cursor_listener.h>
 
 namespace mg = mir::graphics;
 namespace mo  = mir::options;
 namespace msh = mir::shell;
 namespace ms = mir::scene;
 
+/*
 namespace
 {
+
 void usingHiddenCursor(mir::Server& server);
+
+class NullCursorListener : public mir::input::CursorListener
+{
+public:
+    void cursor_moved_to(float, float) override {}
+};
+
 }
+*/
 
 MirServer::MirServer(int &argc, char **argv,
                      const QSharedPointer<ScreensModel> &screensModel, QObject* parent)
@@ -89,10 +100,12 @@
             return std::make_shared<QtCompositor>();
         });
 
+    /*
     override_the_cursor_images([]
         {
             return std::make_shared<qtmir::MirCursorImages>();
         });
+    */
 
     override_the_input_dispatcher([&screensModel]
         {
@@ -118,6 +131,13 @@
             return windowManager;
         });
 
+    /*
+    wrap_cursor_listener([](const std::shared_ptr<mir::input::CursorListener> &)
+        {
+            return std::make_shared<NullCursorListener>();
+        });
+    */
+
     wrap_display_configuration_policy(
         [](const std::shared_ptr<mg::DisplayConfigurationPolicy> &wrapped)
             -> std::shared_ptr<mg::DisplayConfigurationPolicy>
@@ -135,7 +155,7 @@
         screensModel->init(the_display(), the_compositor());
     });
 
-    usingHiddenCursor(*this);
+    //usingHiddenCursor(*this);
 
     try {
         apply_settings();
@@ -144,6 +164,8 @@
         exit(1);
     }
 
+    the_cursor()->show();
+
     if (!unknownArgsFound) { // mir parsed all the arguments, so edit argv to pretend to have just argv[0]
         argc = 1;
     }
@@ -210,14 +232,15 @@
     return m_windowManager.lock().get();
 }
 
+#if 0
 namespace
 {
 struct HiddenCursorWrapper : mg::Cursor
 {
     HiddenCursorWrapper(std::shared_ptr<mg::Cursor> const& wrapped) :
-        wrapped{wrapped} { wrapped->hide(); }
-    void show() override { }
-    void show(mg::CursorImage const&) override { }
+        wrapped{wrapped} { /*wrapped->hide();*/ }
+    void show() override { wrapped->show(); }
+    void show(mg::CursorImage const& img) override { wrapped->show(img); }
     void hide() override { wrapped->hide(); }
 
     void move_to(mir::geometry::Point position) override { wrapped->move_to(position); }
@@ -232,3 +255,4 @@
         { return std::make_shared<HiddenCursorWrapper>(wrapped); });
 };
 }
+#endif

=== modified file 'src/platforms/mirserver/offscreensurface.cpp'
--- src/platforms/mirserver/offscreensurface.cpp	2016-05-05 15:12:09 +0000
+++ src/platforms/mirserver/offscreensurface.cpp	2016-09-12 09:40:37 +0000
@@ -18,7 +18,6 @@
 
 // Mir
 #include <mir/graphics/display.h>
-#include <mir/graphics/gl_context.h>
 
 //Qt
 #include <QOffscreenSurface>