From 5edc32930d85f5f481160b938965c8bc329487e7 Mon Sep 17 00:00:00 2001 From: Vaxry Date: Tue, 30 Apr 2024 02:41:27 +0100 Subject: layerSurface: refactor/move to a memory-safe impl Makes all the pointers smart to avoid memory issues Refactors layerSurface code to live inside desktop/layersurface --- src/events/Layers.cpp | 364 -------------------------------------------------- 1 file changed, 364 deletions(-) delete mode 100644 src/events/Layers.cpp (limited to 'src/events/Layers.cpp') diff --git a/src/events/Layers.cpp b/src/events/Layers.cpp deleted file mode 100644 index 1877822a..00000000 --- a/src/events/Layers.cpp +++ /dev/null @@ -1,364 +0,0 @@ -#include "../Compositor.hpp" -#include "../helpers/WLClasses.hpp" -#include "../managers/input/InputManager.hpp" -#include "../render/Renderer.hpp" -#include "Events.hpp" - -// --------------------------------------------- // -// _ __ ________ _____ _____ // -// | | /\\ \ / / ____| __ \ / ____| // -// | | / \\ \_/ /| |__ | |__) | (___ // -// | | / /\ \\ / | __| | _ / \___ \ // -// | |____ / ____ \| | | |____| | \ \ ____) | // -// |______/_/ \_\_| |______|_| \_\_____/ // -// // -// --------------------------------------------- // - -void Events::listener_newLayerSurface(wl_listener* listener, void* data) { - const auto WLRLAYERSURFACE = (wlr_layer_surface_v1*)data; - - if (!WLRLAYERSURFACE->output) { - const auto PMONITOR = g_pCompositor->getMonitorFromCursor(); - - if (!PMONITOR) { - Debug::log(ERR, "No monitor at cursor on new layer without a monitor. Ignoring."); - wlr_layer_surface_v1_destroy(WLRLAYERSURFACE); - return; - } - - Debug::log(LOG, "New LayerSurface has no preferred monitor. Assigning Monitor {}", PMONITOR->szName); - - WLRLAYERSURFACE->output = PMONITOR->output; - } - - auto PMONITOR = (CMonitor*)g_pCompositor->getMonitorFromOutput(WLRLAYERSURFACE->output); - - if (!WLRLAYERSURFACE->output || !PMONITOR || PMONITOR->pMirrorOf) { - PMONITOR = g_pCompositor->m_vMonitors.front().get(); - WLRLAYERSURFACE->output = PMONITOR->output; // TODO: current mon - } - - SLayerSurface* layerSurface = PMONITOR->m_aLayerSurfaceLayers[WLRLAYERSURFACE->pending.layer].emplace_back(std::make_unique()).get(); - - layerSurface->szNamespace = WLRLAYERSURFACE->_namespace; - - layerSurface->hyprListener_commitLayerSurface.initCallback(&WLRLAYERSURFACE->surface->events.commit, &Events::listener_commitLayerSurface, layerSurface, "layerSurface"); - layerSurface->hyprListener_destroyLayerSurface.initCallback(&WLRLAYERSURFACE->events.destroy, &Events::listener_destroyLayerSurface, layerSurface, "layerSurface"); - layerSurface->hyprListener_mapLayerSurface.initCallback(&WLRLAYERSURFACE->surface->events.map, &Events::listener_mapLayerSurface, layerSurface, "layerSurface"); - layerSurface->hyprListener_unmapLayerSurface.initCallback(&WLRLAYERSURFACE->surface->events.unmap, &Events::listener_unmapLayerSurface, layerSurface, "layerSurface"); - - layerSurface->layerSurface = WLRLAYERSURFACE; - layerSurface->layer = WLRLAYERSURFACE->current.layer; - WLRLAYERSURFACE->data = layerSurface; - layerSurface->monitorID = PMONITOR->ID; - layerSurface->popupHead = std::make_unique(layerSurface); - - layerSurface->forceBlur = g_pConfigManager->shouldBlurLS(layerSurface->szNamespace); - - Debug::log(LOG, "LayerSurface {:x} (namespace {} layer {}) created on monitor {}", (uintptr_t)layerSurface->layerSurface, layerSurface->layerSurface->_namespace, - (int)layerSurface->layer, PMONITOR->szName); -} - -void Events::listener_destroyLayerSurface(void* owner, void* data) { - SLayerSurface* layersurface = (SLayerSurface*)owner; - - Debug::log(LOG, "LayerSurface {:x} destroyed", (uintptr_t)layersurface->layerSurface); - - const auto PMONITOR = g_pCompositor->getMonitorFromID(layersurface->monitorID); - - layersurface->popupHead.reset(); - - if (!g_pCompositor->getMonitorFromID(layersurface->monitorID)) - Debug::log(WARN, "Layersurface destroyed on an invalid monitor (removed?)"); - - if (!layersurface->fadingOut) { - if (layersurface->mapped) { - Debug::log(LOG, "Forcing an unmap of a LS that did a straight destroy!"); - listener_unmapLayerSurface(layersurface, nullptr); - } else { - Debug::log(LOG, "Removing LayerSurface that wasn't mapped."); - layersurface->alpha.setValueAndWarp(0.f); - layersurface->fadingOut = true; - g_pCompositor->addToFadingOutSafe(layersurface); - } - } - - layersurface->noProcess = true; - - layersurface->hyprListener_commitLayerSurface.removeCallback(); - layersurface->hyprListener_destroyLayerSurface.removeCallback(); - layersurface->hyprListener_mapLayerSurface.removeCallback(); - layersurface->hyprListener_unmapLayerSurface.removeCallback(); - - // rearrange to fix the reserved areas - if (PMONITOR) { - g_pHyprRenderer->arrangeLayersForMonitor(PMONITOR->ID); - PMONITOR->scheduledRecalc = true; - - // and damage - CBox geomFixed = {layersurface->geometry.x + PMONITOR->vecPosition.x, layersurface->geometry.y + PMONITOR->vecPosition.y, layersurface->geometry.width, - layersurface->geometry.height}; - g_pHyprRenderer->damageBox(&geomFixed); - } - - layersurface->readyToDelete = true; - layersurface->layerSurface = nullptr; -} - -void Events::listener_mapLayerSurface(void* owner, void* data) { - SLayerSurface* layersurface = (SLayerSurface*)owner; - - Debug::log(LOG, "LayerSurface {:x} mapped", (uintptr_t)layersurface->layerSurface); - - layersurface->mapped = true; - layersurface->keyboardExclusive = layersurface->layerSurface->current.keyboard_interactive; - layersurface->surface = layersurface->layerSurface->surface; - - // fix if it changed its mon - const auto PMONITOR = g_pCompositor->getMonitorFromOutput(layersurface->layerSurface->output); - - if (!PMONITOR) - return; - - layersurface->applyRules(); - - if ((uint64_t)layersurface->monitorID != PMONITOR->ID) { - const auto POLDMON = g_pCompositor->getMonitorFromID(layersurface->monitorID); - for (auto it = POLDMON->m_aLayerSurfaceLayers[layersurface->layer].begin(); it != POLDMON->m_aLayerSurfaceLayers[layersurface->layer].end(); it++) { - if (it->get() == layersurface) { - PMONITOR->m_aLayerSurfaceLayers[layersurface->layer].emplace_back(std::move(*it)); - POLDMON->m_aLayerSurfaceLayers[layersurface->layer].erase(it); - break; - } - } - layersurface->monitorID = PMONITOR->ID; - PMONITOR->scheduledRecalc = true; - g_pHyprRenderer->arrangeLayersForMonitor(POLDMON->ID); - } - - g_pHyprRenderer->arrangeLayersForMonitor(PMONITOR->ID); - - wlr_surface_send_enter(layersurface->layerSurface->surface, layersurface->layerSurface->output); - - if (layersurface->layerSurface->current.keyboard_interactive == ZWLR_LAYER_SURFACE_V1_KEYBOARD_INTERACTIVITY_EXCLUSIVE) - g_pInputManager->m_dExclusiveLSes.push_back(layersurface); - - const bool GRABSFOCUS = layersurface->layerSurface->current.keyboard_interactive != ZWLR_LAYER_SURFACE_V1_KEYBOARD_INTERACTIVITY_NONE && - // don't focus if constrained - (!g_pCompositor->m_sSeat.mouse || !g_pInputManager->isConstrained()); - - if (GRABSFOCUS) { - g_pInputManager->releaseAllMouseButtons(); - g_pCompositor->focusSurface(layersurface->layerSurface->surface); - - const auto LOCAL = - g_pInputManager->getMouseCoordsInternal() - Vector2D(layersurface->geometry.x + PMONITOR->vecPosition.x, layersurface->geometry.y + PMONITOR->vecPosition.y); - wlr_seat_pointer_notify_enter(g_pCompositor->m_sSeat.seat, layersurface->layerSurface->surface, LOCAL.x, LOCAL.y); - wlr_seat_pointer_notify_motion(g_pCompositor->m_sSeat.seat, 0, LOCAL.x, LOCAL.y); - g_pInputManager->m_bEmptyFocusCursorSet = false; - } - - layersurface->position = Vector2D(layersurface->geometry.x, layersurface->geometry.y); - - CBox geomFixed = {layersurface->geometry.x + PMONITOR->vecPosition.x, layersurface->geometry.y + PMONITOR->vecPosition.y, layersurface->geometry.width, - layersurface->geometry.height}; - g_pHyprRenderer->damageBox(&geomFixed); - const auto WORKSPACE = PMONITOR->activeWorkspace; - const bool FULLSCREEN = WORKSPACE->m_bHasFullscreenWindow && WORKSPACE->m_efFullscreenMode == FULLSCREEN_FULL; - - layersurface->startAnimation(!(layersurface->layer == ZWLR_LAYER_SHELL_V1_LAYER_TOP && FULLSCREEN && !GRABSFOCUS)); - layersurface->readyToDelete = false; - layersurface->fadingOut = false; - - g_pEventManager->postEvent(SHyprIPCEvent{"openlayer", std::string(layersurface->layerSurface->_namespace ? layersurface->layerSurface->_namespace : "")}); - EMIT_HOOK_EVENT("openLayer", layersurface); - - g_pCompositor->setPreferredScaleForSurface(layersurface->layerSurface->surface, PMONITOR->scale); - g_pCompositor->setPreferredTransformForSurface(layersurface->layerSurface->surface, PMONITOR->transform); -} - -void Events::listener_unmapLayerSurface(void* owner, void* data) { - SLayerSurface* layersurface = (SLayerSurface*)owner; - - Debug::log(LOG, "LayerSurface {:x} unmapped", (uintptr_t)layersurface->layerSurface); - - g_pEventManager->postEvent(SHyprIPCEvent{"closelayer", std::string(layersurface->layerSurface->_namespace ? layersurface->layerSurface->_namespace : "")}); - EMIT_HOOK_EVENT("closeLayer", layersurface); - - std::erase(g_pInputManager->m_dExclusiveLSes, layersurface); - - if (!g_pInputManager->m_dExclusiveLSes.empty()) - g_pCompositor->focusSurface(g_pInputManager->m_dExclusiveLSes[0]->layerSurface->surface); - - if (!g_pCompositor->getMonitorFromID(layersurface->monitorID) || g_pCompositor->m_bUnsafeState) { - Debug::log(WARN, "Layersurface unmapping on invalid monitor (removed?) ignoring."); - - g_pCompositor->addToFadingOutSafe(layersurface); - - layersurface->mapped = false; - - layersurface->startAnimation(false); - return; - } - - // make a snapshot and start fade - g_pHyprOpenGL->makeLayerSnapshot(layersurface); - - layersurface->startAnimation(false); - - layersurface->mapped = false; - - g_pCompositor->addToFadingOutSafe(layersurface); - - const auto PMONITOR = g_pCompositor->getMonitorFromOutput(layersurface->layerSurface->output); - - const bool WASLASTFOCUS = g_pCompositor->m_pLastFocus == layersurface->layerSurface->surface; - - layersurface->surface = nullptr; - - if (!PMONITOR) - return; - - // refocus if needed - if (WASLASTFOCUS) { - g_pInputManager->releaseAllMouseButtons(); - - Vector2D surfaceCoords; - SLayerSurface* pFoundLayerSurface = nullptr; - wlr_surface* foundSurface = nullptr; - - g_pCompositor->m_pLastFocus = nullptr; - - // find LS-es to focus - foundSurface = g_pCompositor->vectorToLayerSurface(g_pInputManager->getMouseCoordsInternal(), &PMONITOR->m_aLayerSurfaceLayers[ZWLR_LAYER_SHELL_V1_LAYER_OVERLAY], - &surfaceCoords, &pFoundLayerSurface); - - if (!foundSurface) - foundSurface = g_pCompositor->vectorToLayerSurface(g_pInputManager->getMouseCoordsInternal(), &PMONITOR->m_aLayerSurfaceLayers[ZWLR_LAYER_SHELL_V1_LAYER_TOP], - &surfaceCoords, &pFoundLayerSurface); - - if (!foundSurface && g_pCompositor->m_pLastWindow.lock() && g_pCompositor->isWorkspaceVisible(g_pCompositor->m_pLastWindow.lock()->m_pWorkspace)) { - // if there isn't any, focus the last window - const auto PLASTWINDOW = g_pCompositor->m_pLastWindow.lock(); - g_pCompositor->focusWindow(nullptr); - g_pCompositor->focusWindow(PLASTWINDOW); - } else { - // otherwise, full refocus - g_pInputManager->refocus(); - } - } - - CBox geomFixed = {layersurface->geometry.x + PMONITOR->vecPosition.x, layersurface->geometry.y + PMONITOR->vecPosition.y, layersurface->geometry.width, - layersurface->geometry.height}; - g_pHyprRenderer->damageBox(&geomFixed); - - geomFixed = {layersurface->geometry.x + (int)PMONITOR->vecPosition.x, layersurface->geometry.y + (int)PMONITOR->vecPosition.y, - (int)layersurface->layerSurface->surface->current.width, (int)layersurface->layerSurface->surface->current.height}; - g_pHyprRenderer->damageBox(&geomFixed); - - g_pInputManager->sendMotionEventsToFocused(); -} - -void Events::listener_commitLayerSurface(void* owner, void* data) { - SLayerSurface* layersurface = (SLayerSurface*)owner; - - if (!layersurface->layerSurface || !layersurface->layerSurface->output) - return; - - const auto PMONITOR = g_pCompositor->getMonitorFromOutput(layersurface->layerSurface->output); - - if (!PMONITOR) - return; - - if (layersurface->layer == ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND || layersurface->layer == ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM) - g_pHyprOpenGL->markBlurDirtyForMonitor(PMONITOR); // so that blur is recalc'd - - CBox geomFixed = {layersurface->geometry.x, layersurface->geometry.y, layersurface->geometry.width, layersurface->geometry.height}; - g_pHyprRenderer->damageBox(&geomFixed); - - // fix if it changed its mon - if ((uint64_t)layersurface->monitorID != PMONITOR->ID) { - const auto POLDMON = g_pCompositor->getMonitorFromID(layersurface->monitorID); - - for (auto it = POLDMON->m_aLayerSurfaceLayers[layersurface->layer].begin(); it != POLDMON->m_aLayerSurfaceLayers[layersurface->layer].end(); it++) { - if (it->get() == layersurface) { - PMONITOR->m_aLayerSurfaceLayers[layersurface->layer].emplace_back(std::move(*it)); - POLDMON->m_aLayerSurfaceLayers[layersurface->layer].erase(it); - break; - } - } - - layersurface->monitorID = PMONITOR->ID; - PMONITOR->scheduledRecalc = true; - g_pHyprRenderer->arrangeLayersForMonitor(POLDMON->ID); - } - - if (layersurface->layerSurface->current.committed != 0) { - if (layersurface->layer != layersurface->layerSurface->current.layer) { - - for (auto it = PMONITOR->m_aLayerSurfaceLayers[layersurface->layer].begin(); it != PMONITOR->m_aLayerSurfaceLayers[layersurface->layer].end(); it++) { - if (it->get() == layersurface) { - PMONITOR->m_aLayerSurfaceLayers[layersurface->layerSurface->current.layer].emplace_back(std::move(*it)); - PMONITOR->m_aLayerSurfaceLayers[layersurface->layer].erase(it); - break; - } - } - - layersurface->layer = layersurface->layerSurface->current.layer; - - if (layersurface->layer == ZWLR_LAYER_SHELL_V1_LAYER_BACKGROUND || layersurface->layer == ZWLR_LAYER_SHELL_V1_LAYER_BOTTOM) - g_pHyprOpenGL->markBlurDirtyForMonitor(PMONITOR); // so that blur is recalc'd - } - - g_pHyprRenderer->arrangeLayersForMonitor(PMONITOR->ID); - - PMONITOR->scheduledRecalc = true; - } else { - layersurface->position = Vector2D(layersurface->geometry.x, layersurface->geometry.y); - - // update geom if it changed - if (layersurface->layerSurface->surface->current.scale == 1 && PMONITOR->scale != 1.f && layersurface->layerSurface->surface->current.viewport.has_dst) { - // fractional scaling. Dirty hack. - layersurface->geometry = {layersurface->geometry.x, layersurface->geometry.y, (int)(layersurface->layerSurface->surface->current.viewport.dst_width), - (int)(layersurface->layerSurface->surface->current.viewport.dst_height)}; - } else { - // this is because some apps like e.g. rofi-lbonn can't fucking use the protocol correctly. - layersurface->geometry = {layersurface->geometry.x, layersurface->geometry.y, (int)layersurface->layerSurface->surface->current.width, - (int)layersurface->layerSurface->surface->current.height}; - } - } - - if (layersurface->realPosition.goal() != layersurface->geometry.pos()) { - if (layersurface->realPosition.isBeingAnimated()) - layersurface->realPosition = layersurface->geometry.pos(); - else - layersurface->realPosition.setValueAndWarp(layersurface->geometry.pos()); - } - if (layersurface->realSize.goal() != layersurface->geometry.size()) { - if (layersurface->realSize.isBeingAnimated()) - layersurface->realSize = layersurface->geometry.size(); - else - layersurface->realSize.setValueAndWarp(layersurface->geometry.size()); - } - - if (layersurface->layerSurface->current.keyboard_interactive && (!g_pCompositor->m_sSeat.mouse || !g_pInputManager->isConstrained()) // don't focus if constrained - && !layersurface->keyboardExclusive && layersurface->mapped) { - g_pCompositor->focusSurface(layersurface->layerSurface->surface); - - const auto LOCAL = - g_pInputManager->getMouseCoordsInternal() - Vector2D(layersurface->geometry.x + PMONITOR->vecPosition.x, layersurface->geometry.y + PMONITOR->vecPosition.y); - wlr_seat_pointer_notify_enter(g_pCompositor->m_sSeat.seat, layersurface->layerSurface->surface, LOCAL.x, LOCAL.y); - wlr_seat_pointer_notify_motion(g_pCompositor->m_sSeat.seat, 0, LOCAL.x, LOCAL.y); - g_pInputManager->m_bEmptyFocusCursorSet = false; - } else if (!layersurface->layerSurface->current.keyboard_interactive && (!g_pCompositor->m_sSeat.mouse || !g_pInputManager->isConstrained()) && - layersurface->keyboardExclusive) { - g_pInputManager->refocus(); - } - - layersurface->keyboardExclusive = layersurface->layerSurface->current.keyboard_interactive; - - g_pHyprRenderer->damageSurface(layersurface->layerSurface->surface, layersurface->position.x, layersurface->position.y); - - g_pCompositor->setPreferredScaleForSurface(layersurface->layerSurface->surface, PMONITOR->scale); - g_pCompositor->setPreferredTransformForSurface(layersurface->layerSurface->surface, PMONITOR->transform); -} -- cgit v1.2.3