From 9cd5b257459a6b4c5d5d4d1026df85f0ecbe5a93 Mon Sep 17 00:00:00 2001 From: davc0n Date: Sun, 4 May 2025 23:39:00 +0200 Subject: protocols: refactor class member vars (u-z) (#10282) * protocols: refactor class member vars (u-z) * protocols: fix clang format --- src/xwayland/XWM.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/xwayland/XWM.cpp') diff --git a/src/xwayland/XWM.cpp b/src/xwayland/XWM.cpp index 6a0b1c84..c62758c5 100644 --- a/src/xwayland/XWM.cpp +++ b/src/xwayland/XWM.cpp @@ -361,10 +361,10 @@ void CXWM::handleClientMessage(xcb_client_message_event_t* e) { if (!res) continue; - if (res->serial != XSURF->wlSerial || !XSURF->wlSerial) + if (res->m_serial != XSURF->wlSerial || !XSURF->wlSerial) continue; - associate(XSURF, res->surface.lock()); + associate(XSURF, res->m_surface.lock()); break; } @@ -958,7 +958,7 @@ CXWM::CXWM() : connection(g_pXWayland->pServer->xwmFDs[0].get()) { initSelection(); listeners.newWLSurface = PROTO::compositor->m_events.newSurface.registerListener([this](std::any d) { onNewSurface(std::any_cast>(d)); }); - listeners.newXShellSurface = PROTO::xwaylandShell->events.newSurface.registerListener([this](std::any d) { onNewResource(std::any_cast>(d)); }); + listeners.newXShellSurface = PROTO::xwaylandShell->m_events.newSurface.registerListener([this](std::any d) { onNewResource(std::any_cast>(d)); }); createWMWindow(); @@ -1067,10 +1067,10 @@ void CXWM::onNewResource(SP resource) { shellResources.emplace_back(resource); for (auto const& surf : surfaces) { - if (surf->resource || surf->wlSerial != resource->serial) + if (surf->resource || surf->wlSerial != resource->m_serial) continue; - associate(surf, resource->surface.lock()); + associate(surf, resource->m_surface.lock()); break; } } -- cgit v1.2.3