Merge lp:~andreas-pokorny/qtmir/controlMirCursor-and-more into lp:qtmir

[Andreas Pokorny]

WIP

mp needed for integration silo

[lp:~andreas-pokorny/qtmir/controlMirCursor-and-more]

552. By Andreas Pokorny on 2016-09-13

update of qtmir

553. By Andreas Pokorny on 2016-09-13

changelog update

554. By Andreas Pokorny on 2016-09-14

forward qtmir cursor position to the nested cursor

555. By Andreas Pokorny on 2016-09-15

Feed cursor position directly into WindowSystemInterface

Unmerged revisions

555. By Andreas Pokorny on 2016-09-15

Feed cursor position directly into WindowSystemInterface

554. By Andreas Pokorny on 2016-09-14

forward qtmir cursor position to the nested cursor

553. By Andreas Pokorny on 2016-09-13

changelog update

552. By Andreas Pokorny on 2016-09-13

update of qtmir

551. By Andreas Pokorny on 2016-09-13

update to upcoming lp:mir interfaces

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

WIP

=== modified file 'debian/changelog'
--- debian/changelog	2016-09-06 18:31:27 +0000
+++ debian/changelog	2016-09-15 07:26:35 +0000
@@ -1,3 +1,9 @@
+qtmir (0.4.8+16.10.20160906-0ubuntu2) UNRELEASED; urgency=medium
+
+  * updates for nested cursor
+
+ -- Andreas Pokorny <[e-mail]>  Tue, 13 Sep 2016 20:38:14 +0200
+
 qtmir (0.4.8+16.10.20160906-0ubuntu1) yakkety; urgency=medium
 
   [ Daniel d'Andrada ]

=== modified file 'src/platforms/mirserver/cursor.cpp'
--- src/platforms/mirserver/cursor.cpp	2016-08-08 13:10:40 +0000
+++ src/platforms/mirserver/cursor.cpp	2016-09-15 07:26:35 +0000
@@ -22,10 +22,12 @@
 
 // Unity API
 #include <unity/shell/application/MirMousePointerInterface.h>
+#include <qpa/qwindowsysteminterface.h>
 
 using namespace qtmir;
 
-Cursor::Cursor()
+Cursor::Cursor(std::shared_ptr<mir::graphics::Cursor> const& cursor)
+    : m_cursor{cursor}, m_cursorPosition{50.0f, 80.0f}
 {
     m_shapeToCursorName[Qt::ArrowCursor] = QStringLiteral("left_ptr");
     m_shapeToCursorName[Qt::UpArrowCursor] = QStringLiteral("up_arrow");
@@ -55,6 +57,7 @@
 
 void Cursor::changeCursor(QCursor *windowCursor, QWindow * /*window*/)
 {
+    // TODO forward cursor..
     if (m_mousePointer.isNull()) {
         return;
     }
@@ -101,6 +104,13 @@
 bool Cursor::handleMouseEvent(ulong timestamp, QPointF movement, Qt::MouseButtons buttons,
         Qt::KeyboardModifiers modifiers)
 {
+    m_cursorPosition += movement;
+    // make movement decisions here and emit events as needed ..
+    m_cursor->move_to(mir::geometry::Point{int(m_cursorPosition.x()), int(m_cursorPosition.y())});
+    QWindowSystemInterface::handleMouseEvent(NULL, timestamp, m_cursorPosition, m_cursorPosition,
+        buttons, modifiers);
+    return true;
+#if 0
     QMutexLocker locker(&m_mutex);
 
     if (!m_mousePointer || !m_mousePointer->isVisible()) {
@@ -119,10 +129,15 @@
     }
 
     return ok;
+#endif
 }
 
 bool Cursor::handleWheelEvent(ulong timestamp, QPoint angleDelta, Qt::KeyboardModifiers modifiers)
 {
+    QWindowSystemInterface::handleWheelEvent(0, timestamp, m_cursorPosition, m_cursorPosition,
+            QPoint() /* pixelDelta */, angleDelta, modifiers, Qt::ScrollUpdate);
+    return true;
+#if 0
     QMutexLocker locker(&m_mutex);
 
     if (!m_mousePointer || !m_mousePointer->isVisible()) {
@@ -140,10 +155,13 @@
     }
 
     return ok;
+#endif
 }
 
 void Cursor::setPos(const QPoint &pos)
 {
+    m_cursor->move_to(mir::geometry::Point{pos.x(), pos.y()});
+    return;
     if (!m_mousePointer) {
         QPlatformCursor::setPos(pos);
         return;
@@ -155,7 +173,7 @@
     movement.setX(pos.x() - mouseScenePos.x());
     movement.setY(pos.y() - mouseScenePos.y());
 
-    m_mousePointer->handleMouseEvent(0 /*timestamp*/, movement, Qt::NoButton, Qt::NoModifier);
+    //m_mousePointer->handleMouseEvent(0 /*timestamp*/, movement, Qt::NoButton, Qt::NoModifier);
 }
 
 QPoint Cursor::pos() const

=== modified file 'src/platforms/mirserver/cursor.h'
--- src/platforms/mirserver/cursor.h	2016-06-06 19:25:20 +0000
+++ src/platforms/mirserver/cursor.h	2016-09-15 07:26:35 +0000
@@ -20,6 +20,7 @@
 
 #include <QMutex>
 #include <QPointer>
+#include <mir/graphics/cursor.h>
 
 // Unity API
 #include <unity/shell/application/MirPlatformCursor.h>
@@ -30,7 +31,7 @@
 {
     Q_OBJECT
 public:
-    Cursor();
+    Cursor(std::shared_ptr<mir::graphics::Cursor> const& cursor);
 
     // Called form Mir input thread
     bool handleMouseEvent(ulong timestamp, QPointF movement, Qt::MouseButtons buttons,
@@ -59,8 +60,10 @@
     QMutex m_mutex;
     QPointer<MirMousePointerInterface> m_mousePointer;
     QMap<int,QString> m_shapeToCursorName;
+    std::shared_ptr<mir::graphics::Cursor> const m_cursor;
     QString m_qtCursorName;
     QString m_mirCursorName;
+    QPointF m_cursorPosition;
 };
 
 } // namespace qtmir

=== 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-15 07:26:35 +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-15 07:26:35 +0000
@@ -42,6 +42,7 @@
 
 // mir
 #include <mir/graphics/cursor.h>
+#include <mir/input/cursor_listener.h>
 
 namespace mg = mir::graphics;
 namespace mo  = mir::options;
@@ -50,7 +51,12 @@
 
 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,
@@ -89,10 +95,12 @@
             return std::make_shared<QtCompositor>();
         });
 
+    /*
     override_the_cursor_images([]
         {
             return std::make_shared<qtmir::MirCursorImages>();
         });
+    */
 
     override_the_input_dispatcher([&screensModel]
         {
@@ -118,6 +126,11 @@
             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>
@@ -132,11 +145,9 @@
         });
 
     add_init_callback([this, &screensModel] {
-        screensModel->init(the_display(), the_compositor());
+        screensModel->init(the_display(), the_compositor(), the_cursor());
     });
 
-    usingHiddenCursor(*this);
-
     try {
         apply_settings();
     } catch (const std::exception &ex) {
@@ -144,6 +155,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,25 +223,3 @@
     return m_windowManager.lock().get();
 }
 
-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 { }
-    void hide() override { wrapped->hide(); }
-
-    void move_to(mir::geometry::Point position) override { wrapped->move_to(position); }
-
-private:
-    std::shared_ptr<mg::Cursor> const wrapped;
-};
-
-void usingHiddenCursor(mir::Server& server)
-{
-    server.wrap_cursor([&](std::shared_ptr<mg::Cursor> const& wrapped)
-        { return std::make_shared<HiddenCursorWrapper>(wrapped); });
-};
-}

