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/FractionalScale.cpp | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'src/protocols/FractionalScale.cpp') diff --git a/src/protocols/FractionalScale.cpp b/src/protocols/FractionalScale.cpp index 86662d90..f478e622 100644 --- a/src/protocols/FractionalScale.cpp +++ b/src/protocols/FractionalScale.cpp @@ -32,19 +32,16 @@ void CFractionalScaleProtocol::onManagerResourceDestroy(wl_resource* res) { void CFractionalScaleProtocol::onGetFractionalScale(CWpFractionalScaleManagerV1* pMgr, uint32_t id, wlr_surface* surface) { if (m_mAddons.contains(surface)) { LOGM(ERR, "Surface {:x} already has a fractionalScale addon", (uintptr_t)surface); - wl_resource_post_error(pMgr->resource(), WP_FRACTIONAL_SCALE_MANAGER_V1_ERROR_FRACTIONAL_SCALE_EXISTS, "Fractional scale already exists"); + pMgr->error(WP_FRACTIONAL_SCALE_MANAGER_V1_ERROR_FRACTIONAL_SCALE_EXISTS, "Fractional scale already exists"); return; } - const auto PADDON = m_mAddons - .emplace(surface, - std::make_unique( - std::make_shared(wl_resource_get_client(pMgr->resource()), wl_resource_get_version(pMgr->resource()), id), surface)) + const auto PADDON = m_mAddons.emplace(surface, std::make_unique(std::make_shared(pMgr->client(), pMgr->version(), id), surface)) .first->second.get(); if (!PADDON->good()) { m_mAddons.erase(surface); - wl_resource_post_no_memory(pMgr->resource()); + pMgr->noMemory(); return; } -- cgit v1.2.3