1 files changed, 27 insertions, 3 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<COrgKdeKwinServerDecoration> resource_, SP<CWLSurfaceResource> surf) : m_resource(resource_) {
+CServerDecorationKDE::CServerDecorationKDE(SP<COrgKdeKwinServerDecoration> resource_, SP<CWLSurfaceResource> 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) {