Merge lp:~albaguirre/qtubuntu/more-new-mir-apis into lp:qtubuntu

[Alberto Aguirre]

Remove more uses of deprecated mir apis.

- Use proper extension for translating window coordinates
- Use a window spec to apply a cursor name to a window.

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:380
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-ci/175/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4040
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4068
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3909
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/3909/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3909
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/3909/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3909
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/3909/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3909
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/3909/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3909
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/3909/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3909
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/3909/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-ci/175/rebuild

review: Approve (continuous-integration)

[Daniel d'Andrada (dandrader)]

Code makes sense, but it breaks the cursor. Ie, it no longer changes shape. Maybe it needs changes also on the qtmir side to match?

To test:
$ bzr branch lp:~dandrader/+junk/animatedDemos
$ cd animatedDemos/CustomCursor
$ qmake && make
$ cd ..
$ qmlscene CursorShapes.qml -I . -- --desktop_file_hint=/usr/share/applications/gedit.desktop

Currently there's a problem somewhere (didn't investigate yet) that several of the named cursors are not working anymore. But still, the following ones still work:
UpArrow, Cross, WhatsThis, DragCopy, Busy, DragMove, DragLink.
The big boat an football ball custom cursors should also be set and unset as expected

With this patch, no named cursor work anymore. Also once you hover over the big football ball, it never goes back to the arrow cursor.

review: Needs Fixing

