hyprwm
/
hyprpaper
mirror of https://github.com/hyprwm/hyprpaper.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Added support for XDG_CONFIG_HOME (#62) 

* Added support for XDG_CONFIG_HOME

* Style fixes and null check
This commit is contained in:
Ed Younis 2023-07-16 18:44:16 -04:00 committed by GitHub
parent a1d9ab7584
commit ac5f7b038d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/config/ConfigManager.cpp
View File

@ -6,23 +6,13 @@ CConfigManager::CConfigManager() {
// Read file from default location // Read file from default location
// or from an explicit location given by user // or from an explicit location given by user
std::string configPath; std::string configPath = getMainConfigPath();
if (g_pHyprpaper->m_szExplicitConfigPath.empty()) {
const char* const ENVHOME = getenv("HOME");
configPath = ENVHOME + std::string("/.config/hypr/hyprpaper.conf");
} else {
configPath = g_pHyprpaper->m_szExplicitConfigPath;
}
std::ifstream ifs; std::ifstream ifs;
ifs.open(configPath); ifs.open(configPath);
if (!ifs.good()) { if (!ifs.good()) {
if (g_pHyprpaper->m_szExplicitConfigPath.empty()) { Debug::log(CRIT, "Config file `%s` couldn't be opened.", configPath.c_str());
Debug::log(CRIT, "No config file provided. Default config file `~/.config/hypr/hyprpaper.conf` couldn't be opened.");
} else {
Debug::log(CRIT, "No config file provided. Specified file `%s` couldn't be opened.", configPath.c_str());
}
exit(1); exit(1);
} }
@ -58,6 +48,20 @@ CConfigManager::CConfigManager() {
} }
} }
std::string CConfigManager::getMainConfigPath() {
if (!g_pHyprpaper->m_szExplicitConfigPath.empty())
return g_pHyprpaper->m_szExplicitConfigPath;
static const char* xdgConfigHome = getenv("XDG_CONFIG_HOME");
std::string configPath;
if (!xdgConfigHome)
configPath = getenv("HOME") + std::string("/.config");
else
configPath = xdgConfigHome;
return configPath + "/hypr/hyprpaper.conf";
}
std::string CConfigManager::removeBeginEndSpacesTabs(std::string str) { std::string CConfigManager::removeBeginEndSpacesTabs(std::string str) {
while (str[0] == ' ' || str[0] == '\t') { while (str[0] == ' ' || str[0] == '\t') {
str = str.substr(1); str = str.substr(1);
@ -184,10 +188,10 @@ void CConfigManager::handleUnload(const std::string& COMMAND, const std::string&
void CConfigManager::handleUnloadAll(const std::string& COMMAND, const std::string& VALUE) { void CConfigManager::handleUnloadAll(const std::string& COMMAND, const std::string& VALUE) {
std::vector<std::string> toUnload; std::vector<std::string> toUnload;
for (auto&[name, target] : g_pHyprpaper->m_mWallpaperTargets) { for (auto& [name, target] : g_pHyprpaper->m_mWallpaperTargets) {
bool exists = false; bool exists = false;
for (auto&[mon, target2] : g_pHyprpaper->m_mMonitorActiveWallpaperTargets) { for (auto& [mon, target2] : g_pHyprpaper->m_mMonitorActiveWallpaperTargets) {
if (&target == target2) { if (&target == target2) {
exists = true; exists = true;
break; break;
@ -206,7 +210,7 @@ void CConfigManager::handleUnloadAll(const std::string& COMMAND, const std::stri
// trim from both ends // trim from both ends
std::string CConfigManager::trimPath(std::string path) { std::string CConfigManager::trimPath(std::string path) {
//trims whitespaces, tabs and new line feeds // trims whitespaces, tabs and new line feeds
size_t pathStartIndex = path.find_first_not_of(" \t\r\n"); size_t pathStartIndex = path.find_first_not_of(" \t\r\n");
size_t pathEndIndex = path.find_last_not_of(" \t\r\n"); size_t pathEndIndex = path.find_last_not_of(" \t\r\n");
return path.substr(pathStartIndex, pathEndIndex - pathStartIndex + 1); return path.substr(pathStartIndex, pathEndIndex - pathStartIndex + 1);

1
src/config/ConfigManager.hpp
View File

@ -9,6 +9,7 @@ public:
CConfigManager(); CConfigManager();
std::deque<std::string> m_dRequestedPreloads; std::deque<std::string> m_dRequestedPreloads;
std::string getMainConfigPath();
private: private:
std::string parseError; std::string parseError;