cry/Hyprland
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

core/surface: fixup a few pointer handling edge cases

Browse source
This commit is contained in:
Vaxry 2024-07-29 19:02:58 +02:00
parent 9c38b0fdbe
commit e673220340
3 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/protocols/core/Compositor.cpp
View file

@ -156,6 +156,7 @@ void CWLSurfaceResource::destroy() {
unmap();
}
events.destroy.emit();
releaseBuffers(false);
PROTO::compositor->destroyResource(this);
}
@ -338,13 +339,18 @@ void CWLSurfaceResource::unmap() {
// release the buffers.
// this is necessary for XWayland to function correctly,
// as it does not unmap via the traditional commit(null buffer) method, but via the X11 protocol.
releaseBuffers();
}
void CWLSurfaceResource::releaseBuffers(bool onlyCurrent) {
if (current.buffer && !current.buffer->resource->released)
current.buffer->sendRelease();
if (pending.buffer && !pending.buffer->resource->released)
if (pending.buffer && !pending.buffer->resource->released && !onlyCurrent)
pending.buffer->sendRelease();
pending.buffer.reset();
current.buffer.reset();
if (!onlyCurrent)
current.buffer.reset();
}
void CWLSurfaceResource::error(int code, const std::string& str) {

1
src/protocols/core/Compositor.hpp
View file

@ -137,6 +137,7 @@ class CWLSurfaceResource {
int stateLocks = 0;
void destroy();
void releaseBuffers(bool onlyCurrent = true);
void commitPendingState();
void bfHelper(std::vector<SP<CWLSurfaceResource>> nodes, std::function<void(SP<CWLSurfaceResource>, const Vector2D&, void*)> fn, void* data);
};