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/qplatformscreen_qpa.h | |
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/qplatformscreen_qpa.h')
-rw-r--r-- | src/gui/kernel/qplatformscreen_qpa.h | 33 |
1 files changed, 28 insertions, 5 deletions
diff --git a/src/gui/kernel/qplatformscreen_qpa.h b/src/gui/kernel/qplatformscreen_qpa.h index 16e62dd6c6..8d3dd4cc71 100644 --- a/src/gui/kernel/qplatformscreen_qpa.h +++ b/src/gui/kernel/qplatformscreen_qpa.h @@ -52,6 +52,7 @@ #include <QtGui/qcursor.h> #include <QtGui/qimage.h> #include <QtGui/qwindowdefs.h> +#include <QtGui/qplatformpixmap_qpa.h> QT_BEGIN_HEADER @@ -59,24 +60,46 @@ QT_BEGIN_NAMESPACE QT_MODULE(Gui) -class Q_GUI_EXPORT QPlatformScreen : public QObject +class QPlatformBackingStore; +class QPlatformGLContext; +class QPlatformScreenPrivate; +class QPlatformWindow; +class QScreen; +class QSurfaceFormat; + +class Q_GUI_EXPORT QPlatformScreen { - Q_OBJECT + Q_DECLARE_PRIVATE(QPlatformScreen) + public: - virtual ~QPlatformScreen() { } + QPlatformScreen(); + virtual ~QPlatformScreen(); + + virtual QPixmap grabWindow(WId window, int x, int y, int width, int height) const; virtual QRect geometry() const = 0; virtual QRect availableGeometry() const {return geometry();} + virtual int depth() const = 0; virtual QImage::Format format() const = 0; virtual QSize physicalSize() const; - //jl: should setDirty be removed. - virtual void setDirty(const QRect &) {} + virtual QWindow *topLevelAt(const QPoint &point) const; + virtual QList<QPlatformScreen *> virtualSiblings() const; + + QScreen *screen() const; //jl: should this function be in QPlatformIntegration //jl: maybe screenForWindow is a better name? static QPlatformScreen *platformScreenForWindow(const QWindow *window); + + virtual QString name() const { return QString(); } + +protected: + QScopedPointer<QPlatformScreenPrivate> d_ptr; + +private: + Q_DISABLE_COPY(QPlatformScreen) }; QT_END_NAMESPACE |