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

adapt xdg foreign to Kwayland Changes

Browse source
This commit is contained in:
Adrien Faveraux 2020-07-22 22:27:29 +02:00 committed by Vlad Zahorodnii
parent 16c7b29c3b
commit b0f7dcee98
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
wayland_server.cpp
View file

@ -62,7 +62,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#include <KWaylandServer/outputconfiguration_interface.h>
#include <KWaylandServer/xdgdecoration_v1_interface.h>
#include <KWaylandServer/xdgshell_interface.h>
#include <KWaylandServer/xdgforeign_interface.h>
#include <KWaylandServer/xdgforeign_v2_interface.h>
#include <KWaylandServer/xdgoutput_interface.h>
#include <KWaylandServer/keystate_interface.h>
#include <KWaylandServer/filtered_display.h>
@ -185,7 +185,7 @@ void WaylandServer::registerXdgToplevelClient(XdgToplevelClient *client)
client->installPalette(palette);
}
connect(m_XdgForeign, &XdgForeignInterface::transientChanged, client, [this](SurfaceInterface *child) {
connect(m_XdgForeign, &XdgForeignV2Interface::transientChanged, client, [this](SurfaceInterface *child) {
emit foreignTransientChanged(child);
});
}
@ -451,8 +451,7 @@ bool WaylandServer::init(const QByteArray &socketName, InitializationFlags flags
m_display->createSubCompositor(m_display)->create();
m_XdgForeign = m_display->createXdgForeignInterface(m_display);
m_XdgForeign->create();
m_XdgForeign = m_display->createXdgForeignV2Interface(m_display);
m_keyState = m_display->createKeyStateInterface(m_display);
m_keyState->create();

2
wayland_server.h
View file

@ -298,7 +298,7 @@ private:
bool interfacesAnnounced = false;
} m_internalConnection;
KWaylandServer::XdgForeignInterface *m_XdgForeign = nullptr;
KWaylandServer::XdgForeignV2Interface *m_XdgForeign = nullptr;
KWaylandServer::KeyStateInterface *m_keyState = nullptr;
QList<AbstractClient *> m_clients;
QHash<KWaylandServer::ClientConnection*, quint16> m_clientIds;