X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/217da011dd6ea0bdbdc25796acdf72ae0e737d88..7aad78bd95cb265306f1ab81844c7bcd66054068:/slstatus.c

diff --git a/slstatus.c b/slstatus.c
index 6c25f3f..fa91cce 100644
--- a/slstatus.c
+++ b/slstatus.c
@@ -8,6 +8,7 @@
 #include <linux/wireless.h>
 #include <netdb.h>
 #include <pwd.h>
+#include <signal.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -62,8 +63,11 @@ 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;
 static Display *dpy;
+static int done = 0;
 
 #include "config.h"
 
@@ -94,39 +98,24 @@ 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);
-
-	fp = fopen(concat, "r");
-	if (fp == NULL) {
-		warn("Error opening battery file: %s", concat);
-		return smprintf(UNKNOWN_STR);
-	}
-
-	fscanf(fp, "%i", &full);
-	fclose(fp);
-
-	perc = now / (full / 100);
-
 	return smprintf("%d%%", perc);
 }
 
 static char *
 cpu_perc(void)
-{ /* FIXME: ugly function, would be better without sleep(), see below */
+{
 	int perc;
 	long double a[4], b[4];
 	FILE *fp = fopen("/proc/stat","r");
@@ -139,7 +128,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) {
@@ -468,26 +458,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 +488,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 +500,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 +546,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 +556,42 @@ 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;
 	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));
+	XFetchName(dpy, DefaultRootWindow(dpy), &status_old);
+
+	while (!done) {
+		status_string[0] = '\0';
 		for (i = 0; i < sizeof(args) / sizeof(args[0]); ++i) {
 			argument = args[i];
 			if (argument.args == NULL)
@@ -601,9 +609,17 @@ main(void)
 		}
 		XStoreName(dpy, DefaultRootWindow(dpy), status_string);
 		XSync(dpy, False);
-		sleep(UPDATE_INTERVAL - 1); /* FIXME: ugly cpu function which uses 1 second */
+		/*
+		 * subtract delay time spend in function
+		 * calls from the actual global delay time
+		 */
+		sleep(UPDATE_INTERVAL - delay);
+		delay = 0;
 	}
 
+	XStoreName(dpy, DefaultRootWindow(dpy), status_old);
+	XSync(dpy, False);
+
 	XCloseDisplay(dpy);
 
 	return 0;