X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/9b2dc253485ef3a0ac34a5e781bc2c856bec463d..3e04f1d910b2bab606e2bcaa61a0cee4f9cfe8b8:/slstatus.c diff --git a/slstatus.c b/slstatus.c index 55e638f..69fb6a5 100644 --- a/slstatus.c +++ b/slstatus.c @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include @@ -39,6 +40,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 *); @@ -62,7 +64,9 @@ static char *username(void); static char *vol_perc(const char *); static char *wifi_perc(const char *); static char *wifi_essid(const char *); +static void sighandler(const int); +static unsigned short int delay, done; static Display *dpy; #include "config.h" @@ -94,34 +98,50 @@ 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; + + if (!state) { + warn("Failed to get battery state."); + return smprintf(UNKNOWN_STR); + } + + + 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 * @@ -139,7 +159,8 @@ cpu_perc(void) fscanf(fp, "%*s %Lf %Lf %Lf %Lf", &a[0], &a[1], &a[2], &a[3]); fclose(fp); - sleep(1); + delay = (UPDATE_INTERVAL - (UPDATE_INTERVAL - 1)); + sleep(delay); fp = fopen("/proc/stat","r"); if (fp == NULL) { @@ -150,6 +171,7 @@ cpu_perc(void) fscanf(fp, "%*s %Lf %Lf %Lf %Lf", &b[0], &b[1], &b[2], &b[3]); fclose(fp); perc = 100 * ((b[0]+b[1]+b[2]) - (a[0]+a[1]+a[2])) / ((b[0]+b[1]+b[2]+b[3]) - (a[0]+a[1]+a[2]+a[3])); + return smprintf("%d%%", perc); } @@ -175,6 +197,7 @@ disk_free(const char *mountpoint) warn("Could not get filesystem info"); return smprintf(UNKNOWN_STR); } + return smprintf("%f", (float)fs.f_bsize * (float)fs.f_bfree / 1024 / 1024 / 1024); } @@ -190,6 +213,7 @@ disk_perc(const char *mountpoint) } perc = 100 * (1.0f - ((float)fs.f_bfree / (float)fs.f_blocks)); + return smprintf("%d%%", perc); } @@ -232,6 +256,7 @@ entropy(void) fscanf(fp, "%d", &entropy); fclose(fp); + return smprintf("%d", entropy); } @@ -254,9 +279,10 @@ hostname(void) fgets(hostname, sizeof(hostname), fp); /* FIXME: needs improvement */ - memset(&hostname[strlen(hostname)-1], '\0', + memset(&hostname[strlen(hostname)], '\0', sizeof(hostname) - strlen(hostname)); fclose(fp); + return smprintf("%s", hostname); } @@ -272,7 +298,6 @@ ip(const char *interface) return smprintf(UNKNOWN_STR); } - /* get the ip address */ for (ifa = ifaddr; ifa != NULL; ifa = ifa->ifa_next) { if (ifa->ifa_addr == NULL) continue; @@ -289,7 +314,6 @@ ip(const char *interface) } } - /* free the address */ freeifaddrs(ifaddr); return smprintf(UNKNOWN_STR); @@ -321,6 +345,7 @@ ram_free(void) fscanf(fp, "MemFree: %ld kB\n", &free); fclose(fp); + return smprintf("%f", (float)free / 1024 / 1024); } @@ -343,6 +368,7 @@ ram_perc(void) fclose(fp); perc = 100 * ((total - free) - (buffers + cached)) / total; + return smprintf("%d%%", perc); } @@ -359,6 +385,7 @@ ram_total(void) fscanf(fp, "MemTotal: %ld kB\n", &total); fclose(fp); + return smprintf("%f", (float)total / 1024 / 1024); } @@ -380,6 +407,7 @@ ram_used(void) fclose(fp); used = total - free - buffers - cached; + return smprintf("%f", (float)used / 1024 / 1024); } @@ -388,7 +416,7 @@ run_command(const char* command) { int good; FILE *fp = popen(command, "r"); - char buffer[64]; + char buffer[64] = ""; if (fp == NULL) { warn("Could not get command output for: %s", command); @@ -405,6 +433,7 @@ run_command(const char* command) } if (good) buffer[strlen(buffer)-1] = '\0'; + return smprintf("%s", buffer); } @@ -421,6 +450,7 @@ temp(const char *file) fscanf(fp, "%d", &temperature); fclose(fp); + return smprintf("%d°C", temperature / 1000); } @@ -444,11 +474,12 @@ username(void) uid_t uid = geteuid(); struct passwd *pw = getpwuid(uid); - if (pw == NULL) - return smprintf("%s", pw->pw_name); + if (pw == NULL) { + warn("Could not get username"); + return smprintf(UNKNOWN_STR); + } - warn("Could not get username"); - return smprintf(UNKNOWN_STR); + return smprintf("%s", pw->pw_name); } static char * @@ -458,26 +489,26 @@ uid(void) } -static char * -vol_perc(const char *snd_card) -{ /* thanks to botika for this function */ +static char * +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, "default"); + 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, snd_card); + 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); - perror("alsa error"); + warn("Failed to get volume percentage for: %s", soundcard); return smprintf(UNKNOWN_STR); } @@ -488,7 +519,7 @@ vol_perc(const char *snd_card) snd_mixer_selem_id_free(s_elem); snd_mixer_close(handle); - return smprintf("%d", (vol * 100) / max); + return smprintf("%d%%", ((uint_fast16_t)(vol * 100) / max)); } static char * @@ -500,11 +531,11 @@ wifi_perc(const char *wificard) char status[5]; FILE *fp; - ccat(3, "/sys/class/net", wificard, "/operstate"); + ccat(3, "/sys/class/net/", wificard, "/operstate"); fp = fopen(concat, "r"); - if(fp == NULL) { + if (fp == NULL) { warn("Error opening wifi operstate file"); return smprintf(UNKNOWN_STR); } @@ -532,6 +563,7 @@ wifi_perc(const char *wificard) } fclose(fp); + return smprintf("%d%%", strength); } @@ -545,7 +577,7 @@ wifi_essid(const char *wificard) memset(&wreq, 0, sizeof(struct iwreq)); wreq.u.essid.length = IW_ESSID_MAX_SIZE+1; sprintf(wreq.ifr_name, wificard); - if(sockfd == -1) { + if (sockfd == -1) { warn("Cannot open socket for interface: %s", wificard); return smprintf(UNKNOWN_STR); } @@ -555,24 +587,39 @@ wifi_essid(const char *wificard) return smprintf(UNKNOWN_STR); } + close(sockfd); + if (strcmp((char *)wreq.u.essid.pointer, "") == 0) return smprintf(UNKNOWN_STR); else return smprintf("%s", (char *)wreq.u.essid.pointer); } +static void +sighandler(const int signo) +{ + if (signo == SIGTERM || signo == SIGINT) + done = 1; +} + int main(void) { - size_t i; + unsigned short int i; char status_string[4096]; - char *res, *element; + char *res, *element, *status_old; struct arg argument; + struct sigaction act; + + memset(&act, 0, sizeof(act)); + act.sa_handler = sighandler; + sigaction(SIGINT, &act, 0); + sigaction(SIGTERM, &act, 0); dpy = XOpenDisplay(NULL); - for (;;) { - memset(status_string, 0, sizeof(status_string)); + while (!done) { + status_string[0] = '\0'; for (i = 0; i < sizeof(args) / sizeof(args[0]); ++i) { argument = args[i]; if (argument.args == NULL) @@ -590,7 +637,17 @@ main(void) } XStoreName(dpy, DefaultRootWindow(dpy), status_string); XSync(dpy, False); + /* + * subtract delay time spend in function + * calls from the actual global delay time + */ + sleep(UPDATE_INTERVAL - delay); + delay = 0; } + + XStoreName(dpy, DefaultRootWindow(dpy), NULL); + XSync(dpy, False); + XCloseDisplay(dpy); return 0;