Don’t use a default setting for 'order'

[i3/i3status] / i3status.c

diff --git a/i3status.c b/i3status.c
index 542d270f5a9f3b4875c3057f9a700bf016122dbe..ca079313cfccd57806155df2ebdf327123e531dd 100644 (file)
--- 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 <atsutane at freethoughts dot de>
  * Copyright © 2010 Axel Wagner <mail at merovius dot de>
  * Copyright © 2010 Fernando Tarlá Cardoso Lemos <fernandotcl at gmail dot com>
@@ -26,6 +26,7 @@
 #include <sys/types.h>
 #include <time.h>
 #include <sys/time.h>
+#include <locale.h>
 
 #include "i3status.h"
 
@@ -172,7 +173,7 @@ 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),
@@ -223,10 +224,10 @@ 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()
         };
-        
+
         cfg_opt_t usage_opts[] = {
                 CFG_STR("format", "%usage", CFGF_NONE),
                 CFG_END()
@@ -252,7 +253,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),
@@ -283,15 +284,18 @@ int main(int argc, char *argv[]) {
         action.sa_handler = sigpipe;
         sigaction(SIGPIPE, &action, NULL);
 
+        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:hv", long_options, &option_index)) != -1)
                 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,11 +307,25 @@ int main(int argc, char *argv[]) {
         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");
 
         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)
@@ -329,7 +347,9 @@ int main(int argc, char *argv[]) {
 
         struct tm tm;
         while (1) {
-                time_t current_time = time(NULL);
+                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(&current_time, &tm);
@@ -376,7 +396,7 @@ int main(int argc, char *argv[]) {
 
                         CASE_SEC_TITLE("cpu_temperature")
                                 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"));
                 }