X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/2bd581a47b8e355a398b87bb82fdcff547b8073a..8c8326f793549dcc685f0e4ec3e29f1f3790d6d8:/components/battery.c?ds=inline

diff --git a/components/battery.c b/components/battery.c
index e997e4c..152777e 100644
--- a/components/battery.c
+++ b/components/battery.c
@@ -16,8 +16,7 @@
 
 		snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/",
 		         bat, "/capacity");
-		return (pscanf(path, "%i", &perc) == 1) ?
-		       bprintf("%d", perc) : NULL;
+		return (pscanf(path, "%i", &perc) == 1) ? bprintf("%d", perc) : NULL;
 	}
 
 	const char *
@@ -29,7 +28,6 @@
 		} map[] = {
 			{ "Charging",    "+" },
 			{ "Discharging", "-" },
-			{ "Full",        "=" },
 		};
 		size_t i;
 		char path[PATH_MAX], state[12];
@@ -47,41 +45,56 @@
 		}
 		return (i == LEN(map)) ? "?" : map[i].symbol;
 	}
+
+	const char *
+	battery_remaining(const char *bat)
+	{
+		/* TODO: Implement */
+		return NULL;
+	}
 #elif defined(__OpenBSD__)
 	#include <fcntl.h>
 	#include <machine/apmvar.h>
 	#include <sys/ioctl.h>
 	#include <unistd.h>
 
-	const char *
-	battery_perc(const char *null)
+	static int
+	load_apm_power_info(struct apm_power_info *apm_info)
 	{
-		struct apm_power_info apm_info;
 		int fd;
 
 		fd = open("/dev/apm", O_RDONLY);
 		if (fd < 0) {
-			fprintf(stderr, "open '/dev/apm': %s\n", strerror(errno));
-			return NULL;
+			warn("open '/dev/apm':");
+			return 0;
 		}
 
-		if (ioctl(fd, APM_IOC_GETPOWER, &apm_info) < 0) {
-			fprintf(stderr, "ioctl 'APM_IOC_GETPOWER': %s\n",
-			        strerror(errno));
+		memset(apm_info, 0, sizeof(struct apm_power_info));
+		if (ioctl(fd, APM_IOC_GETPOWER, apm_info) < 0) {
+			warn("ioctl 'APM_IOC_GETPOWER':");
 			close(fd);
-			return NULL;
+			return 0;
+		}
+		return close(fd), 1;
+	}
+
+	const char *
+	battery_perc(const char *unused)
+	{
+		struct apm_power_info apm_info;
+
+		if (load_apm_power_info(&apm_info)) {
+			return bprintf("%d", apm_info.battery_life);
 		}
-		close(fd);
 
-		return bprintf("%d", apm_info.battery_life);
+		return NULL;
 	}
 
 	const char *
-	battery_state(const char *bat)
+	battery_state(const char *unused)
 	{
-		int fd;
-		size_t i;
 		struct apm_power_info apm_info;
+		size_t i;
 		struct {
 			unsigned int state;
 			char *symbol;
@@ -90,25 +103,28 @@
 			{ APM_AC_OFF,     "-" },
 		};
 
-		fd = open("/dev/apm", O_RDONLY);
-		if (fd < 0) {
-			fprintf(stderr, "open '/dev/apm': %s\n", strerror(errno));
-			return NULL;
+		if (load_apm_power_info(&apm_info)) {
+			for (i = 0; i < LEN(map); i++) {
+				if (map[i].state == apm_info.ac_state) {
+					break;
+				}
+			}
+			return (i == LEN(map)) ? "?" : map[i].symbol;
 		}
 
-		if (ioctl(fd, APM_IOC_GETPOWER, &apm_info) < 0) {
-			fprintf(stderr, "ioctl 'APM_IOC_GETPOWER': %s\n",
-			        strerror(errno));
-			close(fd);
-			return NULL;
-		}
-		close(fd);
+		return NULL;
+	}
 
-		for (i = 0; i < LEN(map); i++) {
-			if (map[i].state == apm_info.ac_state) {
-				break;
-			}
+	const char *
+	battery_remaining(const char *unused)
+	{
+		struct apm_power_info apm_info;
+
+		if (load_apm_power_info(&apm_info)) {
+			return bprintf("%u:%02u", apm_info.minutes_left / 60,
+				       apm_info.minutes_left % 60);
 		}
-		return (i == LEN(map)) ? "?" : map[i].symbol;
+
+		return NULL;
 	}
 #endif