diff options
Diffstat (limited to 'src/plugins/shellintegration/ivi-shell/qwaylandivishellintegration.cpp')
| -rw-r--r-- | src/plugins/shellintegration/ivi-shell/qwaylandivishellintegration.cpp | 73 |
1 files changed, 18 insertions, 55 deletions
diff --git a/src/plugins/shellintegration/ivi-shell/qwaylandivishellintegration.cpp b/src/plugins/shellintegration/ivi-shell/qwaylandivishellintegration.cpp index ea725ac31..8bf9a0301 100644 --- a/src/plugins/shellintegration/ivi-shell/qwaylandivishellintegration.cpp +++ b/src/plugins/shellintegration/ivi-shell/qwaylandivishellintegration.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** Copyright (C) 2017 ITAGE Corporation, author: <yusuke.binsaki@itage.co.jp> -** Contact: http://www.qt-project.org/legal -** -** 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$ -** -****************************************************************************/ +// Copyright (C) 2017 ITAGE Corporation, author: <yusuke.binsaki@itage.co.jp> +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qwaylandivishellintegration.h" @@ -56,25 +20,24 @@ QT_BEGIN_NAMESPACE namespace QtWaylandClient { +class QWaylandIviController : public QWaylandClientExtensionTemplate<QWaylandIviController>, + public QtWayland::ivi_controller +{ +public: + QWaylandIviController() : QWaylandClientExtensionTemplate(1) { } + void initialize() { QWaylandClientExtensionTemplate::initialize(); } +}; + QWaylandIviShellIntegration::QWaylandIviShellIntegration() + : QWaylandShellIntegrationTemplate(1), m_iviController(new QWaylandIviController) { } bool QWaylandIviShellIntegration::initialize(QWaylandDisplay *display) { - for (QWaylandDisplay::RegistryGlobal global : display->globals()) { - if (global.interface == QLatin1String("ivi_application") && !m_iviApplication) - m_iviApplication.reset(new QtWayland::ivi_application(display->wl_registry(), global.id, global.version)); - if (global.interface == QLatin1String("ivi_controller") && !m_iviController) - m_iviController.reset(new QtWayland::ivi_controller(display->wl_registry(), global.id, global.version)); - } - - if (!m_iviApplication) { - qCDebug(lcQpaWayland) << "Couldn't find global ivi_application for ivi-shell"; - return false; - } - - return QWaylandShellIntegration::initialize(display); + QWaylandShellIntegrationTemplate::initialize(display); + m_iviController->initialize(); + return isActive(); } /* get unique id @@ -127,15 +90,15 @@ uint32_t QWaylandIviShellIntegration::getNextUniqueSurfaceId() QWaylandShellSurface *QWaylandIviShellIntegration::createShellSurface(QWaylandWindow *window) { - if (!m_iviApplication) + if (!isActive()) return nullptr; uint32_t surfaceId = getNextUniqueSurfaceId(); if (surfaceId == 0) return nullptr; - struct ivi_surface *surface = m_iviApplication->surface_create(surfaceId, window->wlSurface()); - if (!m_iviController) + struct ivi_surface *surface = surface_create(surfaceId, window->wlSurface()); + if (!m_iviController->isActive()) return new QWaylandIviSurface(surface, window); struct ::ivi_controller_surface *controller = m_iviController->ivi_controller::surface_create(surfaceId); @@ -149,7 +112,7 @@ QWaylandShellSurface *QWaylandIviShellIntegration::createShellSurface(QWaylandWi transientPos.setX(transientPos.x() + parent->decoration()->margins().left()); transientPos.setY(transientPos.y() + parent->decoration()->margins().top()); } - QSize size = window->window()->geometry().size(); + QSize size = window->windowGeometry().size(); iviSurface->ivi_controller_surface::set_destination_rectangle(transientPos.x(), transientPos.y(), size.width(), |