diff options
| author | davc0n <dconti.dev@gmail.com> | 2025-05-07 15:21:44 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-05-07 15:21:44 +0200 |
| commit | e5df8cdc6227e35fa225acd15cdcc75abe3347cb (patch) | |
| tree | 8f2dfecfe5bda7188240fc2676c559ec75beb307 /src/protocols | |
| parent | f8bbe5124c0012865ea36f52d304313084a31fe9 (diff) | |
xwayland: refactor class member vars (#10312)
* xwayland: refactor class member vars
* xwayland: fix pure wayland build
Diffstat (limited to 'src/protocols')
| -rw-r--r-- | src/protocols/XDGOutput.cpp | 2 | ||||
| -rw-r--r-- | src/protocols/core/DataDevice.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/protocols/XDGOutput.cpp b/src/protocols/XDGOutput.cpp index 93ac1c37..ccb78e98 100644 --- a/src/protocols/XDGOutput.cpp +++ b/src/protocols/XDGOutput.cpp @@ -47,7 +47,7 @@ void CXDGOutputProtocol::onManagerGetXDGOutput(CZxdgOutputManagerV1* mgr, uint32 CXDGOutput* pXDGOutput = m_xdgOutputs.emplace_back(makeUnique<CXDGOutput>(makeShared<CZxdgOutputV1>(CLIENT, mgr->version(), id), PMONITOR)).get(); #ifndef NO_XWAYLAND - if (g_pXWayland && g_pXWayland->pServer && g_pXWayland->pServer->xwaylandClient == CLIENT) + if (g_pXWayland && g_pXWayland->m_server && g_pXWayland->m_server->m_xwaylandClient == CLIENT) pXDGOutput->m_isXWayland = true; #endif pXDGOutput->m_client = CLIENT; diff --git a/src/protocols/core/DataDevice.cpp b/src/protocols/core/DataDevice.cpp index 67c16e43..ad580ed1 100644 --- a/src/protocols/core/DataDevice.cpp +++ b/src/protocols/core/DataDevice.cpp @@ -420,8 +420,8 @@ void CWLDataDeviceProtocol::destroyResource(CWLDataOfferResource* resource) { SP<IDataDevice> CWLDataDeviceProtocol::dataDeviceForClient(wl_client* c) { #ifndef NO_XWAYLAND - if (g_pXWayland && g_pXWayland->pServer && c == g_pXWayland->pServer->xwaylandClient) - return g_pXWayland->pWM->getDataDevice(); + if (g_pXWayland && g_pXWayland->m_server && c == g_pXWayland->m_server->m_xwaylandClient) + return g_pXWayland->m_wm->getDataDevice(); #endif auto it = std::find_if(m_devices.begin(), m_devices.end(), [c](const auto& e) { return e->client() == c; }); @@ -451,7 +451,7 @@ void CWLDataDeviceProtocol::sendSelectionToDevice(SP<IDataDevice> dev, SP<IDataS } #ifndef NO_XWAYLAND else if (const auto X11 = dev->getX11(); X11) - offer = g_pXWayland->pWM->createX11DataOffer(g_pSeatManager->m_state.keyboardFocus.lock(), sel); + offer = g_pXWayland->m_wm->createX11DataOffer(g_pSeatManager->m_state.keyboardFocus.lock(), sel); #endif if UNLIKELY (!offer) { @@ -669,7 +669,7 @@ void CWLDataDeviceProtocol::updateDrag() { } #ifndef NO_XWAYLAND else if (const auto X11 = m_dnd.focusedDevice->getX11(); X11) - offer = g_pXWayland->pWM->createX11DataOffer(g_pSeatManager->m_state.keyboardFocus.lock(), m_dnd.currentSource.lock()); + offer = g_pXWayland->m_wm->createX11DataOffer(g_pSeatManager->m_state.keyboardFocus.lock(), m_dnd.currentSource.lock()); #endif if (!offer) { |