diff options
author | Philippe Coval <philippe.coval@open.eurogiciel.org> | 2014-03-26 10:16:01 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-06-09 11:44:30 +0200 |
commit | 768484daaa64bea965bef981a16f59be8db0c190 (patch) | |
tree | 0e65a8d37f340a4dcdd1f3eb10f4245afba9e35a /src/client/qwaylandxdgsurface.cpp | |
parent | c2a22eea6716e073875474adf624d8463eba836c (diff) |
Add minimize feature to QWindow using wayland's xdg-shell
The feature is disabled by default,
and can be enabled at runtime
by exporting QT_WAYLAND_USE_XDG_SHELL env variable.
This patch relies on presence of protocol file
which has been imported from weston-1.4.0 sources,
until the xdg-shell is merge into wayland itself.
Because xdg-shell is experimental,
code fallback to WaylandShell if no XdgShell
but keep in mind those shells are exclusive.
Since xdg-shell and wayland-shell share most of the API,
some factorization is done by an (empty) abstraction class
to keep the code more readable.
Despite xdg-shell introduces new popups concept,
they're not used on this change for maitainance purpose.
Notes:
* This change depends on presence of xdg-shell protocol file.
* You can check a demo video
(qt-tizen-cinematic-experience-20140430-rzr)
of the test case at :
https://www.youtube.com/watch?v=pY_XXvKc_0E#
* Use Super+Tab to show window again if hidden
Task-number: QTBUG-38633/part/2of2
Change-Id: I2d7ed85bea1847d82439fdfc893a3dbb2581c14a
Reviewed-by: Giulio Camuffo <giulio.camuffo@jollamobile.com>
Diffstat (limited to 'src/client/qwaylandxdgsurface.cpp')
-rw-r--r-- | src/client/qwaylandxdgsurface.cpp | 173 |
1 files changed, 173 insertions, 0 deletions
diff --git a/src/client/qwaylandxdgsurface.cpp b/src/client/qwaylandxdgsurface.cpp new file mode 100644 index 000000000..1b8affacf --- /dev/null +++ b/src/client/qwaylandxdgsurface.cpp @@ -0,0 +1,173 @@ +/**************************************************************************** +** +** Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +** Contact: http://www.qt-project.org/legal +** +** This file is part of the config.tests 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 Digia. For licensing terms and +** conditions see http://qt.digia.com/licensing. For further information +** use the contact form at http://qt.digia.com/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 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, Digia gives you certain additional +** rights. These rights are described in the Digia 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. +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "qwaylandxdgsurface_p.h" + +#include "qwaylanddisplay_p.h" +#include "qwaylandwindow_p.h" +#include "qwaylandinputdevice_p.h" +#include "qwaylanddecoration_p.h" +#include "qwaylandscreen_p.h" + +#include <QtCore/QDebug> + +QT_BEGIN_NAMESPACE + +QWaylandXdgSurface::QWaylandXdgSurface(struct ::xdg_surface *xdg_surface, QWaylandWindow *window) + : QtWayland::xdg_surface(xdg_surface) + , m_window(window) + , m_maximized(false) + , m_minimized(false) + , m_fullscreen(false) +{ +} + +QWaylandXdgSurface::~QWaylandXdgSurface() +{ + xdg_surface_destroy(object()); +} + +void QWaylandXdgSurface::resize(QWaylandInputDevice *inputDevice, enum wl_shell_surface_resize edges) +{ + // May need some conversion if types get incompatibles, ATM they're identical + enum resize_edge const * const arg = reinterpret_cast<enum resize_edge const * const>(&edges); + resize(inputDevice, *arg); +} + +void QWaylandXdgSurface::resize(QWaylandInputDevice *inputDevice, enum resize_edge edges) +{ + resize(inputDevice->wl_seat(), + inputDevice->serial(), + edges); +} + +void QWaylandXdgSurface::move(QWaylandInputDevice *inputDevice) +{ + move(inputDevice->wl_seat(), + inputDevice->serial()); +} + +void QWaylandXdgSurface::setMaximized() +{ + m_maximized = true; + m_size = m_window->window()->geometry().size(); + set_maximized(); +} + +void QWaylandXdgSurface::setFullscreen() +{ + m_fullscreen = true; + m_size = m_window->window()->geometry().size(); + set_fullscreen(); +} + +void QWaylandXdgSurface::setNormal() +{ + if (m_fullscreen || m_maximized || m_minimized) { + if (m_maximized) { unset_maximized(); } + if (m_fullscreen) { unset_fullscreen(); } + + m_fullscreen = m_maximized = m_minimized = false; + setTopLevel(); + QMargins m = m_window->frameMargins(); + m_window->configure(0, m_size.width() + m.left() + m.right(), m_size.height() + m.top() + m.bottom()); + } +} + +void QWaylandXdgSurface::setMinimized() +{ + m_minimized = true; + m_size = m_window->window()->geometry().size(); + set_minimized(); +} + +void QWaylandXdgSurface::setTopLevel() +{ + // There's no xdg_shell_surface API for this, ignoring +} + +void QWaylandXdgSurface::updateTransientParent(QWindow *parent) +{ + QWaylandWindow *parent_wayland_window = static_cast<QWaylandWindow *>(parent->handle()); + if (!parent_wayland_window) + return; + + // set_transient expects a position relative to the parent + QPoint transientPos = m_window->geometry().topLeft(); // this is absolute + QWindow *parentWin = m_window->window()->transientParent(); + transientPos -= parentWin->geometry().topLeft(); + if (parent_wayland_window->decoration()) { + transientPos.setX(transientPos.x() + parent_wayland_window->decoration()->margins().left()); + transientPos.setY(transientPos.y() + parent_wayland_window->decoration()->margins().top()); + } + + uint32_t flags = 0; + Qt::WindowFlags wf = m_window->window()->flags(); + if (wf.testFlag(Qt::ToolTip) + || wf.testFlag(Qt::WindowTransparentForInput)) + flags |= XDG_SURFACE_SET_TRANSIENT_FOR; + + set_transient_for(parent_wayland_window->object()); +} + +void QWaylandXdgSurface::setTitle(const QString & title) +{ + return QtWayland::xdg_surface::set_title(title); +} + +void QWaylandXdgSurface::setAppId(const QString & appId) +{ + return QtWayland::xdg_surface::set_app_id(appId); +} + +void QWaylandXdgSurface::xdg_surface_ping(uint32_t serial) +{ + pong(serial); +} + +void QWaylandXdgSurface::xdg_surface_configure(uint32_t edges, int32_t width, + int32_t height) +{ + m_window->configure(edges, width, height); +} + + +QT_END_NAMESPACE |