hydros/HyprlandRPM
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add rest of locations where dynamicPointerCast is used to patch
Some checks failed
Build hyprland-git / Build and push image (push) Failing after 4m52s
Details

Browse Source
This commit is contained in:
Eriq Taing
2025-12-09 15:01:37 -05:00
parent 06e3db0d76
commit 3a9bb8567c
1 changed files with 143 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

143
hyprland-git/dynamicPointerCast.patch
View File

@@ -19,3 +19,146 @@ index 0d9c2f8..3bcaace 100644
}
PHLWINDOW CCompositor::getWindowFromHandle(uint32_t handle) {
diff --git a/src/desktop/view/LayerSurface.cpp b/src/desktop/view/LayerSurface.cpp
index 3192321..e71163b 100644
--- a/src/desktop/view/LayerSurface.cpp
+++ b/src/desktop/view/LayerSurface.cpp
@@ -12,6 +12,7 @@
#include "../../managers/input/InputManager.hpp"
#include "../../managers/HookSystemManager.hpp"
#include "../../managers/EventManager.hpp"
+#include <memory>
using namespace Desktop;
using namespace Desktop::View;
diff --git a/src/desktop/view/Popup.cpp b/src/desktop/view/Popup.cpp
index 31ea125..07e6b67 100644
--- a/src/desktop/view/Popup.cpp
+++ b/src/desktop/view/Popup.cpp
@@ -12,6 +12,7 @@
#include "../../render/Renderer.hpp"
#include "../../render/OpenGL.hpp"
#include <ranges>
+#include <memory>
using namespace Desktop;
using namespace Desktop::View;
diff --git a/src/desktop/view/SessionLock.cpp b/src/desktop/view/SessionLock.cpp
index a4a5b78..b3747b0 100644
--- a/src/desktop/view/SessionLock.cpp
+++ b/src/desktop/view/SessionLock.cpp
@@ -6,6 +6,8 @@
#include "../../Compositor.hpp"
+#include <memory>
+
using namespace Desktop;
using namespace Desktop::View;
@@ -36,7 +38,7 @@ void View::CSessionLock::init() {
SP<View::CSessionLock> View::CSessionLock::fromView(SP<IView> v) {
if (!v || v->type() != VIEW_TYPE_LOCK_SCREEN)
return nullptr;
- return dynamicPointerCast<View::CSessionLock>(v);
+ return std::dynamicPointerCast<View::CSessionLock>(v);
}
eViewType View::CSessionLock::type() const {
diff --git a/src/desktop/view/Subsurface.cpp b/src/desktop/view/Subsurface.cpp
index 2c39a08..2a90717 100644
--- a/src/desktop/view/Subsurface.cpp
+++ b/src/desktop/view/Subsurface.cpp
@@ -6,6 +6,7 @@
#include "../../protocols/core/Subcompositor.hpp"
#include "../../render/Renderer.hpp"
#include "../../managers/input/InputManager.hpp"
+#include <memory>
using namespace Desktop;
using namespace Desktop::View;
diff --git a/src/desktop/view/WLSurface.cpp b/src/desktop/view/WLSurface.cpp
index 1bf90ae..c6bd048 100644
--- a/src/desktop/view/WLSurface.cpp
+++ b/src/desktop/view/WLSurface.cpp
@@ -4,6 +4,7 @@
#include "../../protocols/core/Compositor.hpp"
#include "../../protocols/LayerShell.hpp"
#include "../../render/Renderer.hpp"
+#include <memory>
using namespace Desktop;
using namespace Desktop::View;
@@ -44,7 +45,7 @@ bool CWLSurface::small() const {
if (!m_resource->m_current.texture)
return false;
- const auto O = dynamicPointerCast<CWindow>(m_view.lock());
+ const auto O = std::dynamicPointerCast<CWindow>(m_view.lock());
const auto REPORTED_SIZE = O->getReportedSize();
return REPORTED_SIZE.x > m_resource->m_current.size.x + 1 || REPORTED_SIZE.y > m_resource->m_current.size.y + 1;
@@ -55,7 +56,7 @@ Vector2D CWLSurface::correctSmallVec() const {
return {};
const auto SIZE = getViewporterCorrectedSize();
- const auto O = dynamicPointerCast<CWindow>(m_view.lock());
+ const auto O = std::dynamicPointerCast<CWindow>(m_view.lock());
const auto REP = O->getReportedSize();
return Vector2D{(REP.x - SIZE.x) / 2, (REP.y - SIZE.y) / 2}.clamp({}, {INFINITY, INFINITY}) * (O->m_realSize->value() / REP);
@@ -106,7 +107,7 @@ CRegion CWLSurface::computeDamage() const {
damage.scale(SCALE);
if (BOX.has_value()) {
if (m_view->type() == VIEW_TYPE_WINDOW)
- damage.intersect(CBox{{}, BOX->size() * dynamicPointerCast<CWindow>(m_view.lock())->m_X11SurfaceScaledBy});
+ damage.intersect(CBox{{}, BOX->size() * std::dynamicPointerCast<CWindow>(m_view.lock())->m_X11SurfaceScaledBy});
else
damage.intersect(CBox{{}, BOX->size()});
}
diff --git a/src/desktop/view/Window.cpp b/src/desktop/view/Window.cpp
index e27129a..e50019e 100644
--- a/src/desktop/view/Window.cpp
+++ b/src/desktop/view/Window.cpp
@@ -43,6 +43,7 @@
#include "../../managers/animation/DesktopAnimationManager.hpp"
#include <hyprutils/string/String.hpp>
+#include <memory>
using namespace Hyprutils::String;
using namespace Hyprutils::Animation;
diff --git a/src/managers/input/InputManager.cpp b/src/managers/input/InputManager.cpp
index 98662d1..e24046a 100644
--- a/src/managers/input/InputManager.cpp
+++ b/src/managers/input/InputManager.cpp
@@ -48,6 +48,7 @@
#include "../cursor/CursorShapeOverrideController.hpp"
#include <aquamarine/input/Input.hpp>
+#include <memory>
CInputManager::CInputManager() {
m_listeners.setCursorShape = PROTO::cursorShape->m_events.setShape.listen([this](const CCursorShapeProtocol::SSetShapeEvent& event) {
@@ -337,10 +338,10 @@ void CInputManager::mouseMoveUnified(uint32_t time, bool refocus, bool mouse, st
const auto BOX = HLSurface->getSurfaceBoxGlobal();
if (BOX) {
- const auto PWINDOW = HLSurface->view()->type() == Desktop::View::VIEW_TYPE_WINDOW ? dynamicPointerCast<Desktop::View::CWindow>(HLSurface->view()) : nullptr;
+ const auto PWINDOW = HLSurface->view()->type() == Desktop::View::VIEW_TYPE_WINDOW ? std::dynamicPointerCast<Desktop::View::CWindow>(HLSurface->view()) : nullptr;
surfacePos = BOX->pos();
pFoundLayerSurface =
- HLSurface->view()->type() == Desktop::View::VIEW_TYPE_LAYER_SURFACE ? dynamicPointerCast<Desktop::View::CLayerSurface>(HLSurface->view()) : nullptr;
+ HLSurface->view()->type() == Desktop::View::VIEW_TYPE_LAYER_SURFACE ? std::dynamicPointerCast<Desktop::View::CLayerSurface>(HLSurface->view()) : nullptr;
if (!pFoundLayerSurface)
pFoundWindow = !PWINDOW || PWINDOW->isHidden() ? Desktop::focusState()->window() : PWINDOW;
} else // reset foundSurface, find one normally
@@ -786,7 +787,7 @@ void CInputManager::processMouseDownNormal(const IPointer::SButtonEvent& e) {
auto HLSurf = Desktop::View::CWLSurface::fromResource(g_pSeatManager->m_state.pointerFocus.lock());
if (HLSurf && HLSurf->view()->type() == Desktop::View::VIEW_TYPE_WINDOW)
- g_pCompositor->changeWindowZOrder(dynamicPointerCast<Desktop::View::CWindow>(HLSurf->view()), true);
+ g_pCompositor->changeWindowZOrder(std::dynamicPointerCast<Desktop::View::CWindow>(HLSurf->view()), true);
break;
}