From 00423bb738d568f4903412fdabdf53e2c63fde7c Mon Sep 17 00:00:00 2001 From: jmanc3 Date: Tue, 2 Sep 2025 04:49:24 -0500 Subject: [PATCH] plugins: expose csd functionality (#11551) --- src/protocols/ServerDecorationKDE.cpp | 30 ++++++++++++++++++++++++--- src/protocols/ServerDecorationKDE.hpp | 19 +++++++++++++---- src/protocols/XDGDecoration.cpp | 28 +++++++++++++++++++++---- src/protocols/XDGDecoration.hpp | 7 +++++++ 4 files changed, 73 insertions(+), 11 deletions(-) diff --git a/src/protocols/ServerDecorationKDE.cpp b/src/protocols/ServerDecorationKDE.cpp index 81f03130..8f625168 100644 --- a/src/protocols/ServerDecorationKDE.cpp +++ b/src/protocols/ServerDecorationKDE.cpp @@ -1,21 +1,41 @@ #include "ServerDecorationKDE.hpp" #include "core/Compositor.hpp" -CServerDecorationKDE::CServerDecorationKDE(SP resource_, SP surf) : m_resource(resource_) { +CServerDecorationKDE::CServerDecorationKDE(SP resource_, SP surf_) : m_surf(surf_), m_resource(resource_) { if UNLIKELY (!good()) return; m_resource->setRelease([this](COrgKdeKwinServerDecoration* pMgr) { PROTO::serverDecorationKDE->destroyResource(this); }); m_resource->setOnDestroy([this](COrgKdeKwinServerDecoration* pMgr) { PROTO::serverDecorationKDE->destroyResource(this); }); + m_resource->setRequestMode([this](COrgKdeKwinServerDecoration*, uint32_t mode) { + auto sendMode = kdeModeOnRequestCSD(mode); + m_resource->sendMode(sendMode); + mostRecentlySent = sendMode; + mostRecentlyRequested = mode; + }); // we send this and ignore request_mode. - m_resource->sendMode(ORG_KDE_KWIN_SERVER_DECORATION_MANAGER_MODE_SERVER); + auto sendMode = kdeDefaultModeCSD(); + m_resource->sendMode(sendMode); + mostRecentlySent = sendMode; } bool CServerDecorationKDE::good() { return m_resource->resource(); } +uint32_t CServerDecorationKDE::kdeDefaultModeCSD() { + return ORG_KDE_KWIN_SERVER_DECORATION_MANAGER_MODE_SERVER; +} + +uint32_t CServerDecorationKDE::kdeModeOnRequestCSD(uint32_t modeRequestedByClient) { + return kdeDefaultModeCSD(); +} + +uint32_t CServerDecorationKDE::kdeModeOnReleaseCSD() { + return kdeDefaultModeCSD(); +} + CServerDecorationKDEProtocol::CServerDecorationKDEProtocol(const wl_interface* iface, const int& ver, const std::string& name) : IWaylandProtocol(iface, ver, name) { ; } @@ -27,7 +47,11 @@ void CServerDecorationKDEProtocol::bindManager(wl_client* client, void* data, ui RESOURCE->setCreate([this](COrgKdeKwinServerDecorationManager* pMgr, uint32_t id, wl_resource* pointer) { this->createDecoration(pMgr, id, pointer); }); // send default mode of SSD, as Hyprland will never ask for CSD. Screw Gnome and GTK. - RESOURCE->sendDefaultMode(ORG_KDE_KWIN_SERVER_DECORATION_MANAGER_MODE_SERVER); + RESOURCE->sendDefaultMode(kdeDefaultManagerModeCSD()); +} + +uint32_t CServerDecorationKDEProtocol::kdeDefaultManagerModeCSD() { + return ORG_KDE_KWIN_SERVER_DECORATION_MANAGER_MODE_SERVER; } void CServerDecorationKDEProtocol::onManagerResourceDestroy(wl_resource* res) { diff --git a/src/protocols/ServerDecorationKDE.hpp b/src/protocols/ServerDecorationKDE.hpp index 5dc93f50..aa350093 100644 --- a/src/protocols/ServerDecorationKDE.hpp +++ b/src/protocols/ServerDecorationKDE.hpp @@ -11,9 +11,18 @@ class CServerDecorationKDE { public: CServerDecorationKDE(SP resource_, SP surf); - bool good(); + SP m_surf; + + uint32_t mostRecentlySent = 0; + uint32_t mostRecentlyRequested = 0; + + bool good(); private: + uint32_t kdeDefaultModeCSD(); + uint32_t kdeModeOnRequestCSD(uint32_t modeRequestedByClient); + uint32_t kdeModeOnReleaseCSD(); + SP m_resource; }; @@ -24,10 +33,12 @@ class CServerDecorationKDEProtocol : public IWaylandProtocol { virtual void bindManager(wl_client* client, void* data, uint32_t ver, uint32_t id); private: - void onManagerResourceDestroy(wl_resource* res); - void destroyResource(CServerDecorationKDE* deco); + uint32_t kdeDefaultManagerModeCSD(); - void createDecoration(COrgKdeKwinServerDecorationManager* pMgr, uint32_t id, wl_resource* surf); + void onManagerResourceDestroy(wl_resource* res); + void destroyResource(CServerDecorationKDE* deco); + + void createDecoration(COrgKdeKwinServerDecorationManager* pMgr, uint32_t id, wl_resource* surf); // std::vector> m_managers; diff --git a/src/protocols/XDGDecoration.cpp b/src/protocols/XDGDecoration.cpp index b093fbb8..0339db6b 100644 --- a/src/protocols/XDGDecoration.cpp +++ b/src/protocols/XDGDecoration.cpp @@ -17,15 +17,35 @@ CXDGDecoration::CXDGDecoration(SP resource_, wl_resou } LOGM(LOG, "setMode: {}. {} MODE_SERVER_SIDE as reply.", modeString, (mode == ZXDG_TOPLEVEL_DECORATION_V1_MODE_SERVER_SIDE ? "Sending" : "Ignoring and sending")); - m_resource->sendConfigure(ZXDG_TOPLEVEL_DECORATION_V1_MODE_SERVER_SIDE); + auto sendMode = xdgModeOnRequestCSD(mode); + m_resource->sendConfigure(sendMode); + mostRecentlySent = sendMode; + mostRecentlyRequested = mode; }); m_resource->setUnsetMode([this](CZxdgToplevelDecorationV1*) { LOGM(LOG, "unsetMode. Sending MODE_SERVER_SIDE."); - m_resource->sendConfigure(ZXDG_TOPLEVEL_DECORATION_V1_MODE_SERVER_SIDE); + auto sendMode = xdgModeOnReleaseCSD(); + m_resource->sendConfigure(sendMode); + mostRecentlySent = sendMode; + mostRecentlyRequested = 0; }); - m_resource->sendConfigure(ZXDG_TOPLEVEL_DECORATION_V1_MODE_SERVER_SIDE); + auto sendMode = xdgDefaultModeCSD(); + m_resource->sendConfigure(sendMode); + mostRecentlySent = sendMode; +} + +zxdgToplevelDecorationV1Mode CXDGDecoration::xdgDefaultModeCSD() { + return ZXDG_TOPLEVEL_DECORATION_V1_MODE_SERVER_SIDE; +} + +zxdgToplevelDecorationV1Mode CXDGDecoration::xdgModeOnRequestCSD(uint32_t modeRequestedByClient) { + return xdgDefaultModeCSD(); +} + +zxdgToplevelDecorationV1Mode CXDGDecoration::xdgModeOnReleaseCSD() { + return xdgDefaultModeCSD(); } bool CXDGDecoration::good() { @@ -71,4 +91,4 @@ void CXDGDecorationProtocol::onGetDecoration(CZxdgDecorationManagerV1* pMgr, uin m_decorations.erase(xdgToplevel); return; } -} \ No newline at end of file +} diff --git a/src/protocols/XDGDecoration.hpp b/src/protocols/XDGDecoration.hpp index 2bbf4bfb..7e8b6ab9 100644 --- a/src/protocols/XDGDecoration.hpp +++ b/src/protocols/XDGDecoration.hpp @@ -9,10 +9,17 @@ class CXDGDecoration { public: CXDGDecoration(SP resource_, wl_resource* toplevel); + uint32_t mostRecentlySent = 0; + uint32_t mostRecentlyRequested = 0; + bool good(); wl_resource* toplevelResource(); private: + zxdgToplevelDecorationV1Mode xdgDefaultModeCSD(); + zxdgToplevelDecorationV1Mode xdgModeOnRequestCSD(uint32_t modeRequestedByClient); + zxdgToplevelDecorationV1Mode xdgModeOnReleaseCSD(); + SP m_resource; wl_resource* m_toplevelResource = nullptr; // READ-ONLY. };