Use Panorama event handlers for handling slider value changes

danielkrupinski · danielkrupinski · commit a2786c2bc9db · 2025-11-08T17:14:26.000+01:00
Disabled build::kHideExecutableMemory because of incompatibility with event handler entry points
diff --git a/Source/BuildConfig.h b/Source/BuildConfig.h
@@ -8,7 +8,7 @@ namespace build
 
 constexpr auto MEMORY_CAPACITY = 1'000'000;
 
-constexpr auto kHideExecutableMemory{true};
+constexpr auto kHideExecutableMemory{false};
 
 constexpr std::basic_string_view kOsirisDirectoryName{WIN64_LINUX(L"OsirisCS2", "OsirisCS2")};
 constexpr std::basic_string_view kConfigDirectoryName{WIN64_LINUX(L"configs", "configs")};
diff --git a/Source/CS2/Classes/CUtlAbstractDelegate.h b/Source/CS2/Classes/CUtlAbstractDelegate.h
@@ -0,0 +1,50 @@
+#pragma once
+
+#include <cassert>
+#include <cstdint>
+#include <type_traits>
+
+#include <Platform/Macros/PlatformSpecific.h>
+
+namespace cs2
+{
+
+#if IS_WIN64()
+
+struct CUtlAbstractDelegate {
+    template <typename F>
+        requires (std::is_pointer_v<F>&& std::is_function_v<std::remove_pointer_t<F>>)
+    CUtlAbstractDelegate(F f)
+        : function{std::uintptr_t(f)}
+    {
+    }
+
+    void* thisptr{};
+    std::uintptr_t function{};
+};
+static_assert(sizeof(CUtlAbstractDelegate) == 16);
+
+#elif IS_LINUX()
+
+struct CUtlAbstractDelegate {
+    template <typename F>
+        requires (std::is_pointer_v<F>&& std::is_function_v<std::remove_pointer_t<F>>)
+    CUtlAbstractDelegate(F f)
+        : functionOrVirtualMethodOffset{std::uintptr_t(f)}
+    {
+        assert(isUsingFunctionPointer());
+    }
+
+    [[nodiscard]] bool isUsingFunctionPointer() const noexcept
+    {
+        return (functionOrVirtualMethodOffset & 1) == 0;
+    }
+
+    void* thisptr{};
+    std::uintptr_t functionOrVirtualMethodOffset{};
+    std::ptrdiff_t offsetToThis{};
+};
+static_assert(sizeof(CUtlAbstractDelegate) == 24);
+
+#endif
+}
diff --git a/Source/CS2/Panorama/CSlider.h b/Source/CS2/Panorama/CSlider.h
@@ -7,6 +7,8 @@ namespace cs2
 
 struct CSlider : CPanel2D {
     using SetValue = void(CSlider* thisptr, float value);
+
+    using SliderValueChangedEventHandler = bool(void* delegateThisptr, CPanel2D* panel, float value);
 };
 
 }
diff --git a/Source/CS2/Panorama/CUIEngine.h b/Source/CS2/Panorama/CUIEngine.h
@@ -2,6 +2,7 @@
 
 #include <cstdint>
 
+#include <CS2/Classes/CUtlAbstractDelegate.h>
 #include <Platform/Macros/IsPlatform.h>
 #include "CPanel2D.h"
 #include "CPanoramaSymbol.h"
@@ -16,6 +17,7 @@ struct CUIEngine {
     using runScript = void (*)(CUIEngine* thisptr, CUIPanel* contextPanel, const char* scriptSource, const char* originFile, std::uint64_t line);
     using makeSymbol = CPanoramaSymbol(*)(CUIEngine* thisptr, int type, const char* text);
     using onDeletePanel = void (*)(CUIEngine* thisptr, CPanel2D* panel);
+    using RegisterEventHandler = void (*)(CUIEngine* thisptr, CPanoramaSymbol eventName, CUIPanel* panel, CUtlAbstractDelegate* handler);
 };
 
 }
