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)]

PASSED: Continuous integration, rev:323
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-ci/73/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/1936
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/1962
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/1897
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/1897
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/1897
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1888
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/1888/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1888
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1888/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/1888
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/1888/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1888
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/1888/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1888
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1888/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/1888
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/1888/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1888
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/1888/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1888
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/1888/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/1888
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/1888/artifact/output/*zip*/output.zip

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

review: Approve (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

[Gerry Boland (gerboland)]

LGTM

review: Approve

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

PASSED: Continuous integration, rev:327
https://unity8-jenkins.ubuntu.com/job/lp-qtubuntu-ci/85/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build/2084
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/2112
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/2022
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/2022
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=yakkety/2022
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2013
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/2013/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2013
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial+overlay/2013/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2013
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=yakkety/2013/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2013
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/2013/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2013
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial+overlay/2013/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2013
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=yakkety/2013/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2013
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/2013/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2013
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial+overlay/2013/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2013
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=yakkety/2013/artifact/output/*zip*/output.zip

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

review: Approve (continuous-integration)

[lp:~dandrader/qtubuntu/exposeMirSurface]

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

Expose MirSurface to client apps through the native interface

=== modified file 'debian/changelog'
--- debian/changelog	2016-06-20 08:49:40 +0000
+++ debian/changelog	2016-06-21 12:18:36 +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.20160620-0ubuntu1) yakkety; urgency=medium
 
   * Revert r324 "EGL convenience" (LP: #1594198)

=== modified file 'src/ubuntumirclient/nativeinterface.cpp'
--- src/ubuntumirclient/nativeinterface.cpp	2016-04-28 14:09:54 +0000
+++ src/ubuntumirclient/nativeinterface.cpp	2016-06-21 12:18:36 +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-21 12:18:36 +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();