Merge pull request #369 from 31KM/master

Introduce memory options 'unit' and 'decimals'

1 files changed, 3 insertions, 1 deletions

diff --git a/i3status.c b/i3status.c
index 1ab8400..4423917 100644
--- a/i3status.c
+++ b/i3status.c
@@ -431,6 +431,8 @@ int main(int argc, char *argv[]) {
         CFG_STR("threshold_degraded", NULL, CFGF_NONE),
         CFG_STR("threshold_critical", NULL, CFGF_NONE),
         CFG_STR("memory_used_method", "classical", CFGF_NONE),
+        CFG_STR("unit", "auto", CFGF_NONE),
+        CFG_INT("decimals", 1, CFGF_NONE),
         CFG_CUSTOM_ALIGN_OPT,
         CFG_CUSTOM_COLOR_OPTS,
         CFG_CUSTOM_MIN_WIDTH_OPT,
@@ -763,7 +765,7 @@ int main(int argc, char *argv[]) {
 
             CASE_SEC("memory") {
                 SEC_OPEN_MAP("memory");
-                print_memory(json_gen, buffer, cfg_getstr(sec, "format"), cfg_getstr(sec, "format_degraded"), cfg_getstr(sec, "threshold_degraded"), cfg_getstr(sec, "threshold_critical"), cfg_getstr(sec, "memory_used_method"));
+                print_memory(json_gen, buffer, cfg_getstr(sec, "format"), cfg_getstr(sec, "format_degraded"), cfg_getstr(sec, "threshold_degraded"), cfg_getstr(sec, "threshold_critical"), cfg_getstr(sec, "memory_used_method"), cfg_getstr(sec, "unit"), cfg_getint(sec, "decimals"));
                 SEC_CLOSE_MAP;
             }