diff --git a/csgo-vulkan-fix/main.cpp b/csgo-vulkan-fix/main.cpp index fca737f..68a786f 100644 --- a/csgo-vulkan-fix/main.cpp +++ b/csgo-vulkan-fix/main.cpp @@ -38,7 +38,7 @@ void hkNotifyMotion(CSeatManager* thisptr, uint32_t time_msec, const Vector2D& l newCoords.y *= (**RESY / g_pCompositor->m_lastMonitor->m_size.y) / g_pCompositor->m_lastWindow->m_X11SurfaceScaledBy; } - (*(origMotion)g_pMouseMotionHook->m_pOriginal)(thisptr, time_msec, newCoords); + (*(origMotion)g_pMouseMotionHook->m_original)(thisptr, time_msec, newCoords); } void hkSetWindowSize(CXWaylandSurface* surface, const CBox& box) { @@ -47,7 +47,7 @@ void hkSetWindowSize(CXWaylandSurface* surface, const CBox& box) { static auto* const PCLASS = (Hyprlang::STRING const*)HyprlandAPI::getConfigValue(PHANDLE, "plugin:csgo-vulkan-fix:class")->getDataStaticPtr(); if (!surface) { - (*(origSurfaceSize)g_pSurfaceSizeHook->m_pOriginal)(surface, box); + (*(origSurfaceSize)g_pSurfaceSizeHook->m_original)(surface, box); return; } @@ -63,11 +63,11 @@ void hkSetWindowSize(CXWaylandSurface* surface, const CBox& box) { CWLSurface::fromResource(SURF)->m_fillIgnoreSmall = true; } - (*(origSurfaceSize)g_pSurfaceSizeHook->m_pOriginal)(surface, newBox); + (*(origSurfaceSize)g_pSurfaceSizeHook->m_original)(surface, newBox); } CRegion hkWLSurfaceDamage(CWLSurface* thisptr) { - const auto RG = (*(origWLSurfaceDamage)g_pWLSurfaceDamageHook->m_pOriginal)(thisptr); + const auto RG = (*(origWLSurfaceDamage)g_pWLSurfaceDamageHook->m_original)(thisptr); static auto* const PCLASS = (Hyprlang::STRING const*)HyprlandAPI::getConfigValue(PHANDLE, "plugin:csgo-vulkan-fix:class")->getDataStaticPtr(); diff --git a/flake.lock b/flake.lock index cb90c5e..520039b 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1744289235, - "narHash": "sha256-ZFkHLdimtFzQACsVVyZkZlfYdj4iNy3PkzXfrwmlse8=", + "lastModified": 1745357003, + "narHash": "sha256-jYwzQkv1r7HN/4qrAuKp+NR4YYNp2xDrOX5O9YVqkWo=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "c8282f4982b56dfa5e9b9f659809da93f8d37e7a", + "rev": "a19cf76ee1a15c1c12083fa372747ce46387289f", "type": "github" }, "original": { @@ -87,11 +87,11 @@ ] }, "locked": { - "lastModified": 1742215578, - "narHash": "sha256-zfs71PXVVPEe56WEyNi2TJQPs0wabU4WAlq0XV7GcdE=", + "lastModified": 1745948457, + "narHash": "sha256-lzTV10FJTCGNtMdgW5YAhCAqezeAzKOd/97HbQK8GTU=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "2fd36421c21aa87e2fe3bee11067540ae612f719", + "rev": "ac903e80b33ba6a88df83d02232483d99f327573", "type": "github" }, "original": { @@ -145,11 +145,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1745593751, - "narHash": "sha256-TJ/Nijr83ydAi473NGeazYqcQ0t8lCPU7aaQv98oGg8=", + "lastModified": 1746291290, + "narHash": "sha256-96SpKoIyUsRas+h6RhnPcgbduyH2j2YrujWpsuKdK8Q=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "742bce016cb848d222fbfcfcf8d3894ea3fdaeff", + "rev": "46ac115bd19ee3aff5c816033de0b1d55a74e33f", "type": "github" }, "original": { @@ -238,11 +238,11 @@ ] }, "locked": { - "lastModified": 1739048983, - "narHash": "sha256-REhTcXq4qs3B3cCDtLlYDz0GZvmsBSh947Ub6pQWGTQ=", + "lastModified": 1745951494, + "narHash": "sha256-2dModE32doiyQMmd6EDAQeZnz+5LOs6KXyE0qX76WIg=", "owner": "hyprwm", "repo": "hyprland-qtutils", - "rev": "3504a293c8f8db4127cb0f7cfc1a318ffb4316f8", + "rev": "4be1d324faf8d6e82c2be9f8510d299984dfdd2e", "type": "github" }, "original": { @@ -267,11 +267,11 @@ ] }, "locked": { - "lastModified": 1744468525, - "narHash": "sha256-9HySx+EtsbbKlZDlY+naqqOV679VdxP6x6fP3wxDXJk=", + "lastModified": 1745357019, + "narHash": "sha256-q/C3qj9FWHQenObXuw/nGIT8iIsWFjgmcQYcA+ZfpPs=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "f1000c54d266e6e4e9d646df0774fac5b8a652df", + "rev": "397600c42b8d7a443a5b4e92aa15f46650a90f18", "type": "github" }, "original": { @@ -292,11 +292,11 @@ ] }, "locked": { - "lastModified": 1743950287, - "narHash": "sha256-/6IAEWyb8gC/NKZElxiHChkouiUOrVYNq9YqG0Pzm4Y=", + "lastModified": 1745975815, + "narHash": "sha256-s3GzsRxBL/N/xYgUXZhQh4t62uR1BN4zxXgWBtJ3lWM=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "f2dc70e448b994cef627a157ee340135bd68fbc6", + "rev": "05878d9470c9e5cbc8807813f9ec2006627a0ca0", "type": "github" }, "original": { @@ -332,11 +332,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1744932701, - "narHash": "sha256-fusHbZCyv126cyArUwwKrLdCkgVAIaa/fQJYFlCEqiU=", + "lastModified": 1746141548, + "narHash": "sha256-IgBWhX7A2oJmZFIrpRuMnw5RAufVnfvOgHWgIdds+hc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b024ced1aac25639f8ca8fdfc2f8c4fbd66c48ef", + "rev": "f02fddb8acef29a8b32f10a335d44828d7825b78", "type": "github" }, "original": { @@ -425,11 +425,11 @@ ] }, "locked": { - "lastModified": 1744644585, - "narHash": "sha256-p0D/e4J6Sv6GSb+9u8OQcVHSE2gPNYB5ygIfGDyEiXQ=", + "lastModified": 1745871725, + "narHash": "sha256-M24SNc2flblWGXFkGQfqSlEOzAGZnMc9QG3GH4K/KbE=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "be6771e754345f18244fb00aae5c9e5ab21ccc26", + "rev": "76bbf1a6b1378e4ab5230bad00ad04bc287c969e", "type": "github" }, "original": { diff --git a/hyprexpo/main.cpp b/hyprexpo/main.cpp index 88203f1..84ec3b7 100644 --- a/hyprexpo/main.cpp +++ b/hyprexpo/main.cpp @@ -29,7 +29,7 @@ static bool renderingOverview = false; // static void hkRenderWorkspace(void* thisptr, PHLMONITOR pMonitor, PHLWORKSPACE pWorkspace, timespec* now, const CBox& geometry) { if (!g_pOverview || renderingOverview || g_pOverview->blockOverviewRendering || g_pOverview->pMonitor != pMonitor) - ((origRenderWorkspace)(g_pRenderWorkspaceHook->m_pOriginal))(thisptr, pMonitor, pWorkspace, now, geometry); + ((origRenderWorkspace)(g_pRenderWorkspaceHook->m_original))(thisptr, pMonitor, pWorkspace, now, geometry); else g_pOverview->render(); } @@ -38,7 +38,7 @@ static void hkAddDamageA(void* thisptr, const CBox& box) { const auto PMONITOR = (CMonitor*)thisptr; if (!g_pOverview || g_pOverview->pMonitor != PMONITOR->m_self || g_pOverview->blockDamageReporting) { - ((origAddDamageA)g_pAddDamageHookA->m_pOriginal)(thisptr, box); + ((origAddDamageA)g_pAddDamageHookA->m_original)(thisptr, box); return; } @@ -49,7 +49,7 @@ static void hkAddDamageB(void* thisptr, const pixman_region32_t* rg) { const auto PMONITOR = (CMonitor*)thisptr; if (!g_pOverview || g_pOverview->pMonitor != PMONITOR->m_self || g_pOverview->blockDamageReporting) { - ((origAddDamageB)g_pAddDamageHookB->m_pOriginal)(thisptr, rg); + ((origAddDamageB)g_pAddDamageHookB->m_original)(thisptr, rg); return; } diff --git a/hyprwinwrap/main.cpp b/hyprwinwrap/main.cpp index a1fa0a1..0a01737 100644 --- a/hyprwinwrap/main.cpp +++ b/hyprwinwrap/main.cpp @@ -92,14 +92,14 @@ void onCommitSubsurface(CSubsurface* thisptr) { const auto PWINDOW = thisptr->m_wlSurface->getWindow(); if (!PWINDOW || std::find_if(bgWindows.begin(), bgWindows.end(), [PWINDOW](const auto& ref) { return ref.lock() == PWINDOW; }) == bgWindows.end()) { - ((origCommitSubsurface)subsurfaceHook->m_pOriginal)(thisptr); + ((origCommitSubsurface)subsurfaceHook->m_original)(thisptr); return; } // cant use setHidden cuz that sends suspended and shit too that would be laggy PWINDOW->m_hidden = false; - ((origCommitSubsurface)subsurfaceHook->m_pOriginal)(thisptr); + ((origCommitSubsurface)subsurfaceHook->m_original)(thisptr); if (const auto MON = PWINDOW->m_monitor.lock(); MON) g_pHyprOpenGL->markBlurDirtyForMonitor(MON); @@ -110,14 +110,14 @@ void onCommit(void* owner, void* data) { const auto PWINDOW = ((CWindow*)owner)->m_self.lock(); if (std::find_if(bgWindows.begin(), bgWindows.end(), [PWINDOW](const auto& ref) { return ref.lock() == PWINDOW; }) == bgWindows.end()) { - ((origCommit)commitHook->m_pOriginal)(owner, data); + ((origCommit)commitHook->m_original)(owner, data); return; } // cant use setHidden cuz that sends suspended and shit too that would be laggy PWINDOW->m_hidden = false; - ((origCommit)commitHook->m_pOriginal)(owner, data); + ((origCommit)commitHook->m_original)(owner, data); if (const auto MON = PWINDOW->m_monitor.lock(); MON) g_pHyprOpenGL->markBlurDirtyForMonitor(MON);