diff --git a/Source/EntryPoints/GuiEntryPoints.h b/Source/EntryPoints/GuiEntryPoints.h
@@ -0,0 +1,15 @@
+#pragma once
+
+#include <CS2/Panorama/CPanel2D.h>
+#include <Utils/TemplateParameterCstring.h>
+
+template <typename HookContext, typename ConfigVariable, TemplateParameterCstring kPanelName>
+class GuiEntryPoints {
+public:
+    LINUX_ONLY([[gnu::aligned(8)]]) static bool hueSliderValueChanged(void* /* thisptr */, cs2::CPanel2D* /* panel */, float value)
+    {
+        HookContext hookContext;
+        hookContext.gui().template onHueSliderValueChanged<ConfigVariable>(kPanelName, value);
+        return true;
+    }
+};
diff --git a/Source/GameClient/Panorama/PanoramaUiEngine.h b/Source/GameClient/Panorama/PanoramaUiEngine.h
@@ -42,6 +42,12 @@ class PanoramaUiEngine {
         return -1;
     }
 
+    void registerEventHandler(cs2::CPanoramaSymbol symbol, cs2::CUIPanel* panel, cs2::CUtlAbstractDelegate handler) noexcept
+    {
+        if (hookContext.patternSearchResults().template get<RegisterEventHandlerFunctionPointer>() && thisptr())
+            hookContext.patternSearchResults().template get<RegisterEventHandlerFunctionPointer>()(*thisptr(), symbol, panel, &handler);
+    }
+
 private:
     [[nodiscard]] auto thisptr() const noexcept
     {
diff --git a/Source/MemoryPatterns/Linux/PanoramaUiEnginePatternsLinux.h b/Source/MemoryPatterns/Linux/PanoramaUiEnginePatternsLinux.h
@@ -16,6 +16,7 @@ struct PanoramaUiEnginePatterns {
             .template addPattern<GetPanelPointerFunctionPointer, CodePattern{"8B 16 31 C9"}>()
             .template addPattern<RunScriptFunctionPointer, CodePattern{"55 48 8D 05 ? ? ? ? 48 89 E5 41 57 49 89 D7 41 56 49"}>()
             .template addPattern<MakeSymbolFunctionPointer, CodePattern{"55 48 89 E5 41 57 41 56 41 55 41 54 53 48 83 EC ? 48 85 D2"}>()
-            .template addPattern<OnDeletePanelFunctionPointer, CodePattern{"48 85 F6 0F 84 ? ? ? ? 55 48 89 E5 41 56 41 55 41 54 49 89 F4 53 48 8B 06 48 89 FB 48 89 F7 FF 10"}>();
+            .template addPattern<OnDeletePanelFunctionPointer, CodePattern{"48 85 F6 0F 84 ? ? ? ? 55 48 89 E5 41 56 41 55 41 54 49 89 F4 53 48 8B 06 48 89 FB 48 89 F7 FF 10"}>()
+            .template addPattern<RegisterEventHandlerFunctionPointer, CodePattern{"55 48 8D 05 ? ? ? ? 48 89 E5 41 57 41 56 49 89 FE 41 55 48 8D 3D ? ? ? ? 49 89 CD"}>();
     }
 };