=== modified file 'src/platforms/mirserver/mirserverstatuslistener.cpp'
--- src/platforms/mirserver/mirserverstatuslistener.cpp	2015-08-11 12:08:32 +0000
+++ src/platforms/mirserver/mirserverstatuslistener.cpp	2016-09-15 07:26:35 +0000
@@ -35,3 +35,11 @@
 void MirServerStatusListener::started()
 {
 }
+
+void MirServerStatusListener::ready_for_user_input()
+{
+}
+
+void MirServerStatusListener::stop_receiving_input()
+{
+}

=== modified file 'src/platforms/mirserver/mirserverstatuslistener.h'
--- src/platforms/mirserver/mirserverstatuslistener.h	2015-08-11 12:08:32 +0000
+++ src/platforms/mirserver/mirserverstatuslistener.h	2016-09-15 07:26:35 +0000
@@ -25,6 +25,8 @@
     void paused() override;
     void resumed() override;
     void started() override;
+    void ready_for_user_input() override;
+    void stop_receiving_input() override;
 };
 
 #endif // MIRSERVERSTATUSLISTENER_H

=== 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-15 07:26:35 +0000
@@ -18,7 +18,6 @@
 
 // Mir
 #include <mir/graphics/display.h>
-#include <mir/graphics/gl_context.h>
 
 //Qt
 #include <QOffscreenSurface>

