diff options
author | Jørgen Lind <jorgen.lind@theqtcompany.com> | 2015-09-18 12:53:55 +0200 |
---|---|---|
committer | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2015-09-18 14:58:50 +0000 |
commit | c246b40578e4425a37ce77a1c193ec6111291a7e (patch) | |
tree | c8baa3882309762a8eb07f59d728342890bb9645 | |
parent | 20e7f3a187b91168dd472500e755f9459fb96ad8 (diff) |
Make the multi-output example work
Change-Id: I765a606a62442306949c6e8338a8384453a721bd
Reviewed-by: Paul Olav Tvete <paul.tvete@theqtcompany.com>
-rw-r--r-- | examples/wayland/multi-output/multi-output.pro | 5 | ||||
-rw-r--r-- | examples/wayland/multi-output/multi-output.qrc | 5 | ||||
-rw-r--r-- | examples/wayland/multi-output/qml/GridScreen.qml (renamed from examples/wayland/multi-output/qml/Screen.qml) | 50 | ||||
-rw-r--r-- | examples/wayland/multi-output/qml/ShellChrome.qml (renamed from examples/wayland/multi-output/qml/Chrome.qml) | 34 | ||||
-rw-r--r-- | examples/wayland/multi-output/qml/ShellScreen.qml | 76 | ||||
-rw-r--r-- | examples/wayland/multi-output/qml/main.qml | 63 | ||||
-rw-r--r-- | examples/wayland/wayland.pro | 1 |
7 files changed, 160 insertions, 74 deletions
diff --git a/examples/wayland/multi-output/multi-output.pro b/examples/wayland/multi-output/multi-output.pro index 7416cdb21..954fe15fb 100644 --- a/examples/wayland/multi-output/multi-output.pro +++ b/examples/wayland/multi-output/multi-output.pro @@ -5,8 +5,9 @@ SOURCES += \ OTHER_FILES = \ qml/main.qml \ - qml/Screen.qml \ - qml/Chrome.qml \ + qml/GridScreen.qml \ + qml/ShellScreen.qml \ + qml/ShellChrome.qml \ images/background.jpg \ RESOURCES += multi-output.qrc diff --git a/examples/wayland/multi-output/multi-output.qrc b/examples/wayland/multi-output/multi-output.qrc index 65ccf9474..86df88177 100644 --- a/examples/wayland/multi-output/multi-output.qrc +++ b/examples/wayland/multi-output/multi-output.qrc @@ -2,7 +2,8 @@ <qresource prefix="/"> <file>images/background.jpg</file> <file>qml/main.qml</file> - <file>qml/Screen.qml</file> - <file>qml/Chrome.qml</file> + <file>qml/GridScreen.qml</file> + <file>qml/ShellScreen.qml</file> + <file>qml/ShellChrome.qml</file> </qresource> </RCC> diff --git a/examples/wayland/multi-output/qml/Screen.qml b/examples/wayland/multi-output/qml/GridScreen.qml index bb8b24299..83f9c3206 100644 --- a/examples/wayland/multi-output/qml/Screen.qml +++ b/examples/wayland/multi-output/qml/GridScreen.qml @@ -42,40 +42,38 @@ import QtQuick 2.0 import QtQuick.Window 2.2 import QtWayland.Compositor 1.0 -Window { - id: screen - property alias surfacesArea: background +WaylandOutput { + id: output + property alias gridSurfaces: listModel - property QtObject compositor + window: Window { + width: 1024 + height: 760 + visible: true - width: 1024 - height: 760 - visible: true - - WaylandMouseTracker { - id: mouseTracker - anchors.fill: parent - - enableWSCursor: true Image { id: background anchors.fill: parent fillMode: Image.Tile source: "qrc:/images/background.jpg" smooth: true - } - WaylandCursorItem { - id: cursor - inputEventsEnabled: false - x: mouseTracker.mouseX - hotspotX - y: mouseTracker.mouseY - hotspotY - - compositor: screen.compositor - } - focus: true - Keys.onPressed: { - if (event.key == Qt.Key_N && event.modifiers & Qt.ControlModifier) - compositor.addScreen(); + GridView { + id: gridView + anchors.fill: parent + model: ListModel { + id: listModel + } + cellWidth: 200 + cellHeight: 200 + delegate: WaylandQuickItem { + surface: gridSurface + width: gridView.cellWidth + height: gridView.cellHeight + sizeFollowsSurface: false + inputEventsEnabled: false + view.discardFrontBuffers: true + } + } } } } diff --git a/examples/wayland/multi-output/qml/Chrome.qml b/examples/wayland/multi-output/qml/ShellChrome.qml index 27160f15a..52177565e 100644 --- a/examples/wayland/multi-output/qml/Chrome.qml +++ b/examples/wayland/multi-output/qml/ShellChrome.qml @@ -41,26 +41,15 @@ import QtQuick 2.0 import QtWayland.Compositor 1.0 -Item { +ShellSurfaceItem { id: rootChrome - //x: clampXPos() - //y: clampYPos() - x: chrome.requestedXPosition - y: chrome.requestedYPosition - width: childrenRect.width - height: childrenRect.height - - property alias surface: chrome.surface - - WaylandSurfaceChrome { - id: chrome - automaticUseShellView: true - automaticDestroyOnSurfaceDestroy: false + shellSurface: ShellSurface { + } - onSurfaceDestroyed: { - destroyAnimation.start(); - } + onSurfaceDestroyed: { + view.bufferLock = true; + destroyAnimation.start(); } SequentialAnimation { @@ -81,15 +70,4 @@ Item { } ] - function clampXPos() { - if (!parent) - return chrome.requestedXPosition; - return Math.max(Math.min(chrome.requestedXPosition, parent.width - 10), 0) - } - function clampYPos() { - if (!parent) - return chrome.requestedYPosition; - return Math.max(Math.min(chrome.requestedYPosition, parent.height - 30), 0) - } - } diff --git a/examples/wayland/multi-output/qml/ShellScreen.qml b/examples/wayland/multi-output/qml/ShellScreen.qml new file mode 100644 index 000000000..de0d1c3ff --- /dev/null +++ b/examples/wayland/multi-output/qml/ShellScreen.qml @@ -0,0 +1,76 @@ +/**************************************************************************** +** +** Copyright (C) 2014 Digia Plc and/or its subsidiary(-ies). +** 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 Digia Plc and its Subsidiary(-ies) 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 QtQuick.Window 2.2 +import QtWayland.Compositor 1.0 + +WaylandOutput { + id: output + property alias surfaceArea: background + + window: Window { + width: 1024 + height: 760 + visible: true + + WaylandMouseTracker { + id: mouseTracker + anchors.fill: parent + + enableWSCursor: true + Image { + id: background + anchors.fill: parent + fillMode: Image.Tile + source: "qrc:/images/background.jpg" + smooth: true + } + WaylandCursorItem { + id: cursor + inputEventsEnabled: false + x: mouseTracker.mouseX - hotspotX + y: mouseTracker.mouseY - hotspotY + + inputDevice : output.compositor.defaultInputDevice + } + } + } +} diff --git a/examples/wayland/multi-output/qml/main.qml b/examples/wayland/multi-output/qml/main.qml index fbde0a730..0a4791572 100644 --- a/examples/wayland/multi-output/qml/main.qml +++ b/examples/wayland/multi-output/qml/main.qml @@ -42,31 +42,62 @@ import QtQuick 2.0 import QtWayland.Compositor 1.0 WaylandCompositor { - id: compositor + id: comp - Component { - id: screenComponent - Screen { } + defaultOutput: shellScreen + ShellScreen { + id: shellScreen + compositor: comp + } + + GridScreen { + id: gridScreen + compositor: comp } Component { id: chromeComponent - Chrome { } + ShellChrome { + } } - exposeDefaultShell: true - - Component.onCompleted: { - addScreen(); + Component { + id: surfaceComponent + WaylandSurface { + id: surface + onMappedChanged: { + if (isMapped && !cursorSurface) { + gridScreen.gridSurfaces.append( { "gridSurface" : surface } ); + } else { + for (var i = 0; i < gridScreen.gridSurfaces.count; i++) { + if (gridScreen.gridSurfaces.get(i).gridSurface === surface) { + gridScreen.gridSurfaces.remove(i,1); + break; + } + } + } + } + } } - function addScreen() { - var screen = screenComponent.createObject(0, { "compositor" : compositor } ); - var output = compositor.primaryOutputSpace.addOutputWindow(screen); - output.automaticFrameCallbacks = true; - } + extensions: [ + Shell { + id: defaultShell + + onCreateShellSurface: { + var item = chromeComponent.createObject(defaultOutput.surfaceArea, { "surface": surface } ); + item.shellSurface.initialize(defaultShell, surface, client, id); + item.surface + } + + Component.onCompleted: { + initialize(); + } + } + ] - onSurfaceCreated: { - var chrome = chromeComponent.createObject(surface.primaryOutput.window.surfacesArea, { "surface" : surface } ); + onCreateSurface: { + var surface = surfaceComponent.createObject(comp, { } ); + surface.initialize(comp, client, id, version); } } diff --git a/examples/wayland/wayland.pro b/examples/wayland/wayland.pro index 2014e701e..e1764217c 100644 --- a/examples/wayland/wayland.pro +++ b/examples/wayland/wayland.pro @@ -4,6 +4,7 @@ SUBDIRS += qwindow-compositor qtHaveModule(quick) { SUBDIRS += pure-qml + SUBDIRS += multi-output } SUBDIRS += server-buffer |