diff --git a/Source/MemoryPatterns/PatternTypes/UiEnginePatternTypes.h b/Source/MemoryPatterns/PatternTypes/UiEnginePatternTypes.h
@@ -8,3 +8,4 @@ STRONG_TYPE_ALIAS(GetPanelPointerFunctionPointer, cs2::CUIEngine::getPanelPointe
 STRONG_TYPE_ALIAS(RunScriptFunctionPointer, cs2::CUIEngine::runScript);
 STRONG_TYPE_ALIAS(MakeSymbolFunctionPointer, cs2::CUIEngine::makeSymbol);
 STRONG_TYPE_ALIAS(OnDeletePanelFunctionPointer, cs2::CUIEngine::onDeletePanel);
+STRONG_TYPE_ALIAS(RegisterEventHandlerFunctionPointer, cs2::CUIEngine::RegisterEventHandler);
diff --git a/Source/MemoryPatterns/Windows/PanoramaUiEnginePatternsWindows.h b/Source/MemoryPatterns/Windows/PanoramaUiEnginePatternsWindows.h
@@ -16,6 +16,7 @@ struct PanoramaUiEnginePatterns {
             .template addPattern<GetPanelPointerFunctionPointer, CodePattern{"4C 63 0A 4C 8B DA"}>()
             .template addPattern<RunScriptFunctionPointer, CodePattern{"48 89 5C 24 ? 4C 89 4C 24 ? 48 89 54 24 ? 55 56 57 41 54 41 55 41 56 41 57 48 8D"}>()
             .template addPattern<MakeSymbolFunctionPointer, CodePattern{"40 55 56 48 83 EC ? 48 63"}>()
-            .template addPattern<OnDeletePanelFunctionPointer, CodePattern{"48 85 D2 0F 84 ? ? ? ? 48 89 5C 24 ? 57 48 83 EC ? 48"}>();
+            .template addPattern<OnDeletePanelFunctionPointer, CodePattern{"48 85 D2 0F 84 ? ? ? ? 48 89 5C 24 ? 57 48 83 EC ? 48"}>()
+            .template addPattern<RegisterEventHandlerFunctionPointer, CodePattern{"48 89 5C 24 ? 66 89 54 24 ? 55 56 57 41 56 41 57 48 83 EC ? 48 8D 05 ? ? ? ? 48 C7 44 24 28 ? ? ? ? 48 89 44 24 ? 4D"}>();
     }
 };
diff --git a/Source/Osiris.vcxproj b/Source/Osiris.vcxproj
@@ -43,6 +43,7 @@
     <ClInclude Include="CS2\Classes\CRenderComponent.h" />
     <ClInclude Include="CS2\Classes\CSceneObject.h" />
     <ClInclude Include="CS2\Classes\CSceneSystem.h" />
+    <ClInclude Include="CS2\Classes\CUtlAbstractDelegate.h" />
     <ClInclude Include="CS2\Classes\CUtlFilenameSymbolTable.h" />
     <ClInclude Include="CS2\Classes\CUtlLinkedList.h" />
     <ClInclude Include="CS2\Classes\CUtlMap.h" />
@@ -116,6 +117,7 @@
     <ClInclude Include="CS2\Panorama\StyleProperties.h" />
     <ClInclude Include="CS2\Panorama\Transform3D.h" />
     <ClInclude Include="Endpoints.h" />
+    <ClInclude Include="EntryPoints\GuiEntryPoints.h" />
     <ClInclude Include="Features\Combat\SniperRifles\NoScopeInaccuracyVis\NoScopeInaccuracyVis.h" />
     <ClInclude Include="Features\Combat\SniperRifles\NoScopeInaccuracyVis\NoScopeInaccuracyVisConfigVariables.h" />
     <ClInclude Include="Features\Combat\SniperRifles\NoScopeInaccuracyVis\NoScopeInaccuracyVisParams.h" />
@@ -384,7 +386,6 @@
     <ClInclude Include="MemoryPatterns\PatternTypes\GlowPropertyPatternTypes.h" />
     <ClInclude Include="MemoryPatterns\PatternTypes\GlowSceneObjectPatternTypes.h" />
     <ClInclude Include="MemoryPatterns\PatternTypes\HostageServicesPatternTypes.h" />
-    <ClInclude Include="MemoryPatterns\PatternTypes\MapPreviewPanelPatternTypes.h" />
     <ClInclude Include="MemoryPatterns\PatternTypes\MemAllocPatternTypes.h" />
     <ClInclude Include="MemoryPatterns\PatternTypes\PanelPatternTypes.h" />
     <ClInclude Include="MemoryPatterns\PatternTypes\PanelStylePatternTypes.h" />
@@ -564,6 +565,7 @@
     <ClInclude Include="Utils\StringBuilder.h" />
     <ClInclude Include="Utils\StringParser.h" />
     <ClInclude Include="Utils\StrongTypeAlias.h" />
+    <ClInclude Include="Utils\TemplateParameterCstring.h" />
     <ClInclude Include="Utils\ToUnderlying.h" />
     <ClInclude Include="Utils\TypeBitFlags.h" />
     <ClInclude Include="Utils\TypedStaticStringPool.h" />
