hyprwm/hyprpicker
1
0
Fork 0
mirror of https://github.com/hyprwm/hyprpicker.git synced 2024-12-22 14:19:48 +01:00
Code Issues Projects Releases Packages Wiki Activity

core: avoid leaving garbage buffers on exit

Browse source
This commit is contained in:
vaxerski 2023-05-29 19:09:55 +02:00
parent 0eea88367a
commit deaca6a4d8
3 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/events/Events.cpp
View file

@ -276,6 +276,7 @@ void Events::handleBufferRelease(void* data, struct wl_buffer* wl_buffer) {
void Events::handleSCBuffer(void* data, struct zwlr_screencopy_frame_v1* frame, uint32_t format, uint32_t width, uint32_t height, uint32_t stride) { void Events::handleSCBuffer(void* data, struct zwlr_screencopy_frame_v1* frame, uint32_t format, uint32_t width, uint32_t height, uint32_t stride) {
const auto PLS = (CLayerSurface*)data; const auto PLS = (CLayerSurface*)data;
if (!PLS->screenBuffer.buffer)
g_pHyprpicker->createBuffer(&PLS->screenBuffer, width, height, format, stride); g_pHyprpicker->createBuffer(&PLS->screenBuffer, width, height, format, stride);
zwlr_screencopy_frame_v1_copy(frame, PLS->screenBuffer.buffer); zwlr_screencopy_frame_v1_copy(frame, PLS->screenBuffer.buffer);

7
src/helpers/LayerSurface.cpp
View file

@ -23,7 +23,8 @@ CLayerSurface::CLayerSurface(SMonitor* pMonitor) {
} }
zwlr_layer_surface_v1_set_size(pLayerSurface, 0, 0); zwlr_layer_surface_v1_set_size(pLayerSurface, 0, 0);
zwlr_layer_surface_v1_set_anchor(pLayerSurface, ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP | ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT | ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM | ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT); zwlr_layer_surface_v1_set_anchor(
pLayerSurface, ZWLR_LAYER_SURFACE_V1_ANCHOR_TOP | ZWLR_LAYER_SURFACE_V1_ANCHOR_RIGHT | ZWLR_LAYER_SURFACE_V1_ANCHOR_BOTTOM | ZWLR_LAYER_SURFACE_V1_ANCHOR_LEFT);
zwlr_layer_surface_v1_set_exclusive_zone(pLayerSurface, -1); zwlr_layer_surface_v1_set_exclusive_zone(pLayerSurface, -1);
zwlr_layer_surface_v1_set_keyboard_interactivity(pLayerSurface, true); zwlr_layer_surface_v1_set_keyboard_interactivity(pLayerSurface, true);
zwlr_layer_surface_v1_add_listener(pLayerSurface, &Events::layersurfaceListener, this); zwlr_layer_surface_v1_add_listener(pLayerSurface, &Events::layersurfaceListener, this);
@ -38,4 +39,8 @@ CLayerSurface::~CLayerSurface() {
if (g_pHyprpicker->m_pWLDisplay) if (g_pHyprpicker->m_pWLDisplay)
wl_display_flush(g_pHyprpicker->m_pWLDisplay); wl_display_flush(g_pHyprpicker->m_pWLDisplay);
g_pHyprpicker->destroyBuffer(&buffers[0]);
g_pHyprpicker->destroyBuffer(&buffers[1]);
g_pHyprpicker->destroyBuffer(&screenBuffer);
} }

15
src/hyprpicker.cpp
View file

@ -1,7 +1,12 @@
#include "hyprpicker.hpp" #include "hyprpicker.hpp"
#include <signal.h>
#include "events/Events.hpp" #include "events/Events.hpp"
void sigHandler(int sig) {
g_pHyprpicker->m_vLayerSurfaces.clear();
exit(0);
}
void CHyprpicker::init() { void CHyprpicker::init() {
m_pWLDisplay = wl_display_connect(nullptr); m_pWLDisplay = wl_display_connect(nullptr);
@ -11,6 +16,8 @@ void CHyprpicker::init() {
return; return;
} }
signal(SIGTERM, sigHandler);
m_pWLRegistry = wl_display_get_registry(m_pWLDisplay); m_pWLRegistry = wl_display_get_registry(m_pWLDisplay);
wl_registry_add_listener(m_pWLRegistry, &Events::registryListener, nullptr); wl_registry_add_listener(m_pWLRegistry, &Events::registryListener, nullptr);
@ -42,12 +49,6 @@ void CHyprpicker::init() {
} }
void CHyprpicker::finish(int code) { void CHyprpicker::finish(int code) {
for (auto& ls : m_vLayerSurfaces) {
destroyBuffer(&ls->buffers[0]);
destroyBuffer(&ls->buffers[1]);
destroyBuffer(&ls->screenBuffer);
}
m_vLayerSurfaces.clear(); m_vLayerSurfaces.clear();
if (m_pWLDisplay) { if (m_pWLDisplay) {