X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/1c8aa5318f13710defb4fb34288b8e6c444ac823..6f011743921db04e5513df45c5ac4b2c752d52de:/slstatus.c diff --git a/slstatus.c b/slstatus.c index af26fe7..47bd4c9 100644 --- a/slstatus.c +++ b/slstatus.c @@ -1,5 +1,6 @@ /* See LICENSE file for copyright and license details. */ +#include #include #include #include @@ -27,6 +28,8 @@ #include "arg.h" +#define LEN(x) (sizeof (x) / sizeof *(x)) + struct arg { const char *(*func)(); const char *fmt; @@ -51,6 +54,7 @@ static const char *ip(const char *iface); static const char *kernel_release(void); static const char *keyboard_indicators(void); static const char *load_avg(void); +static const char *num_files(const char *dir); static const char *ram_free(void); static const char *ram_perc(void); static const char *ram_used(void); @@ -68,12 +72,11 @@ static const char *vol_perc(const char *card); static const char *wifi_perc(const char *iface); static const char *wifi_essid(const char *iface); static void sighandler(const int signo); -static void usage(const int eval); +static void usage(void); char *argv0; static unsigned short int delay = 0; static unsigned short int done; -static unsigned short int dflag, oflag, nflag; static Display *dpy; #include "config.h" @@ -141,10 +144,19 @@ battery_power(const char *bat) static const char * battery_state(const char *bat) { - char path[PATH_MAX]; - char state[12]; FILE *fp; + struct { + char *state; + char *symbol; + } map[] = { + { "Charging", "+" }, + { "Discharging", "-" }, + { "Full", "=" }, + { "Unknown", "/" }, + }; + size_t i; int n; + char path[PATH_MAX], state[12]; snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/", bat, "/status"); fp = fopen(path, "r"); @@ -157,17 +169,13 @@ battery_state(const char *bat) if (n != 1) return UNKNOWN_STR; - if (strcmp(state, "Charging") == 0) { - return "+"; - } else if (strcmp(state, "Discharging") == 0) { - return "-"; - } else if (strcmp(state, "Full") == 0) { - return "="; - } else if (strcmp(state, "Unknown") == 0) { - return "/"; - } else { - return "?"; + for (i = 0; i < LEN(map); i++) { + if (!strcmp(map[i].state, state)) { + break; + } } + + return (i == LEN(map)) ? "?" : map[i].symbol; } static const char * @@ -372,10 +380,9 @@ kernel_release(void) static const char * keyboard_indicators(void) { - Display *dpy = XOpenDisplay(NULL); XKeyboardState state; + XGetKeyboardControl(dpy, &state); - XCloseDisplay(dpy); switch (state.led_mask) { case 1: @@ -402,6 +409,29 @@ load_avg(void) return bprintf("%.2f %.2f %.2f", avgs[0], avgs[1], avgs[2]); } +static const char * +num_files(const char *dir) +{ + struct dirent *dp; + DIR *fd; + int num = 0; + + if ((fd = opendir(dir)) == NULL) { + warn("Failed to get number of files in directory %s", dir); + return UNKNOWN_STR; + } + + while ((dp = readdir(fd)) != NULL) { + if (!strcmp(dp->d_name, ".") || !strcmp(dp->d_name, "..")) + continue; /* skip self and parent */ + num++; + } + + closedir(fd); + + return bprintf("%d", num); +} + static const char * ram_free(void) { @@ -716,7 +746,7 @@ vol_perc(const char *card) close(afd); return UNKNOWN_STR; } - for (i = 0; i < (sizeof(vnames) / sizeof((vnames[0]))); i++) { + for (i = 0; i < LEN(vnames); i++) { if (devmask & (1 << i) && !strcmp("vol", vnames[i])) { if (ioctl(afd, MIXER_READ(i), &v) == -1) { warn("vol_perc: ioctl"); @@ -813,46 +843,32 @@ sighandler(const int signo) } static void -usage(const int eval) +usage(void) { - fprintf(stderr, "usage: %s [-d] [-o] [-n] [-v] [-h]\n", argv0); - exit(eval); + fprintf(stderr, "usage: %s [-s]\n", argv0); + exit(1); } int main(int argc, char *argv[]) { - unsigned short int i; - char status_string[MAXLEN]; - char *element; struct arg argument; struct sigaction act; - size_t len; + size_t i, len; + int sflag = 0; + char status_string[MAXLEN]; + char *element; ARGBEGIN { - case 'd': - dflag = 1; - break; - case 'o': - oflag = 1; - break; - case 'n': - nflag = 1; + case 's': + sflag = 1; break; - case 'v': - printf("slstatus (C) 2016-2017 slstatus engineers\n"); - return 0; - case 'h': - usage(0); default: - usage(1); + usage(); } ARGEND - if ((dflag && oflag) || (dflag && nflag) || (oflag && nflag)) { - usage(1); - } - if (dflag && daemon(1, 1) < 0) { - err(1, "daemon"); + if (argc) { + usage(); } memset(&act, 0, sizeof(act)); @@ -860,8 +876,12 @@ main(int argc, char *argv[]) sigaction(SIGINT, &act, 0); sigaction(SIGTERM, &act, 0); - if (!oflag) { + if (!sflag) { dpy = XOpenDisplay(NULL); + if (!dpy) { + fprintf(stderr, "slstatus: cannot open display"); + exit(1); + } } setlocale(LC_ALL, ""); @@ -869,8 +889,7 @@ main(int argc, char *argv[]) while (!done) { status_string[0] = '\0'; - for (element = status_string, i = len = 0; - i < sizeof(args) / sizeof(args[0]); + for (element = status_string, i = len = 0; i < LEN(args); ++i, element += len) { argument = args[i]; len = snprintf(element, sizeof(status_string)-1 - len, @@ -882,11 +901,8 @@ main(int argc, char *argv[]) } } - if (oflag) { - printf("%s\n", status_string); - } else if (nflag) { + if (sflag) { printf("%s\n", status_string); - done = 1; } else { XStoreName(dpy, DefaultRootWindow(dpy), status_string); XSync(dpy, False); @@ -901,7 +917,7 @@ main(int argc, char *argv[]) } } - if (!oflag) { + if (!sflag) { XStoreName(dpy, DefaultRootWindow(dpy), NULL); XCloseDisplay(dpy); }