=== modified file 'src/platforms/mirserver/screen.cpp'
--- src/platforms/mirserver/screen.cpp	2016-08-16 11:04:25 +0000
+++ src/platforms/mirserver/screen.cpp	2016-09-15 07:26:35 +0000
@@ -138,7 +138,7 @@
 
 bool Screen::skipDBusRegistration = false;
 
-Screen::Screen(const mir::graphics::DisplayConfigurationOutput &screen)
+Screen::Screen(const mir::graphics::DisplayConfigurationOutput &screen, std::shared_ptr<mir::graphics::Cursor> const& cursor)
     : QObject(nullptr)
     , m_refreshRate(-1.0)
     , m_scale(1.0)
@@ -148,6 +148,7 @@
     , m_orientationSensor(new QOrientationSensor(this))
     , m_screenWindow(nullptr)
     , m_unityScreen(nullptr)
+    , m_cursor{cursor}
 {
     setMirDisplayConfiguration(screen, false);
 

=== modified file 'src/platforms/mirserver/screen.h'
--- src/platforms/mirserver/screen.h	2016-04-29 15:41:00 +0000
+++ src/platforms/mirserver/screen.h	2016-09-15 07:26:35 +0000
@@ -25,6 +25,7 @@
 
 // Mir
 #include <mir/graphics/display_configuration.h>
+#include <mir/graphics/cursor.h>
 
 // local
 #include "cursor.h"
@@ -40,7 +41,7 @@
 {
     Q_OBJECT
 public:
-    Screen(const mir::graphics::DisplayConfigurationOutput &);
+    Screen(const mir::graphics::DisplayConfigurationOutput &, std::shared_ptr<mir::graphics::Cursor> const& cursor);
     ~Screen();
 
     // QPlatformScreen methods.

=== modified file 'src/platforms/mirserver/screensmodel.cpp'
--- src/platforms/mirserver/screensmodel.cpp	2016-06-06 19:25:20 +0000
+++ src/platforms/mirserver/screensmodel.cpp	2016-09-15 07:26:35 +0000
@@ -47,10 +47,12 @@
 
 // init only after MirServer has initialized - runs on MirServerThread!!!
 void ScreensModel::init(const std::shared_ptr<mir::graphics::Display> &display,
-                        const std::shared_ptr<mir::compositor::Compositor> &compositor)
+                        const std::shared_ptr<mir::compositor::Compositor> &compositor,
+                        const std::shared_ptr<mir::graphics::Cursor> &cursor)
 {
     m_display = display;
     m_compositor = compositor;
+    m_cursor = cursor;
 
     // Use a Blocking Queued Connection to enforce synchronization of Qt GUI thread with Mir thread(s)
     // on compositor shutdown. Compositor startup can be lazy.
@@ -227,7 +229,7 @@
 
 Screen* ScreensModel::createScreen(const mg::DisplayConfigurationOutput &output) const
 {
-    return new Screen(output);
+    return new Screen(output, m_cursor);
 }
 
 Screen* ScreensModel::findScreenWithId(const QList<Screen *> &list, const mg::DisplayConfigurationOutputId id)

=== modified file 'src/platforms/mirserver/screensmodel.h'
--- src/platforms/mirserver/screensmodel.h	2016-06-06 19:25:20 +0000
+++ src/platforms/mirserver/screensmodel.h	2016-09-15 07:26:35 +0000
@@ -27,7 +27,7 @@
 #include <memory>
 
 namespace mir {
-    namespace graphics { class Display; }
+    namespace graphics { class Display; class Cursor;}
     namespace compositor { class Compositor; }
 }
 class Screen;
@@ -74,7 +74,8 @@
 public:
     // called by MirServer
     void init(const std::shared_ptr<mir::graphics::Display> &display,
-              const std::shared_ptr<mir::compositor::Compositor> &compositor);
+              const std::shared_ptr<mir::compositor::Compositor> &compositor,
+              const std::shared_ptr<mir::graphics::Cursor> &cursor);
     void terminate();
 
     // override for testing purposes
@@ -91,6 +92,7 @@
 
     std::weak_ptr<mir::graphics::Display> m_display;
     std::shared_ptr<mir::compositor::Compositor> m_compositor;
+    std::shared_ptr<mir::graphics::Cursor> m_cursor;
     QList<Screen*> m_screenList;
     bool m_compositing;
 };

