diff options
author | Gerry Boland <gerry.boland@canonical.com> | 2016-11-02 16:46:53 +0000 |
---|---|---|
committer | Matti Paaso <matti.paaso@qt.io> | 2017-01-24 05:52:52 +0000 |
commit | c28fde3fdac19fd5a5f614bb7983080031c924b3 (patch) | |
tree | 441d2d4ea4e1e17db49ed3b12c7c724cbc6db894 /src/plugins/platforms/mirclient/qmirclientscreenobserver.h | |
parent | 4b507e8257243e36f40089d57099c2d668c5884d (diff) |
Mirclient: update based on upstream development in lp:qtubuntu
This is based on revision 360 of lp:qtubuntu.
Main features/bugs fixed:
- fix QQuickWidget-based app rendering
- wire up Qt window types to Mir to enable desktop-based applications
to function with a window manager
- use QEGLPlatformContext and QEGLPBuffer instead of custom code
- correctly populate and update list of QScreens
- support for switching keyboard layouts
- improve window resizing to fix visual glitching
Change-Id: If816a858eb10b6356275d4b80c89a72562b3c29f
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
Reviewed-by: Matti Paaso <matti.paaso@qt.io>
Diffstat (limited to 'src/plugins/platforms/mirclient/qmirclientscreenobserver.h')
-rw-r--r-- | src/plugins/platforms/mirclient/qmirclientscreenobserver.h | 78 |
1 files changed, 78 insertions, 0 deletions
diff --git a/src/plugins/platforms/mirclient/qmirclientscreenobserver.h b/src/plugins/platforms/mirclient/qmirclientscreenobserver.h new file mode 100644 index 0000000000..ad927319c1 --- /dev/null +++ b/src/plugins/platforms/mirclient/qmirclientscreenobserver.h @@ -0,0 +1,78 @@ +/**************************************************************************** +** +** Copyright (C) 2016 Canonical, Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the plugins 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 The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/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 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPL3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or (at your option) the GNU General +** Public license version 3 or any later version approved by the KDE Free +** Qt Foundation. The licenses are as published by the Free Software +** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 +** included in the packaging of this file. Please review the following +** information to ensure the GNU General Public License requirements will +** be met: https://www.gnu.org/licenses/gpl-2.0.html and +** https://www.gnu.org/licenses/gpl-3.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + + +#ifndef QMIRCLIENTSCREENOBSERVER_H +#define QMIRCLIENTSCREENOBSERVER_H + +#include <QObject> + +#include <mir_toolkit/mir_connection.h> + +class QMirClientScreen; + +class QMirClientScreenObserver : public QObject +{ + Q_OBJECT + +public: + QMirClientScreenObserver(MirConnection *connection); + + QList<QMirClientScreen*> screens() const { return mScreenList; } + QMirClientScreen *findScreenWithId(int id); + + void handleScreenPropertiesChange(QMirClientScreen *screen, int dpi, + MirFormFactor formFactor, float scale); + +Q_SIGNALS: + void screenAdded(QMirClientScreen *screen); + void screenRemoved(QMirClientScreen *screen); + +private Q_SLOTS: + void update(); + +private: + QMirClientScreen *findScreenWithId(const QList<QMirClientScreen *> &list, int id); + void removeScreen(QMirClientScreen *screen); + + MirConnection *mMirConnection; + QList<QMirClientScreen*> mScreenList; +}; + +#endif // QMIRCLIENTSCREENOBSERVER_H |