Merge branch 'main' of https://github.com/noctalia-dev/noctalia

Author: Ly-sec

README.md

@@ -178,9 +178,11 @@ sudo xbps-install meson ninja pkg-config git \
   polkit-devel librsvg-devel libqalculate-devel libxml2-devel jemalloc-devel
 ```
 
-Vendored dependencies, with no system package needed: `Wuffs`, `tomlplusplus`,
+Vendored dependencies, with no system package needed: `Wuffs`,
 `nlohmann/json`, `Luau`, `dr_wav`, `fzy`, `stb_image_resize2`, and Material Color Utilities.
 
+Dependencies that are vendored by default, with a meson option to instead use the system package: `tomlplusplus`
+
 System packages required beyond the Wayland/GL stack: `libwebp` handles WebP decoding and thumbnail encoding. Wuffs
 handles the other supported raster image formats. `libqalculate` powers the launcher calculator (arithmetic, unit and
 currency conversion).

meson.build

@@ -177,6 +177,15 @@ stb_dep = declare_dependency(
   include_directories: include_directories('third_party/stb', is_system: true),
 )
 
+# ── Vendored: tomlplusplus (header-only) ─────────────────────────────────
+if get_option('system_tomlplusplus')
+  tomlplusplus_dep = dependency('tomlplusplus')
+else
+  tomlplusplus_dep = declare_dependency(
+    include_directories: include_directories('third_party/tomlplusplus', is_system: true),
+  )
+endif
+
 # ── Vendored: md4c (CommonMark parser) ───────────────────────────────────────
 _md4c_lib = static_library('md4c',
   'third_party/md4c/md4c.c',
@@ -875,7 +884,6 @@ endif
 # ── Include directories ────────────────────────────────────────────────────────
 _noctalia_inc = [
   include_directories('src'),
-  include_directories('third_party/tomlplusplus', is_system: true),
   include_directories('third_party/wuffs', is_system: true),
   # nlohmann is header-only and uses GCC extensions in some paths; treat as system.
   include_directories('third_party/nlohmann', is_system: true),
@@ -917,6 +925,7 @@ noctalia_exe = executable('noctalia',
     mcu_dep,
     libxml2_dep,
     stb_dep,
+    tomlplusplus_dep,
     md4c_dep,
     libwebp_dep,
     luau_dep,
@@ -1057,6 +1066,17 @@ battery_hook_state_test = executable('battery_hook_state_test',
 
 test('battery_hook_state', battery_hook_state_test)
 
+hook_manager_test = executable('hook_manager_test',
+  sources: files(
+    'tests/hook_manager_test.cpp',
+    'src/hooks/hook_manager.cpp',
+    'src/core/log.cpp',
+  ),
+  include_directories: _noctalia_inc,
+)
+
+test('hook_manager', hook_manager_test)
+
 desktop_entry_launch_test = executable('desktop_entry_launch_test',
   sources: files(
     'tests/desktop_entry_launch_test.cpp',
@@ -1269,6 +1289,9 @@ plugin_manifest_test = executable('plugin_manifest_test',
     'src/core/log.cpp',
   ),
   include_directories: _noctalia_inc,
+  dependencies: [
+    tomlplusplus_dep,
+  ],
 )
 
 test('plugin_manifest', plugin_manifest_test)
@@ -1308,7 +1331,10 @@ config_schema_roundtrip_test = executable('config_schema_roundtrip_test',
     'src/core/key_chord.cpp',
   ),
   include_directories: _noctalia_inc,
-  dependencies: [xkbcommon_dep],
+  dependencies: [
+    xkbcommon_dep,
+    tomlplusplus_dep,
+  ],
 )
 
 test('config_schema_roundtrip', config_schema_roundtrip_test)
@@ -1327,7 +1353,10 @@ config_widget_test = executable('config_widget_test',
     'src/core/key_chord.cpp',
   ),
   include_directories: _noctalia_inc,
-  dependencies: [xkbcommon_dep],
+  dependencies: [
+    xkbcommon_dep,
+    tomlplusplus_dep,
+  ],
 )
 
 test('config_widget', config_widget_test)
@@ -1347,7 +1376,10 @@ config_path_resolution_test = executable('config_path_resolution_test',
     'src/core/key_chord.cpp',
   ),
   include_directories: _noctalia_inc,
-  dependencies: [xkbcommon_dep],
+  dependencies: [
+    xkbcommon_dep,
+    tomlplusplus_dep,
+  ],
 )
 
 test('config_path_resolution', config_path_resolution_test)
@@ -1373,6 +1405,9 @@ state_store_test = executable('state_store_test',
     'src/core/log.cpp',
   ),
   include_directories: _noctalia_inc,
+  dependencies: [
+    tomlplusplus_dep,
+  ],
 )
 
 test('state_store', state_store_test)

meson_options.txt

@@ -1,2 +1,3 @@
 option('jemalloc', type: 'feature', value: 'auto', description: 'Use jemalloc on glibc builds')
 option('tests', type: 'feature', value: 'auto', description: 'Build unit tests (auto: on for unsanitized debug builds)')
+option('system_tomlplusplus', type: 'boolean', value: false, description: 'Use system tomlplusplus instead of vendored')

src/core/toml.h

@@ -4,5 +4,5 @@
 #pragma GCC diagnostic ignored "-Wshadow"
 #pragma GCC diagnostic ignored "-Wconversion"
 #pragma GCC diagnostic ignored "-Wsign-conversion"
-#include <toml.hpp>
+#include <toml++/toml.hpp>
 #pragma GCC diagnostic pop

src/shell/greeter/greeter_appearance_sync.cpp

@@ -22,7 +22,7 @@
 #include <string>
 #include <string_view>
 #include <system_error>
-#include <toml.hpp>
+#include <toml++/toml.hpp>
 #include <vector>
 
 namespace {

tests/hook_manager_test.cpp

@@ -0,0 +1,59 @@
+#include "hooks/hook_manager.h"
+
+#include <cassert>
+#include <cstdlib>
+#include <string>
+#include <string_view>
+#include <vector>
+
+std::string_view hookKindKey(HookKind kind) {
+  if (kind == HookKind::WallpaperChanged) {
+    return "wallpaper_changed";
+  }
+  return "unknown";
+}
+
+namespace {
+
+  const char* envOrEmpty(const char* name) {
+    if (const char* value = std::getenv(name)) {
+      return value;
+    }
+    return "";
+  }
+
+} // namespace
+
+int main() {
+  constexpr const char* kPathName = "NOCTALIA_WALLPAPER_PATH";
+  constexpr const char* kConnectorName = "NOCTALIA_WALLPAPER_CONNECTOR";
+
+  ::unsetenv(kPathName);
+  ::unsetenv(kConnectorName);
+
+  HookManager hooks;
+  HooksConfig config;
+  config.commands[static_cast<std::size_t>(HookKind::WallpaperChanged)] = {"record-wallpaper-hook"};
+  hooks.reload(config);
+
+  std::vector<std::string> commands;
+  std::string pathSeen;
+  std::string connectorSeen;
+  hooks.setCommandRunner([&](const std::string& command) {
+    commands.push_back(command);
+    pathSeen = envOrEmpty(kPathName);
+    connectorSeen = envOrEmpty(kConnectorName);
+    return true;
+  });
+
+  hooks.fire(HookKind::WallpaperChanged, {{kPathName, "/tmp/noctalia test/wallpaper.png"}, {kConnectorName, "DP-1"}});
+
+  assert(commands.size() == 1);
+  assert(commands[0] == "record-wallpaper-hook");
+  assert(pathSeen == "/tmp/noctalia test/wallpaper.png");
+  assert(connectorSeen == "DP-1");
+  assert(std::getenv(kPathName) == nullptr);
+  assert(std::getenv(kConnectorName) == nullptr);
+
+  return 0;
+}

tests/process_test.cpp

@@ -4,10 +4,15 @@
 #include <condition_variable>
 #include <cstdio>
 #include <cstdlib>
+#include <filesystem>
+#include <fstream>
+#include <iterator>
 #include <mutex>
 #include <optional>
 #include <string>
 #include <string_view>
+#include <thread>
+#include <unistd.h>
 #include <utility>
 
 namespace {
@@ -19,6 +24,19 @@ namespace {
     return condition;
   }
 
+  std::string shellQuote(const std::string& value) {
+    std::string quoted = "'";
+    for (const char ch : value) {
+      if (ch == '\'') {
+        quoted += "'\\''";
+      } else {
+        quoted += ch;
+      }
+    }
+    quoted += "'";
+    return quoted;
+  }
+
   bool capturedAsyncDeliversCallbacksAndResult() {
     std::mutex mutex;
     std::condition_variable cv;
@@ -122,6 +140,39 @@ namespace {
     return ok;
   }
 
+  bool detachedAsyncInheritsLaunchEnvironment() {
+    const std::filesystem::path outPath =
+        std::filesystem::temp_directory_path() / ("noctalia_process_env_test_" + std::to_string(::getpid()));
+    std::error_code ec;
+    std::filesystem::remove(outPath, ec);
+
+    ::setenv("NOCTALIA_WALLPAPER_PATH", "/tmp/noctalia test/wallpaper.png", 1);
+    ::setenv("NOCTALIA_WALLPAPER_CONNECTOR", "DP-1", 1);
+
+    const std::string command = "printf '%s\\n%s' \"$NOCTALIA_WALLPAPER_PATH\" \"$NOCTALIA_WALLPAPER_CONNECTOR\" > "
+        + shellQuote(outPath.string());
+    const bool launched = process::runAsync(command);
+    ::unsetenv("NOCTALIA_WALLPAPER_PATH");
+    ::unsetenv("NOCTALIA_WALLPAPER_CONNECTOR");
+
+    if (!expect(launched, "detached async env command did not launch")) {
+      return false;
+    }
+
+    std::string contents;
+    for (int i = 0; i < 50; ++i) {
+      std::ifstream in(outPath);
+      contents.assign(std::istreambuf_iterator<char>(in), std::istreambuf_iterator<char>());
+      if (contents == "/tmp/noctalia test/wallpaper.png\nDP-1") {
+        break;
+      }
+      std::this_thread::sleep_for(std::chrono::milliseconds(20));
+    }
+
+    std::filesystem::remove(outPath, ec);
+    return expect(contents == "/tmp/noctalia test/wallpaper.png\nDP-1", "detached async env was not visible in child");
+  }
+
   bool commandExistsRejectsDirectories() {
     bool ok = true;
     ok =
@@ -142,6 +193,7 @@ int main() {
   ok = capturedAsyncDeliversCallbacksAndResult() && ok;
   ok = capturedAsyncDeliversCompletionOnly() && ok;
   ok = syncAppliesEnvOverrides() && ok;
+  ok = detachedAsyncInheritsLaunchEnvironment() && ok;
   ok = commandExistsRejectsDirectories() && ok;
   return ok ? 0 : 1;
 }