X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=i3status.c;h=9087d0cb1a4fa51be9dcc1dba80ef485ce5099a4;hb=29e9a99f065137481dcab887971dae7e4a8c3e21;hp=8a4705fe3c9185fcc5ce6f8c398326f4d85d1b35;hpb=6fda988f360b3145d5772b6964f336dd652357ea;p=i3%2Fi3status diff --git a/i3status.c b/i3status.c index 8a4705f..9087d0c 100644 --- a/i3status.c +++ b/i3status.c @@ -1,79 +1,37 @@ /* * vim:ts=8:expandtab * - * i3status – Generates a status line for dzen2 or wmii - * + * 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. - * - * * 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. + * Copyright © 2010 Axel Wagner * - * * 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 -#include -#include #include #include -#include #include -#include #include #include -#include -#include -#include #include #include #include #include - -#include "queue.h" +#include +#include +#include +#include +#include +#include #include "i3status.h" -struct battery_head batteries; - /* socket file descriptor for general purposes */ int general_socket; -const char *wlan_interface; -const char *eth_interface; -const char *wmii_path; -const char *time_format; -bool use_colors; -bool get_ethspeed; -bool get_cpu_temperature; -char *thermal_zone; -const char *wmii_normcolors = "#222222 #333333"; -char order[MAX_ORDER][2]; -const char **run_watches; -unsigned int num_run_watches; -unsigned int interval = 1; +cfg_t *cfg, *cfg_general; /* * Exit upon SIGPIPE because when we have nowhere to write to, gathering @@ -85,12 +43,109 @@ 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[]) { - char part[512], - pathbuf[512]; - unsigned int i; + 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() + }; - char *configfile = PREFIX "/etc/i3status.conf"; + cfg_opt_t run_watch_opts[] = { + CFG_STR("pidfile", NULL, CFGF_NONE), + CFG_STR("format", "%title: %status", CFGF_NONE), + CFG_END() + }; + + cfg_opt_t wireless_opts[] = { + CFG_STR("format_up", "W: (%quality at %essid) %ip", CFGF_NONE), + CFG_STR("format_down", "W: down", CFGF_NONE), + CFG_END() + }; + + cfg_opt_t ethernet_opts[] = { + 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_up", "%ip", CFGF_NONE), + CFG_STR("format_down", "no IPv6", CFGF_NONE), + CFG_END() + }; + + cfg_opt_t battery_opts[] = { + CFG_STR("format", "%status %percentage %remaining", CFGF_NONE), + CFG_BOOL("last_full_capacity", false, CFGF_NONE), + CFG_END() + }; + + cfg_opt_t time_opts[] = { + CFG_STR("format", "%d.%m.%Y %H:%M:%S", CFGF_NONE), + 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() + }; + + cfg_opt_t temp_opts[] = { + CFG_STR("format", "%degrees C", CFGF_NONE), + CFG_END() + }; + + cfg_opt_t disk_opts[] = { + CFG_STR("format", "%free", 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), + CFG_SEC("run_watch", run_watch_opts, CFGF_TITLE | CFGF_MULTI), + CFG_SEC("wireless", wireless_opts, CFGF_TITLE | CFGF_MULTI), + CFG_SEC("ethernet", ethernet_opts, CFGF_TITLE | CFGF_MULTI), + 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_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; int o, option_index = 0; struct option long_options[] = { {"config", required_argument, 0, 'c'}, @@ -103,59 +158,93 @@ int main(int argc, char *argv[]) { action.sa_handler = sigpipe; sigaction(SIGPIPE, &action, NULL); - SIMPLEQ_INIT(&batteries); + /* 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; else if ((char)o == 'h') { - printf("i3status (c) 2008-2009 Michael Stapelberg\n" + printf("i3status © 2008-2009 Michael Stapelberg\n" "Syntax: %s [-c ]\n", argv[0]); return 0; } - if (load_configuration(configfile) < 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; - setup(); + 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 (i = 0; i < num_run_watches; i += 2) { - bool running = process_runs(run_watches[i+1]); - if (use_colors) - snprintf(part, sizeof(part), "%s%s: %s", - (running ? color("#00FF00") : color("#FF0000")), - run_watches[i], - (running ? "yes" : "no")); - else snprintf(part, sizeof(part), "%s: %s", run_watches[i], (running ? "yes" : "no")); - snprintf(pathbuf, sizeof(pathbuf), "%s%s", order[ORDER_RUN], run_watches[i]); - write_to_statusbar(pathbuf, part, false); - } + for (j = 0; j < cfg_size(cfg, "order"); j++) { + if (j > 0) + print_seperator(); - if (wlan_interface) - write_to_statusbar(concat(order[ORDER_WLAN], "wlan"), get_wireless_info(), false); - if (eth_interface) - write_to_statusbar(concat(order[ORDER_ETH], "eth"), get_eth_info(), false); - struct battery *current_battery; - SIMPLEQ_FOREACH(current_battery, &batteries, batteries) { - write_to_statusbar(concat(order[ORDER_BATTERY], "battery"), get_battery_info(current_battery), false); - } - if (get_cpu_temperature) - write_to_statusbar(concat(order[ORDER_CPU_TEMPERATURE], "cpu_temperature"), get_cpu_temperature_info(), false); + const char *current = cfg_getnstr(cfg, "order", j); - write_to_statusbar(concat(order[ORDER_LOAD], "load"), get_load(), !time_format); + CASE_SEC("ipv6") + print_ipv6_info(cfg_getstr(sec, "format_up"), cfg_getstr(sec, "format_down")); - if (time_format) { - /* Get date & time */ - time_t current_time = time(NULL); - struct tm *current_tm = localtime(¤t_time); - (void)strftime(part, sizeof(part), time_format, current_tm); - write_to_statusbar(concat(order[ORDER_TIME], "time"), part, true); - } + 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_up"), cfg_getstr(sec, "format_down")); - sleep(interval); + CASE_SEC_TITLE("battery") + 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")); + + CASE_SEC_TITLE("disk") + print_disk_info(title, cfg_getstr(sec, "format")); + + CASE_SEC("load") + print_load(cfg_getstr(sec, "format")); + + 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); + + /* 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); } }