diff --git a/Source/Osiris.vcxproj.filters b/Source/Osiris.vcxproj.filters
@@ -250,6 +250,9 @@
     <Filter Include="Features\Hud\BombPlantAlert">
       <UniqueIdentifier>{93348815-91fe-4209-910f-aba93d67345a}</UniqueIdentifier>
     </Filter>
+    <Filter Include="EntryPoints">
+      <UniqueIdentifier>{95ddae8d-0dcc-4c4c-a44b-04135f59fdc5}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="CS2\Classes\C_CSGameRules.h">
@@ -1748,9 +1751,6 @@
     <ClInclude Include="GameClient\Panorama\Ui3dPanel.h">
       <Filter>GameClient\Panorama</Filter>
     </ClInclude>
-    <ClInclude Include="MemoryPatterns\PatternTypes\MapPreviewPanelPatternTypes.h">
-      <Filter>MemoryPatterns\PatternTypes</Filter>
-    </ClInclude>
     <ClInclude Include="Features\Visuals\ModelGlow\Preview\EnemyTeam.h">
       <Filter>Features\Visuals\ModelGlow\Preview</Filter>
     </ClInclude>
@@ -1943,6 +1943,15 @@
     <ClInclude Include="GameClient\Panorama\ImagePanel.h">
       <Filter>GameClient\Panorama</Filter>
     </ClInclude>
+    <ClInclude Include="CS2\Classes\CUtlAbstractDelegate.h">
+      <Filter>CS2\Classes</Filter>
+    </ClInclude>
+    <ClInclude Include="EntryPoints\GuiEntryPoints.h">
+      <Filter>EntryPoints</Filter>
+    </ClInclude>
+    <ClInclude Include="Utils\TemplateParameterCstring.h">
+      <Filter>Utils</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="UI\Panorama\CreateGUI.js">
diff --git a/Source/UI/Panorama/CreateGUI.js b/Source/UI/Panorama/CreateGUI.js
@@ -446,7 +446,6 @@ u8R"(
       direction: "horizontal"
     });
 
-    slider.SetPanelEvent('onvaluechanged', function () { $.Osiris.sliderUpdated('visuals', id, slider); });
     slider.min = min;
     slider.max = max;
     slider.increment = 1.0;
diff --git a/Source/UI/Panorama/PanoramaGUI.h b/Source/UI/Panorama/PanoramaGUI.h
@@ -147,11 +147,20 @@ class PanoramaGUI {
             state().modelGlowPreviewPlayerLabelHandleTT = guiPanel.findChildInLayoutFile("ModelGlowPreviewPlayerTTLabel").getHandle();
             state().modelGlowPreviewPlayerLabelHandleCT = guiPanel.findChildInLayoutFile("ModelGlowPreviewPlayerCTLabel").getHandle();
             state().viewmodelPreviewPanelHandle = guiPanel.findChildInLayoutFile("ViewmodelPreview").getHandle();
+
+            hookContext.template make<VisualsTab>().init(guiPanel);
         }
 
         updateFromConfig();
     }
 
