X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/ba2947ae456c7afa1a6b060d79a37f08d1f6b824..87eae6db0398ec1ddb98d67fea36339ff58eb2a5:/slstatus.c?ds=sidebyside diff --git a/slstatus.c b/slstatus.c index 7babe1f..be124f3 100644 --- a/slstatus.c +++ b/slstatus.c @@ -26,6 +26,7 @@ #undef strlcat #undef strlcpy +#include "arg.h" #include "strlcat.h" #include "strlcpy.h" #include "concat.h" @@ -40,6 +41,7 @@ struct arg { static char *smprintf(const char *, ...); static char *battery_perc(const char *); +static char *battery_state(const char *); static char *cpu_perc(void); static char *datetime(const char *); static char *disk_free(const char *); @@ -63,11 +65,13 @@ static char *username(void); static char *vol_perc(const char *); static char *wifi_perc(const char *); static char *wifi_essid(const char *); +static void set_status(const char *); static void sighandler(const int); +static void usage(void); -static unsigned short int delay; +char *argv0; +static unsigned short int delay, done, dflag, oflag; static Display *dpy; -static int done = 0; #include "config.h" @@ -98,34 +102,44 @@ smprintf(const char *fmt, ...) static char * battery_perc(const char *battery) { - int now, full, perc; + int perc; FILE *fp; - ccat(4, BATTERY_PATH, battery, "/", BATTERY_NOW); - + ccat(3, "/sys/class/power_supply/", battery, "/capacity"); fp = fopen(concat, "r"); if (fp == NULL) { warn("Error opening battery file: %s", concat); return smprintf(UNKNOWN_STR); } - - fscanf(fp, "%i", &now); + fscanf(fp, "%i", &perc); fclose(fp); - ccat(4, BATTERY_PATH, battery, "/", BATTERY_FULL); + return smprintf("%d%%", perc); +} + +static char * +battery_state(const char *battery) +{ + char state[12]; + FILE *fp; + ccat(3, "/sys/class/power_supply/", battery, "/status"); fp = fopen(concat, "r"); if (fp == NULL) { warn("Error opening battery file: %s", concat); return smprintf(UNKNOWN_STR); } - - fscanf(fp, "%i", &full); + fscanf(fp, "%12s", state); fclose(fp); - perc = now / (full / 100); - - return smprintf("%d%%", perc); + if (strcmp(state, "Charging") == 0) + return smprintf("+"); + else if (strcmp(state, "Discharging") == 0) + return smprintf("-"); + else if (strcmp(state, "Full") == 0) + return smprintf("="); + else + return smprintf("?"); } static char * @@ -262,9 +276,7 @@ hostname(void) } fgets(hostname, sizeof(hostname), fp); - /* FIXME: needs improvement */ - memset(&hostname[strlen(hostname)-1], '\0', - sizeof(hostname) - strlen(hostname)); + hostname[strlen(hostname)-1] = '\0'; fclose(fp); return smprintf("%s", hostname); @@ -398,26 +410,18 @@ ram_used(void) static char * run_command(const char* command) { - int good; FILE *fp = popen(command, "r"); - char buffer[64] = ""; + char buffer[64] = "\0"; if (fp == NULL) { warn("Could not get command output for: %s", command); return smprintf(UNKNOWN_STR); } - fgets(buffer, sizeof(buffer)-1, fp); - pclose(fp); - for (int i = 0 ; i != sizeof(buffer); i++) { - if (buffer[i] == '\0') { - good = 1; - break; - } - } - if (good) - buffer[strlen(buffer)-1] = '\0'; + fgets(buffer, sizeof(buffer), fp); + buffer[sizeof(buffer)-1] = '\0'; + pclose(fp); return smprintf("%s", buffer); } @@ -474,25 +478,25 @@ uid(void) static char * -vol_perc(const char *snd_card) -{ /* FIX THIS SHIT! */ +vol_perc(const char *soundcard) +{ long int vol, max, min; snd_mixer_t *handle; snd_mixer_elem_t *elem; snd_mixer_selem_id_t *s_elem; snd_mixer_open(&handle, 0); - snd_mixer_attach(handle, snd_card); + snd_mixer_attach(handle, soundcard); snd_mixer_selem_register(handle, NULL, NULL); snd_mixer_load(handle); snd_mixer_selem_id_malloc(&s_elem); - snd_mixer_selem_id_set_name(s_elem, ALSA_CHANNEL); + snd_mixer_selem_id_set_name(s_elem, "Master"); elem = snd_mixer_find_selem(handle, s_elem); if (elem == NULL) { snd_mixer_selem_id_free(s_elem); snd_mixer_close(handle); - warn("error: ALSA"); + warn("Failed to get volume percentage for: %s", soundcard); return smprintf(UNKNOWN_STR); } @@ -503,7 +507,7 @@ vol_perc(const char *snd_card) snd_mixer_selem_id_free(s_elem); snd_mixer_close(handle); - return smprintf("%d", ((uint_fast16_t)(vol * 100) / max)); + return smprintf("%d%%", ((uint_fast16_t)(vol * 100) / max)); } static char * @@ -579,23 +583,57 @@ wifi_essid(const char *wificard) return smprintf("%s", (char *)wreq.u.essid.pointer); } +static void +set_status(const char *str) +{ + XStoreName(dpy, DefaultRootWindow(dpy), str); + XSync(dpy, False); +} + static void sighandler(const int signo) { - if (signo == SIGTERM || signo == SIGINT) { + if (signo == SIGTERM || signo == SIGINT) done = 1; - } } +static void +usage(void) +{ + fprintf(stderr, + "slstatus (c) 2016, drkhsh\n" + "usage: %s [-dho]\n", + argv0); + exit(1); +} + + + int -main(void) +main(int argc, char *argv[]) { - size_t i; + unsigned short int i; char status_string[4096]; char *res, *element; struct arg argument; struct sigaction act; + ARGBEGIN { + case 'd': + dflag = 1; + break; + case 'o': + oflag = 1; + break; + default: + usage(); + } ARGEND + + if (dflag && oflag) + usage(); + if (dflag) + (void)daemon(1, 1); + memset(&act, 0, sizeof(act)); act.sa_handler = sighandler; sigaction(SIGINT, &act, 0); @@ -605,6 +643,7 @@ main(void) while (!done) { status_string[0] = '\0'; + for (i = 0; i < sizeof(args) / sizeof(args[0]); ++i) { argument = args[i]; if (argument.args == NULL) @@ -620,8 +659,12 @@ main(void) free(res); free(element); } - XStoreName(dpy, DefaultRootWindow(dpy), status_string); - XSync(dpy, False); + + if (!oflag) + set_status(status_string); + else + printf("%s\n", status_string); + /* * subtract delay time spend in function * calls from the actual global delay time @@ -630,6 +673,9 @@ main(void) delay = 0; } + if (!oflag) + set_status(NULL); + XCloseDisplay(dpy); return 0;