Merge lp:~fboucault/unity-2d/opengl_switch into lp:unity-2d/3.0

[Florian Boucault]

[dash, launcher, spread] Added a new command line switch (-opengl) that triggers the use of a QGLWidget for the QML viewport.

[Ricardo Salveti (rsalveti)]

Code seems fine, and was able to test and confirm the opengl usage when using with -opengl.

The initial broken window for places is also gone, as we're also using the raster engine.

Just remember that an additional change is needed at the package side, to add libqt4-opengl-dev as build-depends.

review: Approve

[Olivier Tilloy (osomon)]

@Ricardo: the status of a MR should not be set to Approved until all the necessary changes/fixes have been applied. This is because the buildbot is automatically merging approved MRs. The latest nightly build on ARM failed precisely because of the missing build dependency you were mentioning in your comment (see https://launchpadlibrarian.net/70884789/buildlog_ubuntu-natty-armel.unity-2d_3.8.4.1-0ubuntu2~bzr553_FAILEDTOBUILD.txt.gz).

[Olivier Tilloy (osomon)]

@Florian: the code looks good to me, I still need to test it.

One comment/question on your way of retrieving the command line arguments for the application:

+ QSet<QString> arguments = QSet<QString>::fromList(QCoreApplication::arguments());

Why do you need a QSet? Can’t you just use the QStringList returned by QCoreApplication::arguments() ?
QLists also have a 'contains' method, so it should be fine.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2011-02-18 17:05:47 +0000
+++ CMakeLists.txt	2011-04-29 16:29:42 +0000
@@ -24,6 +24,7 @@
     ${QT_QTDECLARATIVE_INCLUDE_DIR}
     ${QT_QTXML_INCLUDE_DIR}
     ${QT_QTGUI_INCLUDE_DIR}
+    ${QT_QTOPENGL_INCLUDE_DIR}
     ${X11_INCLUDE_DIR}
     )
 

=== modified file 'launcher/app/launcher.cpp'
--- launcher/app/launcher.cpp	2011-04-28 13:09:25 +0000
+++ launcher/app/launcher.cpp	2011-04-29 16:29:42 +0000
@@ -90,6 +90,7 @@
     */
     QApplication::setGraphicsSystem("raster");
     Unity2dApplication application(argc, argv);
+    QSet<QString> arguments = QSet<QString>::fromList(QCoreApplication::arguments());
 
     GnomeSessionClient client(INSTALL_PREFIX "/share/applications/unity-2d-launcher.desktop");
     client.connectToSessionManager();
@@ -110,6 +111,7 @@
 
     /* QML declarative view */
     LauncherView *launcherView = new LauncherView(&panel);
+    launcherView->setUseOpenGL(arguments.contains("-opengl"));
 
     /* FIXME: possible optimisations */
 //    launcherView->setAttribute(Qt::WA_OpaquePaintEvent);

=== modified file 'launcher/app/launcherview.cpp'
--- launcher/app/launcherview.cpp	2011-04-28 13:09:25 +0000
+++ launcher/app/launcherview.cpp	2011-04-29 16:29:42 +0000
@@ -58,7 +58,7 @@
 static const char* COMMANDS_PLACE_ENTRY = "Runner";
 
 LauncherView::LauncherView(QWidget* parent) :
