X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/2d1bbf0d35f096803a96afbc8ae89a057e646d9f..561de544e74487f5e7a9b51850d382fe2278a915:/slstatus.c

diff --git a/slstatus.c b/slstatus.c
index bf3c826..a13bf3b 100644
--- a/slstatus.c
+++ b/slstatus.c
@@ -40,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 *);
@@ -65,9 +66,8 @@ static char *wifi_perc(const char *);
 static char *wifi_essid(const char *);
 static void sighandler(const int);
 
-static unsigned short int delay;
+static unsigned short int delay, done;
 static Display *dpy;
-static int done = 0;
 
 #include "config.h"
 
@@ -98,36 +98,44 @@ smprintf(const char *fmt, ...)
 static char *
 battery_perc(const char *battery)
 {
-	int now, full;
+	int perc;
 	FILE *fp;
 
-	ccat(3, "/sys/class/power_supply/", battery, "/energy_now");
+	ccat(3, "/sys/class/power_supply/", battery, "/capacity");
 	fp = fopen(concat, "r");
 	if (fp == NULL) {
-		ccat(4, "/sys/class/power_supply/", battery, "/charge_now");
-		fp = fopen(concat, "r");
-		if (fp == NULL) {
-			warn("Error opening battery file: %s", concat);
-			return smprintf(UNKNOWN_STR);
-		}
+		warn("Error opening battery file: %s", concat);
+		return smprintf(UNKNOWN_STR);
 	}
-	fscanf(fp, "%i", &now);
+	fscanf(fp, "%i", &perc);
 	fclose(fp);
 
-	ccat(3, "/sys/class/power_supply/", battery, "/energy_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) {
-		ccat(4, "/sys/class/power_supply/", battery, "/charge_full");
-		fp = fopen(concat, "r");
-		if (fp == NULL) {
-			warn("Error opening battery file: %s", concat);
-			return smprintf(UNKNOWN_STR);
-		}
+		warn("Error opening battery file: %s", concat);
+		return smprintf(UNKNOWN_STR);
 	}
-	fscanf(fp, "%i", &full);
+	fscanf(fp, "%12s", state);
 	fclose(fp);
 
-	return smprintf("%d%%", now / (full / 100));
+	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 *
@@ -264,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);
@@ -400,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] = '\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);
 }
 
@@ -476,25 +474,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);
 	}
 
@@ -505,7 +503,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 *
@@ -584,17 +582,16 @@ wifi_essid(const char *wificard)
 static void
 sighandler(const int signo)
 {
-	if (signo == SIGTERM || signo == SIGINT) {
+	if (signo == SIGTERM || signo == SIGINT)
 		done = 1;
-	}
 }
 
 int
 main(void)
 {
-	size_t i;
+	unsigned short int i;
 	char status_string[4096];
-	char *res, *element, *status_old;
+	char *res, *element;
 	struct arg argument;
 	struct sigaction act;
 
@@ -605,8 +602,6 @@ main(void)
 
 	dpy = XOpenDisplay(NULL);
 
-	XFetchName(dpy, DefaultRootWindow(dpy), &status_old);
-
 	while (!done) {
 		status_string[0] = '\0';
 		for (i = 0; i < sizeof(args) / sizeof(args[0]); ++i) {
@@ -634,7 +629,7 @@ main(void)
 		delay = 0;
 	}
 
-	XStoreName(dpy, DefaultRootWindow(dpy), status_old);
+	XStoreName(dpy, DefaultRootWindow(dpy), NULL);
 	XSync(dpy, False);
 
 	XCloseDisplay(dpy);