[Daniel d'Andrada (dandrader)]

For reference, it's bug 1662827

[Alberto Aguirre (albaguirre)]

@Daniel, yeah probably a new codepath needed in qtmir.

Cursor name changes work (with this branch) when I connect directly to a mir_demo_server instance.

[Daniel d'Andrada (dandrader)]

> @Daniel, yeah probably a new codepath needed in qtmir.

Will check the qtmir part.

[Daniel d'Andrada (dandrader)]

> > @Daniel, yeah probably a new codepath needed in qtmir.
>
> Will check the qtmir part.

alan_g said this actually might be a bug in mir: https://bugs.launchpad.net/mir/+bug/1663197

[Daniel d'Andrada (dandrader)]

We should be able to merge it now that the fix for bug 1663197 has been released. Unfortunately this branch now conflicts with latest trunk.

"""
$ bzr merge lp:~albaguirre/qtubuntu/more-new-mir-apis
Not attempting to fix packaging branch ancestry, missing pristine tar data for version 0.63+17.04.20170119.2.
 M src/ubuntumirclient/qmirclientcursor.cpp
 M src/ubuntumirclient/qmirclientdebugextension.cpp
 M src/ubuntumirclient/qmirclientdebugextension.h
 M src/ubuntumirclient/qmirclientintegration.cpp
 M src/ubuntumirclient/qmirclientwindow.cpp
Text conflict in src/ubuntumirclient/qmirclientcursor.cpp
Text conflict in src/ubuntumirclient/qmirclientdebugextension.cpp
Text conflict in src/ubuntumirclient/qmirclientdebugextension.h
Text conflict in src/ubuntumirclient/qmirclientwindow.cpp ...

review: Needs Fixing

[Unity8 CI Bot (unity8-ci-bot)]

PASSED: Continuous integration, rev:381
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-ci/188/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/4160
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/4188
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4026
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/4026/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4026
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=zesty/4026/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4026
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/4026/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4026
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=zesty/4026/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4026
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/4026/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4026
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=zesty/4026/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-ci/188/rebuild

review: Approve (continuous-integration)

[Daniel d'Andrada (dandrader)]

Thanks!

review: Approve

[Gerry Boland (gerboland)]

https://bugs.launchpad.net/miral/+bug/1670876
The new cursor api has a bug which this exposes. I think we need to hold off accepting this until that bug is fixed.

[Gerry Boland (gerboland)]

Mir 0.26.2 released with fix for this aforementioned bug, this should be good to go now

review: Approve

=== modified file 'src/ubuntumirclient/qmirclientcursor.cpp'
--- src/ubuntumirclient/qmirclientcursor.cpp	2017-02-07 16:16:54 +0000
+++ src/ubuntumirclient/qmirclientcursor.cpp	2017-02-21 18:25:18 +0000
@@ -133,6 +133,28 @@
         return "???";
     }
 }
+
+class CursorWindowSpec
+{
+public:
+    CursorWindowSpec(MirConnection *connection, const char *name)
+    :  spec(mir_create_window_spec(connection))
+    {
+        mir_window_spec_set_cursor_name(spec, name);
+    }
+
+    ~CursorWindowSpec()
+    {
+        mir_window_spec_release(spec);
+    }
+
+    void apply(MirWindow *window)
+    {
+        mir_window_apply_spec(window, spec);
+    }
+private:
+    MirWindowSpec * const spec;
+};
 } // anonymous namespace
 
 void QMirClientCursor::changeCursor(QCursor *windowCursor, QWindow *window)
@@ -157,12 +179,8 @@
             applyDefaultCursorConfiguration(mirWindow);
         } else {
             const auto &cursorName = mShapeToCursorName.value(windowCursor->shape(), QByteArray("left_ptr"));
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-            auto cursorConfiguration = mir_cursor_configuration_from_name(cursorName.data());
-#pragma GCC diagnostic pop
-            mir_window_configure_cursor(mirWindow, cursorConfiguration);
-            mir_cursor_configuration_destroy(cursorConfiguration);
+            CursorWindowSpec spec(mConnection, cursorName.data());
+            spec.apply(mirWindow);
         }
     } else {
         applyDefaultCursorConfiguration(mirWindow);
@@ -206,10 +224,7 @@
 
 void QMirClientCursor::applyDefaultCursorConfiguration(MirWindow *window)
 {
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-    auto cursorConfiguration = mir_cursor_configuration_from_name("left_ptr");
-#pragma GCC diagnostic pop
-    mir_window_configure_cursor(window, cursorConfiguration);
-    mir_cursor_configuration_destroy(cursorConfiguration);
+
+    CursorWindowSpec spec(mConnection, "left_ptr");
+    spec.apply(window);
 }

=== modified file 'src/ubuntumirclient/qmirclientdebugextension.cpp'
--- src/ubuntumirclient/qmirclientdebugextension.cpp	2017-02-07 16:18:59 +0000
+++ src/ubuntumirclient/qmirclientdebugextension.cpp	2017-02-21 18:25:18 +0000
@@ -43,42 +43,31 @@
 #include "qmirclientlogging.h"
 
 // mir client debug
-#include <mir_toolkit/debug/surface.h>
+#include <mir_toolkit/extensions/window_coordinate_translation.h>
 
 Q_LOGGING_CATEGORY(mirclientDebug, "qt.qpa.mirclient.debug")
 
-QMirClientDebugExtension::QMirClientDebugExtension()
-    : m_mirclientDebug(QStringLiteral("mirclient-debug-extension"), 1)
-    , m_mapper(nullptr)
+QMirClientDebugExtension::QMirClientDebugExtension(MirConnection *connection)
+    : mExtension(mir_extension_window_coordinate_translation_v1(connection))
 {
-    qCDebug(mirclientDebug) << "NOTICE: Loading mirclient-debug-extension";
-    m_mapper = (MapperPrototype) m_mirclientDebug.resolve("mir_extension_window_coordinate_translation");
-
-    if (!m_mirclientDebug.isLoaded()) {
-        qCWarning(mirclientDebug) << "ERROR: mirclient-debug-extension failed to load:"
-                                  << m_mirclientDebug.errorString();
-    } else if (!m_mapper) {
-        qCWarning(mirclientDebug) << "ERROR: unable to find required symbols in mirclient-debug-extension:"
-                                  << m_mirclientDebug.errorString();
+    if (mExtension == nullptr) {
+        qCWarning(mirclientDebug) << "ERROR: no window coordinate translation extension available";
     }
 }
 
 bool QMirClientDebugExtension::isEnabled() const
 {
-    return m_mirclientDebug.isLoaded() && m_mapper;
+    return mExtension != nullptr;
 }
 
 QPoint QMirClientDebugExtension::mapWindowPointToScreen(MirWindow *window, const QPoint &point)
 {
-    if (!m_mapper) {
+    if (!mExtension) {
         return point;
     }
 
     QPoint mappedPoint;
-    bool status = m_mapper(window, point.x(), point.y(), &mappedPoint.rx(), &mappedPoint.ry());
-    if (status) {
-        return mappedPoint;
-    } else {
-        return point;
-    }
+    mExtension->window_translate_coordinates(window, point.x(), point.y(), &mappedPoint.rx(), &mappedPoint.ry());
+
+    return mappedPoint;
 }

=== modified file 'src/ubuntumirclient/qmirclientdebugextension.h'
--- src/ubuntumirclient/qmirclientdebugextension.h	2017-02-07 16:16:54 +0000
+++ src/ubuntumirclient/qmirclientdebugextension.h	2017-02-21 18:25:18 +0000
@@ -42,25 +42,22 @@
 #define QMIRCLIENTDEBUGEXTENSION_H
 
 #include <QPoint>
-#include <QLibrary>
 
 #include <mir_toolkit/mir_window.h>
 
-typedef bool (*MapperPrototype)(MirWindow* window, int x, int y, int* screenX, int* screenY);
-
+struct MirExtensionWindowCoordinateTranslationV1;
 
 class QMirClientDebugExtension
 {
 public:
-    QMirClientDebugExtension();
+    QMirClientDebugExtension(MirConnection *connection);
 
     bool isEnabled() const;
 
     QPoint mapWindowPointToScreen(MirWindow *, const QPoint &point);
 
 private:
-    QLibrary m_mirclientDebug;
-    MapperPrototype m_mapper;
+    MirExtensionWindowCoordinateTranslationV1 const *mExtension;
 };
 
 #endif // QMIRCLIENTDEBUGEXTENSION_H

=== modified file 'src/ubuntumirclient/qmirclientintegration.cpp'
--- src/ubuntumirclient/qmirclientintegration.cpp	2017-02-07 15:37:20 +0000
+++ src/ubuntumirclient/qmirclientintegration.cpp	2017-02-21 18:25:18 +0000
@@ -163,7 +163,7 @@
         }
     }
     if (testability) {
-        mDebugExtension.reset(new QMirClientDebugExtension);
+        mDebugExtension.reset(new QMirClientDebugExtension(mMirConnection));
         if (!mDebugExtension->isEnabled()) {
             mDebugExtension.reset();
         }