#include <glob.h>
#include <dirent.h>
+#define _IS_WMIISTATUS_C
#include "wmiistatus.h"
+#undef _IS_WMIISTATUS_C
#include "config.h"
+/*
+ * 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];
+ snprintf(concatbuf, sizeof(concatbuf), "%s%s", str1, str2);
+ return concatbuf;
+}
+
static void cleanup_rbar_dir() {
struct dirent *ent;
DIR *dir;
int fd = creat(pathbuf, S_IRUSR | S_IWUSR);
if (fd < 0)
exit(-4);
+ if (use_colors) {
+ char *tmp = concat("#888888 ", wmii_normcolors);
+ write(fd, tmp, strlen(tmp));
+ }
close(fd);
}
static void write_error_to_statusbar(const char *message) {
cleanup_rbar_dir();
+ create_file("error");
write_to_statusbar("error", message);
}
* Write errormessage to statusbar and exit
*
*/
-static void die(const char *fmt, ...) {
+void die(const char *fmt, ...) {
char buffer[512];
va_list ap;
va_start(ap, fmt);
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.
char buf[1024];
static char part[512];
char *walk, *last = buf;
- int fd = open(battery, O_RDONLY);
+ int fd = open(battery_path, O_RDONLY);
if (fd == -1)
- die("Could not open %s", battery);
+ die("Could not open %s", battery_path);
int full_design = -1,
remaining = -1,
present_rate = -1;
interfaces++;
int quality = atoi(interfaces);
/* For some reason, I get 255 sometimes */
- if ((quality == 255) || (quality == 0))
- snprintf(part, sizeof(part), "W: down");
- else {
+ if ((quality == 255) || (quality == 0)) {
+ if (use_colors)
+ snprintf(part, sizeof(part), "%s%s", concat("#FF0000 ", wmii_normcolors), " W: down");
+ else snprintf(part, sizeof(part), "W: down");
+
+ } else {
snprintf(part, sizeof(part), "W: (%02d%%) ", quality);
char *ip_address = get_ip_address(wlan_interface);
strcpy(part+strlen(part), ip_address);
int main(void) {
char part[512],
+ pathbuf[512],
*end;
unsigned int i;
+ load_configuration("/etc/wmiistatus.conf");
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");
+ 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) {
+ sprintf(pathbuf, "%s%s", order[ORDER_RUN], run_watches[i]);
+ create_file(pathbuf);
+ }
while (1) {
- memset(output, '\0', sizeof(output));
- first_push = true;
-
- 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"));
- push_part(part, strlen(part));
+ for (i = 0; i < num_run_watches; i += 2) {
+ bool running = process_runs(run_watches[i+1]);
+ if (use_colors)
+ sprintf(part, "%s %s: %s", (running ? concat("#00FF00 ", wmii_normcolors) : concat("#FF0000 ", wmii_normcolors)), run_watches[i], (running ? "yes" : "no"));
+ else sprintf(part, "%s: %s", run_watches[i], (running ? "yes" : "no"));
+ sprintf(pathbuf, "%s%s", order[ORDER_RUN], run_watches[i]);
+ write_to_statusbar(pathbuf, part);
}
- char *wireless_info = get_wireless_info();
- write_to_statusbar(ORDER_WLAN "wlan", wireless_info);
-
- char *eth_info = get_eth_info();
- write_to_statusbar(ORDER_ETH "eth", eth_info);
-
- char *battery_info = get_battery_info();
- write_to_statusbar(ORDER_BATTERY "battery", battery_info);
+ if (wlan_interface)
+ write_to_statusbar(concat(order[ORDER_WLAN], "wlan"), get_wireless_info());
+ 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());
/* Get load */
int load_avg = open("/proc/loadavg", O_RDONLY);
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);
+ write_to_statusbar(concat(order[ORDER_LOAD], "load"), part);
+
+ if (time_format) {
+ /* 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(concat(order[ORDER_TIME], "time"), part);
+ }
- sleep(1);
+ sleep(interval);
}
}
projects / i3 / i3status / blobdiff