diff options
Diffstat (limited to 'src/gui/kernel')
67 files changed, 961 insertions, 340 deletions
diff --git a/src/gui/kernel/kernel.pri b/src/gui/kernel/kernel.pri index f766b5fbaf..eb87a8c31b 100644 --- a/src/gui/kernel/kernel.pri +++ b/src/gui/kernel/kernel.pri @@ -24,6 +24,7 @@ HEADERS += \ kernel/qplatformthemefactory_p.h \ kernel/qplatformthemeplugin.h \ kernel/qplatformwindow.h \ + kernel/qplatformoffscreensurface.h \ kernel/qplatformwindow_p.h \ kernel/qplatformcursor.h \ kernel/qplatformclipboard.h \ @@ -34,6 +35,7 @@ HEADERS += \ kernel/qguiapplication_p.h \ kernel/qwindow_p.h \ kernel/qwindow.h \ + kernel/qoffscreensurface.h \ kernel/qplatformsurface.h \ kernel/qsurface.h \ kernel/qclipboard.h \ @@ -81,6 +83,7 @@ SOURCES += \ kernel/qplatformthemefactory.cpp \ kernel/qplatformthemeplugin.cpp \ kernel/qplatformwindow.cpp \ + kernel/qplatformoffscreensurface.cpp \ kernel/qplatformcursor.cpp \ kernel/qplatformclipboard.cpp \ kernel/qplatformnativeinterface.cpp \ @@ -88,6 +91,7 @@ SOURCES += \ kernel/qsurfaceformat.cpp \ kernel/qguiapplication.cpp \ kernel/qwindow.cpp \ + kernel/qoffscreensurface.cpp \ kernel/qplatformsurface.cpp \ kernel/qsurface.cpp \ kernel/qclipboard.cpp \ diff --git a/src/gui/kernel/qclipboard.h b/src/gui/kernel/qclipboard.h index 520d731717..7235a03b6b 100644 --- a/src/gui/kernel/qclipboard.h +++ b/src/gui/kernel/qclipboard.h @@ -44,8 +44,6 @@ #include <QtCore/qobject.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -112,6 +110,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QCLIPBOARD_H diff --git a/src/gui/kernel/qcursor.h b/src/gui/kernel/qcursor.h index d4ca15ff93..016a0ef798 100644 --- a/src/gui/kernel/qcursor.h +++ b/src/gui/kernel/qcursor.h @@ -45,8 +45,6 @@ #include <QtCore/qpoint.h> #include <QtGui/qwindowdefs.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -130,6 +128,4 @@ Q_GUI_EXPORT QDebug operator<<(QDebug, const QCursor &); QT_END_NAMESPACE -QT_END_HEADER - #endif // QCURSOR_H diff --git a/src/gui/kernel/qdrag.h b/src/gui/kernel/qdrag.h index abbb382400..553b0e1922 100644 --- a/src/gui/kernel/qdrag.h +++ b/src/gui/kernel/qdrag.h @@ -44,8 +44,6 @@ #include <QtCore/qobject.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -100,6 +98,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QDRAG_H diff --git a/src/gui/kernel/qevent.h b/src/gui/kernel/qevent.h index e84765cae6..0b4e708bdb 100644 --- a/src/gui/kernel/qevent.h +++ b/src/gui/kernel/qevent.h @@ -58,8 +58,6 @@ #include <QtGui/qvector2d.h> #include <QtGui/qtouchdevice.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -909,6 +907,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QEVENT_H diff --git a/src/gui/kernel/qgenericplugin.h b/src/gui/kernel/qgenericplugin.h index 10bde146bd..f00a532283 100644 --- a/src/gui/kernel/qgenericplugin.h +++ b/src/gui/kernel/qgenericplugin.h @@ -45,8 +45,6 @@ #include <QtCore/qplugin.h> #include <QtCore/qfactoryinterface.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -68,6 +66,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // QGENERICPLUGIN_H diff --git a/src/gui/kernel/qgenericpluginfactory.h b/src/gui/kernel/qgenericpluginfactory.h index 03d688a5c5..2443e670cc 100644 --- a/src/gui/kernel/qgenericpluginfactory.h +++ b/src/gui/kernel/qgenericpluginfactory.h @@ -44,8 +44,6 @@ #include <QtCore/qstringlist.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -61,6 +59,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // QGENERICPLUGINFACTORY_H diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index c155ecfe0c..89b3b9ab89 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -1063,6 +1063,8 @@ QGuiApplicationPrivate::~QGuiApplicationPrivate() delete platform_integration; platform_integration = 0; delete m_gammaTables.load(); + + window_list.clear(); } #if 0 @@ -1665,10 +1667,10 @@ void QGuiApplicationPrivate::processCloseEvent(QWindowSystemInterfacePrivate::Cl void QGuiApplicationPrivate::processFileOpenEvent(QWindowSystemInterfacePrivate::FileOpenEvent *e) { - if (e->fileName.isEmpty()) + if (e->url.isEmpty()) return; - QFileOpenEvent event(e->fileName); + QFileOpenEvent event(e->url); QGuiApplication::sendSpontaneousEvent(qApp, &event); } @@ -2622,6 +2624,13 @@ static inline void applyCursor(QWindow *w, QCursor c) cursor->changeCursor(&c, w); } +static inline void unsetCursor(QWindow *w) +{ + if (const QScreen *screen = w->screen()) + if (QPlatformCursor *cursor = screen->handle()->cursor()) + cursor->changeCursor(0, w); +} + static inline void applyCursor(const QList<QWindow *> &l, const QCursor &c) { for (int i = 0; i < l.size(); ++i) { @@ -2635,8 +2644,13 @@ static inline void applyWindowCursor(const QList<QWindow *> &l) { for (int i = 0; i < l.size(); ++i) { QWindow *w = l.at(i); - if (w->handle() && w->type() != Qt::Desktop) - applyCursor(w, w->cursor()); + if (w->handle() && w->type() != Qt::Desktop) { + if (qt_window_private(w)->hasCursor) { + applyCursor(w, w->cursor()); + } else { + unsetCursor(w); + } + } } } @@ -2768,111 +2782,6 @@ QInputMethod *QGuiApplication::inputMethod() QFontDatabase::removeApplicationFont() */ -// These pixmaps approximate the images in the Windows User Interface Guidelines. - -// XPM - -static const char * const move_xpm[] = { -"11 20 3 1", -". c None", -"a c #FFFFFF", -"X c #000000", // X11 cursor is traditionally black -"aa.........", -"aXa........", -"aXXa.......", -"aXXXa......", -"aXXXXa.....", -"aXXXXXa....", -"aXXXXXXa...", -"aXXXXXXXa..", -"aXXXXXXXXa.", -"aXXXXXXXXXa", -"aXXXXXXaaaa", -"aXXXaXXa...", -"aXXaaXXa...", -"aXa..aXXa..", -"aa...aXXa..", -"a.....aXXa.", -"......aXXa.", -".......aXXa", -".......aXXa", -"........aa."}; - - -/* XPM */ -static const char * const copy_xpm[] = { -"24 30 3 1", -". c None", -"a c #000000", -"X c #FFFFFF", -"XX......................", -"XaX.....................", -"XaaX....................", -"XaaaX...................", -"XaaaaX..................", -"XaaaaaX.................", -"XaaaaaaX................", -"XaaaaaaaX...............", -"XaaaaaaaaX..............", -"XaaaaaaaaaX.............", -"XaaaaaaXXXX.............", -"XaaaXaaX................", -"XaaXXaaX................", -"XaX..XaaX...............", -"XX...XaaX...............", -"X.....XaaX..............", -"......XaaX..............", -".......XaaX.............", -".......XaaX.............", -"........XX...aaaaaaaaaaa", -".............aXXXXXXXXXa", -".............aXXXXXXXXXa", -".............aXXXXaXXXXa", -".............aXXXXaXXXXa", -".............aXXaaaaaXXa", -".............aXXXXaXXXXa", -".............aXXXXaXXXXa", -".............aXXXXXXXXXa", -".............aXXXXXXXXXa", -".............aaaaaaaaaaa"}; - -/* XPM */ -static const char * const link_xpm[] = { -"24 30 3 1", -". c None", -"a c #000000", -"X c #FFFFFF", -"XX......................", -"XaX.....................", -"XaaX....................", -"XaaaX...................", -"XaaaaX..................", -"XaaaaaX.................", -"XaaaaaaX................", -"XaaaaaaaX...............", -"XaaaaaaaaX..............", -"XaaaaaaaaaX.............", -"XaaaaaaXXXX.............", -"XaaaXaaX................", -"XaaXXaaX................", -"XaX..XaaX...............", -"XX...XaaX...............", -"X.....XaaX..............", -"......XaaX..............", -".......XaaX.............", -".......XaaX.............", -"........XX...aaaaaaaaaaa", -".............aXXXXXXXXXa", -".............aXXXaaaaXXa", -".............aXXXXaaaXXa", -".............aXXXaaaaXXa", -".............aXXaaaXaXXa", -".............aXXaaXXXXXa", -".............aXXaXXXXXXa", -".............aXXXaXXXXXa", -".............aXXXXXXXXXa", -".............aaaaaaaaaaa"}; - QPixmap QGuiApplicationPrivate::getPixmapCursor(Qt::CursorShape cshape) { Q_UNUSED(cshape); diff --git a/src/gui/kernel/qguiapplication.h b/src/gui/kernel/qguiapplication.h index f90321f396..0e9d6f2336 100644 --- a/src/gui/kernel/qguiapplication.h +++ b/src/gui/kernel/qguiapplication.h @@ -49,8 +49,6 @@ #include <QtCore/qpoint.h> #include <QtCore/qsize.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -187,6 +185,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QGUIAPPLICATION_H diff --git a/src/gui/kernel/qguiapplication_p.h b/src/gui/kernel/qguiapplication_p.h index 0946591887..e5f08934c1 100644 --- a/src/gui/kernel/qguiapplication_p.h +++ b/src/gui/kernel/qguiapplication_p.h @@ -65,8 +65,6 @@ #include "private/qshortcutmap_p.h" #include <qicon.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QPlatformIntegration; @@ -293,6 +291,4 @@ Q_GUI_EXPORT bool operator==(const QGuiApplicationPrivate::ActiveTouchPointsKey QT_END_NAMESPACE -QT_END_HEADER - #endif // QGUIAPPLICATION_P_H diff --git a/src/gui/kernel/qinputmethod.h b/src/gui/kernel/qinputmethod.h index 35e29e9cb5..eceebb1c0f 100644 --- a/src/gui/kernel/qinputmethod.h +++ b/src/gui/kernel/qinputmethod.h @@ -44,8 +44,6 @@ #include <QtCore/qobject.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QInputMethodPrivate; @@ -116,6 +114,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/gui/kernel/qinputmethod_p.h b/src/gui/kernel/qinputmethod_p.h index ab91660e3f..6cfc5e2f88 100644 --- a/src/gui/kernel/qinputmethod_p.h +++ b/src/gui/kernel/qinputmethod_p.h @@ -61,8 +61,6 @@ #include <qpa/qplatformintegration.h> #include <private/qguiapplication_p.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QInputMethodPrivate : public QObjectPrivate @@ -91,6 +89,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/gui/kernel/qkeysequence.h b/src/gui/kernel/qkeysequence.h index dd26efda8e..6324e203f0 100644 --- a/src/gui/kernel/qkeysequence.h +++ b/src/gui/kernel/qkeysequence.h @@ -45,8 +45,6 @@ #include <QtCore/qnamespace.h> #include <QtCore/qstring.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -231,6 +229,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // QKEYSEQUENCE_H diff --git a/src/gui/kernel/qoffscreensurface.cpp b/src/gui/kernel/qoffscreensurface.cpp new file mode 100644 index 0000000000..e2306050dd --- /dev/null +++ b/src/gui/kernel/qoffscreensurface.cpp @@ -0,0 +1,345 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtGui module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "qoffscreensurface.h" + +#include "qguiapplication_p.h" +#include "qscreen.h" +#include "qplatformintegration.h" +#include "qplatformoffscreensurface.h" +#include "qwindow.h" +#include "qplatformwindow.h" + +QT_BEGIN_NAMESPACE + +/*! + \class QOffscreenSurface + \inmodule QtGui + \since 5.1 + \brief The QOffscreenSurface class represents an offscreen surface in the underlying platform. + + QOffscreenSurface is intended to be used with QOpenGLContext to allow rendering with OpenGL in + an arbitrary thread without the need to create a QWindow. + + Even though the surface is renderable, the surface's pixels are not accessible. + QOffscreenSurface should only be used to create OpenGL resources such as textures + or framebuffer objects. + + An application will typically use QOffscreenSurface to perform some time-consuming tasks in a + separate thread in order to avoid stalling the main rendering thread. Resources created in the + QOffscreenSurface's context can be shared with the main OpenGL context. Some common use cases + are asynchronous texture uploads or rendering into a QOpenGLFramebufferObject. + + How the offscreen surface is implemented depends on the underlying platform, but it will + typically use a pixel buffer (pbuffer). If the platform doesn't implement or support + offscreen surfaces, QOffscreenSurface will use an invisible QWindow internally. +*/ +class Q_GUI_EXPORT QOffscreenSurfacePrivate : public QObjectPrivate +{ + Q_DECLARE_PUBLIC(QOffscreenSurface) + +public: + QOffscreenSurfacePrivate() + : QObjectPrivate() + , surfaceType(QSurface::OpenGLSurface) + , platformOffscreenSurface(0) + , offscreenWindow(0) + , screen(0) + , size(1, 1) + { + } + + ~QOffscreenSurfacePrivate() + { + } + + QSurface::SurfaceType surfaceType; + QPlatformOffscreenSurface *platformOffscreenSurface; + QWindow *offscreenWindow; + QSurfaceFormat requestedFormat; + QScreen *screen; + QSize size; +}; + + +/*! + Creates an offscreen surface for the \a targetScreen. + + The underlying platform surface is not created until create() is called. + + \sa setScreen(), create() +*/ +QOffscreenSurface::QOffscreenSurface(QScreen *targetScreen) + : QObject(*new QOffscreenSurfacePrivate(), 0) + , QSurface(Offscreen) +{ + Q_D(QOffscreenSurface); + d->screen = targetScreen; + if (!d->screen) + d->screen = QGuiApplication::primaryScreen(); + + //if your applications aborts here, then chances are your creating a QOffscreenSurface before + //the screen list is populated. + Q_ASSERT(d->screen); + + connect(d->screen, SIGNAL(destroyed(QObject*)), this, SLOT(screenDestroyed(QObject*))); +} + + +/*! + Destroys the offscreen surface. +*/ +QOffscreenSurface::~QOffscreenSurface() +{ + destroy(); +} + +/*! + Returns the surface type of the offscreen surface. + + The surface type of an offscreen surface is always QSurface::OpenGLSurface. +*/ +QOffscreenSurface::SurfaceType QOffscreenSurface::surfaceType() const +{ + Q_D(const QOffscreenSurface); + return d->surfaceType; +} + +/*! + Allocates the platform resources associated with the offscreen surface. + + It is at this point that the surface format set using setFormat() gets resolved + into an actual native surface. + + Call destroy() to free the platform resources if necessary. + + \sa destroy() +*/ +void QOffscreenSurface::create() +{ + Q_D(QOffscreenSurface); + if (!d->platformOffscreenSurface && !d->offscreenWindow) { + d->platformOffscreenSurface = QGuiApplicationPrivate::platformIntegration()->createPlatformOffscreenSurface(this); + // No platform offscreen surface, fallback to an invisible window + if (!d->platformOffscreenSurface) { + d->offscreenWindow = new QWindow(d->screen); + d->offscreenWindow->setSurfaceType(QWindow::OpenGLSurface); + d->offscreenWindow->setFormat(d->requestedFormat); + d->offscreenWindow->setGeometry(0, 0, d->size.width(), d->size.height()); + d->offscreenWindow->create(); + } + } +} + +/*! + Releases the native platform resources associated with this offscreen surface. + + \sa create() +*/ +void QOffscreenSurface::destroy() +{ + Q_D(QOffscreenSurface); + delete d->platformOffscreenSurface; + d->platformOffscreenSurface = 0; + if (d->offscreenWindow) { + d->offscreenWindow->destroy(); + delete d->offscreenWindow; + d->offscreenWindow = 0; + } +} + +/*! + Returns \c true if this offscreen surface is valid; otherwise returns \c false. + + The offscreen surface is valid if the platform resources have been successfuly allocated. + + \sa create() +*/ +bool QOffscreenSurface::isValid() const +{ + Q_D(const QOffscreenSurface); + return (d->platformOffscreenSurface && d->platformOffscreenSurface->isValid()) + || (d->offscreenWindow && d->offscreenWindow->handle()); +} + +/*! + Sets the offscreen surface \a format. + + The surface format will be resolved in the create() function. Calling + this function after create() will not re-resolve the surface format of the native surface. + + \sa create(), destroy() +*/ +void QOffscreenSurface::setFormat(const QSurfaceFormat &format) +{ + Q_D(QOffscreenSurface); + d->requestedFormat = format; +} + +/*! + Returns the requested surfaceformat of this offscreen surface. + + If the requested format was not supported by the platform implementation, + the requestedFormat will differ from the actual offscreen surface format. + + This is the value set with setFormat(). + + \sa setFormat(), format() + */ +QSurfaceFormat QOffscreenSurface::requestedFormat() const +{ + Q_D(const QOffscreenSurface); + return d->requestedFormat; +} + +/*! + Returns the actual format of this offscreen surface. + + After the offscreen surface has been created, this function will return the actual + surface format of the surface. It might differ from the requested format if the requested + format could not be fulfilled by the platform. + + \sa create(), requestedFormat() +*/ +QSurfaceFormat QOffscreenSurface::format() const +{ + Q_D(const QOffscreenSurface); + if (d->platformOffscreenSurface) + return d->platformOffscreenSurface->format(); + if (d->offscreenWindow) + return d->offscreenWindow->format(); + return d->requestedFormat; +} + +/*! + Returns the size of the offscreen surface. +*/ +QSize QOffscreenSurface::size() const +{ + Q_D(const QOffscreenSurface); + return d->size; +} + +/*! + Returns the screen to which the offscreen surface is connected. + + \sa setScreen() +*/ +QScreen *QOffscreenSurface::screen() const +{ + Q_D(const QOffscreenSurface); + return d->screen; +} + +/*! + Sets the screen to which the offscreen surface is connected. + + If the offscreen surface has been created, it will be recreated on the \a newScreen. + + \sa screen() +*/ +void QOffscreenSurface::setScreen(QScreen *newScreen) +{ + Q_D(QOffscreenSurface); + if (!newScreen) + newScreen = QGuiApplication::primaryScreen(); + if (newScreen != d->screen) { + const bool wasCreated = d->platformOffscreenSurface != 0 || d->offscreenWindow != 0; + if (wasCreated) + destroy(); + if (d->screen) + disconnect(d->screen, SIGNAL(destroyed(QObject*)), this, SLOT(screenDestroyed(QObject*))); + d->screen = newScreen; + if (newScreen) { + connect(d->screen, SIGNAL(destroyed(QObject*)), this, SLOT(screenDestroyed(QObject*))); + if (wasCreated) + create(); + } + emit screenChanged(newScreen); + } +} + +/*! + Called when the offscreen surface's screen is destroyed. + + \internal +*/ +void QOffscreenSurface::screenDestroyed(QObject *object) +{ + Q_D(QOffscreenSurface); + if (object == static_cast<QObject *>(d->screen)) + setScreen(0); +} + +/*! + \fn QOffscreenSurface::screenChanged(QScreen *screen) + + This signal is emitted when an offscreen surface's \a screen changes, either + by being set explicitly with setScreen(), or automatically when + the window's screen is removed. +*/ + +/*! + Returns the platform offscreen surface corresponding to the offscreen surface. + + \internal +*/ +QPlatformOffscreenSurface *QOffscreenSurface::handle() const +{ + Q_D(const QOffscreenSurface); + return d->platformOffscreenSurface; +} + +/*! + Returns the platform surface corresponding to the offscreen surface. + + \internal +*/ +QPlatformSurface *QOffscreenSurface::surfaceHandle() const +{ + Q_D(const QOffscreenSurface); + if (d->offscreenWindow) + return d->offscreenWindow->handle(); + + return d->platformOffscreenSurface; +} + +QT_END_NAMESPACE diff --git a/src/gui/kernel/qoffscreensurface.h b/src/gui/kernel/qoffscreensurface.h new file mode 100644 index 0000000000..a1b46f9b88 --- /dev/null +++ b/src/gui/kernel/qoffscreensurface.h @@ -0,0 +1,98 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtGui module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QOFFSCREENSURFACE_H +#define QOFFSCREENSURFACE_H + +#include <QtCore/QObject> +#include <QtGui/qsurface.h> + +QT_BEGIN_NAMESPACE + +class QOffscreenSurfacePrivate; + +class QScreen; +class QPlatformOffscreenSurface; + +class Q_GUI_EXPORT QOffscreenSurface : public QObject, public QSurface +{ + Q_OBJECT + Q_DECLARE_PRIVATE(QOffscreenSurface) + +public: + + explicit QOffscreenSurface(QScreen *screen = 0); + virtual ~QOffscreenSurface(); + + SurfaceType surfaceType() const; + + void create(); + void destroy(); + + bool isValid() const; + + void setFormat(const QSurfaceFormat &format); + QSurfaceFormat format() const; + QSurfaceFormat requestedFormat() const; + + QSize size() const; + + QScreen *screen() const; + void setScreen(QScreen *screen); + + QPlatformOffscreenSurface *handle() const; + +Q_SIGNALS: + void screenChanged(QScreen *screen); + +private Q_SLOTS: + void screenDestroyed(QObject *screen); + +private: + + QPlatformSurface *surfaceHandle() const; + + Q_DISABLE_COPY(QOffscreenSurface) +}; + +QT_END_NAMESPACE + +#endif // QOFFSCREENSURFACE_H diff --git a/src/gui/kernel/qopenglcontext.h b/src/gui/kernel/qopenglcontext.h index d6d812a98d..e8d04d7446 100644 --- a/src/gui/kernel/qopenglcontext.h +++ b/src/gui/kernel/qopenglcontext.h @@ -59,8 +59,6 @@ #include <QtGui/qopengl.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QOpenGLContextPrivate; @@ -159,8 +157,6 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_OPENGL #endif // QGUIGLCONTEXT_H diff --git a/src/gui/kernel/qopenglcontext_p.h b/src/gui/kernel/qopenglcontext_p.h index fb81412b2b..ba5434e8ac 100644 --- a/src/gui/kernel/qopenglcontext_p.h +++ b/src/gui/kernel/qopenglcontext_p.h @@ -64,8 +64,6 @@ #include <QtCore/QHash> #include <QtCore/QSet> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -259,7 +257,5 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_OPENGL #endif // QOPENGLCONTEXT_P_H diff --git a/src/gui/kernel/qpalette.h b/src/gui/kernel/qpalette.h index 9ea0830442..2248f6727e 100644 --- a/src/gui/kernel/qpalette.h +++ b/src/gui/kernel/qpalette.h @@ -46,8 +46,6 @@ #include <QtGui/qcolor.h> #include <QtGui/qbrush.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -210,6 +208,4 @@ Q_GUI_EXPORT QDebug operator<<(QDebug, const QPalette &); QT_END_NAMESPACE -QT_END_HEADER - #endif // QPALETTE_H diff --git a/src/gui/kernel/qplatformclipboard.h b/src/gui/kernel/qplatformclipboard.h index a925b16e9e..3ffc020e8d 100644 --- a/src/gui/kernel/qplatformclipboard.h +++ b/src/gui/kernel/qplatformclipboard.h @@ -57,8 +57,6 @@ #include <QtGui/QClipboard> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -76,8 +74,6 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_CLIPBOARD #endif //QPLATFORMCLIPBOARD_H diff --git a/src/gui/kernel/qplatformcursor.cpp b/src/gui/kernel/qplatformcursor.cpp index 16a59f5d07..c2f510b496 100644 --- a/src/gui/kernel/qplatformcursor.cpp +++ b/src/gui/kernel/qplatformcursor.cpp @@ -95,6 +95,10 @@ QList<QPlatformCursor *> QPlatformCursorPrivate::getInstances() \a windowCursor is a pointer to the QCursor that should be displayed. + To unset the cursor of \a window, 0 is passed. This means \a window does not have + a cursor set and the cursor of a the first parent window which has a cursor explicitly + set or the system default cursor should take effect. + \a window is a pointer to the window currently displayed at QCursor::pos(). Note that this may be 0 if the current position is not occupied by a displayed widget. diff --git a/src/gui/kernel/qplatformcursor.h b/src/gui/kernel/qplatformcursor.h index d624a068f1..011209aa3a 100644 --- a/src/gui/kernel/qplatformcursor.h +++ b/src/gui/kernel/qplatformcursor.h @@ -58,8 +58,6 @@ #include <qpa/qplatformscreen.h> #include <QtGui/QCursor> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -106,6 +104,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QPLATFORMCURSOR_H diff --git a/src/gui/kernel/qplatformdialoghelper.h b/src/gui/kernel/qplatformdialoghelper.h index fe3c5d2b99..ecc00ed8c6 100644 --- a/src/gui/kernel/qplatformdialoghelper.h +++ b/src/gui/kernel/qplatformdialoghelper.h @@ -59,8 +59,6 @@ #include <QtCore/QDir> #include <QtGui/QRgb> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -319,6 +317,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QPLATFORMDIALOGHELPER_H diff --git a/src/gui/kernel/qplatformdrag.h b/src/gui/kernel/qplatformdrag.h index 61ff2dddf6..59f9899f23 100644 --- a/src/gui/kernel/qplatformdrag.h +++ b/src/gui/kernel/qplatformdrag.h @@ -54,8 +54,6 @@ #include <QtCore/qglobal.h> #include <QtGui/QPixmap> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE #ifndef QT_NO_DRAGANDDROP @@ -118,6 +116,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/gui/kernel/qplatforminputcontext.h b/src/gui/kernel/qplatforminputcontext.h index 2efe9486ca..0e4121eed4 100644 --- a/src/gui/kernel/qplatforminputcontext.h +++ b/src/gui/kernel/qplatforminputcontext.h @@ -53,8 +53,6 @@ #include <QtGui/qinputmethod.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QPlatformInputContextPrivate; @@ -102,6 +100,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QPLATFORMINPUTCONTEXT_H diff --git a/src/gui/kernel/qplatforminputcontext_p.h b/src/gui/kernel/qplatforminputcontext_p.h index f55acbd79f..29d6e45269 100644 --- a/src/gui/kernel/qplatforminputcontext_p.h +++ b/src/gui/kernel/qplatforminputcontext_p.h @@ -55,8 +55,6 @@ #include <private/qobject_p.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QPlatformInputContextPrivate: public QObjectPrivate @@ -73,6 +71,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/gui/kernel/qplatforminputcontextfactory_p.h b/src/gui/kernel/qplatforminputcontextfactory_p.h index 2e82f7c4d5..2177d7965d 100644 --- a/src/gui/kernel/qplatforminputcontextfactory_p.h +++ b/src/gui/kernel/qplatforminputcontextfactory_p.h @@ -55,8 +55,6 @@ #include <QtCore/qstringlist.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -72,7 +70,5 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // QPLATFORMINPUTCONTEXTFACTORY_H diff --git a/src/gui/kernel/qplatforminputcontextplugin_p.h b/src/gui/kernel/qplatforminputcontextplugin_p.h index ac97df15a3..ff79bb94b9 100644 --- a/src/gui/kernel/qplatforminputcontextplugin_p.h +++ b/src/gui/kernel/qplatforminputcontextplugin_p.h @@ -56,8 +56,6 @@ #include <QtCore/qplugin.h> #include <QtCore/qfactoryinterface.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -77,6 +75,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // QPLATFORMINPUTCONTEXTPLUGIN_H diff --git a/src/gui/kernel/qplatformintegration.cpp b/src/gui/kernel/qplatformintegration.cpp index 980e45742e..027b9fc9f1 100644 --- a/src/gui/kernel/qplatformintegration.cpp +++ b/src/gui/kernel/qplatformintegration.cpp @@ -360,4 +360,15 @@ class QPlatformTheme *QPlatformIntegration::createPlatformTheme(const QString &n return new QPlatformTheme; } +/*! + Factory function for QOffscreenSurface. An offscreen surface will typically be implemented with a + pixel buffer (pbuffer). If the platform doesn't support offscreen surfaces, an invisible window + will be used by QOffscreenSurface instead. +*/ +QPlatformOffscreenSurface *QPlatformIntegration::createPlatformOffscreenSurface(QOffscreenSurface *surface) const +{ + Q_UNUSED(surface) + return 0; +} + QT_END_NAMESPACE diff --git a/src/gui/kernel/qplatformintegration.h b/src/gui/kernel/qplatformintegration.h index ee796bf323..6e10df9495 100644 --- a/src/gui/kernel/qplatformintegration.h +++ b/src/gui/kernel/qplatformintegration.h @@ -55,8 +55,6 @@ #include <qpa/qplatformscreen.h> #include <QtGui/qsurfaceformat.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -77,6 +75,8 @@ class QPlatformDialogHelper; class QPlatformSharedGraphicsCache; class QPlatformServices; class QKeyEvent; +class QPlatformOffscreenSurface; +class QOffscreenSurface; class Q_GUI_EXPORT QPlatformIntegration { @@ -148,12 +148,12 @@ public: virtual QStringList themeNames() const; virtual QPlatformTheme *createPlatformTheme(const QString &name) const; + virtual QPlatformOffscreenSurface *createPlatformOffscreenSurface(QOffscreenSurface *surface) const; + protected: void screenAdded(QPlatformScreen *screen); }; QT_END_NAMESPACE -QT_END_HEADER - #endif // QPLATFORMINTEGRATION_H diff --git a/src/gui/kernel/qplatformintegrationfactory_p.h b/src/gui/kernel/qplatformintegrationfactory_p.h index 859e6f9c4d..fb3ba55316 100644 --- a/src/gui/kernel/qplatformintegrationfactory_p.h +++ b/src/gui/kernel/qplatformintegrationfactory_p.h @@ -55,8 +55,6 @@ #include <QtCore/qstringlist.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -71,7 +69,5 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // QPLATFORMINTEGRATIONFACTORY_H diff --git a/src/gui/kernel/qplatformintegrationplugin.h b/src/gui/kernel/qplatformintegrationplugin.h index 4de0d3edc0..434366f0b0 100644 --- a/src/gui/kernel/qplatformintegrationplugin.h +++ b/src/gui/kernel/qplatformintegrationplugin.h @@ -54,8 +54,6 @@ #include <QtCore/qplugin.h> #include <QtCore/qfactoryinterface.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -75,6 +73,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // QPLATFORMINTEGRATIONPLUGIN_H diff --git a/src/gui/kernel/qplatformmenu.h b/src/gui/kernel/qplatformmenu.h index b02998940b..3485cc58dd 100644 --- a/src/gui/kernel/qplatformmenu.h +++ b/src/gui/kernel/qplatformmenu.h @@ -57,8 +57,6 @@ #include <QtGui/QKeySequence> #include <QtGui/QIcon> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QPlatformMenu; @@ -80,6 +78,7 @@ public: virtual void setIsSeparator(bool isSeparator) = 0; virtual void setFont(const QFont &font) = 0; virtual void setRole(MenuRole role) = 0; + virtual void setCheckable(bool checkable) = 0; virtual void setChecked(bool isChecked) = 0; virtual void setShortcut(const QKeySequence& shortcut) = 0; virtual void setEnabled(bool enabled) = 0; @@ -101,8 +100,19 @@ public: virtual quintptr tag()const = 0; virtual void setText(const QString &text) = 0; + virtual void setIcon(const QIcon &icon) = 0; virtual void setEnabled(bool enabled) = 0; virtual void setVisible(bool visible) = 0; + virtual void setMinimumWidth(int width) { Q_UNUSED(width); } + virtual void setFont(const QFont &font) { Q_UNUSED(font); } + + virtual void showPopup(const QWindow *parentWindow, QPoint pos, const QPlatformMenuItem *item) + { + Q_UNUSED(parentWindow); + Q_UNUSED(pos); + Q_UNUSED(item); + setVisible(true); + } virtual QPlatformMenuItem *menuItemAt(int position) const = 0; virtual QPlatformMenuItem *menuItemForTag(quintptr tag) const = 0; @@ -125,7 +135,5 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/gui/kernel/qplatformnativeinterface.h b/src/gui/kernel/qplatformnativeinterface.h index fd892c1e75..eaa24a9e55 100644 --- a/src/gui/kernel/qplatformnativeinterface.h +++ b/src/gui/kernel/qplatformnativeinterface.h @@ -55,8 +55,6 @@ #include <QtCore/QObject> #include <QtCore/QVariant> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -98,6 +96,4 @@ Q_SIGNALS: QT_END_NAMESPACE -QT_END_HEADER - #endif // QPLATFORMNATIVEINTERFACE_H diff --git a/src/gui/kernel/qplatformoffscreensurface.cpp b/src/gui/kernel/qplatformoffscreensurface.cpp new file mode 100644 index 0000000000..dd354f465e --- /dev/null +++ b/src/gui/kernel/qplatformoffscreensurface.cpp @@ -0,0 +1,93 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtGui module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "qplatformoffscreensurface.h" + +#include "qoffscreensurface.h" +#include "qscreen.h" + +QT_BEGIN_NAMESPACE + +class QPlatformOffscreenSurfacePrivate +{ +public: +}; + +QPlatformOffscreenSurface::QPlatformOffscreenSurface(QOffscreenSurface *offscreenSurface) + : QPlatformSurface(offscreenSurface) + , d_ptr(new QPlatformOffscreenSurfacePrivate) +{ +} + +QPlatformOffscreenSurface::~QPlatformOffscreenSurface() +{ +} + +QOffscreenSurface *QPlatformOffscreenSurface::offscreenSurface() const +{ + return static_cast<QOffscreenSurface*>(m_surface); +} + +/*! + Returns the platform screen handle corresponding to this QPlatformOffscreenSurface. +*/ +QPlatformScreen *QPlatformOffscreenSurface::screen() const +{ + return offscreenSurface()->screen()->handle(); +} + +/*! + Returns the actual surface format of the offscreen surface. +*/ +QSurfaceFormat QPlatformOffscreenSurface::format() const +{ + return QSurfaceFormat(); +} + +/*! + Returns \c true if the platform offscreen surface has been allocated. +*/ +bool QPlatformOffscreenSurface::isValid() const +{ + return false; +} + +QT_END_NAMESPACE diff --git a/src/gui/kernel/qplatformoffscreensurface.h b/src/gui/kernel/qplatformoffscreensurface.h new file mode 100644 index 0000000000..099d8ee94a --- /dev/null +++ b/src/gui/kernel/qplatformoffscreensurface.h @@ -0,0 +1,85 @@ +/**************************************************************************** +** +** Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the QtGui module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/contact-us. +** +** GNU Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 2.1 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 2.1 requirements +** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Digia gives you certain additional +** rights. These rights are described in the Digia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 3.0 as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL included in the +** packaging of this file. Please review the following information to +** ensure the GNU General Public License version 3.0 requirements will be +** met: http://www.gnu.org/copyleft/gpl.html. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QPLATFORMOFFSCREENSURFACE_H +#define QPLATFORMOFFSCREENSURFACE_H + +// +// W A R N I N G +// ------------- +// +// This file is part of the QPA API and is not meant to be used +// in applications. Usage of this API may make your code +// source and binary incompatible with future versions of Qt. +// + +#include "qplatformsurface.h" +#include <QtCore/qscopedpointer.h> + +QT_BEGIN_NAMESPACE + +class QOffscreenSurface; +class QPlatformScreen; +class QPlatformOffscreenSurfacePrivate; + +class Q_GUI_EXPORT QPlatformOffscreenSurface : public QPlatformSurface +{ + Q_DECLARE_PRIVATE(QPlatformOffscreenSurface) +public: + explicit QPlatformOffscreenSurface(QOffscreenSurface *offscreenSurface); + virtual ~QPlatformOffscreenSurface(); + + QOffscreenSurface *offscreenSurface() const; + + QPlatformScreen *screen() const; + + virtual QSurfaceFormat format() const; + virtual bool isValid() const; + +protected: + QScopedPointer<QPlatformOffscreenSurfacePrivate> d_ptr; +private: + Q_DISABLE_COPY(QPlatformOffscreenSurface) +}; + +QT_END_NAMESPACE + +#endif // QPLATFORMOFFSCREENSURFACE_H diff --git a/src/gui/kernel/qplatformopenglcontext.h b/src/gui/kernel/qplatformopenglcontext.h index 6a0c819752..9e13622283 100644 --- a/src/gui/kernel/qplatformopenglcontext.h +++ b/src/gui/kernel/qplatformopenglcontext.h @@ -58,8 +58,6 @@ #include <QtGui/qwindow.h> #include <QtGui/qopengl.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -102,8 +100,6 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_OPENGL #endif // QPLATFORMOPENGLCONTEXT_H diff --git a/src/gui/kernel/qplatformscreen.h b/src/gui/kernel/qplatformscreen.h index eae9c5a739..085a147e8d 100644 --- a/src/gui/kernel/qplatformscreen.h +++ b/src/gui/kernel/qplatformscreen.h @@ -63,8 +63,6 @@ #include <QtGui/qwindowdefs.h> #include <qpa/qplatformpixmap.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -133,6 +131,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QPLATFORMSCREEN_H diff --git a/src/gui/kernel/qplatformscreen_p.h b/src/gui/kernel/qplatformscreen_p.h index 6914a82a06..588496b494 100644 --- a/src/gui/kernel/qplatformscreen_p.h +++ b/src/gui/kernel/qplatformscreen_p.h @@ -53,8 +53,6 @@ // We mean it. // -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QScreen; @@ -67,6 +65,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // QPLATFORMSCREEN_P_H diff --git a/src/gui/kernel/qplatformscreenpageflipper.h b/src/gui/kernel/qplatformscreenpageflipper.h index c6eac28564..232e37d24a 100644 --- a/src/gui/kernel/qplatformscreenpageflipper.h +++ b/src/gui/kernel/qplatformscreenpageflipper.h @@ -53,8 +53,6 @@ #include <QtCore/QObject> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class Q_GUI_EXPORT QPlatformScreenBuffer { @@ -91,6 +89,4 @@ Q_SIGNALS: QT_END_NAMESPACE -QT_END_HEADER - #endif // QPLATFORMSCREENPAGEFLIPPER_H diff --git a/src/gui/kernel/qplatformservices.h b/src/gui/kernel/qplatformservices.h index 200298f2ba..609a4a04be 100644 --- a/src/gui/kernel/qplatformservices.h +++ b/src/gui/kernel/qplatformservices.h @@ -53,8 +53,6 @@ #include <QtCore/QtGlobal> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QUrl; @@ -71,6 +69,5 @@ public: }; QT_END_NAMESPACE -QT_END_HEADER #endif // QPLATFORMSERVICES_H diff --git a/src/gui/kernel/qplatformsharedgraphicscache.h b/src/gui/kernel/qplatformsharedgraphicscache.h index 20a551688f..bb2dfe00e5 100644 --- a/src/gui/kernel/qplatformsharedgraphicscache.h +++ b/src/gui/kernel/qplatformsharedgraphicscache.h @@ -54,8 +54,6 @@ #include <QtCore/qobject.h> #include <QtGui/qimage.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class Q_GUI_EXPORT QPlatformSharedGraphicsCache: public QObject @@ -103,6 +101,4 @@ Q_SIGNALS: QT_END_NAMESPACE -QT_END_HEADER - #endif // QPLATFORMSHAREDGRAPHICSCACHE_H diff --git a/src/gui/kernel/qplatformsurface.h b/src/gui/kernel/qplatformsurface.h index bffb3c5848..b96e494f74 100644 --- a/src/gui/kernel/qplatformsurface.h +++ b/src/gui/kernel/qplatformsurface.h @@ -55,8 +55,6 @@ #include <QtGui/qsurface.h> #include <QtGui/qsurfaceformat.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -74,10 +72,9 @@ private: QSurface *m_surface; friend class QPlatformWindow; + friend class QPlatformOffscreenSurface; }; QT_END_NAMESPACE -QT_END_HEADER - #endif //QPLATFORMSURFACE_H diff --git a/src/gui/kernel/qplatformtheme.cpp b/src/gui/kernel/qplatformtheme.cpp index ceb95c51e8..9f5c789a6e 100644 --- a/src/gui/kernel/qplatformtheme.cpp +++ b/src/gui/kernel/qplatformtheme.cpp @@ -46,6 +46,7 @@ #include <QtCore/qfileinfo.h> #include <qpalette.h> #include <qtextformat.h> +#include <qiconloader_p.h> QT_BEGIN_NAMESPACE @@ -272,4 +273,19 @@ QPlatformSystemTrayIcon *QPlatformTheme::createPlatformSystemTrayIcon() const } #endif +/*! + Factory function for the QIconEngine used by QIcon::fromTheme(). By default this + function returns a QIconLoaderEngine, but subclasses can reimplement it to + provide their own. + + It is especially useful to benefit from some platform specific facilities or + optimizations like an inter-process cache in systems mostly built with Qt. + + \since 5.1 +*/ +QIconEngine *QPlatformTheme::createIconEngine(const QString &iconName) const +{ + return new QIconLoaderEngine(iconName); +} + QT_END_NAMESPACE diff --git a/src/gui/kernel/qplatformtheme.h b/src/gui/kernel/qplatformtheme.h index 3ac2b904d2..0e95321102 100644 --- a/src/gui/kernel/qplatformtheme.h +++ b/src/gui/kernel/qplatformtheme.h @@ -53,10 +53,9 @@ #include <QtCore/QtGlobal> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE +class QIconEngine; class QMenu; class QMenuBar; class QPlatformMenuItem; @@ -272,11 +271,11 @@ public: virtual QPixmap standardPixmap(StandardPixmap sp, const QSizeF &size) const; virtual QPixmap fileIconPixmap(const QFileInfo &fileInfo, const QSizeF &size) const; + virtual QIconEngine *createIconEngine(const QString &iconName) const; + static QVariant defaultThemeHint(ThemeHint hint); }; QT_END_NAMESPACE -QT_END_HEADER - #endif // QPLATFORMTHEME_H diff --git a/src/gui/kernel/qplatformthemefactory_p.h b/src/gui/kernel/qplatformthemefactory_p.h index 632aae86ee..ad954f39b6 100644 --- a/src/gui/kernel/qplatformthemefactory_p.h +++ b/src/gui/kernel/qplatformthemefactory_p.h @@ -55,8 +55,6 @@ #include <QtCore/qstringlist.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -71,6 +69,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // QPLATFORMTHEMEFACTORY_H diff --git a/src/gui/kernel/qplatformthemeplugin.h b/src/gui/kernel/qplatformthemeplugin.h index e3f106753a..cef5fb77b4 100644 --- a/src/gui/kernel/qplatformthemeplugin.h +++ b/src/gui/kernel/qplatformthemeplugin.h @@ -54,8 +54,6 @@ #include <QtCore/qplugin.h> #include <QtCore/qfactoryinterface.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QPlatformTheme; @@ -74,6 +72,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // QPLATFORMTHEMEPLUGIN_H diff --git a/src/gui/kernel/qplatformwindow.cpp b/src/gui/kernel/qplatformwindow.cpp index b710701e7f..1eec6bfefc 100644 --- a/src/gui/kernel/qplatformwindow.cpp +++ b/src/gui/kernel/qplatformwindow.cpp @@ -197,7 +197,13 @@ bool QPlatformWindow::isEmbedded(const QPlatformWindow *parentWindow) const */ QPoint QPlatformWindow::mapToGlobal(const QPoint &pos) const { - return pos; + const QPlatformWindow *p = this; + QPoint result = pos; + while (p) { + result += p->geometry().topLeft(); + p = p->parent(); + } + return result; } /*! @@ -209,7 +215,13 @@ QPoint QPlatformWindow::mapToGlobal(const QPoint &pos) const */ QPoint QPlatformWindow::mapFromGlobal(const QPoint &pos) const { - return pos; + const QPlatformWindow *p = this; + QPoint result = pos; + while (p) { + result -= p->geometry().topLeft(); + p = p->parent(); + } + return result; } /*! diff --git a/src/gui/kernel/qplatformwindow.h b/src/gui/kernel/qplatformwindow.h index fe62d7b67b..e3e460b54c 100644 --- a/src/gui/kernel/qplatformwindow.h +++ b/src/gui/kernel/qplatformwindow.h @@ -59,8 +59,6 @@ #include <qpa/qplatformopenglcontext.h> #include <qpa/qplatformsurface.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -140,5 +138,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER #endif //QPLATFORMWINDOW_H diff --git a/src/gui/kernel/qplatformwindow_p.h b/src/gui/kernel/qplatformwindow_p.h index 24e18ca379..ac47afb6f1 100644 --- a/src/gui/kernel/qplatformwindow_p.h +++ b/src/gui/kernel/qplatformwindow_p.h @@ -55,8 +55,6 @@ #include <QtCore/qrect.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QPlatformWindowPrivate @@ -67,6 +65,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // QPLATFORMWINDOW_P_H diff --git a/src/gui/kernel/qscreen.h b/src/gui/kernel/qscreen.h index 557cd019a3..9fe4379646 100644 --- a/src/gui/kernel/qscreen.h +++ b/src/gui/kernel/qscreen.h @@ -52,8 +52,6 @@ #include <QtCore/qnamespace.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -160,7 +158,5 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QSCREEN_H diff --git a/src/gui/kernel/qscreen_p.h b/src/gui/kernel/qscreen_p.h index 7b26159c20..3e5feb2932 100644 --- a/src/gui/kernel/qscreen_p.h +++ b/src/gui/kernel/qscreen_p.h @@ -58,8 +58,6 @@ #include <QtCore/private/qobject_p.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QScreenPrivate : public QObjectPrivate @@ -98,6 +96,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // QSCREEN_P_H diff --git a/src/gui/kernel/qsessionmanager.h b/src/gui/kernel/qsessionmanager.h index 4eac11e403..a1cd8741d2 100644 --- a/src/gui/kernel/qsessionmanager.h +++ b/src/gui/kernel/qsessionmanager.h @@ -49,8 +49,6 @@ #ifndef QT_NO_SESSIONMANAGER -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -101,8 +99,6 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QT_NO_SESSIONMANAGER #endif // QSESSIONMANAGER_H diff --git a/src/gui/kernel/qstylehints.h b/src/gui/kernel/qstylehints.h index c9c8185b9a..7a447aae67 100644 --- a/src/gui/kernel/qstylehints.h +++ b/src/gui/kernel/qstylehints.h @@ -44,8 +44,6 @@ #include <QtCore/qobject.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -74,6 +72,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif diff --git a/src/gui/kernel/qsurface.cpp b/src/gui/kernel/qsurface.cpp index 97b8220124..a943639d5f 100644 --- a/src/gui/kernel/qsurface.cpp +++ b/src/gui/kernel/qsurface.cpp @@ -61,6 +61,7 @@ QT_BEGIN_NAMESPACE The SurfaceClass enum describes the actual subclass of the surface. \value Window The surface is an instance of QWindow. + \value Offscreen The surface is an instance of QOffscreenSurface. */ diff --git a/src/gui/kernel/qsurface.h b/src/gui/kernel/qsurface.h index 36d85342c5..8dbc230c10 100644 --- a/src/gui/kernel/qsurface.h +++ b/src/gui/kernel/qsurface.h @@ -47,8 +47,6 @@ #include <QtCore/qsize.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -60,7 +58,8 @@ class Q_GUI_EXPORT QSurface { public: enum SurfaceClass { - Window + Window, + Offscreen }; enum SurfaceType { @@ -89,6 +88,4 @@ protected: QT_END_NAMESPACE -QT_END_HEADER - #endif //QSURFACE_H diff --git a/src/gui/kernel/qsurfaceformat.cpp b/src/gui/kernel/qsurfaceformat.cpp index 2c26a172a4..25b603bb9c 100644 --- a/src/gui/kernel/qsurfaceformat.cpp +++ b/src/gui/kernel/qsurfaceformat.cpp @@ -583,6 +583,30 @@ int QSurfaceFormat::minorVersion() const } /*! + Returns a QPair<int, int> representing the OpenGL version. + + Useful for version checks, for example format.version() >= qMakePair(3, 2) +*/ +QPair<int, int> QSurfaceFormat::version() const +{ + return qMakePair(d->major, d->minor); +} + +/*! + Sets the desired \a major and \a minor OpenGL versions. + + The default version is 2.0. +*/ +void QSurfaceFormat::setVersion(int major, int minor) +{ + if (d->minor != minor || d->major != major) { + detach(); + d->minor = minor; + d->major = major; + } +} + +/*! Returns true if all the options of the two QSurfaceFormat objects \a a and \a b are equal. diff --git a/src/gui/kernel/qsurfaceformat.h b/src/gui/kernel/qsurfaceformat.h index 8ab89225de..7c3c846df3 100644 --- a/src/gui/kernel/qsurfaceformat.h +++ b/src/gui/kernel/qsurfaceformat.h @@ -42,8 +42,7 @@ #define QSURFACEFORMAT_H #include <QtCore/qglobal.h> - -QT_BEGIN_HEADER +#include <QtCore/qpair.h> QT_BEGIN_NAMESPACE @@ -122,6 +121,9 @@ public: void setMinorVersion(int minorVersion); int minorVersion() const; + QPair<int, int> version() const; + void setVersion(int major, int minor); + bool stereo() const; void setStereo(bool enable); @@ -156,6 +158,4 @@ inline bool QSurfaceFormat::stereo() const QT_END_NAMESPACE -QT_END_HEADER - #endif //QSURFACEFORMAT_H diff --git a/src/gui/kernel/qtouchdevice.h b/src/gui/kernel/qtouchdevice.h index d9892bfbd3..312bdce3e6 100644 --- a/src/gui/kernel/qtouchdevice.h +++ b/src/gui/kernel/qtouchdevice.h @@ -44,8 +44,6 @@ #include <QtCore/qobject.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -90,6 +88,4 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QTouchDevice::Capabilities) QT_END_NAMESPACE -QT_END_HEADER - #endif // QTOUCHDEVICE_H diff --git a/src/gui/kernel/qtouchdevice_p.h b/src/gui/kernel/qtouchdevice_p.h index a358d77e92..435f8a5c37 100644 --- a/src/gui/kernel/qtouchdevice_p.h +++ b/src/gui/kernel/qtouchdevice_p.h @@ -56,8 +56,6 @@ #include <QtCore/qobject.h> #include <QtGui/qtouchdevice.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -79,6 +77,4 @@ public: QT_END_NAMESPACE -QT_END_HEADER - #endif // QTOUCHDEVICE_P_H diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp index 2fcad5706f..69ae30389e 100644 --- a/src/gui/kernel/qwindow.cpp +++ b/src/gui/kernel/qwindow.cpp @@ -115,6 +115,9 @@ QT_BEGIN_NAMESPACE windowing systems that do not make this information visible to the application, isExposed() will simply return the same value as isVisible(). + QWindow::Visibility queried through visibility() is a convenience API + combining the functions of visible() and windowState(). + \section1 Rendering There are two Qt APIs that can be used to render content into a window, @@ -216,6 +219,120 @@ QWindow::~QWindow() } /*! + \enum QWindow::Visibility + \since 5.1 + + This enum describes what part of the screen the window occupies or should + occupy. + + \value Windowed The window occupies part of the screen, but not necessarily + the entire screen. This state will occur only on windowing systems which + support showing multiple windows simultaneously. In this state it is + possible for the user to move and resize the window manually, if + WindowFlags permit it and if it is supported by the windowing system. + + \value Minimized The window is reduced to an entry or icon on the task bar, + dock, task list or desktop, depending on how the windowing system handles + minimized windows. + + \value Maximized The window occupies one entire screen, and the titlebar is + still visible. On most windowing systems this is the state achieved by + clicking the maximize button on the toolbar. + + \value FullScreen The window occupies one entire screen, is not resizable, + and there is no titlebar. On some platforms which do not support showing + multiple simultaneous windows, this can be the usual visibility when the + window is not hidden. + + \value AutomaticVisibility This means to give the window a default visible + state, which might be fullscreen or windowed depending on the platform. + It can be given as a parameter to setVisibility but will never be + read back from the visibility accessor. + + \value Hidden The window is not visible in any way, however it may remember + a latent visibility which can be restored by setting AutomaticVisibility. +*/ + +/*! + \property QWindow::visibility + \brief the screen-occupation state of the window + \since 5.1 + + Visibility is whether the window should appear in the windowing system as + normal, minimized, maximized, fullscreen or hidden. + + To set the visibility to AutomaticVisibility means to give the window + a default visible state, which might be fullscreen or windowed depending on + the platform. + When reading the visibility property you will always get the actual state, + never AutomaticVisibility. +*/ +QWindow::Visibility QWindow::visibility() const +{ + Q_D(const QWindow); + return d->visibility; +} + +void QWindow::setVisibility(Visibility v) +{ + switch (v) { + case Hidden: + hide(); + break; + case AutomaticVisibility: + show(); + break; + case Windowed: + showNormal(); + break; + case Minimized: + showMinimized(); + break; + case Maximized: + showMaximized(); + break; + case FullScreen: + showFullScreen(); + break; + default: + Q_ASSERT(false); + break; + } +} + +void QWindowPrivate::updateVisibility() +{ + Q_Q(QWindow); + + QWindow::Visibility old = visibility; + + if (visible) { + switch (windowState) { + case Qt::WindowMinimized: + visibility = QWindow::Minimized; + break; + case Qt::WindowMaximized: + visibility = QWindow::Maximized; + break; + case Qt::WindowFullScreen: + visibility = QWindow::FullScreen; + break; + case Qt::WindowNoState: + visibility = QWindow::Windowed; + break; + default: + Q_ASSERT(false); + break; + } + } else { + visibility = QWindow::Hidden; + } + + if (visibility != old) + emit q->visibilityChanged(visibility); +} + +/*! Sets the \a surfaceType of the window. Specifies whether the window is meant for raster rendering with @@ -264,6 +381,7 @@ void QWindow::setVisible(bool visible) return; d->visible = visible; emit visibleChanged(visible); + d->updateVisibility(); if (!d->platformWindow) create(); @@ -284,7 +402,7 @@ void QWindow::setVisible(bool visible) } #ifndef QT_NO_CURSOR - if (visible) + if (visible && d->hasCursor) d->applyCursor(); #endif d->platformWindow->setVisible(visible); @@ -642,7 +760,8 @@ void QWindow::lower() } /*! - Sets the window's opacity in the windowing system to \a level. + \property QWindow::opacity + \brief The opacity of the window in the windowing system. If the windowing system supports window opacity, this can be used to fade the window in and out, or to make it semitransparent. @@ -650,15 +769,25 @@ void QWindow::lower() A value of 1.0 or above is treated as fully opaque, whereas a value of 0.0 or below is treated as fully transparent. Values inbetween represent varying levels of translucency between the two extremes. + + The default value is 1.0. */ void QWindow::setOpacity(qreal level) { Q_D(QWindow); - if (level == d->opacity) // #fixme: Add property for 5.1 + if (level == d->opacity) return; d->opacity = level; - if (d->platformWindow) + if (d->platformWindow) { d->platformWindow->setOpacity(level); + emit opacityChanged(level); + } +} + +qreal QWindow::opacity() const +{ + Q_D(const QWindow); + return d->opacity; } /*! @@ -797,6 +926,7 @@ void QWindow::setWindowState(Qt::WindowState state) d->platformWindow->setWindowState(state); d->windowState = state; emit windowStateChanged(d->windowState); + d->updateVisibility(); } /*! @@ -1436,13 +1566,15 @@ QObject *QWindow::focusObject() const Shows the window. This equivalent to calling showFullScreen() or showNormal(), depending - on whether the platform defaults to windows being fullscreen or not. + on whether the platform defaults to windows being fullscreen or not, and + whether the window is a popup. - \sa showFullScreen(), showNormal(), hide(), QStyleHints::showIsFullScreen() + \sa showFullScreen(), showNormal(), hide(), QStyleHints::showIsFullScreen(), flags() */ void QWindow::show() { - if (qApp->styleHints()->showIsFullScreen()) + bool isPopup = d_func()->windowFlags & Qt::Popup & ~Qt::Window; + if (!isPopup && qApp->styleHints()->showIsFullScreen()) showFullScreen(); else showNormal(); @@ -1711,6 +1843,7 @@ bool QWindow::event(QEvent *ev) case QEvent::WindowStateChange: { Q_D(QWindow); emit windowStateChanged(d->windowState); + d->updateVisibility(); break; } @@ -1946,13 +2079,7 @@ void QWindowPrivate::maybeQuitOnLastWindowClosed() void QWindow::setCursor(const QCursor &cursor) { Q_D(QWindow); - d->cursor = cursor; - // Only attempt to set cursor and emit signal if there is an actual platform cursor - if (d->screen->handle()->cursor()) { - d->applyCursor(); - QEvent event(QEvent::CursorChange); - QGuiApplication::sendEvent(this, &event); - } + d->setCursor(&cursor); } /*! @@ -1960,7 +2087,8 @@ void QWindow::setCursor(const QCursor &cursor) */ void QWindow::unsetCursor() { - setCursor(Qt::ArrowCursor); + Q_D(QWindow); + d->setCursor(0); } /*! @@ -1974,14 +2102,39 @@ QCursor QWindow::cursor() const return d->cursor; } +void QWindowPrivate::setCursor(const QCursor *newCursor) +{ + + Q_Q(QWindow); + if (newCursor) { + const Qt::CursorShape newShape = newCursor->shape(); + if (newShape <= Qt::LastCursor && hasCursor && newShape == cursor.shape()) + return; // Unchanged and no bitmap/custom cursor. + cursor = *newCursor; + hasCursor = true; + } else { + if (!hasCursor) + return; + cursor = QCursor(Qt::ArrowCursor); + hasCursor = false; + } + // Only attempt to set cursor and emit signal if there is an actual platform cursor + if (screen->handle()->cursor()) { + applyCursor(); + QEvent event(QEvent::CursorChange); + QGuiApplication::sendEvent(q, &event); + } +} + void QWindowPrivate::applyCursor() { Q_Q(QWindow); if (platformWindow) { if (QPlatformCursor *platformCursor = screen->handle()->cursor()) { - QCursor *oc = QGuiApplication::overrideCursor(); - QCursor c = oc ? *oc : cursor; - platformCursor->changeCursor(&c, q); + QCursor *c = QGuiApplication::overrideCursor(); + if (!c && hasCursor) + c = &cursor; + platformCursor->changeCursor(c, q); } } } diff --git a/src/gui/kernel/qwindow.h b/src/gui/kernel/qwindow.h index 2e2f12a8ab..4b8f0ca3e7 100644 --- a/src/gui/kernel/qwindow.h +++ b/src/gui/kernel/qwindow.h @@ -59,8 +59,6 @@ #include <QtGui/qcursor.h> #endif -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -93,6 +91,8 @@ class Q_GUI_EXPORT QWindow : public QObject, public QSurface Q_OBJECT Q_DECLARE_PRIVATE(QWindow) + Q_ENUMS(Visibility) + // All properties which are declared here are inherited by QQuickWindow and therefore available in QML. // So please think carefully about what it does to the QML namespace if you add any new ones, // particularly the possible meanings these names might have in any specializations of Window. @@ -111,9 +111,19 @@ class Q_GUI_EXPORT QWindow : public QObject, public QSurface Q_PROPERTY(int maximumWidth READ maximumWidth WRITE setMaximumWidth NOTIFY maximumWidthChanged) Q_PROPERTY(int maximumHeight READ maximumHeight WRITE setMaximumHeight NOTIFY maximumHeightChanged) Q_PROPERTY(bool visible READ isVisible WRITE setVisible NOTIFY visibleChanged) + Q_PROPERTY(Visibility visibility READ visibility WRITE setVisibility NOTIFY visibilityChanged) Q_PROPERTY(Qt::ScreenOrientation contentOrientation READ contentOrientation WRITE reportContentOrientationChange NOTIFY contentOrientationChanged) + Q_PROPERTY(qreal opacity READ opacity WRITE setOpacity NOTIFY opacityChanged) public: + enum Visibility { + Hidden = 0, + AutomaticVisibility, + Windowed, + Minimized, + Maximized, + FullScreen + }; explicit QWindow(QScreen *screen = 0); explicit QWindow(QWindow *parent); @@ -124,6 +134,9 @@ public: bool isVisible() const; + Visibility visibility() const; + void setVisibility(Visibility v); + void create(); WId winId() const; @@ -148,6 +161,8 @@ public: QString title() const; void setOpacity(qreal level); + qreal opacity() const; + void requestActivate(); bool isActive() const; @@ -283,10 +298,13 @@ Q_SIGNALS: void maximumHeightChanged(int arg); void visibleChanged(bool arg); + void visibilityChanged(QWindow::Visibility visibility); void contentOrientationChanged(Qt::ScreenOrientation orientation); void focusObjectChanged(QObject *object); + void opacityChanged(qreal opacity); + private Q_SLOTS: void screenDestroyed(QObject *screen); @@ -330,6 +348,4 @@ private: QT_END_NAMESPACE -QT_END_HEADER - #endif // QWINDOW_H diff --git a/src/gui/kernel/qwindow_p.h b/src/gui/kernel/qwindow_p.h index 6933c892a0..bcbface370 100644 --- a/src/gui/kernel/qwindow_p.h +++ b/src/gui/kernel/qwindow_p.h @@ -59,8 +59,6 @@ #include <QtCore/private/qobject_p.h> #include <QtGui/QIcon> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE #define QWINDOWSIZE_MAX ((1<<24)-1) @@ -85,6 +83,7 @@ public: , visible(false) , exposed(false) , windowState(Qt::WindowNoState) + , visibility(QWindow::Hidden) , resizeEventPending(true) , receivedExpose(false) , positionPolicy(WindowFrameExclusive) @@ -98,6 +97,7 @@ public: , screen(0) #ifndef QT_NO_CURSOR , cursor(Qt::ArrowCursor) + , hasCursor(false) #endif { isWindow = true; @@ -109,6 +109,7 @@ public: void maybeQuitOnLastWindowClosed(); #ifndef QT_NO_CURSOR + void setCursor(const QCursor *c = 0); void applyCursor(); #endif @@ -122,6 +123,8 @@ public: virtual QWindow *eventReceiver() { Q_Q(QWindow); return q; } + void updateVisibility(); + QWindow::SurfaceType surfaceType; Qt::WindowFlags windowFlags; QWindow *parentWindow; @@ -134,6 +137,7 @@ public: QIcon windowIcon; QRect geometry; Qt::WindowState windowState; + QWindow::Visibility visibility; bool resizeEventPending; bool receivedExpose; PositionPolicy positionPolicy; @@ -153,12 +157,11 @@ public: #ifndef QT_NO_CURSOR QCursor cursor; + bool hasCursor; #endif }; QT_END_NAMESPACE -QT_END_HEADER - #endif // QWINDOW_P_H diff --git a/src/gui/kernel/qwindowdefs.h b/src/gui/kernel/qwindowdefs.h index 9aaca3ff60..42f4bc7c9b 100644 --- a/src/gui/kernel/qwindowdefs.h +++ b/src/gui/kernel/qwindowdefs.h @@ -46,7 +46,6 @@ #include <QtCore/qobjectdefs.h> #include <QtCore/qnamespace.h> -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE @@ -88,7 +87,6 @@ typedef QList<QWidget *> QWidgetList; typedef QList<QWindow *> QWindowList; QT_END_NAMESPACE -QT_END_HEADER // Window system dependent definitions @@ -104,7 +102,6 @@ typedef QT_PREPEND_NAMESPACE(quintptr) WId; -QT_BEGIN_HEADER QT_BEGIN_NAMESPACE template<class K, class V> class QHash; @@ -114,7 +111,6 @@ template<class V> class QSet; typedef QSet<QWidget *> QWidgetSet; QT_END_NAMESPACE -QT_END_HEADER #if defined(QT_NEEDS_QMAIN) #define main qMain diff --git a/src/gui/kernel/qwindowdefs_win.h b/src/gui/kernel/qwindowdefs_win.h index 8f551900ae..fea995a0f5 100644 --- a/src/gui/kernel/qwindowdefs_win.h +++ b/src/gui/kernel/qwindowdefs_win.h @@ -44,8 +44,6 @@ #include <QtCore/qglobal.h> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE @@ -124,6 +122,4 @@ Q_WIDGETS_EXPORT HDC qt_win_display_dc(); QT_END_NAMESPACE -QT_END_HEADER - #endif // QWINDOWDEFS_WIN_H diff --git a/src/gui/kernel/qwindowsysteminterface.cpp b/src/gui/kernel/qwindowsysteminterface.cpp index 27bb4bae00..5483dc49d0 100644 --- a/src/gui/kernel/qwindowsysteminterface.cpp +++ b/src/gui/kernel/qwindowsysteminterface.cpp @@ -575,6 +575,12 @@ void QWindowSystemInterface::handleFileOpenEvent(const QString& fileName) QGuiApplicationPrivate::processWindowSystemEvent(&e); } +void QWindowSystemInterface::handleFileOpenEvent(const QUrl &url) +{ + QWindowSystemInterfacePrivate::FileOpenEvent e(url); + QGuiApplicationPrivate::processWindowSystemEvent(&e); +} + void QWindowSystemInterface::handleTabletEvent(QWindow *w, ulong timestamp, bool down, const QPointF &local, const QPointF &global, int device, int pointerType, qreal pressure, int xTilt, int yTilt, qreal tangentialPressure, qreal rotation, int z, qint64 uid, @@ -641,6 +647,13 @@ void QWindowSystemInterface::handleContextMenuEvent(QWindow *w, bool mouseTrigge } #endif +#ifndef QT_NO_DEBUG_STREAM +Q_GUI_EXPORT QDebug operator<<(QDebug dbg, const QWindowSystemInterface::TouchPoint &p) { + dbg.nospace() << "TouchPoint(" << p.id << " @" << p.normalPosition << " press " << p.pressure << " vel " << p.velocity << " state " << (int)p.state; + return dbg.space(); +} +#endif + Q_GUI_EXPORT void qt_handleMouseEvent(QWindow *w, const QPointF & local, const QPointF & global, Qt::MouseButtons b, Qt::KeyboardModifiers mods = Qt::NoModifier) { QWindowSystemInterface::handleMouseEvent(w, local, global, b, mods); } diff --git a/src/gui/kernel/qwindowsysteminterface.h b/src/gui/kernel/qwindowsysteminterface.h index 5715b69ee5..687c72bbef 100644 --- a/src/gui/kernel/qwindowsysteminterface.h +++ b/src/gui/kernel/qwindowsysteminterface.h @@ -62,8 +62,6 @@ #include <QtCore/QEventLoop> #include <QtGui/QVector2D> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class QMimeData; @@ -160,6 +158,7 @@ public: static void handleThemeChange(QWindow *tlw); static void handleFileOpenEvent(const QString& fileName); + static void handleFileOpenEvent(const QUrl &url); static void handleTabletEvent(QWindow *w, ulong timestamp, bool down, const QPointF &local, const QPointF &global, int device, int pointerType, qreal pressure, int xTilt, int yTilt, @@ -191,6 +190,10 @@ private: static bool sendWindowSystemEventsImplementation(QEventLoop::ProcessEventsFlags flags); }; +#ifndef QT_NO_DEBUG_STREAM +Q_GUI_EXPORT QDebug operator<<(QDebug dbg, const QWindowSystemInterface::TouchPoint &p); +#endif + QT_END_NAMESPACE -QT_END_HEADER + #endif // QWINDOWSYSTEMINTERFACE_H diff --git a/src/gui/kernel/qwindowsysteminterface_p.h b/src/gui/kernel/qwindowsysteminterface_p.h index 4131568461..d0b728ec4d 100644 --- a/src/gui/kernel/qwindowsysteminterface_p.h +++ b/src/gui/kernel/qwindowsysteminterface_p.h @@ -59,8 +59,6 @@ #include <QMutex> #include <QList> -QT_BEGIN_HEADER - QT_BEGIN_NAMESPACE class Q_GUI_EXPORT QWindowSystemInterfacePrivate { @@ -287,9 +285,12 @@ public: class FileOpenEvent : public WindowSystemEvent { public: FileOpenEvent(const QString& fileName) - : WindowSystemEvent(FileOpen), fileName(fileName) + : WindowSystemEvent(FileOpen), url(QUrl::fromLocalFile(fileName)) + { } + FileOpenEvent(const QUrl &url) + : WindowSystemEvent(FileOpen), url(url) { } - QString fileName; + QUrl url; }; class TabletEvent : public InputEvent { @@ -424,7 +425,6 @@ public: static QList<QTouchEvent::TouchPoint> convertTouchPoints(const QList<QWindowSystemInterface::TouchPoint> &points, QEvent::Type *type); }; -QT_END_HEADER QT_END_NAMESPACE #endif // QWINDOWSYSTEMINTERFACE_P_H |