public/gpu-screen-recorder-ui
1
0
Fork 0
mirror of https://repo.dec05eba.com/gpu-screen-recorder-ui synced 2026-03-31 09:17:04 +09:00
Code Issues Actions Packages Projects Releases Wiki Activity

Properly cleanup wl outputs for cursor tracker

Browse Source
This commit is contained in:
dec05eba
2025-10-30 20:12:47 +01:00
parent d70b36000f
commit a6b1111230
2 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/CursorTracker/CursorTrackerWayland.hpp
View File

@@ -34,6 +34,7 @@ namespace gsr {
std::vector<WaylandOutput> monitors; std::vector<WaylandOutput> monitors;
struct zxdg_output_manager_v1 *xdg_output_manager = nullptr; struct zxdg_output_manager_v1 *xdg_output_manager = nullptr;
private: private:
void clear_monitors();
void set_monitor_outputs_from_xdg_output(struct wl_display *dpy); void set_monitor_outputs_from_xdg_output(struct wl_display *dpy);
private: private:
int drm_fd = -1; int drm_fd = -1;

35
src/CursorTracker/CursorTrackerWayland.cpp
View File

@@ -403,6 +403,7 @@ namespace gsr {
} }
CursorTrackerWayland::~CursorTrackerWayland() { CursorTrackerWayland::~CursorTrackerWayland() {
clear_monitors();
if(drm_fd > 0) if(drm_fd > 0)
close(drm_fd); close(drm_fd);
} }
@@ -480,6 +481,21 @@ namespace gsr {
wl_display_roundtrip(dpy); wl_display_roundtrip(dpy);
} }
void CursorTrackerWayland::clear_monitors() {
for(WaylandOutput &monitor : monitors) {
if(monitor.output) {
wl_output_destroy(monitor.output);
monitor.output = nullptr;
}
if(monitor.xdg_output) {
zxdg_output_v1_destroy(monitor.xdg_output);
monitor.xdg_output = nullptr;
}
}
monitors.clear();
}
std::optional<CursorInfo> CursorTrackerWayland::get_latest_cursor_info() { std::optional<CursorInfo> CursorTrackerWayland::get_latest_cursor_info() {
if(drm_fd <= 0 || latest_crtc_id == -1) if(drm_fd <= 0 || latest_crtc_id == -1)
return std::nullopt; return std::nullopt;
@@ -494,7 +510,7 @@ namespace gsr {
return std::nullopt; return std::nullopt;
} }
monitors.clear(); clear_monitors();
struct wl_registry *registry = wl_display_get_registry(dpy); struct wl_registry *registry = wl_display_get_registry(dpy);
wl_registry_add_listener(registry, &registry_listener, this); wl_registry_add_listener(registry, &registry_listener, this);
@@ -508,22 +524,13 @@ namespace gsr {
mgl::vec2i cursor_position = latest_cursor_position; mgl::vec2i cursor_position = latest_cursor_position;
const WaylandOutput *wayland_monitor = get_wayland_monitor_by_name(monitors, monitor_name); const WaylandOutput *wayland_monitor = get_wayland_monitor_by_name(monitors, monitor_name);
if(!wayland_monitor) if(!wayland_monitor) {
clear_monitors();
return std::nullopt; return std::nullopt;
}
cursor_position = wayland_monitor->pos + latest_cursor_position; cursor_position = wayland_monitor->pos + latest_cursor_position;
for(WaylandOutput &monitor : monitors) { clear_monitors();
if(monitor.output) {
wl_output_destroy(monitor.output);
monitor.output = nullptr;
}
if(monitor.xdg_output) {
zxdg_output_v1_destroy(monitor.xdg_output);
monitor.xdg_output = nullptr;
}
}
monitors.clear();
if(xdg_output_manager) { if(xdg_output_manager) {
zxdg_output_manager_v1_destroy(xdg_output_manager); zxdg_output_manager_v1_destroy(xdg_output_manager);