summaryrefslogtreecommitdiff
path: root/i3status.c
diff options
context:
space:
mode:
authorDennis Vesterlund <dennisvesterlund@gmail.com>2019-02-21 15:34:32 +0100
committerMichael Stapelberg <stapelberg@users.noreply.github.com>2019-02-21 15:34:32 +0100
commit9b5f6ae5f460c8642286cf174751a317f155d043 (patch)
tree802a6ca40521ffddffe91fcab5d4a50f67fdd8f2 /i3status.c
parent9d28a661a72cd118448e92c30a35b98100aa57bf (diff)
Added function to print content from file (#331)
Added a function to print file contents to status bar without newlines. Added tests for print file contents function Added manpage entry for file contents
Diffstat (limited to 'i3status.c')
-rw-r--r--i3status.c19
1 files changed, 19 insertions, 0 deletions
diff --git a/i3status.c b/i3status.c
index 90660bb..0898da3 100644
--- a/i3status.c
+++ b/i3status.c
@@ -491,6 +491,18 @@ int main(int argc, char *argv[]) {
CFG_CUSTOM_SEP_BLOCK_WIDTH_OPT,
CFG_END()};
+ cfg_opt_t read_opts[] = {
+ CFG_STR("format", "%content", CFGF_NONE),
+ CFG_STR("format_bad", "%title - %errno: %error", CFGF_NONE),
+ CFG_STR("path", NULL, CFGF_NONE),
+ CFG_INT("max_characters", 255, CFGF_NONE),
+ CFG_CUSTOM_ALIGN_OPT,
+ CFG_CUSTOM_COLOR_OPTS,
+ CFG_CUSTOM_MIN_WIDTH_OPT,
+ CFG_CUSTOM_SEPARATOR_OPT,
+ CFG_CUSTOM_SEP_BLOCK_WIDTH_OPT,
+ CFG_END()};
+
cfg_opt_t opts[] = {
CFG_STR_LIST("order", "{}", CFGF_NONE),
CFG_SEC("general", general_opts, CFGF_NONE),
@@ -509,6 +521,7 @@ int main(int argc, char *argv[]) {
CFG_SEC("load", load_opts, CFGF_NONE),
CFG_SEC("memory", memory_opts, CFGF_NONE),
CFG_SEC("cpu_usage", usage_opts, CFGF_NONE),
+ CFG_SEC("read_file", read_opts, CFGF_TITLE | CFGF_MULTI),
CFG_END()};
char *configfile = NULL;
@@ -787,6 +800,12 @@ int main(int argc, char *argv[]) {
print_cpu_usage(json_gen, buffer, cfg_getstr(sec, "format"), cfg_getstr(sec, "format_above_threshold"), cfg_getstr(sec, "format_above_degraded_threshold"), cfg_getstr(sec, "path"), cfg_getfloat(sec, "max_threshold"), cfg_getfloat(sec, "degraded_threshold"));
SEC_CLOSE_MAP;
}
+
+ CASE_SEC_TITLE("read_file") {
+ SEC_OPEN_MAP("read_file");
+ print_file_contents(json_gen, buffer, title, cfg_getstr(sec, "path"), cfg_getstr(sec, "format"), cfg_getstr(sec, "format_bad"), cfg_getint(sec, "max_characters"));
+ SEC_CLOSE_MAP;
+ }
}
if (output_format == O_I3BAR) {
yajl_gen_array_close(json_gen);