diff options
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/kernel/kernel.pri | 2 | ||||
-rw-r--r-- | src/gui/kernel/qplatforminputcontext_qpa.cpp | 72 | ||||
-rw-r--r-- | src/gui/kernel/qplatforminputcontext_qpa.h | 66 | ||||
-rw-r--r-- | src/gui/kernel/qplatformintegration_qpa.cpp | 16 | ||||
-rw-r--r-- | src/gui/kernel/qplatformintegration_qpa.h | 2 |
5 files changed, 158 insertions, 0 deletions
diff --git a/src/gui/kernel/kernel.pri b/src/gui/kernel/kernel.pri index bfc2e44deb..7f9434e9b4 100644 --- a/src/gui/kernel/kernel.pri +++ b/src/gui/kernel/kernel.pri @@ -43,6 +43,7 @@ qpa { kernel/qplatformintegration_qpa.h \ kernel/qplatformdrag_qpa.h \ kernel/qplatformscreen_qpa.h \ + kernel/qplatforminputcontext_qpa.h \ kernel/qplatformintegrationfactory_qpa_p.h \ kernel/qplatformintegrationplugin_qpa.h \ kernel/qplatformwindow_qpa.h \ @@ -63,6 +64,7 @@ qpa { kernel/qgenericpluginfactory_qpa.cpp \ kernel/qgenericplugin_qpa.cpp \ kernel/qwindowsysteminterface_qpa.cpp \ + kernel/qplatforminputcontext_qpa.cpp \ kernel/qplatformintegration_qpa.cpp \ kernel/qplatformscreen_qpa.cpp \ kernel/qplatformintegrationfactory_qpa.cpp \ diff --git a/src/gui/kernel/qplatforminputcontext_qpa.cpp b/src/gui/kernel/qplatforminputcontext_qpa.cpp new file mode 100644 index 0000000000..a618d2056e --- /dev/null +++ b/src/gui/kernel/qplatforminputcontext_qpa.cpp @@ -0,0 +1,72 @@ +/**************************************************************************** +** +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtGui module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** GNU Lesser General Public License Usage +** 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, Nokia gives you certain additional +** rights. These rights are described in the Nokia 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. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include <qplatforminputcontext_qpa.h> + +QPlatformInputContext::QPlatformInputContext() +{ +} + +void QPlatformInputContext::reset() +{ +} + +void QPlatformInputContext::update() +{ +} + +void QPlatformInputContext::mouseHandler(int, QMouseEvent *event) +{ + // Default behavior for simple ephemeral input contexts. Some + // complex input contexts should not be reset here. + if (event->type() == QEvent::MouseButtonPress || event->type() == QEvent::MouseButtonDblClick) + reset(); +} + +QObject *QPlatformInputContext::focusObject() const +{ + return focus.data(); +} + +void QPlatformInputContext::setFocusObject(QObject *o) +{ + focus = o; +} diff --git a/src/gui/kernel/qplatforminputcontext_qpa.h b/src/gui/kernel/qplatforminputcontext_qpa.h new file mode 100644 index 0000000000..f39d974172 --- /dev/null +++ b/src/gui/kernel/qplatforminputcontext_qpa.h @@ -0,0 +1,66 @@ +/**************************************************************************** +** +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the QtGui module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** GNU Lesser General Public License Usage +** 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, Nokia gives you certain additional +** rights. These rights are described in the Nokia 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. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QPLATFORMINPUTCONTEXT_H +#define QPLATFORMINPUTCONTEXT_H + +#include <qsharedpointer.h> +class QMouseEvent; + +class Q_GUI_EXPORT QPlatformInputContext +{ +public: + QPlatformInputContext(); + + virtual void reset(); + virtual void update(); + + virtual void mouseHandler(int x, QMouseEvent *event); + + QObject *focusObject() const; + virtual void setFocusObject(QObject *o); + +// virtual QList<QAction *> actions(); +private: + QWeakPointer<QObject> focus; +}; + +#endif diff --git a/src/gui/kernel/qplatformintegration_qpa.cpp b/src/gui/kernel/qplatformintegration_qpa.cpp index 773f1a31f6..c51924639b 100644 --- a/src/gui/kernel/qplatformintegration_qpa.cpp +++ b/src/gui/kernel/qplatformintegration_qpa.cpp @@ -98,6 +98,12 @@ QPlatformClipboard *QPlatformIntegration::clipboard() const #endif #ifndef QT_NO_DRAGANDDROP +/*! + Accessor for the platform integrations drag object. + + Default implementation returns 0, implying no drag and drop support. + +*/ QPlatformDrag *QPlatformIntegration::drag() const { return 0; @@ -245,4 +251,14 @@ QPlatformPrinterSupport *QPlatformIntegration::printerSupport() const return ps; } +/*! + Returns the platforms input context. + + The default implementation returns 0, implying no input method support. +*/ +QPlatformInputContext *QPlatformIntegration::inputContext() const +{ + return 0; +} + QT_END_NAMESPACE diff --git a/src/gui/kernel/qplatformintegration_qpa.h b/src/gui/kernel/qplatformintegration_qpa.h index 23353b715c..a74ff2916a 100644 --- a/src/gui/kernel/qplatformintegration_qpa.h +++ b/src/gui/kernel/qplatformintegration_qpa.h @@ -64,6 +64,7 @@ class QPlatformDrag; class QPlatformGLContext; class QGuiGLFormat; class QAbstractEventDispatcher; +class QPlatformInputContext; class Q_GUI_EXPORT QPlatformIntegration { @@ -100,6 +101,7 @@ public: #ifndef QT_NO_DRAGANDDROP virtual QPlatformDrag *drag() const; #endif + virtual QPlatformInputContext *inputContext() const; // Access native handles. The window handle is already available from Wid; virtual QPlatformNativeInterface *nativeInterface() const; |