From c54cd6ea513700fc8c344500a0097be0b64c8e34 Mon Sep 17 00:00:00 2001 From: Alec Murphy Date: Sat, 19 Apr 2025 08:13:58 -0400 Subject: [PATCH] System: Use Settings/config.json for debug options --- Settings/config.json | 6 ++++++ System/Core/Compositor.HC | 2 +- System/Libraries/System.HC | 4 ++++ System/MakeSystem.HC | 7 ++++++- 4 files changed, 17 insertions(+), 2 deletions(-) create mode 100644 Settings/config.json diff --git a/Settings/config.json b/Settings/config.json new file mode 100644 index 0000000..928c3a8 --- /dev/null +++ b/Settings/config.json @@ -0,0 +1,6 @@ +{ + "debug": { + "show_compositor_overlay": true, + "show_system_log_messages": true + } +} \ No newline at end of file diff --git a/System/Core/Compositor.HC b/System/Core/Compositor.HC index 3077b07..8842cbe 100644 --- a/System/Core/Compositor.HC +++ b/System/Core/Compositor.HC @@ -1065,7 +1065,7 @@ U0 @compositor_task() // Debug stuff I64 debug_row; - if (KeyDown(SC_F12)) { + if (KeyDown(SC_F12) || (config->o("debug") && config->o("debug")->@("show_compositor_overlay"))) { debug_row = 32; total_mem = sys_code_bp->alloced_u8s; diff --git a/System/Libraries/System.HC b/System/Libraries/System.HC index 38f86df..c1d7bb1 100644 --- a/System/Libraries/System.HC +++ b/System/Libraries/System.HC @@ -51,6 +51,10 @@ U8* @system_build_info() { return System.build_info; } U0 @system_log(CTask* task, U8* fmt, ...) { + if (!config->o("debug")) + return; + if (!config->o("debug")->@("show_system_log_messages")) + return; U8* buf = StrPrintJoin(NULL, fmt, argc, argv); U8* str = buf; U32 color; diff --git a/System/MakeSystem.HC b/System/MakeSystem.HC index 083cc77..9eb9b38 100644 --- a/System/MakeSystem.HC +++ b/System/MakeSystem.HC @@ -52,13 +52,17 @@ load_elf("M:/build/bin/tlse"); // Erythros system libraries "libraries: { "; +#include "Libraries/Json"; + +// Load system-wide config values +JsonObject* config = Json.Parse(FileRead("M:/Settings/config.json"), erythros_mem_task); + #include "Libraries/Function"; #include "Libraries/Base64"; #include "Libraries/String"; #include "Libraries/BitmapFont"; #include "Libraries/Display"; #include "Libraries/FileSystem"; -#include "Libraries/Json"; #include "Libraries/Graphics2D"; #include "Libraries/Animation2D"; #include "Libraries/Image"; @@ -78,6 +82,7 @@ load_elf("M:/build/bin/tlse"); #include "Libraries/Widget"; #include "Libraries/Theme"; + @http_init_tmp_and_cache_directories; #include "Libraries/Css/Tokenizer";