Added workable QScreen API on top of QPlatformScreen.

QPlatformIntegration::screens() no longer has to be implemented,
implementations should call QPlatformIntegration::screenAdded() for each
screen instead. This is for being able to support adding screens at
run-time later on, by connecting it to a signal in QGuiApplication.

The QGuiGLContext API has changed a bit, by not sending in all the
parameters in the constructor but instead having a create() function.
The createPlatformGLContext() factory in QPlatformIntegration takes a
QGuiGLContext * instead of a QSurfaceFormat and a share context, similar
to how the window and backing store factory functions work.

The XCB plugin has experimental support for connecting to multiple X
displays simultaneously, creating one or more QScreen for each.

Change-Id: I248a22a4fd3481280710110272c04a30a8021e8f
Reviewed-on: http://codereview.qt.nokia.com/2103
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>

4 files changed, 18 insertions, 30 deletions

diff --git a/src/widgets/kernel/qapplication_qpa.cpp b/src/widgets/kernel/qapplication_qpa.cpp
index 1b37ddf2e0..3c0575b656 100644
--- a/src/widgets/kernel/qapplication_qpa.cpp
+++ b/src/widgets/kernel/qapplication_qpa.cpp
@@ -45,6 +45,7 @@
 #ifndef QT_NO_CURSOR
 #include "private/qcursor_p.h"
 #endif
+#include "qscreen.h"
 
 #include "private/qwidget_p.h"
 #include "private/qevent_p.h"
