From 04c05e9a53f4fe59c58967809b91ea792b6cffbd Mon Sep 17 00:00:00 2001 From: Johan Klokkhammer Helsing Date: Wed, 7 Sep 2016 16:32:05 +0200 Subject: Make QWaylandKeymap a QObject This makes it possible to use defaultSeat declaratively by allowing it to be uninitialized until the QWaylandCompositor::create has been called. Change-Id: I962cc7cc82a0bbc9240abb50cf92dee77e4a0ba6 Reviewed-by: Pier Luigi Fiorini Reviewed-by: Paul Olav Tvete --- tests/auto/compositor/compositor/testseat.h | 2 +- .../auto/compositor/compositor/tst_compositor.cpp | 9 ++- tests/manual/keymap/keymapcompositor.qml | 87 ++++++++++++++++++++++ 3 files changed, 93 insertions(+), 5 deletions(-) create mode 100644 tests/manual/keymap/keymapcompositor.qml (limited to 'tests') diff --git a/tests/auto/compositor/compositor/testseat.h b/tests/auto/compositor/compositor/testseat.h index 54641c07d..7fa7030fa 100644 --- a/tests/auto/compositor/compositor/testseat.h +++ b/tests/auto/compositor/compositor/testseat.h @@ -36,7 +36,7 @@ QT_END_NAMESPACE class TestSeat : public QWaylandSeat { - + Q_OBJECT public: TestSeat(QWaylandCompositor *compositor, QWaylandSeat::CapabilityFlags caps); diff --git a/tests/auto/compositor/compositor/tst_compositor.cpp b/tests/auto/compositor/compositor/tst_compositor.cpp index 3052b7b45..16aedd8ec 100644 --- a/tests/auto/compositor/compositor/tst_compositor.cpp +++ b/tests/auto/compositor/compositor/tst_compositor.cpp @@ -347,20 +347,21 @@ void tst_WaylandCompositor::seatCreation() MockClient client; Q_UNUSED(client); - TestSeat* dev = static_cast(compositor.defaultSeat()); + TestSeat* seat = qobject_cast(compositor.defaultSeat()); + QTRY_VERIFY(seat); // The compositor will create the default input device - QTRY_COMPARE(compositor.defaultSeat(), dev); + QTRY_VERIFY(seat->isInitialized()); QList allEvents; - allEvents += dev->createMouseEvents(5); + allEvents += seat->createMouseEvents(5); foreach (QMouseEvent *me, allEvents) { compositor.seatFor(me); } // The default input device will get called exatly the number of times it has created // the events - QTRY_COMPARE(dev->queryCount(), 5); + QTRY_COMPARE(seat->queryCount(), 5); } void tst_WaylandCompositor::seatKeyboardFocus() diff --git a/tests/manual/keymap/keymapcompositor.qml b/tests/manual/keymap/keymapcompositor.qml new file mode 100644 index 000000000..7f8982636 --- /dev/null +++ b/tests/manual/keymap/keymapcompositor.qml @@ -0,0 +1,87 @@ +/**************************************************************************** +** +** Copyright (C) 2016 The Qt Company Ltd. +** Contact: http://www.qt-project.org/legal +** +** This file is part of the examples of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.0 +import QtWayland.Compositor 1.0 +import QtQuick.Window 2.2 + +WaylandCompositor { + id: wlcompositor + property string layout: "no" + + defaultSeat.keymap { + layout: layout + options: "ctrl:swapcaps" + } + + WaylandOutput { + compositor: wlcompositor + window: Window { + width: 1024 + height: 768 + visible: true + color: "#c17711" + Text { + anchors.centerIn: parent + text: "Click the background to change layout: " + layout + } + MouseArea { + anchors.fill: parent + onClicked: layout = layout === "us" ? "no" : "us" + } + Item { + id: surfaceArea + anchors.fill: parent + } + } + } + Component { + id: chromeComponent + ShellSurfaceItem { + onSurfaceDestroyed: destroy() + } + } + WlShell { + onWlShellSurfaceCreated: chromeComponent.createObject(surfaceArea, { "shellSurface": shellSurface } ); + } + XdgShellV5 { + onXdgSurfaceCreated: chromeComponent.createObject(surfaceArea, { "shellSurface": xdgSurface } ); + } +} -- cgit v1.2.3