]> git.sur5r.net Git - i3/i3status/blobdiff - wmiistatus.c
Add forgotten file
[i3/i3status] / wmiistatus.c
index 13f9e85996d3d2490afe6f0022d2a66d1ddcff7c..c0a1fe38bb5f87acb8fb458d5d5576c20c7106d0 100644 (file)
@@ -52,6 +52,8 @@
 #include <dirent.h>
 #include <getopt.h>
 
+#include "queue.h"
+
 #ifdef LINUX
 #include <linux/ethtool.h>
 #include <linux/sockios.h>
 #include <sys/resource.h>
 #endif
 
-#define _IS_WMIISTATUS_C
 #include "wmiistatus.h"
-#undef _IS_WMIISTATUS_C
-#include "config.h"
+
+#define BAR "^fg(#333333)^p(5;-2)^ro(2)^p()^fg()^p(5)"
+
+struct battery {
+       const char *path;
+       SIMPLEQ_ENTRY(battery) batteries;
+};
+
+SIMPLEQ_HEAD(battery_head, battery) batteries;
 
 /* socket file descriptor for general purposes */
 static int general_socket;
 
+static const char *wlan_interface;
+static const char *eth_interface;
+static char *wmii_path;
+static const char *time_format;
+static const char *battery_path;
+static bool use_colors;
+static bool get_ethspeed;
+static const char *wmii_normcolors = "#222222 #333333";
+static char order[MAX_ORDER][2];
+static const char **run_watches;
+static unsigned int num_run_watches;
+static unsigned int interval = 1;
+
 /*
  * This function just concats two strings in place, it should only be used
  * for concatting order to the name of a file or concatting color codes.
@@ -82,11 +103,28 @@ static char *concat(const char *str1, const char *str2) {
        return concatbuf;
 }
 
+/*
+ * Returns the correct color format for dzen (^fg(color)) or wmii (color <normcolors>)
+ *
+ */
+static char *color(const char *colorstr) {
+       static char colorbuf[32];
+#ifdef DZEN
+       (void)snprintf(colorbuf, sizeof(colorbuf), "^fg(%s)", colorstr);
+#else
+       (void)snprintf(colorbuf, sizeof(colorbuf), "%s %s ", colorstr, wmii_normcolors);
+#endif
+       return colorbuf;
+}
+
 /*
  * Cleans wmii's /rbar directory by deleting all regular files
  *
  */
 static void cleanup_rbar_dir() {
+#ifdef DZEN
+       return;
+#endif
        struct dirent *ent;
        DIR *dir;
        char pathbuf[strlen(wmii_path)+256+1];
@@ -111,6 +149,9 @@ static void cleanup_rbar_dir() {
  *
  */
 static void create_file(const char *name) {
+#ifdef DZEN
+       return;
+#endif
        char pathbuf[strlen(wmii_path)+256+1];
        int fd;
        int flags = O_CREAT | O_WRONLY;
@@ -125,7 +166,7 @@ static void create_file(const char *name) {
        if ((fd = open(pathbuf, flags, S_IRUSR | S_IWUSR)) < 0)
                exit(EXIT_FAILURE);
        if (use_colors) {
-               char *tmp = concat("#888888 ", wmii_normcolors);
+               char *tmp = color("#888888");
                if (write(fd, tmp, strlen(tmp)) != (ssize_t)strlen(tmp))
                        exit(EXIT_FAILURE);
        }
@@ -139,11 +180,13 @@ static void create_file(const char *name) {
  */
 static void setup(void) {
        unsigned int i;
-       struct stat statbuf;
        char pathbuf[512];
 
+#ifndef DZEN
+       struct stat statbuf;
        /* Wait until wmii_path/rbar exists */
        for (; stat(wmii_path, &statbuf) < 0; sleep(interval));
+#endif
 
        cleanup_rbar_dir();
        if (wlan_interface)
@@ -165,7 +208,17 @@ static void setup(void) {
  * Writes the given message in the corresponding file in wmii's /rbar directory
  *
  */
-static void write_to_statusbar(const char *name, const char *message) {
+static void write_to_statusbar(const char *name, const char *message, bool final_entry) {
+#ifdef DZEN
+       if (final_entry) {
+               (void)printf("%s^p(6)\n", message);
+               fflush(stdout);
+               return;
+       }
+       (void)printf("%s" BAR, message);
+       return;
+#endif
+
        char pathbuf[strlen(wmii_path)+256+1];
        int fd;
 
@@ -187,7 +240,7 @@ static void write_to_statusbar(const char *name, const char *message) {
 static void write_error_to_statusbar(const char *message) {
        cleanup_rbar_dir();
        create_file("error");
-       write_to_statusbar("error", message);
+       write_to_statusbar("error", message, true);
 }
 
 /*
@@ -230,7 +283,7 @@ static char *skip_character(char *input, char character, int amount) {
  * worn off your battery is.
  *
  */
-static char *get_battery_info() {
+static char *get_battery_info(const char *path) {
        char buf[1024];
        static char part[512];
        char *walk, *last;
@@ -240,7 +293,7 @@ static char *get_battery_info() {
            present_rate = -1;
        charging_status_t status = CS_DISCHARGING;
 
-       if ((fd = open(battery_path, O_RDONLY)) == -1)
+       if ((fd = open(path, O_RDONLY)) == -1)
                return "No battery found";
 
        memset(part, 0, sizeof(part));
@@ -263,7 +316,10 @@ static char *get_battery_info() {
                        last = walk+1;
        (void)close(fd);
 
-       if ((full_design != -1) && (remaining != -1) && (present_rate != -1)) {
+       if ((full_design == 1) || (remaining == -1))
+               return part;
+
+       if (present_rate > 0) {
                float remaining_time;
                int seconds, hours, minutes;
                if (status == CS_CHARGING)
@@ -283,10 +339,40 @@ static char *get_battery_info() {
                         (status == CS_DISCHARGING ? "BAT" : "FULL")),
                        (((float)remaining / (float)full_design) * 100),
                        hours, minutes, seconds);
+       } else {
+               (void)snprintf(part, sizeof(part), "%s %.02f%%",
+                       (status == CS_CHARGING ? "CHR" :
+                        (status == CS_DISCHARGING ? "BAT" : "FULL")),
+                       (((float)remaining / (float)full_design) * 100));
        }
        return part;
 }
 
+/*
+ * Return the IP address for the given interface or "no IP" if the
+ * interface is up and running but hasn't got an IP address yet
+ *
+ */
+static const char *get_ip_address(const char *interface) {
+       static char part[512];
+       struct ifreq ifr;
+       struct sockaddr_in addr;
+       socklen_t len = sizeof(struct sockaddr_in);
+       memset(part, 0, sizeof(part));
+
+       (void)strcpy(ifr.ifr_name, interface);
+       ifr.ifr_addr.sa_family = AF_INET;
+       if (ioctl(general_socket, SIOCGIFADDR, &ifr) < 0)
+               return NULL;
+
+       memcpy(&addr, &ifr.ifr_addr, len);
+       (void)inet_ntop(AF_INET, &addr.sin_addr.s_addr, part, len);
+       if (strlen(part) == 0)
+               (void)snprintf(part, sizeof(part), "no IP");
+
+       return part;
+}
+
 /*
  * Just parses /proc/net/wireless looking for lines beginning with
  * wlan_interface, extracting the quality of the link and adding the
@@ -317,42 +403,16 @@ static char *get_wireless_info() {
                        continue;
                if ((quality == UCHAR_MAX) || (quality == 0)) {
                        if (use_colors)
-                               (void)snprintf(part, sizeof(part), "%s%s",
-                                       concat("#FF0000 ", wmii_normcolors), " W: down");
+                               (void)snprintf(part, sizeof(part), "%sW: down", color("#FF0000"));
                        else (void)snprintf(part, sizeof(part), "W: down");
-               } else (void)snprintf(part, sizeof(part), "W: (%03d%%) %s",
-                               quality, get_ip_address(wlan_interface));
+               } else (void)snprintf(part, sizeof(part), "%sW: (%03d%%) %s",
+                               color("#00FF00"), quality, get_ip_address(wlan_interface));
                return part;
        }
 
        return part;
 }
 
-/*
- * Return the IP address for the given interface or "no IP" if the
- * interface is up and running but hasn't got an IP address yet
- *
- */
-static const char *get_ip_address(const char *interface) {
-       static char part[512];
-       struct ifreq ifr;
-       struct sockaddr_in addr;
-       socklen_t len = sizeof(struct sockaddr_in);
-       memset(part, 0, sizeof(part));
-
-       (void)strcpy(ifr.ifr_name, interface);
-       ifr.ifr_addr.sa_family = AF_INET;
-       if (ioctl(general_socket, SIOCGIFADDR, &ifr) < 0)
-               return NULL;
-
-       memcpy(&addr, &ifr.ifr_addr, len);
-       (void)inet_ntop(AF_INET, &addr.sin_addr.s_addr, part, len);
-       if (strlen(part) == 0)
-               (void)snprintf(part, sizeof(part), "no IP");
-
-       return part;
-}
-
 /*
  * Combines ethernet IP addresses and speed (if requested) for displaying
  *
@@ -426,6 +486,125 @@ static bool process_runs(const char *path) {
 #endif
 }
 
+/*
+ * Reads the configuration from the given file
+ *
+ */
+static int load_configuration(const char *configfile) {
+       #define OPT(x) else if (strcasecmp(dest_name, x) == 0)
+
+       /* check if the file exists */
+       struct stat buf;
+       if (stat(configfile, &buf) < 0)
+               return -1;
+
+       int result = 0;
+       FILE *handle = fopen(configfile, "r");
+       if (handle == NULL)
+               die("Could not open configfile\n");
+       char dest_name[512], dest_value[512], whole_buffer[1026];
+
+       while (!feof(handle)) {
+               char *ret;
+               if ((ret = fgets(whole_buffer, 1024, handle)) == whole_buffer) {
+                       /* sscanf implicitly strips whitespace */
+                       if (sscanf(whole_buffer, "%s %[^\n]", dest_name, dest_value) < 1)
+                               continue;
+               } else if (ret != NULL)
+                       die("Could not read line in configuration file\n");
+
+               /* skip comments and empty lines */
+               if (dest_name[0] == '#' || strlen(dest_name) < 3)
+                       continue;
+
+               OPT("wlan")
+                       wlan_interface = strdup(dest_value);
+               OPT("eth")
+                       eth_interface = strdup(dest_value);
+               OPT("time_format")
+                       time_format = strdup(dest_value);
+               OPT("battery_path") {
+                       struct battery *new = calloc(1, sizeof(struct battery));
+                       if (new == NULL)
+                               die("Could not allocate memory\n");
+                       new->path = strdup(dest_value);
+                       SIMPLEQ_INSERT_TAIL(&batteries, new, batteries);
+               } OPT("color")
+                       use_colors = true;
+               OPT("get_ethspeed")
+                       get_ethspeed = true;
+               OPT("normcolors")
+                       wmii_normcolors = strdup(dest_value);
+               OPT("interval")
+                       interval = atoi(dest_value);
+               OPT("wmii_path")
+               {
+#ifndef DZEN
+                       static glob_t globbuf;
+                       struct stat stbuf;
+                       if (glob(dest_value, GLOB_NOCHECK | GLOB_TILDE, NULL, &globbuf) < 0)
+                               die("glob() failed\n");
+                       wmii_path = strdup(globbuf.gl_pathc > 0 ? globbuf.gl_pathv[0] : dest_value);
+                       globfree(&globbuf);
+
+                       if ((stat(wmii_path, &stbuf)) == -1) {
+                               fprintf(stderr, "Warning: wmii_path contains an invalid path\n");
+                               free(wmii_path);
+                               wmii_path = strdup(dest_value);
+                       }
+                       if (wmii_path[strlen(wmii_path)-1] != '/')
+                               die("wmii_path is not terminated by /\n");
+#endif
+               }
+               OPT("run_watch")
+               {
+                       char *name = strdup(dest_value);
+                       char *path = name;
+                       while (*path != ' ')
+                               path++;
+                       *(path++) = '\0';
+                       num_run_watches += 2;
+                       run_watches = realloc(run_watches, sizeof(char*) * num_run_watches);
+                       run_watches[num_run_watches-2] = name;
+                       run_watches[num_run_watches-1] = path;
+               }
+               OPT("order")
+               {
+                       #define SET_ORDER(opt, idx) { if (strcasecmp(token, opt) == 0) sprintf(order[idx], "%d", c++); }
+                       char *walk, *token;
+                       int c = 0;
+                       walk = token = dest_value;
+                       while (*walk != '\0') {
+                               while ((*walk != ',') && (*walk != '\0'))
+                                       walk++;
+                               *(walk++) = '\0';
+                               SET_ORDER("run", ORDER_RUN);
+                               SET_ORDER("wlan", ORDER_WLAN);
+                               SET_ORDER("eth", ORDER_ETH);
+                               SET_ORDER("battery", ORDER_BATTERY);
+                               SET_ORDER("load", ORDER_LOAD);
+                               SET_ORDER("time", ORDER_TIME);
+                               token = walk;
+                               while (isspace((int)(*token)))
+                                       token++;
+                       }
+               }
+               else
+               {
+                       result = -2;
+                       die("Unknown configfile option: %s\n", dest_name);
+               }
+       }
+       fclose(handle);
+
+#ifndef DZEN
+       if (wmii_path == NULL)
+               exit(EXIT_FAILURE);
+#endif
+
+       return result;
+}
+
 int main(int argc, char *argv[]) {
        char part[512],
             pathbuf[512];
@@ -439,6 +618,8 @@ int main(int argc, char *argv[]) {
                {0, 0, 0, 0}
        };
 
+       SIMPLEQ_INIT(&batteries);
+
        while ((o = getopt_long(argc, argv, "c:h", long_options, &option_index)) != -1)
                if ((char)o == 'c')
                        configfile = optarg;
@@ -460,23 +641,23 @@ int main(int argc, char *argv[]) {
                for (i = 0; i < num_run_watches; i += 2) {
                        bool running = process_runs(run_watches[i+1]);
                        if (use_colors)
-                               snprintf(part, sizeof(part), "%s %s: %s",
-                                       (running ?
-                                               concat("#00FF00 ", wmii_normcolors) :
-                                               concat("#FF0000 ", wmii_normcolors)),
+                               snprintf(part, sizeof(part), "%s%s: %s",
+                                       (running ? color("#00FF00") : color("#FF0000")),
                                        run_watches[i],
                                        (running ? "yes" : "no"));
                        else snprintf(part, sizeof(part), "%s: %s", run_watches[i], (running ? "yes" : "no"));
                        snprintf(pathbuf, sizeof(pathbuf), "%s%s", order[ORDER_RUN], run_watches[i]);
-                       write_to_statusbar(pathbuf, part);
+                       write_to_statusbar(pathbuf, part, false);
                }
 
                if (wlan_interface)
-                       write_to_statusbar(concat(order[ORDER_WLAN], "wlan"), get_wireless_info());
+                       write_to_statusbar(concat(order[ORDER_WLAN], "wlan"), get_wireless_info(), false);
                if (eth_interface)
-                       write_to_statusbar(concat(order[ORDER_ETH], "eth"), get_eth_info());
-               if (battery_path)
-                       write_to_statusbar(concat(order[ORDER_BATTERY], "battery"), get_battery_info());
+                       write_to_statusbar(concat(order[ORDER_ETH], "eth"), get_eth_info(), false);
+               struct battery *current_battery;
+               SIMPLEQ_FOREACH(current_battery, &batteries, batteries) {
+                       write_to_statusbar(concat(order[ORDER_BATTERY], "battery"), get_battery_info(current_battery->path), false);
+               }
 
                /* Get load */
 #ifdef LINUX
@@ -499,14 +680,14 @@ int main(int argc, char *argv[]) {
                                (double)load.ldavg[1] / scale,
                                (double)load.ldavg[2] / scale);
 #endif
-               write_to_statusbar(concat(order[ORDER_LOAD], "load"), part);
+               write_to_statusbar(concat(order[ORDER_LOAD], "load"), part, !time_format);
 
                if (time_format) {
                        /* Get date & time */
                        time_t current_time = time(NULL);
                        struct tm *current_tm = localtime(&current_time);
                        (void)strftime(part, sizeof(part), time_format, current_tm);
-                       write_to_statusbar(concat(order[ORDER_TIME], "time"), part);
+                       write_to_statusbar(concat(order[ORDER_TIME], "time"), part, true);
                }
 
                sleep(interval);