X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/81997b327c908a618e7c0b4e0be6103eb71fb6de..35f7862744288411600b5200e3612b4ed204092d:/slstatus.c?ds=inline diff --git a/slstatus.c b/slstatus.c index 73dc5a3..1a297f8 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,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 * @@ -139,7 +153,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) { @@ -257,9 +272,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); @@ -393,26 +406,18 @@ ram_used(void) static char * 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); 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); } @@ -468,26 +473,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); } @@ -498,7 +503,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 * @@ -510,11 +515,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); } @@ -556,7 +561,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); } @@ -566,24 +571,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; 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) @@ -601,7 +621,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;