Bugfix: Correctly check for interface up/down-status (Thanks docsteel)

[i3/i3status] / i3status.c

diff --git a/i3status.c b/i3status.c
index f2d055def82dda7c41ce17fb3317358621efdaa0..30995b298f021d771a50d76160376085b422a731 100644 (file)
--- a/i3status.c
+++ b/i3status.c
@@ -5,6 +5,8 @@
  *
  * Copyright © 2008-2009 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>
  *
  * See file LICENSE for license information.
  *
@@ -22,6 +24,8 @@
 #include <glob.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <time.h>
+#include <sys/time.h>
 
 #include "i3status.h"
 
@@ -61,12 +65,33 @@ static char *file_exists(char *path) {
         return full_path;
 }
 
+/*
+ * Validates a color in "#RRGGBB" format
+ *
+ */
+static int valid_color(const char *value)
+{
+        if (strlen(value) != 7) return 0;
+        if (value[0] != '#') return 0;
+        for (int i = 1; i < 7; ++i) {
+                if (value[i] >= '0' && value[i] <= '9') continue;
+                if (value[i] >= 'a' && value[i] <= 'f') continue;
+                if (value[i] >= 'A' && value[i] <= 'F') continue;
+                return 0;
+        }
+        return 1;
+}
+
 int main(int argc, char *argv[]) {
         unsigned int j;
 
         cfg_opt_t general_opts[] = {
                 CFG_STR("output_format", "dzen2", CFGF_NONE),
                 CFG_BOOL("colors", 1, CFGF_NONE),
+                CFG_STR("color_good", "#00FF00", CFGF_NONE),
+                CFG_STR("color_degraded", "#FFFF00", CFGF_NONE),
+                CFG_STR("color_bad", "#FF0000", CFGF_NONE),
+                CFG_STR("color_separator", "#333333", CFGF_NONE),
                 CFG_INT("interval", 1, CFGF_NONE),
                 CFG_END()
         };
@@ -90,7 +115,8 @@ int main(int argc, char *argv[]) {
         };
 
         cfg_opt_t ipv6_opts[] = {
-                CFG_STR("format", "%ip", CFGF_NONE),
+                CFG_STR("format_up", "%ip", CFGF_NONE),
+                CFG_STR("format_down", "no IPv6", CFGF_NONE),
                 CFG_END()
         };
 
@@ -105,6 +131,11 @@ int main(int argc, char *argv[]) {
                 CFG_END()
         };
 
+        cfg_opt_t ddate_opts[] = {
+                CFG_STR("format", "%{%a, %b %d%}, %Y%N - %H", CFGF_NONE),
+                CFG_END()
+        };
+
         cfg_opt_t load_opts[] = {
                 CFG_STR("format", "%5min %10min %15min", CFGF_NONE),
                 CFG_END()
@@ -120,6 +151,14 @@ int main(int argc, char *argv[]) {
                 CFG_END()
         };
 
+        cfg_opt_t volume_opts[] = {
+                CFG_STR("format", "♪: %volume", CFGF_NONE),
+                CFG_STR("device", "default", CFGF_NONE),
+                CFG_STR("mixer", "Master", CFGF_NONE),
+                CFG_INT("mixer_idx", 0, 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),
@@ -129,8 +168,10 @@ int main(int argc, char *argv[]) {
                 CFG_SEC("battery", battery_opts, CFGF_TITLE | CFGF_MULTI),
                 CFG_SEC("cpu_temperature", temp_opts, CFGF_TITLE | CFGF_MULTI),
                 CFG_SEC("disk", disk_opts, CFGF_TITLE | CFGF_MULTI),
-                CFG_SEC("ipv6", ipv6_opts, CFGF_TITLE),
+                CFG_SEC("volume", volume_opts, CFGF_TITLE | CFGF_MULTI),
+                CFG_SEC("ipv6", ipv6_opts, CFGF_NONE),
                 CFG_SEC("time", time_opts, CFGF_NONE),
+                CFG_SEC("ddate", ddate_opts, CFGF_NONE),
                 CFG_SEC("load", load_opts, CFGF_NONE),
                 CFG_END()
         };
@@ -183,9 +224,17 @@ int main(int argc, char *argv[]) {
                 output_format = O_NONE;
         else die("Unknown output format: \"%s\"\n", output_str);
 
+        if (!valid_color(cfg_getstr(cfg_general, "color_good"))
+                        || !valid_color(cfg_getstr(cfg_general, "color_degraded"))
+                        || !valid_color(cfg_getstr(cfg_general, "color_bad"))
+                        || !valid_color(cfg_getstr(cfg_general, "color_separator")))
+               die("Bad color format");
+
         if ((general_socket = socket(AF_INET, SOCK_DGRAM, 0)) == -1)
                 die("Could not create socket\n");
 
+        int interval = cfg_getint(cfg_general, "interval");
+
         while (1) {
                 for (j = 0; j < cfg_size(cfg, "order"); j++) {
                         if (j > 0)
@@ -194,7 +243,7 @@ int main(int argc, char *argv[]) {
                         const char *current = cfg_getnstr(cfg, "order", j);
 
                         CASE_SEC("ipv6")
-                                print_ipv6_info(cfg_getstr(sec, "format"));
+                                print_ipv6_info(cfg_getstr(sec, "format_up"), cfg_getstr(sec, "format_down"));
 
                         CASE_SEC_TITLE("wireless")
                                 print_wireless_info(title, cfg_getstr(sec, "format_up"), cfg_getstr(sec, "format_down"));
@@ -217,12 +266,28 @@ int main(int argc, char *argv[]) {
                         CASE_SEC("time")
                                 print_time(cfg_getstr(sec, "format"));
 
+                        CASE_SEC("ddate")
+                                print_ddate(cfg_getstr(sec, "format"));
+
+                        CASE_SEC_TITLE("volume")
+                                print_volume(cfg_getstr(sec, "format"),
+                                             cfg_getstr(sec, "device"),
+                                             cfg_getstr(sec, "mixer"),
+                                             cfg_getint(sec, "mixer_idx"));
+
                         CASE_SEC_TITLE("cpu_temperature")
                                 print_cpu_temperature_info(atoi(title), cfg_getstr(sec, "format"));
                 }
                 printf("\n");
                 fflush(stdout);
 
-                sleep(cfg_getint(cfg_general, "interval"));
+                /* To provide updates on every full second (as good as possible)
+                 * 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};
+                nanosleep(&ts, NULL);
         }
 }