@@ -384,21 +385,13 @@ bool QApplication::isEffectEnabled(Qt::UIEffect effect)
 
 QWidget *QApplication::topLevelAt(const QPoint &pos)
 {
-    QPlatformIntegration *pi = QGuiApplicationPrivate::platformIntegration();
-
-    QList<QPlatformScreen *> screens = pi->screens();
-    QList<QPlatformScreen *>::const_iterator screen = screens.constBegin();
-    QList<QPlatformScreen *>::const_iterator end = screens.constEnd();
-
-    // The first screen in a virtual environment should know about all top levels
-    if (pi->isVirtualDesktop()) {
-        QWidgetWindow *w = qobject_cast<QWidgetWindow *>((*screen)->topLevelAt(pos));
-        return w ? w->widget() : 0;
-    }
+    QList<QScreen *> screens = QGuiApplication::screens();
+    QList<QScreen *>::const_iterator screen = screens.constBegin();
+    QList<QScreen *>::const_iterator end = screens.constEnd();
 
     while (screen != end) {
         if ((*screen)->geometry().contains(pos)) {
-            QWidgetWindow *w = qobject_cast<QWidgetWindow *>((*screen)->topLevelAt(pos));
+            QWidgetWindow *w = qobject_cast<QWidgetWindow *>((*screen)->handle()->topLevelAt(pos));
             return w ? w->widget() : 0;
         }
         ++screen;
diff --git a/src/widgets/kernel/qdesktopwidget_qpa.cpp b/src/widgets/kernel/qdesktopwidget_qpa.cpp
index 5e4dffb15d..380daee8c0 100644
--- a/src/widgets/kernel/qdesktopwidget_qpa.cpp
+++ b/src/widgets/kernel/qdesktopwidget_qpa.cpp
@@ -40,6 +40,7 @@
 ****************************************************************************/
 
 #include "qdesktopwidget.h"
+#include "qscreen.h"
 #include "private/qapplication_p.h"
 #include <QWidget>
 #include "private/qwidget_p.h"
@@ -51,7 +52,7 @@ QT_USE_NAMESPACE
 void QDesktopWidgetPrivate::updateScreenList()
 {
     Q_Q(QDesktopWidget);
-    QList<QPlatformScreen *> screenList = QGuiApplicationPrivate::platformIntegration()->screens();
+    QList<QScreen *> screenList = QGuiApplication::screens();
     int targetLength = screenList.length();
     int currentLength = screens.length();
 
@@ -97,7 +98,7 @@ QDesktopWidget::~QDesktopWidget()
 
 bool QDesktopWidget::isVirtualDesktop() const
 {
-    return QGuiApplicationPrivate::platformIntegration()->isVirtualDesktop();
+    return QGuiApplication::primaryScreen()->virtualSiblings().size() > 1;
 }
 
 int QDesktopWidget::primaryScreen() const
@@ -107,8 +108,7 @@ int QDesktopWidget::primaryScreen() const
 
 int QDesktopWidget::numScreens() const
 {
-    QPlatformIntegration *pi = QGuiApplicationPrivate::platformIntegration();
-    return qMax(pi->screens().size(), 1);
+    return qMax(QGuiApplication::screens().size(), 1);
 }
 
 QWidget *QDesktopWidget::screen(int screen)
@@ -121,26 +121,24 @@ QWidget *QDesktopWidget::screen(int screen)
 
 const QRect QDesktopWidget::availableGeometry(int screenNo) const
 {
-    QPlatformIntegration *pi = QGuiApplicationPrivate::platformIntegration();
-    QList<QPlatformScreen *> screens = pi->screens();
+    QList<QScreen *> screens = QGuiApplication::screens();
     if (screenNo == -1)
         screenNo = 0;
     if (screenNo < 0 || screenNo >= screens.size())
         return QRect();
     else
-        return screens[screenNo]->availableGeometry();
+        return screens.at(screenNo)->availableGeometry();
 }
 
 const QRect QDesktopWidget::screenGeometry(int screenNo) const
 {
-    QPlatformIntegration *pi = QGuiApplicationPrivate::platformIntegration();
-    QList<QPlatformScreen *> screens = pi->screens();
+    QList<QScreen *> screens = QGuiApplication::screens();
     if (screenNo == -1)
         screenNo = 0;
     if (screenNo < 0 || screenNo >= screens.size())
         return QRect();
     else
-        return screens[screenNo]->geometry();
+        return screens.at(screenNo)->geometry();
 }
 
 int QDesktopWidget::screenNumber(const QWidget *w) const
@@ -157,11 +155,10 @@ int QDesktopWidget::screenNumber(const QWidget *w) const
 
 int QDesktopWidget::screenNumber(const QPoint &p) const
 {
-    QPlatformIntegration *pi = QGuiApplicationPrivate::platformIntegration();
-    QList<QPlatformScreen *> screens = pi->screens();
+    QList<QScreen *> screens = QGuiApplication::screens();
 
     for (int i = 0; i < screens.size(); ++i)
-        if (screens[i]->geometry().contains(p))
+        if (screens.at(i)->geometry().contains(p))
             return i;
 
     return primaryScreen(); //even better would be closest screen
diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
index a29a265e5a..76218a9eb3 100644
--- a/src/widgets/kernel/qwidget.cpp
+++ b/src/widgets/kernel/qwidget.cpp
@@ -1266,8 +1266,7 @@ void QWidgetPrivate::init(QWidget *parentWidget, Qt::WindowFlags f)
 #elif defined(Q_WS_QPA)
     if (desktopWidget) {
         int screen = desktopWidget->d_func()->topData()->screenIndex;
-        QPlatformIntegration *platform = QGuiApplicationPrivate::platformIntegration();
-        platform->moveToScreen(q->windowHandle(), screen);
+        q->windowHandle()->setScreen(QGuiApplication::screens().value(screen, 0));
     }
 #else
     Q_UNUSED(desktopWidget);
diff --git a/src/widgets/kernel/qwidget_qpa.cpp b/src/widgets/kernel/qwidget_qpa.cpp
index 5051b38185..b8f1f4ebc7 100644
--- a/src/widgets/kernel/qwidget_qpa.cpp
+++ b/src/widgets/kernel/qwidget_qpa.cpp
@@ -104,6 +104,7 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
 
     win->setWindowFlags(data.window_flags);
     win->setGeometry(q->geometry());
+    win->setScreen(QGuiApplication::screens().value(topData()->screenIndex, 0));
 
     if (q->testAttribute(Qt::WA_TranslucentBackground)) {
         QSurfaceFormat format;
@@ -141,7 +142,6 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO
 //    first check children. and create them if necessary
 //    q_createNativeChildrenAndSetParent(q->windowHandle(),q);
 
-    QGuiApplicationPrivate::platformIntegration()->moveToScreen(win, topData()->screenIndex);
 //    qDebug() << "create_sys" << q << q->internalWinId();
 }
 
@@ -261,8 +261,7 @@ void QWidgetPrivate::setParent_sys(QWidget *newparent, Qt::WindowFlags f)
             maybeTopData()->screenIndex = targetScreen;
         // only if it is already created
         if (q->testAttribute(Qt::WA_WState_Created)) {
-            QPlatformIntegration *platform = QGuiApplicationPrivate::platformIntegration();
-            platform->moveToScreen(q->windowHandle(), targetScreen);
+            q->windowHandle()->setScreen(QGuiApplication::screens().value(targetScreen, 0));
         }
     }
 }