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

wayland: implement plasma window management v17

Browse source 
This fixes plasmashell crashing because of the stacking order string exceeding
the size of a Wayland message

CCBUG: 479492
This commit is contained in:
Xaver Hugl 2024-02-16 00:53:38 +01:00
parent 7bf40c3501
commit 3465ecac16
1 changed files with 35 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
src/wayland/plasmawindowmanagement.cpp
View file

@ -24,7 +24,7 @@
namespace KWin
{
static const quint32 s_version = 16;
static const quint32 s_version = 17;
static const quint32 s_activationVersion = 1;
class PlasmaWindowManagementInterfacePrivate : public QtWaylandServer::org_kde_plasma_window_management
@ -37,6 +37,8 @@ public:
void sendStackingOrderChanged(wl_resource *resource);
void sendStackingOrderUuidsChanged();
void sendStackingOrderUuidsChanged(wl_resource *resource);
void sendStackingOrderChanged2();
void sendStackingOrderChanged2(Resource *resource);
PlasmaWindowManagementInterface::ShowingDesktopState state = PlasmaWindowManagementInterface::ShowingDesktopState::Disabled;
QList<PlasmaWindowInterface *> windows;
@ -51,6 +53,7 @@ protected:
void org_kde_plasma_window_management_show_desktop(Resource *resource, uint32_t state) override;
void org_kde_plasma_window_management_get_window(Resource *resource, uint32_t id, uint32_t internal_window_id) override;
void org_kde_plasma_window_management_get_window_by_uuid(Resource *resource, uint32_t id, const QString &internal_window_uuid) override;
void org_kde_plasma_window_management_get_stacking_order(Resource *resource, uint32_t id) override;
};
class PlasmaWindowInterfacePrivate : public QtWaylandServer::org_kde_plasma_window
@ -161,7 +164,8 @@ void PlasmaWindowManagementInterfacePrivate::sendStackingOrderChanged()
void PlasmaWindowManagementInterfacePrivate::sendStackingOrderChanged(wl_resource *r)
{
if (wl_resource_get_version(r) < ORG_KDE_PLASMA_WINDOW_MANAGEMENT_STACKING_ORDER_CHANGED_SINCE_VERSION) {
if (wl_resource_get_version(r) < ORG_KDE_PLASMA_WINDOW_MANAGEMENT_STACKING_ORDER_CHANGED_SINCE_VERSION
|| wl_resource_get_version(r) >= ORG_KDE_PLASMA_WINDOW_MANAGEMENT_STACKING_ORDER_CHANGED_2_SINCE_VERSION) {
return;
}
@ -178,7 +182,8 @@ void PlasmaWindowManagementInterfacePrivate::sendStackingOrderUuidsChanged()
void PlasmaWindowManagementInterfacePrivate::sendStackingOrderUuidsChanged(wl_resource *r)
{
if (wl_resource_get_version(r) < ORG_KDE_PLASMA_WINDOW_MANAGEMENT_STACKING_ORDER_UUID_CHANGED_SINCE_VERSION) {
if (wl_resource_get_version(r) < ORG_KDE_PLASMA_WINDOW_MANAGEMENT_STACKING_ORDER_UUID_CHANGED_SINCE_VERSION
|| wl_resource_get_version(r) >= ORG_KDE_PLASMA_WINDOW_MANAGEMENT_STACKING_ORDER_CHANGED_2_SINCE_VERSION) {
return;
}
@ -194,6 +199,22 @@ void PlasmaWindowManagementInterfacePrivate::sendStackingOrderUuidsChanged(wl_re
send_stacking_order_uuid_changed(r, uuids);
}
void PlasmaWindowManagementInterfacePrivate::sendStackingOrderChanged2()
{
const auto clientResources = resourceMap();
for (auto resource : clientResources) {
sendStackingOrderChanged2(resource);
}
}
void PlasmaWindowManagementInterfacePrivate::sendStackingOrderChanged2(Resource *resource)
{
if (resource->version() < ORG_KDE_PLASMA_WINDOW_MANAGEMENT_STACKING_ORDER_CHANGED_2_SINCE_VERSION) {
return;
}
org_kde_plasma_window_management_send_stacking_order_changed_2(resource->handle);
}
void PlasmaWindowManagementInterfacePrivate::org_kde_plasma_window_management_bind_resource(Resource *resource)
{
for (const auto window : std::as_const(windows)) {
@ -257,6 +278,16 @@ void PlasmaWindowManagementInterfacePrivate::org_kde_plasma_window_management_ge
(*it)->d->sendInitialState(windowResource);
}
void PlasmaWindowManagementInterfacePrivate::org_kde_plasma_window_management_get_stacking_order(Resource *resource, uint32_t id)
{
wl_resource *stackingOrder = wl_resource_create(resource->client(), &org_kde_plasma_stacking_order_interface, resource->version(), id);
for (const auto &uuid : std::as_const(stackingOrderUuids)) {
org_kde_plasma_stacking_order_send_window(stackingOrder, uuid.toUtf8().constData());
}
org_kde_plasma_stacking_order_send_done(stackingOrder);
wl_resource_destroy(stackingOrder);
}
PlasmaWindowManagementInterface::PlasmaWindowManagementInterface(Display *display, QObject *parent)
: QObject(parent)
, d(new PlasmaWindowManagementInterfacePrivate(this, display))
@ -317,6 +348,7 @@ void PlasmaWindowManagementInterface::setStackingOrderUuids(const QList<QString>
}
d->stackingOrderUuids = stackingOrderUuids;
d->sendStackingOrderUuidsChanged();
d->sendStackingOrderChanged2();
}
void PlasmaWindowManagementInterface::setPlasmaVirtualDesktopManagementInterface(PlasmaVirtualDesktopManagementInterface *manager)