diff options
| author | Vaxry <43317083+vaxerski@users.noreply.github.com> | 2023-07-19 20:09:49 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-19 20:09:49 +0200 |
| commit | 89b87158dbf100e4177f4a010190ba5f80252eb2 (patch) | |
| tree | cacff8d4257c0e4a1f95937c969075df0b07c280 /src/protocols | |
| parent | ce9896204a2ab1eb4f8960d44b876cbc9d0955ac (diff) | |
internal: Wrap regions (#2750)
Diffstat (limited to 'src/protocols')
| -rw-r--r-- | src/protocols/Screencopy.cpp | 10 | ||||
| -rw-r--r-- | src/protocols/ToplevelExport.cpp | 9 |
2 files changed, 6 insertions, 13 deletions
diff --git a/src/protocols/Screencopy.cpp b/src/protocols/Screencopy.cpp index 801b4615..c93bd5f7 100644 --- a/src/protocols/Screencopy.cpp +++ b/src/protocols/Screencopy.cpp @@ -403,17 +403,15 @@ void CScreencopyProtocolManager::sendFrameDamage(SScreencopyFrame* frame) { if (!frame->withDamage) return; - PIXMAN_DAMAGE_FOREACH(&frame->pMonitor->lastFrameDamage) { - const auto RECT = &RECTSARR[i]; + for (auto& RECT : frame->pMonitor->lastFrameDamage.getRects()) { - if (frame->buffer->width < 1 || frame->buffer->height < 1 || frame->buffer->width - RECT->x1 < 1 || frame->buffer->height - RECT->y1 < 1) { + if (frame->buffer->width < 1 || frame->buffer->height < 1 || frame->buffer->width - RECT.x1 < 1 || frame->buffer->height - RECT.y1 < 1) { Debug::log(ERR, "[sc] Failed to send damage"); break; } - zwlr_screencopy_frame_v1_send_damage(frame->resource, std::clamp(RECT->x1, 0, frame->buffer->width), std::clamp(RECT->y1, 0, frame->buffer->height), - std::clamp(RECT->x2 - RECT->x1, 0, frame->buffer->width - RECT->x1), - std::clamp(RECT->y2 - RECT->y1, 0, frame->buffer->height - RECT->y1)); + zwlr_screencopy_frame_v1_send_damage(frame->resource, std::clamp(RECT.x1, 0, frame->buffer->width), std::clamp(RECT.y1, 0, frame->buffer->height), + std::clamp(RECT.x2 - RECT.x1, 0, frame->buffer->width - RECT.x1), std::clamp(RECT.y2 - RECT.y1, 0, frame->buffer->height - RECT.y1)); } } diff --git a/src/protocols/ToplevelExport.cpp b/src/protocols/ToplevelExport.cpp index 180b1489..eeeaa81f 100644 --- a/src/protocols/ToplevelExport.cpp +++ b/src/protocols/ToplevelExport.cpp @@ -347,16 +347,14 @@ bool CToplevelExportProtocolManager::copyFrameShm(SScreencopyFrame* frame, times return false; // render the client - const auto PMONITOR = g_pCompositor->getMonitorFromID(frame->pWindow->m_iMonitorID); - pixman_region32_t fakeDamage; - pixman_region32_init_rect(&fakeDamage, 0, 0, PMONITOR->vecPixelSize.x * 10, PMONITOR->vecPixelSize.y * 10); + const auto PMONITOR = g_pCompositor->getMonitorFromID(frame->pWindow->m_iMonitorID); + CRegion fakeDamage{0, 0, PMONITOR->vecPixelSize.x * 10, PMONITOR->vecPixelSize.y * 10}; if (frame->overlayCursor) wlr_output_lock_software_cursors(PMONITOR->output, true); if (!wlr_output_attach_render(PMONITOR->output, nullptr)) { Debug::log(ERR, "[toplevel_export] Couldn't attach render"); - pixman_region32_fini(&fakeDamage); wlr_buffer_end_data_ptr_access(frame->buffer); if (frame->overlayCursor) wlr_output_lock_software_cursors(PMONITOR->output, false); @@ -398,7 +396,6 @@ bool CToplevelExportProtocolManager::copyFrameShm(SScreencopyFrame* frame, times if (!PFORMAT) { Debug::log(ERR, "[toplevel_export] Cannot read pixels, unsupported format %lx", PFORMAT); g_pHyprOpenGL->end(); - pixman_region32_fini(&fakeDamage); wlr_buffer_end_data_ptr_access(frame->buffer); if (frame->overlayCursor) wlr_output_lock_software_cursors(PMONITOR->output, false); @@ -415,8 +412,6 @@ bool CToplevelExportProtocolManager::copyFrameShm(SScreencopyFrame* frame, times wlr_output_rollback(PMONITOR->output); - pixman_region32_fini(&fakeDamage); - wlr_buffer_end_data_ptr_access(frame->buffer); if (frame->overlayCursor) |