X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=i3status.c;h=9f04850513b9a5a3d5420aa811f04de328c413b0;hb=fc3fac640f4b4b2dc5e0a9fc304ab41a912a96f0;hp=97e081b7445b91fe6018b7e4525006e39923b49a;hpb=53bf8bcb01812254ea58e5a531f0e95637ed93eb;p=i3%2Fi3status

diff --git a/i3status.c b/i3status.c
index 97e081b..9f04850 100644
--- a/i3status.c
+++ b/i3status.c
@@ -209,6 +209,7 @@ int main(int argc, char *argv[]) {
 
         cfg_opt_t battery_opts[] = {
                 CFG_STR("format", "%status %percentage %remaining", CFGF_NONE),
+                CFG_STR("path", "/sys/class/power_supply/BAT%d/uevent", CFGF_NONE),
                 CFG_BOOL("last_full_capacity", false, CFGF_NONE),
                 CFG_END()
         };
@@ -224,7 +225,7 @@ int main(int argc, char *argv[]) {
         };
 
         cfg_opt_t load_opts[] = {
-                CFG_STR("format", "%5min %10min %15min", CFGF_NONE),
+                CFG_STR("format", "%1min %5min %15min", CFGF_NONE),
                 CFG_END()
         };
 
@@ -253,7 +254,7 @@ int main(int argc, char *argv[]) {
         };
 
         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_STR_LIST("order", "{}", 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),
@@ -291,11 +292,11 @@ int main(int argc, char *argv[]) {
                 if ((char)o == 'c')
                         configfile = optarg;
                 else if ((char)o == 'h') {
-                        printf("i3status " VERSION " © 2008-2010 Michael Stapelberg and contributors\n"
+                        printf("i3status " VERSION " © 2008-2011 Michael Stapelberg and contributors\n"
                                 "Syntax: %s [-c <configfile>] [-h] [-v]\n", argv[0]);
                         return 0;
                 } else if ((char)o == 'v') {
-                        printf("i3status " VERSION " © 2008-2010 Michael Stapelberg and contributors\n");
+                        printf("i3status " VERSION " © 2008-2011 Michael Stapelberg and contributors\n");
                         return 0;
                 }
 
@@ -303,10 +304,13 @@ int main(int argc, char *argv[]) {
         if (configfile == NULL)
                 configfile = get_config_path();
 
-        cfg = cfg_init(opts, CFGF_NONE);
+        cfg = cfg_init(opts, CFGF_NOCASE);
         if (cfg_parse(cfg, configfile) == CFG_PARSE_ERROR)
                 return EXIT_FAILURE;
 
+        if (cfg_size(cfg, "order") == 0)
+                die("Your 'order' array is empty. Please fix your config.\n");
+
         cfg_general = cfg_getsec(cfg, "general");
         if (cfg_general == NULL)
                 die("Could not get section \"general\"\n");
@@ -368,7 +372,7 @@ int main(int argc, char *argv[]) {
                                 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"), cfg_getbool(sec, "last_full_capacity"));
+                                print_battery_info(atoi(title), cfg_getstr(sec, "path"), 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"));