correctly auto-detect the output format with zsh (Thanks mist)

[i3/i3status] / i3status.c

diff --git a/i3status.c b/i3status.c
index ebef5138110a601be4e8eefa11f6df02f3c8230f..23f0b97ea066c0e6e3300763928d3432a71934e5 100644 (file)
--- a/i3status.c
+++ b/i3status.c
@@ -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),
@@ -283,6 +284,9 @@ 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;
@@ -308,6 +312,17 @@ int main(int argc, char *argv[]) {
                 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)