/*
* 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 <atsutane at freethoughts dot de>
* All rights reserved.
*
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
+ * 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.
+ * * 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.
+ * 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.
+ * 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.
*
*/
-#include <sys/types.h>
-#include <sys/stat.h>
-#include <fcntl.h>
#include <string.h>
#include <stdio.h>
-#include <time.h>
#include <stdbool.h>
-#include <stdarg.h>
#include <unistd.h>
#include <stdlib.h>
-#include <limits.h>
-#include <ctype.h>
-#include <sys/ioctl.h>
#include <sys/socket.h>
#include <netinet/in.h>
#include <getopt.h>
#include <signal.h>
-
-#include "queue.h"
+#include <confuse.h>
#include "i3status.h"
-struct battery_head batteries;
-
/* socket file descriptor for general purposes */
int general_socket;
-const char *wlan_interface = NULL;
-const char *eth_interface = NULL;
-char *wmii_path = NULL;
-const char *time_format = NULL;
-bool use_colors = false;
-bool get_ethspeed = false;
-bool get_ipv6 = false;
-bool get_cpu_temperature = false;
-char *thermal_zone = NULL;
-const char *wmii_normcolors = "#222222 #333333";
-int order[MAX_ORDER];
-const char **run_watches = NULL;
-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
}
int main(int argc, char *argv[]) {
- char part[512],
- pathbuf[512];
- unsigned int i;
- int j;
+ unsigned int j;
+
+ cfg_opt_t general_opts[] = {
+ CFG_BOOL("colors", 1, CFGF_NONE),
+ CFG_INT("interval", 1, CFGF_NONE),
+ CFG_END()
+ };
+
+ 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", "E: %ip (%speed)", CFGF_NONE),
+ CFG_END()
+ };
+
+ cfg_opt_t ipv6_opts[] = {
+ CFG_STR("format", "%ip", CFGF_NONE),
+ CFG_END()
+ };
+
+ cfg_opt_t battery_opts[] = {
+ CFG_STR("format", "%status %remaining", 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 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 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("ipv6", ipv6_opts, CFGF_TITLE),
+ CFG_SEC("time", time_opts, CFGF_NONE),
+ CFG_SEC("load", load_opts, CFGF_NONE),
+ CFG_END()
+ };
char *configfile = PREFIX "/etc/i3status.conf";
int o, option_index = 0;
action.sa_handler = sigpipe;
sigaction(SIGPIPE, &action, NULL);
- SIMPLEQ_INIT(&batteries);
-
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 <configfile>]\n", argv[0]);
return 0;
}
- if (load_configuration(configfile) < 0)
+ 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 ((general_socket = socket(AF_INET, SOCK_DGRAM, 0)) == -1)
die("Could not create socket\n");
while (1) {
- for (j = 0; j < MAX_ORDER; j++) {
- generate_order(wlan_interface, ORDER_WLAN, "wlan", get_wireless_info());
- generate_order(eth_interface, ORDER_ETH, "eth", get_eth_info());
- generate_order(get_ipv6, ORDER_IPV6, "ipv6", get_ipv6_addr());
- generate_order(get_cpu_temperature, ORDER_CPU_TEMPERATURE, "cpu_temperature", get_cpu_temperature_info());
- generate_order(true, ORDER_LOAD, "load", get_load());
-
- if (j == order[ORDER_RUN]) {
- 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%s",
- (running ? color("#00FF00") : color("#FF0000")),
- run_watches[i],
- (running ? "yes" : "no"), endcolor());
- else snprintf(part, sizeof(part), "%s: %s", run_watches[i], (running ? "yes" : "no"));
- snprintf(pathbuf, sizeof(pathbuf), "%d%s", order[ORDER_RUN], run_watches[i]);
- write_to_statusbar(pathbuf, part, false);
- }
- }
-
- if (j == order[ORDER_BATTERY]) {
- struct battery *current;
- SIMPLEQ_FOREACH(current, &batteries, batteries)
- generate(ORDER_BATTERY, "battery", get_battery_info(current));
- }
-
- if (j == order[ORDER_TIME]) {
- if (time_format != NULL) {
- /* 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);
- generate(ORDER_TIME, "time", part);
- } else {
- generate(ORDER_TIME, "time", "");
- }
- }
+ for (j = 0; j < cfg_size(cfg, "order"); j++) {
+ if (j > 0)
+ print_seperator();
+
+ const char *current = cfg_getnstr(cfg, "order", j);
+
+ CASE_SEC("ipv6")
+ print_ipv6_info(cfg_getstr(sec, "format"));
+
+ 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"));
+
+ CASE_SEC_TITLE("battery")
+ print_battery_info(atoi(title), cfg_getstr(sec, "format"));
+
+ CASE_SEC_TITLE("run_watch")
+ print_run_watch(title, cfg_getstr(sec, "pidfile"), cfg_getstr(sec, "format"));
+
+ CASE_SEC("load")
+ print_load(cfg_getstr(sec, "format"));
+
+ CASE_SEC("time")
+ print_time(cfg_getstr(sec, "format"));
+
+ CASE_SEC_TITLE("cpu_temperature")
+ print_cpu_temperature_info(atoi(title), cfg_getstr(sec, "format"));
}
+ printf("\n");
+ fflush(stdout);
- sleep(interval);
+ sleep(cfg_getint(cfg_general, "interval"));
}
}
projects / i3 / i3status / blobdiff