diff options
Diffstat (limited to 'src/protocols/ToplevelExport.cpp')
| -rw-r--r-- | src/protocols/ToplevelExport.cpp | 46 |
1 files changed, 20 insertions, 26 deletions
diff --git a/src/protocols/ToplevelExport.cpp b/src/protocols/ToplevelExport.cpp index e579e1a7..1a696628 100644 --- a/src/protocols/ToplevelExport.cpp +++ b/src/protocols/ToplevelExport.cpp @@ -27,8 +27,7 @@ CToplevelExportProtocolManager::CToplevelExportProtocolManager() { return; #endif - m_pGlobal = wl_global_create(g_pCompositor->m_sWLDisplay, &hyprland_toplevel_export_manager_v1_interface, - TOPLEVEL_EXPORT_VERSION, this, bindManagerInt); + m_pGlobal = wl_global_create(g_pCompositor->m_sWLDisplay, &hyprland_toplevel_export_manager_v1_interface, TOPLEVEL_EXPORT_VERSION, this, bindManagerInt); if (!m_pGlobal) { Debug::log(ERR, "ToplevelExportManager could not start! Sharing windows will not work!"); @@ -67,17 +66,14 @@ void handleDestroyFrame(wl_client* client, wl_resource* resource) { } static const struct hyprland_toplevel_export_manager_v1_interface toplevelExportManagerImpl = { - .capture_toplevel = handleCaptureToplevel, - .destroy = handleDestroy, + .capture_toplevel = handleCaptureToplevel, + .destroy = handleDestroy, .capture_toplevel_with_wlr_toplevel_handle = handleCaptureToplevelWithWlr, }; -static const struct hyprland_toplevel_export_frame_v1_interface toplevelFrameImpl = { - .copy = handleCopyFrame, - .destroy = handleDestroyFrame -}; +static const struct hyprland_toplevel_export_frame_v1_interface toplevelFrameImpl = {.copy = handleCopyFrame, .destroy = handleDestroyFrame}; -SToplevelClient* clientFromResource(wl_resource* resource) { +SToplevelClient* clientFromResource(wl_resource* resource) { ASSERT(wl_resource_instance_of(resource, &hyprland_toplevel_export_manager_v1_interface, &toplevelExportManagerImpl)); return (SToplevelClient*)wl_resource_get_user_data(resource); } @@ -108,8 +104,7 @@ void handleManagerResourceDestroy(wl_resource* resource) { void CToplevelExportProtocolManager::bindManager(wl_client* client, void* data, uint32_t version, uint32_t id) { const auto PCLIENT = &m_lClients.emplace_back(); - PCLIENT->resource = wl_resource_create(client, &hyprland_toplevel_export_manager_v1_interface, - version, id); + PCLIENT->resource = wl_resource_create(client, &hyprland_toplevel_export_manager_v1_interface, version, id); if (!PCLIENT->resource) { Debug::log(ERR, "ToplevelExportManager could not bind! (out of memory?)"); @@ -135,7 +130,7 @@ void CToplevelExportProtocolManager::removeFrame(SToplevelFrame* frame, bool for if (!frame) return; - std::erase_if(m_vFramesAwaitingWrite, [&] (const auto& other) { return other == frame; }); + std::erase_if(m_vFramesAwaitingWrite, [&](const auto& other) { return other == frame; }); wl_resource_set_user_data(frame->resource, nullptr); wlr_buffer_unlock(frame->buffer); @@ -147,10 +142,10 @@ void CToplevelExportProtocolManager::captureToplevel(wl_client* client, wl_resou const auto PCLIENT = clientFromResource(resource); // create a frame - const auto PFRAME = &m_lFrames.emplace_back(); + const auto PFRAME = &m_lFrames.emplace_back(); PFRAME->overlayCursor = !!overlay_cursor; - PFRAME->resource = wl_resource_create(client, &hyprland_toplevel_export_frame_v1_interface, wl_resource_get_version(resource), frame); - PFRAME->pWindow = pWindow; + PFRAME->resource = wl_resource_create(client, &hyprland_toplevel_export_frame_v1_interface, wl_resource_get_version(resource), frame); + PFRAME->pWindow = pWindow; if (!PFRAME->pWindow) { Debug::log(ERR, "Client requested sharing of window handle %x which does not exist!", PFRAME->pWindow); @@ -202,7 +197,7 @@ void CToplevelExportProtocolManager::captureToplevel(wl_client* client, wl_resou PFRAME->dmabufFormat = DRM_FORMAT_INVALID; } - PFRAME->box = { 0, 0, (int)(PFRAME->pWindow->m_vRealSize.vec().x * PMONITOR->scale), (int)(PFRAME->pWindow->m_vRealSize.vec().y * PMONITOR->scale) }; + PFRAME->box = {0, 0, (int)(PFRAME->pWindow->m_vRealSize.vec().x * PMONITOR->scale), (int)(PFRAME->pWindow->m_vRealSize.vec().y * PMONITOR->scale)}; int ow, oh; wlr_output_effective_resolution(PMONITOR->output, &ow, &oh); wlr_box_transform(&PFRAME->box, &PFRAME->box, PMONITOR->transform, ow, oh); @@ -247,9 +242,9 @@ void CToplevelExportProtocolManager::copyFrame(wl_client* client, wl_resource* r } wlr_dmabuf_attributes dmabufAttrs; - void* wlrBufferAccessData; - uint32_t wlrBufferAccessFormat; - size_t wlrBufferAccessStride; + void* wlrBufferAccessData; + uint32_t wlrBufferAccessFormat; + size_t wlrBufferAccessStride; if (wlr_buffer_get_dmabuf(PBUFFER, &dmabufAttrs)) { PFRAME->bufferCap = WLR_BUFFER_CAP_DMABUF; @@ -287,7 +282,7 @@ void CToplevelExportProtocolManager::onMonitorRender(CMonitor* pMonitor) { return; // nothing to share std::vector<SToplevelFrame*> framesToRemove; - + // share frame if correct output for (auto& f : m_vFramesAwaitingWrite) { if (!f->pWindow) { @@ -295,12 +290,11 @@ void CToplevelExportProtocolManager::onMonitorRender(CMonitor* pMonitor) { continue; } - wlr_box geometry = { f->pWindow->m_vRealPosition.vec().x, f->pWindow->m_vRealPosition.vec().y, - f->pWindow->m_vRealSize.vec().x, f->pWindow->m_vRealSize.vec().y }; + wlr_box geometry = {f->pWindow->m_vRealPosition.vec().x, f->pWindow->m_vRealPosition.vec().y, f->pWindow->m_vRealSize.vec().x, f->pWindow->m_vRealSize.vec().y}; if (!wlr_output_layout_intersects(g_pCompositor->m_sWLROutputLayout, pMonitor->output, &geometry)) continue; - + shareFrame(f); framesToRemove.push_back(f); @@ -342,14 +336,14 @@ void CToplevelExportProtocolManager::shareFrame(SToplevelFrame* frame) { } bool CToplevelExportProtocolManager::copyFrameShm(SToplevelFrame* frame, timespec* now) { - void* data; + void* data; uint32_t format; - size_t stride; + size_t stride; if (!wlr_buffer_begin_data_ptr_access(frame->buffer, WLR_BUFFER_DATA_PTR_ACCESS_WRITE, &data, &format, &stride)) return false; // render the client - const auto PMONITOR = g_pCompositor->getMonitorFromID(frame->pWindow->m_iMonitorID); + 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); |
