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

[Daniel d'Andrada]

Make QWindow::winId() return the underlying MirSurface pointer

Have it return something useful.

ubuntu-keyboard needs that in order to be able to use Mir client API to fill out the input region of its surface.

Unmerged revisions

323. By Daniel d'Andrada on 2016-06-03

Make QWindow::winId() return the underlying MirSurface pointer

Have it return something useful.

=== modified file 'src/ubuntumirclient/integration.cpp'
--- src/ubuntumirclient/integration.cpp	2016-04-28 14:44:18 +0000
+++ src/ubuntumirclient/integration.cpp	2016-06-08 14:15:13 +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-08 14:15:13 +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/window.cpp'
--- src/ubuntumirclient/window.cpp	2016-04-28 14:44:18 +0000
+++ src/ubuntumirclient/window.cpp	2016-06-08 14:15:13 +0000
@@ -118,12 +118,6 @@
     }
 }
 
-WId makeId()
-{
-    static int id = 1;
-    return id++;
-}
-
 MirPixelFormat defaultPixelFormatFor(MirConnection *connection)
 {
     MirPixelFormat format;
@@ -513,7 +507,6 @@
                            EGLConfig eglConfig, MirConnection *mirConnection)
     : QObject(nullptr)
     , QPlatformWindow(w)
-    , mId(makeId())
     , mClipboard(clipboard)
     , mWindowState(w->windowState())
     , mWindowFlags(w->flags())
@@ -721,7 +714,7 @@
 
 WId UbuntuWindow::winId() const
 {
-    return mId;
+    return reinterpret_cast<WId>(mSurface->mirSurface());
 }
 
 void UbuntuWindow::onSwapBuffersDone()

=== modified file 'src/ubuntumirclient/window.h'
--- src/ubuntumirclient/window.h	2016-04-28 14:44:18 +0000
+++ src/ubuntumirclient/window.h	2016-06-08 14:15:13 +0000
@@ -73,7 +73,6 @@
     void updatePanelHeightHack(bool enable);
     void updateSurfaceState();
     mutable QMutex mMutex;
-    const WId mId;
     const QSharedPointer<UbuntuClipboard> mClipboard;
     Qt::WindowState mWindowState;
     Qt::WindowFlags mWindowFlags;