hyprwm/hyprpaper
1
0
Fork 0
mirror of https://github.com/hyprwm/hyprpaper.git synced 2026-05-07 00:58:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

config: add ability to randomize sort order (#336)

Browse source 
* feat: Add ability to randomize sort order

Add a 'wallpaper#order' config option with 'random' option which allows
wallpaper directories to be shuffled randomly on hyprpaper launch.
'default' leaves existing behavior unchanged.

* only parse order on load, don't keep in SSetting struct
This commit is contained in:
Silas J. Matson 2026-03-02 04:41:57 -08:00 • committed by GitHub
parent a67b9ed738
commit 238abb5157
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 20 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/config/ConfigManager.cpp
View file

@ -2,6 +2,7 @@
#include <algorithm>
#include <filesystem>
#include <glob.h>
#include <random>
#include <hyprlang.hpp>
#include <hyprutils/path/Path.hpp>
#include <hyprutils/string/String.hpp>
@ -63,6 +64,7 @@ bool CConfigManager::init() {
m_config.addSpecialConfigValue("wallpaper", "path", Hyprlang::STRING{""});
m_config.addSpecialConfigValue("wallpaper", "fit_mode", Hyprlang::STRING{"cover"});
m_config.addSpecialConfigValue("wallpaper", "timeout", Hyprlang::INT{0});
m_config.addSpecialConfigValue("wallpaper", "order", Hyprlang::STRING{"default"});
m_config.registerHandler(&handleSource, "source", Hyprlang::SHandlerOptions{});
@ -157,7 +159,7 @@ std::vector<CConfigManager::SSetting> CConfigManager::getSettings() {
result.reserve(keys.size());
for (auto& key : keys) {
std::string monitor, fitMode, path;
std::string monitor, fitMode, path, order;
int timeout;
try {
@ -165,6 +167,7 @@ std::vector<CConfigManager::SSetting> CConfigManager::getSettings() {
fitMode = std::any_cast<Hyprlang::STRING>(m_config.getSpecialConfigValue("wallpaper", "fit_mode", key.c_str()));
path = std::any_cast<Hyprlang::STRING>(m_config.getSpecialConfigValue("wallpaper", "path", key.c_str()));
timeout = std::any_cast<Hyprlang::INT>(m_config.getSpecialConfigValue("wallpaper", "timeout", key.c_str()));
order = std::any_cast<Hyprlang::STRING>(m_config.getSpecialConfigValue("wallpaper", "order", key.c_str()));
} catch (...) {
g_logger->log(LOG_ERR, "Failed parsing wallpaper for key {}", key);
continue;
@ -182,7 +185,22 @@ std::vector<CConfigManager::SSetting> CConfigManager::getSettings() {
continue;
}
result.emplace_back(SSetting{.monitor = std::move(monitor), .fitMode = std::move(fitMode), .paths = RESOLVE_PATH.value(), .timeout = timeout});
auto resolvedPaths = RESOLVE_PATH.value();
if (resolvedPaths.size() > 1) {
if (order != "default" && order != "random") {
g_logger->log(LOG_WARN, "Invalid order value '{}', falling back to default", order);
order = "default";
}
if (order == "random") {
std::random_device rd;
std::mt19937 g(rd());
std::shuffle(resolvedPaths.begin(), resolvedPaths.end(), g);
}
}
result.emplace_back(SSetting{.monitor = std::move(monitor), .fitMode = std::move(fitMode), .paths = std::move(resolvedPaths), .timeout = timeout});
}
return result;