X-Git-Url: https://git.sur5r.net/?p=i3%2Fi3status;a=blobdiff_plain;f=i3status.c;h=b7f9b86a6037b1081289849eb713dbde15303cc5;hp=e4a3e4c1d5c3db141cf0ebbe7dd5dee29c095420;hb=188e5873be5e9c590988f9299653df5f52d44355;hpb=4ec02bea7bbe534ef4b610bc63d1694bf0823174

diff --git a/i3status.c b/i3status.c
index e4a3e4c..b7f9b86 100644
--- 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"
 
@@ -163,8 +164,8 @@ static char *get_config_path() {
         free(buf);
 
         die("Unable to find the configuration file (looked at "
-                "~/.i3status/config, $XDG_CONFIG_HOME/i3status/config, "
-                "/etc/i3status/config and $XDG_CONFIG_DIRS/i3status/config)");
+                "~/.i3status.conf, $XDG_CONFIG_HOME/i3status/config, "
+                "/etc/i3status.conf and $XDG_CONFIG_DIRS/i3status/config)");
         return NULL;
 }
 
@@ -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),
@@ -208,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()
         };
@@ -223,7 +225,12 @@ 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()
         };
 
@@ -247,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),
@@ -260,6 +267,7 @@ int main(int argc, char *argv[]) {
                 CFG_SEC("time", time_opts, CFGF_NONE),
                 CFG_SEC("ddate", ddate_opts, CFGF_NONE),
                 CFG_SEC("load", load_opts, CFGF_NONE),
+                CFG_SEC("cpu_usage", usage_opts, CFGF_NONE),
                 CFG_END()
         };
 
@@ -277,15 +285,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;
                 }
 
@@ -293,19 +304,35 @@ 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");
 
         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)
                 output_format = O_XMOBAR;
+        else if (strcasecmp(output_str, "i3bar") == 0)
+                output_format = O_I3BAR;
         else if (strcasecmp(output_str, "none") == 0)
                 output_format = O_NONE;
         else die("Unknown output format: \"%s\"\n", output_str);
@@ -316,12 +343,29 @@ int main(int argc, char *argv[]) {
                         || !valid_color(cfg_getstr(cfg_general, "color_separator")))
                die("Bad color format");
 
+        if (output_format == O_I3BAR) {
+                /* Initialize the i3bar protocol. See i3/docs/i3bar-protocol
+                 * for details. */
+                printf("{\"version\":1}\n[\n");
+        }
+
         if ((general_socket = socket(AF_INET, SOCK_DGRAM, 0)) == -1)
                 die("Could not create socket\n");
 
         int interval = cfg_getint(cfg_general, "interval");
 
+        struct tm tm;
         while (1) {
+                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);
+                        current_tm = &tm;
+                }
+                if (output_format == O_I3BAR)
+                        printf("[");
                 for (j = 0; j < cfg_size(cfg, "order"); j++) {
                         if (j > 0)
                                 print_seperator();
@@ -338,7 +382,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"));
@@ -350,10 +394,10 @@ int main(int argc, char *argv[]) {
                                 print_load(cfg_getstr(sec, "format"));
 
                         CASE_SEC("time")
-                                print_time(cfg_getstr(sec, "format"));
+                                print_time(cfg_getstr(sec, "format"), current_tm);
 
                         CASE_SEC("ddate")
-                                print_ddate(cfg_getstr(sec, "format"));
+                                print_ddate(cfg_getstr(sec, "format"), current_tm);
 
                         CASE_SEC_TITLE("volume")
                                 print_volume(cfg_getstr(sec, "format"),
@@ -363,7 +407,12 @@ 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"));
                 }
+                if (output_format == O_I3BAR)
+                        printf("],");
                 printf("\n");
                 fflush(stdout);
 
@@ -371,9 +420,9 @@ int main(int argc, char *argv[]) {
                  * 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(&current_time, NULL);
-                struct timespec ts = {interval - 1, (10e5 - current_time.tv_usec) * 1000};
+                struct timeval current_timeval;
+                gettimeofday(&current_timeval, NULL);
+                struct timespec ts = {interval - 1, (10e5 - current_timeval.tv_usec) * 1000};
                 nanosleep(&ts, NULL);
         }
 }