diff options
author | Samuel Rødal <samuel.rodal@nokia.com> | 2011-07-21 13:50:28 +0200 |
---|---|---|
committer | Jørgen Lind <jorgen.lind@nokia.com> | 2011-07-25 13:52:09 +0200 |
commit | c3da77798b876716ce038a30e9aa8517ec158c47 (patch) | |
tree | 99ac6cf5ce37fcb626a12857bb18cf9b444b27f2 /src/gui/kernel/qguiapplication.cpp | |
parent | e80b6619524a3720efb5fbe4c2307bec25a12ab8 (diff) |
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>
Diffstat (limited to 'src/gui/kernel/qguiapplication.cpp')
-rw-r--r-- | src/gui/kernel/qguiapplication.cpp | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index ad01a72a45..a54dab6398 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -52,6 +52,7 @@ #include <QtCore/qmutex.h> #include <QtDebug> #include <qpalette.h> +#include <qscreen.h> #include <QtGui/QPlatformIntegration> #include <QtGui/QGenericPluginFactory> @@ -103,6 +104,8 @@ QGuiApplicationPrivate *QGuiApplicationPrivate::self = 0; QClipboard *QGuiApplicationPrivate::qt_clipboard = 0; #endif +QList<QScreen *> QGuiApplicationPrivate::screen_list; + QWindowList QGuiApplicationPrivate::window_list; QWindow *QGuiApplicationPrivate::active_window = 0; @@ -179,21 +182,27 @@ QWindowList QGuiApplication::topLevelWindows() return QGuiApplicationPrivate::window_list; } -QWindow *QGuiApplication::topLevelAt(const QPoint &pos) +QScreen *QGuiApplication::primaryScreen() { - QPlatformIntegration *pi = QGuiApplicationPrivate::platformIntegration(); + if (QGuiApplicationPrivate::screen_list.isEmpty()) + return 0; + return QGuiApplicationPrivate::screen_list.at(0); +} - QList<QPlatformScreen *> screens = pi->screens(); - QList<QPlatformScreen *>::const_iterator screen = screens.constBegin(); - QList<QPlatformScreen *>::const_iterator end = screens.constEnd(); +QList<QScreen *> QGuiApplication::screens() +{ + return QGuiApplicationPrivate::screen_list; +} - // The first screen in a virtual environment should know about all top levels - if (pi->isVirtualDesktop()) - return (*screen)->topLevelAt(pos); +QWindow *QGuiApplication::topLevelAt(const QPoint &pos) +{ + 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)) - return (*screen)->topLevelAt(pos); + return (*screen)->handle()->topLevelAt(pos); ++screen; } return 0; |