X-Git-Url: https://git.sur5r.net/?p=i3%2Fi3status;a=blobdiff_plain;f=i3status.c;h=7995d743e9b847116a5c88d87a35f130ceec782b;hp=eabcd6c68cbf79469ca105e0013673da42ad3718;hb=f1a33824e83d720da57a581372620e76ce20bddb;hpb=38337511e9b5896006f276c111265c985b2af70d diff --git a/i3status.c b/i3status.c index eabcd6c..7995d74 100644 --- a/i3status.c +++ b/i3status.c @@ -3,7 +3,7 @@ * * i3status – Generates a status line for dzen2 or xmobar * - * Copyright © 2008-2009 Michael Stapelberg and contributors + * Copyright © 2008-2011 Michael Stapelberg and contributors * Copyright © 2009 Thorsten Toepper * Copyright © 2010 Axel Wagner * Copyright © 2010 Fernando Tarlá Cardoso Lemos @@ -26,9 +26,12 @@ #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; @@ -45,26 +48,27 @@ void sigpipe(int signum) { } /* - * Checks if there is a file at the given path (expanding ~) and returns the - * full path if so or NULL if there is no file. + * Checks if the given path exists by calling stat(). * */ -static char *file_exists(char *path) { - static glob_t globbuf; +static bool path_exists(const char *path) { struct stat buf; - char *full_path = NULL; - - if (glob(path, GLOB_NOCHECK | GLOB_TILDE, NULL, &globbuf) < 0) - return NULL; - - full_path = (globbuf.gl_pathc > 0 ? globbuf.gl_pathv[0] : path); + return (stat(path, &buf) == 0); +} - if (stat(full_path, &buf) < 0) - return NULL; +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; +} - return full_path; +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 * @@ -82,11 +86,94 @@ static int valid_color(const char *value) 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() { + char *xdg_config_home, *xdg_config_dirs, *config_path; + + /* 1: check the traditional path under the home directory */ + config_path = resolve_tilde("~/.i3status.conf"); + if (path_exists(config_path)) + return config_path; + + /* 2: check for $XDG_CONFIG_HOME/i3status/config */ + 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); + + /* 3: check the traditional path under /etc */ + config_path = SYSCONFDIR "/i3status.conf"; + if (path_exists(config_path)) + return sstrdup(config_path); + + /* 4: check for $XDG_CONFIG_DIRS/i3status/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); + + die("Unable to find the configuration file (looked at " + "~/.i3status/config, $XDG_CONFIG_HOME/i3status/config, " + "/etc/i3status/config and $XDG_CONFIG_DIRS/i3status/config)"); + return NULL; +} + int main(int argc, char *argv[]) { unsigned int j; cfg_opt_t general_opts[] = { - CFG_STR("output_format", "dzen2", CFGF_NONE), + CFG_STR("output_format", "auto", CFGF_NONE), CFG_BOOL("colors", 1, CFGF_NONE), CFG_STR("color_good", "#00FF00", CFGF_NONE), CFG_STR("color_degraded", "#FFFF00", CFGF_NONE), @@ -103,7 +190,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() }; @@ -141,8 +228,14 @@ int main(int argc, char *argv[]) { CFG_END() }; + cfg_opt_t usage_opts[] = { + CFG_STR("format", "%usage", CFGF_NONE), + CFG_END() + }; + cfg_opt_t temp_opts[] = { CFG_STR("format", "%degrees C", CFGF_NONE), + CFG_STR("path", NULL, CFGF_NONE), CFG_END() }; @@ -151,6 +244,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), @@ -160,18 +261,21 @@ 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("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_SEC("cpu_usage", usage_opts, CFGF_NONE), CFG_END() }; - char *configfile; + 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} }; @@ -180,23 +284,24 @@ int main(int argc, char *argv[]) { action.sa_handler = sigpipe; sigaction(SIGPIPE, &action, NULL); - /* Figure out which configuration file to use before the user may - * override this setting using -c */ - - if ((configfile = file_exists("~/.i3status.conf")) == NULL) - configfile = file_exists(PREFIX "/etc/i3status.conf"); + if (setlocale(LC_ALL, "") == NULL) + die("Could not set locale. Please make sure all your LC_* / LANG settings are correct."); - 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-2011 Michael Stapelberg and contributors\n" + "Syntax: %s [-c ] [-h] [-v]\n", argv[0]); + return 0; + } else if ((char)o == 'v') { + printf("i3status " VERSION " © 2008-2011 Michael Stapelberg and contributors\n"); return 0; } + if (configfile == NULL) - die("No configuration file found\n"); + configfile = get_config_path(); cfg = cfg_init(opts, CFGF_NONE); if (cfg_parse(cfg, configfile) == CFG_PARSE_ERROR) @@ -207,6 +312,17 @@ int main(int argc, char *argv[]) { die("Could not get section \"general\"\n"); char *output_str = cfg_getstr(cfg_general, "output_format"); + if (strcasecmp(output_str, "auto") == 0) { + fprintf(stderr, "i3status: trying to auto-detect output_format setting\n"); + output_str = auto_detect_format(); + if (!output_str) { + output_str = "none"; + fprintf(stderr, "i3status: falling back to \"none\"\n"); + } else { + fprintf(stderr, "i3status: auto-detected \"%s\"\n", output_str); + } + } + if (strcasecmp(output_str, "dzen2") == 0) output_format = O_DZEN2; else if (strcasecmp(output_str, "xmobar") == 0) @@ -226,7 +342,16 @@ int main(int argc, char *argv[]) { int interval = cfg_getint(cfg_general, "interval"); + struct tm tm; while (1) { + struct timeval tv; + gettimeofday(&tv, NULL); + time_t current_time = tv.tv_sec; + struct tm *current_tm = NULL; + if (current_time != (time_t) -1) { + localtime_r(¤t_time, &tm); + current_tm = &tm; + } for (j = 0; j < cfg_size(cfg, "order"); j++) { if (j > 0) print_seperator(); @@ -255,13 +380,22 @@ int main(int argc, char *argv[]) { print_load(cfg_getstr(sec, "format")); CASE_SEC("time") - print_time(cfg_getstr(sec, "format")); + print_time(cfg_getstr(sec, "format"), current_tm); CASE_SEC("ddate") - print_ddate(cfg_getstr(sec, "format")); + print_ddate(cfg_getstr(sec, "format"), current_tm); + + 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")); + print_cpu_temperature_info(atoi(title), cfg_getstr(sec, "path"), cfg_getstr(sec, "format")); + + CASE_SEC("cpu_usage") + print_cpu_usage(cfg_getstr(sec, "format")); } printf("\n"); fflush(stdout); @@ -270,9 +404,9 @@ int main(int argc, char *argv[]) { * 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}; + struct timeval current_timeval; + gettimeofday(¤t_timeval, NULL); + struct timespec ts = {interval - 1, (10e5 - current_timeval.tv_usec) * 1000}; nanosleep(&ts, NULL); } }