+    template <typename ConfigVariable>
+    void onHueSliderValueChanged(const char* panelId, float value) const
+    {
+        const auto newVariableValue = handleHueSlider(panelId, value, ConfigVariable::ValueType::kMin, ConfigVariable::ValueType::kMax, GET_CONFIG_VAR(ConfigVariable));
+        hookContext.config().template setVariable<ConfigVariable>(typename ConfigVariable::ValueType{newVariableValue});
+    }
+
     [[nodiscard]] decltype(auto) modelGlowPreviewPanel(const char* panelId) const noexcept
     {
         auto&& guiPanel = uiEngine().getPanelFromHandle(state().guiPanelHandle);
@@ -208,6 +217,25 @@ class PanoramaGUI {
     }
 
 private:
+    [[nodiscard]] decltype(auto) getHueSlider(const char* sliderId) const noexcept
+    {
+        auto&& guiPanel = uiEngine().getPanelFromHandle(state().guiPanelHandle);
+        return hookContext.template make<HueSlider>(guiPanel.findChildInLayoutFile(sliderId));
+    }
+
+    [[nodiscard]] color::HueInteger handleHueSlider(const char* sliderId, float value, color::HueInteger min, color::HueInteger max, color::HueInteger current) const noexcept
+    {
+        const auto hueIntegral = static_cast<color::HueInteger::UnderlyingType>(value);
+        if (hueIntegral < min || hueIntegral > max || hueIntegral == current)
+            return current;
+
+        const auto hue = color::HueInteger{hueIntegral};
+        auto&& hueSlider = getHueSlider(sliderId);
+        hueSlider.updateTextEntry(hue);
+        hueSlider.updateColorPreview(hue);
+        return hue;
+    }
+
     [[nodiscard]] decltype(auto) uiEngine() const noexcept
     {
         return hookContext.template make<PanoramaUiEngine>();
diff --git a/Source/UI/Panorama/SetCommandHandler.h b/Source/UI/Panorama/SetCommandHandler.h
diff --git a/Source/UI/Panorama/Tabs/VisualsTab/HueSlider.h b/Source/UI/Panorama/Tabs/VisualsTab/HueSlider.h
diff --git a/Source/UI/Panorama/VisualsTab.h b/Source/UI/Panorama/VisualsTab.h
diff --git a/Source/Utils/TemplateParameterCstring.h b/Source/Utils/TemplateParameterCstring.h

Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,8 @@ namespace cs2`
`7`	`7`
`8`	`8`	`struct CSlider : CPanel2D {`
`9`	`9`	`using SetValue = void(CSlider* thisptr, float value);`
	`10`	`+`
	`11`	`+ using SliderValueChangedEventHandler = bool(void* delegateThisptr, CPanel2D* panel, float value);`
`10`	`12`	`};`
`11`	`13`
`12`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,12 @@ class PanoramaUiEngine {`
`42`	`42`	`return -1;`
`43`	`43`	`}`
`44`	`44`
	`45`	`+ void registerEventHandler(cs2::CPanoramaSymbol symbol, cs2::CUIPanel* panel, cs2::CUtlAbstractDelegate handler) noexcept`
	`46`	`+ {`
	`47`	`+ if (hookContext.patternSearchResults().template get<RegisterEventHandlerFunctionPointer>() && thisptr())`
	`48`	`+ hookContext.patternSearchResults().template get<RegisterEventHandlerFunctionPointer>()(*thisptr(), symbol, panel, &handler);`
	`49`	`+ }`
	`50`	`+`
`45`	`51`	`private:`
`46`	`52`	`[[nodiscard]] auto thisptr() const noexcept`
`47`	`53`	`{`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,7 @@ struct PanoramaUiEnginePatterns {`
`16`	`16`	`.template addPattern<GetPanelPointerFunctionPointer, CodePattern{"8B 16 31 C9"}>()`
`17`	`17`	`.template addPattern<RunScriptFunctionPointer, CodePattern{"55 48 8D 05 ? ? ? ? 48 89 E5 41 57 49 89 D7 41 56 49"}>()`
`18`	`18`	`.template addPattern<MakeSymbolFunctionPointer, CodePattern{"55 48 89 E5 41 57 41 56 41 55 41 54 53 48 83 EC ? 48 85 D2"}>()`
`19`		`- .template addPattern<OnDeletePanelFunctionPointer, CodePattern{"48 85 F6 0F 84 ? ? ? ? 55 48 89 E5 41 56 41 55 41 54 49 89 F4 53 48 8B 06 48 89 FB 48 89 F7 FF 10"}>();`
	`19`	`+ .template addPattern<OnDeletePanelFunctionPointer, CodePattern{"48 85 F6 0F 84 ? ? ? ? 55 48 89 E5 41 56 41 55 41 54 49 89 F4 53 48 8B 06 48 89 FB 48 89 F7 FF 10"}>()`
	`20`	`+ .template addPattern<RegisterEventHandlerFunctionPointer, CodePattern{"55 48 8D 05 ? ? ? ? 48 89 E5 41 57 41 56 49 89 FE 41 55 48 8D 3D ? ? ? ? 49 89 CD"}>();`
`20`	`21`	`}`
`21`	`22`	`};`