yukijoou/kwin
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve code readability in xdg-foreign wrapper

Browse source 
This moves out code that links/unlinks imported toplevels and child
surfaces in functions to improve code readability.
This commit is contained in:
Vlad Zahorodnii 2021-03-22 20:16:21 +02:00
parent 060940e426
commit 0b688f6b6e
3 changed files with 44 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

63
src/wayland/xdgforeign_v2_interface.cpp
View file

@ -1,5 +1,6 @@
/*
SPDX-FileCopyrightText: 2017 Marco Martin <notmart@gmail.com>
SPDX-FileCopyrightText: 2021 Vlad Zahorodnii <vlad.zahorodnii@kde.org>
SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
*/
@ -126,44 +127,58 @@ void XdgImporterV2Interface::zxdg_importer_v2_import_toplevel(Resource *resource
XdgImportedV2Interface *imported = new XdgImportedV2Interface(exported, importedResource);
connect(imported, &XdgImportedV2Interface::childChanged, this, [this, imported](SurfaceInterface *child) {
// remove any previous association
auto it = m_children.find(imported);
if (it != m_children.end()) {
m_parents.remove(*it);
m_children.erase(it);
}
m_parents[child] = imported;
m_children[imported] = child;
SurfaceInterface *parent = imported->surface();
emit m_foreign->transientChanged(child, parent);
link(imported, child);
// child surface destroyed
connect(child, &QObject::destroyed, this, [this, child]() {
auto it = m_parents.find(child);
if (it != m_parents.end()) {
XdgImportedV2Interface *parent = *it;
m_children.remove(*it);
m_parents.erase(it);
emit m_foreign->transientChanged(nullptr, parent->surface());
}
unlink(nullptr, child);
});
});
// surface no longer imported
connect(imported, &XdgImportedV2Interface::destroyed, this, [this, handle, imported]() {
m_importedSurfaces.remove(handle);
connect(imported, &XdgImportedV2Interface::destroyed, this, [this, imported]() {
unlink(imported, nullptr);
});
}
auto it = m_children.find(imported);
void XdgImporterV2Interface::link(XdgImportedV2Interface *parent, SurfaceInterface *child)
{
// remove any previous association
auto it = m_children.find(parent);
if (it != m_children.end()) {
m_parents.remove(*it);
m_children.erase(it);
}
m_parents[child] = parent;
m_children[parent] = child;
emit m_foreign->transientChanged(child, parent->surface());
}
void XdgImporterV2Interface::unlink(XdgImportedV2Interface *parent, SurfaceInterface *child)
{
if (parent) {
// If the parent endpoint is unlinked, the transientChanged() signal will indicate
// the orphaned child.
auto it = m_children.find(parent);
if (it != m_children.end()) {
SurfaceInterface *child = *it;
m_parents.remove(*it);
m_children.erase(it);
emit m_foreign->transientChanged(child, nullptr);
}
});
m_importedSurfaces[handle] = imported;
} else if (child) {
// If the child endpoint is unlinked, the transientChanged() signal will indicate
// what parent has lost a child.
auto it = m_parents.find(child);
if (it != m_parents.end()) {
XdgImportedV2Interface *parent = *it;
m_children.remove(*it);
m_parents.erase(it);
emit m_foreign->transientChanged(nullptr, parent->surface());
}
}
}
XdgExportedV2Interface::XdgExportedV2Interface(SurfaceInterface *surface, wl_resource *resource )

1
src/wayland/xdgforeign_v2_interface.h
View file

@ -1,5 +1,6 @@
/*
SPDX-FileCopyrightText: 2017 Marco Martin <notmart@gmail.com>
SPDX-FileCopyrightText: 2021 Vlad Zahorodnii <vlad.zahorodnii@kde.org>
SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
*/

4
src/wayland/xdgforeign_v2_interface_p.h
View file

@ -1,5 +1,6 @@
/*
SPDX-FileCopyrightText: 2017 Marco Martin <notmart@gmail.com>
SPDX-FileCopyrightText: 2021 Vlad Zahorodnii <vlad.zahorodnii@kde.org>
SPDX-License-Identifier: LGPL-2.1-only OR LGPL-3.0-only OR LicenseRef-KDE-Accepted-LGPL
*/
@ -53,6 +54,9 @@ class XdgImporterV2Interface : public QObject, public QtWaylandServer::zxdg_impo
public:
XdgImporterV2Interface(Display *display, XdgForeignV2Interface *foreign);
void link(XdgImportedV2Interface *parent, SurfaceInterface *child);
void unlink(XdgImportedV2Interface *parent, SurfaceInterface *child);
SurfaceInterface *transientFor(SurfaceInterface *surface);
protected: