From b15c2bfff6941bd2072eade13177433d7ab58a00 Mon Sep 17 00:00:00 2001 From: Vaxry <43317083+vaxerski@users.noreply.github.com> Date: Mon, 7 Apr 2025 21:08:16 +0200 Subject: CursorManager: Store cursor pixel data retrieved from X/HC as a copy (#9986) Instead of storing pointers as refs (which could randomly get invalid very easily) copy the data. --- src/managers/CursorManager.cpp | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'src/managers/CursorManager.cpp') diff --git a/src/managers/CursorManager.cpp b/src/managers/CursorManager.cpp index cad456ba..ee0cff35 100644 --- a/src/managers/CursorManager.cpp +++ b/src/managers/CursorManager.cpp @@ -18,12 +18,16 @@ static void hcLogger(enum eHyprcursorLogLevel level, char* message) { Debug::log(NONE, "[hc] {}", message); } -CCursorBuffer::CCursorBuffer(cairo_surface_t* surf, const Vector2D& size_, const Vector2D& hot_) : hotspot(hot_), surface(surf), stride(cairo_image_surface_get_stride(surf)) { +CCursorBuffer::CCursorBuffer(cairo_surface_t* surf, const Vector2D& size_, const Vector2D& hot_) : m_hotspot(hot_), m_stride(cairo_image_surface_get_stride(surf)) { size = size_; + + m_data = std::vector((uint8_t*)cairo_image_surface_get_data(surf), ((uint8_t*)cairo_image_surface_get_data(surf)) + (cairo_image_surface_get_height(surf) * m_stride)); } -CCursorBuffer::CCursorBuffer(uint8_t* pixelData_, const Vector2D& size_, const Vector2D& hot_) : hotspot(hot_), pixelData(pixelData_), stride(4 * size_.x) { +CCursorBuffer::CCursorBuffer(const uint8_t* pixelData, const Vector2D& size_, const Vector2D& hot_) : m_hotspot(hot_), m_stride(4 * size_.x) { size = size_; + + m_data = std::vector(pixelData, pixelData + ((int)size_.y * m_stride)); } Aquamarine::eBufferCapability CCursorBuffer::caps() { @@ -51,12 +55,12 @@ Aquamarine::SSHMAttrs CCursorBuffer::shm() { attrs.success = true; attrs.format = DRM_FORMAT_ARGB8888; attrs.size = size; - attrs.stride = stride; + attrs.stride = m_stride; return attrs; } std::tuple CCursorBuffer::beginDataPtr(uint32_t flags) { - return {pixelData ? pixelData : cairo_image_surface_get_data(surface), DRM_FORMAT_ARGB8888, stride}; + return {m_data.data(), DRM_FORMAT_ARGB8888, m_stride}; } void CCursorBuffer::endDataPtr() { -- cgit v1.2.3