From d9fe1d0f58bcafd22ee23097de41e7039a36afe2 Mon Sep 17 00:00:00 2001 From: Vaxry Date: Sun, 21 Apr 2024 16:29:30 +0100 Subject: idle-inhibit: move to new impl --- src/protocols/IdleInhibit.cpp | 48 +++++++++++++++++++++++++++++ src/protocols/IdleInhibit.hpp | 63 +++++++++++++++++++++++++++++++++++++++ src/protocols/WaylandProtocol.hpp | 1 + 3 files changed, 112 insertions(+) create mode 100644 src/protocols/IdleInhibit.cpp create mode 100644 src/protocols/IdleInhibit.hpp (limited to 'src/protocols') diff --git a/src/protocols/IdleInhibit.cpp b/src/protocols/IdleInhibit.cpp new file mode 100644 index 00000000..0b90e284 --- /dev/null +++ b/src/protocols/IdleInhibit.cpp @@ -0,0 +1,48 @@ +#include "IdleInhibit.hpp" + +CIdleInhibitor::CIdleInhibitor(SP resource_, wlr_surface* surf_) : resource(resource_), surface(surf_) { + ; +} + +CIdleInhibitorResource::CIdleInhibitorResource(SP resource_, wlr_surface* surface_) : resource(resource_), surface(surface_) { + hyprListener_surfaceDestroy.initCallback( + &surface->events.destroy, [this](void* owner, void* data) { PROTO::idleInhibit->removeInhibitor(this); }, this, "CIdleInhibitorResource"); + + resource->setOnDestroy([this](CZwpIdleInhibitorV1* p) { PROTO::idleInhibit->removeInhibitor(this); }); + resource->setDestroy([this](CZwpIdleInhibitorV1* p) { PROTO::idleInhibit->removeInhibitor(this); }); +} + +CIdleInhibitorResource::~CIdleInhibitorResource() { + hyprListener_surfaceDestroy.removeCallback(); + events.destroy.emit(); +} + +CIdleInhibitProtocol::CIdleInhibitProtocol(const wl_interface* iface, const int& ver, const std::string& name) : IWaylandProtocol(iface, ver, name) { + ; +} + +void CIdleInhibitProtocol::onManagerResourceDestroy(wl_resource* res) { + std::erase_if(m_vManagers, [res](const auto& other) { return other->resource() == res; }); +} + +void CIdleInhibitProtocol::bindManager(wl_client* client, void* data, uint32_t ver, uint32_t id) { + const auto RESOURCE = m_vManagers.emplace_back(std::make_unique(client, ver, id)).get(); + RESOURCE->setOnDestroy([this](CZwpIdleInhibitManagerV1* p) { this->onManagerResourceDestroy(p->resource()); }); + + RESOURCE->setDestroy([this](CZwpIdleInhibitManagerV1* pMgr) { this->onManagerResourceDestroy(pMgr->resource()); }); + RESOURCE->setCreateInhibitor( + [this](CZwpIdleInhibitManagerV1* pMgr, uint32_t id, wl_resource* surface) { this->onCreateInhibitor(pMgr, id, wlr_surface_from_resource(surface)); }); +} + +void CIdleInhibitProtocol::removeInhibitor(CIdleInhibitorResource* resource) { + std::erase_if(m_vInhibitors, [resource](const auto& el) { return el.get() == resource; }); +} + +void CIdleInhibitProtocol::onCreateInhibitor(CZwpIdleInhibitManagerV1* pMgr, uint32_t id, wlr_surface* surface) { + const auto CLIENT = wl_resource_get_client(pMgr->resource()); + const auto RESOURCE = + m_vInhibitors.emplace_back(std::make_shared(std::make_shared(CLIENT, wl_resource_get_version(pMgr->resource()), id), surface)); + + RESOURCE->inhibitor = std::make_shared(RESOURCE, surface); + events.newIdleInhibitor.emit(RESOURCE->inhibitor); +} \ No newline at end of file diff --git a/src/protocols/IdleInhibit.hpp b/src/protocols/IdleInhibit.hpp new file mode 100644 index 00000000..3283333f --- /dev/null +++ b/src/protocols/IdleInhibit.hpp @@ -0,0 +1,63 @@ +#pragma once + +#include +#include +#include "WaylandProtocol.hpp" +#include "idle-inhibit-unstable-v1.hpp" +#include "../helpers/signal/Signal.hpp" + +class CIdleInhibitorResource; + +class CIdleInhibitor { + public: + CIdleInhibitor(SP resource_, wlr_surface* surf_); + + struct { + CHyprSignalListener destroy; + } listeners; + + WP resource; + wlr_surface* surface = nullptr; +}; + +class CIdleInhibitorResource { + public: + CIdleInhibitorResource(SP resource_, wlr_surface* surface_); + ~CIdleInhibitorResource(); + + SP inhibitor; + + struct { + CSignal destroy; + } events; + + private: + SP resource; + wlr_surface* surface = nullptr; + + DYNLISTENER(surfaceDestroy); +}; + +class CIdleInhibitProtocol : public IWaylandProtocol { + public: + CIdleInhibitProtocol(const wl_interface* iface, const int& ver, const std::string& name); + + virtual void bindManager(wl_client* client, void* data, uint32_t ver, uint32_t id); + + void onManagerResourceDestroy(wl_resource* res); + void onCreateInhibitor(CZwpIdleInhibitManagerV1* pMgr, uint32_t id, wlr_surface* surface); + + void removeInhibitor(CIdleInhibitorResource*); + + struct { + CSignal newIdleInhibitor; // data: SP + } events; + + private: + std::vector> m_vManagers; + std::vector> m_vInhibitors; +}; + +namespace PROTO { + inline UP idleInhibit; +} \ No newline at end of file diff --git a/src/protocols/WaylandProtocol.hpp b/src/protocols/WaylandProtocol.hpp index 588a1420..d23a0e48 100644 --- a/src/protocols/WaylandProtocol.hpp +++ b/src/protocols/WaylandProtocol.hpp @@ -11,6 +11,7 @@ #define SP std::shared_ptr #define UP std::unique_ptr +#define WP std::weak_ptr #define PROTO NProtocols -- cgit v1.2.3