From beee22a95ed9044950e5486f22edd813e00ffa2c Mon Sep 17 00:00:00 2001 From: Kamikadze <40305144+Kam1k4dze@users.noreply.github.com> Date: Thu, 14 Aug 2025 19:44:56 +0500 Subject: refactor: Use new hyprutils casts (#11377) --- src/managers/PointerManager.cpp | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) (limited to 'src/managers/PointerManager.cpp') diff --git a/src/managers/PointerManager.cpp b/src/managers/PointerManager.cpp index 34bf0976..318ec343 100644 --- a/src/managers/PointerManager.cpp +++ b/src/managers/PointerManager.cpp @@ -502,9 +502,8 @@ SP CPointerManager::renderHWCursorBuffer(SPdmabuf(); auto [data, fmt, size] = buf->beginDataPtr(0); - auto CAIROSURFACE = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, DMABUF.size.x, DMABUF.size.y); - auto CAIRODATASURFACE = - cairo_image_surface_create_for_data((unsigned char*)texData.data(), CAIRO_FORMAT_ARGB32, texture->m_size.x, texture->m_size.y, texture->m_size.x * 4); + auto CAIROSURFACE = cairo_image_surface_create(CAIRO_FORMAT_ARGB32, DMABUF.size.x, DMABUF.size.y); + auto CAIRODATASURFACE = cairo_image_surface_create_for_data(texData.data(), CAIRO_FORMAT_ARGB32, texture->m_size.x, texture->m_size.y, texture->m_size.x * 4); auto CAIRO = cairo_create(CAIROSURFACE); @@ -525,7 +524,7 @@ SP CPointerManager::renderHWCursorBuffer(SP(TR)); // FIXME: this is wrong, and doesn't work for 5, 6 and 7. (flipped + rot) // cba to do it rn, does anyone fucking use that?? @@ -550,7 +549,7 @@ SP CPointerManager::renderHWCursorBuffer(SP(cairo_image_surface_get_height(CAIROSURFACE)) * cairo_image_surface_get_stride(CAIROSURFACE)); cairo_destroy(CAIRO); cairo_surface_destroy(CAIROSURFACE); @@ -664,7 +663,7 @@ CBox CPointerManager::getCursorBoxGlobal() { Vector2D CPointerManager::closestValid(const Vector2D& pos) { static auto PADDING = CConfigValue("cursor:hotspot_padding"); - auto CURSOR_PADDING = std::clamp((int)*PADDING, 0, 100); + auto CURSOR_PADDING = std::clamp(sc(*PADDING), 0, 100); CBox hotBox = {{pos.x - CURSOR_PADDING, pos.y - CURSOR_PADDING}, {2 * CURSOR_PADDING, 2 * CURSOR_PADDING}}; // @@ -809,7 +808,7 @@ void CPointerManager::warpAbsolute(Vector2D abs, SP dev) { switch (dev->getType()) { case HID_TYPE_TABLET: { - CTablet* TAB = reinterpret_cast(dev.get()); + CTablet* TAB = rc(dev.get()); if (!TAB->m_boundOutput.empty()) { mappedArea = outputMappedArea(TAB->m_boundOutput); mappedArea.translate(TAB->m_boundBox.pos()); @@ -826,13 +825,13 @@ void CPointerManager::warpAbsolute(Vector2D abs, SP dev) { break; } case HID_TYPE_TOUCH: { - ITouch* TOUCH = reinterpret_cast(dev.get()); + ITouch* TOUCH = rc(dev.get()); if (!TOUCH->m_boundOutput.empty()) mappedArea = outputMappedArea(TOUCH->m_boundOutput); break; } case HID_TYPE_POINTER: { - IPointer* POINTER = reinterpret_cast(dev.get()); + IPointer* POINTER = rc(dev.get()); if (!POINTER->m_boundOutput.empty()) mappedArea = outputMappedArea(POINTER->m_boundOutput); break; @@ -1118,7 +1117,7 @@ void CPointerManager::setStoredMovement(uint64_t time, const Vector2D& delta, co } void CPointerManager::sendStoredMovement() { - PROTO::relativePointer->sendRelativeMotion((uint64_t)m_storedTime * 1000, m_storedDelta, m_storedUnaccel); + PROTO::relativePointer->sendRelativeMotion(m_storedTime * 1000, m_storedDelta, m_storedUnaccel); m_storedTime = 0; m_storedDelta = Vector2D{}; m_storedUnaccel = Vector2D{}; -- cgit v1.2.3