diff options
| author | zakk4223 <zakk@rsdio.com> | 2024-03-20 21:55:13 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-21 01:55:13 +0000 |
| commit | 4c796683c05a0eaccc14aae8875f06972f9f3c5e (patch) | |
| tree | a2605abdd24aa8a1c444adceee70cbdb450d296b /src/config/ConfigManager.cpp | |
| parent | 214ec82ba7dcbb33b45963d13b84f9bd6c913614 (diff) | |
config: Config error limit/hyprctl (#5165)
* Add error_limit to limit the number of config error messages shown in notification
* Add configerrors hyprctl command
* Formatting
* Formatting for not my code
* Use CVarList, add escapeJSONStrings
* Add indication there are more undisplayed errors
* Restore suppress_errors; move getErrors() to ConfigManager
* Formatting, wtf
* Format
Diffstat (limited to 'src/config/ConfigManager.cpp')
| -rw-r--r-- | src/config/ConfigManager.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/config/ConfigManager.cpp b/src/config/ConfigManager.cpp index d671ffb0..7925da64 100644 --- a/src/config/ConfigManager.cpp +++ b/src/config/ConfigManager.cpp @@ -372,6 +372,7 @@ CConfigManager::CConfigManager() { m_pConfig->addConfigValue("debug:damage_tracking", {(Hyprlang::INT)DAMAGE_TRACKING_FULL}); m_pConfig->addConfigValue("debug:manual_crash", Hyprlang::INT{0}); m_pConfig->addConfigValue("debug:suppress_errors", Hyprlang::INT{0}); + m_pConfig->addConfigValue("debug:error_limit", Hyprlang::INT{5}); m_pConfig->addConfigValue("debug:watchdog_timeout", Hyprlang::INT{5}); m_pConfig->addConfigValue("debug:disable_scale_checks", Hyprlang::INT{0}); @@ -609,6 +610,10 @@ std::string CConfigManager::getMainConfigPath() { return getConfigDir() + "/hypr/" + (ISDEBUG ? "hyprlandd.conf" : "hyprland.conf"); } +std::string CConfigManager::getErrors() { + return m_szConfigErrors; +} + void CConfigManager::reload() { EMIT_HOOK_EVENT("preConfigReload", nullptr); setDefaultAnimationVars(); @@ -740,6 +745,12 @@ void CConfigManager::postConfigReload(const Hyprlang::CParseResult& result) { g_pHyprOpenGL->m_bReloadScreenShader = true; // parseError will be displayed next frame + + if (result.error) + m_szConfigErrors = result.getError(); + else + m_szConfigErrors = ""; + if (result.error && !std::any_cast<Hyprlang::INT>(m_pConfig->getConfigValue("debug:suppress_errors"))) g_pHyprError->queueCreate(result.getError(), CColor(1.0, 50.0 / 255.0, 50.0 / 255.0, 1.0)); else if (std::any_cast<Hyprlang::INT>(m_pConfig->getConfigValue("autogenerated")) == 1) |
