Merge lp:~dandrader/qtubuntu/exposeMirSurface into lp:qtubuntu

[Daniel d'Andrada]

Expose MirSurface to client apps through the native interface

Needed by ubuntu-keyboard to fill out the input shape/region of its surface.

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

FAILED: Continuous integration, rev:323
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-ci/72/
Executed test runs:
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build/1935/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1961
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1896
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1896
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/1896
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1887/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1887
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1887/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/1887
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/1887/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1887
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1887/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1887
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1887/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/1887
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/1887/artifact/output/*zip*/output.zip
    FAILURE: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1887/console
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1887
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1887/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/1887
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/1887/artifact/output/*zip*/output.zip

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

review: Needs Fixing (continuous-integration)

[lp:~dandrader/qtubuntu/exposeMirSurface]

322. By Daniel d'Andrada on 2016-06-14

Generate better mir session names

323. By Nick Dedekind on 2016-06-14

Support for cross building

324. By Gerry Boland on 2016-06-14

Convert UbuntuOpenGLContext to use QEGLPlatformContext, and allow clients to customize chosen GLConfig (LP: #1507817, #1549455)

325. By Gerry Boland on 2016-06-14

Integration: no need for the non-const versions of createWindow and createGLContext

326. By CI Train Bot Account on 2016-06-14

Releasing 0.62+16.10.20160614-0ubuntu1

327. By Michał Sawicz on 2016-06-20

Revert r324 "EGL convenience" (LP: #1594198)

328. By CI Train Bot Account on 2016-06-20

Releasing 0.62+16.10.20160620-0ubuntu1

329. By Daniel d'Andrada on 2016-06-21

Expose MirSurface to client apps through the native interface

Unmerged revisions

=== modified file 'debian/changelog'
--- debian/changelog	2016-05-27 13:05:27 +0000
+++ debian/changelog	2016-06-09 18:58:55 +0000
@@ -1,3 +1,9 @@
+qtubuntu (0.63) UNRELEASED; urgency=medium
+
+  * Expose MirSurface to client apps through the native interface
+
+ -- Daniel d'Andrada <[e-mail]>  Thu, 09 Jun 2016 15:48:12 -0300
+
 qtubuntu (0.62+16.10.20160527.1-0ubuntu1) yakkety; urgency=medium
 
   [ Albert Astals Cid ]

=== modified file 'src/ubuntumirclient/integration.cpp'
--- src/ubuntumirclient/integration.cpp	2016-04-28 14:44:18 +0000
+++ src/ubuntumirclient/integration.cpp	2016-06-09 18:58:55 +0000
@@ -28,6 +28,7 @@
 #include "window.h"
 
 // Qt
+#include <QFileInfo>
 #include <QGuiApplication>
 #include <private/qguiapplication_p.h>
 #include <qpa/qplatformnativeinterface.h>
@@ -77,8 +78,12 @@
     , mClipboard(new UbuntuClipboard)
     , mScaleFactor(1.0)
 {
-    setupOptions();
-    setupDescription();
+    {
+        QStringList args = QCoreApplication::arguments();
+        setupOptions(args);
+        QByteArray sessionName = generateSessionName(args);
+        setupDescription(sessionName);
+    }
 
     // Create new application instance
     mInstance = u_application_instance_new_from_description_with_options(mDesc, mOptions);
@@ -161,9 +166,8 @@
     return mServices;
 }
 
-void UbuntuClientIntegration::setupOptions()
+void UbuntuClientIntegration::setupOptions(QStringList &args)
 {
-    QStringList args = QCoreApplication::arguments();
     int argc = args.size() + 1;
     char **argv = new char*[argc];
     for (int i = 0; i < argc - 1; i++)
@@ -177,10 +181,11 @@
     delete [] argv;
 }
 
-void UbuntuClientIntegration::setupDescription()
+void UbuntuClientIntegration::setupDescription(QByteArray &sessionName)
 {
     mDesc = u_application_description_new();
-    UApplicationId* id = u_application_id_new_from_stringn("QtUbuntu", 8);
+
+    UApplicationId* id = u_application_id_new_from_stringn(sessionName.data(), sessionName.count());
     u_application_description_set_application_id(mDesc, id);
 
     UApplicationLifecycleDelegate* delegate = u_application_lifecycle_delegate_new();
@@ -190,6 +195,35 @@
     u_application_description_set_application_lifecycle_delegate(mDesc, delegate);
 }
 
+QByteArray UbuntuClientIntegration::generateSessionName(QStringList &args)
+{
+    // Try to come up with some meaningful session name to uniquely identify this session,
+    // helping with shell debugging
+
+    if (args.count() == 0) {
+        return QByteArray("QtUbuntu");
+    } if (args[0].contains("qmlscene")) {
+        return generateSessionNameFromQmlFile(args);
+    } else {
+        // use the executable name
+        QFileInfo fileInfo(args[0]);
+        return fileInfo.fileName().toLocal8Bit();
+    }
+}
+
+QByteArray UbuntuClientIntegration::generateSessionNameFromQmlFile(QStringList &args)
+{
+    Q_FOREACH (QString arg, args) {
+        if (arg.endsWith(".qml")) {
+            QFileInfo fileInfo(arg);
+            return fileInfo.fileName().toLocal8Bit();
+        }
+    }
+
+    // give up
+    return "qmlscene";
+}
+
 QPlatformWindow* UbuntuClientIntegration::createPlatformWindow(QWindow* window) const
 {
     return const_cast<UbuntuClientIntegration*>(this)->createPlatformWindow(window);

=== modified file 'src/ubuntumirclient/integration.h'
--- src/ubuntumirclient/integration.h	2016-04-28 14:09:54 +0000
+++ src/ubuntumirclient/integration.h	2016-06-09 18:58:55 +0000
@@ -76,8 +76,10 @@
     void destroyScreen(UbuntuScreen *screen);
 
 private:
-    void setupOptions();
-    void setupDescription();
+    void setupOptions(QStringList &args);
+    void setupDescription(QByteArray &sessionName);
+    static QByteArray generateSessionName(QStringList &args);
+    static QByteArray generateSessionNameFromQmlFile(QStringList &args);
 
     UbuntuNativeInterface* mNativeInterface;
     QPlatformFontDatabase* mFontDb;

=== modified file 'src/ubuntumirclient/nativeinterface.cpp'
--- src/ubuntumirclient/nativeinterface.cpp	2016-04-28 14:09:54 +0000
+++ src/ubuntumirclient/nativeinterface.cpp	2016-06-09 18:58:55 +0000
@@ -36,6 +36,7 @@
         insert("nativeorientation", UbuntuNativeInterface::NativeOrientation);
         insert("display", UbuntuNativeInterface::Display);
         insert("mirconnection", UbuntuNativeInterface::MirConnection);
+        insert("mirsurface", UbuntuNativeInterface::MirSurface);
         insert("scale", UbuntuNativeInterface::Scale);
         insert("formfactor", UbuntuNativeInterface::FormFactor);
     }
@@ -98,9 +99,11 @@
     if (!ubuntuResourceMap()->contains(kLowerCaseResource))
         return NULL;
     const ResourceType kResourceType = ubuntuResourceMap()->value(kLowerCaseResource);
-    if (kResourceType == UbuntuNativeInterface::EglDisplay) {
+
+    switch (kResourceType) {
+    case EglDisplay:
         return mIntegration->eglDisplay();
-    } else if (kResourceType == UbuntuNativeInterface::NativeOrientation) {
+    case NativeOrientation:
         // Return the device's native screen orientation.
         if (window) {
             UbuntuScreen *ubuntuScreen = static_cast<UbuntuScreen*>(window->screen()->handle());
@@ -110,8 +113,19 @@
             mNativeOrientation = new Qt::ScreenOrientation(platformScreen->nativeOrientation());
         }
         return mNativeOrientation;
-    } else {
-        return NULL;
+    case MirSurface:
+        if (window) {
+            auto ubuntuWindow = static_cast<UbuntuWindow*>(window->handle());
+            if (ubuntuWindow) {
+                return ubuntuWindow->mirSurface();
+            } else {
+                return nullptr;
+            }
+        } else {
+            return nullptr;
+        }
+    default:
+        return nullptr;
     }
 }
 

=== modified file 'src/ubuntumirclient/nativeinterface.h'
--- src/ubuntumirclient/nativeinterface.h	2016-04-28 14:09:54 +0000
+++ src/ubuntumirclient/nativeinterface.h	2016-06-09 18:58:55 +0000
@@ -26,7 +26,7 @@
 class UbuntuNativeInterface : public QPlatformNativeInterface {
     Q_OBJECT
 public:
-    enum ResourceType { EglDisplay, EglContext, NativeOrientation, Display, MirConnection, Scale, FormFactor };
+    enum ResourceType { EglDisplay, EglContext, NativeOrientation, Display, MirConnection, MirSurface, Scale, FormFactor };
 
     UbuntuNativeInterface(const UbuntuClientIntegration *integration);
     ~UbuntuNativeInterface();