hyprwm
/
Hyprland
mirror of https://github.com/hyprwm/Hyprland
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sessionLock: call wlr_surface_map/_unmap on the surface manually 

fixes unmapped subsurfaces etc

ref #5816
This commit is contained in:
Vaxry 2024-04-30 21:59:07 +01:00
parent a09103cd38
commit 70ebc3add3
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/protocols/SessionLock.cpp
View File

@ -36,8 +36,10 @@ CSessionLockSurface::CSessionLockSurface(SP<CExtSessionLockSurfaceV1> resource_,
if (committed) if (committed)
events.commit.emit(); events.commit.emit();
else else {
wlr_surface_map(pSurface);
events.map.emit(); events.map.emit();
}
committed = true; committed = true;
}, },
this, "SessionLockSurface"); this, "SessionLockSurface");
@ -46,6 +48,7 @@ CSessionLockSurface::CSessionLockSurface(SP<CExtSessionLockSurfaceV1> resource_,
&pSurface->events.destroy, &pSurface->events.destroy,
[this](void* owner, void* data) { [this](void* owner, void* data) {
LOGM(WARN, "SessionLockSurface object remains but surface is being destroyed???"); LOGM(WARN, "SessionLockSurface object remains but surface is being destroyed???");
wlr_surface_unmap(pSurface);
hyprListener_surfaceCommit.removeCallback(); hyprListener_surfaceCommit.removeCallback();
hyprListener_surfaceDestroy.removeCallback(); hyprListener_surfaceDestroy.removeCallback();
pSurface = nullptr; pSurface = nullptr;
@ -58,6 +61,8 @@ CSessionLockSurface::CSessionLockSurface(SP<CExtSessionLockSurfaceV1> resource_,
} }
CSessionLockSurface::~CSessionLockSurface() { CSessionLockSurface::~CSessionLockSurface() {
if (pSurface && pSurface->mapped)
wlr_surface_unmap(pSurface);
hyprListener_surfaceCommit.removeCallback(); hyprListener_surfaceCommit.removeCallback();
hyprListener_surfaceDestroy.removeCallback(); hyprListener_surfaceDestroy.removeCallback();
events.destroy.emit(); // just in case. events.destroy.emit(); // just in case.

2
src/render/Renderer.cpp
View File

@ -745,7 +745,7 @@ void CHyprRenderer::renderSessionLockSurface(SSessionLockSurface* pSurface, CMon
renderdata.w = pMonitor->vecSize.x; renderdata.w = pMonitor->vecSize.x;
renderdata.h = pMonitor->vecSize.y; renderdata.h = pMonitor->vecSize.y;
renderSurface(renderdata.surface, 0, 0, &renderdata); wlr_surface_for_each_surface(pSurface->surface.lock()->surface(), renderSurface, &renderdata);
} }
void CHyprRenderer::renderAllClientsForWorkspace(CMonitor* pMonitor, PHLWORKSPACE pWorkspace, timespec* time, const Vector2D& translate, const float& scale) { void CHyprRenderer::renderAllClientsForWorkspace(CMonitor* pMonitor, PHLWORKSPACE pWorkspace, timespec* time, const Vector2D& translate, const float& scale) {