diff options
| -rw-r--r-- | i3status.c | 6 | ||||
| -rw-r--r-- | include/i3status.h | 6 | ||||
| -rw-r--r-- | man/i3status.man | 7 | ||||
| -rw-r--r-- | src/print_cpu_usage.c | 4 | ||||
| -rw-r--r-- | src/print_path_exists.c | 10 | ||||
| -rw-r--r-- | src/print_run_watch.c | 10 |
6 files changed, 33 insertions, 10 deletions
@@ -290,6 +290,7 @@ int main(int argc, char *argv[]) { cfg_opt_t run_watch_opts[] = { CFG_STR("pidfile", NULL, CFGF_NONE), CFG_STR("format", "%title: %status", CFGF_NONE), + CFG_STR("format_down", NULL, CFGF_NONE), CFG_CUSTOM_ALIGN_OPT, CFG_CUSTOM_COLOR_OPTS, CFG_CUSTOM_MIN_WIDTH_OPT, @@ -298,6 +299,7 @@ int main(int argc, char *argv[]) { cfg_opt_t path_exists_opts[] = { CFG_STR("path", NULL, CFGF_NONE), CFG_STR("format", "%title: %status", CFGF_NONE), + CFG_STR("format_down", NULL, CFGF_NONE), CFG_CUSTOM_ALIGN_OPT, CFG_CUSTOM_COLOR_OPTS, CFG_CUSTOM_MIN_WIDTH_OPT, @@ -607,13 +609,13 @@ int main(int argc, char *argv[]) { CASE_SEC_TITLE("run_watch") { SEC_OPEN_MAP("run_watch"); - print_run_watch(json_gen, buffer, title, cfg_getstr(sec, "pidfile"), cfg_getstr(sec, "format")); + print_run_watch(json_gen, buffer, title, cfg_getstr(sec, "pidfile"), cfg_getstr(sec, "format"), cfg_getstr(sec, "format_down")); SEC_CLOSE_MAP; } CASE_SEC_TITLE("path_exists") { SEC_OPEN_MAP("path_exists"); - print_path_exists(json_gen, buffer, title, cfg_getstr(sec, "path"), cfg_getstr(sec, "format")); + print_path_exists(json_gen, buffer, title, cfg_getstr(sec, "path"), cfg_getstr(sec, "format"), cfg_getstr(sec, "format_down")); SEC_CLOSE_MAP; } diff --git a/include/i3status.h b/include/i3status.h index f2a262c..8fb1b79 100644 --- a/include/i3status.h +++ b/include/i3status.h @@ -189,10 +189,10 @@ void print_disk_info(yajl_gen json_gen, char *buffer, const char *path, const ch void print_battery_info(yajl_gen json_gen, char *buffer, int number, const char *path, const char *format, const char *format_down, const char *status_chr, const char *status_bat, const char *status_full, int low_threshold, char *threshold_type, bool last_full_capacity, bool integer_battery_capacity, bool hide_seconds); void print_time(yajl_gen json_gen, char *buffer, const char *title, const char *format, const char *tz, time_t t); void print_ddate(yajl_gen json_gen, char *buffer, const char *format, time_t t); -const char *get_ip_addr(); +const char *get_ip_addr(const char *interface); void print_wireless_info(yajl_gen json_gen, char *buffer, const char *interface, const char *format_up, const char *format_down); -void print_run_watch(yajl_gen json_gen, char *buffer, const char *title, const char *pidfile, const char *format); -void print_path_exists(yajl_gen json_gen, char *buffer, const char *title, const char *path, const char *format); +void print_run_watch(yajl_gen json_gen, char *buffer, const char *title, const char *pidfile, const char *format, const char *format_down); +void print_path_exists(yajl_gen json_gen, char *buffer, const char *title, const char *path, const char *format, const char *format_down); void print_cpu_temperature_info(yajl_gen json_gen, char *buffer, int zone, const char *path, const char *format, int); void print_cpu_usage(yajl_gen json_gen, char *buffer, const char *format); void print_eth_info(yajl_gen json_gen, char *buffer, const char *interface, const char *format_up, const char *format_down); diff --git a/man/i3status.man b/man/i3status.man index 502f391..a3a8c60 100644 --- a/man/i3status.man +++ b/man/i3status.man @@ -239,7 +239,7 @@ implies no coloring at all. You can define a different format with the option "format_not_mounted" which is used if the path is not a mount point. So you can just empty -the output for the given path with adding »format_not_mounted=""« +the output for the given path with adding +format_not_mounted=""+ to the config section. *Example order*: +disk /mnt/usbstick+ @@ -259,6 +259,8 @@ to the config section. Expands the given path to a pidfile and checks if the process ID found inside is valid (that is, if the process is running). You can use this to check if a specific application, such as a VPN client or your DHCP client is running. +There also is an option "format_down". You can hide the output with ++format_down=""+. *Example order*: +run_watch DHCP+ @@ -268,6 +270,8 @@ a specific application, such as a VPN client or your DHCP client is running. Checks if the given path exists in the filesystem. You can use this to check if something is active, like for example a VPN tunnel managed by NetworkManager. +There also is an option "format_down". You can hide the output with ++format_down=""+. *Example order*: +path_exists VPN+ @@ -446,6 +450,7 @@ or OSS (FreeBSD/OpenBSD). *Example order*: +volume master+ *Example format*: +♪: %volume+ + *Example format_muted*: +♪: 0%%+ *Example configuration*: diff --git a/src/print_cpu_usage.c b/src/print_cpu_usage.c index 2c59f69..927e763 100644 --- a/src/print_cpu_usage.c +++ b/src/print_cpu_usage.c @@ -10,8 +10,12 @@ #include <sys/param.h> #include <sys/types.h> #include <sys/sysctl.h> +#if defined(__OpenBSD__) +#include <sys/sched.h> +#else #include <sys/dkstat.h> #endif +#endif #if defined(__DragonFly__) #include <sys/param.h> diff --git a/src/print_path_exists.c b/src/print_path_exists.c index 1b231e6..65bc9c8 100644 --- a/src/print_path_exists.c +++ b/src/print_path_exists.c @@ -6,17 +6,23 @@ #include <sys/stat.h> #include "i3status.h" -void print_path_exists(yajl_gen json_gen, char *buffer, const char *title, const char *path, const char *format) { +void print_path_exists(yajl_gen json_gen, char *buffer, const char *title, const char *path, const char *format, const char *format_down) { const char *walk; char *outwalk = buffer; struct stat st; const bool exists = (stat(path, &st) == 0); + if (exists || format_down == NULL) { + walk = format; + } else { + walk = format_down; + } + INSTANCE(path); START_COLOR((exists ? "color_good" : "color_bad")); - for (walk = format; *walk != '\0'; walk++) { + for (; *walk != '\0'; walk++) { if (*walk != '%') { *(outwalk++) = *walk; continue; diff --git a/src/print_run_watch.c b/src/print_run_watch.c index 3d1ec3f..b108f8f 100644 --- a/src/print_run_watch.c +++ b/src/print_run_watch.c @@ -5,16 +5,22 @@ #include <yajl/yajl_version.h> #include "i3status.h" -void print_run_watch(yajl_gen json_gen, char *buffer, const char *title, const char *pidfile, const char *format) { +void print_run_watch(yajl_gen json_gen, char *buffer, const char *title, const char *pidfile, const char *format, const char *format_down) { bool running = process_runs(pidfile); const char *walk; char *outwalk = buffer; + if (running || format_down == NULL) { + walk = format; + } else { + walk = format_down; + } + INSTANCE(pidfile); START_COLOR((running ? "color_good" : "color_bad")); - for (walk = format; *walk != '\0'; walk++) { + for (; *walk != '\0'; walk++) { if (*walk != '%') { *(outwalk++) = *walk; continue; |