=== modified file 'tests/framework/fake_displayconfigurationoutput.h'
--- tests/framework/fake_displayconfigurationoutput.h	2015-11-11 10:43:36 +0000
+++ tests/framework/fake_displayconfigurationoutput.h	2016-09-15 07:26:35 +0000
@@ -45,7 +45,10 @@
     mir_power_mode_on,
     mir_orientation_normal,
     1.0f,
-    mir_form_factor_unknown
+    mir_form_factor_unknown,
+    mir_subpixel_arrangement_horizontal_rgb,
+    mg::GammaCurves(),
+    mir_output_gamma_supported
 };
 
 const mg::DisplayConfigurationOutput fakeOutput2
@@ -71,7 +74,10 @@
     mir_power_mode_on,
     mir_orientation_left,
     1.0f,
-    mir_form_factor_unknown
+    mir_form_factor_unknown,
+    mir_subpixel_arrangement_horizontal_rgb,
+    mg::GammaCurves(),
+    mir_output_gamma_supported
 };
 
 #endif // FAKE_DISPLAYCONFIGURATIONOUTPUT_H

=== modified file 'tests/framework/mock_display.h'
--- tests/framework/mock_display.h	2016-02-19 10:41:15 +0000
+++ tests/framework/mock_display.h	2016-09-15 07:26:35 +0000
@@ -18,7 +18,7 @@
 #define MOCKDISPLAY_H
 
 #include <mir/graphics/display.h>
-#include <mir/graphics/gl_context.h>
+//#include <mir/renderer/gl/context.h>
 #include <mir/version.h>
 
 #if MIR_SERVER_VERSION >= MIR_VERSION_NUMBER(0, 20, 0)
@@ -56,11 +56,13 @@
     MOCK_METHOD0(pause, void());
     MOCK_METHOD0(resume, void());
     MOCK_METHOD1(create_hardware_cursor, std::shared_ptr<mir::graphics::Cursor>(std::shared_ptr<mir::graphics::CursorImage> const&));
