X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=i3status.c;h=6d6fbc7f1f2e9064d87dde790a9bcbab16ed2ab6;hb=862297ecada056bce29eb603fc6f5e35471409f1;hp=c6e36f55c76f14ec69372245bc90d9c18342288b;hpb=013fdece8dbf31acf531b4745e335bb0edb56a2e;p=i3%2Fi3status diff --git a/i3status.c b/i3status.c index c6e36f5..6d6fbc7 100644 --- a/i3status.c +++ b/i3status.c @@ -5,6 +5,8 @@ * * Copyright © 2008-2009 Michael Stapelberg and contributors * Copyright © 2009 Thorsten Toepper + * Copyright © 2010 Axel Wagner + * Copyright © 2010 Fernando Tarlá Cardoso Lemos * * See file LICENSE for license information. * @@ -19,9 +21,16 @@ #include #include #include +#include +#include +#include +#include +#include #include "i3status.h" +#define exit_if_null(pointer, ...) { if (pointer == NULL) die(__VA_ARGS__); } + /* socket file descriptor for general purposes */ int general_socket; @@ -37,12 +46,136 @@ void sigpipe(int signum) { exit(1); } +/* + * Checks if the given path exists by calling stat(). + * + */ +static bool path_exists(const char *path) { + struct stat buf; + return (stat(path, &buf) == 0); +} + +static void *scalloc(size_t size) { + void *result = calloc(size, 1); + exit_if_null(result, "Error: out of memory (calloc(%zd))\n", size); + return result; +} + +static char *sstrdup(const char *str) { + char *result = strdup(str); + exit_if_null(result, "Error: out of memory (strdup())\n"); + return result; +} + + +/* + * Validates a color in "#RRGGBB" format + * + */ +static int valid_color(const char *value) +{ + if (strlen(value) != 7) return 0; + if (value[0] != '#') return 0; + for (int i = 1; i < 7; ++i) { + if (value[i] >= '0' && value[i] <= '9') continue; + if (value[i] >= 'a' && value[i] <= 'f') continue; + if (value[i] >= 'A' && value[i] <= 'F') continue; + return 0; + } + return 1; +} + +/* + * This function resolves ~ in pathnames. + * It may resolve wildcards in the first part of the path, but if no match + * or multiple matches are found, it just returns a copy of path as given. + * + */ +static char *resolve_tilde(const char *path) { + static glob_t globbuf; + char *head, *tail, *result = NULL; + + tail = strchr(path, '/'); + head = strndup(path, tail ? (size_t)(tail - path) : strlen(path)); + + int res = glob(head, GLOB_TILDE, NULL, &globbuf); + free(head); + /* no match, or many wildcard matches are bad */ + if (res == GLOB_NOMATCH || globbuf.gl_pathc != 1) + result = sstrdup(path); + else if (res != 0) { + die("glob() failed"); + } else { + head = globbuf.gl_pathv[0]; + result = scalloc(strlen(head) + (tail ? strlen(tail) : 0) + 1); + strncpy(result, head, strlen(head)); + strncat(result, tail, strlen(tail)); + } + globfree(&globbuf); + + return result; +} + +static char *get_config_path() { + /* 1: check for $XDG_CONFIG_HOME/i3/config */ + char *xdg_config_home, *xdg_config_dirs, *config_path; + + if ((xdg_config_home = getenv("XDG_CONFIG_HOME")) == NULL) + xdg_config_home = "~/.config"; + + xdg_config_home = resolve_tilde(xdg_config_home); + if (asprintf(&config_path, "%s/i3status/config", xdg_config_home) == -1) + die("asprintf() failed"); + free(xdg_config_home); + + if (path_exists(config_path)) + return config_path; + free(config_path); + + /* 2: check for $XDG_CONFIG_DIRS/i3/config */ + if ((xdg_config_dirs = getenv("XDG_CONFIG_DIRS")) == NULL) + xdg_config_dirs = "/etc/xdg"; + + char *buf = strdup(xdg_config_dirs); + char *tok = strtok(buf, ":"); + while (tok != NULL) { + tok = resolve_tilde(tok); + if (asprintf(&config_path, "%s/i3status/config", tok) == -1) + die("asprintf() failed"); + free(tok); + if (path_exists(config_path)) { + free(buf); + return config_path; + } + free(config_path); + tok = strtok(NULL, ":"); + } + free(buf); + + /* 3: check traditional paths */ + config_path = resolve_tilde("~/.i3status.conf"); + if (path_exists(config_path)) + return config_path; + + config_path = strdup(SYSCONFDIR "/i3status.conf"); + if (!path_exists(config_path)) + die("Neither $XDG_CONFIG_HOME/i3status/config, nor " + "$XDG_CONFIG_DIRS/i3status/config, nor ~/.i3status.conf nor " + SYSCONFDIR "/i3status.conf exist."); + + return config_path; +} + int main(int argc, char *argv[]) { unsigned int j; cfg_opt_t general_opts[] = { CFG_STR("output_format", "dzen2", CFGF_NONE), CFG_BOOL("colors", 1, CFGF_NONE), + CFG_STR("color_good", "#00FF00", CFGF_NONE), + CFG_STR("color_degraded", "#FFFF00", CFGF_NONE), + CFG_STR("color_bad", "#FF0000", CFGF_NONE), + CFG_STR("color_separator", "#333333", CFGF_NONE), CFG_INT("interval", 1, CFGF_NONE), CFG_END() }; @@ -54,7 +187,7 @@ int main(int argc, char *argv[]) { }; cfg_opt_t wireless_opts[] = { - CFG_STR("format_up", "W: (%quality at %essid) %ip", CFGF_NONE), + CFG_STR("format_up", "W: (%quality at %essid, %bitrate) %ip", CFGF_NONE), CFG_STR("format_down", "W: down", CFGF_NONE), CFG_END() }; @@ -66,7 +199,8 @@ int main(int argc, char *argv[]) { }; cfg_opt_t ipv6_opts[] = { - CFG_STR("format", "%ip", CFGF_NONE), + CFG_STR("format_up", "%ip", CFGF_NONE), + CFG_STR("format_down", "no IPv6", CFGF_NONE), CFG_END() }; @@ -81,6 +215,11 @@ int main(int argc, char *argv[]) { CFG_END() }; + cfg_opt_t ddate_opts[] = { + CFG_STR("format", "%{%a, %b %d%}, %Y%N - %H", CFGF_NONE), + CFG_END() + }; + cfg_opt_t load_opts[] = { CFG_STR("format", "%5min %10min %15min", CFGF_NONE), CFG_END() @@ -96,6 +235,14 @@ int main(int argc, char *argv[]) { CFG_END() }; + cfg_opt_t volume_opts[] = { + CFG_STR("format", "♪: %volume", CFGF_NONE), + CFG_STR("device", "default", CFGF_NONE), + CFG_STR("mixer", "Master", CFGF_NONE), + CFG_INT("mixer_idx", 0, CFGF_NONE), + CFG_END() + }; + cfg_opt_t opts[] = { CFG_STR_LIST("order", "{ipv6,\"run_watch DHCP\",\"wireless wlan0\",\"ethernet eth0\",\"battery 0\",\"cpu_temperature 0\",load,time}", CFGF_NONE), CFG_SEC("general", general_opts, CFGF_NONE), @@ -105,17 +252,20 @@ int main(int argc, char *argv[]) { CFG_SEC("battery", battery_opts, CFGF_TITLE | CFGF_MULTI), CFG_SEC("cpu_temperature", temp_opts, CFGF_TITLE | CFGF_MULTI), CFG_SEC("disk", disk_opts, CFGF_TITLE | CFGF_MULTI), - CFG_SEC("ipv6", ipv6_opts, CFGF_TITLE), + CFG_SEC("volume", volume_opts, CFGF_TITLE | CFGF_MULTI), + CFG_SEC("ipv6", ipv6_opts, CFGF_NONE), CFG_SEC("time", time_opts, CFGF_NONE), + CFG_SEC("ddate", ddate_opts, CFGF_NONE), CFG_SEC("load", load_opts, CFGF_NONE), CFG_END() }; - char *configfile = PREFIX "/etc/i3status.conf"; + char *configfile = NULL; int o, option_index = 0; struct option long_options[] = { {"config", required_argument, 0, 'c'}, {"help", no_argument, 0, 'h'}, + {"version", no_argument, 0, 'v'}, {0, 0, 0, 0} }; @@ -124,15 +274,22 @@ int main(int argc, char *argv[]) { action.sa_handler = sigpipe; sigaction(SIGPIPE, &action, NULL); - while ((o = getopt_long(argc, argv, "c:h", long_options, &option_index)) != -1) + while ((o = getopt_long(argc, argv, "c:hv", long_options, &option_index)) != -1) if ((char)o == 'c') configfile = optarg; else if ((char)o == 'h') { - printf("i3status © 2008-2009 Michael Stapelberg\n" - "Syntax: %s [-c ]\n", argv[0]); + printf("i3status " VERSION " © 2008-2010 Michael Stapelberg and contributors\n" + "Syntax: %s [-c ] [-h] [-v]\n", argv[0]); + return 0; + } else if ((char)o == 'v') { + printf("i3status " VERSION " © 2008-2010 Michael Stapelberg and contributors\n"); return 0; } + + if (configfile == NULL) + configfile = get_config_path(); + cfg = cfg_init(opts, CFGF_NONE); if (cfg_parse(cfg, configfile) == CFG_PARSE_ERROR) return EXIT_FAILURE; @@ -150,9 +307,17 @@ int main(int argc, char *argv[]) { output_format = O_NONE; else die("Unknown output format: \"%s\"\n", output_str); + if (!valid_color(cfg_getstr(cfg_general, "color_good")) + || !valid_color(cfg_getstr(cfg_general, "color_degraded")) + || !valid_color(cfg_getstr(cfg_general, "color_bad")) + || !valid_color(cfg_getstr(cfg_general, "color_separator"))) + die("Bad color format"); + if ((general_socket = socket(AF_INET, SOCK_DGRAM, 0)) == -1) die("Could not create socket\n"); + int interval = cfg_getint(cfg_general, "interval"); + while (1) { for (j = 0; j < cfg_size(cfg, "order"); j++) { if (j > 0) @@ -161,7 +326,7 @@ int main(int argc, char *argv[]) { const char *current = cfg_getnstr(cfg, "order", j); CASE_SEC("ipv6") - print_ipv6_info(cfg_getstr(sec, "format")); + print_ipv6_info(cfg_getstr(sec, "format_up"), cfg_getstr(sec, "format_down")); CASE_SEC_TITLE("wireless") print_wireless_info(title, cfg_getstr(sec, "format_up"), cfg_getstr(sec, "format_down")); @@ -184,12 +349,28 @@ int main(int argc, char *argv[]) { CASE_SEC("time") print_time(cfg_getstr(sec, "format")); + CASE_SEC("ddate") + print_ddate(cfg_getstr(sec, "format")); + + CASE_SEC_TITLE("volume") + print_volume(cfg_getstr(sec, "format"), + cfg_getstr(sec, "device"), + cfg_getstr(sec, "mixer"), + cfg_getint(sec, "mixer_idx")); + CASE_SEC_TITLE("cpu_temperature") print_cpu_temperature_info(atoi(title), cfg_getstr(sec, "format")); } printf("\n"); fflush(stdout); - sleep(cfg_getint(cfg_general, "interval")); + /* To provide updates on every full second (as good as possible) + * we don’t use sleep(interval) but we sleep until the next + * second (with microsecond precision) plus (interval-1) + * seconds. */ + struct timeval current_time; + gettimeofday(¤t_time, NULL); + struct timespec ts = {interval - 1, (10e5 - current_time.tv_usec) * 1000}; + nanosleep(&ts, NULL); } }