cry/Hyprland
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

plugins: expose csd functionality (#11551)

Browse source
This commit is contained in:
jmanc3 2025-09-02 04:49:24 -05:00 • committed by GitHub
parent 8a64168a43
commit 00423bb738
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 73 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/protocols/ServerDecorationKDE.cpp
View file

@ -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) {

19
src/protocols/ServerDecorationKDE.hpp
View file

@ -11,9 +11,18 @@ class CServerDecorationKDE {
public:
CServerDecorationKDE(SP<COrgKdeKwinServerDecoration> resource_, SP<CWLSurfaceResource> surf);
bool good();
SP<CWLSurfaceResource> 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<COrgKdeKwinServerDecoration> 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<UP<COrgKdeKwinServerDecorationManager>> m_managers;

28
src/protocols/XDGDecoration.cpp
View file

@ -17,15 +17,35 @@ CXDGDecoration::CXDGDecoration(SP<CZxdgToplevelDecorationV1> 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;
}
}
}

7
src/protocols/XDGDecoration.hpp
View file

@ -9,10 +9,17 @@ class CXDGDecoration {
public:
CXDGDecoration(SP<CZxdgToplevelDecorationV1> 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<CZxdgToplevelDecorationV1> m_resource;
wl_resource* m_toplevelResource = nullptr; // READ-ONLY.
};