X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/b04ca3ef45decced916dd43370d43a10f21e2991..fa7c266e2b7adbc2a87bd44057b9e561d9ed61e3:/components/battery.c

diff --git a/components/battery.c b/components/battery.c
index b05c171..99e09d5 100644
--- a/components/battery.c
+++ b/components/battery.c
@@ -1,5 +1,4 @@
 /* See LICENSE file for copyright and license details. */
-#include <errno.h>
 #include <stdio.h>
 #include <string.h>
 
@@ -7,6 +6,29 @@
 
 #if defined(__linux__)
 	#include <limits.h>
+	#include <unistd.h>
+
+	#define CHARGE_NOW "/sys/class/power_supply/%s/charge_now"
+	#define ENERGY_NOW "/sys/class/power_supply/%s/energy_now"
+	#define CURRENT_NOW "/sys/class/power_supply/%s/current_now"
+	#define POWER_NOW "/sys/class/power_supply/%s/power_now"
+
+	static const char *
+	pick(const char *bat, const char *f1, const char *f2, char *path,
+	     size_t length)
+	{
+		if (esnprintf(path, length, f1, bat) > 0 &&
+		    access(path, R_OK) == 0) {
+			return f1;
+		}
+
+		if (esnprintf(path, length, f2, bat) > 0 &&
+		    access(path, R_OK) == 0) {
+			return f2;
+		}
+
+		return NULL;
+	}
 
 	const char *
 	battery_perc(const char *bat)
@@ -14,15 +36,22 @@
 		int perc;
 		char path[PATH_MAX];
 
-		snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/",
-		         bat, "/capacity");
-		return (pscanf(path, "%i", &perc) == 1) ? bprintf("%d", perc) : NULL;
+		if (esnprintf(path, sizeof(path),
+		              "/sys/class/power_supply/%s/capacity",
+		              bat) < 0) {
+			return NULL;
+		}
+		if (pscanf(path, "%d", &perc) != 1) {
+			return NULL;
+		}
+
+		return bprintf("%d", perc);
 	}
 
 	const char *
 	battery_state(const char *bat)
 	{
-		struct {
+		static struct {
 			char *state;
 			char *symbol;
 		} map[] = {
@@ -32,8 +61,11 @@
 		size_t i;
 		char path[PATH_MAX], state[12];
 
-		snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/",
-		         bat, "/status");
+		if (esnprintf(path, sizeof(path),
+		              "/sys/class/power_supply/%s/status",
+		              bat) < 0) {
+			return NULL;
+		}
 		if (pscanf(path, "%12s", state) != 1) {
 			return NULL;
 		}
@@ -49,8 +81,43 @@
 	const char *
 	battery_remaining(const char *bat)
 	{
-		/* TODO: Implement */
-		return NULL;
+		int charge_now, current_now, m, h;
+		double timeleft;
+		char path[PATH_MAX], state[12];
+
+		if (esnprintf(path, sizeof(path),
+		              "/sys/class/power_supply/%s/status",
+		              bat) < 0) {
+			return NULL;
+		}
+		if (pscanf(path, "%12s", state) != 1) {
+			return NULL;
+		}
+
+		if (!pick(bat, CHARGE_NOW, ENERGY_NOW, path, sizeof(path)) ||
+		    pscanf(path, "%d", &charge_now) < 0) {
+			return NULL;
+		}
+
+		if (!strcmp(state, "Discharging")) {
+			if (!pick(bat, CURRENT_NOW, POWER_NOW, path,
+			          sizeof(path)) ||
+			    pscanf(path, "%d", &current_now) < 0) {
+				return NULL;
+			}
+
+			if (current_now == 0) {
+				return NULL;
+			}
+
+			timeleft = (double)charge_now / (double)current_now;
+			h = timeleft;
+			m = (timeleft - (double)h) * 60;
+
+			return bprintf("%dh %dm", h, m);
+		}
+
+		return "";
 	}
 #elif defined(__OpenBSD__)
 	#include <fcntl.h>
@@ -93,8 +160,6 @@
 	const char *
 	battery_state(const char *unused)
 	{
-		struct apm_power_info apm_info;
-		size_t i;
 		struct {
 			unsigned int state;
 			char *symbol;
@@ -102,6 +167,8 @@
 			{ APM_AC_ON,      "+" },
 			{ APM_AC_OFF,     "-" },
 		};
+		struct apm_power_info apm_info;
+		size_t i;
 
 		if (load_apm_power_info(&apm_info)) {
 			for (i = 0; i < LEN(map); i++) {
@@ -122,7 +189,8 @@
 
 		if (load_apm_power_info(&apm_info)) {
 			if (apm_info.ac_state != APM_AC_ON) {
-				return bprintf("%u:%02u", apm_info.minutes_left / 60,
+				return bprintf("%uh %02um",
+			                       apm_info.minutes_left / 60,
 				               apm_info.minutes_left % 60);
 			} else {
 				return "";