hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-11-22 20:25:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

xdg-activation: keep tokens after the resource is dead

Browse source 
fixes #5957
This commit is contained in:
Vaxry 2024-05-08 22:17:10 +01:00
parent 6a988d9276
commit e4e84064f2
2 changed files with 25 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/protocols/XDGActivation.cpp
View file

@ -31,6 +31,21 @@ CXDGActivationToken::CXDGActivationToken(SP<CXdgActivationTokenV1> resource_) :
LOGM(LOG, "assigned new xdg-activation token {}", token); LOGM(LOG, "assigned new xdg-activation token {}", token);
resource->sendDone(token.c_str()); resource->sendDone(token.c_str());
PROTO::activation->m_vSentTokens.push_back({token, resource->client()});
auto count = std::count_if(PROTO::activation->m_vSentTokens.begin(), PROTO::activation->m_vSentTokens.end(),
[this](const auto& other) { return other.client == resource->client(); });
if (count > 10) {
// remove first token. Too many, dear app.
for (auto i = PROTO::activation->m_vSentTokens.begin(); i != PROTO::activation->m_vSentTokens.end(); ++i) {
if (i->client == resource->client()) {
PROTO::activation->m_vSentTokens.erase(i);
break;
}
}
}
}); });
} }
@ -54,21 +69,15 @@ void CXDGActivationProtocol::bindManager(wl_client* client, void* data, uint32_t
RESOURCE->setDestroy([this](CXdgActivationV1* pMgr) { this->onManagerResourceDestroy(pMgr->resource()); }); RESOURCE->setDestroy([this](CXdgActivationV1* pMgr) { this->onManagerResourceDestroy(pMgr->resource()); });
RESOURCE->setGetActivationToken([this](CXdgActivationV1* pMgr, uint32_t id) { this->onGetToken(pMgr, id); }); RESOURCE->setGetActivationToken([this](CXdgActivationV1* pMgr, uint32_t id) { this->onGetToken(pMgr, id); });
RESOURCE->setActivate([this](CXdgActivationV1* pMgr, const char* token, wl_resource* surface) { RESOURCE->setActivate([this](CXdgActivationV1* pMgr, const char* token, wl_resource* surface) {
const auto TOKEN = std::find_if(m_vTokens.begin(), m_vTokens.end(), [token](const auto& t) { return t->committed && t->token == token; }); auto TOKEN = std::find_if(m_vSentTokens.begin(), m_vSentTokens.end(), [token](const auto& t) { return t.token == token; });
if (TOKEN == m_vTokens.end()) { if (TOKEN == m_vSentTokens.end()) {
LOGM(WARN, "activate event for non-existent token {}??", token); LOGM(WARN, "activate event for non-existent token {}??", token);
return; return;
} }
auto xdgToken = TOKEN->get(); // remove token. It's been now spent.
m_vSentTokens.erase(TOKEN);
if (xdgToken->used) {
LOGM(WARN, "activate event for already used token {}, ignoring", token);
return;
}
xdgToken->used = true;
wlr_surface* surf = wlr_surface_from_resource(surface); wlr_surface* surf = wlr_surface_from_resource(surface);
const auto PWINDOW = g_pCompositor->getWindowFromSurface(surf); const auto PWINDOW = g_pCompositor->getWindowFromSurface(surf);

6
src/protocols/XDGActivation.hpp
View file

@ -37,6 +37,12 @@ class CXDGActivationProtocol : public IWaylandProtocol {
void destroyToken(CXDGActivationToken* pointer); void destroyToken(CXDGActivationToken* pointer);
void onGetToken(CXdgActivationV1* pMgr, uint32_t id); void onGetToken(CXdgActivationV1* pMgr, uint32_t id);
struct SSentToken {
std::string token;
wl_client* client = nullptr; // READ-ONLY: can be dead
};
std::vector<SSentToken> m_vSentTokens;
// //
std::vector<UP<CXdgActivationV1>> m_vManagers; std::vector<UP<CXdgActivationV1>> m_vManagers;
std::vector<UP<CXDGActivationToken>> m_vTokens; std::vector<UP<CXDGActivationToken>> m_vTokens;