X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=wmiistatus.c;h=c0a1fe38bb5f87acb8fb458d5d5576c20c7106d0;hb=e4c017893c409b939789ca959f8668a648a45682;hp=44d13a479c644b05d16f7c1b88f582300fc3e721;hpb=7c79d735d87285df04dd46832da2c397421e2129;p=i3%2Fi3status diff --git a/wmiistatus.c b/wmiistatus.c index 44d13a4..c0a1fe3 100644 --- a/wmiistatus.c +++ b/wmiistatus.c @@ -2,7 +2,7 @@ * Generates a status line for use with wmii or other minimal window managers * * - * Copyright (c) 2008 Michael Stapelberg and contributors + * Copyright (c) 2008-2009 Michael Stapelberg and contributors * All rights reserved. * * Redistribution and use in source and binary forms, with or without modification, @@ -41,6 +41,7 @@ #include #include #include +#include #include #include #include @@ -49,78 +50,227 @@ #include #include #include +#include + +#include "queue.h" + +#ifdef LINUX +#include +#include +#else +/* TODO: correctly check for *BSD */ +#include +#include +#include +#endif #include "wmiistatus.h" -#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. + * Otherwise, the buffer size would have to be increased. + * + */ +static char *concat(const char *str1, const char *str2) { + static char concatbuf[32]; + (void)snprintf(concatbuf, sizeof(concatbuf), "%s%s", str1, str2); + return concatbuf; +} + +/* + * Returns the correct color format for dzen (^fg(color)) or wmii (color ) + * + */ +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]; if ((dir = opendir(wmii_path)) == NULL) - exit(-3); + exit(EXIT_FAILURE); while ((ent = readdir(dir)) != NULL) { if (ent->d_type == DT_REG) { - sprintf(pathbuf, "%s%s", wmii_path, ent->d_name); - unlink(pathbuf); + (void)snprintf(pathbuf, sizeof(pathbuf), "%s%s", wmii_path, ent->d_name); + if (unlink(pathbuf) == -1) + exit(EXIT_FAILURE); } } - closedir(dir); + (void)closedir(dir); } +/* + * Creates the specified file in wmii's /rbar directory with + * correct modes and initializes colors if colormode is enabled + * + */ 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; + struct stat statbuf; - sprintf(pathbuf, "%s%s", wmii_path, name); - int fd = creat(pathbuf, S_IRUSR | S_IWUSR); - if (fd < 0) - exit(-4); -#ifdef USE_COLORS - write(fd, "#888888 " WMII_NORMCOLORS, strlen("#888888 " WMII_NORMCOLORS)); + (void)snprintf(pathbuf, sizeof(pathbuf), "%s%s", wmii_path, name); + + /* Overwrite file's contents if it exists */ + if (stat(pathbuf, &statbuf) >= 0) + flags |= O_TRUNC; + + if ((fd = open(pathbuf, flags, S_IRUSR | S_IWUSR)) < 0) + exit(EXIT_FAILURE); + if (use_colors) { + char *tmp = color("#888888"); + if (write(fd, tmp, strlen(tmp)) != (ssize_t)strlen(tmp)) + exit(EXIT_FAILURE); + } + (void)close(fd); +} + +/* + * Waits until wmii_path/rbar exists (= the filesystem gets mounted), + * cleans up all files and creates the needed files + * + */ +static void setup(void) { + unsigned int i; + char pathbuf[512]; + +#ifndef DZEN + struct stat statbuf; + /* Wait until wmii_path/rbar exists */ + for (; stat(wmii_path, &statbuf) < 0; sleep(interval)); #endif - close(fd); + + cleanup_rbar_dir(); + if (wlan_interface) + create_file(concat(order[ORDER_WLAN],"wlan")); + if (eth_interface) + create_file(concat(order[ORDER_ETH],"eth")); + if (battery_path) + create_file(concat(order[ORDER_BATTERY],"battery")); + create_file(concat(order[ORDER_LOAD],"load")); + if (time_format) + create_file(concat(order[ORDER_TIME],"time")); + for (i = 0; i < num_run_watches; i += 2) { + snprintf(pathbuf, sizeof(pathbuf), "%s%s", order[ORDER_RUN], run_watches[i]); + create_file(pathbuf); + } } -static void write_to_statusbar(const char *name, const char *message) { +/* + * Writes the given message in the corresponding file in wmii's /rbar directory + * + */ +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; - sprintf(pathbuf, "%s%s", wmii_path, name); - int fd = open(pathbuf, O_RDWR); - if (fd == -1) - exit(-2); - write(fd, message, strlen(message)); - close(fd); + (void)snprintf(pathbuf, sizeof(pathbuf), "%s%s", wmii_path, name); + if ((fd = open(pathbuf, O_RDWR)) == -1) { + /* Try to re-setup stuff and just continue */ + setup(); + return; + } + if (write(fd, message, strlen(message)) != (ssize_t)strlen(message)) + exit(EXIT_FAILURE); + (void)close(fd); } +/* + * Writes an errormessage to statusbar + * + */ static void write_error_to_statusbar(const char *message) { cleanup_rbar_dir(); - write_to_statusbar("error", message); + create_file("error"); + write_to_statusbar("error", message, true); } /* * Write errormessage to statusbar and exit * */ -static void die(const char *fmt, ...) { - char buffer[512]; - va_list ap; - va_start(ap, fmt); - vsprintf(buffer, fmt, ap); - va_end(ap); - - write_error_to_statusbar(buffer); - exit(-1); +void die(const char *fmt, ...) { + if (wmii_path != NULL) { + char buffer[512]; + va_list ap; + va_start(ap, fmt); + (void)vsnprintf(buffer, sizeof(buffer), fmt, ap); + va_end(ap); + + write_error_to_statusbar(buffer); + } + exit(EXIT_FAILURE); } +/* + * Skip the given character for exactly 'amount' times, returns + * a pointer to the first non-'character' character in 'input'. + * + */ static char *skip_character(char *input, char character, int amount) { char *walk; - int len = strlen(input), - blanks = 0; + size_t len = strlen(input); + int blanks = 0; - for (walk = input; ((walk - input) < len) && (blanks < amount); walk++) + for (walk = input; ((size_t)(walk - input) < len) && (blanks < amount); walk++) if (*walk == character) blanks++; @@ -128,28 +278,33 @@ static char *skip_character(char *input, char character, int amount) { } /* - * Get battery information from /sys. Note that it uses the design capacity to calculate the percentage, - * not the full capacity. + * Get battery information from /sys. Note that it uses the design capacity to + * calculate the percentage, not the last full capacity, so you can see how + * 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 = buf; - int fd = open(battery, O_RDONLY); - if (fd == -1) - die("Could not open %s", battery); + char *walk, *last; + int fd; int full_design = -1, remaining = -1, present_rate = -1; charging_status_t status = CS_DISCHARGING; - memset(part, '\0', sizeof(part)); - read(fd, buf, sizeof(buf)); - for (walk = buf; (walk-buf) < 1024; walk++) + + if ((fd = open(path, O_RDONLY)) == -1) + return "No battery found"; + + memset(part, 0, sizeof(part)); + (void)read(fd, buf, sizeof(buf)); + for (walk = buf, last = buf; (walk-buf) < 1024; walk++) if (*walk == '=') { - if (BEGINS_WITH(last, "POWER_SUPPLY_ENERGY_FULL_DESIGN")) + if (BEGINS_WITH(last, "POWER_SUPPLY_ENERGY_FULL_DESIGN") || + BEGINS_WITH(last, "POWER_SUPPLY_CHARGE_FULL_DESIGN")) full_design = atoi(walk+1); - else if (BEGINS_WITH(last, "POWER_SUPPLY_ENERGY_NOW")) + else if (BEGINS_WITH(last, "POWER_SUPPLY_ENERGY_NOW") || + BEGINS_WITH(last, "POWER_SUPPLY_CHARGE_NOW")) remaining = atoi(walk+1); else if (BEGINS_WITH(last, "POWER_SUPPLY_CURRENT_NOW")) present_rate = atoi(walk+1); @@ -159,205 +314,382 @@ static char *get_battery_info() { status = CS_FULL; } else if (*walk == '\n') last = walk+1; - close(fd); + (void)close(fd); - if ((full_design != -1) && (remaining != -1) && (present_rate != -1)) { - float remaining_time, perc; + if ((full_design == 1) || (remaining == -1)) + return part; + + if (present_rate > 0) { + float remaining_time; + int seconds, hours, minutes; if (status == CS_CHARGING) remaining_time = ((float)full_design - (float)remaining) / (float)present_rate; else if (status == CS_DISCHARGING) remaining_time = ((float)remaining / (float)present_rate); - else { - snprintf(part, sizeof(part), "FULL"); - return part; - } - perc = ((float)remaining / (float)full_design); + else remaining_time = 0; - int seconds = (int)(remaining_time * 3600.0); - int hours = seconds / 3600; + seconds = (int)(remaining_time * 3600.0); + hours = seconds / 3600; seconds -= (hours * 3600); - int minutes = seconds / 60; + minutes = seconds / 60; seconds -= (minutes * 60); - sprintf(part, "%s %.02f%% %02d:%02d:%02d", (status == CS_CHARGING? "CHR" : "BAT"), - (perc * 100), hours, minutes, seconds); + (void)snprintf(part, sizeof(part), "%s %.02f%% %02d:%02d:%02d", + (status == CS_CHARGING ? "CHR" : + (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; } /* - * Just parses /proc/net/wireless + * 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 char *get_wireless_info() { - char buf[1024]; +static const char *get_ip_address(const char *interface) { static char part[512]; - char *interfaces; - memset(buf, '\0', sizeof(buf)); - memset(part, '\0', sizeof(part)); - - int fd = open("/proc/net/wireless", O_RDONLY); - if (fd == -1) - die("Could not open /proc/net/wireless"); - read(fd, buf, sizeof(buf)); - close(fd); + struct ifreq ifr; + struct sockaddr_in addr; + socklen_t len = sizeof(struct sockaddr_in); + memset(part, 0, sizeof(part)); - interfaces = skip_character(buf, '\n', 2) + 1; - while (interfaces < buf+strlen(buf)) { - while (isspace((int)*interfaces)) - interfaces++; - if (strncmp(interfaces, wlan_interface, strlen(wlan_interface)) == 0) { - /* Skip status field (0000) */ - interfaces += strlen(wlan_interface) + 2; - interfaces = skip_character(interfaces, ' ', 1); - while (isspace((int)*interfaces)) - interfaces++; - int quality = atoi(interfaces); - /* For some reason, I get 255 sometimes */ - if ((quality == 255) || (quality == 0)) { -#ifdef USE_COLORS - snprintf(part, sizeof(part), "#FF0000 " WMII_NORMCOLORS " W: down"); -#else - snprintf(part, sizeof(part), "W: down"); -#endif + (void)strcpy(ifr.ifr_name, interface); + ifr.ifr_addr.sa_family = AF_INET; + if (ioctl(general_socket, SIOCGIFADDR, &ifr) < 0) + return NULL; - } else { - snprintf(part, sizeof(part), "W: (%02d%%) ", quality); - char *ip_address = get_ip_address(wlan_interface); - strcpy(part+strlen(part), ip_address); - } - - return part; - } - interfaces = skip_character(interfaces, '\n', 1) + 1; - } + 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; } -static char *get_ip_address(const char *interface) { +/* + * Just parses /proc/net/wireless looking for lines beginning with + * wlan_interface, extracting the quality of the link and adding the + * current IP address of wlan_interface. + * + */ +static char *get_wireless_info() { + char buf[1024]; static char part[512]; - struct ifreq ifr; - memset(part, '\0', sizeof(part)); - - int fd = socket(AF_INET, SOCK_DGRAM, 0); - - strcpy(ifr.ifr_name, interface); - if (ioctl(fd, SIOCGIFFLAGS, &ifr) < 0) - die("Could not get interface flags (SIOCGIFFLAGS)"); + char *interfaces; + int fd; + memset(buf, 0, sizeof(buf)); + memset(part, 0, sizeof(part)); - if (!(ifr.ifr_flags & IFF_UP) || - !(ifr.ifr_flags & IFF_RUNNING)) { - close(fd); - return NULL; - } + if ((fd = open("/proc/net/wireless", O_RDONLY)) == -1) + die("Could not open /proc/net/wireless\n"); + (void)read(fd, buf, sizeof(buf)); + (void)close(fd); - strcpy(ifr.ifr_name, interface); - ifr.ifr_addr.sa_family = AF_INET; - if (ioctl(fd, SIOCGIFADDR, &ifr) == 0) { - struct sockaddr_in addr; - memcpy(&addr, &ifr.ifr_addr, sizeof(struct sockaddr_in)); - inet_ntop(AF_INET, &addr.sin_addr.s_addr, part, sizeof(struct sockaddr_in)); - if (strlen(part) == 0) - sprintf(part, "no IP"); + interfaces = skip_character(buf, '\n', 1) + 1; + while ((interfaces = skip_character(interfaces, '\n', 1)+1) < buf+strlen(buf)) { + while (isspace((int)*interfaces)) + interfaces++; + if (!BEGINS_WITH(interfaces, wlan_interface)) + continue; + int quality; + if (sscanf(interfaces, "%*[^:]: 0000 %d", &quality) != 1) + continue; + if ((quality == UCHAR_MAX) || (quality == 0)) { + if (use_colors) + (void)snprintf(part, sizeof(part), "%sW: down", color("#FF0000")); + else (void)snprintf(part, sizeof(part), "W: down"); + } else (void)snprintf(part, sizeof(part), "%sW: (%03d%%) %s", + color("#00FF00"), quality, get_ip_address(wlan_interface)); + return part; } - close(fd); return part; } +/* + * Combines ethernet IP addresses and speed (if requested) for displaying + * + */ static char *get_eth_info() { static char part[512]; - char *ip_address = get_ip_address(eth_interface); + const char *ip_address = get_ip_address(eth_interface); + int ethspeed = 0; + + if (get_ethspeed) { +#ifdef LINUX + /* This code path requires root privileges */ + struct ifreq ifr; + struct ethtool_cmd ecmd; + + ecmd.cmd = ETHTOOL_GSET; + (void)memset(&ifr, 0, sizeof(ifr)); + ifr.ifr_data = (caddr_t)&ecmd; + (void)strcpy(ifr.ifr_name, eth_interface); + if (ioctl(general_socket, SIOCETHTOOL, &ifr) == 0) + ethspeed = (ecmd.speed == USHRT_MAX ? 0 : ecmd.speed); + else get_ethspeed = false; +#endif + } if (ip_address == NULL) - snprintf(part, sizeof(part), "E: down"); - else snprintf(part, sizeof(part), "E: %s", ip_address); + (void)snprintf(part, sizeof(part), "E: down"); + else { + if (get_ethspeed) + (void)snprintf(part, sizeof(part), "E: %s (%d Mbit/s)", ip_address, ethspeed); + else (void)snprintf(part, sizeof(part), "E: %s", ip_address); + } return part; } /* - * Checks if the PID in path is still valid by checking if /proc/ exists + * Checks if the PID in path is still valid by checking: + * (Linux) if /proc/ exists + * (NetBSD) if sysctl returns process infos for this pid * */ static bool process_runs(const char *path) { - char pidbuf[512], - procbuf[512], - *walk; - int n; + char pidbuf[16]; static glob_t globbuf; - struct stat statbuf; + int fd; + memset(pidbuf, 0, sizeof(pidbuf)); if (glob(path, GLOB_NOCHECK | GLOB_TILDE, NULL, &globbuf) < 0) - die("glob() failed"); - const char *real_path = (globbuf.gl_pathc > 0 ? globbuf.gl_pathv[0] : path); - int fd = open(real_path, O_RDONLY); + die("glob() failed\n"); + fd = open((globbuf.gl_pathc > 0 ? globbuf.gl_pathv[0] : path), O_RDONLY); globfree(&globbuf); if (fd < 0) return false; - n = read(fd, pidbuf, sizeof(pidbuf)); - if (n > 0) - pidbuf[n] = '\0'; - close(fd); - for (walk = pidbuf; *walk != '\0'; walk++) - if (!isdigit((int)(*walk))) { - *walk = '\0'; - break; - } - sprintf(procbuf, "/proc/%s", pidbuf); + (void)read(fd, pidbuf, sizeof(pidbuf)); + (void)close(fd); + +#ifdef LINUX + struct stat statbuf; + char procbuf[512]; + (void)snprintf(procbuf, sizeof(procbuf), "/proc/%ld", strtol(pidbuf, NULL, 10)); return (stat(procbuf, &statbuf) >= 0); +#else + /* TODO: correctly check for NetBSD. Evaluate if this runs on OpenBSD/FreeBSD */ + struct kinfo_proc info; + size_t length = sizeof(struct kinfo_proc); + int mib[4] = { CTL_KERN, KERN_PROC, KERN_PROC_PID, strtol(pidbuf, NULL, 10) }; + if (sysctl(mib, 4, &info, &length, NULL, 0) < 0) + return false; + return (length != 0); +#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(void) { +int main(int argc, char *argv[]) { char part[512], - pathbuf[512], - *end; + pathbuf[512]; unsigned int i; - cleanup_rbar_dir(); - create_file(ORDER_WLAN "wlan"); - create_file(ORDER_ETH "eth"); - create_file(ORDER_BATTERY "battery"); - create_file(ORDER_LOAD "load"); - create_file(ORDER_TIME "time"); - for (i = 0; i < sizeof(run_watches) / sizeof(char*); i += 2) { - sprintf(pathbuf, "%s%s", ORDER_RUN, run_watches[i]); - create_file(pathbuf); - } + char *configfile = PREFIX "/etc/wmiistatus.conf"; + int o, option_index = 0; + struct option long_options[] = { + {"config", required_argument, 0, 'c'}, + {"help", no_argument, 0, 'h'}, + {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; + else if ((char)o == 'h') { + printf("wmiistatus (c) 2008-2009 Michael Stapelberg\n" + "Syntax: %s [-c ]\n", argv[0]); + return 0; + } + + if (load_configuration(configfile) < 0) + return EXIT_FAILURE; + + setup(); + + if ((general_socket = socket(AF_INET, SOCK_DGRAM, 0)) == -1) + die("Could not create socket\n"); while (1) { - for (i = 0; i < sizeof(run_watches) / sizeof(char*); i += 2) { + for (i = 0; i < num_run_watches; i += 2) { bool running = process_runs(run_watches[i+1]); -#ifdef USE_COLORS - sprintf(part, "%s %s: %s", (running ? "#00FF00 " WMII_NORMCOLORS : "#FF0000 " WMII_NORMCOLORS), run_watches[i], (running ? "yes" : "no")); -#else - sprintf(part, "%s: %s", run_watches[i], (running ? "yes" : "no")); -#endif - sprintf(pathbuf, "%s%s", ORDER_RUN, run_watches[i]); - write_to_statusbar(pathbuf, part); + if (use_colors) + 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, false); } - write_to_statusbar(ORDER_WLAN "wlan", get_wireless_info()); - write_to_statusbar(ORDER_ETH "eth", get_eth_info()); - write_to_statusbar(ORDER_BATTERY "battery", get_battery_info()); + if (wlan_interface) + 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(), 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 */ - int load_avg = open("/proc/loadavg", O_RDONLY); - if (load_avg == -1) - die("Could not open /proc/loadavg"); - read(load_avg, part, sizeof(part)); - close(load_avg); - end = skip_character(part, ' ', 3); - *end = '\0'; - write_to_statusbar(ORDER_LOAD "load", part); - - /* Get date & time */ - time_t current_time = time(NULL); - struct tm *current_tm = localtime(¤t_time); - strftime(part, sizeof(part), time_format, current_tm); - write_to_statusbar(ORDER_TIME "time", part); - - sleep(1); +#ifdef LINUX + int load_avg; + if ((load_avg = open("/proc/loadavg", O_RDONLY)) == -1) + die("Could not open /proc/loadavg\n"); + (void)read(load_avg, part, sizeof(part)); + (void)close(load_avg); + *skip_character(part, ' ', 3) = '\0'; +#else + /* TODO: correctly check for NetBSD, check if it works the same on *BSD */ + struct loadavg load; + size_t length = sizeof(struct loadavg); + int mib[2] = { CTL_VM, VM_LOADAVG }; + if (sysctl(mib, 2, &load, &length, NULL, 0) < 0) + die("Could not sysctl({ CTL_VM, VM_LOADAVG })\n"); + double scale = load.fscale; + (void)snprintf(part, sizeof(part), "%.02f %.02f %.02f", + (double)load.ldavg[0] / scale, + (double)load.ldavg[1] / scale, + (double)load.ldavg[2] / scale); +#endif + 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(¤t_time); + (void)strftime(part, sizeof(part), time_format, current_tm); + write_to_statusbar(concat(order[ORDER_TIME], "time"), part, true); + } + + sleep(interval); } }