From c3da77798b876716ce038a30e9aa8517ec158c47 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Samuel=20R=C3=B8dal?= <samuel.rodal@nokia.com>
Date: Thu, 21 Jul 2011 13:50:28 +0200
Subject: Added workable QScreen API on top of QPlatformScreen.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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>
---
 src/gui/kernel/qwindow.cpp | 34 +++++++++++++++++++++++++++++++++-
 1 file changed, 33 insertions(+), 1 deletion(-)

(limited to 'src/gui/kernel/qwindow.cpp')

diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp
index 7fa9316878..018474aba7 100644
--- a/src/gui/kernel/qwindow.cpp
+++ b/src/gui/kernel/qwindow.cpp
@@ -45,6 +45,7 @@
 #include "qsurfaceformat.h"
 #include "qplatformglcontext_qpa.h"
 #include "qguiglcontext_qpa.h"
+#include "qscreen.h"
 
 #include "qwindow_p.h"
 #include "qguiapplication_p.h"
@@ -55,12 +56,27 @@
 
 QT_BEGIN_NAMESPACE
 
+QWindow::QWindow(QScreen *targetScreen)
+    : QObject(*new QWindowPrivate(), 0)
+    , QSurface(QSurface::Window)
+{
+    Q_D(QWindow);
+    d->screen = targetScreen;
+    if (!d->screen)
+        d->screen = QGuiApplication::primaryScreen();
+    QGuiApplicationPrivate::window_list.prepend(this);
+}
+
 QWindow::QWindow(QWindow *parent)
     : QObject(*new QWindowPrivate(), parent)
     , QSurface(QSurface::Window)
 {
     Q_D(QWindow);
     d->parentWindow = parent;
+    if (parent)
+        d->screen = parent->screen();
+    if (!d->screen)
+        d->screen = QGuiApplication::primaryScreen();
     QGuiApplicationPrivate::window_list.prepend(this);
 }
 
@@ -439,6 +455,23 @@ bool QWindow::setMouseGrabEnabled(bool grab)
     return false;
 }
 
+QScreen *QWindow::screen() const
+{
+    Q_D(const QWindow);
+    return d->screen;
+}
+
+void QWindow::setScreen(QScreen *newScreen)
+{
+    Q_D(QWindow);
+    bool wasCreated = d->platformWindow != 0;
+    if (wasCreated)
+        destroy();
+    d->screen = newScreen ? newScreen : QGuiApplication::primaryScreen();
+    if (wasCreated)
+        create();
+}
+
 void QWindow::showMinimized()
 {
     qDebug() << "unimplemented:" << __FILE__ << __LINE__;
@@ -486,7 +519,6 @@ void QWindow::hideEvent(QHideEvent *)
 
 bool QWindow::event(QEvent *event)
 {
-    Q_D(QWindow);
     switch (event->type()) {
     case QEvent::MouseMove:
         mouseMoveEvent(static_cast<QMouseEvent*>(event));
-- 
cgit v1.2.3