diff options
| author | vaxerski <43317083+vaxerski@users.noreply.github.com> | 2022-03-24 21:34:24 +0100 |
|---|---|---|
| committer | vaxerski <43317083+vaxerski@users.noreply.github.com> | 2022-03-24 21:34:24 +0100 |
| commit | ed5c0a7d33632afac4a7d10782c71d8ee4fdb141 (patch) | |
| tree | e50fdb976ae22654d647ffc90df61594dff04fe5 /src/events/Layers.cpp | |
| parent | 7eb2a1023b7b5b25daf8ee836627ab78da2233ca (diff) | |
Log shifts
Diffstat (limited to 'src/events/Layers.cpp')
| -rw-r--r-- | src/events/Layers.cpp | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/src/events/Layers.cpp b/src/events/Layers.cpp index cc05a386..6b4f0a1a 100644 --- a/src/events/Layers.cpp +++ b/src/events/Layers.cpp @@ -57,6 +57,8 @@ void Events::listener_newLayerSurface(wl_listener* listener, void* data) { void Events::listener_destroyLayerSurface(wl_listener* listener, void* data) { SLayerSurface* layersurface = wl_container_of(listener, layersurface, listen_destroyLayerSurface); + Debug::log(LOG, "LayerSurface %x destroyed", layersurface->layerSurface); + if (layersurface->layerSurface->mapped) layersurface->layerSurface->mapped = false; @@ -70,8 +72,6 @@ void Events::listener_destroyLayerSurface(wl_listener* listener, void* data) { const auto PMONITOR = g_pCompositor->getMonitorFromID(layersurface->monitorID); - Debug::log(LOG, "LayerSurface %x destroyed", layersurface->layerSurface); - // remove the layersurface as it's not used anymore PMONITOR->m_aLayerSurfaceLists[layersurface->layer].remove(layersurface); delete layersurface; @@ -86,6 +86,8 @@ void Events::listener_destroyLayerSurface(wl_listener* listener, void* data) { void Events::listener_mapLayerSurface(wl_listener* listener, void* data) { SLayerSurface* layersurface = wl_container_of(listener, layersurface, listen_mapLayerSurface); + Debug::log(LOG, "LayerSurface %x mapped", layersurface->layerSurface); + layersurface->layerSurface->mapped = true; wlr_surface_send_enter(layersurface->layerSurface->surface, layersurface->layerSurface->output); @@ -106,20 +108,18 @@ void Events::listener_mapLayerSurface(wl_listener* listener, void* data) { if (layersurface->layerSurface->current.keyboard_interactive) g_pCompositor->focusSurface(layersurface->layerSurface->surface); - - Debug::log(LOG, "LayerSurface %x mapped", layersurface->layerSurface); } void Events::listener_unmapLayerSurface(wl_listener* listener, void* data) { SLayerSurface* layersurface = wl_container_of(listener, layersurface, listen_unmapLayerSurface); + Debug::log(LOG, "LayerSurface %x unmapped", layersurface->layerSurface); + if (layersurface->layerSurface->mapped) layersurface->layerSurface->mapped = false; if (layersurface->layerSurface->surface == g_pCompositor->m_pLastFocus) g_pCompositor->m_pLastFocus = nullptr; - - Debug::log(LOG, "LayerSurface %x unmapped", layersurface->layerSurface); } void Events::listener_commitLayerSurface(wl_listener* listener, void* data) { @@ -162,6 +162,8 @@ void createSubsurface(wlr_subsurface* pSubSurface, SLayerSurface* pLayerSurface) if (!pSubSurface || !pLayerSurface) return; + Debug::log(LOG, "Subsurface %x created", pSubSurface); + g_pCompositor->m_lSubsurfaces.push_back(SSubsurface()); const auto PNEWSUBSURFACE = &g_pCompositor->m_lSubsurfaces.back(); @@ -198,12 +200,16 @@ void Events::listener_newSubsurface(wl_listener* listener, void* data) { void Events::listener_mapSubsurface(wl_listener* listener, void* data) { SSubsurface* subsurface = wl_container_of(listener, subsurface, listen_mapSubsurface); + Debug::log(LOG, "Subsurface %x mapped", subsurface); + damageSubsurface(subsurface, true); } void Events::listener_unmapSubsurface(wl_listener* listener, void* data) { SSubsurface* subsurface = wl_container_of(listener, subsurface, listen_unmapSubsurface); + Debug::log(LOG, "Subsurface %x unmapped", subsurface); + damageSubsurface(subsurface, true); } @@ -216,6 +222,8 @@ void Events::listener_commitSubsurface(wl_listener* listener, void* data) { void Events::listener_destroySubsurface(wl_listener* listener, void* data) { SSubsurface* subsurface = wl_container_of(listener, subsurface, listen_destroySubsurface); + Debug::log(LOG, "Subsurface %x destroyed", subsurface); + wl_list_remove(&subsurface->listen_mapSubsurface.link); wl_list_remove(&subsurface->listen_unmapSubsurface.link); wl_list_remove(&subsurface->listen_destroySubsurface.link); |
