X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=i3status.c;h=9087d0cb1a4fa51be9dcc1dba80ef485ce5099a4;hb=6298377bd467a241dc1b05ef54f4e6ce02e06de1;hp=e72b6779e028a3a92e9b6b619d295bba24eb21c5;hpb=783707906c102c6b30f18a3837cec523974b882c;p=i3%2Fi3status diff --git a/i3status.c b/i3status.c index e72b677..9087d0c 100644 --- a/i3status.c +++ b/i3status.c @@ -3,36 +3,11 @@ * * i3status – Generates a status line for dzen2 or xmobar * - * * Copyright © 2008-2009 Michael Stapelberg and contributors * Copyright © 2009 Thorsten Toepper - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * * Redistributions of source code must retain the above copyright notice, this - * list of conditions and the following disclaimer. + * Copyright © 2010 Axel Wagner * - * * Redistributions in binary form must reproduce the above copyright notice, - * this list of conditions and the following disclaimer in the documentation - * and/or other materials provided with the distribution. - * - * * Neither the name of Michael Stapelberg nor the names of contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - * POSSIBILITY OF SUCH DAMAGE. + * See file LICENSE for license information. * */ #include @@ -45,6 +20,11 @@ #include #include #include +#include +#include +#include +#include +#include #include "i3status.h" @@ -63,10 +43,32 @@ void sigpipe(int signum) { exit(1); } +/* + * 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. + * + */ +static char *file_exists(char *path) { + static glob_t globbuf; + 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); + + if (stat(full_path, &buf) < 0) + return NULL; + + return full_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_INT("interval", 1, CFGF_NONE), CFG_END() @@ -85,17 +87,20 @@ int main(int argc, char *argv[]) { }; cfg_opt_t ethernet_opts[] = { - CFG_STR("format", "E: %ip (%speed)", CFGF_NONE), + CFG_STR("format_up", "E: %ip (%speed)", CFGF_NONE), + CFG_STR("format_down", "E: down", CFGF_NONE), CFG_END() }; 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() }; cfg_opt_t battery_opts[] = { - CFG_STR("format", "%status %remaining", CFGF_NONE), + CFG_STR("format", "%status %percentage %remaining", CFGF_NONE), + CFG_BOOL("last_full_capacity", false, CFGF_NONE), CFG_END() }; @@ -104,6 +109,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() @@ -128,13 +138,14 @@ 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("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; int o, option_index = 0; struct option long_options[] = { {"config", required_argument, 0, 'c'}, @@ -147,6 +158,12 @@ 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"); + while ((o = getopt_long(argc, argv, "c:h", long_options, &option_index)) != -1) if ((char)o == 'c') configfile = optarg; @@ -156,15 +173,31 @@ int main(int argc, char *argv[]) { return 0; } + if (configfile == NULL) + die("No configuration file found\n"); + cfg = cfg_init(opts, CFGF_NONE); if (cfg_parse(cfg, configfile) == CFG_PARSE_ERROR) return EXIT_FAILURE; cfg_general = cfg_getsec(cfg, "general"); + if (cfg_general == NULL) + die("Could not get section \"general\"\n"); + + char *output_str = cfg_getstr(cfg_general, "output_format"); + if (strcasecmp(output_str, "dzen2") == 0) + output_format = O_DZEN2; + else if (strcasecmp(output_str, "xmobar") == 0) + output_format = O_XMOBAR; + else if (strcasecmp(output_str, "none") == 0) + output_format = O_NONE; + else die("Unknown output format: \"%s\"\n", output_str); 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) @@ -173,16 +206,16 @@ 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")); CASE_SEC_TITLE("ethernet") - print_eth_info(title, cfg_getstr(sec, "format")); + print_eth_info(title, cfg_getstr(sec, "format_up"), cfg_getstr(sec, "format_down")); CASE_SEC_TITLE("battery") - print_battery_info(atoi(title), cfg_getstr(sec, "format")); + print_battery_info(atoi(title), cfg_getstr(sec, "format"), cfg_getbool(sec, "last_full_capacity")); CASE_SEC_TITLE("run_watch") print_run_watch(title, cfg_getstr(sec, "pidfile"), cfg_getstr(sec, "format")); @@ -196,12 +229,22 @@ 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("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); } }