From 1626707b7f4fd3d2b313e78cb3a41783f072f73b Mon Sep 17 00:00:00 2001 From: vaxerski <43317083+vaxerski@users.noreply.github.com> Date: Sat, 23 Jul 2022 15:48:08 +0200 Subject: make layerSurfaces into RAII --- src/events/Layers.cpp | 33 ++++++++++++++++++++++++++------- src/events/Monitors.cpp | 19 +++++++++---------- 2 files changed, 35 insertions(+), 17 deletions(-) (limited to 'src/events') diff --git a/src/events/Layers.cpp b/src/events/Layers.cpp index 431ebef1..f69b9127 100644 --- a/src/events/Layers.cpp +++ b/src/events/Layers.cpp @@ -32,7 +32,7 @@ void Events::listener_newLayerSurface(wl_listener* listener, void* data) { } const auto PMONITOR = (SMonitor*)g_pCompositor->getMonitorFromOutput(WLRLAYERSURFACE->output); - SLayerSurface* layerSurface = PMONITOR->m_aLayerSurfaceLists[WLRLAYERSURFACE->pending.layer].emplace_back(new SLayerSurface()); + SLayerSurface* layerSurface = PMONITOR->m_aLayerSurfaceLists[WLRLAYERSURFACE->pending.layer].emplace_back(std::make_unique()).get(); layerSurface->szNamespace = WLRLAYERSURFACE->_namespace; @@ -109,8 +109,13 @@ void Events::listener_mapLayerSurface(void* owner, void* data) { if ((uint64_t)layersurface->monitorID != PMONITOR->ID) { const auto POLDMON = g_pCompositor->getMonitorFromID(layersurface->monitorID); - POLDMON->m_aLayerSurfaceLists[layersurface->layer].remove(layersurface); - PMONITOR->m_aLayerSurfaceLists[layersurface->layer].push_back(layersurface); + for (auto it = POLDMON->m_aLayerSurfaceLists[layersurface->layer].begin(); it != POLDMON->m_aLayerSurfaceLists[layersurface->layer].end(); it++) { + if (it->get() == layersurface) { + PMONITOR->m_aLayerSurfaceLists[layersurface->layer].emplace_back(std::move(*it)); + POLDMON->m_aLayerSurfaceLists[layersurface->layer].erase(it); + break; + } + } layersurface->monitorID = PMONITOR->ID; g_pLayoutManager->getCurrentLayout()->recalculateMonitor(POLDMON->ID); g_pHyprRenderer->arrangeLayersForMonitor(POLDMON->ID); @@ -197,8 +202,15 @@ void Events::listener_commitLayerSurface(void* owner, void* data) { // fix if it changed its mon if ((uint64_t)layersurface->monitorID != PMONITOR->ID) { const auto POLDMON = g_pCompositor->getMonitorFromID(layersurface->monitorID); - POLDMON->m_aLayerSurfaceLists[layersurface->layer].remove(layersurface); - PMONITOR->m_aLayerSurfaceLists[layersurface->layer].push_back(layersurface); + + for (auto it = POLDMON->m_aLayerSurfaceLists[layersurface->layer].begin(); it != POLDMON->m_aLayerSurfaceLists[layersurface->layer].end(); it++) { + if (it->get() == layersurface) { + PMONITOR->m_aLayerSurfaceLists[layersurface->layer].emplace_back(std::move(*it)); + POLDMON->m_aLayerSurfaceLists[layersurface->layer].erase(it); + break; + } + } + layersurface->monitorID = PMONITOR->ID; g_pLayoutManager->getCurrentLayout()->recalculateMonitor(POLDMON->ID); g_pHyprRenderer->arrangeLayersForMonitor(POLDMON->ID); @@ -208,8 +220,15 @@ void Events::listener_commitLayerSurface(void* owner, void* data) { g_pHyprRenderer->arrangeLayersForMonitor(PMONITOR->ID); if (layersurface->layer != layersurface->layerSurface->current.layer) { - PMONITOR->m_aLayerSurfaceLists[layersurface->layer].remove(layersurface); - PMONITOR->m_aLayerSurfaceLists[layersurface->layerSurface->current.layer].push_back(layersurface); + + for (auto it = PMONITOR->m_aLayerSurfaceLists[layersurface->layer].begin(); it != PMONITOR->m_aLayerSurfaceLists[layersurface->layer].end(); it++) { + if (it->get() == layersurface) { + PMONITOR->m_aLayerSurfaceLists[layersurface->layerSurface->current.layer].emplace_back(std::move(*it)); + PMONITOR->m_aLayerSurfaceLists[layersurface->layer].erase(it); + break; + } + } + layersurface->layer = layersurface->layerSurface->current.layer; } diff --git a/src/events/Monitors.cpp b/src/events/Monitors.cpp index 9604dc69..57da68fc 100644 --- a/src/events/Monitors.cpp +++ b/src/events/Monitors.cpp @@ -72,10 +72,11 @@ void Events::listener_newOutput(wl_listener* listener, void* data) { return; } - SMonitor newMonitor; - newMonitor.output = OUTPUT; - newMonitor.ID = g_pCompositor->getNextAvailableMonitorID(); - newMonitor.szName = OUTPUT->name; + const auto PNEWMONITOR = g_pCompositor->m_vMonitors.emplace_back(std::make_unique()).get(); + + PNEWMONITOR->output = OUTPUT; + PNEWMONITOR->ID = g_pCompositor->getNextAvailableMonitorID(); + PNEWMONITOR->szName = OUTPUT->name; wlr_output_init_render(OUTPUT, g_pCompositor->m_sWLRAllocator, g_pCompositor->m_sWLRRenderer); @@ -86,11 +87,9 @@ void Events::listener_newOutput(wl_listener* listener, void* data) { wlr_output_enable_adaptive_sync(OUTPUT, 1); // create it in the arr - newMonitor.vecPosition = monitorRule.offset; - newMonitor.vecSize = monitorRule.resolution; - newMonitor.refreshRate = monitorRule.refreshRate; - - const auto PNEWMONITOR = g_pCompositor->m_vMonitors.emplace_back(std::make_unique(newMonitor)).get(); + PNEWMONITOR->vecPosition = monitorRule.offset; + PNEWMONITOR->vecSize = monitorRule.resolution; + PNEWMONITOR->refreshRate = monitorRule.refreshRate; PNEWMONITOR->hyprListener_monitorFrame.initCallback(&OUTPUT->events.frame, &Events::listener_monitorFrame, PNEWMONITOR); PNEWMONITOR->hyprListener_monitorDestroy.initCallback(&OUTPUT->events.destroy, &Events::listener_monitorDestroy, PNEWMONITOR); @@ -134,7 +133,7 @@ void Events::listener_newOutput(wl_listener* listener, void* data) { g_pLayoutManager->getCurrentLayout()->recalculateMonitor(PNEWMONITOR->ID); PNEWWORKSPACE->startAnim(true,true,true); } else { - PNEWWORKSPACE = g_pCompositor->m_vWorkspaces.emplace_back(std::make_unique(newMonitor.ID, newDefaultWorkspaceName)).get(); + PNEWWORKSPACE = g_pCompositor->m_vWorkspaces.emplace_back(std::make_unique(PNEWMONITOR->ID, newDefaultWorkspaceName)).get(); // We are required to set the name here immediately wlr_ext_workspace_handle_v1_set_name(PNEWWORKSPACE->m_pWlrHandle, newDefaultWorkspaceName.c_str()); -- cgit v1.2.3