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/protocols/core/Compositor.cpp | 20 ++++++++++---------- src/protocols/core/DataDevice.cpp | 2 +- src/protocols/core/Output.cpp | 8 ++++---- src/protocols/core/Seat.cpp | 4 ++-- src/protocols/core/Shm.cpp | 8 ++++---- src/protocols/core/Subcompositor.cpp | 6 +++--- 6 files changed, 24 insertions(+), 24 deletions(-) (limited to 'src/protocols/core') diff --git a/src/protocols/core/Compositor.cpp b/src/protocols/core/Compositor.cpp index bbb76cb2..37e2df9a 100644 --- a/src/protocols/core/Compositor.cpp +++ b/src/protocols/core/Compositor.cpp @@ -57,7 +57,7 @@ bool CWLRegionResource::good() { } SP CWLRegionResource::fromResource(wl_resource* res) { - auto data = (CWLRegionResource*)(((CWlRegion*)wl_resource_get_user_data(res))->data()); + auto data = sc(sc(wl_resource_get_user_data(res))->data()); return data ? data->m_self.lock() : nullptr; } @@ -167,7 +167,7 @@ CWLSurfaceResource::CWLSurfaceResource(SP resource_) : m_resource(re whenReadable(); } else if (state->buffer->type() == Aquamarine::BUFFER_TYPE_DMABUF && state->buffer->dmabuf().success) { // async buffer and is dmabuf, then we can wait on implicit fences - auto syncFd = dynamic_cast(state->buffer.m_buffer.get())->exportSyncFile(); + auto syncFd = dc(state->buffer.m_buffer.get())->exportSyncFile(); if (syncFd.isValid()) g_pEventLoopManager->doOnReadable(std::move(syncFd), whenReadable); @@ -211,7 +211,7 @@ CWLSurfaceResource::CWLSurfaceResource(SP resource_) : m_resource(re m_pending.updated.bits.transform = true; m_pending.updated.bits.damage = true; - m_pending.transform = (wl_output_transform)tr; + m_pending.transform = sc(tr); m_pending.bufferDamage = CBox{{}, m_pending.bufferSize}; }); @@ -270,7 +270,7 @@ void CWLSurfaceResource::dropCurrentBuffer() { } SP CWLSurfaceResource::fromResource(wl_resource* res) { - auto data = (CWLSurfaceResource*)(((CWlSurface*)wl_resource_get_user_data(res))->data()); + auto data = sc(sc(wl_resource_get_user_data(res))->data()); return data ? data->m_self.lock() : nullptr; } @@ -379,7 +379,7 @@ void CWLSurfaceResource::bfHelper(std::vector> const& nod for (auto const& n : nodes) { Vector2D offset = {}; if (n->m_role->role() == SURFACE_ROLE_SUBSURFACE) { - auto subsurface = ((CSubsurfaceRole*)n->m_role.get())->m_subsurface.lock(); + auto subsurface = sc(n->m_role.get())->m_subsurface.lock(); offset = subsurface->posRelativeToParent(); } @@ -491,7 +491,7 @@ CBox CWLSurfaceResource::extends() { if (surf->m_role->role() != SURFACE_ROLE_SUBSURFACE) return; - ((CRegion*)d)->add(CBox{offset, surf->m_current.size}); + sc(d)->add(CBox{offset, surf->m_current.size}); }, &full); return full.getExtents(); @@ -515,7 +515,7 @@ void CWLSurfaceResource::commitState(SSurfaceState& state) { m_current.texture->m_transform = wlTransformToHyprutils(m_current.transform); if (m_role->role() == SURFACE_ROLE_SUBSURFACE) { - auto subsurface = ((CSubsurfaceRole*)m_role.get())->m_subsurface.lock(); + auto subsurface = sc(m_role.get())->m_subsurface.lock(); if (subsurface->m_sync) return; @@ -525,7 +525,7 @@ void CWLSurfaceResource::commitState(SSurfaceState& state) { breadthfirst( [](SP surf, const Vector2D& offset, void* data) { if (surf->m_role->role() == SURFACE_ROLE_SUBSURFACE) { - auto subsurface = ((CSubsurfaceRole*)surf->m_role.get())->m_subsurface.lock(); + auto subsurface = sc(surf->m_role.get())->m_subsurface.lock(); if (!subsurface->m_sync) return; } @@ -543,7 +543,7 @@ void CWLSurfaceResource::commitState(SSurfaceState& state) { SImageDescription CWLSurfaceResource::getPreferredImageDescription() { auto parent = m_self; if (parent->m_role->role() == SURFACE_ROLE_SUBSURFACE) { - auto subsurface = ((CSubsurfaceRole*)parent->m_role.get())->m_subsurface.lock(); + auto subsurface = sc(parent->m_role.get())->m_subsurface.lock(); parent = subsurface->t1Parent(); } WP monitor; @@ -611,7 +611,7 @@ void CWLSurfaceResource::updateCursorShm(CRegion damage) { // bpp is 32 INSALLAH auto begin = 4 * box.y1 * (box.x2 - box.x1) + box.x1; auto len = 4 * (box.x2 - box.x1); - memcpy((uint8_t*)shmData.data() + begin, (uint8_t*)pixelData + begin, len); + memcpy(shmData.data() + begin, pixelData + begin, len); } }); } diff --git a/src/protocols/core/DataDevice.cpp b/src/protocols/core/DataDevice.cpp index 254a55a3..98dd2945 100644 --- a/src/protocols/core/DataDevice.cpp +++ b/src/protocols/core/DataDevice.cpp @@ -157,7 +157,7 @@ CWLDataSourceResource::~CWLDataSourceResource() { } SP CWLDataSourceResource::fromResource(wl_resource* res) { - auto data = (CWLDataSourceResource*)(((CWlDataSource*)wl_resource_get_user_data(res))->data()); + auto data = sc(sc(wl_resource_get_user_data(res))->data()); return data ? data->m_self.lock() : nullptr; } diff --git a/src/protocols/core/Output.cpp b/src/protocols/core/Output.cpp index 8ebf87eb..d0f057e3 100644 --- a/src/protocols/core/Output.cpp +++ b/src/protocols/core/Output.cpp @@ -51,7 +51,7 @@ CWLOutputResource::CWLOutputResource(SP resource_, PHLMONITOR pMonito } SP CWLOutputResource::fromResource(wl_resource* res) { - auto data = (CWLOutputResource*)(((CWlOutput*)wl_resource_get_user_data(res))->data()); + auto data = sc(sc(wl_resource_get_user_data(res))->data()); return data ? data->m_self.lock() : nullptr; } @@ -74,10 +74,10 @@ void CWLOutputResource::updateState() { if (m_resource->version() >= 2) m_resource->sendScale(std::ceil(m_monitor->m_scale)); - m_resource->sendMode((wl_output_mode)(WL_OUTPUT_MODE_CURRENT), m_monitor->m_pixelSize.x, m_monitor->m_pixelSize.y, m_monitor->m_refreshRate * 1000.0); + m_resource->sendMode(WL_OUTPUT_MODE_CURRENT, m_monitor->m_pixelSize.x, m_monitor->m_pixelSize.y, m_monitor->m_refreshRate * 1000.0); - m_resource->sendGeometry(0, 0, m_monitor->m_output->physicalSize.x, m_monitor->m_output->physicalSize.y, (wl_output_subpixel)m_monitor->m_output->subpixel, - m_monitor->m_output->make.c_str(), m_monitor->m_output->model.c_str(), m_monitor->m_transform); + m_resource->sendGeometry(0, 0, m_monitor->m_output->physicalSize.x, m_monitor->m_output->physicalSize.y, m_monitor->m_output->subpixel, m_monitor->m_output->make.c_str(), + m_monitor->m_output->model.c_str(), m_monitor->m_transform); if (m_resource->version() >= 2) m_resource->sendDone(); diff --git a/src/protocols/core/Seat.cpp b/src/protocols/core/Seat.cpp index 8aa2f36a..e89c49ae 100644 --- a/src/protocols/core/Seat.cpp +++ b/src/protocols/core/Seat.cpp @@ -473,7 +473,7 @@ void CWLSeatResource::sendCapabilities(uint32_t caps) { if (caps & eHIDCapabilityType::HID_INPUT_CAPABILITY_TOUCH) wlCaps |= WL_SEAT_CAPABILITY_TOUCH; - m_resource->sendCapabilities((wl_seat_capability)wlCaps); + m_resource->sendCapabilities(sc(wlCaps)); } bool CWLSeatResource::good() { @@ -561,6 +561,6 @@ SP CWLSeatProtocol::seatResourceForClient(wl_client* client) { std::vector& CCursorSurfaceRole::cursorPixelData(SP surface) { RASSERT(surface->m_role->role() == SURFACE_ROLE_CURSOR, "cursorPixelData called on a non-cursor surface"); - auto role = (CCursorSurfaceRole*)surface->m_role.get(); + auto role = sc(surface->m_role.get()); return role->m_cursorShmPixelData; } diff --git a/src/protocols/core/Shm.cpp b/src/protocols/core/Shm.cpp index d73525a6..673bc03b 100644 --- a/src/protocols/core/Shm.cpp +++ b/src/protocols/core/Shm.cpp @@ -59,7 +59,7 @@ Aquamarine::SSHMAttrs CWLSHMBuffer::shm() { } std::tuple CWLSHMBuffer::beginDataPtr(uint32_t flags) { - return {(uint8_t*)m_pool->m_data + m_offset, m_fmt, m_stride * size.y}; + return {sc(m_pool->m_data) + m_offset, m_fmt, m_stride * size.y}; } void CWLSHMBuffer::endDataPtr() { @@ -101,7 +101,7 @@ static int shmIsSizeValid(CFileDescriptor& fd, size_t size) { return 0; } - return (size_t)st.st_size >= size; + return sc(st.st_size) >= size; } CWLSHMPoolResource::CWLSHMPoolResource(SP resource_, CFileDescriptor fd_, size_t size_) : m_resource(resource_) { @@ -119,7 +119,7 @@ CWLSHMPoolResource::CWLSHMPoolResource(SP resource_, CFileDescriptor m_resource->setOnDestroy([this](CWlShmPool* r) { PROTO::shm->destroyResource(this); }); m_resource->setResize([this](CWlShmPool* r, int32_t size_) { - if UNLIKELY (size_ < (int32_t)m_pool->m_size) { + if UNLIKELY (size_ < sc(m_pool->m_size)) { r->error(-1, "Shrinking a shm pool is illegal"); return; } @@ -188,7 +188,7 @@ CWLSHMResource::CWLSHMResource(SP resource_) : m_resource(resource_) { // send a few supported formats. No need for any other I think? for (auto const& s : PROTO::shm->m_shmFormats) { - m_resource->sendFormat((wl_shm_format)s); + m_resource->sendFormat(sc(s)); } } diff --git a/src/protocols/core/Subcompositor.cpp b/src/protocols/core/Subcompositor.cpp index a8873390..c198052c 100644 --- a/src/protocols/core/Subcompositor.cpp +++ b/src/protocols/core/Subcompositor.cpp @@ -116,7 +116,7 @@ Vector2D CWLSubsurfaceResource::posRelativeToParent() { while (surf->m_role->role() == SURFACE_ROLE_SUBSURFACE && std::ranges::find_if(surfacesVisited, [surf](const auto& other) { return surf == other; }) == surfacesVisited.end()) { surfacesVisited.emplace_back(surf); - auto subsurface = ((CSubsurfaceRole*)m_parent->m_role.get())->m_subsurface.lock(); + auto subsurface = sc(m_parent->m_role.get())->m_subsurface.lock(); pos += subsurface->m_position; surf = subsurface->m_parent.lock(); } @@ -133,7 +133,7 @@ SP CWLSubsurfaceResource::t1Parent() { while (surf->m_role->role() == SURFACE_ROLE_SUBSURFACE && std::ranges::find_if(surfacesVisited, [surf](const auto& other) { return surf == other; }) == surfacesVisited.end()) { surfacesVisited.emplace_back(surf); - auto subsurface = ((CSubsurfaceRole*)m_parent->m_role.get())->m_subsurface.lock(); + auto subsurface = sc(m_parent->m_role.get())->m_subsurface.lock(); surf = subsurface->m_parent.lock(); } return surf; @@ -163,7 +163,7 @@ CWLSubcompositorResource::CWLSubcompositorResource(SP resource SP t1Parent = nullptr; if (PARENT->m_role->role() == SURFACE_ROLE_SUBSURFACE) { - auto subsurface = ((CSubsurfaceRole*)PARENT->m_role.get())->m_subsurface.lock(); + auto subsurface = sc(PARENT->m_role.get())->m_subsurface.lock(); t1Parent = subsurface->t1Parent(); } else t1Parent = PARENT; -- cgit v1.2.3