3c67cc1399
Summary: The main clever part that's not just boring boiler plate is how we handle the structure change A surface now has an XDGSurface which then has a an Xdg TopLevel or a Xdg Popup We need to fit this into the public API which assumes a surface has a Surface or a Popup. The old Surface is similar to the new TopLevel. The shoehorning works by relying on the fact that a surface without a role is pretty useless. Clients create the surface implicitly with the toplevel or implicitly with the popup. The server only announced it has a new "XdgSurface" when it gets a new zxdg_surface_get_toplevel. ---- Popup decisions: - On popup creation the server should copy the current info from the positioner and then it gets deleted. Given kwaylands job is to keep state, we expose all these parameter via popup. - Due to this positioner is not exposed as a resource anywhere. - Server API is 100% backwards compatiable. i.e new code will work identically with v5 clients. - Client API is not. Grabs are called separately from the constructor, and the parent surface changed to an xdgsurface, not a raw surface. V5 code still works as-is, just not with the new constructors. It seemed better to match the v6 (and what will be the stable v7) than to try and do hacks and lose functionality. Given the client needs to change the code to opt into V6 anyway. I don't think this is a huge problem. Test Plan: Current test still passes. Reviewers: #plasma, graesslin Reviewed By: #plasma, graesslin Subscribers: graesslin, mart, plasma-devel, #frameworks Tags: #frameworks, #plasma_on_wayland Differential Revision: https://phabricator.kde.org/D6047
273 lines
7 KiB
C++
273 lines
7 KiB
C++
/****************************************************************************
|
|
Copyright 2016 Martin Gräßlin <mgraesslin@kde.org>
|
|
|
|
This library is free software; you can redistribute it and/or
|
|
modify it under the terms of the GNU Lesser General Public
|
|
License as published by the Free Software Foundation; either
|
|
version 2.1 of the License, or (at your option) version 3, or any
|
|
later version accepted by the membership of KDE e.V. (or its
|
|
successor approved by the membership of KDE e.V.), which shall
|
|
act as a proxy defined in Section 6 of version 3 of the license.
|
|
|
|
This library is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
Lesser General Public License for more details.
|
|
|
|
You should have received a copy of the GNU Lesser General Public
|
|
License along with this library. If not, see <http://www.gnu.org/licenses/>.
|
|
****************************************************************************/
|
|
#include "xdgshell_interface_p.h"
|
|
|
|
namespace KWayland
|
|
{
|
|
namespace Server
|
|
{
|
|
|
|
XdgShellInterface::Private::Private(XdgShellInterfaceVersion interfaceVersion, XdgShellInterface *q, Display *d, const wl_interface *interface, quint32 version)
|
|
: Global::Private(d, interface, version)
|
|
, interfaceVersion(interfaceVersion)
|
|
, q(q)
|
|
{
|
|
}
|
|
|
|
void XdgShellInterface::Private::setupTimer(quint32 serial)
|
|
{
|
|
QTimer *pingTimer = new QTimer();
|
|
pingTimer->setSingleShot(false);
|
|
pingTimer->setInterval(1000);
|
|
int attempt = 0;
|
|
connect(pingTimer, &QTimer::timeout, q, [this, serial, attempt]() mutable {
|
|
++attempt;
|
|
if (attempt == 1) {
|
|
emit q->pingDelayed(serial);
|
|
} else {
|
|
emit q->pingTimeout(serial);
|
|
auto timerIt = pingTimers.find(serial);
|
|
if (timerIt != pingTimers.end()) {
|
|
delete timerIt.value();
|
|
pingTimers.erase(timerIt);
|
|
}
|
|
}
|
|
});
|
|
|
|
pingTimers.insert(serial, pingTimer);
|
|
pingTimer->start();
|
|
}
|
|
|
|
XdgShellInterface::XdgShellInterface(Private *d, QObject *parent)
|
|
: Global(d, parent)
|
|
{
|
|
}
|
|
|
|
XdgShellInterface::~XdgShellInterface() = default;
|
|
|
|
XdgShellSurfaceInterface *XdgShellInterface::getSurface(wl_resource *native)
|
|
{
|
|
Q_UNUSED(native)
|
|
return nullptr;
|
|
}
|
|
|
|
XdgShellInterfaceVersion XdgShellInterface::interfaceVersion() const
|
|
{
|
|
Q_D();
|
|
return d->interfaceVersion;
|
|
}
|
|
|
|
quint32 XdgShellInterface::ping(XdgShellSurfaceInterface * surface)
|
|
{
|
|
return d_func()->ping(surface);
|
|
}
|
|
|
|
XdgShellInterface::Private *XdgShellInterface::d_func() const
|
|
{
|
|
return reinterpret_cast<Private*>(d.data());
|
|
}
|
|
|
|
XdgShellSurfaceInterface::Private::Private(XdgShellInterfaceVersion interfaceVersion, XdgShellSurfaceInterface *q, Global *c, SurfaceInterface *surface, wl_resource *parentResource, const wl_interface *interface, const void *implementation)
|
|
: Resource::Private(q, c, parentResource, interface, implementation)
|
|
, GenericShellSurface<XdgShellSurfaceInterface>(q, surface)
|
|
, interfaceVersion(interfaceVersion)
|
|
{
|
|
}
|
|
|
|
XdgShellSurfaceInterface::Private::~Private() = default;
|
|
|
|
XdgShellSurfaceInterface::XdgShellSurfaceInterface(Private *p)
|
|
: Resource(p)
|
|
{
|
|
}
|
|
|
|
XdgShellSurfaceInterface::~XdgShellSurfaceInterface() = default;
|
|
|
|
XdgShellInterfaceVersion XdgShellSurfaceInterface::interfaceVersion() const
|
|
{
|
|
Q_D();
|
|
return d->interfaceVersion;
|
|
}
|
|
|
|
quint32 XdgShellSurfaceInterface::configure(States states, const QSize &size)
|
|
{
|
|
Q_D();
|
|
return d->configure(states, size);
|
|
}
|
|
|
|
bool XdgShellSurfaceInterface::isConfigurePending() const
|
|
{
|
|
Q_D();
|
|
return !d->configureSerials.isEmpty();
|
|
}
|
|
|
|
SurfaceInterface *XdgShellSurfaceInterface::surface() const
|
|
{
|
|
Q_D();
|
|
return d->surface;
|
|
}
|
|
|
|
QString XdgShellSurfaceInterface::title() const
|
|
{
|
|
Q_D();
|
|
return d->title;
|
|
}
|
|
|
|
QByteArray XdgShellSurfaceInterface::windowClass() const
|
|
{
|
|
Q_D();
|
|
return d->windowClass;
|
|
}
|
|
|
|
bool XdgShellSurfaceInterface::isTransient() const
|
|
{
|
|
Q_D();
|
|
return !d->parent.isNull();
|
|
}
|
|
|
|
QPointer<XdgShellSurfaceInterface> XdgShellSurfaceInterface::transientFor() const
|
|
{
|
|
Q_D();
|
|
return d->parent;
|
|
}
|
|
|
|
void XdgShellSurfaceInterface::close()
|
|
{
|
|
Q_D();
|
|
d->close();
|
|
}
|
|
|
|
XdgShellSurfaceInterface::Private *XdgShellSurfaceInterface::d_func() const
|
|
{
|
|
return reinterpret_cast<Private*>(d.data());
|
|
}
|
|
|
|
XdgShellPopupInterface::Private::Private(XdgShellInterfaceVersion interfaceVersion, XdgShellPopupInterface *q, XdgShellInterface *c, SurfaceInterface *surface, wl_resource *parentResource, const wl_interface *interface, const void *implementation)
|
|
: Resource::Private(q, c, parentResource, interface, implementation)
|
|
, GenericShellSurface<XdgShellPopupInterface>(q, surface)
|
|
, interfaceVersion(interfaceVersion)
|
|
{
|
|
}
|
|
|
|
XdgShellPopupInterface::Private::~Private() = default;
|
|
|
|
XdgShellPopupInterface::XdgShellPopupInterface(Private *p)
|
|
: Resource(p)
|
|
{
|
|
}
|
|
|
|
XdgShellPopupInterface::~XdgShellPopupInterface() = default;
|
|
|
|
SurfaceInterface *XdgShellPopupInterface::surface() const
|
|
{
|
|
Q_D();
|
|
return d->surface;
|
|
}
|
|
|
|
QPointer<SurfaceInterface> XdgShellPopupInterface::transientFor() const
|
|
{
|
|
Q_D();
|
|
return d->parent;
|
|
}
|
|
|
|
QSize XdgShellPopupInterface::initialSize() const
|
|
{
|
|
Q_D();
|
|
return d->initialSize;
|
|
}
|
|
|
|
QPoint XdgShellPopupInterface::transientOffset() const
|
|
{
|
|
QRect rect = anchorRect();
|
|
const QPoint center = rect.isEmpty() ? rect.topLeft() : rect.center();
|
|
rect = rect.adjusted(0,0,1,1); //compensate for the stupid QRect::right +1 fiasco
|
|
|
|
switch(anchorEdge()) {
|
|
case Qt::TopEdge | Qt::LeftEdge:
|
|
return rect.topLeft();
|
|
case Qt::TopEdge:
|
|
return QPoint(center.x(), rect.y());
|
|
case Qt::TopEdge | Qt::RightEdge:
|
|
return rect.topRight();
|
|
case Qt::RightEdge:
|
|
return QPoint(rect.right(), center.y());
|
|
case Qt::BottomEdge | Qt::RightEdge:
|
|
return rect.bottomRight();
|
|
case Qt::BottomEdge:
|
|
return QPoint(center.x(), rect.bottom());
|
|
case Qt::BottomEdge | Qt::LeftEdge:
|
|
return rect.bottomLeft();
|
|
case Qt::LeftEdge:
|
|
return QPoint(rect.left(), center.y());
|
|
default:
|
|
return center;
|
|
}
|
|
Q_UNREACHABLE();
|
|
}
|
|
|
|
QRect XdgShellPopupInterface::anchorRect() const
|
|
{
|
|
Q_D();
|
|
return d->anchorRect;
|
|
}
|
|
|
|
Qt::Edges XdgShellPopupInterface::anchorEdge() const
|
|
{
|
|
Q_D();
|
|
return d->anchorEdge;
|
|
}
|
|
|
|
Qt::Edges XdgShellPopupInterface::gravity() const
|
|
{
|
|
Q_D();
|
|
return d->gravity;
|
|
}
|
|
|
|
QPoint XdgShellPopupInterface::anchorOffset() const
|
|
{
|
|
Q_D();
|
|
return d->anchorOffset;
|
|
}
|
|
|
|
PositionerConstraints XdgShellPopupInterface::constraintAdjustments() const
|
|
{
|
|
Q_D();
|
|
return d->constraintAdjustments;
|
|
}
|
|
|
|
void XdgShellPopupInterface::popupDone()
|
|
{
|
|
Q_D();
|
|
return d->popupDone();
|
|
}
|
|
|
|
quint32 XdgShellPopupInterface::configure(const QRect &rect)
|
|
{
|
|
Q_D();
|
|
return d->configure(rect);
|
|
}
|
|
|
|
XdgShellPopupInterface::Private *XdgShellPopupInterface::d_func() const
|
|
{
|
|
return reinterpret_cast<Private*>(d.data());
|
|
}
|
|
|
|
}
|
|
}
|