From 0237e39f74a7facf51d40bc4c95f6ce8ce3cdc2e Mon Sep 17 00:00:00 2001 From: Vaxry Date: Wed, 1 May 2024 19:40:35 +0100 Subject: protocols: utilize hyprwayland-scanner 0.3.3 functions stuff like ::version(), ::client(), ::error() etc --- src/protocols/RelativePointer.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/protocols/RelativePointer.cpp') diff --git a/src/protocols/RelativePointer.cpp b/src/protocols/RelativePointer.cpp index df7e2e6d..0e50641e 100644 --- a/src/protocols/RelativePointer.cpp +++ b/src/protocols/RelativePointer.cpp @@ -6,7 +6,7 @@ CRelativePointer::CRelativePointer(SP resource_) : resour if (!resource_->resource()) return; - pClient = wl_resource_get_client(resource_->resource()); + pClient = resource->client(); resource->setDestroy([this](CZwpRelativePointerV1* pMgr) { PROTO::relativePointer->destroyRelativePointer(this); }); resource->setOnDestroy([this](CZwpRelativePointerV1* pMgr) { PROTO::relativePointer->destroyRelativePointer(this); }); @@ -46,12 +46,11 @@ void CRelativePointerProtocol::destroyRelativePointer(CRelativePointer* pointer) } void CRelativePointerProtocol::onGetRelativePointer(CZwpRelativePointerManagerV1* pMgr, uint32_t id, wl_resource* pointer) { - const auto CLIENT = wl_resource_get_client(pMgr->resource()); - const auto RESOURCE = - m_vRelativePointers.emplace_back(std::make_unique(std::make_shared(CLIENT, wl_resource_get_version(pMgr->resource()), id))).get(); + const auto CLIENT = pMgr->client(); + const auto RESOURCE = m_vRelativePointers.emplace_back(std::make_unique(std::make_shared(CLIENT, pMgr->version(), id))).get(); if (!RESOURCE->good()) { - wl_resource_post_no_memory(pMgr->resource()); + pMgr->noMemory(); m_vRelativePointers.pop_back(); return; } -- cgit v1.2.3