-    QDeclarativeView(parent),
+    Unity2DDeclarativeView(parent),
     m_superKeyPressed(false), m_superKeyHeld(false)
 {
     m_superKeyHoldTimer.setSingleShot(true);

=== modified file 'launcher/app/launcherview.h'
--- launcher/app/launcherview.h	2011-04-01 09:23:58 +0000
+++ launcher/app/launcherview.h	2011-04-29 16:29:42 +0000
@@ -27,10 +27,12 @@
 
 #include "gconfitem-qml-wrapper.h"
 
+#include <unity2ddeclarativeview.h>
+
 class DeclarativeDragDropEvent;
 class LauncherDBus;
 
-class LauncherView : public QDeclarativeView
+class LauncherView : public Unity2DDeclarativeView
 {
     Q_OBJECT
     Q_PROPERTY(bool superKeyHeld READ superKeyHeld NOTIFY superKeyHeldChanged)

=== modified file 'libunity-2d-private/src/CMakeLists.txt'
--- libunity-2d-private/src/CMakeLists.txt	2011-03-21 13:46:48 +0000
+++ libunity-2d-private/src/CMakeLists.txt	2011-04-29 16:29:42 +0000
@@ -13,6 +13,7 @@
     unity2ddebug.cpp
     unity2dpanel.cpp
     unity2dtr.cpp
+    unity2ddeclarativeview.cpp
     mimedata.cpp
     dragdropevent.cpp
     propertybinder.cpp
@@ -38,6 +39,7 @@
     ${QT_QTCORE_LIBRARIES}
     ${QT_QTDBUS_LIBRARIES}
     ${QT_QTDECLARATIVE_LIBRARIES}
+    ${QT_QTOPENGL_LIBRARIES}
     ${X11_LIBRARIES}
     ${GLIB_LDFLAGS}
     )

=== added file 'libunity-2d-private/src/unity2ddeclarativeview.cpp'
--- libunity-2d-private/src/unity2ddeclarativeview.cpp	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/unity2ddeclarativeview.cpp	2011-04-29 16:29:42 +0000
@@ -0,0 +1,37 @@
+#include "unity2ddeclarativeview.h"
+#include <QGLWidget>
+
+Unity2DDeclarativeView::Unity2DDeclarativeView(QWidget *parent) :
+    QDeclarativeView(parent), m_useOpenGL(false)
+{
+}
+
+bool Unity2DDeclarativeView::useOpenGL() const
+{
+    return m_useOpenGL;
+}
+
+void Unity2DDeclarativeView::setUseOpenGL(bool useOpenGL)
+{
+    if (useOpenGL == m_useOpenGL) {
+        return;
+    }
+
+    if (useOpenGL) {
+        QGLFormat format = QGLFormat::defaultFormat();
+        format.setSampleBuffers(false);
+
+        QGLWidget *glWidget = new QGLWidget(format);
+        /* TODO: possibly faster, to be tested */
+        //glWidget->setAutoFillBackground(false);
+
+        setViewport(glWidget);
+    } else {
+        setViewport(0);
+    }
+
+    m_useOpenGL = useOpenGL;
+    Q_EMIT useOpenGLChanged(useOpenGL);
+}
+
+#include <unity2ddeclarativeview.moc>

=== added file 'libunity-2d-private/src/unity2ddeclarativeview.h'
--- libunity-2d-private/src/unity2ddeclarativeview.h	1970-01-01 00:00:00 +0000
+++ libunity-2d-private/src/unity2ddeclarativeview.h	2011-04-29 16:29:42 +0000
@@ -0,0 +1,27 @@
+#ifndef UNITY2DDECLARATIVEVIEW_H
+#define UNITY2DDECLARATIVEVIEW_H
+
+#include <QDeclarativeView>
+
+class Unity2DDeclarativeView : public QDeclarativeView
+{
+    Q_OBJECT
+
+    Q_PROPERTY(bool useOpenGL READ useOpenGL WRITE setUseOpenGL NOTIFY useOpenGLChanged)
+
+public:
+    Unity2DDeclarativeView(QWidget *parent = 0);
+
+    bool useOpenGL() const;
+    void setUseOpenGL(bool);
+
+Q_SIGNALS:
+    void useOpenGLChanged(bool);
+
+private:
+    bool m_useOpenGL;
+};
+
+Q_DECLARE_METATYPE(Unity2DDeclarativeView*)
+
+#endif // UNITY2DDECLARATIVEVIEW_H

=== modified file 'places/app/dashdeclarativeview.cpp'
--- places/app/dashdeclarativeview.cpp	2011-04-12 17:28:33 +0000
+++ places/app/dashdeclarativeview.cpp	2011-04-29 16:29:42 +0000
@@ -47,7 +47,7 @@
 static const char* DASH_DBUS_OBJECT_PATH = "/Dash";
 
 DashDeclarativeView::DashDeclarativeView()
-: QDeclarativeView()
+: Unity2DDeclarativeView()
 , m_launcherClient(new LauncherClient(this))
 , m_mode(HiddenMode)
 , m_expanded(false)

=== modified file 'places/app/dashdeclarativeview.h'
--- places/app/dashdeclarativeview.h	2011-04-12 15:40:46 +0000
+++ places/app/dashdeclarativeview.h	2011-04-29 16:29:42 +0000
@@ -18,10 +18,11 @@
 #define DashDeclarativeView_H
 
 #include <QDeclarativeView>
+#include <unity2ddeclarativeview.h>
 
 class LauncherClient;
 
-class DashDeclarativeView : public QDeclarativeView
+class DashDeclarativeView : public Unity2DDeclarativeView
 {
     Q_OBJECT
     Q_ENUMS(DashMode)

=== modified file 'places/app/places.cpp'
--- places/app/places.cpp	2011-04-13 13:44:28 +0000
+++ places/app/places.cpp	2011-04-29 16:29:42 +0000
@@ -57,9 +57,12 @@
     */
     QApplication::setGraphicsSystem("raster");
     QApplication application(argc, argv);
+    QSet<QString> arguments = QSet<QString>::fromList(QCoreApplication::arguments());
 
     qmlRegisterType<DashDeclarativeView>("Places", 1, 0, "DashDeclarativeView");
     DashDeclarativeView view;
+    view.setUseOpenGL(arguments.contains("-opengl"));
+
     if (!view.connectToBus()) {
         qCritical() << "Another instance of the Dash already exists. Quitting.";
         return -1;

=== modified file 'spread/app/spread.cpp'
--- spread/app/spread.cpp	2011-04-19 14:11:36 +0000
+++ spread/app/spread.cpp	2011-04-29 16:29:42 +0000
@@ -50,8 +50,10 @@
     */
     QApplication::setGraphicsSystem("raster");
     QApplication application(argc, argv);
+    QSet<QString> arguments = QSet<QString>::fromList(QCoreApplication::arguments());
 
     SpreadView view;
+    view.setUseOpenGL(arguments.contains("-opengl"));
 
     /* The spread window is borderless and not moveable by the user, yet not
        fullscreen */

=== modified file 'spread/app/spreadview.cpp'
--- spread/app/spreadview.cpp	2011-03-17 16:05:29 +0000
+++ spread/app/spreadview.cpp	2011-04-29 16:29:42 +0000
@@ -29,7 +29,7 @@
 
 #include "launcherclient.h"
 
-SpreadView::SpreadView() : QDeclarativeView()
+SpreadView::SpreadView() : Unity2DDeclarativeView()
 {
 }
 

=== modified file 'spread/app/spreadview.h'
--- spread/app/spreadview.h	2011-02-03 02:39:53 +0000
+++ spread/app/spreadview.h	2011-04-29 16:29:42 +0000
@@ -23,7 +23,9 @@
 #include <QDeclarativeView>
 #include <QEvent>
 
-class SpreadView : public QDeclarativeView
+#include <unity2ddeclarativeview.h>
+
+class SpreadView : public Unity2DDeclarativeView
 {
     Q_OBJECT