X-Git-Url: https://git.xinqibao.xyz/slstatus.git/blobdiff_plain/96f3a8a54eeb3b2294ed953dad8b15349f3e2703..8c8326f793549dcc685f0e4ec3e29f1f3790d6d8:/components/battery.c

diff --git a/components/battery.c b/components/battery.c
index cd1169d..152777e 100644
--- a/components/battery.c
+++ b/components/battery.c
@@ -1,85 +1,130 @@
 /* See LICENSE file for copyright and license details. */
+#include <errno.h>
 #include <stdio.h>
-#if defined(__linux__)
-#include <limits.h>
 #include <string.h>
-#elif defined(__OpenBSD__)
-#include <sys/ioctl.h>
-#include <fcntl.h>
-#include <unistd.h>
-#include <machine/apmvar.h>
-#endif
 
 #include "../util.h"
 
-const char *
-battery_perc(const char *bat)
-{
 #if defined(__linux__)
-	int perc;
-	char path[PATH_MAX];
+	#include <limits.h>
 
-	snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/", bat, "/capacity");
-	return (pscanf(path, "%i", &perc) == 1) ?
-	       bprintf("%d", perc) : NULL;
-#elif defined(__OpenBSD__)
-	struct apm_power_info apm_info;
-	int fd;
+	const char *
+	battery_perc(const char *bat)
+	{
+		int perc;
+		char path[PATH_MAX];
 
-	fd = open("/dev/apm", O_RDONLY);
-	if (fd < 0) {
-		fprintf(stderr, "Failed to open file /dev/apm");
+		snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/",
+		         bat, "/capacity");
+		return (pscanf(path, "%i", &perc) == 1) ? bprintf("%d", perc) : NULL;
+	}
+
+	const char *
+	battery_state(const char *bat)
+	{
+		struct {
+			char *state;
+			char *symbol;
+		} map[] = {
+			{ "Charging",    "+" },
+			{ "Discharging", "-" },
+		};
+		size_t i;
+		char path[PATH_MAX], state[12];
+
+		snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/",
+		         bat, "/status");
+		if (pscanf(path, "%12s", state) != 1) {
+			return NULL;
+		}
+
+		for (i = 0; i < LEN(map); i++) {
+			if (!strcmp(map[i].state, state)) {
+				break;
+			}
+		}
+		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>
+
+	static int
+	load_apm_power_info(struct apm_power_info *apm_info)
+	{
+		int fd;
+
+		fd = open("/dev/apm", O_RDONLY);
+		if (fd < 0) {
+			warn("open '/dev/apm':");
+			return 0;
+		}
+
+		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 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);
+		}
 
-	if (ioctl(fd, APM_IOC_GETPOWER, &apm_info) < 0) {
-		fprintf(stderr, "Failed to get battery info");
-		close(fd);
 		return NULL;
 	}
-	close(fd);
 
-	return bprintf("%d", apm_info.battery_life);
-#endif
-}
+	const char *
+	battery_state(const char *unused)
+	{
+		struct apm_power_info apm_info;
+		size_t i;
+		struct {
+			unsigned int state;
+			char *symbol;
+		} map[] = {
+			{ APM_AC_ON,      "+" },
+			{ APM_AC_OFF,     "-" },
+		};
+
+		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 defined(__linux__)
-const char *
-battery_power(const char *bat)
-{
-	int watts;
-	char path[PATH_MAX];
-
-	snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/", bat, "/power_now");
-	return (pscanf(path, "%i", &watts) == 1) ?
-	       bprintf("%d", (watts + 500000) / 1000000) : NULL;
-}
-
-const char *
-battery_state(const char *bat)
-{
-	struct {
-		char *state;
-		char *symbol;
-	} map[] = {
-		{ "Charging",    "+" },
-		{ "Discharging", "-" },
-		{ "Full",        "=" },
-		{ "Unknown",     "/" },
-	};
-	size_t i;
-	char path[PATH_MAX], state[12];
-
-	snprintf(path, sizeof(path), "%s%s%s", "/sys/class/power_supply/", bat, "/status");
-	if (pscanf(path, "%12s", state) != 1) {
 		return NULL;
 	}
 
-	for (i = 0; i < LEN(map); i++) {
-		if (!strcmp(map[i].state, 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 NULL;
 	}
-	return (i == LEN(map)) ? "?" : map[i].symbol;
-}
 #endif