X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=wmiistatus.c;h=c47b5289e05c6b247e52cdb47e858b2790571f2e;hb=6f705c20decfca58aa1cd2e6c459aae01f50b318;hp=33575a5234f12557308f05eeafa5b2d96157700f;hpb=65251638ddea3310ed69534191198afa9e9d97ed;p=i3%2Fi3status diff --git a/wmiistatus.c b/wmiistatus.c index 33575a5..c47b528 100644 --- a/wmiistatus.c +++ b/wmiistatus.c @@ -38,6 +38,7 @@ #include #include #include +#include #include #include #include @@ -46,24 +47,68 @@ #include #include #include -#include "wmiistatus.h" +#include +#include +#include "wmiistatus.h" #include "config.h" -static void write_to_statusbar(const char *message) { - int fd = open(wmii_path, O_RDWR); +static void cleanup_rbar_dir() { + struct dirent *ent; + DIR *dir; + char pathbuf[strlen(wmii_path)+256+1]; + + if ((dir = opendir(wmii_path)) == NULL) + exit(-3); + + while ((ent = readdir(dir)) != NULL) { + if (ent->d_type == DT_REG) { + sprintf(pathbuf, "%s%s", wmii_path, ent->d_name); + unlink(pathbuf); + } + } + + closedir(dir); +} + +static void create_file(const char *name) { + char pathbuf[strlen(wmii_path)+256+1]; + + sprintf(pathbuf, "%s%s", wmii_path, name); + int fd = creat(pathbuf, S_IRUSR | S_IWUSR); + if (fd < 0) + exit(-4); + close(fd); +} + +static void write_to_statusbar(const char *name, const char *message) { + char pathbuf[strlen(wmii_path)+256+1]; + + 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); } +static void write_error_to_statusbar(const char *message) { + cleanup_rbar_dir(); + write_to_statusbar("error", message); +} + /* * Write errormessage to statusbar and exit * */ -static void die(const char *message) { - write_to_statusbar(message); +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); } @@ -79,14 +124,6 @@ static char *skip_character(char *input, char character, int amount) { return (walk == input ? walk : walk-1); } -static void push_part(const char *input, const int n) { - if (first_push) - first_push = false; - else - strncpy(output+strlen(output), " | ", strlen(" | ")); - strncpy(output+strlen(output), input, n); -} - /* * Get battery information from /sys. Note that it uses the design capacity to calculate the percentage, * not the full capacity. @@ -96,9 +133,9 @@ static char *get_battery_info() { char buf[1024]; static char part[512]; char *walk, *last = buf; - int fd = open("/sys/class/power_supply/BAT0/uevent", O_RDONLY); + int fd = open(battery, O_RDONLY); if (fd == -1) - die("Could not open /sys/class/power_supply/BAT0/uevent"); + die("Could not open %s", battery); int full_design = -1, remaining = -1, present_rate = -1; @@ -157,6 +194,8 @@ static char *get_wireless_info() { 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); @@ -174,8 +213,12 @@ static char *get_wireless_info() { /* For some reason, I get 255 sometimes */ if ((quality == 255) || (quality == 0)) snprintf(part, sizeof(part), "W: down"); - else snprintf(part, sizeof(part), "W: (%02d%%) ", quality); - // TODO: get IP address + 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; @@ -184,75 +227,123 @@ static char *get_wireless_info() { return part; } -static char *get_eth_info() { +static char *get_ip_address(const char *interface) { static char part[512]; struct ifreq ifr; memset(part, '\0', sizeof(part)); int fd = socket(AF_INET, SOCK_DGRAM, 0); - strcpy(ifr.ifr_name, eth_interface); + strcpy(ifr.ifr_name, interface); if (ioctl(fd, SIOCGIFFLAGS, &ifr) < 0) die("Could not get interface flags (SIOCGIFFLAGS)"); if (!(ifr.ifr_flags & IFF_UP) || !(ifr.ifr_flags & IFF_RUNNING)) { - sprintf(part, "E: down"); close(fd); - return part; + return NULL; } - strcpy(ifr.ifr_name, eth_interface); + 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+3, sizeof(struct sockaddr_in)); - strncpy(part, "E: ", strlen("E: ")); + inet_ntop(AF_INET, &addr.sin_addr.s_addr, part, sizeof(struct sockaddr_in)); if (strlen(part) == 0) - sprintf(part, "E: no IP"); + sprintf(part, "no IP"); } close(fd); return part; } +static char *get_eth_info() { + static char part[512]; + char *ip_address = get_ip_address(eth_interface); + + if (ip_address == NULL) + snprintf(part, sizeof(part), "E: down"); + else snprintf(part, sizeof(part), "E: %s", ip_address); + + return part; +} + +/* + * Checks if the PID in path is still valid by checking if /proc/ exists + * + */ +static bool process_runs(const char *path) { + char pidbuf[512], + procbuf[512], + *walk; + int n; + static glob_t globbuf; + struct stat statbuf; + + 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); + 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); + return (stat(procbuf, &statbuf) >= 0); +} + int main(void) { char part[512], + pathbuf[512], *end; + unsigned int i; - while (1) { - memset(output, '\0', sizeof(output)); - first_push = true; - - char *wireless_info = get_wireless_info(); - push_part(wireless_info, strlen(wireless_info)); + 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 *eth_info = get_eth_info(); - push_part(eth_info, strlen(eth_info)); + while (1) { + for (i = 0; i < sizeof(run_watches) / sizeof(char*); i += 2) { + sprintf(part, "%s: %s", run_watches[i], (process_runs(run_watches[i+1]) ? "yes" : "no")); + sprintf(pathbuf, "%s%s", ORDER_RUN, run_watches[i]); + write_to_statusbar(pathbuf, part); + } - char *battery_info = get_battery_info(); - push_part(battery_info, strlen(battery_info)); + 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()); - /* 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); - push_part(part, (end-part)); + *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), "%d.%m.%Y %H:%M:%S", current_tm); - push_part(part, strlen(part)); - - printf("output = %s\n", output); - - int fd = open("/mnt/wmii/rbar/status", O_RDWR); - write(fd, output, strlen(output)); - close(fd); + strftime(part, sizeof(part), time_format, current_tm); + write_to_statusbar(ORDER_TIME "time", part); sleep(1); }