diff options
Diffstat (limited to 'src/protocols/Viewporter.cpp')
| -rw-r--r-- | src/protocols/Viewporter.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/protocols/Viewporter.cpp b/src/protocols/Viewporter.cpp index 674b8373..0b82603f 100644 --- a/src/protocols/Viewporter.cpp +++ b/src/protocols/Viewporter.cpp @@ -15,10 +15,10 @@ CViewportResource::CViewportResource(SP<CWpViewport> resource_, SP<CWLSurfaceRes return; } - surface->pending.updated.viewport = true; + surface->m_pending.updated.viewport = true; if (x == -1 && y == -1) { - surface->pending.viewport.hasDestination = false; + surface->m_pending.viewport.hasDestination = false; return; } @@ -27,8 +27,8 @@ CViewportResource::CViewportResource(SP<CWpViewport> resource_, SP<CWLSurfaceRes return; } - surface->pending.viewport.hasDestination = true; - surface->pending.viewport.destination = {x, y}; + surface->m_pending.viewport.hasDestination = true; + surface->m_pending.viewport.destination = {x, y}; }); resource->setSetSource([this](CWpViewport* r, wl_fixed_t fx, wl_fixed_t fy, wl_fixed_t fw, wl_fixed_t fh) { @@ -37,12 +37,12 @@ CViewportResource::CViewportResource(SP<CWpViewport> resource_, SP<CWLSurfaceRes return; } - surface->pending.updated.viewport = true; + surface->m_pending.updated.viewport = true; double x = wl_fixed_to_double(fx), y = wl_fixed_to_double(fy), w = wl_fixed_to_double(fw), h = wl_fixed_to_double(fh); if (x == -1 && y == -1 && w == -1 && h == -1) { - surface->pending.viewport.hasSource = false; + surface->m_pending.viewport.hasSource = false; return; } @@ -51,20 +51,20 @@ CViewportResource::CViewportResource(SP<CWpViewport> resource_, SP<CWLSurfaceRes return; } - surface->pending.viewport.hasSource = true; - surface->pending.viewport.source = {x, y, w, h}; + surface->m_pending.viewport.hasSource = true; + surface->m_pending.viewport.source = {x, y, w, h}; }); - listeners.surfacePrecommit = surface->events.precommit.registerListener([this](std::any d) { - if (!surface || !surface->pending.buffer) + listeners.surfacePrecommit = surface->m_events.precommit.registerListener([this](std::any d) { + if (!surface || !surface->m_pending.buffer) return; - if (surface->pending.viewport.hasSource) { - auto& src = surface->pending.viewport.source; + if (surface->m_pending.viewport.hasSource) { + auto& src = surface->m_pending.viewport.source; - if (src.w + src.x > surface->pending.bufferSize.x || src.h + src.y > surface->pending.bufferSize.y) { + if (src.w + src.x > surface->m_pending.bufferSize.x || src.h + src.y > surface->m_pending.bufferSize.y) { resource->error(WP_VIEWPORT_ERROR_BAD_VALUE, "Box doesn't fit"); - surface->pending.rejected = true; + surface->m_pending.rejected = true; return; } } @@ -75,8 +75,8 @@ CViewportResource::~CViewportResource() { if (!surface) return; - surface->pending.viewport.hasDestination = false; - surface->pending.viewport.hasSource = false; + surface->m_pending.viewport.hasDestination = false; + surface->m_pending.viewport.hasSource = false; } bool CViewportResource::good() { |