pgrondek/polybar-dwm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(config): ${self.key} references the current section

Browse Source
This commit is contained in:
Michael Carlberg 2016-10-28 13:36:53 +02:00
parent cc253b069a
commit 2cc6ef662a
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/components/config.hpp
View File

@ -181,11 +181,12 @@ class config {
protected: protected:
/** /**
* Find value of a config parameter defined as a reference * Find value of a config parameter defined as a reference
* variable using ${section.param} or ${env:VAR} * variable using ${section.param}
* ${self.key} may be used to reference the current bar section
* *
* @deprecated: ${BAR.key} has been replaced with ${self.key} * ${BAR.key} may be used to reference the current bar section
* but the former is kept to avoid breaking current configs * ${self.key} may be used to reference the current section
* ${env:key} may be used to reference an environment variable
* ${xrdb:key} may be used to reference a variable in the X resource db
*/ */
template <typename T> template <typename T>
T dereference_var(string ref_section, string ref_key, string var, const T ref_val) const { T dereference_var(string ref_section, string ref_key, string var, const T ref_val) const {
@ -221,7 +222,7 @@ class config {
auto section = path.substr(0, n); auto section = path.substr(0, n);
section = string_util::replace(section, "BAR", bar_section()); section = string_util::replace(section, "BAR", bar_section());
section = string_util::replace(section, "self", bar_section()); section = string_util::replace(section, "self", ref_section);
auto key = path.substr(n + 1, path.length() - n - 1); auto key = path.substr(n + 1, path.length() - n - 1);
auto val = m_ptree.get_optional<T>(build_path(section, key)); auto val = m_ptree.get_optional<T>(build_path(section, key));