-    MOCK_METHOD0(create_gl_context, std::unique_ptr<mir::graphics::GLContext>());
 
 #if MIR_SERVER_VERSION >= MIR_VERSION_NUMBER(0, 20, 0)
     MOCK_METHOD2(create_virtual_output, std::unique_ptr<mir::graphics::VirtualOutput> (int width, int height));
 #endif
+#if MIR_SERVER_VERSION >= MIR_VERSION_NUMBER(0, 25, 0)
+    MOCK_METHOD0(native_display, mir::graphics::NativeDisplay*());
+#endif
 };
 
 #endif // MOCKDISPLAY_H

=== modified file 'tests/mirserver/Screen/screen_test.cpp'
--- tests/mirserver/Screen/screen_test.cpp	2016-02-15 16:02:18 +0000
+++ tests/mirserver/Screen/screen_test.cpp	2016-09-15 07:26:35 +0000
@@ -44,7 +44,7 @@
 
 TEST_F(ScreenTest, OrientationSensorForExternalDisplay)
 {
-    Screen *screen = new Screen(fakeOutput1); // is external display (dvi)
+    Screen *screen = new Screen(fakeOutput1, nullptr); // is external display (dvi)
 
     // Default state should be disabled
     ASSERT_FALSE(screen->orientationSensorEnabled());
@@ -58,7 +58,7 @@
 
 TEST_F(ScreenTest, OrientationSensorForInternalDisplay)
 {
-    Screen *screen = new Screen(fakeOutput2); // is internal display
+    Screen *screen = new Screen(fakeOutput2, nullptr); // is internal display
 
     // Default state should be active
     ASSERT_TRUE(screen->orientationSensorEnabled());
@@ -72,7 +72,7 @@
 
 TEST_F(ScreenTest, ReadConfigurationFromDisplayConfig)
 {
-    Screen *screen = new Screen(fakeOutput1);
+    Screen *screen = new Screen(fakeOutput1, nullptr);
 
     EXPECT_EQ(screen->geometry(), QRect(0, 0, 150, 200));
     EXPECT_EQ(screen->availableGeometry(), QRect(0, 0, 150, 200));
@@ -85,7 +85,7 @@
 
 TEST_F(ScreenTest, ReadDifferentConfigurationFromDisplayConfig)
 {
-    Screen *screen = new Screen(fakeOutput2);
+    Screen *screen = new Screen(fakeOutput2, nullptr);
 
     EXPECT_EQ(screen->geometry(), QRect(500, 600, 1500, 2000));
     EXPECT_EQ(screen->availableGeometry(), QRect(500, 600, 1500, 2000));

=== modified file 'tests/mirserver/ScreensModel/stub_screen.h'
--- tests/mirserver/ScreensModel/stub_screen.h	2015-08-20 10:16:54 +0000
+++ tests/mirserver/ScreensModel/stub_screen.h	2016-09-15 07:26:35 +0000
@@ -23,7 +23,7 @@
 {
     Q_OBJECT
 public:
-    StubScreen(const mir::graphics::DisplayConfigurationOutput &output) : Screen(output) {}
+    StubScreen(const mir::graphics::DisplayConfigurationOutput &output) : Screen(output, nullptr) {}
 
     void makeCurrent() { Screen::makeCurrent(); }
 };

=== modified file 'tests/mirserver/ScreensModel/testable_screensmodel.h'
--- tests/mirserver/ScreensModel/testable_screensmodel.h	2016-04-29 15:41:00 +0000
+++ tests/mirserver/ScreensModel/testable_screensmodel.h	2016-09-15 07:26:35 +0000
@@ -30,7 +30,7 @@
     void do_init(const std::shared_ptr<mir::graphics::Display> &display,
                  const std::shared_ptr<mir::compositor::Compositor> &compositor)
     {
-        init(display, compositor);
+        init(display, compositor, nullptr);
     }
 
     void do_terminate() { terminate(); }