From 8726a7363eb9213235e6e23657668e0daac39a5b Mon Sep 17 00:00:00 2001 From: Vaxry <43317083+vaxerski@users.noreply.github.com> Date: Fri, 20 Mar 2026 13:52:37 -0400 Subject: config: cleanup the entire config infrastructure (#13785) Massively refactors the config infrastructure, sorely needed and will be req'd for the lua stuff --- src/plugins/PluginSystem.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'src/plugins/PluginSystem.cpp') diff --git a/src/plugins/PluginSystem.cpp b/src/plugins/PluginSystem.cpp index 3bd8f473..b52a994e 100644 --- a/src/plugins/PluginSystem.cpp +++ b/src/plugins/PluginSystem.cpp @@ -2,7 +2,7 @@ #include #include -#include "../config/ConfigManager.hpp" +#include "../config/legacy/ConfigManager.hpp" #include "../debug/HyprCtl.hpp" #include "../managers/eventLoop/EventLoopManager.hpp" #include "../managers/permissions/DynamicPermissionManager.hpp" @@ -132,7 +132,7 @@ std::expected CPluginSystem::loadPluginInternal(const std PLUGIN->m_version = PLUGINDATA.version; PLUGIN->m_name = PLUGINDATA.name; - g_pEventLoopManager->doLater([] { g_pConfigManager->reload(); }); + g_pEventLoopManager->doLater([] { Config::mgr()->reload(); }); Log::logger->log(Log::DEBUG, R"( [PluginSystem] Plugin {} loaded. Handle: {:x}, path: "{}", author: "{}", description: "{}", version: "{}")", PLUGINDATA.name, rc(MODULE), path, PLUGINDATA.author, PLUGINDATA.description, PLUGINDATA.version); @@ -175,7 +175,9 @@ void CPluginSystem::unloadPlugin(const CPlugin* plugin, bool eject) { HyprlandAPI::unregisterHyprCtlCommand(plugin->m_handle, sp); } - g_pConfigManager->removePluginConfig(plugin->m_handle); + // FIXME: this is wrong and if I forget to fix this by the time I add another config parser + // this will explode and I will be mad because I am a RETARD + Config::Legacy::mgr()->removePluginConfig(plugin->m_handle); // save these two for dlclose and a log, // as erase_if will kill the pointer @@ -189,7 +191,7 @@ void CPluginSystem::unloadPlugin(const CPlugin* plugin, bool eject) { Log::logger->log(Log::DEBUG, " [PluginSystem] Plugin {} unloaded.", PLNAME); // reload config to fix some stuf like e.g. unloadedPluginVars - g_pEventLoopManager->doLater([] { g_pConfigManager->reload(); }); + g_pEventLoopManager->doLater([] { Config::mgr()->reload(); }); } void CPluginSystem::unloadAllPlugins() { -- cgit v1.2.3