hyprwm/Hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/Hyprland synced 2024-11-29 15:05:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

config: fix long variables being substrd

Browse source
This commit is contained in:
vaxerski 2023-03-18 14:57:59 +00:00
parent 6e6971606d
commit ef80a69399
2 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/config/ConfigManager.cpp
View file

@ -40,11 +40,13 @@ CConfigManager::CConfigManager() {
void CConfigManager::populateEnvironment() { void CConfigManager::populateEnvironment() {
environmentVariables.clear(); environmentVariables.clear();
for (char** env = environ; *env; ++env) { for (char** env = environ; *env; ++env) {
const std::string ENVVAR = *env; const std::string ENVVAR = *env;
const auto VARIABLE = ENVVAR.substr(0, ENVVAR.find_first_of('=')); const auto VARIABLE = ENVVAR.substr(0, ENVVAR.find_first_of('='));
const auto VALUE = ENVVAR.substr(ENVVAR.find_first_of('=') + 1); const auto VALUE = ENVVAR.substr(ENVVAR.find_first_of('=') + 1);
environmentVariables[VARIABLE] = VALUE; environmentVariables.emplace_back(std::make_pair<>(VARIABLE, VALUE));
} }
std::sort(environmentVariables.begin(), environmentVariables.end(), [&](const auto& a, const auto& b) { return a.first.length() > b.first.length(); });
} }
void CConfigManager::setDefaultVars() { void CConfigManager::setDefaultVars() {
@ -293,7 +295,9 @@ void CConfigManager::configSetValueSafe(const std::string& COMMAND, const std::s
if (COMMAND[0] == '$') { if (COMMAND[0] == '$') {
// register a dynamic var // register a dynamic var
Debug::log(LOG, "Registered dynamic var \"%s\" -> %s", COMMAND.c_str(), VALUE.c_str()); Debug::log(LOG, "Registered dynamic var \"%s\" -> %s", COMMAND.c_str(), VALUE.c_str());
configDynamicVars[COMMAND.substr(1)] = VALUE; configDynamicVars.emplace_back(std::make_pair<>(COMMAND.substr(1), VALUE));
std::sort(configDynamicVars.begin(), configDynamicVars.end(), [&](const auto& a, const auto& b) { return a.first.length() > b.first.length(); });
} else { } else {
parseError = "Error setting value <" + VALUE + "> for field <" + COMMAND + ">: No such field."; parseError = "Error setting value <" + VALUE + "> for field <" + COMMAND + ">: No such field.";
} }

4
src/config/ConfigManager.hpp
View file

@ -187,7 +187,7 @@ class CConfigManager {
private: private:
std::deque<std::string> configPaths; // stores all the config paths std::deque<std::string> configPaths; // stores all the config paths
std::unordered_map<std::string, time_t> configModifyTimes; // stores modify times std::unordered_map<std::string, time_t> configModifyTimes; // stores modify times
std::unordered_map<std::string, std::string> configDynamicVars; // stores dynamic vars declared by the user std::vector<std::pair<std::string, std::string>> configDynamicVars; // stores dynamic vars declared by the user
std::unordered_map<std::string, SConfigValue> configValues; std::unordered_map<std::string, SConfigValue> configValues;
std::unordered_map<std::string, std::unordered_map<std::string, SConfigValue>> deviceConfigs; // stores device configs std::unordered_map<std::string, std::unordered_map<std::string, SConfigValue>> deviceConfigs; // stores device configs
@ -215,7 +215,7 @@ class CConfigManager {
bool firstExecDispatched = false; bool firstExecDispatched = false;
std::deque<std::string> firstExecRequests; std::deque<std::string> firstExecRequests;
std::unordered_map<std::string, std::string> environmentVariables; std::vector<std::pair<std::string, std::string>> environmentVariables;
// internal methods // internal methods
void setDefaultVars(); void setDefaultVars();